diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index e0cc32fd3..1e31a4f1d 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -15,6 +15,7 @@ jobs:
         with:
           submodules: true
       - run: make -C apps/KhiCAS cleanall
+      - run: make -C apps/KhiCAS src/lib/libmpfi.a
       - run: make KhiCAS_rebuild
       - run: ./tool/archive KhiCAS.tar KhiCAS
       - uses: actions/upload-artifact@master
diff --git a/.gitignore b/.gitignore
index dc0291eb3..ab9af520b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ apps/KhiCAS/src/gmp*/trialdivtab.h
 *.pc
 **/libtool
 **/aclocal.m4
+khiext/
+khiext.tgz
+*~
diff --git a/apps/KhiCAS/README.md b/apps/KhiCAS/README.md
index 39953d41d..a78722cf7 100644
--- a/apps/KhiCAS/README.md
+++ b/apps/KhiCAS/README.md
@@ -13,7 +13,7 @@ To update KhiCAS, you have some things to do:
 3. Copy the contents of the folder `khiext/apps/KhiCAS` to the folder `apps/KhiCAS`
 4. Now, you have the new version of KhiCAS, but you have to apply some changes to the code.
 5. Replace `inline bool iskeydown(int key){ return getkey(key | 0x80000000); }` by `inline bool iskeydown(int key);`
-6. Add this code in the file `apps/KhiCAS/main.cpp`:
+6. Add this code in the file `apps/KhiCAS/src/main.cpp`:
 
 ```cpp
 bool iskeydown(int key) {
diff --git a/apps/KhiCAS/app.elf b/apps/KhiCAS/app.elf
index c78186864..424c11b5c 100644
Binary files a/apps/KhiCAS/app.elf and b/apps/KhiCAS/app.elf differ
diff --git a/apps/KhiCAS/buildDeps~ b/apps/KhiCAS/buildDeps~
deleted file mode 100755
index 8e4cfc9cb..000000000
--- a/apps/KhiCAS/buildDeps~
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-function build {
-  (
-    cd src/gmp-6.2.1
-    ./configure --host=arm-none-eabi --disable-assembly CFLAGS="$2"
-    make -j $(nproc)
-    cp .libs/libgmp.a ../lib/
-    cp gmp.h ../include/gmp.h
-    make distclean
-  )
-
-  (
-    cd src/mpfr-4.1.0
-    ./configure --with-gmp=../ --host=arm-none-eabi --disable-shared CFLAGS="$2"
-    make -j $(nproc)
-    cp src/.libs/libmpfr.a ../lib/
-    cp src/mpfr.h ../include/mpfr.h
-    make distclean
-  )
-
-  (
-    cd src/mpfi-1.5.4
-    
-    # Quick and dirty hack for github pages to work
-    # Setup symlinks manually
-    # mkdir build-aux
-    # mkdir m4
-    
-    # ln -s /usr/share/libtool/build-aux/ltmain.sh    build-aux/ltmain.sh
-    # ln -s /usr/share/automake-1.16/missing          build-aux/missing
-    # ln -s /usr/share/automake-1.16/config.sub       build-aux/config.sub
-    # ln -s /usr/share/automake-1.16/compile          build-aux/compile
-    # ln -s /usr/share/automake-1.16/config.guess     build-aux/config.guess
-    # ln -s /usr/share/automake-1.16/test-driver      build-aux/test-driver
-    # ln -s /usr/share/automake-1.16/install-sh       build-aux/install-sh
-    # ln -s /usr/share/automake-1.16/ar-lib           build-aux/ar-lib
-    # ln -s /usr/share/automake-1.16/depcomp          build-aux/depcomp
-    # ln -s /usr/share/aclocal/ltoptions.m4           m4/ltoptions.m4
-    # ln -s /usr/share/aclocal/ltsugar.m4             m4/ltsugar.m4
-    # ln -s /usr/share/aclocal/libtool.m4             m4/libtool.m4
-    # ln -s /usr/share/aclocal/lt~obsolete.m4         m4/lt~obsolete.m4
-    # ln -s /usr/share/aclocal/ltversion.m4           m4/ltversion.m4
-    
-    
-    ./configure --with-mpfr=$(pwd)/../ --with-gmp=$(pwd)/../ --host=arm-none-eabi CFLAGS="$2"
-    make -j $(nproc)
-    cp src/.libs/libmpfi.a ../lib/
-    cp src/mpfi.h ../include/mpfi.h
-    make distclean
-    
-    rm -r build-aux
-    rm -r m4
-  )
-  
-  (
-    cd src/micropython-1.12/numworks
-    ./mklib
-  )
-}
-
-# build n0100 "-Os -fdata-sections -ffunction-sections -DNDEBUG -mthumb -march=armv7e-m -mfloat-abi=hard -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -fno-strict-aliasing --specs=nosys.specs"
-build n0110 "-Os -fdata-sections -ffunction-sections -DNDEBUG -mthumb -march=armv7e-m -mfloat-abi=hard -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -fno-strict-aliasing --specs=nosys.specs"
diff --git a/apps/KhiCAS/buildGiac~ b/apps/KhiCAS/buildGiac~
deleted file mode 100755
index 94b2f282e..000000000
--- a/apps/KhiCAS/buildGiac~
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-function build {
-  (
-    cd src/giac-1.6.0/src
-    rm -f *.o *.a
-    make -f Makefile.numworks.$1 -j $(nproc)
-    cp libgiac.a ../../lib/
-    rm -f *.o *.a
-  )
-}
-
-#build n0100
-build n0110
-#build simulator
diff --git a/apps/KhiCAS/examples/bac11.xw b/apps/KhiCAS/examples/bac11.xw
old mode 100755
new mode 100644
diff --git a/apps/KhiCAS/examples/bac12.xw b/apps/KhiCAS/examples/bac12.xw
old mode 100755
new mode 100644
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/Makefile.numworks.n0110~ b/apps/KhiCAS/src/giac-1.6.0/src/Makefile.numworks.n0110~
deleted file mode 100755
index 78d04865f..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/Makefile.numworks.n0110~
+++ /dev/null
@@ -1,27 +0,0 @@
-PREFIX=arm-none-eabi-
-GCC = $(PREFIX)gcc
-CXX = $(PREFIX)g++
-LD = $(PREFIX)ld 
-
-CXXFLAGS = -Os -I. -I../../include #-I../../libtommath-0.39
-CXXFLAGS += -fno-threadsafe-statics -mthumb -march=armv7e-m -mfloat-abi=hard  -mcpu=cortex-m7 -mfpu=fpv5-sp-d16  -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive
-#CXXFLAGS += -DNUMWORKS -DNSPIRE_NEWLIB -DHAVE_CONFIG_H -DIN_GIAC -DTIMEOUT -DNO_PHYSICAL_CONSTANTS -DNO_STDEXCEPT  -DGIAC_BINARY_ARCHIVE -DNO_UNARY_FUNCTION_COMPOSE -DNO_TEMPLATE_MULTGCD  -DNO_RTTI  -DGIAC_GENERIC_CONSTANTS # -DGIAC_NO_OPTIMIZATIONS -DSTATIC_BUILTIN_LEXER_FUNCTIONS
-CXXFLAGS += -DDEVICE -DNUMWORKS -DHAVE_CONFIG_H -DIN_GIAC -DTIMEOUT -DNO_STDEXCEPT  -DGIAC_BINARY_ARCHIVE -DNO_UNARY_FUNCTION_COMPOSE -DNO_TEMPLATE_MULTGCD  -DGIAC_NO_OPTIMIZATIONS -DSTATIC_BUILTIN_LEXER_FUNCTIONS -DTIMEOUT -DMICROPY_LIB 
-
-OBJS = sym2poly.o gausspol.o threaded.o maple.o ti89.o mathml.o moyal.o misc.o permu.o desolve.o input_parser.o symbolic.o index.o modpoly.o modfactor.o ezgcd.o derive.o solve.o intg.o intgab.o risch.o lin.o series.o subst.o vecteur.o sparse.o csturm.o tex.o global.o ifactor.o alg_ext.o gauss.o isom.o help.o plot.o plot3d.o rpn.o prog.o pari.o cocoa.o unary.o usual.o identificateur.o gen.o input_lexer.o tinymt32.o first.o quater.o kdisplay.o kadd.o k_csdk.o
-
-all: libgiac.a
-
-.cc.o:
-	$(CXX) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CXX) $(CXXFLAGS) -c $<
-
-clean:
-	rm -f *.o
-
-libgiac.a: $(OBJS) 
-	$(PREFIX)ar rcs libgiac.a $(OBJS) 
-	$(PREFIX)ranlib libgiac.a
-	$(PREFIX)objcopy --redefine-sym mp_init=mp_tm_init $@
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/alg_ext.cc b/apps/KhiCAS/src/giac-1.6.0/src/alg_ext.cc
index b24a5fa6a..fccdc5cc3 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/alg_ext.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/alg_ext.cc
@@ -728,10 +728,10 @@ namespace giac {
 	  if (!rootof_trylock()){
 	    if (lvptr){
 	      gen vexpr=r2e(v,vecteur(lvptr->begin()+1,lvptr->end()),contextptr);
-	      symbolic_rootof_list()[vexpr]=gaa+k*gbb;
+	      symbolic_rootof_list()[vexpr]=k*gaa+gbb;
 	    }
 	    else
-	      symbolic_rootof_list()[v]=gaa+k*gbb;
+	      symbolic_rootof_list()[v]=k*gaa+gbb;
 	    rootof_unlock();
 	  }
 	}
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/config.h b/apps/KhiCAS/src/giac-1.6.0/src/config.h
index ea739610e..5188900a4 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/config.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/config.h
@@ -455,7 +455,7 @@
 #define PACKAGE_NAME "giac"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "giac 1.7.0"
+#define PACKAGE_STRING "giac 1.9.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "giac"
@@ -464,7 +464,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.0"
+#define PACKAGE_VERSION "1.9.0"
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */
@@ -506,7 +506,7 @@
 /* #undef USE_OPENGL32 */
 
 /* Version number of package */
-#define VERSION "1.7.0"
+#define VERSION "1.9.0"
 
 /* Define to 1 if the X Window System is missing or not being used. */
 #define X_DISPLAY_MISSING 1
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/derive.cc b/apps/KhiCAS/src/giac-1.6.0/src/derive.cc
index ddddfda55..f982f70a7 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/derive.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/derive.cc
@@ -808,6 +808,8 @@ namespace giac {
     step_infolevel(contextptr)=savestep;
     gprintf(step_extrema1,gettext("Derivative of %gen with respect to %gen is %gen\nSolving %gen with respect to %gen answer %gen"),makevecteur(arg,var,d,deq,var,s.type==_VECT?change_subtype(s,_SEQ__VECT):s),contextptr);
     calc_mode(c,contextptr);
+    if (c==1 && s.type==_VECT) 
+      s.subtype=0;
     vecteur ls=lidnt(s);
     for (int i=0;i<int(ls.size());++i){
       if (ls[i]==var || (var.type==_VECT && equalposcomp(*var._VECTptr,ls[i])))
@@ -1110,10 +1112,30 @@ namespace giac {
     tmp.insert(tmp.begin(),symbolic(at_ou,gen(res,_SEQ__VECT)));
     return symbolic(at_and,gen(tmp,_SEQ__VECT));
   }
+  void domain_auto_assume(const gen & f,const gen & x,GIAC_CONTEXT){
+    vecteur range;
+    find_range(x,range,contextptr);
+    if (range.size()>=1 && range.front().type==_VECT){
+      range=*range.front()._VECTptr;
+      if (range.size()==2 && range[0]==minus_inf && range[1]==plus_inf){
+	gen periode;
+	if (is_periodic(f,x,periode,contextptr)){
+	  gen hyp=symb_and(symbolic(at_superieur_egal,makesequence(x,0)),symbolic(at_inferieur_egal,makesequence(x,periode)));
+	  *logptr(contextptr) << "Periodic function. Auto assume" << hyp << "\n";
+	  giac_assume(hyp,contextptr);
+	}
+      }
+    }
+  }
   gen _domain(const gen & args,GIAC_CONTEXT){
     if (is_undef(args)) return args;
-    if (args.type!=_VECT || args.subtype!=_SEQ__VECT)
-      return domain(args,vx_var,0,contextptr);
+    if (args.type!=_VECT || args.subtype!=_SEQ__VECT){
+      gen xval=assumeeval(vx_var,contextptr);
+      domain_auto_assume(args,vx_var,contextptr);
+      gen res=domain(args,vx_var,0,contextptr);
+      restorepurge(xval,vx_var,contextptr);
+      return res;
+    }
     vecteur v=*args._VECTptr;
     if (v.size()<2)
       return gensizeerr(contextptr);
@@ -1123,7 +1145,11 @@ namespace giac {
       v.push_back(0);
     if (v[2].type!=_INT_)
       return gensizeerr(contextptr);
-    return domain(v[0],v[1],v[2].val,contextptr);
+    gen xval=assumeeval(vx_var,contextptr);
+    domain_auto_assume(v[0],v[1],contextptr);
+    gen res=domain(v[0],v[1],v[2].val,contextptr);
+    restorepurge(xval,vx_var,contextptr);
+    return res;
   }
   static const char _domain_s []="domain";
   static define_unary_function_eval (__domain,&_domain,_domain_s);
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/dispatch.h b/apps/KhiCAS/src/giac-1.6.0/src/dispatch.h
index 70f054a33..6b1f0bc76 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/dispatch.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/dispatch.h
@@ -476,10 +476,10 @@ namespace giac {
   };
 
   enum color_values {
-#ifdef KHICAS
+#if defined KHICAS || defined GIAC_HAS_STO_38
     _BLACK=0,
     _RED=0xf800,
-    _GREEN=0x0400,
+    _GREEN=0x07e0,
     _YELLOW=0xffe0,
     _BLUE=0x001f,
     _MAGENTA=0xf81f,
@@ -488,18 +488,21 @@ namespace giac {
 #else // KHICAS
 #ifdef GIAC_HAS_STO_38
     _WHITE=0,
+    _RED=0xff0000,
+    _GREEN=0xff00,
+    _YELLOW=0xffff00,
+    _BLUE=0xff,
+    _MAGENTA=0xff00ff,
+    _CYAN=0xffff,
+    _BLACK=7,
 #else
     _BLACK=0,
-#endif
     _RED=1,
     _GREEN=2,
     _YELLOW=3,
     _BLUE=4,
     _MAGENTA=5,
     _CYAN=6,
-#ifdef GIAC_HAS_STO_38
-    _BLACK=7,
-#else
     _WHITE=7,
 #endif
 #endif // KHICAS
@@ -618,6 +621,18 @@ namespace giac {
     _GT_ACYCLIC = 159,             // acyclic
     _KDE_BANDWIDTH = 160,          // bandwidth
     _KDE_BINS = 161,               // bins
+    _NLP_METHOD = 162,
+    _NLP_TOLERANCE = 163,
+    _NLP_VERBOSE = 164,
+    _ANN_HALF_MSE = 165,           // MSE
+    _ANN_CROSS_ENTROPY = 166,      // cross_entropy
+    _ANN_LOG_LOSS = 167,           // log_loss
+    _ANN_BLOCK_SIZE = 168,         // block_size
+    _ANN_MOMENTUM = 169,           // momentum
+    _ANN_TOPOLOGY = 170,            // topology
+    _ANN_LEARNING_RATE = 171,      // learning_rate
+    _ANN_WEIGHT_DECAY = 172,       // weight_decay
+    _ANN_RELU = 173,               // ReLU
   };
 
   enum mupad_operator {
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/gen.cc b/apps/KhiCAS/src/giac-1.6.0/src/gen.cc
index c2318db91..e53d4200b 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/gen.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/gen.cc
@@ -4669,7 +4669,7 @@ namespace giac {
       if (a.type==_INT_){
 	longlong tmp=((longlong) a.val+b.val);
 	a.val=(int)tmp;
-	if (a.val==tmp)
+	if (a.val==tmp && tmp!=-2147483648)
 	  return a;
 	return a=tmp;
       }
@@ -5475,7 +5475,7 @@ namespace giac {
       if (a.type==_INT_){
 	longlong tmp=((longlong) a.val-b.val);
 	a.val=(int)tmp;
-	if (a.val==tmp)
+	if (a.val==tmp && tmp!=-2147483648)
 	  return a;
 	return a=tmp;
       }
@@ -6025,7 +6025,7 @@ namespace giac {
       if (ab>>31)
 	tmp=ab;
 #else
-      if (tmp.val!=ab)
+      if (tmp.val!=ab || tmp==-2147483648)
 	tmp=ab;
 #endif
       return;
@@ -9037,7 +9037,7 @@ namespace giac {
 #ifdef HAVE_LIBMPFR
 	// FIXME?? try to avoid rounding error with more digits
 	if (fabs(approx._DOUBLE_val)<1e-5 && (a-b).type!=_FRAC){
-	  gen tmp=accurate_evalf(eval(a-b,1,contextptr),1000);
+	  gen tmp=accurate_evalf(eval(a-b,1,contextptr),1100); // 1100 bits exceeds double precision, if a and b are equal up to double precision, this will be rounded to 0.0
 	  tmp=evalf_double(tmp,1,contextptr);
 	  if (tmp.type==_DOUBLE_)
 	    approx=tmp;
@@ -14181,6 +14181,8 @@ void sprint_double(char * s,double d){
 	return "lp_heuristic";
       case _NLP_PRESOLVE:
 	return "nlp_presolve";
+      case _NLP_METHOD:
+ 	return "nlp_method";      
       case _NLP_SAMPLES:
 	return "nlp_samples";
       case _NLP_INTEGER:
@@ -14193,6 +14195,10 @@ void sprint_double(char * s,double d){
 	return "nlp_binaryvariables";
       case _NLP_NONNEGINT:
 	return "nlp_nonnegint";
+      case _NLP_TOLERANCE:
+ 	return "nlp_tolerance";
+      case _NLP_VERBOSE:
+ 	return "nlp_verbose";
       case _NLP_FEAS_TOL:
 	return "nlp_feasibilitytolerance";
       case _NLP_INT_TOL:
@@ -14231,6 +14237,24 @@ void sprint_double(char * s,double d){
         return "bandwidth";
       case _KDE_BINS:
         return "bins";
+      case _ANN_LEARNING_RATE:
+        return "learning_rate";
+      case _ANN_WEIGHT_DECAY:
+        return "weight_decay";
+      case _ANN_RELU:
+        return "ReLU";
+      case _ANN_HALF_MSE:
+        return "MSE";
+      case _ANN_CROSS_ENTROPY:
+        return "cross_entropy";
+      case _ANN_LOG_LOSS:
+        return "log_loss";
+      case _ANN_BLOCK_SIZE:
+        return "block_size";
+      case _ANN_MOMENTUM:
+        return "momentum";
+      case _ANN_TOPOLOGY:
+        return "topology";
       }
     }
     if (subtype==_INT_MUPADOPERATOR){
@@ -16797,7 +16821,7 @@ void sprint_double(char * s,double d){
       if (is3d(last)){
 	int worker=0;
 	worker=EM_ASM_INT_V({
-	    if (typeof(UI.disable3d) !== 'undefined' && UI.disable3d)
+	    if (typeof(UI)!=="undefined" && typeof(UI.disable3d) !== 'undefined' && UI.disable3d)
 	      return UI.disable3d;
 	    if (Module.worker) return 1; else return 0;
 	});
@@ -16836,7 +16860,7 @@ void sprint_double(char * s,double d){
 #ifdef KHICAS // replace ],[ by ][
       if (last.is_symb_of_sommet(at_pnt)){
 	if (os_shell || nspirelua)
-	  xcas::displaygraph(g,&C);
+	  xcas::displaygraph(g,gp,&C);
 	S="Graphic_object";
       }
       else {
@@ -16878,12 +16902,12 @@ void sprint_double(char * s,double d){
 #if !defined GIAC_GGB 
 #if defined EMCC || defined EMCC2
 	double add_evalf=EM_ASM_DOUBLE_V({
-	    if (typeof(UI.add_evalf)!="undefined")
+	    if (typeof(UI)!=="undefined" && typeof(UI.add_evalf)!="undefined")
 	      return UI.add_evalf*1.0;
 	    return 1.0;
 	  }),
 	  js_bigint=EM_ASM_DOUBLE_V({
-	      if (typeof(UI.js_bigint)!="undefined")
+	      if (typeof(UI)!=="undefined" && typeof(UI.js_bigint)!="undefined")
 	      return UI.js_bigint*1.0;
 	    return 0.0;
 	  });
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/gen.h b/apps/KhiCAS/src/giac-1.6.0/src/gen.h
index b3345088b..95f7862ab 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/gen.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/gen.h
@@ -1275,6 +1275,7 @@ namespace giac {
       return s.c_str();
     }
     virtual std::string texprint (GIAC_CONTEXT) const { return "Nothing_to_print_tex"; }
+    virtual gen giac_constructor (GIAC_CONTEXT) const { return *this; }
     virtual gen eval(int level,const context * contextptr) const {return *this;};
     virtual gen evalf(int level,const context * contextptr) const {return *this;};
     virtual gen makegen(int i) const { return string2gen("makegen not redefined"); } ;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/global.cc b/apps/KhiCAS/src/giac-1.6.0/src/global.cc
index 03c88839e..343d9d22e 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/global.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/global.cc
@@ -52,7 +52,9 @@ using namespace std;
 #include <string.h>
 #include <stdexcept>
 #include <algorithm>
-#include <vector>
+#if !defined RTOS_THREADX
+//#include <vector>
+#endif
 #if !defined BESTA_OS && !defined FXCG
 #include <cerrno>
 #endif
@@ -1577,7 +1579,7 @@ namespace giac {
     // 00
     // type 
     // record data
-    if (*ptr!=0xee0bddba)  // ba dd 0b ee
+    if (*((unsigned *)ptr)!=0xee0bddba)  // ba dd 0b ee
       return false; 
     int pos=4; ptr+=4;
     for (;pos<nwstoresize1;){
@@ -3640,6 +3642,7 @@ extern "C" void Sleep(unsigned int miliSecond);
 #endif
   int GAMMA_LIMIT = 100 ;
   int NEWTON_DEFAULT_ITERATION=40;
+  int NEWTON_MAX_RANDOM_RESTART=5;
   int TEST_PROBAB_PRIME=25;
   int GCDHEU_MAXTRY=5;
   int GCDHEU_DEGREE=100;
@@ -3679,6 +3682,11 @@ extern "C" void Sleep(unsigned int miliSecond);
 #endif
   int GAMMA_LIMIT = 100 ;
   int NEWTON_DEFAULT_ITERATION=60;
+#ifdef GIAC_GGB
+  int NEWTON_MAX_RANDOM_RESTART=20;
+#else
+  int NEWTON_MAX_RANDOM_RESTART=5;
+#endif
   int TEST_PROBAB_PRIME=25;
   int GCDHEU_MAXTRY=5;
   int GCDHEU_DEGREE=100;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/global.cc~ b/apps/KhiCAS/src/giac-1.6.0/src/global.cc~
deleted file mode 100755
index b2358c2ba..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/global.cc~
+++ /dev/null
@@ -1,8747 +0,0 @@
-/* -*- compile-command: "g++-3.4 -I.. -g -c global.cc  -DHAVE_CONFIG_H -DIN_GIAC" -*- */
-
-#include "giacPCH.h"
-
-/*  
- *  Copyright (C) 2000,14 B. Parisse, Institut Fourier, 38402 St Martin d'Heres
- *
- *  This program 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifdef KHICAS
-  extern "C" double millis(); //extern int time_shift;
-#endif
-
-using namespace std;
-#ifdef HAVE_SSTREAM
-#include <sstream>
-#else
-#include <strstream>
-#endif
-#if !defined GIAC_HAS_STO_38 && !defined NSPIRE && !defined FXCG 
-#include <fstream>
-#endif
-#include "global.h"
-// #include <time.h>
-#if !defined BESTA_OS && !defined FXCG
-#include <signal.h>
-#endif
-#include <math.h>
-#ifndef WINDOWS
-#include <stdint.h>   // for uintptr_t
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#include <string.h>
-#include <stdexcept>
-#include <algorithm>
-#include <vector>
-#if !defined BESTA_OS && !defined FXCG
-#include <cerrno>
-#endif
-#include "gen.h"
-#include "identificateur.h"
-#include "symbolic.h"
-#include "sym2poly.h"
-#include "plot.h"
-#include "rpn.h"
-#include "prog.h"
-#include "usual.h"
-#include "tex.h"
-#include "path.h"
-#include "input_lexer.h"
-#include "giacintl.h"
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef _HAS_LIMITS
-#include <limits>
-#endif
-#ifndef BESTA_OS
-#ifdef WIN32
-#ifndef VISUALC
-#if !defined(GNUWINCE) && !defined(__MINGW_H)
-#include <sys/cygwin.h>
-#endif
-#if !defined(GNUWINCE) 
-#include <windows.h>
-#endif // ndef gnuwince
-#endif // ndef visualc
-#endif // win32
-#endif // ndef bestaos
-
-#ifdef HAVE_LIBFLTK
-#include <FL/fl_ask.H>
-#endif
-
-#if defined VISUALC && !defined BESTA_OS && !defined RTOS_THREADX && !defined FREERTOS 
-#include <Windows.h>
-#endif 
-
-#ifdef BESTA_OS
-#include <stdlib.h>
-#endif // besta_os
-
-#include <stdio.h>
-#include <stdarg.h>
-#ifdef QUICKJS
-#include "qjsgiac.h"
-string js_vars;
-void update_js_vars(){
-  const char VARS[]="function update_js_vars(){let res=''; for(var b in globalThis) { let prop=globalThis[b]; if (globalThis.hasOwnProperty(b)) res+=b+' ';} return res;}; update_js_vars()";
-  char * names=js_ck_eval(VARS,&global_js_context);
-  if (names){
-    js_vars=names;
-    free(names);
-  }
-}
-int js_token(const char * buf){
-  return js_token(js_vars.c_str(),buf);
-}
-#else // QUICKJS
-void update_js_vars(){}
-int js_token(const char * buf){
-  return 0;
-}
-#endif
-int js_token(const char * list,const char * buf){
-  int bufl=strlen(buf);
-  for (const char * p=list;*p;){
-    if (p[0]=='\'')
-      ++p;
-    if (strncmp(p,buf,bufl)==0 && 
-	(p[bufl]==0 || p[bufl]==' ' || p[bufl]=='\'')){
-      return (p[bufl]=='\'')?3:2;
-    }
-    // skip to next keyword in p
-    for (;*p;++p){
-      if (*p==' '){
-	++p; break;
-      }
-    }
-  }
-  return 0;
-}
-
-#ifdef HAVE_LIBMICROPYTHON
-std::string & python_console(){
-  static std::string * ptr=0;
-  if (!ptr)
-    ptr=new string;
-  return *ptr;
-}
-#endif
-bool freezeturtle=false;
-
-#if defined(FIR)
-extern "C" int firvsprintf(char*,const char*, va_list);
-#endif
-
-#ifdef FXCG
-extern "C" int KeyPressed( void );
-#endif
-
-#ifdef KHICAS
-#include "kdisplay.h"
-#endif
-
-#ifdef NSPIRE_NEWLIB
-#include <libndls.h>
-#endif
-
-#if defined NUMWORKS  && defined DEVICE
-extern "C" const char * extapp_fileRead(const char * filename, size_t *len, int storage);
-extern "C"  bool extapp_erasesector(void *);
-extern "C"  bool extapp_writememory(unsigned char * dest,const unsigned char * data,size_t length);
-#endif
-
-#ifdef NUMWORKS
-size_t pythonjs_stack_size=30*1024,pythonjs_heap_size=40*1024;
-#else
-  size_t pythonjs_stack_size=128*1024,pythonjs_heap_size=(2*1024-256-64)*1024;
-#endif
-void * bf_ctx_ptr=0;
-size_t bf_global_prec=128; // global precision for BF
-
-int my_sprintf(char * s, const char * format, ...){
-    int z;
-    va_list ap;
-    va_start(ap,format);
-#if defined(FIR) && !defined(FIR_LINUX)
-    z = firvsprintf(s, format, ap);
-#else
-    z = vsprintf(s, format, ap);
-#endif
-    va_end(ap);
-    return z;
-}
-
-int ctrl_c_interrupted(int exception){
-  if (!giac::ctrl_c && !giac::interrupted)
-    return 0;
-  giac::ctrl_c=giac::interrupted=0;
-#ifndef NO_STD_EXCEPT
-  if (exception)
-    giac::setsizeerr("Interrupted");
-#endif
-  return 1;
-}
-
-void console_print(const char * s){
-  *logptr(giac::python_contextptr) << s;
-}
-
-const char * console_prompt(const char * s){
-  static string S;
-  giac::gen g=giac::_input(giac::string2gen(s?s:"?",false),giac::python_contextptr);
-  S=g.print(giac::python_contextptr);
-  return S.c_str();
-}
-
-// support for tar archive in flash on the numworks
-char * buf64k=0; // we only have 64k of RAM buffer on the Numworks
-const size_t buflen=(1<<16);
-int numworks_maxtarsize=0x600000-0x10000;
-size_t tar_first_modified_offset=0; // set to non 0 if tar data comes from Numworks
-
-
-// erase sector containing address if required
-// returns true if erased, false otherwise 
-// if false is returned, it means that [address..end of sector] contains 0xff
-// i.e. the remaining part of this sector is ready to write without erasing
-void erase_sector(const char * buf){
-#if defined NUMWORKS && defined DEVICE
-  extapp_erasesector((void *)buf);
-#else
-  char * nxt=(char *) ((((size_t) buf)/buflen +1)*buflen);
-  char * start=nxt-buflen;
-  for (int i=0;i<buflen;++i)
-    start[i]=0xff;
-#endif
-}
-
-#if defined NUMWORKS && defined DEVICE
-void WriteMemory(char * target,const char * src,size_t length){
-  extapp_writememory((unsigned char *)target,(unsigned char*)src,length);
-}
-
-#else
-void WriteMemory(char * target,const char * src,size_t length){
-  memcpy(target,src,length);
-}
-#endif
-
-
-#if 0
-bool write_memory(char * target,const char * src,size_t length_){
-  //if (length % 256) return false;
-  size_t length=((255+length_)/256)*256;
-  char * nxt=(char *) ((((size_t) target)/buflen +1)*buflen);
-  size_t delta=length;
-  if (delta>nxt-target)
-    delta=nxt-target;
-  // first copy current sector in buf64k before erasing
-  char * prev=(char *)nxt-buflen;
-  memcpy(buf64k,prev,buflen);
-  memcpy(buf64k+(target-prev),src,delta);
-  erase_sector(target);
-  WriteMemory(prev,buf64k,buflen);
-  length -= delta;
-  src += delta;
-  target += delta;
-  while (length>0){
-    memcpy(buf64k,target,buflen);
-    delta=length;
-    if (delta>buflen) 
-      delta=buflen;
-    memcpy(buf64k,src,delta);
-    erase_sector(target);
-    WriteMemory(target,buf64k,buflen);
-    length -= delta;
-    src += delta;
-    target += delta;      
-  }
-}
-#endif
-
-// TAR: tar file format support
-int tar_filesize(int s){
-  int h=(s/512+1)*512;
-  if (s%512)
-    h +=512;
-  return h;
-}
-
-// adapted from tarballjs https://github.com/ankitrohatgi/tarballjs
-string giac_readString(const char * buffer,size_t str_offset, size_t size) {
-  int i = 0;
-  string rtnStr = "";
-  while(i<size) {
-    unsigned char ch=buffer[str_offset+i];
-    if (ch<32 || ch>=128) break;
-    rtnStr += ch;
-    i++;
-  }
-  return rtnStr;
-}
-string giac_readFileName(const char * buffer,size_t header_offset) {
-  return giac_readString(buffer,header_offset, 100);
-}
-string giac_readFileType(const char * buffer,size_t header_offset) {
-  // offset: 156
-  const char typeStr = buffer[header_offset+156];
-  if (typeStr == '0')
-    return "file";
-  if (typeStr == '5')
-    return "directory";
-  return string(1,typeStr);
-}
-int giac_readFileSize(const char * buffer,size_t header_offset) {
-  // offset: 124
-  const char * szView = buffer+ header_offset+124;
-  int res=0;
-  for (int i = 0; i < 11; i++) {
-    char tmp=szView[i];
-    if (tmp<'0' || tmp>'9') return -1; // invalid file size
-    res *= 8;
-    res += (tmp-'0');
-  }
-  return res;
-}
-
-int giac_readMode(const char * buffer,size_t header_offset) {
-  // offset: 100
-  const char * szView = buffer+ header_offset+100;
-  int res=0;
-  for (int i = 0; i < 7; i++) {
-    char tmp=szView[i];
-    if (tmp==' ')
-      return res;
-    if (tmp<'0' || tmp>'9') 
-      return -1; // invalid file size
-    res *= 10;
-    res += (tmp-'0');
-  }
-  return res;
-}
-
-void tar_clear(char * buffer){
-  for (int i=0;i<1024;++i)
-    buffer[i]=0;
-}
-
-std::vector<fileinfo_t> tar_fileinfo(const char * buffer,size_t byteLength){
-  vector<fileinfo_t> fileInfo;
-  if (!buffer) return fileInfo;
-  size_t offset=0,file_size=0;       
-  string file_name = "";
-  string file_type = "";
-  while (byteLength==0 || offset<byteLength-512){
-    file_name = giac_readFileName(buffer,offset); // file name
-    if (file_name.size() == 0) 
-      break;
-    file_type = giac_readFileType(buffer,offset);
-    file_size = giac_readFileSize(buffer,offset);
-    int mode = giac_readMode(buffer,offset);
-    if (file_size<0)
-      break;
-    //console.log(offset,file_name,file_size);
-    fileinfo_t tmp={file_name,file_type,file_size,offset,mode};
-    fileInfo.push_back(tmp);
-    offset += tar_filesize(file_size);
-  }
-  //console.log('fileinfo',offset,dohtml);
-  return fileInfo;
-}
-
-size_t tar_totalsize(const char * buffer,size_t byteLength){
-  std::vector<fileinfo_t> f=tar_fileinfo(buffer,byteLength);
-  if (f.empty()) return 0;
-  fileinfo_t i=f[f.size()-1];
-  size_t offset=i.header_offset+tar_filesize(i.size);
-  return offset;
-}
-
-std::string leftpad(const string & s,size_t targetLength) {
-  if (targetLength<=s.size())
-    return s;
-  string add(targetLength-s.size(),'0');
-  return add+s;
-}
-  
-void tar_writestring(char * buffer,const string & str, size_t offset, size_t size) {
-  for (size_t i = 0; i < size; i++) {
-    if (i < str.size()) 
-      buffer[i+offset] = str[i];
-    else 
-      buffer[i+offset] = 0;
-  }
-}
-
-std::string toString8(longlong chksum){
-  if (chksum<0)
-    return "-"+toString8(-chksum);
-  if (chksum==0)
-    return "0";
-  string res;
-  for (;chksum;chksum/=8){
-    res = string(1,'0'+(chksum % 8))+res;
-  }
-  return res;
-}
-
-ulonglong fromstring8(const char * ptr){
-  ulonglong res=0; char ch;
-  for (;(ch=*ptr);++ptr){
-    if (ch==' ')
-      return res;
-    if (ch<'0' || ch>'8')
-      return -1;
-    res *= 8;
-    res += ch-'0';
-  }
-  return res;
-}
-
-void tar_writechecksum(char * buffer,size_t header_offset) {
-  // offset: 148
-  tar_writestring(buffer,"        ", header_offset+148, 8); // first fill with spaces
-  // add up header bytes
-  int chksum = 0;
-  for (int i = 0; i < 512; i++) {
-    chksum += buffer[header_offset+i];
-  }
-  tar_writestring(buffer,leftpad(toString8(chksum),6), header_offset+148, 8);
-  tar_writestring(buffer," ",header_offset+155,1); // add space inside chksum field
-}
-
-void tar_fillheader(char * buffer,size_t offset,int exec=0){
-  int uid = 501;
-  int gid = 20;
-  string mode = exec?"755":"644"; 
-#if !defined HAVE_NO_SYS_TIMES_H && defined HAVE_SYS_TIME_H
-  struct timeval t;
-  gettimeofday(&t, NULL);
-  longlong mtime=t.tv_sec;
-#else
-  longlong mtime=(2021LL-1970)*24*365.2425*3600;
-#ifdef KHICAS
-  mtime = millis()/1000;
-#endif
-#endif
-  string user = "user";
-  string group = "group";
-
-  tar_writestring(buffer,leftpad(mode,7)+" ", offset+100, 8);  
-  tar_writestring(buffer,leftpad(toString8(uid),6)+" ",offset+108,8);
-  tar_writestring(buffer,leftpad(toString8(gid),6)+" ",offset+116,8);
-  tar_writestring(buffer,leftpad(toString8(mtime),11)+" ",offset+136,12);
-
-  //UI.tar_writestring(buffer,"ustar", offset+257,6); // magic string
-  //UI.tar_writestring(buffer,"00", offset+263,2); // magic version
-  tar_writestring(buffer,"ustar  ", offset+257,8);
-    
-  tar_writestring(buffer,user, offset+265,32); // user
-  tar_writestring(buffer,group, offset+297,32); //group
-  tar_writestring(buffer,"000000 ",offset+329,7); //devmajor
-  tar_writestring(buffer,"000000 ",offset+337,7); //devmajor
-  tar_writechecksum(buffer,offset);
-}
-
-// flash version
-int flash_adddata(const char * buffer_,const char * filename,const char * data,size_t datasize,int exec){
-  vector<fileinfo_t> finfo=tar_fileinfo(buffer_,numworks_maxtarsize);
-  size_t s=finfo.size();
-  if (s==0) return 0;
-  fileinfo_t last=finfo[s-1];
-  size_t offset=last.header_offset;
-  offset += tar_filesize(last.size);
-  if (offset+1024+datasize>numworks_maxtarsize) return 0;
-  buffer_ += offset;
-  char * nxt=(char *) ((((size_t) buffer_)/buflen +1)*buflen);
-  char * prev=nxt-buflen;
-  size_t pos=buffer_-prev;
-  for (int i=0;i<buflen;++i)
-    buf64k[i]=0xff;
-  memcpy(buf64k,prev,pos);
-  char * buffer=buf64k+pos; // point to header
-  // fill with 0
-  for (int i=0;i<512;++i)
-    buffer[i]=0;
-  tar_writestring(buffer,filename,0,100); // filename
-  tar_writestring(buffer,leftpad(toString8(datasize),11)+" ",124,12);  // filesize
-  tar_writestring(buffer,"0",156,1); // file type
-  tar_fillheader(buffer,0,exec);
-  // add data
-  buffer += 512;
-  pos += 512;
-  size_t length=datasize;
-  if (length>buflen-pos)
-    length=buflen-pos;
-  memcpy(buffer,data,length);
-  buffer += length;
-  for (;(size_t) buffer % 512;++buffer)
-    *buffer=0;
-  erase_sector(prev);
-  WriteMemory(prev,buf64k,buflen);
-  datasize -= length;
-  data += length;
-  prev += buflen;
-  while (datasize>0){
-    // copy remaining data
-    length=datasize<buflen?datasize:buflen;
-    memcpy(buf64k,data,length);
-    for (int i=length;i<buflen;++i)
-      buf64k[i]=0xff;
-    erase_sector(prev);
-    WriteMemory(prev,buf64k,buflen);
-    datasize -= length;
-  }
-  return 1;
-}
-
-// RAM version
-int tar_adddata(char * & buffer,size_t * buffersizeptr,const char * filename,const char * data,size_t datasize,int exec){
-  size_t buffersize=buffersizeptr?*buffersizeptr:0;
-  vector<fileinfo_t> finfo=tar_fileinfo(buffer,buffersize);
-  size_t s=finfo.size();
-  if (s==0) return 0;
-  fileinfo_t last=finfo[s-1];
-  size_t offset=last.header_offset;
-  offset += tar_filesize(last.size);
-  buffersize=offset;
-  size_t newsize=offset+1024+datasize;
-  newsize=10240*((newsize+10239)/10240);
-  if (newsize>numworks_maxtarsize) return 0;
-  // console.log(buffer.byteLength,newsize);
-  // resize buffer
-  if (buffersize<newsize){
-    char * newbuf=(char *)malloc(newsize);
-    // char * newbuf=new char[newsize];
-    memcpy(newbuf,buffer,buffersize);
-    // delete [] buffer;
-    free(buffer);
-    buffersize=newsize;
-    if (buffersizeptr) *buffersizeptr=buffersize;
-    buffer=newbuf;
-  }
-  // console.log(buffer.byteLength,newsize);
-  // fill header with 0
-  for (int i=0;i<1024;++i)
-    buffer[offset+i]=0;
-  tar_writestring(buffer,filename,offset,100); // filename
-  tar_writestring(buffer,leftpad(toString8(datasize),11)+" ",offset+124,12);  // filesize
-  tar_writestring(buffer,"0",offset+156,1); // file type
-  tar_fillheader(buffer,offset,exec);
-  // copy data 
-  for (size_t i=0;i<datasize;++i)
-    buffer[offset+512+i]=data[i];
-  return 1;
-}
-
-// flash version
-int flash_addfile(const char * buffer,const char * filename){
-#if defined NUMWORKS  && defined DEVICE
-  size_t len;
-  const char * ch=extapp_fileRead(filename,&len,1); // read file in ram
-  return flash_adddata(buffer,filename,ch,len,0); // copy in flash
-#else
-  vector<char> data;
-  FILE * f = fopen(filename,"rb");
-  while (1){
-    char ch=fgetc(f);
-    if (feof(f))
-      break;
-    data.push_back(ch);
-  }
-  fclose(f);
-  int exec=1;
-  for (int i=0;filename[i];++i){
-    if (filename[i]=='.')
-      exec=0;
-  }
-  string fname=filename;
-  for (int i=0;filename[i];++i){
-    if (filename[i]=='/')
-      fname=filename+i+1;
-  }
-  return flash_adddata(buffer,fname.c_str(),&data.front(),data.size(),exec);
-#endif
-}
-
-// RAM version
-int tar_addfile(char * & buffer,const char * filename,size_t * buffersizeptr){
-  FILE * f = fopen(filename,"rb");
-  vector<char> data;
-  while (1){
-    char ch=fgetc(f);
-    if (feof(f))
-      break;
-    data.push_back(ch);
-  }
-  fclose(f);
-  int exec=1;
-  for (int i=0;filename[i];++i){
-    if (filename[i]=='.')
-      exec=0;
-  }
-  string fname=giac::remove_path(filename);
-  return tar_adddata(buffer,buffersizeptr,fname.c_str(),&data.front(),data.size(),exec);
-}
-
-int tar_savefile(char * buffer,const char * filename){
-  vector<fileinfo_t> finfo=tar_fileinfo(buffer,0);
-  int s=finfo.size();
-  if (s==0) return 0;
-  fileinfo_t info;
-  for (int i=0;i<s;++i){
-    info=finfo[i];
-    if (info.filename==filename)
-      break;
-  }
-  if (info.filename!=filename) return 0;
-  size_t target=info.header_offset+512;
-  size_t size=info.size;
-  FILE * f=fopen(filename,"wb");
-  if (!f) return 0;
-  fwrite(buffer+target,size,1,f);
-  fclose(f);
-  return 1;
-}
-
-#if 0
-// flash version
-// mark_only==1 mark for erase, ==2 undelete
-// use mark_only==0 if and only if you need some space in flash
-// otherwise it's safer to empty the trash from a PC
-int flash_removefile(const char * buffer,const char * filename,size_t * tar_first_modif_offsetptr,int mark_only){
-  vector<fileinfo_t> finfo=tar_fileinfo(buffer,0);
-  int s=finfo.size();
-  if (s==0) return 0;
-  fileinfo_t info;
-  for (int i=0;i<s;++i){
-    info=finfo[i];
-    if (info.filename==filename)
-      break;
-  }
-  if (info.filename!=filename) return 0;
-  // new code, mark file as non readable
-  size_t target=info.header_offset;
-  if (tar_first_modif_offsetptr && target<*tar_first_modif_offsetptr)
-    *tar_first_modif_offsetptr=target;
-  // mark the file as non readable
-  if (mark_only){
-    char headbuf[512];
-    memcpy(headbuf,buffer+target,512);
-    if (mark_only==1)
-      headbuf[104] = '0'+((headbuf[104]-'0') &3);
-    else
-      headbuf[104] = '0'+((headbuf[104]-'0') |4);
-    tar_writechecksum(headbuf,0);
-    // recompute chksum
-    write_memory((char *)buffer+target,headbuf,512);
-    return 1;
-  }
-  // really erase, move info.header_offset+info.size+512 to info.header_offset
-  size_t src=target+tar_filesize(info.size);
-  fileinfo_t infoend=finfo[s-1];
-  size_t end=infoend.header_offset+tar_filesize(infoend.size);
-  write_memory((char *)buffer+target,buffer+src,end-src);
-  // clear space after new end
-  // for (;target<end;++target)  buffer[target]=0;
-  return 1;
-}
-#endif
-
-const char * tar_loadfile(const char * buffer,const char * filename,size_t * len){
-  vector<fileinfo_t> finfo=tar_fileinfo(buffer,0);
-  int s=finfo.size();
-  for (int i=0;i<s;++i){
-    const fileinfo_t & f=finfo[i];
-    if (f.filename==filename){
-      if (len)
-	*len=f.size;
-      return buffer+f.header_offset+512;
-    }
-  }
-  return 0;
-}
-
-bool match(const char * filename,const char * extension){
-  if (!extension)
-    return true;
-  int el=strlen(extension);
-  int fl=strlen(filename);
-  if (el>=fl) return false;
-  int i=fl-el,j=0;
-  for (;j<el;++i,++j){
-    if (filename[i]!=extension[j])
-      return false;
-  }
-  return true;
-}
-
-int tar_filebrowser(const char * buf,const char ** filenames,int maxrecords,const char * extension){
-  vector<fileinfo_t> finfo=tar_fileinfo(buf,0);
-  int s=finfo.size();
-  if (s==0) return 0;
-  int j=0;
-  for (int i=0;i<s;++i){
-    const fileinfo_t & f=finfo[i];
-    if (match(f.filename.c_str(),extension)){
-      filenames[j]=f.filename.c_str();
-      ++j;
-      if (j==maxrecords)
-	return j;
-    }
-  }
-  return j;
-}
-
-// RAM version
-int tar_removefile(char * buffer,const char * filename,size_t * tar_first_modif_offsetptr){
-  vector<fileinfo_t> finfo=tar_fileinfo(buffer,0);
-  int s=finfo.size();
-  if (s==0) return 0;
-  fileinfo_t info;
-  for (int i=0;i<s;++i){
-    info=finfo[i];
-    if (info.filename==filename)
-      break;
-  }
-  if (info.filename!=filename) return 0;
-  // move info.header_offset+info.size+512 to info.header_offset
-  size_t target=info.header_offset;
-  if (tar_first_modif_offsetptr && target<*tar_first_modif_offsetptr)
-    *tar_first_modif_offsetptr=target;
-  size_t src=target+tar_filesize(info.size);
-  fileinfo_t infoend=finfo[s-1];
-  size_t end=infoend.header_offset+tar_filesize(infoend.size);
-  // memcpy would be faster, but I'm unsure it is safe here
-  for (;src<end;++src,++target) 
-    buffer[target]=buffer[src];
-  for (;target<end;++target) // clear space after new end
-    buffer[target]=0;
-  return 1;
-}
-
-bool tar_nxt_readable(const vector<fileinfo_t> & finfo,int cur,fileinfo_t & f){
-  int s=finfo.size();
-  for (int i=cur;i<s;++i){
-    f=finfo[i];
-    int droit=f.mode/100 ;
-    if ( (droit & 4)==4)
-      return true;
-  }
-  return false;
-}
-
-bool same_offset_size (const fileinfo_t & a,const fileinfo_t &b){
-  return a.header_offset==b.header_offset && a.size==b.size;
-}
-
-int flash_synchronize(const char * buffer,const vector<fileinfo_t> & finfo,size_t * tar_first_modif_offsetptr){
-  vector<fileinfo_t> oinfo=tar_fileinfo(buffer,0);
-  int s=finfo.size();
-  if (oinfo.size()!=finfo.size())
-    return 0;
-  for (int i=0;i<s;++i){
-    fileinfo_t f=finfo[i],o=oinfo[i];
-    if (!same_offset_size(f,o))
-      return 0;
-    if (f.mode==o.mode && f.filename==o.filename)
-      continue;
-    if (tar_first_modif_offsetptr && *tar_first_modif_offsetptr>f.header_offset)
-      *tar_first_modif_offsetptr=f.header_offset;
-    // copy current sector 
-    size_t sector_begin=(f.header_offset/buflen)*buflen,sector_end=sector_begin+buflen;
-    memcpy(buf64k,buffer+sector_begin,buflen);
-    // modify all records in this sector
-    for (;i<s;++i){
-      f=finfo[i];
-      size_t sector_pos=f.header_offset-sector_begin;
-      if (sector_pos>=buflen){
-	break;
-      }
-      char * headbuf=buf64k+sector_pos;
-      strcpy(headbuf,f.filename.c_str());
-      if ( (f.mode/100 & 4) ==0)
-	headbuf[104] = '0'+((headbuf[104]-'0') &3);
-      else
-	headbuf[104] = '0'+((headbuf[104]-'0') |4);
-      tar_writechecksum(headbuf,0);
-    }
-    erase_sector(buffer+sector_begin);
-    WriteMemory((char *)buffer+sector_begin,buf64k,buflen);
-  } 
-  return 1;
-}
-
-int flash_emptytrash(const char * buffer,const vector<fileinfo_t> & finfo,size_t * tar_first_modif_offsetptr){
-  size_t flash_end=0x90800000LL-buflen,flash_begin=0x90200000LL;
-  int s=finfo.size();
-  if (s==0) return 0;
-  // find 1st offset marked non readable
-  int i; // record position
-  fileinfo_t f,fnxt;
-  for (i=0;i<s;++i){
-    f=finfo[i];
-    int droit=f.mode/100 ;
-    if ( (droit & 4)==0){
-      break;
-    }
-  }
-  if (i==s) return 0;
-  // if (!tar_nxt_readable(finfo,i,fnxt)) return 0;
-  if (tar_first_modif_offsetptr && *tar_first_modif_offsetptr>f.header_offset)
-    *tar_first_modif_offsetptr=f.header_offset;
-  // find current sector
-  size_t sector_begin=(f.header_offset/buflen)*buflen,sector_end=sector_begin+buflen;
-  memcpy(buf64k,buffer+sector_begin,buflen);
-  size_t sector_pos=f.header_offset-sector_begin; // in [0,buflen[
-  int nwrite=0;
-  for (;i<s;++nwrite){
-    // buf64k[0..sector_pos[ is ok
-    int nxti=i;
-    for (++nxti;nxti<s;++nxti){
-      fnxt=finfo[nxti];
-      int droit=fnxt.mode /100;
-      if ( (droit & 4)==4){
-	break;
-      }
-    }
-    if (nxti==s) break;
-    size_t src=fnxt.header_offset;
-    // find nxt offset marked as non readable
-    for (++nxti;nxti<s;++nxti){
-      f=finfo[nxti];
-      int droit=f.mode /100;
-      if ( (droit & 4)==0){
-	break;
-      }
-    }
-    size_t length = f.header_offset-src; 
-    if (nxti==s)
-      length += tar_filesize(f.size);
-    // total number of bytes to be copied 
-    while (length>0){
-      size_t nbytes=length;
-      if (length>buflen-sector_pos)
-	nbytes=buflen-sector_pos;
-      memcpy(buf64k+sector_pos,buffer+src,nbytes);
-      sector_pos += nbytes;
-      for (int j=sector_pos;j<buflen;++j)
-	buf64k[j]=0xff;
-      src += nbytes;
-      length -= nbytes; 
-      if (sector_pos==buflen){
-	// erase sector, transfert buf64k, copy next sector in buf64k
-	erase_sector((char *)buffer+sector_begin);
-	WriteMemory((char *)buffer+sector_begin,buf64k,buflen);
-	sector_begin += buflen;
-	if (sector_begin>flash_end-flash_begin)
-	  return 1;
-	sector_end += buflen;
-	sector_pos = 0;
-	memcpy(buf64k,buffer+sector_begin,buflen);
-      }
-    }
-    i=nxti;
-  }
-  if (sector_pos>0){
-    erase_sector((char *)buffer+sector_begin);
-    for (int j=sector_pos;j<buflen;++j)
-      buf64k[j]=0xff;
-    WriteMemory((char *)buffer+sector_begin,buf64k,buflen);
-  }
-  return nwrite;
-}
-
-int flash_emptytrash(const char * buffer,size_t * tar_first_modif_offsetptr){
-  vector<fileinfo_t> finfo=tar_fileinfo(buffer,0);
-  return flash_emptytrash(buffer,finfo,tar_first_modif_offsetptr);
-}
-
-char * file_gettar(const char * filename){
-  FILE * f=fopen(filename,"rb");
-  if (!f) return 0;
-  vector<char> res;
-  while (1){
-    char ch=fgetc(f);
-    if (feof(f))
-      break;
-    res.push_back(ch);
-  }
-  fclose(f);
-  size_t size=res.size();
-  size_t bufsize=65536*((size+65535)/65536);
-  char * buffer=(char *)malloc(bufsize);
-  memcpy(buffer,&res.front(),size);
-  return buffer;
-}
-
-char * file_gettar_aligned(const char * filename,char * & freeptr){
-  size_t size=numworks_maxtarsize;
-  size_t bufsize=buflen*((size+(buflen-1))/buflen);
-  char * buffer=(char *)malloc(bufsize+2*buflen);
-  freeptr=buffer;
-  // align buffer
-  buffer=(char *) ((((size_t) buffer)/buflen +1)*buflen);
-  FILE * f=fopen(filename,"rb");
-  if (!f){
-    for (size_t i=0;i<size;++i)
-      buffer[i]=0;
-    return buffer;
-  }
-  vector<char> res;
-  while (1){
-    char ch=fgetc(f);
-    if (feof(f))
-      break;
-    res.push_back(ch);
-  }
-  fclose(f);
-  size=res.size();
-  if (size<numworks_maxtarsize)
-    size=numworks_maxtarsize;
-  memcpy(buffer,&res.front(),size);
-  return buffer;
-}
-
-
-int file_savetar(const char * filename,char * buffer,size_t buffersize){
-  size_t l=tar_totalsize(buffer,buffersize);
-  if (l==0) return 0;
-  FILE * f=fopen(filename,"wb");
-  if (!f) return 0;
-  fwrite(buffer,l,1,f);
-  char buf[1024];
-  for (int i=0;i<1024;++i)
-    buf[i]=0;
-  fwrite(buf,1024,1,f);
-  fclose(f);
-  return 1;
-}
-#if !defined KHICAS && !defined USE_GMP_REPLACEMENTS && !defined GIAC_HAS_STO_38// 
-
-#ifdef HAVE_LIBDFU
-extern "C" { 
-#include "dfu_lib.h"
-}
-#endif
-
-// Numworks calculator
-int dfu_exec(const char * s_){
-  CERR << s_ << "\n";
-#if 0 // def HAVE_LIBDFU
-  std::istringstream ss(s_);
-  std::string arg;
-  std::vector<std::string> ls;
-  std::vector<char*> v;
-  while (ss >> arg)
-    {
-      ls.push_back(arg); 
-      v.push_back(const_cast<char*>(ls.back().c_str()));
-    }
-  v.push_back(0);  // need terminating null pointer
-  int res=dfu_main(v.size()-1,&v[0]);
-  return res;
-#else
-#ifdef WIN32 
-  string s(s_);
-#ifdef __MINGW_H
-  if (giac::is_file_available("c:\\xcaswin\\dfu-util.exe"))
-    s="c:\\xcaswin\\"+s;
-  // otherwise dfu-util should be in the path
-#else
-  if (giac::is_file_available("/cygdrive/c/xcas64/dfu-util.exe"))
-    s="/cygdrive/c/xcas64/"+s;
-  else
-    s="./"+s;
-#endif
-  return system(s.c_str());
-#else // WIN32
-#ifdef __APPLE__
-  string s(s_);
-  s="/Applications/usr/bin/"+s;
-  if (giac::is_file_available(s.c_str()))
-    return giac::system_no_deprecation(s.c_str());
-  s=s_; s="/usr/bin/"+s;
-  return giac::system_no_deprecation(s.c_str());
-#else
-  return system(s_);
-#endif
-#endif // WIN32
-#endif 
-}
-
-bool dfu_get_scriptstore_addr(size_t & start,size_t & taille){
-  unlink("__platf");
-  if (dfu_exec("dfu-util -i0 -a0 -s 0x90000000:0x20 -U __platf"))
-    return false;
-  FILE * f=fopen("__platf","r");
-  if (!f){ return false; }
-  unsigned char r[32];
-  int i=fread(r,1,32,f);
-  fclose(f);
-  unlink("__platf");  
-  // check for f0 0d c0 de at offset 8, 9, a, b
-  bool externalinfo=r[8]==0xf0 && r[9]==0x0d && r[10]==0xc0 && r[11]==0xde;
-  if (externalinfo){
-    if (dfu_exec("dfu-util -i0 -a0 -s 0x90010000:0x20 -U __platf"))
-      return false;
-  }
-  else {
-    if (dfu_exec("dfu-util -i0 -a0 -s 0x080001c4:0x20 -U __platf"))
-      return false;
-  }
-  f=fopen("__platf","r");
-  if (!f){ return false; }
-  i=fread(r,1,32,f);
-  if (externalinfo){
-    start=((r[15]*256U+r[14])*256+r[13])*256+r[12];
-    taille=((r[19]*256U+r[18])*256+r[17])*256+r[16];
-  }
-  else {
-    start=((r[23]*256U+r[22])*256+r[21])*256+r[20];
-    taille=((r[27]*256U+r[26])*256+r[25])*256+r[24];
-  }
-  // taille=(taille/32768)*32768; // do not care of end of scriptstore
-  fclose(f);
-  return i==32;
-}
-
-bool dfu_get_scriptstore(const char * fname){
-  unlink(fname);
-  size_t start,taille;
-  if (!dfu_get_scriptstore_addr(start,taille)) return false;
-  string s="dfu-util -U "+string(fname)+" -i0 -a0 -s "+ giac::print_INT_(start)+":"+giac::print_INT_(taille)+":force";
-  return !dfu_exec(s.c_str());
-}
-
-bool dfu_send_scriptstore(const char * fname){
-  size_t start,taille;
-  if (!dfu_get_scriptstore_addr(start,taille)) return false;
-  string s="dfu-util -D "+string(fname)+" -i0 -a0 -s "+ giac::print_INT_(start)+":"+giac::print_INT_(taille)+":force";
-  return !dfu_exec(s.c_str());
-} 
-
-bool dfu_send_rescue(const char * fname){
-  string s=string("dfu-util -i0 -a0 -s 0x20030000:force:leave -D ")+ fname;
-  return !dfu_exec(s.c_str());
-}
-
-bool dfu_send_firmware(const char * fname){
-  string s=string("dfu-util -i0 -a0 -D ")+ fname;
-  return !dfu_exec(s.c_str());
-}
-
-bool dfu_send_apps(const char * fname){
-  string s=string("dfu-util -i 0 -a 0 -s 0x90200000 -D ")+ fname;
-  return !dfu_exec(s.c_str());
-}
-
-bool dfu_get_epsilon_internal(const char * fname){
-  unlink(fname);
-  string s=string("dfu-util -i 0 -a 0 -s 0x08000000:0x8000 -U ")+ fname;
-  return !dfu_exec(s.c_str());
-}
-
-bool dfu_get_epsilon(const char * fname){
-  unlink(fname);
-  string s=string("dfu-util -i 0 -a 0 -s 0x90000000:0x120000 -U ")+ fname;
-  return !dfu_exec(s.c_str());
-}
-
-// check that we can really read/write on the Numworks at 0x90120000
-// and get the same
-bool dfu_check_epsilon2(const char * fname){
-  FILE * f=fopen(fname,"wb");
-  int n=0xe0000;
-  char * ptr=(char *) malloc(n);
-  srand(time(NULL));
-  int i;
-  for (i=0;i<n;++i){
-    int j=(rand()/(1.0+RAND_MAX))*n;
-    ptr[j]=rand();
-  }
-  for (i=0;i<n;++i){
-    fputc(ptr[i],f);
-  }
-  fclose(f);
-  // write to the device something that can not be guessed 
-  // without really storing to flash
-  string s=string("dfu-util -i 0 -a 0 -s 0x90120000:0xe0000 -D ")+ fname;
-  if (dfu_exec(s.c_str()))
-    return false;
-  // retrieve it and compare
-  unlink(fname);
-  s=string("dfu-util -i 0 -a 0 -s 0x90120000:0xe0000 -U ")+ fname;
-  if (dfu_exec(s.c_str()))
-    return false;
-  f=fopen(fname,"r");
-  for (i=0;i<n;++i){
-    char ch=fgetc(f);
-    if (ch!=ptr[i])
-      break;
-  }
-  fclose(f);
-  return i==n;
-}
-
-// check that we can really read/write on the Numworks at 0x90740000
-// and get the same
-bool dfu_check_apps2(const char * fname){
-  FILE * f=fopen(fname,"wb");
-  int n=0xa0000;
-  char * ptr=(char *) malloc(n);
-  srand(time(NULL));
-  int i;
-  for (i=0;i<n;++i){
-    int j=(rand()/(1.0+RAND_MAX))*n;
-    ptr[j]=rand();
-  }
-  for (i=0;i<n;++i){
-    fputc(ptr[i],f);
-  }
-  fclose(f);
-  // write to the device something that can not be guessed 
-  // without really storing to flash
-  string s=string("dfu-util -i 0 -a 0 -s 0x90740000:0xa0000 -D ")+ fname;
-  if (dfu_exec(s.c_str()))
-    return false;
-  // retrieve it and compare
-  unlink(fname);
-  s=string("dfu-util -i 0 -a 0 -s 0x90740000:0xa0000 -U ")+ fname;
-  if (dfu_exec(s.c_str()))
-    return false;
-  f=fopen(fname,"r");
-  for (i=0;i<n;++i){
-    char ch=fgetc(f);
-    if (ch!=ptr[i])
-      break;
-  }
-  fclose(f);
-  return i==n;
-}
-
-bool dfu_get_apps(const char * fname){
-  unlink(fname);
-  string s=string("dfu-util -i 0 -a 0 -s 0x90200000:0x600000 -U ")+ fname;
-  return !dfu_exec(s.c_str());
-}
-
-char * numworks_gettar(size_t & tar_first_modif_offset){
-  if (!dfu_get_apps("__apps"))
-    return 0;
-  FILE * f=fopen("__apps","rb");
-  if (!f) return 0;
-  char * buffer=(char *)malloc(numworks_maxtarsize);
-  fread(buffer,numworks_maxtarsize,1,f);
-  fclose(f);
-  tar_first_modif_offset=tar_totalsize(buffer,numworks_maxtarsize);
-  return buffer;
-}
-
-bool dfu_update_khicas(const char * fname){
-  FILE * f=fopen(fname,"rb");
-  if (!f) return 0;
-  char * buffer=(char *)malloc(numworks_maxtarsize);
-  fread(buffer,numworks_maxtarsize,1,f);
-  fclose(f);
-  size_t pos=0;
-  char * oldbuffer=numworks_gettar(pos);
-  if (!oldbuffer){
-    free(buffer);
-    return false;
-  }
-  vector<fileinfo_t> oldv=tar_fileinfo(oldbuffer,0),v=tar_fileinfo(buffer,0);
-  // add files from oldbuffer that are not in buffer
-  for (int i=0;i<oldv.size();++i){
-    const fileinfo_t & cur=oldv[i];
-    string s=cur.filename; int j;
-    for (j=0;j<v.size();++j){
-      if (v[j].filename==s)
-	break;
-    }
-    if (j<v.size()) 
-      continue; // file is in buffer
-    int res=tar_adddata(buffer,0,s.c_str(),oldbuffer+cur.header_offset+512,cur.size,0); // exec can not be translated
-  }
-  file_savetar("__apps",buffer,0);
-  //return true;
-  return dfu_send_apps("__apps");
-}
-
-bool numworks_sendtar(char * buffer,size_t buffersize,size_t tar_first_modif_offset){
-  vector<fileinfo_t> v=tar_fileinfo(buffer,buffersize);
-  if (v.empty())
-    return false;
-  fileinfo_t info=v[v.size()-1];
-  size_t end=info.header_offset+tar_filesize(info.size)+1024;
-  if (end>numworks_maxtarsize || end<=tar_first_modif_offset) return false;
-  for (size_t i=end-1024;i<end;++i)
-    buffer[i]=0;
-  FILE * f =fopen("__apps","wb");
-  if (!f)
-    return false;
-  size_t start=(tar_first_modif_offset/65536)*65536;
-  fwrite(buffer+start,end-start,1,f);
-  fclose(f);
-  longlong ll=0x90200000LL+start;
-  string s=string("dfu-util -i 0 -a 0 -s ")+giac::gen(ll).print(giac::context0)+" -D __apps" ;
-  return !dfu_exec(s.c_str());
-}
-
-#endif 
-
-#ifndef NO_NAMESPACE_GIAC
-namespace giac {
-#endif // ndef NO_NAMESPACE_GIAC
-
-  
-  // buf:=tar "file.tar" -> init
-  // tar(buf) -> list files
-  // tar(buf,0,"filename") -> remove filename
-  // tar(buf,1,"filename") -> add filename
-  // tar(buf,2,"filename") -> save filename
-  // tar(buf,"file.tar") -> write tar
-  // purge(buf) -> free buffer
-  gen _tar(const gen & g_,GIAC_CONTEXT){
-    gen g(eval(g_,eval_level(contextptr),contextptr));
-    if (g.type==_STRNG){
-      char * buf=file_gettar(g._STRNGptr->c_str());
-      if (!buf) return 0;
-      tar_first_modified_offset=0;
-      return gen((void *)buf,_BUFFER_POINTER);
-    }
-    if (g.type==_POINTER_ && g.subtype==_BUFFER_POINTER){
-      char * buf= (char *) g._POINTER_val;
-      if (!buf) return 0;
-      vector<fileinfo_t> v=tar_fileinfo(buf,0);
-      vecteur res1,res2,res3,res4;
-      for (int i=0;i<v.size();++i){
-	res1.push_back(string2gen(v[i].filename,false));
-	res2.push_back(v[i].size);
-	res3.push_back(v[i].header_offset);
-	res4.push_back(v[i].mode);
-      }
-      return makevecteur(res1,res2,res3,res4);
-    }
-#if !defined KHICAS && !defined USE_GMP_REPLACEMENTS && !defined GIAC_HAS_STO_38
-    if (g.type==_INT_){
-      if (g.val==1){
-	char * buf= numworks_gettar(tar_first_modified_offset);
-	if (!buf) return 0;
-	return gen((void *)buf,_BUFFER_POINTER);
-      }
-    }
-#endif
-    if (g.type==_VECT){
-      vecteur & v=*g._VECTptr; 
-      int s=v.size();
-      if (s>=2 && v.front().type==_POINTER_){
-	char * buf= (char *) v[0]._POINTER_val;
-	if (!buf) return 0;
-	if (s==2 && v[1].type==_STRNG)
-	  return file_savetar(v[1]._STRNGptr->c_str(),buf,0);
-#if !defined KHICAS && !defined USE_GMP_REPLACEMENTS && !defined GIAC_HAS_STO_38
-	if (s==2 && v[1].type==_INT_){
-	  if (v[1].val==1)
-	    return numworks_sendtar(buf,0,tar_first_modified_offset);
-	}
-#endif
-	if (s==3 && v[1].type==_INT_ && v[2].type==_STRNG){
-	  int val=v[1].val;
-	  if (val==0)
-	    return tar_removefile(buf,v[2]._STRNGptr->c_str(),0);
-	  if (val==1 && tar_addfile(buf,v[2]._STRNGptr->c_str(),0)){
-	    gen res=gen((void *)buf,_BUFFER_POINTER);
-	    if (g_.type==_VECT && !g_._VECTptr->empty())
-	      return sto(res,g_._VECTptr->front(),contextptr);
-	    return res;
-	  }
-	  if (val==2)
-	    return tar_savefile(buf,v[2]._STRNGptr->c_str());
-	}
-      }
-    }
-    return gensizeerr(contextptr);
-  }
-  static const char _tar_s []="tar";
-  static define_unary_function_eval_quoted (__tar,&_tar,_tar_s);
-  define_unary_function_ptr5( at_tar ,alias_at_tar,&__tar,_QUOTE_ARGUMENTS,true);
-
-  std::string dos2unix(const std::string & src){
-    std::string unixsrc; // convert newlines to Unix
-    for (int i=0;i+1<src.size();++i){
-      if (src[i]==13 && src[i+1]==10)
-	continue;
-      unixsrc+= src[i];
-    }
-    return unixsrc;
-  }
-
-  gen tabunsignedchar2gen(const unsigned char tab[],int len){
-    gen res=0;
-    for (int i=0;i<len;++i){
-      res=256*res;
-      res+=tab[i];
-    }
-    return res;
-  }
-  
-
-#if !defined KHICAS && !defined USE_GMP_REPLACEMENTS && !defined GIAC_HAS_STO_38
-  bool scriptstore2map(const char * fname,nws_map & m){
-    FILE * f=fopen(fname,"r");
-    if (!f)
-      return false;
-    unsigned char buf[nwstoresize1];
-    fread(buf,1,nwstoresize1,f);
-    fclose(f);
-    unsigned char * ptr=buf;
-    // Numworks script store archive
-    // record format: length on 2 bytes
-    // if not zero length
-    // record name 
-    // 00
-    // type 
-    // record data
-    int pos=4; ptr+=4;
-    for (;pos<nwstoresize1;){
-      size_t L=ptr[1]*256+ptr[0]; 
-      ptr+=2; pos+=2;
-      if (L==0) break;
-      L-=2;
-#ifdef VISUALC
-      char buf_[65536];
-#else
-      char buf_[L+1];
-#endif
-      memcpy(buf_,(const char *)ptr,L); ptr+=L; pos+=L;
-      string name(buf_);
-      const char * buf_mode=buf_+name.size()+2;
-      nwsrec r;
-      r.type=buf_mode[-1];
-      r.data.resize(L-name.size()-3);
-      memcpy(&r.data[0],buf_mode,r.data.size());
-      m[name]=r;
-    }
-    if (pos>=nwstoresize1)
-      return false;
-    return true;
-  }
-
-  bool map2scriptstore(const nws_map & m,const char * fname){
-    unsigned char buf[nwstoresize1];
-    for (int i=0;i<nwstoresize1;++i)
-      buf[i]=0;
-    unsigned char * ptr=buf;
-    *(unsigned *) ptr= 0xee0bddba;
-    ptr += 4;
-    nws_map::const_iterator it=m.begin(),itend=m.end();
-    int total=0;
-    for (;it!=itend;++it){
-      const string & s=it->first;
-      unsigned l1=s.size();
-      unsigned l2=it->second.data.size();
-      short unsigned L=2+l1+1+1+l2+1;
-      total += L;
-      if (total>=nwstoresize1)
-	return false;
-      *ptr=L % 256; ++ptr; *ptr=L/256; ++ptr;
-      memcpy(ptr,s.c_str(),l1+1); ptr += l1+1;
-      *ptr=it->second.type; ++ptr;
-      memcpy(ptr,&it->second.data[0],l2); ptr+=l2;
-      *ptr=0; ++ptr; 
-    }
-    FILE * f=fopen(fname,"wb");
-    if (!f)
-      return false;
-    fwrite(buf,1,nwstoresize1,f);
-    fclose(f);
-    return true;
-  }
-#endif
-
-  
-#if !defined USE_GMP_REPLACEMENTS && !defined GIAC_HAS_STO_38
-
-  /*********************************************************************
-   * Filename:   sha256.c/.h
-   * Author:     Brad Conte (brad AT bradconte.com)
-   * Copyright:
-   * Disclaimer: This code is presented "as is" without any guarantees.
-   * Details:    Implementation of the SHA-256 hashing algorithm.
-              SHA-256 is one of the three algorithms in the SHA2
-              specification. The others, SHA-384 and SHA-512, are not
-              offered in this implementation.
-              Algorithm specification can be found here:
-	      * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
-              This implementation uses little endian byte order.
-  *********************************************************************/
-#define SHA256_BLOCK_SIZE 32            // SHA256 outputs a 32 byte digest
-
-  /**************************** DATA TYPES ****************************/
-  typedef unsigned char BYTE;             // 8-bit byte
-  typedef unsigned int  WORD;             // 32-bit word, change to "long" for 16-bit machines
-    
-  typedef struct {
-    BYTE data[64];
-    WORD datalen;
-    unsigned long long bitlen;
-    WORD state[8];
-  } SHA256_CTX;
-  
-  
-  /****************************** MACROS ******************************/
-#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
-#define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b))))
-
-#define CH(x,y,z) (((x) & (y)) ^ (~(x) & (z)))
-#define MAJ(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-#define EP0(x) (ROTRIGHT(x,2) ^ ROTRIGHT(x,13) ^ ROTRIGHT(x,22))
-#define EP1(x) (ROTRIGHT(x,6) ^ ROTRIGHT(x,11) ^ ROTRIGHT(x,25))
-#define SIG0(x) (ROTRIGHT(x,7) ^ ROTRIGHT(x,18) ^ ((x) >> 3))
-#define SIG1(x) (ROTRIGHT(x,17) ^ ROTRIGHT(x,19) ^ ((x) >> 10))
-
-  /**************************** VARIABLES *****************************/
-  static const WORD k[64] = {
-    0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5,
-    0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174,
-    0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da,
-    0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7,0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967,
-    0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13,0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85,
-    0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3,0xd192e819,0xd6990624,0xf40e3585,0x106aa070,
-    0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5,0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3,
-    0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-  };
-
-  /*********************** FUNCTION DEFINITIONS ***********************/
-  void giac_sha256_transform(SHA256_CTX *ctx, const BYTE data[])
-  {
-    WORD a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
-
-    for (i = 0, j = 0; i < 16; ++i, j += 4)
-      m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]);
-    for ( ; i < 64; ++i)
-      m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
-
-    a = ctx->state[0];
-    b = ctx->state[1];
-    c = ctx->state[2];
-    d = ctx->state[3];
-    e = ctx->state[4];
-    f = ctx->state[5];
-    g = ctx->state[6];
-    h = ctx->state[7];
-
-    for (i = 0; i < 64; ++i) {
-      t1 = h + EP1(e) + CH(e,f,g) + k[i] + m[i];
-      t2 = EP0(a) + MAJ(a,b,c);
-      h = g;
-      g = f;
-      f = e;
-      e = d + t1;
-      d = c;
-      c = b;
-      b = a;
-      a = t1 + t2;
-    }
-
-    ctx->state[0] += a;
-    ctx->state[1] += b;
-    ctx->state[2] += c;
-    ctx->state[3] += d;
-    ctx->state[4] += e;
-    ctx->state[5] += f;
-    ctx->state[6] += g;
-    ctx->state[7] += h;
-  }
-
-  void giac_sha256_init(SHA256_CTX *ctx)
-  {
-    ctx->datalen = 0;
-    ctx->bitlen = 0;
-    ctx->state[0] = 0x6a09e667;
-    ctx->state[1] = 0xbb67ae85;
-    ctx->state[2] = 0x3c6ef372;
-    ctx->state[3] = 0xa54ff53a;
-    ctx->state[4] = 0x510e527f;
-    ctx->state[5] = 0x9b05688c;
-    ctx->state[6] = 0x1f83d9ab;
-    ctx->state[7] = 0x5be0cd19;
-  }
-
-  void giac_sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len)
-  {
-    WORD i;
-
-    for (i = 0; i < len; ++i) {
-      ctx->data[ctx->datalen] = data[i];
-      ctx->datalen++;
-      if (ctx->datalen == 64) {
-	giac_sha256_transform(ctx, ctx->data);
-	ctx->bitlen += 512;
-	ctx->datalen = 0;
-      }
-    }
-  }
-
-  void giac_sha256_final(SHA256_CTX *ctx, BYTE hash[])
-  {
-    WORD i;
-
-    i = ctx->datalen;
-
-    // Pad whatever data is left in the buffer.
-    if (ctx->datalen < 56) {
-      ctx->data[i++] = 0x80;
-      while (i < 56)
-	ctx->data[i++] = 0x00;
-    }
-    else {
-      ctx->data[i++] = 0x80;
-      while (i < 64)
-	ctx->data[i++] = 0x00;
-      giac_sha256_transform(ctx, ctx->data);
-      memset(ctx->data, 0, 56);
-    }
-
-    // Append to the padding the total message's length in bits and transform.
-    ctx->bitlen += ctx->datalen * 8;
-    ctx->data[63] = ctx->bitlen;
-    ctx->data[62] = ctx->bitlen >> 8;
-    ctx->data[61] = ctx->bitlen >> 16;
-    ctx->data[60] = ctx->bitlen >> 24;
-    ctx->data[59] = ctx->bitlen >> 32;
-    ctx->data[58] = ctx->bitlen >> 40;
-    ctx->data[57] = ctx->bitlen >> 48;
-    ctx->data[56] = ctx->bitlen >> 56;
-    giac_sha256_transform(ctx, ctx->data);
-
-    // Since this implementation uses little endian byte ordering and SHA uses big endian,
-    // reverse all the bytes when copying the final state to the output hash.
-    for (i = 0; i < 4; ++i) {
-      hash[i]      = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
-      hash[i + 4]  = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
-      hash[i + 8]  = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
-      hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff;
-      hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff;
-      hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff;
-      hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0x000000ff;
-      hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0x000000ff;
-    }
-  }
-  /* END OF SHA256 */
-
-  
-#endif
-
-#if !defined KHICAS && !defined USE_GMP_REPLACEMENTS && !defined GIAC_HAS_STO_38
-  const unsigned char rsa_n_tab[]=
-    {
-      0xf2,0x0e,0xd4,0x9d,0x44,0x04,0xc4,0xc8,0x6a,0x5b,0xc6,0x9a,0xd6,0xdf,
-      0x9c,0xf5,0x56,0xf2,0x0d,0xad,0x6c,0x34,0xb4,0x48,0xf7,0xa7,0xa8,0x27,0xa0,
-      0xc8,0xbe,0x36,0xb1,0xc0,0x95,0xf8,0xc2,0x72,0xfb,0x78,0x0f,0x3f,0x15,0x22,
-      0xaf,0x51,0x96,0xe3,0xdc,0x39,0xb4,0xc6,0x40,0x6d,0x58,0x56,0x1f,0xad,0x55,
-      0x55,0x08,0xf1,0xde,0x5a,0xbc,0xd3,0xcc,0x16,0x3d,0x33,0xee,0x83,0x3f,0x32,
-      0xa7,0xa7,0xb8,0x95,0x2f,0x35,0xeb,0xf6,0x32,0x4d,0x22,0xd9,0x60,0xb7,0x5e,
-      0xbd,0xea,0xa5,0xcb,0x9c,0x69,0xeb,0xfd,0x9f,0x2b,0x5f,0x3d,0x38,0x5a,0xe1,
-      0x2b,0x63,0xf8,0x92,0x35,0x91,0xea,0x77,0x07,0xcc,0x4b,0x7a,0xbc,0xe0,0xa0,
-      0x8b,0x82,0x98,0xa2,0x87,0x10,0x2c,0xe2,0x23,0x53,0x2f,0x70,0x03,0xec,0x2d,
-      0x22,0x34,0x72,0x57,0x4d,0x24,0x2e,0x97,0xc9,0xfb,0x23,0xb0,0x05,0xff,0x87,
-      0x6e,0xbf,0x94,0x2d,0xf0,0x36,0xed,0xd7,0x9a,0xac,0x0c,0x21,0x94,0xa2,0x75,
-      0xfc,0x39,0x9b,0xba,0xf2,0xc6,0xc9,0x34,0xa0,0xb2,0x66,0x5a,0xcc,0xc9,0x5c,
-      0xc7,0xdb,0xce,0xfb,0x3a,0x10,0xee,0xc1,0x82,0x9a,0x43,0xef,0xed,0x87,0xbd,
-      0x6c,0xe4,0xc1,0x36,0xd0,0x0a,0x85,0x6e,0xca,0xcd,0x13,0x29,0x65,0xb5,0xd4,
-      0x13,0x4a,0x14,0xaa,0x65,0xac,0x0e,0x6f,0x19,0xb0,0x62,0x47,0x65,0x0e,0x40,
-      0x82,0x37,0xd6,0xf0,0x17,0x48,0xaa,0x8c,0x7b,0xc4,0x5e,0x4a,0x72,0x26,0xa6,
-      0x08,0x2e,0xff,0x2d,0x9d,0x0e,0x2e,0x19,0xe9,0x6a,0x4c,0x7c,0x3e,0xe9,0xbc,
-      0x78,0x95
-    };
-
-  int rsa_check(const char * sigfilename,int maxkeys,BYTE hash[][SHA256_BLOCK_SIZE],int * tailles,vector<string> & fnames){
-    gen rsa_n(tabunsignedchar2gen(rsa_n_tab,sizeof(rsa_n_tab)));
-    gen N=pow(gen(2),768),q;
-    // read by blocks of 2048 bits=256 bytes
-    FILE * f=fopen(sigfilename,"r");
-    if (!f)
-      return 0;
-    char firmwarename[256];
-    int i=0;
-    for (;i<maxkeys;++i){
-      gen key=0;
-      // skip firmware filename and size
-      fscanf(f,"%i %s",&tailles[i],firmwarename);
-      fnames.push_back(firmwarename);
-      // skip 0x prefix
-      for (;;){
-	unsigned char c=fgetc(f);
-	if (feof(f))
-	  break;
-	if (c=='\n' || c==' ' || c=='0')
-	  continue;
-	if (c=='x')
-	  break;
-	// invalid char
-	return 0;
-      }
-      if (feof(f)){
-	fclose(f);
-	return i;
-      }
-      for (int j=0;j<256;++j){
-	key = 256*key;
-	unsigned char c=fgetc(f);
-	if (feof(f)){
-	  fclose(f);
-	  if (j!=0){ return 0; }
-	  return i;
-	}
-	if (c==' ' || c=='\n')
-	  break;
-	if (c>='0' && c<='9')
-	  c=c-'0';
-	else {
-	  if (c>='a' && c<='f')
-	    c=10+c-'a';
-	  else {
-	    fclose(f);
-	    return 0;
-	  }
-	}
-	unsigned char d=fgetc(f);
-	if (feof(f)){
-	  fclose(f);
-	  return 0;
-	}
-	if (d==' ' || d=='\n'){
-	  key = key/16+int(c);
-	  break;
-	}
-	if (d>='0' && d<='9')
-	  d=d-'0';
-	else {
-	  if (d>='a' && d<='f')
-	    d=10+d-'a';
-	  else {
-	    fclose(f);
-	    return 0;
-	  }
-	}
-	key += int(c)*16+int(d);
-      }
-      // public key decrypt and keep only 768 low bits
-      key=powmod(key,65537,rsa_n);
-      key=irem(key,N,q); 
-      if (q!=12345){
-	fclose(f);
-	return 0;
-      }
-      // check that key is valid and write in hash[i]
-      for (int j=0;j<32;++j){
-	// divide 3 times by 256, remainder must be in '0'..'9'
-	int o=0;
-	int tab[]={1,10,100};
-	for (int k=0;k<3;++k){
-	  gen r=irem(key,256,q);
-	  key=q;
-	  if (r.type!=_INT_ || r.val>'9' || r.val<'0'){
-	    fclose(f);
-	    return 0;
-	  }
-	  o+=(r.val-'0')*tab[k];
-	}
-	if (o<0 || o>255){
-	  fclose(f);
-	  return 0;
-	}
-	if (i<maxkeys)
-	  hash[i][31-j]=o;
-      }
-    }
-    fclose(f);
-    return i;
-  }
-
-  const int MAXKEYS=64;
-  // Numworks firmwares signature file is in doc/shakeys
-  bool sha256_check(const char * sigfilename,const char * filename,const char *firmwarename){
-    BYTE hash[MAXKEYS][SHA256_BLOCK_SIZE];
-    int tailles[MAXKEYS];
-    vector<string> fnames;
-    int nkeys=rsa_check(sigfilename,MAXKEYS,hash,tailles,fnames);
-    if (nkeys==0) return false;
-    BYTE buf[SHA256_BLOCK_SIZE];
-    SHA256_CTX ctx;
-    string text;
-    FILE * f=fopen(filename,"rb");
-    if (!f)
-      return false;
-    int taille=0;
-    for (;;++taille){
-      unsigned char c=fgetc(f);
-      if (feof(f))
-	break;
-      text += c;
-    }
-    fclose(f);
-    unsigned char * ptr=(unsigned char *)text.c_str();
-    for (int i=0;i<nkeys;++i){
-      if (debug_infolevel)
-	CERR << i << " " << firmwarename << " " << taille << " " << fnames[i] << " " << tailles[i] << '\n';
-      if (firmwarename!=fnames[i] || taille<tailles[i])
-	continue;
-      // now try for all compatible sizes
-      // we do not know the firmware size, we extract 2M or 6M
-      // the part after the end is not known
-      giac_sha256_init(&ctx);
-      giac_sha256_update(&ctx, ptr, tailles[i]);
-      giac_sha256_final(&ctx, buf);
-      if (!memcmp(hash[i], buf, SHA256_BLOCK_SIZE))
-	return true;
-    }
-    return false;
-  }
-
-  bool nws_certify_firmware(bool withoverwrite,GIAC_CONTEXT){
-    string sig(giac::giac_aide_dir()+"shakeys");
-    if (!is_file_available(sig.c_str())){
-#ifdef __APPLE__
-      sig="/Applications/usr/share/giac/doc/shakeys";
-#else
-#ifdef WIN32
-#ifdef __MINGW_H
-      sig="c:\\xcaswin\\doc\\shakeys";
-#else
-      sig="/cygwin/c/xcas64/shakeys";
-#endif
-#else // WIN32
-      sig="/usr/share/giac/doc/shakeys";
-#endif // WIN32
-#endif // APPLE
-      if (!is_file_available(sig.c_str())){
-	sig="shakeys";
-	if (!is_file_available(sig.c_str())){
-	  *logptr(contextptr) << "Fichier de signature introuvable\n" ;
-	  return false;
-	}
-      }
-    }
-    char epsilon[]="epsilon__",apps[]="apps__";
-    *logptr(contextptr) << "Extraction du firmware interne epsilon\n" ;
-    if (!dfu_get_epsilon_internal(epsilon)) return false;
-    *logptr(contextptr) << "Verification de signature interne epsilon\n" ;
-    if (!sha256_check(sig.c_str(),epsilon,"delta.internal.bin")) return false;
-    *logptr(contextptr) << "Extraction du firmware externe epsilon\n" ;
-    if (!dfu_get_epsilon(epsilon)) return false;
-    *logptr(contextptr) << "Verification de signature externe epsilon\n" ;
-    if (!sha256_check(sig.c_str(),epsilon,"delta.external.bin")) return false;
-    *logptr(contextptr) << "Signature firmware conforme\nExtraction des applications\n" ;
-    if (!dfu_get_apps(apps)) return false;
-    *logptr(contextptr) << "Verification de signature applications externes\n" ;
-    if (!sha256_check(sig.c_str(),apps,"apps.tar")) return false;
-    const char eps2name[]="eps2__";
-    if (withoverwrite && 
-	(!dfu_check_epsilon2(eps2name) || !dfu_check_apps2(eps2name))){
-      *logptr(contextptr) << "Le test d'ecriture et relecture a echoue.\nLe firwmare n'est peut-etre pas conforme ou la flash est endommagee.\n";
-      return false;
-    }
-    *logptr(contextptr) << "Signature applications conforme\nCalculatrice conforme à la reglementation\nCertification par le logiciel Xcas\nInstitut Fourier\nUniversité de Grenoble\nAssurez-vous d'avoir téléchargé Xcas sur\nwww-fourier.ujf-grenoble.fr/~parisse/install_fr.html\n" ;
-    return true;
-  }
-#endif
-
-  const context * python_contextptr=0;
-
-  void opaque_double_copy(void * source,void * target){
-    *((double *) target) = * ((double *) source);
-  }
-
-  double opaque_double_val(const void * source){
-    longlong r = * (longlong *)(source) ;
-    (* (gen *) (&r)).type = 0;
-    return * (double *)(&r); 
-  }
-
-  // FIXME: make the replacement call for APPLE
-  int system_no_deprecation(const char *command) {
-#if defined _IOS_FIX_ || defined FXCG || defined OSXIOS
-    return 0;
-#else
-    return system(command);
-#endif
-  }
-
-  double min_proba_time=10; // in seconds
-
-#ifdef FXCG
-  void control_c(){
-    int i=0 ; // KeyPressed(); // check for EXIT key pressed?
-    if (i==1){ ctrl_c=true; interrupted=true; }
-  }
-#endif
-
-#ifdef TIMEOUT
-#if !defined(EMCC) && !defined(EMCC2)
-  double time(int ){
-    return double(CLOCK())/1000000; // CLOCKS_PER_SEC;
-  }
-#endif
-  time_t caseval_begin,caseval_current;
-  double caseval_maxtime=15; // max 15 seconds
-  int caseval_n=0,caseval_mod=0,caseval_unitialized=-123454321;
-#if !defined POCKETCAS
-  void control_c(){
-#if defined NSPIRE || defined KHICAS
-    if (
-#if defined NSPIRE || defined NSPIRE_NEWLIB
-	on_key_enabled && on_key_pressed()
-#else
-	back_key_pressed()
-#endif
-	){ 
-      kbd_interrupted=true;
-      ctrl_c=interrupted=true; 
-    }
-#else
-    if (caseval_unitialized!=-123454321){
-      caseval_unitialized=-123454321;
-      caseval_mod=0;
-      caseval_n=0;
-      caseval_maxtime=15;
-    }
-    if (caseval_mod>0){ 
-      ++caseval_n; 
-      if (caseval_n >=caseval_mod){
-	caseval_n=0; 
-	caseval_current=time(0); 
-#if defined(EMCC) || defined(EMCC2)
-	if (difftime(caseval_current,caseval_begin)>caseval_maxtime)
-#else
-	if (caseval_current>caseval_maxtime+caseval_begin)
-#endif
-	  { 
-	    CERR << "Timeout" << '\n'; ctrl_c=true; interrupted=true; 
-	    caseval_begin=caseval_current;
-	  } 
-      } 
-    }
-#endif // NSPIRE
-  }
-#endif // POCKETCAS
-#endif // TIMEOUT
-
-#if defined KHICAS
-  void usleep(int t){
-    os_wait_1ms(t/1000);
-  }
-#else
-#ifdef NSPIRE_NEWLIB
-  void usleep(int t){
-    msleep(t/1000);
-  }
-#endif
-  
-#endif
-
-#if defined VISUALC || defined BESTA_OS
-#if !defined FREERTOS && !defined HAVE_LIBMPIR 
-  int R_OK=4;
-#endif
-  int access(const char *path, int mode ){
-    // return _access(path, mode );
-    return 0;
-  }
-#ifdef RTOS_THREADX
-extern "C" void Sleep(unsigned int miliSecond);
-#endif
-
-  void usleep(int t){
-#ifdef RTOS_THREADX
-    Sleep(t/1000);
-#else
-    Sleep(int(t/1000.+.5));
-#endif
-  }
-#endif
-
-#ifdef __APPLE__
-  int PARENTHESIS_NWAIT=10;
-#else
-  int PARENTHESIS_NWAIT=100;
-#endif
-
-  // FIXME: threads allowed curently disabled
-  // otherwise fermat_gcd_mod_2var crashes at puccini
-  bool threads_allowed=true,mpzclass_allowed=true;
-#ifdef HAVE_LIBPTHREAD
-  pthread_mutex_t interactive_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-  std::vector<aide> * & vector_aide_ptr (){
-    static std::vector<aide> * ans = 0;
-    if (!ans) ans=new std::vector<aide>;
-    return ans;
-  }
-  std::vector<std::string> * & vector_completions_ptr (){
-    static std::vector<std::string> * ans = 0;
-    if (!ans) ans=new  std::vector<std::string>;
-    return ans;
-  }
-#ifdef NSPIRE_NEWLIB
-  const context * context0=new context;
-#else
-  const context * context0=0;
-#endif
-  // Global variable when context is 0
-  void (*fl_widget_delete_function)(void *) =0;
-#ifndef NSPIRE
-  ostream & (*fl_widget_archive_function)(ostream &,void *)=0;
-  gen (*fl_widget_unarchive_function)(istream &)=0;
-#endif
-  gen (*fl_widget_updatepict_function)(const gen & g)=0;
-  std::string (*fl_widget_texprint_function)(void * ptr)=0;
-
-  const char * _last_evaled_function_name_=0;
-  const char * & last_evaled_function_name(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_last_evaled_function_name_;
-    else
-      return _last_evaled_function_name_;
-  }
-
-  const char * _currently_scanned=0;
-  const char * & currently_scanned(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_currently_scanned_;
-    else
-      return _currently_scanned;
-  }
-
-  const gen * _last_evaled_argptr_=0;
-  const gen * & last_evaled_argptr(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_last_evaled_argptr_;
-    else
-      return _last_evaled_argptr_;
-  }
-
-  static int _language_=0; 
-  int & language(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_language_;
-    else
-      return _language_;
-  }
-  void language(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_language_=b;
-#if !defined(EMCC) && !defined(EMCC2)
-    else
-#endif
-      _language_=b;
-  }
-
-  static int _max_sum_sqrt_=3; 
-  int & max_sum_sqrt(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_max_sum_sqrt_;
-    else
-      return _max_sum_sqrt_;
-  }
-  void max_sum_sqrt(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_max_sum_sqrt_=b;
-    else
-      _max_sum_sqrt_=b;
-  }
-
-#ifdef GIAC_HAS_STO_38 // Prime sum(x^2,x,0,100000) crash on hardware
-  static int _max_sum_add_=10000; 
-#else
-  static int _max_sum_add_=100000; 
-#endif
-  int & max_sum_add(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_max_sum_add_;
-    else
-      return _max_sum_add_;
-  }
-
-  static int _default_color_=FL_BLACK;
-  int & default_color(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_default_color_;
-    else
-      return _default_color_;
-  }
-  void default_color(int c,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      contextptr->globalptr->_default_color_=c;
-    else
-      _default_color_=c;
-  }
-
-  static void * _evaled_table_=0;
-  void * & evaled_table(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_evaled_table_;
-    else
-      return _evaled_table_;
-  }
-
-  static void * _extra_ptr_=0;
-  void * & extra_ptr(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_extra_ptr_;
-    else
-      return _extra_ptr_;
-  }
-
-  static int _spread_Row_=0;
-  int & spread_Row(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_spread_Row_;
-    else
-      return _spread_Row_;
-  }
-  void spread_Row(int c,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      contextptr->globalptr->_spread_Row_=c;
-    else
-      _spread_Row_=c;
-  }
-
-  static int _spread_Col_=0;
-  int & spread_Col(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_spread_Col_;
-    else
-      return _spread_Col_;
-  }
-  void spread_Col(int c,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      contextptr->globalptr->_spread_Col_=c;
-    else
-      _spread_Col_=c;
-  }
-
-  static int _printcell_current_row_=0;
-  int & printcell_current_row(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_printcell_current_row_;
-    else
-      return _printcell_current_row_;
-  }
-  void printcell_current_row(int c,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      contextptr->globalptr->_printcell_current_row_=c;
-    else
-      _printcell_current_row_=c;
-  }
-
-  static int _printcell_current_col_=0;
-  int & printcell_current_col(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_printcell_current_col_;
-    else
-      return _printcell_current_col_;
-  }
-  void printcell_current_col(int c,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      contextptr->globalptr->_printcell_current_col_=c;
-    else
-      _printcell_current_col_=c;
-  }
-
-  static double _total_time_=0.0;
-  double & total_time(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_total_time_;
-    else
-      return _total_time_;
-  }
-
-#if 1
-  static double _epsilon_=1e-12;
-#else
-#ifdef __SGI_CPP_LIMITS
-  static double _epsilon_=100*numeric_limits<double>::epsilon();
-#else
-  static double _epsilon_=1e-12;
-#endif
-#endif
-  double & epsilon(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_epsilon_;
-    else
-      return _epsilon_;
-  }
-  void epsilon(double c,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      contextptr->globalptr->_epsilon_=c;
-    else
-      _epsilon_=c;
-  }
-
-  static double _proba_epsilon_=1e-15;
-  double & proba_epsilon(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_proba_epsilon_;
-    else
-      return _proba_epsilon_;
-  }
-
-  static bool _expand_re_im_=true; 
-  bool & expand_re_im(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_expand_re_im_;
-    else
-      return _expand_re_im_;
-  }
-  void expand_re_im(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_expand_re_im_=b;
-    else
-      _expand_re_im_=b;
-  }
-
-  static int _scientific_format_=0; 
-  int & scientific_format(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_scientific_format_;
-    else
-      return _scientific_format_;
-  }
-  void scientific_format(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_scientific_format_=b;
-    else
-      _scientific_format_=b;
-  }
-
-  static int _decimal_digits_=12; 
-
-  int & decimal_digits(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_decimal_digits_;
-    else
-      return _decimal_digits_;
-  }
-  void decimal_digits(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_decimal_digits_=b;
-    else
-      _decimal_digits_=b;
-  }
-
-  static int _minchar_for_quote_as_string_=1; 
-
-  int & minchar_for_quote_as_string(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_minchar_for_quote_as_string_;
-    else
-      return _minchar_for_quote_as_string_;
-  }
-  void minchar_for_quote_as_string(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_minchar_for_quote_as_string_=b;
-    else
-      _minchar_for_quote_as_string_=b;
-  }
-
-  static int _xcas_mode_=0; 
-  int & xcas_mode(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_xcas_mode_;
-    else
-      return _xcas_mode_;
-  }
-  void xcas_mode(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_xcas_mode_=b;
-    else
-      _xcas_mode_=b;
-  }
-
-
-  static int _integer_format_=0; 
-  int & integer_format(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_integer_format_;
-    else
-      return _integer_format_;
-  }
-  void integer_format(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_integer_format_=b;
-    else
-      _integer_format_=b;
-  }
-  static int _latex_format_=0; 
-  int & latex_format(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_latex_format_;
-    else
-      return _latex_format_;
-  }
-#ifdef BCD
-  static u32 _bcd_decpoint_='.'|('E'<<16)|(' '<<24); 
-  u32 & bcd_decpoint(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_bcd_decpoint_;
-    else
-      return _bcd_decpoint_;
-  }
-
-  static u32 _bcd_mantissa_=12+(15<<8); 
-  u32 & bcd_mantissa(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_bcd_mantissa_;
-    else
-      return _bcd_mantissa_;
-  }
-
-  static u32 _bcd_flags_=0; 
-  u32 & bcd_flags(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_bcd_flags_;
-    else
-      return _bcd_flags_;
-  }
-
-  static bool _bcd_printdouble_=false;
-  bool & bcd_printdouble(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_bcd_printdouble_;
-    else
-      return _bcd_printdouble_;
-  }
-
-#endif
-
-  static bool _integer_mode_=true;
-  bool & integer_mode(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_integer_mode_;
-    else
-      return _integer_mode_;
-  }
-
-  void integer_mode(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_integer_mode_=b;
-    else
-      _integer_mode_=b;
-  }
-
-  bool python_color=false;
-#ifdef NSPIRE_NEWLIB
-  bool os_shell=false;
-#else
-  bool os_shell=true;
-#endif
-
-#ifdef KHICAS
-  static int _python_compat_=true;
-#else
-  static int _python_compat_=false;
-#endif
-  int & python_compat(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_python_compat_;
-    else
-      return _python_compat_;
-  }
-
-  void python_compat(int b,GIAC_CONTEXT){
-    python_color=b; //cout << "python_color " << b << '\n';
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_python_compat_=b;
-    else
-      _python_compat_=b;
-  }
-
-  static bool _complex_mode_=false; 
-  bool & complex_mode(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_complex_mode_;
-    else
-      return _complex_mode_;
-  }
-
-  void complex_mode(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_complex_mode_=b;
-    else
-      _complex_mode_=b;
-  }
-
-  static bool _escape_real_=true; 
-  bool & escape_real(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_escape_real_;
-    else
-      return _escape_real_;
-  }
-
-  void escape_real(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_escape_real_=b;
-    else
-      _escape_real_=b;
-  }
-
-  static bool _do_lnabs_=true;
-  bool & do_lnabs(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_do_lnabs_;
-    else
-      return _do_lnabs_;
-  }
-
-  void do_lnabs(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_do_lnabs_=b;
-    else
-      _do_lnabs_=b;
-  }
-
-  static bool _eval_abs_=true;
-  bool & eval_abs(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_eval_abs_;
-    else
-      return _eval_abs_;
-  }
-
-  void eval_abs(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_eval_abs_=b;
-    else
-      _eval_abs_=b;
-  }
-
-  static bool _eval_equaltosto_=true;
-  bool & eval_equaltosto(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_eval_equaltosto_;
-    else
-      return _eval_equaltosto_;
-  }
-
-  void eval_equaltosto(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_eval_equaltosto_=b;
-    else
-      _eval_equaltosto_=b;
-  }
-
-  static bool _all_trig_sol_=false; 
-  bool & all_trig_sol(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_all_trig_sol_;
-    else
-      return _all_trig_sol_;
-  }
-
-  void all_trig_sol(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_all_trig_sol_=b;
-    else
-      _all_trig_sol_=b;
-  }
-
-  static bool _try_parse_i_=true; 
-  bool & try_parse_i(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_try_parse_i_;
-    else
-      return _try_parse_i_;
-  }
-
-  void try_parse_i(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_try_parse_i_=b;
-    else
-      _try_parse_i_=b;
-  }
-
-  static bool _specialtexprint_double_=false; 
-  bool & specialtexprint_double(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_specialtexprint_double_;
-    else
-      return _specialtexprint_double_;
-  }
-
-  void specialtexprint_double(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_specialtexprint_double_=b;
-    else
-      _specialtexprint_double_=b;
-  }
-
-  static bool _atan_tan_no_floor_=false; 
-  bool & atan_tan_no_floor(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_atan_tan_no_floor_;
-    else
-      return _atan_tan_no_floor_;
-  }
-
-  void atan_tan_no_floor(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_atan_tan_no_floor_=b;
-    else
-      _atan_tan_no_floor_=b;
-  }
-
-  static bool _keep_acosh_asinh_=false; 
-  bool & keep_acosh_asinh(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_keep_acosh_asinh_;
-    else
-      return _keep_acosh_asinh_;
-  }
-
-  void keep_acosh_asinh(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_keep_acosh_asinh_=b;
-    else
-      _keep_acosh_asinh_=b;
-  }
-
-  static bool _keep_algext_=false; 
-  bool & keep_algext(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_keep_algext_;
-    else
-      return _keep_algext_;
-  }
-
-  void keep_algext(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_keep_algext_=b;
-    else
-      _keep_algext_=b;
-  }
-
-  static bool _auto_assume_=false; 
-  bool & auto_assume(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_auto_assume_;
-    else
-      return _auto_assume_;
-  }
-
-  void auto_assume(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_auto_assume_=b;
-    else
-      _auto_assume_=b;
-  }
-
-  static bool _parse_e_=false; 
-  bool & parse_e(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_parse_e_;
-    else
-      return _parse_e_;
-  }
-
-  void parse_e(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_parse_e_=b;
-    else
-      _parse_e_=b;
-  }
-
-  static bool _convert_rootof_=true; 
-  bool & convert_rootof(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_convert_rootof_;
-    else
-      return _convert_rootof_;
-  }
-
-  void convert_rootof(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_convert_rootof_=b;
-    else
-      _convert_rootof_=b;
-  }
-
-  static bool _lexer_close_parenthesis_=true; 
-  bool & lexer_close_parenthesis(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_lexer_close_parenthesis_;
-    else
-      return _lexer_close_parenthesis_;
-  }
-
-  void lexer_close_parenthesis(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_lexer_close_parenthesis_=b;
-    else
-      _lexer_close_parenthesis_=b;
-  }
-
-  static bool _rpn_mode_=false; 
-  bool & rpn_mode(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_rpn_mode_;
-    else
-      return _rpn_mode_;
-  }
-
-  void rpn_mode(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_rpn_mode_=b;
-    else
-      _rpn_mode_=b;
-  }
-
-#ifdef __MINGW_H
-  static bool _ntl_on_=false; 
-#else
-  static bool _ntl_on_=true; 
-#endif
-
-  bool & ntl_on(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_ntl_on_;
-    else
-      return _ntl_on_;
-  }
-
-  void ntl_on(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_ntl_on_=b;
-    else
-      _ntl_on_=b;
-  }
-
-  static bool _complex_variables_=false; 
-  bool & complex_variables(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_complex_variables_;
-    else
-      return _complex_variables_;
-  }
-
-  void complex_variables(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_complex_variables_=b;
-    else
-      _complex_variables_=b;
-  }
-
-  static bool _increasing_power_=false;
-  bool & increasing_power(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_increasing_power_;
-    else
-      return _increasing_power_;
-  }
-
-  void increasing_power(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_increasing_power_=b;
-    else
-      _increasing_power_=b;
-  }
-
-  static vecteur & _history_in_(){
-    static vecteur * ans = 0;
-    if (ans)
-      ans=new vecteur;
-    return *ans;
-  }
-  vecteur & history_in(GIAC_CONTEXT){
-    if (contextptr)
-      return *contextptr->history_in_ptr;
-    else
-      return _history_in_();
-  }
-
-  static vecteur & _history_out_(){
-    static vecteur * ans = 0;
-    if (!ans)
-      ans=new vecteur;
-    return *ans;
-  }
-  vecteur & history_out(GIAC_CONTEXT){
-    if (contextptr)
-      return *contextptr->history_out_ptr;
-    else
-      return _history_out_();
-  }
-
-  static vecteur & _history_plot_(){
-    static vecteur * ans = 0;
-    if (!ans)
-      ans=new vecteur;
-    return *ans;
-  }
-  vecteur & history_plot(GIAC_CONTEXT){
-    if (contextptr)
-      return *contextptr->history_plot_ptr;
-    else
-      return _history_plot_();
-  }
-
-  static bool _approx_mode_=false;
-  bool & approx_mode(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_approx_mode_;
-    else
-      return _approx_mode_;
-  }
-
-  void approx_mode(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_approx_mode_=b;
-    else
-      _approx_mode_=b;
-  }
-
-  static char _series_variable_name_='h';
-  char & series_variable_name(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_series_variable_name_;
-    else
-      return _series_variable_name_;
-  }
-
-  void series_variable_name(char b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_series_variable_name_=b;
-    else
-      _series_variable_name_=b;
-  }
-
-  static unsigned short _series_default_order_=5;
-  unsigned short & series_default_order(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_series_default_order_;
-    else
-      return _series_default_order_;
-  }
-
-  void series_default_order(unsigned short b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_series_default_order_=b;
-    else
-      _series_default_order_=b;
-  }
-
-  static int _angle_mode_=0;
-  bool angle_radian(GIAC_CONTEXT)
-  {
-    if(contextptr && contextptr->globalptr)
-      return contextptr->globalptr->_angle_mode_ == 0;
-    else
-      return _angle_mode_ == 0;
-  }
-
-  void angle_radian(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_angle_mode_=(b?0:1);
-    else
-      _angle_mode_=(b?0:1);
-  }
-
-  bool angle_degree(GIAC_CONTEXT)
-  {
-    if(contextptr && contextptr->globalptr)
-      return contextptr->globalptr->_angle_mode_ == 1;
-    else
-      return _angle_mode_ == 1;
-  }
-
-  int get_mode_set_radian(GIAC_CONTEXT)
-  {
-    int mode;
-    if(contextptr && contextptr->globalptr)
-    {
-      mode = contextptr->globalptr->_angle_mode_;
-      contextptr->globalptr->_angle_mode_ = 0;
-    }
-    else
-    {
-      mode = _angle_mode_;
-      _angle_mode_ = 0;
-    }
-    return mode;
-  }
-
-  void angle_mode(int b, GIAC_CONTEXT)
-  {
-    if(contextptr && contextptr->globalptr){
-#ifdef POCKETCAS
-      _angle_mode_ = b;
-#endif
-      contextptr->globalptr->_angle_mode_ = b;
-    }
-    else
-      _angle_mode_ = b;
-  }
-
-  int & angle_mode(GIAC_CONTEXT)
-  {
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_angle_mode_;
-    else
-      return _angle_mode_;
-  }
-
-  static bool _show_point_=true;
-  bool & show_point(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_show_point_;
-    else
-      return _show_point_;
-  }
-
-  void show_point(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_show_point_=b;
-    else
-      _show_point_=b;
-  }
-
-  static int _show_axes_=1;
-  int & show_axes(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_show_axes_;
-    else
-      return _show_axes_;
-  }
-
-  void show_axes(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_show_axes_=b;
-    else
-      _show_axes_=b;
-  }
-
-  static bool _io_graph_=false; 
-  // DO NOT SET TO true WITH non-zero contexts or fix symadd when points are added
-  bool & io_graph(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_io_graph_;
-    else
-      return _io_graph_;
-  }
-
-  void io_graph(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_io_graph_=b;
-    else
-      _io_graph_=b;
-  }
-
-  static bool _variables_are_files_=false;
-  bool & variables_are_files(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_variables_are_files_;
-    else
-      return _variables_are_files_;
-  }
-
-  void variables_are_files(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_variables_are_files_=b;
-    else
-      _variables_are_files_=b;
-  }
-
-  static int _bounded_function_no_=0;
-  int & bounded_function_no(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_bounded_function_no_;
-    else
-      return _bounded_function_no_;
-  }
-
-  void bounded_function_no(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_bounded_function_no_=b;
-    else
-      _bounded_function_no_=b;
-  }
-
-  static int _series_flags_=0x3;
-  int & series_flags(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_series_flags_;
-    else
-      return _series_flags_;
-  }
-
-  void series_flags(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_series_flags_=b;
-    else
-      _series_flags_=b;
-  }
-
-  static int _step_infolevel_=0;
-  int & step_infolevel(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_step_infolevel_;
-    else
-      return _step_infolevel_;
-  }
-
-  void step_infolevel(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_step_infolevel_=b;
-    else
-      _step_infolevel_=b;
-  }
-
-  static bool _local_eval_=true;
-  bool & local_eval(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_local_eval_;
-    else
-      return _local_eval_;
-  }
-
-  void local_eval(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_local_eval_=b;
-    else
-      _local_eval_=b;
-  }
-
-  static bool _withsqrt_=true;
-  bool & withsqrt(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_withsqrt_;
-    else
-      return _withsqrt_;
-  }
-
-  void withsqrt(bool b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_withsqrt_=b;
-    else
-      _withsqrt_=b;
-  }
-
-#ifdef WITH_MYOSTREAM
-  my_ostream my_cerr (&CERR);
-  static my_ostream * _logptr_= &my_cerr;
-
-  my_ostream * logptr(GIAC_CONTEXT){
-    my_ostream * res;
-    if (contextptr && contextptr->globalptr )
-      res=contextptr->globalptr->_logptr_;
-    else
-      res= _logptr_;
-    return res?res:&my_cerr;
-  }
-#else
-#ifdef NSPIRE
-  static nio::console * _logptr_=&CERR;
-  nio::console * logptr(GIAC_CONTEXT){
-    return &CERR;
-  }
-#else
-#ifdef FXCG
-  static ostream * _logptr_=0;
-#else
-#ifdef KHICAS
-  stdostream os_cerr;
-  static my_ostream * _logptr_=&os_cerr;
-#else
-  static my_ostream * _logptr_=&CERR;
-#endif
-#endif
-  my_ostream * logptr(GIAC_CONTEXT){
-    my_ostream * res;
-    if (contextptr && contextptr->globalptr )
-      res=contextptr->globalptr->_logptr_;
-    else
-      res= _logptr_;
-#if defined(EMCC) || defined(EMCC2)
-    return res?res:&COUT;
-#else
-#ifdef FXCG
-    return 0;
-#else
-#ifdef KHICAS
-    return res?res:&os_cerr;
-#else
-    return res?res:&CERR;
-#endif
-#endif
-#endif
-  }
-#endif
-#endif
-
-  void logptr(my_ostream * b,GIAC_CONTEXT){
-#ifdef NSPIRE
-#else
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_logptr_=b;
-    else
-      _logptr_=b;
-#endif
-  }
-
-  thread_param::thread_param(): _kill_thread(false), thread_eval_status(-1), v(6)
-#ifdef HAVE_LIBPTHREAD
-#ifdef __MINGW_H
-			      ,eval_thread(),stackaddr(0)
-#else
-			      ,eval_thread(0),stackaddr(0)
-#endif
-#endif
-  { 
-  }
-
-  thread_param * & context0_thread_param_ptr(){
-    static thread_param * ans=0;
-    if (!ans)
-      ans=new thread_param();
-    return ans;
-  }
-
-#if 0
-  static thread_param & context0_thread_param(){
-    return *context0_thread_param_ptr();
-  }
-#endif
-
-  thread_param * thread_param_ptr(const context * contextptr){
-    return (contextptr && contextptr->globalptr)?contextptr->globalptr->_thread_param_ptr:context0_thread_param_ptr();
-  }
-
-  bool kill_thread(GIAC_CONTEXT){
-    thread_param * ptr= (contextptr && contextptr->globalptr )?contextptr->globalptr->_thread_param_ptr:0;
-    return ptr?ptr->_kill_thread:context0_thread_param_ptr()->_kill_thread;
-  }
-
-  void kill_thread(bool b,GIAC_CONTEXT){
-    thread_param * ptr= (contextptr && contextptr->globalptr )?contextptr->globalptr->_thread_param_ptr:0;
-    if (!ptr)
-      ptr=context0_thread_param_ptr();
-    ptr->_kill_thread=b;
-  }
-
-
-#ifdef HAVE_LIBPTHREAD
-  pthread_mutex_t _mutexptr = PTHREAD_MUTEX_INITIALIZER,_mutex_eval_status= PTHREAD_MUTEX_INITIALIZER;
-  pthread_mutex_t * mutexptr(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      return contextptr->globalptr->_mutexptr;
-    return &_mutexptr;
-  }
-
-  bool is_context_busy(GIAC_CONTEXT){
-    int concurrent=pthread_mutex_trylock(mutexptr(contextptr));
-    bool res=concurrent==EBUSY;
-    if (!res)
-      pthread_mutex_unlock(mutexptr(contextptr));
-    return res;
-  }
-
-  int thread_eval_status(GIAC_CONTEXT){
-    int res;
-    if (contextptr && contextptr->globalptr){
-      pthread_mutex_lock(contextptr->globalptr->_mutex_eval_status_ptr);
-      res=contextptr->globalptr->_thread_param_ptr->thread_eval_status;
-      pthread_mutex_unlock(contextptr->globalptr->_mutex_eval_status_ptr);
-    }
-    else {
-      pthread_mutex_lock(&_mutex_eval_status);
-      res=context0_thread_param_ptr()->thread_eval_status;
-      pthread_mutex_unlock(&_mutex_eval_status);
-    }
-    return res;
-  }
-
-  void thread_eval_status(int val,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr){
-      pthread_mutex_lock(contextptr->globalptr->_mutex_eval_status_ptr);
-      contextptr->globalptr->_thread_param_ptr->thread_eval_status=val;
-      pthread_mutex_unlock(contextptr->globalptr->_mutex_eval_status_ptr);
-    }
-    else {
-      pthread_mutex_lock(&_mutex_eval_status);
-      context0_thread_param_ptr()->thread_eval_status=val;
-      pthread_mutex_unlock(&_mutex_eval_status);
-    }
-  }
-
-#else
-  bool is_context_busy(GIAC_CONTEXT){
-    return false;
-  }
-
-  int thread_eval_status(GIAC_CONTEXT){
-    return -1;
-  }
-  
-  void thread_eval_status(int val,GIAC_CONTEXT){
-  }
-
-#endif
-
-  static int _eval_level=DEFAULT_EVAL_LEVEL;
-  int & eval_level(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_eval_level;
-    else
-      return _eval_level;
-  }
-
-  void eval_level(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_eval_level=b;
-    else
-      _eval_level=b;
-  }
-
-#ifdef FXCG // defined(GIAC_HAS_STO_38) || defined(ConnectivityKit)
-  static unsigned int _rand_seed=123457;
-#else
-  static tinymt32_t _rand_seed;
-#endif
-
-#ifdef FXCG // defined(GIAC_HAS_STO_38) || defined(ConnectivityKit)
-  unsigned int & rand_seed(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_rand_seed;
-    else
-      return _rand_seed;
-  }
-#else
-  tinymt32_t * rand_seed(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return &contextptr->globalptr->_rand_seed;
-    else
-      return &_rand_seed;
-  }
-#endif
-
-  void rand_seed(unsigned int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_rand_seed=b;
-    else
-      _rand_seed=b;
-  }
-
-  int std_rand(){
-#if 1 // def NSPIRE
-    static unsigned int r = 0;
-    r = unsigned ((1664525*ulonglong(r)+1013904223)%(ulonglong(1)<<31));
-    return r;
-#else
-    return std::rand();
-#endif
-  }
-
-  int giac_rand(GIAC_CONTEXT){
-#ifdef FXCG // defined(GIAC_HAS_STO_38) || defined(ConnectivityKit)
-    unsigned int & r = rand_seed(contextptr);
-    // r = (2147483629*ulonglong(r)+ 2147483587)% 2147483647;
-    r = unsigned ((1664525*ulonglong(r)+1013904223)%(ulonglong(1)<<31));
-    return r;
-#else
-    for (;;){
-      unsigned r=tinymt32_generate_uint32(rand_seed(contextptr)) >> 1;
-      if (!(r>>31))
-	return r;
-    }
-#endif // tinymt32
-  }
-
-  static int _prog_eval_level_val=1;
-  int & prog_eval_level_val(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_prog_eval_level_val;
-    else
-      return _prog_eval_level_val;
-  }
-
-  void prog_eval_level_val(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_prog_eval_level_val=b;
-    else
-      _prog_eval_level_val=b;
-  }
-
-  void cleanup_context(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr ){
-      contextptr->globalptr->_eval_level=DEFAULT_EVAL_LEVEL;
-    }
-    eval_level(contextptr)=DEFAULT_EVAL_LEVEL;
-    if (!contextptr)
-      protection_level=0;
-    local_eval(true,contextptr);
-  }
-
-
-  static parser_lexer & _pl(){
-    static parser_lexer * ans = 0;
-    if (!ans)
-      ans=new parser_lexer();
-    ans->_i_sqrt_minus1_=1;
-    return * ans;
-  }
-  int & lexer_column_number(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._lexer_column_number_;
-    else
-      return _pl()._lexer_column_number_;
-  }
-  int & lexer_line_number(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._lexer_line_number_;
-    else
-      return _pl()._lexer_line_number_;
-  }
-  void lexer_line_number(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._lexer_line_number_=b;
-    else
-      _pl()._lexer_line_number_=b;
-  }
-  void increment_lexer_line_number(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      ++contextptr->globalptr->_pl._lexer_line_number_;
-    else
-      ++_pl()._lexer_line_number_;
-  }
-
-  int & index_status(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._index_status_;
-    else
-      return _pl()._index_status_;
-  }
-  void index_status(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._index_status_=b;
-    else
-      _pl()._index_status_=b;
-  }
-
-  int & i_sqrt_minus1(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._i_sqrt_minus1_;
-    else
-      return _pl()._i_sqrt_minus1_;
-  }
-  void i_sqrt_minus1(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._i_sqrt_minus1_=b;
-    else
-      _pl()._i_sqrt_minus1_=b;
-  }
-
-  int & opened_quote(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._opened_quote_;
-    else
-      return _pl()._opened_quote_;
-  }
-  void opened_quote(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._opened_quote_=b;
-    else
-      _pl()._opened_quote_=b;
-  }
-
-  int & in_rpn(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._in_rpn_;
-    else
-      return _pl()._in_rpn_;
-  }
-  void in_rpn(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._in_rpn_=b;
-    else
-      _pl()._in_rpn_=b;
-  }
-
-  int & spread_formula(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._spread_formula_;
-    else
-      return _pl()._spread_formula_;
-  }
-  void spread_formula(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._spread_formula_=b;
-    else
-      _pl()._spread_formula_=b;
-  }
-
-  int & initialisation_done(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._initialisation_done_;
-    else
-      return _pl()._initialisation_done_;
-  }
-  void initialisation_done(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._initialisation_done_=b;
-    else
-      _pl()._initialisation_done_=b;
-  }
-
-  static int _calc_mode_=0; 
-  int & calc_mode(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_calc_mode_;
-    else
-      return _calc_mode_;
-  }
-  int abs_calc_mode(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return absint(contextptr->globalptr->_calc_mode_);
-    else
-      return absint(_calc_mode_);
-  }
-  static std::string & _autoname_(){
-    static string * ans = 0;
-    if (!ans){
-#ifdef GIAC_HAS_STO_38
-      ans= new string("GA");
-#else
-      ans = new string("A");
-#endif
-    }
-    return *ans;
-  }
-  void calc_mode(int b,GIAC_CONTEXT){
-    if ( (b==38 || b==-38) && strcmp(_autoname_().c_str(),"GA")<0)
-      autoname("GA",contextptr);
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_calc_mode_=b;
-    else
-      _calc_mode_=b;
-  }
-
-  int array_start(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr){
-      bool hp38=absint(contextptr->globalptr->_calc_mode_)==38;
-      return (!contextptr->globalptr->_python_compat_ && (contextptr->globalptr->_xcas_mode_ || hp38))?1:0;
-    }
-    return (!_python_compat_ && (_xcas_mode_ || absint(_calc_mode_)==38))?1:0;
-  }
-
-  std::string autoname(GIAC_CONTEXT){
-    std::string res;
-    if (contextptr && contextptr->globalptr )
-      res=contextptr->globalptr->_autoname_;
-    else
-      res=_autoname_();
-    for (;;){
-      gen tmp(res,contextptr);
-      if (tmp.type==_IDNT){
-	gen tmp1=eval(tmp,1,contextptr);
-	if (tmp==tmp1)
-	  break;
-      }
-      autoname_plus_plus(res);
-    }
-    return res;
-  }
-  std::string autoname(const std::string & s,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_autoname_=s;
-    else
-      _autoname_()=s;
-    return s;
-  }
-
-  static std::string & _autosimplify_(){
-    static string * ans = 0;
-    if (!ans)
-      ans=new string("regroup");
-    return *ans;
-  }
-  std::string autosimplify(GIAC_CONTEXT){
-    std::string res;
-    if (contextptr && contextptr->globalptr )
-      res=contextptr->globalptr->_autosimplify_;
-    else
-      res=_autosimplify_();
-    return res;
-  }
-  std::string autosimplify(const std::string & s,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_autosimplify_=s;
-    else
-      _autosimplify_()=s;
-    return s;
-  }
-
-  static std::string & _lastprog_name_(){
-    static string * ans = 0;
-    if (!ans)
-      ans=new string("lastprog");
-    return *ans;
-  }
-  std::string lastprog_name(GIAC_CONTEXT){
-    std::string res;
-    if (contextptr && contextptr->globalptr )
-      res=contextptr->globalptr->_lastprog_name_;
-    else
-      res=_lastprog_name_();
-    return res;
-  }
-  std::string lastprog_name(const std::string & s,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_lastprog_name_=s;
-    else
-      _lastprog_name_()=s;
-    return s;
-  }
-
-  static std::string & _format_double_(){
-    static string * ans = 0;
-    if (!ans)
-      ans=new string("");
-    return * ans;
-  }
-  std::string & format_double(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_format_double_;
-    else
-      return _format_double_();
-  }
-
-  std::string comment_s(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._comment_s_;
-    else
-      return _pl()._comment_s_;
-  }
-  void comment_s(const std::string & b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._comment_s_=b;
-    else
-      _pl()._comment_s_=b;
-  }
-
-  void increment_comment_s(const std::string & b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._comment_s_ += b;
-    else
-      _pl()._comment_s_ += b;
-  }
-
-  void increment_comment_s(char b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._comment_s_ += b;
-    else
-      _pl()._comment_s_ += b;
-  }
-
-  std::string parser_filename(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._parser_filename_;
-    else
-      return _pl()._parser_filename_;
-  }
-  void parser_filename(const std::string & b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._parser_filename_=b;
-    else
-      _pl()._parser_filename_=b;
-  }
-
-  std::string parser_error(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._parser_error_;
-    else
-      return _pl()._parser_error_;
-  }
-  void parser_error(const std::string & b,GIAC_CONTEXT){
-#ifndef GIAC_HAS_STO_38
-    if (!first_error_line(contextptr))
-      alert(b,contextptr);
-    else
-      *logptr(contextptr) << b << '\n';
-#endif
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._parser_error_=b;
-    else
-      _pl()._parser_error_=b;
-  }
-
-  std::string error_token_name(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._error_token_name_;
-    else
-      return _pl()._error_token_name_;
-  }
-  void error_token_name(const std::string & b0,GIAC_CONTEXT){
-    string b(b0);
-    if (b0.size()==2 && b0[0]==-61 && b0[1]==-65)
-      b="end of input";
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._error_token_name_=b;
-    else
-      _pl()._error_token_name_=b;
-  }
-
-  int & first_error_line(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_pl._first_error_line_;
-    else
-      return _pl()._first_error_line_;
-  }
-  void first_error_line(int b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      contextptr->globalptr->_pl._first_error_line_=b;
-    else
-      _pl()._first_error_line_=b;
-  }
-
-  static gen & _parsed_gen_(){
-    static gen * ans = 0;
-    if (!ans)
-      ans=new gen;
-    return * ans;
-  }
-  gen parsed_gen(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return *contextptr->globalptr->_parsed_genptr_;
-    else
-      return _parsed_gen_();
-  }
-  void parsed_gen(const gen & b,GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      *contextptr->globalptr->_parsed_genptr_=b;
-    else
-      _parsed_gen_()=b;
-  }
-
-  static logo_turtle & _turtle_(){
-    static logo_turtle * ans = 0;
-    if (!ans)
-      ans=new logo_turtle;
-    return *ans;
-  }
-  logo_turtle & turtle(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr )
-      return contextptr->globalptr->_turtle_;
-    else
-      return _turtle_();
-  }
-
-#ifndef KHICAS
-  // protect turtle access by a lock
-  // turtle changes are mutually exclusive even in different contexts
-#ifdef HAVE_LIBPTHREAD
-  pthread_mutex_t turtle_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-  std::vector<logo_turtle> & _turtle_stack_(){
-    static std::vector<logo_turtle> * ans = 0;
-    if (!ans)
-      ans=new std::vector<logo_turtle>(1,_turtle_());
-#ifdef HAVE_LIBPTHREAD
-    ans->reserve(20000);
-#endif
-    return *ans;
-  }
-  std::vector<logo_turtle> & turtle_stack(GIAC_CONTEXT){
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_lock(&turtle_mutex);
-#endif
-    std::vector<logo_turtle> * ans=0;
-    if (contextptr && contextptr->globalptr )
-      ans=&contextptr->globalptr->_turtle_stack_;
-    else
-      ans=&_turtle_stack_();
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_unlock(&turtle_mutex);
-#endif
-    return *ans;
-  }
-#endif
-
-  // Other global variables
-#ifdef NSPIRE
-  bool secure_run=false;
-#else
-  bool secure_run=true;
-#endif
-  bool center_history=false;
-  bool in_texmacs=false;
-  bool block_signal=false;
-  bool CAN_USE_LAPACK = true;
-  bool simplify_sincosexp_pi=true;
-  int history_begin_level=0; 
-  // variable used to avoid copying the whole history between processes 
-#ifdef WIN32 // Temporary
-  int debug_infolevel=0;
-#else
-  int debug_infolevel=0;
-#endif
-  int printprog=0;
-#if defined __APPLE__ || defined VISUALC || defined __MINGW_H || defined BESTA_OS || defined NSPIRE || defined FXCG || defined NSPIRE_NEWLIB || defined KHICAS
-#ifdef _WIN32
-  int threads=atoi(getenv("NUMBER_OF_PROCESSORS"));
-#else
-  int threads=1;
-#endif
-#else
-  int threads=sysconf (_SC_NPROCESSORS_ONLN);
-#endif
-  unsigned max_pairs_by_iteration=32768; 
-  // gbasis max number of pairs by F4 iteration
-  // setting to 2000 accelerates cyclic9mod but cyclic9 would be slower
-  // 32768 is enough for cyclic10mod without truncation and not too large for yang1
-  unsigned simult_primes=16,simult_primes2=16,simult_primes3=16,simult_primes_seuil2=-1,simult_primes_seuil3=-1; 
-  // gbasis modular algorithm on Q: simultaneous primes (more primes means more parallel threads but also more memory required)
-  double gbasis_reinject_ratio=0.2;
-  // gbasis modular algo on Q: if new basis element exceed this ratio, new elements are reinjected in the ideal generators for the remaining computations
-  double gbasis_reinject_speed_ratio=1/6.;
-  // gbasis modular algo on Q: new basis elements are reinjected if the 2nd run with learning CPU speed / 1st run without learning CPU speed is >=
-  int gbasis_logz_age_sort=0,gbasis_stop=0;
-  // rur_do_gbasis==-1 no gbasis Q recon for rur, ==0 always gbasis Q recon, >0 size limit in monomials of the gbasis for gbasis Q recon
-  // rur_do_certify==-1 do not certify, ==0 full certify, >0 certify equation if total degree is <= rur_do_certify. Beware of the 1 shift with the user command.
-  int rur_do_gbasis=-1,rur_do_certify=0,rur_certify_maxthreads=6;
-  bool rur_error_ifnot0dimensional=false;
-  unsigned short int GIAC_PADIC=50;
-  const char cas_suffixe[]=".cas";
-  int MAX_PROD_EXPAND_SIZE=4096;
-#if defined RTOS_THREADX || defined BESTA_OS || defined(KHICAS)
-#ifdef BESTA_OS
-  int LIST_SIZE_LIMIT = 100000 ;
-  int FACTORIAL_SIZE_LIMIT = 1000 ;
-  int CALL_LAPACK = 1111;
-#else
-  int LIST_SIZE_LIMIT = 1000 ;
-  int FACTORIAL_SIZE_LIMIT = 254 ;
-  int CALL_LAPACK = 1111;
-#endif
-  int GAMMA_LIMIT = 100 ;
-  int NEWTON_DEFAULT_ITERATION=40;
-  int TEST_PROBAB_PRIME=25;
-  int GCDHEU_MAXTRY=5;
-  int GCDHEU_DEGREE=100;
-  int DEFAULT_EVAL_LEVEL=5;
-  int MODFACTOR_PRIMES =5;
-  int NTL_MODGCD=1<<30; // default: ntl gcd disabled
-  int NTL_RESULTANT=382; 
-  int NTL_XGCD=50;
-  int HGCD=128;//16384;
-  int HENSEL_QUADRATIC_POWER=25;
-  int KARAMUL_SIZE=13;
-  int INT_KARAMUL_SIZE=300;
-  int FFTMUL_SIZE=100; 
-  int FFTMUL_INT_MAXBITS=1024;
-  int MAX_ALG_EXT_ORDER_SIZE = 4;
-  int MAX_COMMON_ALG_EXT_ORDER_SIZE = 16;
-  int TRY_FU_UPRIME=5;
-  int SOLVER_MAX_ITERATE=25;
-  int MAX_PRINTABLE_ZINT=10000;
-  int MAX_RECURSION_LEVEL=9;
-  int GBASIS_DETERMINISTIC=20;
-  int GBASISF4_MAX_TOTALDEG=1024;
-  int GBASISF4_MAXITER=256;
-  // int GBASISF4_BUCHBERGER=5;
-  const int BUFFER_SIZE=512;
-#else
-  int CALL_LAPACK=1111;
-#if defined(EMCC) || defined(EMCC2)
-  int LIST_SIZE_LIMIT = 10000000 ;
-#else
-  int LIST_SIZE_LIMIT = 500000000 ;
-#endif
-#ifdef USE_GMP_REPLACEMENTS
-  int FACTORIAL_SIZE_LIMIT = 10000 ;
-#else
-  int FACTORIAL_SIZE_LIMIT = 10000000 ;
-#endif
-  int GAMMA_LIMIT = 100 ;
-  int NEWTON_DEFAULT_ITERATION=60;
-  int TEST_PROBAB_PRIME=25;
-  int GCDHEU_MAXTRY=5;
-  int GCDHEU_DEGREE=100;
-  int DEFAULT_EVAL_LEVEL=25;
-  int MODFACTOR_PRIMES =5;
-  int NTL_MODGCD=1<<30; // default: ntl gcd disabled
-  int NTL_RESULTANT=382; 
-  int NTL_XGCD=50;
-  int HGCD=128;//16384;
-  int HENSEL_QUADRATIC_POWER=25;
-  int KARAMUL_SIZE=13;
-  int INT_KARAMUL_SIZE=300;
-  int FFTMUL_SIZE=100; 
-  int FFTMUL_INT_MAXBITS=1024;
-#if 0 // def GIAC_GGB
-  int MAX_ALG_EXT_ORDER_SIZE = 3;
-#else
-  int MAX_ALG_EXT_ORDER_SIZE = 6;
-#endif
-#if defined EMCC || defined NO_TEMPLATE_MULTGCD || defined GIAC_HAS_STO_38
-  int MAX_COMMON_ALG_EXT_ORDER_SIZE = 16;
-#else
-  int MAX_COMMON_ALG_EXT_ORDER_SIZE = 64;
-#endif
-  int TRY_FU_UPRIME=5;
-  int SOLVER_MAX_ITERATE=25;
-  int MAX_PRINTABLE_ZINT=1000000;
-  int MAX_RECURSION_LEVEL=100;
-  int GBASIS_DETERMINISTIC=50;
-  int GBASISF4_MAX_TOTALDEG=16384;
-  int GBASISF4_MAXITER=1024;
-  // int GBASISF4_BUCHBERGER=5;
-  const int BUFFER_SIZE=16384;
-#endif
-  volatile bool ctrl_c=false,interrupted=false,kbd_interrupted=false;
-#ifdef GIAC_HAS_STO_38
-  double powlog2float=1e4;
-  int MPZ_MAXLOG2=8600; // max 2^8600 about 1K
-#else
-  double powlog2float=1e8;
-  int MPZ_MAXLOG2=80000000; // 100 millions bits
-#endif
-#ifdef HAVE_LIBNTL
-  int PROOT_FACTOR_MAXDEG=300;
-#else
-  int PROOT_FACTOR_MAXDEG=30;
-#endif
-  int MODRESULTANT=20;
-  int ABS_NBITS_EVALF=1000;
-
-  // used by WIN32 for the path to the xcas directory
-  string & xcasroot(){
-    static string * ans=0;
-    if (!ans)
-      ans=new string;
-    return * ans;
-  }
-  string & xcasrc(){
-#ifdef WIN32
-    static string * ans=0;
-    if (!ans) ans=new string("xcas.rc");
-#else
-    static string * ans=0;
-    if (!ans) ans=new string(".xcasrc");
-#endif
-    return *ans;
-  }
-
-#if defined HAVE_SIGNAL_H && !defined HAVE_NO_SIGNAL_H
-  pid_t parent_id=getpid();
-#else
-  pid_t parent_id=0;
-#endif
-  pid_t child_id=0; // child process (to replace by a vector of childs?)
-
-  void ctrl_c_signal_handler(int signum){
-    ctrl_c=true;
-#if !defined KHICAS && !defined NSPIRE_NEWLIB && !defined WIN32 && !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined POCKETCAS && !defined __MINGW_H
-    if (child_id)
-      kill(child_id,SIGINT);
-#endif
-#if defined HAVE_SIGNAL_H && !defined HAVE_NO_SIGNAL_H
-    cerr << "Ctrl-C pressed (pid " << getpid() << ")" << '\n';
-#endif
-  }
-#if !defined NSPIRE && !defined FXCG
-  gen catch_err(const std::runtime_error & error){
-    cerr << error.what() << '\n';
-    debug_ptr(0)->sst_at_stack.clear();
-    debug_ptr(0)->current_instruction_stack.clear();
-    debug_ptr(0)->args_stack.clear();
-    protection_level=0;
-    debug_ptr(0)->debug_mode=false;
-    return string2gen(string(error.what()),false);
-  }
-#endif
-
-#if 0
-  static vecteur subvect(const vecteur & v,int i){
-    int s=v.size();
-    if (i<0)
-      i=-i;
-    vecteur res(v);
-    for (;s<i;++s)
-      res.push_back(undef);
-    return vecteur(res.begin(),res.begin()+i);
-  }
-#endif
-
-#if defined HAVE_SIGNAL_H_OLD 
-  static bool running_file=false;
-  static int run_modif_pos;
-  bool synchronize_history=true;
-  char buf[BUFFER_SIZE];
-
-  // at the beginning the parent process calls make_child
-  // this forks, the child process then waits for a SIGUSR1 from
-  // the parent that indicate data to evaluate is ready in #cas_entree#
-  // When finished the child kills the parent with SIGUSR1
-  // The answer is in #cas_sortie#
-  // Parent: child_busy is set to true during evaluation
-  // and reset to false by SIGUSR1
-  // Child uses signal_child for signal trapping and parent uses
-  // data_ready
-  // SIGUSR2 is used by the child process for intermediate data
-  // [Typically a plot instruction]
-  // The child kills the parent with SIGUSR2,
-  // child_busy remains true but data ready is set
-  // Then the child waits for a parent SIGUSR2 signal
-  // signal_plot_parent is true for intermediate data, false otherwise
-  volatile bool signal_child=true; // true if busy
-  volatile bool signal_plot_child=false; // true if child can continue
-  volatile bool signal_plot_parent=false; 
-  volatile bool child_busy=false,data_ready=false;
-  // child sends a SIGUSR1
-  void data_signal_handler(int signum){
-          // cerr << "Parent called" << '\n';
-    signal_plot_parent=false;
-    child_busy=false;
-    data_ready=true;
-  }
-
-  /*
-  void control_c(){
-    if (ctrl_c){
-      ctrl_c=false;
-      interrupted=true;
-      cerr << "Throwing exception" << '\n';
-      throw(std::runtime_error("Stopped by Ctrl-C"));
-    }
-  }
-  */
-
-  // child sends a SIGUSR2 (intermediate data)
-  void plot_signal_handler(int signum){
-          // cerr << "Plot_signal_handler Parent called" << '\n';
-    signal_plot_parent=true;
-    child_busy=false;
-    data_ready=true;
-  }
-
-  void child_signal_handler(int signum){
-    // cerr << "Child called" << '\n';
-    signal_child=true;
-  }
-  
-  void child_plot_done(int signum){
-    signal_plot_child=true;
-  }
-  
-  void kill_and_wait_sigusr2(){
-    sigset_t mask, oldmask;
-    sigemptyset (&mask);
-    sigaddset (&mask, SIGUSR2);
-    /* Wait for a signal to arrive. */
-    sigprocmask (SIG_BLOCK, &mask, &oldmask);
-    signal_plot_child=false;
-#ifndef WIN32
-    kill(parent_id,SIGUSR2);
-#endif
-    // cerr << "Child ready" << '\n';
-#ifndef WIN32
-    while (!signal_plot_child)
-      sigsuspend (&oldmask);
-    sigprocmask (SIG_UNBLOCK, &mask, NULL);
-#endif
-  }
-
-  gen wait_parent(){
-    kill_and_wait_sigusr2();
-    ifstream child_in(cas_entree_name().c_str());    
-    gen res;
-    try {
-      res=unarchive(child_in,context0);
-    }
-    catch (std::runtime_error & e){
-      res=string2gen(e.what(),false);
-    }
-    child_in.close();
-    return res;
-  }
-
-  static pid_t make_child(){ // forks and return child id
-#if defined HAVE_NO_SIGNAL_H || defined(DONT_FORK)
-#ifdef DONT_FORK
-	  child_id = 1;
-	  return 1;
-#endif // DONT_FORK
-	return -1;
-#else // HAVE_NO_SIGNAL_H
-    running_file=false;
-    child_busy=false;
-    ctrl_c=false;
-    signal(SIGINT,ctrl_c_signal_handler);
-    signal(SIGUSR1,data_signal_handler);
-    signal(SIGUSR2,plot_signal_handler);
-    if (child_id>(pid_t) 0)
-      return child_id; // exists
-    child_id=fork();
-    if (child_id<(pid_t) 0)
-      throw(std::runtime_error("Make_child error: Unable to fork"));
-    if (!child_id){ // child process, redirect input/output
-      sigset_t mask, oldmask;
-      sigemptyset (&mask);
-      sigaddset (&mask, SIGUSR1);
-      signal(SIGUSR1,child_signal_handler);
-      signal(SIGUSR2,child_plot_done);
-      signal_child=false;
-      gen args;
-      /* Wait for a signal to arrive. */
-      sigprocmask (SIG_BLOCK, &mask, &oldmask);
-      signal_child=false;
-      for (;;){
-	// cerr << "Child ready" << '\n';
-#ifndef WIN32
-	while (!signal_child)
-	  sigsuspend (&oldmask);
-	sigprocmask (SIG_UNBLOCK, &mask, NULL);
-#endif
-	// read and evaluate input
-	CLOCK_T start, end;
-	double elapsed;
-	start = CLOCK();
-        messages_to_print="";
-	ifstream child_in(cas_entree_name().c_str());
-	// Unarchive step
-	try {
-	  child_in >> rpn_mode(context0) >> global_window_ymin >> history_begin_level ;
-	  // cerr << args << '\n';
-	  if (history_begin_level<0){
-	    child_in >> synchronize_history;
-	    args=unarchive(child_in,context0);
-	    if (!synchronize_history){
-	      // cerr << "No sync " << '\n';
-	      history_in(0)[-history_begin_level-1]=args;
-	      history_out(0)=subvect(history_out(0),-history_begin_level-1);
-	    }
-	    else {
-	      // cerr << " Sync " << '\n';
-	      history_in(0)=*args._VECTptr;
-	      args=unarchive(child_in,context0);
-	      history_out(0)=*args._VECTptr;
-	    }
-	  }
-	  else {
-	    args=unarchive(child_in,context0);
-	    // cerr << "Lu1 " << args << '\n';
-	    if (history_begin_level>signed(history_in(context0).size()))
-	      history_begin_level=history_in(context0).size();
-	    history_in(0)=mergevecteur(subvect(history_in(context0),history_begin_level),*args._VECTptr);
-	    args=unarchive(child_in,context0);
-	    // cerr << "Lu2 " << args << '\n';
-	    history_out(0)=mergevecteur(subvect(history_out(context0),history_begin_level),*args._VECTptr);
-	    args=unarchive(child_in,context0);
-	    // cerr << "Lu3 " << args << '\n';
-	    history_in(0).push_back(args);
-	  }
-	}
-	catch (std::runtime_error & error ){
-	  last_evaled_argptr(contextptr)=NULL;
-	  args = string2gen("Child unarchive error:"+string(error.what()),false);
-	}
-	child_in.close();
-	// cerr << args << '\n';
-	// output result of evaluation to child_out
-	gen args_evaled;
-	{ // BEGIN of old try block
-	  if (history_begin_level<0){
-	    history_begin_level=-history_begin_level-1;
-	    int s=history_in(context0).size();
-	    block_signal=true;
-	    for (int k=history_begin_level;k<s;++k){
-	      try {
-                if (history_in(context0)[k].is_symb_of_sommet(at_signal) || history_in(context0)[k].is_symb_of_sommet(at_debug))
-		  history_out(context0).push_back(eval(history_in(context0)[k]._SYMBptr->feuille,eval_level(context0),context0));
-                else
-		  history_out(context0).push_back(eval(history_in(context0)[k],eval_level(context0),context0));
-	      }
-	      catch (std::runtime_error & error){
-		last_evaled_argptr(contextptr)=NULL;
-		history_out(context0).push_back(catch_err(error));
-	      }
-	    }
-	    args=vecteur(history_in(context0).begin()+history_begin_level,history_in(context0).end());
-	    args_evaled=vecteur(history_out(context0).begin()+history_begin_level,history_out(context0).end());
-	  }
-	  else {
-	    if ( (args.type!=_VECT) || (args.subtype!=_RUNFILE__VECT) ){
-	      if (debug_infolevel>10)
-		cerr << "Child eval " << args << '\n';
-	      try {
-		args_evaled=args.eval(1,context0);
-	      }
-	      catch (std::runtime_error & error){
-		last_evaled_argptr(contextptr)=NULL;
-		args_evaled=catch_err(error);
-	      }
-	      history_out(context0).push_back(args_evaled);
-	      if (debug_infolevel>10)
-		cerr << "Child result " << args_evaled << '\n';
-	    }
-	    else {
-	      vecteur v;
-	      history_in(context0).pop_back();
-	      const_iterateur it=args._VECTptr->begin(),itend=args._VECTptr->end();
-	      for (;it!=itend;++it){
-		if (it->is_symb_of_sommet(at_signal) ||it->is_symb_of_sommet(at_debug) )
-		  continue;
-		history_in(context0).push_back(*it);
-		try {
-		  if (it->is_symb_of_sommet(at_debug))
-		    args_evaled=it->_SYMBptr->feuille.eval(1,context0);
-		  else
-		    args_evaled=it->eval(1,context0);
-		}
-		catch (std::runtime_error & error){
-		  last_evaled_argptr(contextptr)=NULL;
-		  args_evaled=catch_err(error);
-		}
-		// cerr << args_evaled << '\n';
-		history_out(context0).push_back(args_evaled);
-		v.push_back(args_evaled);
-		ofstream child_out(cas_sortie_name().c_str());
-		archive(child_out,*it,context0);
-		archive(child_out,args_evaled,context0);
-		child_out << messages_to_print << "ÿ" ;
-		child_out.close();
-		// cerr << "Signal reads " << res << '\n';
-		kill_and_wait_sigusr2();
-	      }
-	      // args_evaled=gen(v,args.subtype);
-	      args=0;
-	      args_evaled=0;
-	    }
-	  }
-	} // END of old try/catch block
-	block_signal=false;
-	end = CLOCK();
-	elapsed = ((double) (end - start)) / CLOCKS_PER_SEC;
-	ofstream child_out(cas_sortie_name().c_str());
-	archive(child_out,args,context0) ;
-	archive(child_out,args_evaled,context0) ;
-	child_out << messages_to_print ;
-	int mm=messages_to_print.size();
-	if (mm && (messages_to_print[mm-1]!='\n'))
-	  child_out << '\n';
-	child_out << "Time: " << elapsed << "ÿ" ;
-	child_out.close();
-	// cerr << "Child sending signal to " << parent_id << '\n';
-	/* Wait for a signal to arrive. */
-	sigprocmask (SIG_BLOCK, &mask, &oldmask);
-	signal_child=false;
-#ifndef WIN32
-	kill(parent_id,SIGUSR1);
-#endif
-      }
-    }
-    // cerr << "Forking " << parent_id << " " << child_id << '\n';
-    return child_id;
-#endif // HAVE_NO_SIGNAL_H
-  }
-
-  static void archive_write_error(){
-    cerr << "Archive error on " << cas_entree_name() << '\n';
-  }
-  
-  // return true if entree has been sent to evalation by child process
-  static bool child_eval(const string & entree,bool numeric,bool is_run_file){
-#if defined(HAVE_NO_SIGNAL_H) || defined(DONT_FORK)
-    return false;
-#else
-    if (is_run_file || rpn_mode(context0))
-      history_begin_level=0;
-    // added signal re-mapping because PARI seems to mess signal on the ipaq
-    signal(SIGUSR1,data_signal_handler);
-    signal(SIGUSR2,plot_signal_handler);
-    if (!child_id)
-      child_id=make_child();
-    if (child_busy || data_ready)
-      return false;
-    gen entr;
-    CLOCK_T start, end;
-    start = CLOCK();
-    try {
-      ofstream parent_out(cas_entree_name().c_str());
-      if (!signal_plot_parent){
-	parent_out << rpn_mode(context0) << " " << global_window_ymin << " " << history_begin_level << '\n';
-	archive(parent_out,vecteur(history_in(context0).begin()+history_begin_level,history_in(context0).end()),context0);
-	archive(parent_out,vecteur(history_out(context0).begin()+history_begin_level,history_out(context0).end()),context0);
-      }
-      if (is_run_file){
-	ifstream infile(entree.c_str());
-	char c;
-	string s;
-	while (!infile.eof()){
-	  infile.get(c);
-	  s += c;
-	}
-	entr = gen(s,context0);
-	if (entr.type!=_VECT)
-	  entr=gen(makevecteur(entr),_RUNFILE__VECT);
-	else
-	  entr.subtype=_RUNFILE__VECT;
-      }
-      else {
-	entr = gen(entree,context0);
-	if (numeric)
-	  entr = symbolic(at_evalf,gen(entree,context0));
-      }
-      archive(parent_out,entr,context0);
-      if (!parent_out)
-	setsizeerr();
-      parent_out.close();
-      if (!parent_out)
-	setsizeerr();
-    } catch (std::runtime_error & e){
-      last_evaled_argptr(contextptr)=NULL;
-      archive_write_error();
-      return false;
-    }
-    child_busy=true;
-    if (signal_plot_parent){
-      // cerr << "child_eval: Sending SIGUSR2 to child" << '\n';
-      signal_plot_parent=false;
-#ifndef WIN32
-      kill(child_id,SIGUSR2);
-#endif
-      return true;
-    }
-    // cerr << "Sending SIGUSR1 to " << child_id << '\n';
-#ifndef WIN32
-    kill(child_id,SIGUSR1);
-#endif
-    running_file=is_run_file;
-    end = CLOCK();
-    // cerr << "# Save time" << double(end-start)/CLOCKS_PER_SEC << '\n';
-    return true;
-#endif /// HAVE_NO_SIGNAL_H
-  }
-
-  static bool child_reeval(int history_begin_level){
-#if defined(HAVE_NO_SIGNAL_H) || defined(DONT_FORK)
-    return false;
-#else
-    signal(SIGUSR1,data_signal_handler);
-    signal(SIGUSR2,plot_signal_handler);
-    if (!child_id)
-      child_id=make_child();
-    if (child_busy || data_ready)
-      return false;
-    messages_to_print="";
-    try {
-      ofstream parent_out(cas_entree_name().c_str());
-      parent_out << rpn_mode(context0) << " " << global_window_ymin << " " << -1-history_begin_level << " " << synchronize_history << '\n';
-      if (synchronize_history){
-	archive(parent_out,history_in(context0),context0);
-	archive(parent_out,vecteur(history_out(context0).begin(),history_out(context0).begin()+history_begin_level),context0);
-      }
-      else
-	archive(parent_out,history_in(context0)[history_begin_level],context0);
-      if (!parent_out)
-	setsizeerr();
-      parent_out.close();
-      if (!parent_out)
-	setsizeerr();
-    } catch (std::runtime_error & e){
-      last_evaled_argptr(contextptr)=NULL;
-      archive_write_error();
-      return false;
-    }
-    child_busy=true;
-    running_file=true;
-    // erase the part of the history that we are computing again
-    if (run_modif_pos<signed(history_in(context0).size()))
-      history_in(context0).erase(history_in(context0).begin()+run_modif_pos,history_in(context0).end());
-    if (run_modif_pos<signed(history_out(context0).size()))
-      history_out(context0).erase(history_out(context0).begin()+run_modif_pos,history_out(context0).end());
-#ifndef WIN32
-    kill(child_id,SIGUSR1);
-#endif
-    return true;
-#endif /// HAVE_NO_SIGNAL_H
-  }
-
-  static void updatePICT(const vecteur & args){
-    const_iterateur it=args.begin(),itend=args.end();
-    gen sortie;
-    for (;it!=itend;++it){
-      sortie=*it;
-      if (sortie.type==_POINTER_ && sortie.subtype==_FL_WIDGET_POINTER && fl_widget_updatepict_function){
-	sortie = fl_widget_updatepict_function(sortie);
-	// cerr << "updatepict" << sortie << '\n';
-      }
-      if ( (sortie.type==_SYMB) && equalposcomp(plot_sommets,sortie._SYMBptr->sommet)){
-#ifdef WITH_GNUPLOT
-	plot_instructions.push_back(sortie);
-#endif
-	if ((sortie._SYMBptr->feuille.type==_VECT) && (sortie._SYMBptr->feuille._VECTptr->size()==3) && (sortie._SYMBptr->feuille._VECTptr->back().type==_STRNG) && ( ((*sortie._SYMBptr->feuille._VECTptr)[1].type==_VECT) || is_zero((*sortie._SYMBptr->feuille._VECTptr)[1])) ){
-	  string lab=*(sortie._SYMBptr->feuille._VECTptr->back()._STRNGptr);
-#ifdef WITH_GNUPLOT
-	  if (lab.size() && (lab>=PICTautoname)){
-	    PICTautoname=lab;
-	    PICTautoname_plus_plus();
-	  }
-#endif
-	}
-      }
-      else {
-	if ( ((sortie.type==_SYMB) && (sortie._SYMBptr->sommet==at_erase)) ||
-             ((sortie.type==_FUNC) && (*sortie._FUNCptr==at_erase)) ){
-#ifdef WITH_GNUPLOT
-	  plot_instructions.clear();
-#endif
-	}
-	else {
-	  if ( (sortie.type==_VECT) && (sortie._VECTptr->size()) && (sortie._VECTptr->back().type==_SYMB) && (equalposcomp(plot_sommets,sortie._VECTptr->back()._SYMBptr->sommet))){
-#ifdef WITH_GNUPLOT
-	    plot_instructions.push_back(sortie);
-#endif
-	    sortie=sortie._VECTptr->back();
-	    if ((sortie._SYMBptr->feuille.type==_VECT) && (sortie._SYMBptr->feuille._VECTptr->size()==3) && (sortie._SYMBptr->feuille._VECTptr->back().type==_STRNG)  ){
-	      string lab=*(sortie._SYMBptr->feuille._VECTptr->back()._STRNGptr);
-#ifdef WITH_GNUPLOT
-	      if (lab.size() && (lab>=PICTautoname)){
-		PICTautoname=lab;
-		PICTautoname_plus_plus();
-	      }
-#endif
-	    } 
-	  }
-	  else {
-#ifdef WITH_GNUPLOT
-	    plot_instructions.push_back(zero);
-#endif
-	  }
-	}
-      }
-    } // end for (;it!=itend;++it)
-  } 
-
-  static void signal_child_ok(){
-    child_busy=true;
-    data_ready=false;
-    signal_plot_parent=false;
-#ifndef WIN32
-    kill(child_id,SIGUSR2);
-#endif // WIN32
-  }
-
-  static const unary_function_eval * parent_evalonly_sommets_alias[]={*(const unary_function_eval **) &at_widget_size,*(const unary_function_eval **) &at_keyboard,*(const unary_function_eval **) &at_current_sheet,*(const unary_function_eval **) &at_Row,*(const unary_function_eval **) &at_Col,0};
-  static const unary_function_ptr & parent_evalonly_sommets=(const unary_function_ptr *) parent_evalonly_sommets_alias;
-  static bool update_data(gen & entree,gen & sortie,GIAC_CONTEXT){
-    // if (entree.type==_IDNT)
-    //   entree=symbolic(at_sto,makevecteur(sortie,entree));
-    // discarded sto autoadd otherwise files with many definitions
-    // are overwritten
-    debug_ptr(contextptr)->debug_mode=false;
-    if (signal_plot_parent){
-      // cerr << "Child signaled " << entree << " " << sortie << '\n';
-      if ( entree.type==_SYMB ){
-	if ( (entree._SYMBptr->sommet==at_click && entree._SYMBptr->feuille.type==_VECT && entree._SYMBptr->feuille._VECTptr->empty() ) 
-	     || (entree._SYMBptr->sommet==at_debug) 
-	     ) {
-	  debug_ptr(contextptr)->debug_mode=(entree._SYMBptr->sommet==at_debug);
-	  // cerr << "Child waiting" << '\n';
-	  data_ready=false;
-	  *debug_ptr(contextptr)->debug_info_ptr=entree._SYMBptr->feuille;
-	  debug_ptr(contextptr)->debug_refresh=true;
-	  return true;
-	}
-	if ( entree._SYMBptr->sommet==at_click || entree._SYMBptr->sommet==at_inputform || entree._SYMBptr->sommet==at_interactive ){
-	  // cerr << entree << '\n';
-	  gen res=entree.eval(1,contextptr);
-	  // cerr << res << '\n';
-	  ofstream parent_out(cas_entree_name().c_str());
-	  archive(parent_out,res,contextptr);
-	  parent_out.close();
-	  signal_child_ok();
-	  return true;
-	}
-	// cerr << "Child signaled " << entree << " " << sortie << '\n';
-      }
-      if (sortie.type==_SYMB){
-	if (sortie._SYMBptr->sommet==at_SetFold){
-	  current_folder_name=sortie._SYMBptr->feuille;
-	  signal_child_ok();
-	  return false;
-	}
-	if (sortie._SYMBptr->sommet==at_sto && sortie._SYMBptr->feuille.type==_VECT){
-	  vecteur & v=*sortie._SYMBptr->feuille._VECTptr;
-	  // cerr << v << '\n';
-	  if ((v.size()==2) && (v[1].type==_IDNT)){
-	    if (v[1]._IDNTptr->value)
-	      delete v[1]._IDNTptr->value;
-	    v[1]._IDNTptr->value = new gen(v[0]);
-	  }
-	  signal_child_ok();
-	  return false;	  
-	}
-	if (sortie._SYMBptr->sommet==at_purge){
-	  gen & g=sortie._SYMBptr->feuille;
-	  if ((g.type==_IDNT) && (g._IDNTptr->value) ){
-	    delete g._IDNTptr->value;
-	    g._IDNTptr->value=0;
-	  }
-	  signal_child_ok();
-	  return false;
-	}
-	if ((sortie._SYMBptr->sommet==at_cd) && (sortie._SYMBptr->feuille.type==_STRNG)){
-#ifndef HAVE_NO_CWD
-	  chdir(sortie._SYMBptr->feuille._STRNGptr->c_str());
-#endif
-	  signal_child_ok();
-	  return false;
-	}
-	if ( sortie._SYMBptr->sommet==at_insmod || sortie._SYMBptr->sommet==at_rmmod || sortie._SYMBptr->sommet==at_user_operator ){
-	  protecteval(sortie,DEFAULT_EVAL_LEVEL,contextptr);
-	  signal_child_ok();
-	  return false;
-	}
-	if (sortie._SYMBptr->sommet==at_xyztrange){
-	  gen f=sortie._SYMBptr->feuille;
-	  if ( (f.type==_VECT) && (f._VECTptr->size()>=12)){
-	    protecteval(sortie,2,contextptr);
-            signal_child_ok();
-	    return false;
-	  }
-	}
-	if (sortie._SYMBptr->sommet==at_cas_setup){
-	  gen f=sortie._SYMBptr->feuille;
-	  if ( (f.type==_VECT) && (f._VECTptr->size()>=7)){
-	    vecteur v=*f._VECTptr;
-	    cas_setup(v,contextptr); 
-            signal_child_ok();
-	    return false;
-	  }
-	}
-      }
-      if (entree.type==_SYMB && entree._SYMBptr->sommet==at_signal && sortie.type==_SYMB && equalposcomp(parent_evalonly_sommets,sortie._SYMBptr->sommet) ) {
-	gen res=sortie.eval(1,contextptr);
-	ofstream parent_out(cas_entree_name().c_str());
-	archive(parent_out,res,contextptr);
-	parent_out.close();
-	signal_child_ok();	
-	return false;
-      }
-    } // end signal_plot_parent
-    // cerr << "# Parse time" << double(end-start)/CLOCKS_PER_SEC << '\n';
-    // see if it's a PICT update
-    vecteur args;
-    // update history
-    if (rpn_mode(contextptr)) {
-      if ((sortie.type==_VECT)&& (sortie.subtype==_RPN_STACK__VECT)){
-	history_out(contextptr)=*sortie._VECTptr;
-	history_in(contextptr)=vecteur(history_out(contextptr).size(),undef);
-	int i=erase_pos(contextptr);
-	args=vecteur(history_out(contextptr).begin()+i,history_out(contextptr).end());
-#ifdef WITH_GNUPLOT
-	plot_instructions.clear();
-#endif
-      }
-      else {
-	if (entree.type==_FUNC){
-	  int s=min(max(entree.subtype,0),(int)history_out(contextptr).size());
-	  vecteur v(s);
-	  for (int k=s-1;k>=0;--k){
-	    v[k]=history_out(contextptr).back();
-	    history_out(contextptr).pop_back();
-	    history_in(contextptr).pop_back();
-	  }
-	  entree=symbolic(*entree._FUNCptr,v);
-	}
-	history_in(contextptr).push_back(entree);
-	history_out(contextptr).push_back(sortie);
-	int i=erase_pos(contextptr);
-	args=vecteur(history_out(contextptr).begin()+i,history_out(contextptr).end());
-#ifdef WITH_GNUPLOT
-	plot_instructions.clear();
-#endif
-      }
-    }  
-    else {
-      bool fait=false;
-      if (running_file) {
-	if (entree.type==_VECT && sortie.type==_VECT) {
-	  history_in(contextptr)=mergevecteur(history_in(contextptr),*entree._VECTptr);
-	  history_out(contextptr)=mergevecteur(history_out(contextptr),*sortie._VECTptr);
-	  fait=true;
-	}
-	if (is_zero(entree) && is_zero(sortie))
-	  fait=true;
-      }
-      if (!fait){
-	if (in_texmacs){
-	  COUT << GIAC_DATA_BEGIN << "verbatim:";
-	  COUT << "ans(" << history_out(contextptr).size() << ") " << sortie << "\n";
-  
-	  COUT << GIAC_DATA_BEGIN << "latex:$$ " << gen2tex(entree,contextptr) << "\\quad = \\quad " << gen2tex(sortie,contextptr) << "$$" << GIAC_DATA_END;
-	  COUT << "\n";
-	  COUT << GIAC_DATA_BEGIN << "channel:prompt" << GIAC_DATA_END;
-          COUT << "quest(" << history_out(contextptr).size()+1 << ") ";
-          COUT << GIAC_DATA_END;
-          fflush (stdout);
-	}
-	history_in(contextptr).push_back(entree);
-	history_out(contextptr).push_back(sortie);
-	// for PICT update
-	args=vecteur(1,sortie);
-      }
-      if (running_file){
-	// for PICT update
-	int i=erase_pos(contextptr);
-	args=vecteur(history_out(contextptr).begin()+i,history_out(contextptr).end());
-	// CERR << "PICT clear" << '\n';
-#ifdef WITH_GNUPLOT
-	plot_instructions.clear();
-#endif
-        //running_file=false;
-      }
-      // now do the update
-    }
-    updatePICT(args);
-    data_ready=false;
-    if (signal_plot_parent)
-        signal_child_ok();
-    return true;
-  }
-
-  static void archive_read_error(){
-    CERR << "Read error on " << cas_sortie_name() << '\n';
-    data_ready=false;
-#ifndef WIN32
-    if (child_id)
-      kill(child_id,SIGKILL);
-#endif
-    child_id=0;
-  }
-
-  static bool read_data(gen & entree,gen & sortie,string & message,GIAC_CONTEXT){
-    if (!data_ready)
-      return false;
-    message="";
-    try {
-      ifstream parent_in(cas_sortie_name().c_str());
-      if (!parent_in)
-	setsizeerr();
-      CLOCK_T start, end;  
-      start = CLOCK();
-      entree=unarchive(parent_in,contextptr);
-      sortie=unarchive(parent_in,contextptr);
-      end = CLOCK();
-      parent_in.getline(buf,BUFFER_SIZE,'¿');
-      if (buf[0]=='\n')
-	message += (buf+1);
-      else
-	message += buf;
-      if (!parent_in)
-	setsizeerr();
-    } catch (std::runtime_error & ){
-      last_evaled_argptr(contextptr)=NULL;
-      archive_read_error();
-      return false;
-    }
-    return update_data(entree,sortie,contextptr);
-  }
-#endif // HAVE_SIGNAL_H_OLD
-
-  string home_directory(){
-    string s("/");
-#ifdef FXCG
-    return s;
-#else
-    if (getenv("GIAC_HOME"))
-      s=getenv("GIAC_HOME");
-    else {
-      if (getenv("XCAS_HOME"))
-	s=getenv("XCAS_HOME");
-    }
-    if (!s.empty() && s[s.size()-1]!='/')
-      s += '/';
-    if (s.size()!=1)
-      return s;
-#ifdef HAVE_NO_HOME_DIRECTORY
-    return s;
-#else
-    if (access("/etc/passwd",R_OK))
-      return "";
-    uid_t u=getuid();
-    passwd * p=getpwuid(u);
-    if (p) s=p->pw_dir;
-    return s+"/";
-#endif
-#endif
-  }
-
-#ifndef FXCG
-  string cas_entree_name(){
-    if (getenv("XCAS_TMP"))
-      return getenv("XCAS_TMP")+("/#cas_entree#"+print_INT_(parent_id));
-#ifdef IPAQ
-    return "/tmp/#cas_entree#"+print_INT_(parent_id);
-#else
-    return home_directory()+"#cas_entree#"+print_INT_(parent_id);
-#endif
-  }
-
-  string cas_sortie_name(){
-    if (getenv("XCAS_TMP"))
-      return getenv("XCAS_TMP")+("/#cas_sortie#"+print_INT_(parent_id));
-#ifdef IPAQ
-    return "/tmp/#cas_sortie#"+print_INT_(parent_id);
-#else
-    return home_directory()+"#cas_sortie#"+print_INT_(parent_id);
-#endif
-  }
-#endif
-  
-  void read_config(const string & name,GIAC_CONTEXT,bool verbose){
-#if !defined NSPIRE && !defined FXCG && !defined GIAC_HAS_STO_38
-#if !defined __MINGW_H 
-    if (access(name.c_str(),R_OK)) {
-      if (verbose)
-	CERR << "// Unable to find config file " << name << '\n';
-      return;
-    }
-#endif
-    ifstream inf(name.c_str());
-    if (!inf)
-      return;
-    vecteur args;
-    if (verbose)
-      CERR << "// Reading config file " << name << '\n';
-    readargs_from_stream(inf,args,contextptr);
-    gen g(args);
-    if (debug_infolevel || verbose)    
-      CERR << g << '\n';
-    g.eval(1,contextptr);
-    if (verbose){
-      CERR << "// User configuration done" << '\n';
-      CERR << "// Maximum number of parallel threads " << threads << '\n';
-      CERR << "Threads allowed " << threads_allowed << '\n';
-    }
-    if (debug_infolevel){
-#ifdef HASH_MAP_NAMESPACE
-      CERR << "Using hash_map_namespace"<< '\n';
-#endif
-      CERR << "Mpz_class allowed " << mpzclass_allowed << '\n';
-      // CERR << "Heap multiplication " << heap_mult << '\n';
-    }
-#endif
-  }
-
-  // Unix: configuration is read from xcas.rc in the giac_aide_location dir
-  // then from the user ~/.xcasrc
-  // Win: configuration from $XCAS_ROOT/xcas.rc then from home_dir()+xcasrc
-  // or if not available from current dir xcasrc
-  void protected_read_config(GIAC_CONTEXT,bool verbose){
-#ifndef NO_STDEXCEPT
-    try {
-#endif
-      string s;
-#ifdef WIN32
-      s=home_directory();
-#ifdef GNUWINCE
-	  s = xcasroot();
-#else
-      if (s.size()<2 && getenv("XCAS_ROOT")){
-	s=getenv("XCAS_ROOT");
-	if (debug_infolevel || verbose)
-	  CERR << "Found XCAS_ROOT " << s << '\n';
-      }
-#endif // GNUWINCE
-#else
-      s=giac_aide_location;
-      s=s.substr(0,s.size()-8);
-#endif
-      if (s.size())
-	read_config(s+"/xcas.rc",contextptr,verbose);
-      s=home_directory();
-      if (s.size()<2)
-	s="";
-      read_config(s+xcasrc(),contextptr,verbose);
-#ifndef NO_STDEXCEPT
-    }
-    catch (std::runtime_error & e){
-      last_evaled_argptr(contextptr)=NULL;
-      CERR << "Error in config file " << xcasrc() << " " << e.what() << '\n';
-    }
-#endif
-  }
-
-  string giac_aide_dir(){
-#if defined NSPIRE || defined FXCG || defined MINGW32
-    return xcasroot();
-#else
-    if (!access((xcasroot()+"aide_cas").c_str(),R_OK)){
-      return xcasroot();
-    }
-    if (getenv("XCAS_ROOT")){
-      string s=getenv("XCAS_ROOT");
-      return s;
-    }
-    if (xcasroot().size()>4 && xcasroot().substr(xcasroot().size()-4,4)=="bin/"){
-      string s(xcasroot().substr(0,xcasroot().size()-4));
-      s+="share/giac/";
-      if (!access((s+"aide_cas").c_str(),R_OK)){
-	return s;
-      }
-    }
-#ifdef __APPLE__
-    if (!access("/Applications/usr/share/giac/",R_OK))
-      return "/Applications/usr/share/giac/";
-    return "/Applications/usr/share/giac/";
-#endif
-#if defined WIN32 && !defined MINGW
-    return "/cygdrive/c/xcas/";
-#endif
-    string s(giac_aide_location); // ".../aide_cas"
-    // test if aide_cas is there, if not test at xcasroot() return ""
-    if (!access(s.c_str(),R_OK)){
-      s=s.substr(0,s.size()-8);
-      CERR << "// Giac share root-directory:" << s << '\n';
-      return s;
-    }
-    return "";
-#endif // __MINGW_H
-  }
-
-  std::string absolute_path(const std::string & orig_file){
-#ifdef BESTA_OS 
-    // BP: FIXME
-    return orig_file;
-#else
-#if (!defined WIN32) || (defined VISUALC)
-    if (orig_file[0]=='/')
-      return orig_file;
-    else
-      return giac_aide_dir()+orig_file;
-#else
-#if !defined GNUWINCE && !defined __MINGW_H
-     string res=orig_file;
-     const char *_epath;
-     _epath = orig_file.c_str()  ;
-     /* If we have a POSIX path list, convert to win32 path list */
-     if (_epath != NULL && *_epath != 0
-         && cygwin_posix_path_list_p (_epath)){
-#ifdef x86_64
-       int s = cygwin_conv_path (CCP_POSIX_TO_WIN_A , _epath, NULL, 0);
-       char * _win32path = (char *) malloc(s);
-       cygwin_conv_path(CCP_POSIX_TO_WIN_A,_epath, _win32path,s);
-       s=strlen(_win32path);
-#else
-       char * _win32path = (char *) malloc
-	 (cygwin_posix_to_win32_path_list_buf_size (_epath));
-       cygwin_posix_to_win32_path_list (_epath, _win32path);
-       int s=strlen(_win32path);
-#endif
-       res.clear();
-       for (int i=0;i<s;++i){
-	 char ch=_win32path[i];
-	 if (ch=='\\' || ch==' ')
-	   res += '\\';
-	 res += ch;
-       }
-       free(_win32path);
-     }
-     return res;
-#else
-    string file=orig_file,s;
-    if (file[0]!='/'){
-      file=giac_aide_dir()+file;
-    }
-    if (file.substr(0,10)=="/cygdrive/" || (file[0]!='/' && file[1]!=':')){
-      string s1=xcasroot();
-      if (file.substr(0,10)=="/cygdrive/")
-	s1=file[10]+(":"+file.substr(11,file.size()-11));
-      else {
-	// remove /cygdrive/
-	if (s1.substr(0,10)=="/cygdrive/")
-	  s1=s1[10]+(":"+s1.substr(11,s1.size()-11));
-	else
-	  s1="c:/xcas/";
-	s1 += file;
-      }
-      string s2;
-      int t=s1.size();
-      for (int i=0;i<t;++i){
-	if (s1[i]=='/')
-	  s2+="\\\\";
-	else {
-	  if (s1[i]==' ')
-	    s2+='\\';
-	  s2+=s1[i];
-	}
-      }
-      return s2;
-    }
-#endif // GNUWINCE
-#endif // WIN32
-    return orig_file;
-#endif // BESTA_OS
-  }
-
-  bool is_file_available(const char * ch){
-    if (!ch)
-      return false;
-#if !defined NSPIRE && !defined FXCG 
-#if defined MINGW32 && defined GIAC_GGB
-    return true;
-#else
-    if (access(ch,R_OK))
-      return false;
-#endif
-#endif
-    return true;
-  }
-
-  bool file_not_available(const char * ch){
-    return !is_file_available(ch);
-  }
-
-  static void add_slash(string & path){
-    if (!path.empty() && path[path.size()-1]!='/')
-      path += '/';
-  }
-#ifdef FXCG
-  const char * getenv(const char *){
-    return "";
-  }
-#endif
-
-  bool check_file_path(const string & s){
-    int ss=int(s.size()),i;
-    for (i=0;i<ss;++i){
-      if (s[i]==' ')
-	break;
-    }
-    string name=s.substr(0,i);
-#ifdef FXCG
-    const char ch[]="/";
-#else
-    const char * ch=getenv("PATH");
-#endif
-    if (!ch || name[0]=='/')
-      return is_file_available(name.c_str());
-    string path;
-    int l=int(strlen(ch));
-    for (i=0;i<l;++i){
-      if (ch[i]==':'){
-	if (!path.empty()){
-	  add_slash(path);
-	  if (is_file_available((path+name).c_str()))
-	    return true;
-	}
-	path="";
-      }
-      else
-	path += ch[i];
-    }
-    add_slash(path);
-    return path.empty()?false:is_file_available((path+name).c_str());
-  }
-
-  string browser_command(const string & orig_file){
-#if defined NSPIRE || defined FXCG || defined MINGW32
-    return "";
-#else
-    string file=orig_file;
-    string s;
-    bool url=false;
-    if (file.substr(0,4)=="http"){
-      url=true;
-      s="'"+file+"'";
-    }
-    else {
-      if (file[0]!='/'){
-#ifdef WIN32
-	file=giac_aide_dir()+file;
-#else    
-	s=giac_aide_dir();
-#endif
-      }
-      s="file:"+s+file;
-    }
-    if (debug_infolevel)
-      CERR << s << '\n';
-#ifdef WIN32
-    bool with_firefox=false;
-    /*
-    string firefox="/cygdrive/c/Program Files/Mozilla Firefox/firefox.exe";
-    if (getenv("BROWSER")){
-      string tmp=getenv("BROWSER");
-      if (tmp=="firefox" || tmp=="mozilla"){
-	with_firefox=!access(firefox.c_str(),R_OK);
-	if (!with_firefox){
-	  firefox="/cygdrive/c/Program Files/mozilla.org/Mozilla/mozilla.exe";
-	  with_firefox=!access(firefox.c_str(),R_OK);
-	}
-      }
-    }
-    */
-    if (!url && (file.substr(0,10)=="/cygdrive/" || (file[0]!='/' && file[1]!=':')) ){
-      string s1=xcasroot();
-      if (file.substr(0,10)=="/cygdrive/")
-	s1=file[10]+(":"+file.substr(11,file.size()-11));
-      else {
-	// remove /cygdrive/
-	if (s1.substr(0,10)=="/cygdrive/")
-	  s1=s1[10]+(":"+s1.substr(11,s1.size()-11));
-	else
-	  s1="c:/xcas/";
-	s1 += s.substr(5,s.size()-5);
-      }
-      CERR << "s1=" << s1 << '\n';
-      string s2;
-      if (with_firefox)
-	s2=s1;
-      else {
-	int t=int(s1.size());
-	for (int i=0;i<t;++i){
-	  if (s1[i]=='/')
-	    s2+="\\";
-	  else
-	    s2+=s1[i];
-	}
-      }
-      CERR << "s2=" << s2 << '\n';
-      s=s2;
-      // s="file:"+s2;
-      // s = s.substr(0,5)+"C:\\\\xcas\\\\"+s2;
-    }
-    // Remove # trailing part of URL
-    int ss=int(s.size());
-    for (--ss;ss>0;--ss){
-      if (s[ss]=='#' || s[ss]=='.' || s[ss]=='/' )
-	break;
-    }
-    if (ss && s[ss]!='.')
-      s=s.substr(0,ss);
-    s=xcasroot()+"cygstart.exe '"+s+"' &";
-    /*
-    if (with_firefox){
-      s="'"+firefox+"' '"+s+"' &";
-    }
-    else {
-      if (getenv("BROWSER"))
-	s=getenv("BROWSER")+(" '"+s+"' &");
-      else 
-	s="'/cygdrive/c/Program Files/Internet Explorer/IEXPLORE.EXE' '"+s+"' &";
-    }
-    */
-#else
-    string browser;
-    if (getenv("BROWSER"))
-      browser=getenv("BROWSER");
-    else {
-#ifdef __APPLE__
-      browser="open" ; // browser="/Applications/Safari.app/Contents/MacOS/Safari";
-      // Remove file: that seems not supported by Safari
-      if (!url)
-	s = s.substr(5,s.size()-5);
-      // Remove # trailing part of URL
-      int ss=s.size();
-      for (--ss;ss>0;--ss){
-	if (s[ss]=='#' || s[ss]=='.' || s[ss]=='/' )
-	  break;
-      }
-      if (ss && s[ss]!='.')
-	s=s.substr(0,ss);
-#else
-      browser="mozilla";
-      if (!access("/usr/bin/dillo",R_OK))
-	browser="dillo";
-      if (!access("/usr/bin/chromium",R_OK))
-	browser="chromium";
-      if (!access("/usr/bin/firefox",R_OK))
-	browser="firefox";
-#endif
-    }
-    // find binary name
-    int bs=browser.size(),i;
-    for (i=bs-1;i>=0;--i){
-      if (browser[i]=='/')
-	break;
-    }
-    ++i;
-    string browsersub=browser.substr(i,bs-i);
-    if (s[0]!='\'') s='\''+s+'\'';
-    if (browsersub=="mozilla" || browsersub=="mozilla-bin" || browsersub=="firefox" || browsersub=="chromium"){
-      s="if ! "+browser+" -remote \"openurl("+s+")\" ; then "+browser+" "+s+" & fi &";
-    }
-    else
-      s=browser+" "+s+" &";
-#endif
-    //if (debug_infolevel)
-      CERR << "// Running command:"+ s<<'\n';
-    return s;
-#endif // __MINGW_H
-  }
-
-  bool system_browser_command(const string & file){
-#if defined BESTA_OS || defined POCKETCAS
-    return false;
-#else
-#ifdef WIN32
-    string res=file;
-    if (file.size()>4 && file.substr(0,4)!="http" && file.substr(0,4)!="file"){
-      if (res[0]!='/')
-	res=giac_aide_dir()+res;
-      // Remove # trailing part of URL
-      int ss=int(res.size());
-      for (--ss;ss>0;--ss){
-	if (res[ss]=='#' || res[ss]=='.' || res[ss]=='/' )
-	  break;
-      }
-      if (ss && res[ss]!='.')
-	res=res.substr(0,ss);
-      CERR << res << '\n';
-#if !defined VISUALC && !defined __MINGW_H && !defined NSPIRE && !defined FXCG
-      /* If we have a POSIX path list, convert to win32 path list */
-      const char *_epath;
-      _epath = res.c_str()  ;
-      if (_epath != NULL && *_epath != 0
-	  && cygwin_posix_path_list_p (_epath)){
-#ifdef x86_64
-	int s = cygwin_conv_path (CCP_POSIX_TO_WIN_A , _epath, NULL, 0);
-	char * _win32path = (char *) malloc(s);
-	cygwin_conv_path(CCP_POSIX_TO_WIN_A,_epath, _win32path,s);
-#else
-	char * _win32path = (char *) malloc (cygwin_posix_to_win32_path_list_buf_size (_epath));
-	cygwin_posix_to_win32_path_list (_epath, _win32path);
-#endif
-	res = _win32path;
-	free(_win32path);
-      }
-#endif
-    }
-    CERR << res << '\n';
-#if !defined VISUALC && !defined NSPIRE && !defined FXCG
-#ifdef __MINGW_H
-    while (res.size()>=2 && res.substr(0,2)=="./")
-      res=res.substr(2,res.size()-2);
-    if (res.size()<4 || res.substr(0,4)!="http")
-      res = "file:///c:/xcaswin/"+res;
-    CERR << "running open on " << res << '\n';
-    //ShellExecute(NULL,"open","file:///c:/xcaswin/doc/fr/cascmd_fr/index.html",\
-NULL,NULL,SW_SHOWNORMAL);
-    ShellExecute(NULL,"open",res.c_str(),NULL,NULL,SW_SHOWNORMAL);
-#else
-    // FIXME: works under visualc but not using /UNICODE flag
-    // find correct flag
-    ShellExecute(NULL,NULL,res.c_str(),NULL,NULL,1);
-#endif
-#endif
-    return true;
-#else
-#ifdef BESTA_OS
-    return false; // return 1;
-#else
-    return !system_no_deprecation(browser_command(file).c_str());
-#endif
-#endif
-#endif
-  }
-
-  vecteur remove_multiples(vecteur & ww){
-    vecteur w;
-    if (!ww.empty()){
-      islesscomplexthanf_sort(ww.begin(),ww.end());
-      gen prec=ww[0];
-      for (unsigned i=1;i<ww.size();++i){
-	if (ww[i]==prec)
-	  continue;
-	w.push_back(prec);
-	prec=ww[i];
-      }
-      w.push_back(prec);
-    }
-    return w;
-  }
-
-  int equalposcomp(const vector<int> v,int i){
-    vector<int>::const_iterator it=v.begin(),itend=v.end();
-    for (;it!=itend;++it)
-      if (*it==i)
-	return int(it-v.begin())+1;
-    return 0;
-  }
-
-  int equalposcomp(const vector<short int> v,int i){
-    vector<short int>::const_iterator it=v.begin(),itend=v.end();
-    for (;it!=itend;++it)
-      if (*it==i)
-	return int(it-v.begin())+1;
-    return 0;
-  }
-
-  int equalposcomp(int tab[],int f){
-    for (int i=1;*tab!=0;++tab,++i){
-      if (*tab==f)
-	return i;
-    }
-    return 0;
-  }
-
-  std::string find_lang_prefix(int i){
-    switch (i){
-    case 1:
-      return "fr/";
-    case 2:
-      return "en/";
-    case 3:
-      return "es/";
-    case 4:
-      return "el/";
-    case 9:
-      return "pt/";
-    case 6:
-      return "it/";
-      /*
-    case 7:
-      return "tr/";
-      break;
-      */
-    case 8:
-      return "zh/";
-    case 5:
-      return "de/";
-      break;
-    default:
-      return "local/";
-    }  
-  }
-
-  std::string find_doc_prefix(int i){
-    switch (i){
-    case 1:
-      return "doc/fr/";
-      break;
-    case 2:
-      return "doc/en/";
-      break;
-    case 3:
-      return "doc/es/";
-      break;
-    case 4:
-      return "doc/el/";
-      break;
-    case 9:
-      return "doc/pt/";
-      break;
-    case 6:
-      return "doc/it/";
-      break;
-      /*
-    case 7:
-      return "doc/tr/";
-      break;
-      */
-    case 8:
-      return "doc/zh/";
-      break;
-    case 5:
-      return "doc/de/";
-      break;
-    default:
-      return "doc/local/";
-    }  
-  }
-
-  void update_completions(){
-    if (vector_completions_ptr()){
-      vector_completions_ptr()->clear();
-      int n=int(vector_aide_ptr()->size());
-      for (int k=0;k<n;++k){
-	if (debug_infolevel>10)
-	  CERR << "+ " << (*vector_aide_ptr())[k].cmd_name  << '\n';
-	vector_completions_ptr()->push_back((*vector_aide_ptr())[k].cmd_name);
-      }
-    }
-  }
-
-  void add_language(int i,GIAC_CONTEXT){
-#ifdef FXCG
-    return;
-#else
-    if (!equalposcomp(lexer_localization_vector(),i)){
-      lexer_localization_vector().push_back(i);
-      update_lexer_localization(lexer_localization_vector(),lexer_localization_map(),back_lexer_localization_map(),contextptr);
-#if !defined(EMCC) && !defined(EMCC2)
-      if (vector_aide_ptr()){
-	// add locale command description
-	int count;
-	string filename=giac_aide_dir()+find_doc_prefix(i)+"aide_cas";
-	readhelp(*vector_aide_ptr(),filename.c_str(),count,false);
-	// add synonyms
-	multimap<string,localized_string>::iterator it,backend=back_lexer_localization_map().end(),itend;
-	vector<aide>::iterator jt = vector_aide_ptr()->begin(),jtend=vector_aide_ptr()->end();
-	for (;jt!=jtend;++jt){
-	  it=back_lexer_localization_map().find(jt->cmd_name);
-	  itend=back_lexer_localization_map().upper_bound(jt->cmd_name);
-	  if (it!=backend){
-	    for (;it!=itend;++it){
-	      if (it->second.language==i)
-		jt->synonymes.push_back(it->second);
-	    }
-	  }
-	}
-	int s = int(vector_aide_ptr()->size());
-	for (int j=0;j<s;++j){
-	  aide a=(*vector_aide_ptr())[j];
-	  it=back_lexer_localization_map().find(a.cmd_name);
-	  itend=back_lexer_localization_map().upper_bound(a.cmd_name);
-	  if (it!=backend){
-	    for (;it!=itend;++it){
-	      if (it->second.language==i){
-		a.cmd_name=it->second.chaine;
-		a.language=it->second.language;
-		vector_aide_ptr()->push_back(a);
-	      }
-	    }
-	  }
-	}
-#ifndef KHICAS
-	CERR << "Added " << vector_aide_ptr()->size()-s << " synonyms" << '\n';
-#endif
-	sort(vector_aide_ptr()->begin(),vector_aide_ptr()->end(),alpha_order);
-	update_completions();
-      }
-#endif
-    }
-#endif // FXCG
-  }
-
-  void remove_language(int i,GIAC_CONTEXT){
-#ifdef FXCG
-    return;
-#else
-    if (int pos=equalposcomp(lexer_localization_vector(),i)){
-      if (vector_aide_ptr()){
-	vector<aide> nv;
-	int s=int(vector_aide_ptr()->size());
-	for (int j=0;j<s;++j){
-	  if ((*vector_aide_ptr())[j].language!=i)
-	    nv.push_back((*vector_aide_ptr())[j]);
-	}
-	*vector_aide_ptr() = nv;
-	update_completions();
-	vector<aide>::iterator jt = vector_aide_ptr()->begin(),jtend=vector_aide_ptr()->end();
-	for (;jt!=jtend;++jt){
-	  vector<localized_string> syno;
-	  vector<localized_string>::const_iterator kt=jt->synonymes.begin(),ktend=jt->synonymes.end();
-	  for (;kt!=ktend;++kt){
-	    if (kt->language!=i)
-	      syno.push_back(*kt);
-	  }
-	  jt->synonymes=syno;
-	}
-      }
-      --pos;
-      lexer_localization_vector().erase(lexer_localization_vector().begin()+pos);
-      update_lexer_localization(lexer_localization_vector(), lexer_localization_map(), back_lexer_localization_map(), contextptr);
-	}
-#endif
-  }
-
-  int string2lang(const string & s){
-    if (s=="fr")
-      return 1;
-    if (s=="en")
-      return 2;
-    if (s=="sp" || s=="es")
-      return 3;
-    if (s=="el")
-      return 4;
-    if (s=="pt")
-      return 9;
-    if (s=="it")
-      return 6;
-    if (s=="tr")
-      return 7;
-    if (s=="zh")
-      return 8;
-    if (s=="de")
-      return 5;
-    return 0;
-  }
-
-  std::string set_language(int i,GIAC_CONTEXT){
-#if defined(EMCC) || defined(EMCC2)
-    if (language(contextptr)!=i){
-      language(i,contextptr);
-      add_language(i,contextptr);
-    }
-#else
-    language(i,contextptr);
-    add_language(i,contextptr);
-#endif
-#ifdef KHICAS
-    lang=i;
-#endif
-    return find_doc_prefix(i);
-  }
-
-  std::string read_env(GIAC_CONTEXT,bool verbose){
-#ifndef RTOS_THREADX
-#ifndef BESTA_OS
-    if (getenv("GIAC_LAPACK")){
-      CALL_LAPACK=atoi(getenv("GIAC_LAPACK"));
-      if (verbose)
-	CERR << "// Will call lapack if dimension is >=" << CALL_LAPACK << '\n';
-    }
-    if (getenv("GIAC_PADIC")){
-      GIAC_PADIC=atoi(getenv("GIAC_PADIC"));
-      if (verbose)
-	CERR << "// Will use p-adic algorithm if dimension is >=" << GIAC_PADIC << '\n';
-    }
-#endif
-#endif
-    if (getenv("XCAS_RPN")){
-      if (verbose)
-	CERR << "// Setting RPN mode" << '\n';
-      rpn_mode(contextptr)=true;
-    }
-    if (getenv("GIAC_XCAS_MODE")){
-      xcas_mode(contextptr)=atoi(getenv("GIAC_XCAS_MODE"));
-      if (verbose)
-	CERR << "// Setting maple mode " << xcas_mode(contextptr) << '\n';
-    }
-    if (getenv("GIAC_C")){
-      xcas_mode(contextptr)=0;
-      if (verbose)
-	CERR << "// Setting giac C mode" << '\n';
-    }
-    if (getenv("GIAC_MAPLE")){
-      xcas_mode(contextptr)=1;
-      if (verbose)
-	CERR << "// Setting giac maple mode" << '\n';
-    }
-    if (getenv("GIAC_MUPAD")){
-      xcas_mode(contextptr)=2;
-      if (verbose)
-	CERR << "// Setting giac mupad mode" << '\n';
-    }
-    if (getenv("GIAC_TI")){
-      xcas_mode(contextptr)=3;
-      if (verbose)
-	CERR << "// Setting giac TI mode" << '\n';
-    }
-    if (getenv("GIAC_MONO")){
-      if (verbose)
-	CERR << "// Threads polynomial * disabled" << '\n';
-      threads_allowed=false;
-    }
-    if (getenv("GIAC_MPZCLASS")){
-      if (verbose)
-	CERR << "// mpz_class enabled" << '\n';
-      mpzclass_allowed=true;
-    }
-    if (getenv("GIAC_DEBUG")){
-      debug_infolevel=atoi(getenv("GIAC_DEBUG"));
-      CERR << "// Setting debug_infolevel to " << debug_infolevel << '\n';
-    }
-    if (getenv("GIAC_PRINTPROG")){ 
-      // force print of prog at parse, 256 for python compat mode print
-      printprog=atoi(getenv("GIAC_PRINTPROG"));
-      CERR << "// Setting printprog to " << printprog << '\n';
-    }
-    string s;
-    if (getenv("LANG"))
-      s=getenv("LANG");
-    else { // __APPLE__ workaround
-#if !defined VISUALC && !defined NSPIRE && !defined FXCG
-      if (!strcmp(gettext("File"),"Fich")){
-	setenv("LANG","fr_FR.UTF8",1);
-	s="fr_FR.UTF8";
-      }
-      else {
-	s="en_US.UTF8";
-	setenv("LANG",s.c_str(),1);
-      }
-      if (!strcmp(gettext("File"),"Datei")){
-	setenv("LANG","de_DE.UTF8",1);
-	s="de_DE.UTF8";
-      }
-#endif
-    }
-    if (s.size()>=2){
-      s=s.substr(0,2);
-      int i=string2lang(s);
-      if (i){
-	language(i,contextptr);
-	return find_doc_prefix(i);
-      }
-    }
-    language(0,contextptr);
-    return find_doc_prefix(0);
-  }
-
-  string cas_setup_string(GIAC_CONTEXT){
-    string s("cas_setup(");
-    s += print_VECT(cas_setup(contextptr),_SEQ__VECT,contextptr);
-    s += "),";
-    s += "xcas_mode(";
-    s += print_INT_(xcas_mode(contextptr)+python_compat(contextptr)*256);
-    s += ")";
-    return s;
-  }
-
-  string geo_setup_string(){
-    return xyztrange(gnuplot_xmin,gnuplot_xmax,gnuplot_ymin,gnuplot_ymax,gnuplot_zmin,gnuplot_zmax,gnuplot_tmin,gnuplot_tmax,global_window_xmin,global_window_xmax,global_window_ymin,global_window_ymax,_show_axes_,class_minimum,class_size,
-#ifdef WITH_GNUPLOT
-		     gnuplot_hidden3d,gnuplot_pm3d
-#else
-		     1,1
-#endif
-		     ).print(context0);
-  }
-
-  string add_extension(const string & s,const string & ext,const string & def){
-    if (s.empty())
-      return def+"."+ext;
-    int i=int(s.size());
-    for (--i;i>0;--i){
-      if (s[i]=='.')
-	break;
-    }
-    if (i<=0)
-      return s+"."+ext;
-    return s.substr(0,i)+"."+ext;
-  }
-
-#ifdef HAVE_LIBPTHREAD
-  pthread_mutex_t context_list_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-  vector<context *> & context_list(){
-    static vector<context *> * ans=0;
-    if (!ans) ans=new vector<context *>(1,(context *) 0);
-    return *ans;
-  }
-  context::context() { 
-    // CERR << "new context " << this << '\n';
-    parent=0;
-    tabptr=new sym_tab; 
-    globalcontextptr=this; previous=0; globalptr=new global; 
-    quoted_global_vars=new vecteur;
-    rootofs=new vecteur;
-    history_in_ptr=new vecteur;
-    history_out_ptr=new vecteur;
-    history_plot_ptr=new vecteur;
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_lock(&context_list_mutex);
-#endif
-    context_list().push_back(this);
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_unlock(&context_list_mutex);
-#endif
-  }
-
-#ifndef RTOS_THREADX
-#if !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined(KHICAS)
-  std::map<std::string,context *> * context_names = new std::map<std::string,context *> ;
-
-  context::context(const string & name) { 
-    // CERR << "new context " << this << '\n';
-    parent=0;
-    tabptr=new sym_tab; 
-    globalcontextptr=this; previous=0; globalptr=new global; 
-    quoted_global_vars=new vecteur;
-    rootofs=new vecteur;
-    history_in_ptr=new vecteur;
-    history_out_ptr=new vecteur;
-    history_plot_ptr=new vecteur;
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_lock(&context_list_mutex);
-#endif
-    context_list().push_back(this);
-    if (context_names)
-      (*context_names)[name]=this;
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_unlock(&context_list_mutex);
-#endif
-  }
-#endif
-#endif
-
-  context::context(const context & c) { 
-    *this = c;
-  }
-
-  context * context::clone() const{
-    context * ptr = new context;
-    *ptr->globalptr = *globalptr;
-    return ptr;
-  }
-
-  void init_context(context * ptr){
-    if (!ptr){
-      CERR << "init_context on null context" << '\n';
-      return;
-    }
-     ptr->globalptr->_xcas_mode_=_xcas_mode_;
-#ifdef GIAC_HAS_STO_38
-     ptr->globalptr->_calc_mode_=-38;
-#else
-     ptr->globalptr->_calc_mode_=_calc_mode_;
-#endif
-     ptr->globalptr->_decimal_digits_=_decimal_digits_;
-     ptr->globalptr->_minchar_for_quote_as_string_=_minchar_for_quote_as_string_;
-     ptr->globalptr->_scientific_format_=_scientific_format_;
-     ptr->globalptr->_integer_format_=_integer_format_;
-     ptr->globalptr->_integer_mode_=_integer_mode_;
-     ptr->globalptr->_latex_format_=_latex_format_;
-#ifdef BCD
-     ptr->globalptr->_bcd_decpoint_=_bcd_decpoint_;
-     ptr->globalptr->_bcd_mantissa_=_bcd_mantissa_;
-     ptr->globalptr->_bcd_flags_=_bcd_flags_;
-     ptr->globalptr->_bcd_printdouble_=_bcd_printdouble_;
-#endif
-     ptr->globalptr->_expand_re_im_=_expand_re_im_;
-     ptr->globalptr->_do_lnabs_=_do_lnabs_;
-     ptr->globalptr->_eval_abs_=_eval_abs_;
-     ptr->globalptr->_eval_equaltosto_=_eval_equaltosto_;
-     ptr->globalptr->_complex_mode_=_complex_mode_;
-     ptr->globalptr->_escape_real_=_escape_real_;
-     ptr->globalptr->_try_parse_i_=_try_parse_i_;
-     ptr->globalptr->_specialtexprint_double_=_specialtexprint_double_;
-     ptr->globalptr->_atan_tan_no_floor_=_atan_tan_no_floor_;
-     ptr->globalptr->_keep_acosh_asinh_=_keep_acosh_asinh_;
-     ptr->globalptr->_keep_algext_=_keep_algext_;
-     ptr->globalptr->_auto_assume_=_auto_assume_;
-     ptr->globalptr->_parse_e_=_parse_e_;
-     ptr->globalptr->_convert_rootof_=_convert_rootof_;
-     ptr->globalptr->_python_compat_=_python_compat_;
-     ptr->globalptr->_complex_variables_=_complex_variables_;
-     ptr->globalptr->_increasing_power_=_increasing_power_;
-     ptr->globalptr->_approx_mode_=_approx_mode_;
-     ptr->globalptr->_series_variable_name_=_series_variable_name_;
-     ptr->globalptr->_series_default_order_=_series_default_order_;
-     ptr->globalptr->_autosimplify_=_autosimplify_();
-     ptr->globalptr->_lastprog_name_=_lastprog_name_();
-     ptr->globalptr->_angle_mode_=_angle_mode_;
-     ptr->globalptr->_variables_are_files_=_variables_are_files_;
-     ptr->globalptr->_bounded_function_no_=_bounded_function_no_;
-     ptr->globalptr->_series_flags_=_series_flags_; // bit1= full simplify, bit2=1 for truncation
-     ptr->globalptr->_step_infolevel_=_step_infolevel_; // bit1= full simplify, bit2=1 for truncation
-     ptr->globalptr->_local_eval_=_local_eval_;
-     ptr->globalptr->_default_color_=_default_color_;
-     ptr->globalptr->_epsilon_=_epsilon_<=0?1e-12:_epsilon_;
-     ptr->globalptr->_proba_epsilon_=_proba_epsilon_;
-     ptr->globalptr->_withsqrt_=_withsqrt_;
-     ptr->globalptr->_show_point_=_show_point_; // show 3-d point 
-     ptr->globalptr->_io_graph_=_io_graph_; // show 2-d point in io
-     ptr->globalptr->_show_axes_=_show_axes_;
-     ptr->globalptr->_spread_Row_=_spread_Row_;
-     ptr->globalptr->_spread_Col_=_spread_Col_;
-     ptr->globalptr->_printcell_current_row_=_printcell_current_row_;
-     ptr->globalptr->_printcell_current_col_=_printcell_current_col_;
-     ptr->globalptr->_all_trig_sol_=_all_trig_sol_;
-     ptr->globalptr->_lexer_close_parenthesis_=_lexer_close_parenthesis_;
-     ptr->globalptr->_rpn_mode_=_rpn_mode_;
-     ptr->globalptr->_ntl_on_=_ntl_on_;
-     ptr->globalptr->_prog_eval_level_val =_prog_eval_level_val ;
-     ptr->globalptr->_eval_level=_eval_level;
-     ptr->globalptr->_rand_seed=_rand_seed;
-     ptr->globalptr->_language_=_language_;
-     ptr->globalptr->_last_evaled_argptr_=_last_evaled_argptr_;
-     ptr->globalptr->_last_evaled_function_name_=_last_evaled_function_name_;
-     ptr->globalptr->_currently_scanned_="";
-     ptr->globalptr->_max_sum_sqrt_=_max_sum_sqrt_;      
-     ptr->globalptr->_max_sum_add_=_max_sum_add_;   
-     
-  }
-
-  context * clone_context(const context * contextptr) {
-    context * ptr = new context;
-    if (contextptr){
-      *ptr->globalptr = *contextptr->globalptr;
-      *ptr->tabptr = *contextptr->tabptr;
-    }
-    else {
-      init_context(ptr);
-    }
-    return ptr;
-  }
-
-  context::~context(){
-    // CERR << "delete context " << this << '\n';
-    if (!previous){
-      if (history_in_ptr)
-	delete history_in_ptr;
-      if (history_out_ptr)
-	delete history_out_ptr;
-      if (history_plot_ptr)
-	delete history_plot_ptr;
-      if (quoted_global_vars)
-	delete quoted_global_vars;
-      if (rootofs)
-	delete rootofs;
-      if (globalptr)
-	delete globalptr;
-      if (tabptr)
-	delete tabptr;
-#ifdef HAVE_LIBPTHREAD
-      pthread_mutex_lock(&context_list_mutex);
-#endif
-      int s=int(context_list().size());
-      for (int i=s-1;i>0;--i){
-	if (context_list()[i]==this){
-	  context_list().erase(context_list().begin()+i);
-	  break;
-	}
-      }
-#ifndef RTOS_THREADX
-#if !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined(KHICAS)
-      if (context_names){
-	map<string,context *>::iterator it=context_names->begin(),itend=context_names->end();
-	for (;it!=itend;++it){
-	  if (it->second==this){
-	    context_names->erase(it);
-	    break;
-	  }
-	}
-      }
-#endif
-#endif
-#ifdef HAVE_LIBPTHREAD
-      pthread_mutex_unlock(&context_list_mutex);
-#endif
-    }
-  }
-
-#ifndef CLK_TCK
-#define CLK_TCK 1
-#endif
-
-#ifndef HAVE_NO_SYS_TIMES_H
-   double delta_tms(struct tms tmp1,struct tms tmp2){
-#if defined(HAVE_SYSCONF) && !defined(EMCC) && !defined(EMCC2)
-     return double( tmp2.tms_utime+tmp2.tms_stime+tmp2.tms_cutime+tmp2.tms_cstime-(tmp1.tms_utime+tmp1.tms_stime+tmp1.tms_cutime+tmp1.tms_cstime) )/sysconf(_SC_CLK_TCK);
-#else
-    return double( tmp2.tms_utime+tmp2.tms_stime+tmp2.tms_cutime+tmp2.tms_cstime-(tmp1.tms_utime+tmp1.tms_stime+tmp1.tms_cutime+tmp1.tms_cstime) )/CLK_TCK;
-#endif
-   }
-#elif defined(__MINGW_H)
-  double delta_tms(clock_t tmp1,clock_t tmp2) {
-    return (double)(tmp2-tmp1)/CLOCKS_PER_SEC;
-  }
-#endif /// HAVE_NO_SYS_TIMES_H
-
-  string remove_filename(const string & s){
-    int l=int(s.size());
-    for (;l;--l){
-      if (s[l-1]=='/')
-	break;
-    }
-    return s.substr(0,l);
-  }
-
-#ifdef HAVE_LIBPTHREAD
-  static void * in_thread_eval(void * arg){
-    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,NULL);
-    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL);
-    vecteur *v = (vecteur *) arg;
-    context * contextptr=(context *) (*v)[2]._POINTER_val;
-    thread_param * ptr =thread_param_ptr(contextptr);
-    pthread_attr_getstacksize(&ptr->attr,&ptr->stacksize);
-    ptr->stackaddr=(void *) ((uintptr_t) &ptr-ptr->stacksize);
-#ifndef __MINGW_H
-    struct tms tmp1,tmp2;
-    times(&tmp1);
-#else
-    int beg=CLOCK();
-#endif
-    gen g = (*v)[0];
-    g = protecteval(g,(*v)[1].val,contextptr);
-#ifndef NO_STDEXCEPT
-    try {
-#endif
-#ifndef __MINGW_H
-      times(&tmp2);
-      double dt=delta_tms(tmp1,tmp2);
-      total_time(contextptr) += dt;
-      (*v)[4]=dt;
-#else
-      int end=CLOCK();
-      (*v)[4]=end-beg;
-#endif
-      (*v)[5]=g;
-#ifndef NO_STDEXCEPT
-    } catch (std::runtime_error & e){
-      last_evaled_argptr(contextptr)=NULL;
-    }
-#endif
-    ptr->stackaddr=0;
-    thread_eval_status(0,contextptr);
-    pthread_exit(0);
-    return 0;
-  }
-
-  // create a new thread for evaluation of g at level level in context
-  bool make_thread(const gen & g,int level,const giac_callback & f,void * f_param,const context * contextptr){
-    if (is_context_busy(contextptr))
-      return false;
-    thread_param * ptr =thread_param_ptr(contextptr);
-    if (!ptr || ptr->v.size()!=6)
-      return false;
-    pthread_mutex_lock(mutexptr(contextptr));
-    ptr->v[0]=g;
-    ptr->v[1]=level;
-    ptr->v[2]=gen((void *)contextptr,_CONTEXT_POINTER);
-    ptr->f=f;
-    ptr->f_param=f_param;
-    thread_eval_status(1,contextptr);
-    pthread_attr_init(&ptr->attr);
-    int cres=pthread_create (&ptr->eval_thread, &ptr->attr, in_thread_eval,(void *)&ptr->v);
-    if (cres){
-      thread_eval_status(0,contextptr);
-      pthread_mutex_unlock(mutexptr(contextptr));
-    }
-    return !cres;
-  }
-
-  // check if contextptr has a running evaluation thread
-  // if not returns -1
-  // if evaluation is not finished return 1
-  // if evaluation is finished, clear mutex lock and 
-  // call the thread_param_ptr callback function with the evaluation value
-  // and returns 0
-  // otherwise returns status, 2=debug, 3=wait click
-  int check_thread(context * contextptr){
-    if (!is_context_busy(contextptr))
-      return -1;
-    int status=thread_eval_status(contextptr);
-    if (status!=0 && !kill_thread(contextptr))
-      return status;
-    thread_param tp = *thread_param_ptr(contextptr);
-    if (status==0){
-      // unsigned thread_return_value=0;
-      // void * ptr_return=&thread_return_value;
-      // pthread_join(eval_thread,&ptr_return);
-      if (
-#ifdef __MINGW_H
-	  1
-#else
-	  tp.eval_thread
-#endif
-	  ){
-	giac_callback f=tp.f;
-	gen arg_callback=tp.v[5];
-	void * param_callback=tp.f_param;
-	double tt=tp.v[4]._DOUBLE_val;
-	pthread_join(tp.eval_thread,0); 
-	pthread_mutex_unlock(mutexptr(contextptr));
-	// double tt=double(tp.v[4].val)/CLOCKS_PER_SEC;
-	if (tt>0.4)
-	  (*logptr(contextptr)) << gettext("\nEvaluation time: ") << tt << '\n';
-	if (f)
-	  f(arg_callback,param_callback);
-	else
-	  (*logptr(contextptr)) << arg_callback << '\n';
-	return 0;
-      }
-    }
-    if (kill_thread(contextptr)){
-      kill_thread(false,contextptr);
-      thread_eval_status(0,contextptr);
-      clear_prog_status(contextptr);
-      cleanup_context(contextptr);
-      if (tp.f)
-	tp.f(string2gen("Aborted",false),tp.f_param);
-#if !defined __MINGW_H && !defined KHICAS
-      *logptr(contextptr) << gettext("Thread ") << tp.eval_thread << " has been cancelled" << '\n';
-#endif
-#ifdef NO_STDEXCEPT
-      pthread_cancel(tp.eval_thread) ;
-#else
-      try {
-	pthread_cancel(tp.eval_thread) ;
-      } catch (...){
-      }
-#endif
-      pthread_mutex_unlock(mutexptr(contextptr));
-      return -1;
-    }
-    return status;
-  }
-
-  // check contexts in context_list starting at index i, 
-  // returns at first context with status >= 2
-  // return value is -2 (invalid range), -1 (ok) or context number
-  int check_threads(int i){
-    int s,ans=-1;
-    context * cptr;
-    if (// i>=s || 
-	i<0)
-      return -2;
-    for (;;++i){
-      pthread_mutex_lock(&context_list_mutex);
-      s=context_list().size();
-      if (i<s)
-	cptr=context_list()[i];
-      pthread_mutex_unlock(&context_list_mutex);
-      if (i>=s)
-	break;
-      int res=check_thread(cptr);
-      if (res>1){
-	ans=i;
-	break;
-      }
-    }
-    return ans;
-  }
-
-  gen thread_eval(const gen & g_,int level,context * contextptr,void (* wait_0001)(context *) ){
-    gen g=equaltosto(g_,contextptr);
-    /* launch a new thread for evaluation only,
-       no more readqueue, readqueue is done by the "parent" thread
-       Ctrl-C will kill the "child" thread
-       wait_001 is a function that should wait 0.001 s and update thinks
-       for example it could remove idle callback of a GUI
-       then call the wait function of the GUI and readd callbacks
-    */
-    pthread_t eval_thread;
-    vecteur v(6);
-    v[0]=g;
-    v[1]=level;
-    v[2]=gen(contextptr,_CONTEXT_POINTER);
-    pthread_mutex_lock(mutexptr(contextptr));
-    thread_eval_status(1,contextptr);
-    int cres=pthread_create (&eval_thread, (pthread_attr_t *) NULL, in_thread_eval,(void *)&v);
-    if (!cres){
-      for (;;){
-	int eval_status=thread_eval_status(contextptr);
-	if (!eval_status)
-	  break;
-	wait_0001(contextptr);
-	if (kill_thread(contextptr)){
-	  kill_thread(false,contextptr);
-	  clear_prog_status(contextptr);
-	  cleanup_context(contextptr);
-#if !defined __MINGW_H && !defined KHICAS
-	  *logptr(contextptr) << gettext("Cancel thread ") << eval_thread << '\n';
-#endif
-#ifdef NO_STDEXCEPT
-	  pthread_cancel(eval_thread) ;
-#else
-	  try {
-	    pthread_cancel(eval_thread) ;
-	  } catch (...){
-	  }
-#endif
-	  pthread_mutex_unlock(mutexptr(contextptr));
-	  return undef;
-	}
-      }
-      // unsigned thread_return_value=0;
-      // void * ptr=&thread_return_value;
-      pthread_join(eval_thread,0); // pthread_join(eval_thread,&ptr);
-      // Restore pointers and return v[3]
-      pthread_mutex_unlock(mutexptr(contextptr));
-      // double tt=double(v[4].val)/CLOCKS_PER_SEC;
-      double tt=v[4]._DOUBLE_val;
-      if (tt>0.1)
-	(*logptr(contextptr)) << gettext("Evaluation time: ") << tt << '\n';
-      return v[5];
-    }
-    pthread_mutex_unlock(mutexptr(contextptr));
-    return protecteval(g,level,contextptr);
-  }
-#else
-
-  bool make_thread(const gen & g,int level,const giac_callback & f,void * f_param,context * contextptr){
-    return false;
-  }
-
-  int check_thread(context * contextptr){
-    return -1;
-  }
-
-  int check_threads(int i){
-    return -1;
-  }
-
-  gen thread_eval(const gen & g,int level,context * contextptr,void (* wait_001)(context * )){
-    return protecteval(g,level,contextptr);
-  }
-#endif // HAVE_LIBPTHREAD
-
-  debug_struct::debug_struct():indent_spaces(0),debug_mode(false),sst_mode(false),sst_in_mode(false),debug_allowed(true),current_instruction(-1),debug_refresh(false){
-    debug_info_ptr=new gen;
-    fast_debug_info_ptr=new gen;
-    debug_prog_name=new gen;
-    debug_localvars=new gen;
-    debug_contextptr=0;
-  }
-  
-  debug_struct::~debug_struct(){
-    delete debug_info_ptr;
-    delete fast_debug_info_ptr;
-    delete debug_prog_name;
-    delete debug_localvars;
-  }
-
-  debug_struct & debug_struct::operator =(const debug_struct & dbg){
-    indent_spaces=dbg.indent_spaces;
-    args_stack=dbg.args_stack;
-    debug_breakpoint=dbg.debug_breakpoint;
-    debug_watch=dbg.debug_watch ;
-    debug_mode=dbg.debug_mode;
-    sst_mode=dbg.sst_mode ;
-    sst_in_mode=dbg.sst_in_mode ;
-    debug_allowed=dbg.debug_allowed;
-    current_instruction_stack=dbg.current_instruction_stack;
-    current_instruction=dbg.current_instruction;
-    sst_at_stack=dbg.sst_at_stack;
-    sst_at=dbg.sst_at;
-    if (debug_info_ptr)
-      delete debug_info_ptr;
-    debug_info_ptr=new gen(dbg.debug_info_ptr?*dbg.debug_info_ptr:0) ;
-    if (fast_debug_info_ptr)
-      delete fast_debug_info_ptr;
-    fast_debug_info_ptr= new gen(dbg.fast_debug_info_ptr?*dbg.fast_debug_info_ptr:0);
-    if (debug_prog_name)
-      delete debug_prog_name;
-    debug_prog_name=new gen(dbg.debug_prog_name?*dbg.debug_prog_name:0);
-    if (debug_localvars)
-      delete debug_localvars;
-    debug_localvars=new gen(dbg.debug_localvars?*dbg.debug_localvars:0);
-    debug_refresh=dbg.debug_refresh;
-    debug_contextptr=dbg.debug_contextptr;
-    return *this;
-  }
-
-  static debug_struct & _debug_data(){
-    static debug_struct * ans = 0;
-    if (!ans) ans=new debug_struct;
-    return *ans;
-  }
-
-  debug_struct * debug_ptr(GIAC_CONTEXT){
-    if (contextptr && contextptr->globalptr)
-      return contextptr->globalptr->_debug_ptr;
-    return &_debug_data();
-  }
-
-  void clear_prog_status(GIAC_CONTEXT){
-    debug_struct * ptr=debug_ptr(contextptr);
-    if (ptr){
-      ptr->args_stack.clear();
-      ptr->debug_mode=false;
-      ptr->sst_at_stack.clear();
-      if (!contextptr)
-	protection_level=0;
-    }
-  }
-
-
-  global::global() : _xcas_mode_(0), 
-		     _calc_mode_(0),_decimal_digits_(12),_minchar_for_quote_as_string_(1),
-		     _scientific_format_(0), _integer_format_(0), _latex_format_(0), 
-#ifdef BCD
-		     _bcd_decpoint_('.'|('E'<<16)|(' '<<24)),_bcd_mantissa_(12+(15<<8)), _bcd_flags_(0),_bcd_printdouble_(false),
-#endif
-		     _expand_re_im_(true), _do_lnabs_(true), _eval_abs_(true),_eval_equaltosto_(true),_integer_mode_(true),_complex_mode_(false), _escape_real_(true),_complex_variables_(false), _increasing_power_(false), _approx_mode_(false), _variables_are_files_(false), _local_eval_(true), 
-		     _withsqrt_(true), 
-		     _show_point_(true),  _io_graph_(true),
-		     _all_trig_sol_(false),
-#ifdef __MINGW_H
-		     _ntl_on_(false),
-#else
-		     _ntl_on_(true),
-#endif
-#ifdef WITH_MYOSTREAM
-		     _lexer_close_parenthesis_(true),_rpn_mode_(false),_try_parse_i_(true),_specialtexprint_double_(false),_atan_tan_no_floor_(false),_keep_acosh_asinh_(false),_keep_algext_(false),_auto_assume_(false),_parse_e_(false),_convert_rootof_(true),
-#ifdef KHICAS
-		     _python_compat_(true),
-#else
-		     _python_compat_(false),
-#endif
-		     _angle_mode_(0), _bounded_function_no_(0), _series_flags_(0x3),_step_infolevel_(0),_default_color_(FL_BLACK), _epsilon_(1e-12), _proba_epsilon_(1e-15),  _show_axes_(1),_spread_Row_ (-1), _spread_Col_ (-1),_logptr_(&my_CERR),_prog_eval_level_val(1), _eval_level(DEFAULT_EVAL_LEVEL), _rand_seed(123457),_last_evaled_function_name_(0),_currently_scanned_(""),_last_evaled_argptr_(0),_max_sum_sqrt_(3),
-#ifdef GIAC_HAS_STO_38 // Prime sum(x^2,x,0,100000) crash on hardware	
-		     _max_sum_add_(10000),
-#else
-		     _max_sum_add_(100000),
-#endif
-		     _total_time_(0),_evaled_table_(0),_extra_ptr_(0),_series_variable_name_('h'),_series_default_order_(5),
-#else
-		     _lexer_close_parenthesis_(true),_rpn_mode_(false),_try_parse_i_(true),_specialtexprint_double_(false),_atan_tan_no_floor_(false),_keep_acosh_asinh_(false),_keep_algext_(false),_auto_assume_(false),_parse_e_(false),_convert_rootof_(true),
-#ifdef KHICAS
-		     _python_compat_(true),
-#else
-		     _python_compat_(false),
-#endif
-		     _angle_mode_(0), _bounded_function_no_(0), _series_flags_(0x3),_step_infolevel_(0),_default_color_(FL_BLACK), _epsilon_(1e-12), _proba_epsilon_(1e-15),  _show_axes_(1),_spread_Row_ (-1), _spread_Col_ (-1), 
-#if defined(EMCC) || defined(EMCC2)
-		     _logptr_(&COUT), 
-#else
-#ifdef FXCG
-		     _logptr_(0),
-#else
-#ifdef KHICAS
-		     _logptr_(&os_cerr),
-#else
-		     _logptr_(&CERR),
-#endif
-#endif
-#endif
-		     _prog_eval_level_val(1), _eval_level(DEFAULT_EVAL_LEVEL), _rand_seed(123457),_last_evaled_function_name_(0),_currently_scanned_(""),_last_evaled_argptr_(0),_max_sum_sqrt_(3),
-#ifdef GIAC_HAS_STO_38 // Prime sum(x^2,x,0,100000) crash on hardware	
-		     _max_sum_add_(10000),
-#else
-		     _max_sum_add_(100000),
-#endif
-		     _total_time_(0),_evaled_table_(0),_extra_ptr_(0),_series_variable_name_('h'),_series_default_order_(5)
-#endif
-  { 
-    _pl._i_sqrt_minus1_=1;
-#ifndef KHICAS
-    _turtle_stack_.push_back(_turtle_);
-#endif
-    _debug_ptr=new debug_struct;
-    _thread_param_ptr=new thread_param;
-    _parsed_genptr_=new gen;
-#ifdef GIAC_HAS_STO_38
-    _autoname_="GA";
-#else
-    _autoname_="A";
-#endif
-    _autosimplify_="regroup";
-    _lastprog_name_="lastprog";
-    _format_double_="";
-#ifdef HAVE_LIBPTHREAD
-    _mutexptr = new pthread_mutex_t;
-    pthread_mutex_init(_mutexptr,0);
-    _mutex_eval_status_ptr = new pthread_mutex_t;
-    pthread_mutex_init(_mutex_eval_status_ptr,0);
-#endif
-  }
-
-  global & global::operator = (const global & g){
-     _xcas_mode_=g._xcas_mode_;
-     _calc_mode_=g._calc_mode_;
-     _decimal_digits_=g._decimal_digits_;
-     _minchar_for_quote_as_string_=g._minchar_for_quote_as_string_;
-     _scientific_format_=g._scientific_format_;
-     _integer_format_=g._integer_format_;
-     _integer_mode_=g._integer_mode_;
-     _latex_format_=g._latex_format_;
-#ifdef BCD
-     _bcd_decpoint_=g._bcd_decpoint_;
-     _bcd_mantissa_=g._bcd_mantissa_;
-     _bcd_flags_=g._bcd_flags_;
-     _bcd_printdouble_=g._bcd_printdouble_;
-#endif
-     _expand_re_im_=g._expand_re_im_;
-     _do_lnabs_=g._do_lnabs_;
-     _eval_abs_=g._eval_abs_;
-     _eval_equaltosto_=g._eval_equaltosto_;
-     _complex_mode_=g._complex_mode_;
-     _escape_real_=g._escape_real_;
-     _complex_variables_=g._complex_variables_;
-     _increasing_power_=g._increasing_power_;
-     _approx_mode_=g._approx_mode_;
-     _series_variable_name_=g._series_variable_name_;
-     _series_default_order_=g._series_default_order_;
-     _angle_mode_=g._angle_mode_;
-     _atan_tan_no_floor_=g._atan_tan_no_floor_;
-     _keep_acosh_asinh_=g._keep_acosh_asinh_;
-     _keep_algext_=g._keep_algext_;
-     _auto_assume_=g._auto_assume_;
-     _parse_e_=g._parse_e_;
-     _convert_rootof_=g._convert_rootof_;
-     _python_compat_=g._python_compat_;
-     _variables_are_files_=g._variables_are_files_;
-     _bounded_function_no_=g._bounded_function_no_;
-     _series_flags_=g._series_flags_; // bit1= full simplify, bit2=1 for truncation, bit3=?, bit4=1 do not convert back SPOL1 to symbolic expression
-     _step_infolevel_=g._step_infolevel_; // bit1= full simplify, bit2=1 for truncation
-     _local_eval_=g._local_eval_;
-     _default_color_=g._default_color_;
-     _epsilon_=g._epsilon_;
-     _proba_epsilon_=g._proba_epsilon_;
-     _withsqrt_=g._withsqrt_;
-     _show_point_=g._show_point_; // show 3-d point 
-     _io_graph_=g._io_graph_; // show 2-d point in io
-     _show_axes_=g._show_axes_;
-     _spread_Row_=g._spread_Row_;
-     _spread_Col_=g._spread_Col_;
-     _printcell_current_row_=g._printcell_current_row_;
-     _printcell_current_col_=g._printcell_current_col_;
-     _all_trig_sol_=g._all_trig_sol_;
-     _ntl_on_=g._ntl_on_;
-     _prog_eval_level_val =g._prog_eval_level_val ;
-     _eval_level=g._eval_level;
-     _rand_seed=g._rand_seed;
-     _language_=g._language_;
-     _last_evaled_argptr_=g._last_evaled_argptr_;
-     _last_evaled_function_name_=g._last_evaled_function_name_;
-     _currently_scanned_=g._currently_scanned_;
-     _max_sum_sqrt_=g._max_sum_sqrt_;
-     _max_sum_add_=g._max_sum_add_;
-     _turtle_=g._turtle_;
-#ifndef KHICAS
-     _turtle_stack_=g._turtle_stack_;
-#endif
-     _autoname_=g._autoname_;
-     _format_double_=g._format_double_;
-     _extra_ptr_=g._extra_ptr_;
-     return *this;
-  }
-
-  global::~global(){
-    delete _parsed_genptr_;
-    delete _thread_param_ptr;
-    delete _debug_ptr;
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_destroy(_mutexptr);
-    delete _mutexptr;
-    pthread_mutex_destroy(_mutex_eval_status_ptr);
-    delete _mutex_eval_status_ptr;
-#endif
-  }
-
-#ifdef FXCG
-  bool my_isinf(double d){
-    return 1/d==0.0;
-  }
-  bool my_isnan(double d){
-    return d==d+1 && !my_isinf(d);
-  }
-#else // FXCG
-#ifdef __APPLE__
-  bool my_isnan(double d){
-#if 1 // TARGET_OS_IPHONE
-    return isnan(d);
-#else
-    return __isnand(d);
-#endif
-  }
-
-  bool my_isinf(double d){
-#if 1  // TARGET_OS_IPHONE
-    return isinf(d);
-#else
-    return __isinfd(d);
-#endif
-  }
-
-#else // __APPLE__
-  bool my_isnan(double d){
-#if defined VISUALC || defined BESTA_OS
-#if !defined RTOS_THREADX && !defined FREERTOS
-    return _isnan(d)!=0;
-#else
-    return isnan(d);
-#endif
-#else
-#if defined(FIR_LINUX) || defined(FIR_ANDROID)
-    return std::isnan(d);
-#else
-    return isnan(d);
-#endif
-#endif
-  }
-
-  bool my_isinf(double d){
-#if defined VISUALC || defined BESTA_OS
-    double x=0.0;
-    return d==1.0/x || d==-1.0/x;
-#else
-#if defined(FIR_LINUX) || defined(FIR_ANDROID)
-    return std::isinf(d);
-#else
-    return isinf(d);
-#endif
-#endif
-  }
-
-#endif // __APPLE__
-#endif // FXCG
-  
-  double giac_floor(double d){
-    double maxdouble=longlong(1)<<30;
-    if (d>=maxdouble || d<=-maxdouble)
-      return std::floor(d);
-    if (d>0)
-      return int(d);
-    double k=int(d);
-    if (k==d)
-      return k;
-    else
-      return k-1;
-  }
-  double giac_ceil(double d){
-    double maxdouble=longlong(1)<<54;
-    if (d>=maxdouble || d<=-maxdouble)
-      return d;
-    if (d<0)
-      return double(longlong(d));
-    double k=double(longlong(d));
-    if (k==d)
-      return k;
-    else
-      return k+1;
-  }
-
-
-
-/* --------------------------------------------------------------------- */
-/*
- * Copyright 2001-2004 Unicode, Inc.
- * 
- * Disclaimer
- * 
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- * 
- * Limitations on Rights to Redistribute This Code
- * 
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-/* ---------------------------------------------------------------------
-
-    Conversions between UTF-16 and UTF-8. Source code file.
-    Author: Mark E. Davis, 1994.
-    Rev History: Rick McGowan, fixes & updates May 2001.
-    Sept 2001: fixed const & error conditions per
-    mods suggested by S. Parent & A. Lillich.
-    June 2002: Tim Dodd added detection and handling of incomplete
-    source sequences, enhanced error detection, added casts
-    to eliminate compiler warnings.
-    July 2003: slight mods to back out aggressive FFFE detection.
-    Jan 2004: updated switches in from-UTF8 conversions.
-    Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
-    Jan 2013: Jean-Yves Avenard adapted to only calculate size if 
-    destination pointer are null
-
------------------------------------------------------------------------- */
-
-
-static const int halfShift  = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-#define UNI_SUR_HIGH_START  (UTF32)0xD800
-#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
-#define UNI_SUR_LOW_START   (UTF32)0xDC00
-#define UNI_SUR_LOW_END     (UTF32)0xDFFF
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
-             0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow.  There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-/* --------------------------------------------------------------------- */
-
-/* The interface converts a whole buffer to avoid function-call overhead.
- * Constants have been gathered. Loops & conditionals have been removed as
- * much as possible for efficiency, in favor of drop-through switches.
- * (See "Note A" at the bottom of the file for equivalent code.)
- * If your compiler supports it, the "isLegalUTF8" call can be turned
- * into an inline function.
- */
-
-/* --------------------------------------------------------------------- */
-
-unsigned int ConvertUTF16toUTF8 (
-    const UTF16* sourceStart, const UTF16* sourceEnd, 
-    UTF8* targetStart, UTF8* targetEnd, ConversionFlags flags) {
-    ConversionResult result = conversionOK;
-    const UTF16* source = sourceStart;
-    UTF8* target = targetStart;
-    UTF32 ch;
-    while ((source < sourceEnd) && (ch = *source)) {
-    unsigned short bytesToWrite = 0;
-    const UTF32 byteMask = 0xBF;
-    const UTF32 byteMark = 0x80; 
-    const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
-    source++;
-    /* If we have a surrogate pair, convert to UTF32 first. */
-    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
-        /* If the 16 bits following the high surrogate are in the source buffer... */
-        UTF32 ch2;
-        if ((source < sourceEnd) && (ch2 = *source)) {
-        /* If it's a low surrogate, convert to UTF32. */
-        if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
-            ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
-            + (ch2 - UNI_SUR_LOW_START) + halfBase;
-            ++source;
-        } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
-            --source; /* return to the illegal value itself */
-            result = sourceIllegal;
-            break;
-        }
-        } else { /* We don't have the 16 bits following the high surrogate. */
-        --source; /* return to the high surrogate */
-        result = sourceExhausted;
-        break;
-        }
-    } else if (flags == strictConversion) {
-        /* UTF-16 surrogate values are illegal in UTF-32 */
-        if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
-        --source; /* return to the illegal value itself */
-        result = sourceIllegal;
-        break;
-        }
-    }
-    /* Figure out how many bytes the result will require */
-    if (ch < (UTF32)0x80) {      bytesToWrite = 1;
-    } else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
-    } else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
-    } else if (ch < (UTF32)0x110000) {  bytesToWrite = 4;
-    } else {       bytesToWrite = 3;
-                        ch = UNI_REPLACEMENT_CHAR;
-    }
-
-    target += bytesToWrite;
-    if ((uintptr_t)target > (uintptr_t)targetEnd) {
-        source = oldSource; /* Back up source pointer! */
-        target -= bytesToWrite; result = targetExhausted; break;
-    }
-    switch (bytesToWrite) { /* note: everything falls through. */
-        case 4: target--; if (targetStart) { *target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; }
-        case 3: target--; if (targetStart) { *target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; }
-        case 2: target--; if (targetStart) { *target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; }
-        case 1: target--; if (targetStart) { *target =  (UTF8)(ch | firstByteMark[bytesToWrite]); }
-    }
-    target += bytesToWrite;
-    }
-
-    unsigned int length = int(target - targetStart);
-    return length;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Utility routine to tell whether a sequence of bytes is legal UTF-8.
- * This must be called with the length pre-determined by the first byte.
- * If not calling this from ConvertUTF8to*, then the length can be set by:
- *  length = trailingBytesForUTF8[*source]+1;
- * and the sequence is illegal right away if there aren't that many bytes
- * available.
- * If presented with a length > 4, this returns false.  The Unicode
- * definition of UTF-8 goes up to 4-byte sequences.
- */
-
-static Boolean isLegalUTF8(const UTF8 *source, int length) {
-    UTF8 a;
-    const UTF8 *srcptr = source+length;
-    switch (length) {
-    default: return false;
-    /* Everything else falls through when "true"... */
-    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 2: if ((a = (*--srcptr)) > 0xBF) return false;
-
-    switch (*source) {
-        /* no fall-through in this inner switch */
-        case 0xE0: if (a < 0xA0) return false; break;
-        case 0xED: if (a > 0x9F) return false; break;
-        case 0xF0: if (a < 0x90) return false; break;
-        case 0xF4: if (a > 0x8F) return false; break;
-        default:   if (a < 0x80) return false;
-    }
-
-    case 1: if (*source >= 0x80 && *source < 0xC2) return false;
-    }
-    if (*source > 0xF4) return false;
-    return true;
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Exported function to return whether a UTF-8 sequence is legal or not.
- * This is not used here; it's just exported.
- */
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
-    int length = trailingBytesForUTF8[*source]+1;
-    if (source+length > sourceEnd) {
-    return false;
-    }
-    return isLegalUTF8(source, length);
-}
-
-/* --------------------------------------------------------------------- */
-
-unsigned int ConvertUTF8toUTF16 (const UTF8* sourceStart, const UTF8* sourceEnd, UTF16* targetStart, UTF16* targetEnd, ConversionFlags flags)
-#if 0 //def GIAC_HAS_STO_38
-{
-    wchar_t *d= targetStart;
-#define read(a) if (sourceStart>=sourceEnd) break; a= *sourceStart++
-    while (sourceStart<sourceEnd && d!=targetEnd)
-    {
-        read(uint8_t c);
-        if ((c&0x80)==0) { *d++= c; continue; }
-        if ((c&0xe0)==0xc0) { read(uint8_t c2); if ((c2&0xc0)!=0x80) continue; *d++= ((c&0x1f)<<6)+(c2&0x3f); continue; }
-        if ((c&0xf0)==0xe0) { read(uint8_t c2); if ((c2&0xc0)!=0x80) continue; read(uint8_t c3); if ((c3&0xc0)!=0x80) continue; *d++= ((((c&0xf)<<6)+(c2&0x3f))<<6)+(c3&0x3f); continue; }
-        if ((c&0xf8)==0xf0) { read(uint8_t c2); if ((c2&0xc0)!=0x80) continue; read(uint8_t c3); if ((c3&0xc0)!=0x80) continue; read(uint8_t c4); if ((c4&0xc0)!=0x80) continue; *d++= ((((((c&0xf)<<6)+(c2&0x3f))<<6)+(c3&0x3f))<<6)+(c4&0x3f); continue; }
-        while (sourceStart<sourceEnd) { c= *sourceEnd; if ((c&0x80)==0 || (c&0xc0)!=0x80) break; sourceEnd++; }
-    }
-#undef read
-    return d-targetStart;
-}
-
-unsigned int ConvertUTF8toUTF162 (
-    const UTF8* sourceStart, const UTF8* sourceEnd, 
-    UTF16* targetStart, UTF16* targetEnd, ConversionFlags flags) 
-#endif
-{
-    ConversionResult result = conversionOK;
-    const UTF8* source = sourceStart;
-    UTF16* target = targetStart;
-    while (source < sourceEnd && *source) {
-    UTF32 ch = 0;
-    unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-    if (source + extraBytesToRead >= sourceEnd) {
-        result = sourceExhausted; break;
-    }
-    /* Do this check whether lenient or strict */
-    if (! isLegalUTF8(source, extraBytesToRead+1)) {
-        result = sourceIllegal;
-        break;
-    }
-    /*
-     * The cases all fall through. See "Note A" below.
-     */
-    switch (extraBytesToRead) {
-        case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-        case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-        case 3: ch += *source++; ch <<= 6;
-        case 2: ch += *source++; ch <<= 6;
-        case 1: ch += *source++; ch <<= 6;
-        case 0: ch += *source++;
-    }
-    ch -= offsetsFromUTF8[extraBytesToRead];
-
-    if ((uintptr_t)target >= (uintptr_t)targetEnd) {
-        source -= (extraBytesToRead+1); /* Back up source pointer! */
-        result = targetExhausted; break;
-    }
-    if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-        /* UTF-16 surrogate values are illegal in UTF-32 */
-        if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-        if (flags == strictConversion) {
-            source -= (extraBytesToRead+1); /* return to the illegal value itself */
-            result = sourceIllegal;
-            break;
-        } else {
-          if (targetStart)
-            *target = UNI_REPLACEMENT_CHAR;
-          target++;
-        }
-        } else {
-          if (targetStart)
-            *target = (UTF16)ch; /* normal case */
-          target++;
-        }
-    } else if (ch > UNI_MAX_UTF16) {
-        if (flags == strictConversion) {
-        result = sourceIllegal;
-        source -= (extraBytesToRead+1); /* return to the start */
-        break; /* Bail out; shouldn't continue */
-        } else {
-        *target++ = UNI_REPLACEMENT_CHAR;
-        }
-    } else {
-        /* target is a character in range 0xFFFF - 0x10FFFF. */
-        if ((uintptr_t)target + 1 >= (uintptr_t)targetEnd) {
-        source -= (extraBytesToRead+1); /* Back up source pointer! */
-        result = targetExhausted; break;
-        }
-        ch -= halfBase;
-        if (targetStart)
-        {
-          *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
-          *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
-        }
-        else
-          target += 2;
-    }
-    }
-
-    unsigned int length = unsigned(target - targetStart);
-    return length;
-}
-
-  unsigned int utf82unicode(const char * line, wchar_t * wline, unsigned int n){
-    if (!line){
-      if (wline) wline[0]=0;
-      return 0;
-    }
-
-    unsigned int j = ConvertUTF8toUTF16 (
-      (const UTF8*) line,((line + n) < line) ? (const UTF8*)~0 : (const UTF8*)(line + n),
-      (UTF16*)wline, (UTF16*)~0,
-      lenientConversion);
-
-    if (wline) wline[j] = 0;
-
-    return j;
-  }
-
-    // convert position n in utf8-encoded line into the corresponding position 
-  // in the same string encoded with unicode 
-  unsigned int utf8pos2unicodepos(const char * line,unsigned int n,bool skip_added_spaces){
-    if (!line) return 0;
-    unsigned int i=0,j=0,c;
-    for (;i<n;i++){
-      c=line[i];
-      if (!c)
-	return j;
-      if ( (c & 0xc0) == 0x80)
-	continue;
-      if (c < 128){ // 0/xxxxxxx/
-	j++;
-	continue;
-      }
-      if ( (c & 0xe0) == 0xc0) { // 2 char code 110/xxxxx/ 10/xxxxxx/
-	i++;
-	c = (c & 0x1f) << 6 | (line[i] & 0x3f);
-	j++;
-	continue;
-      } 
-      if ( (c & 0xf0) == 0xe0) { // 3 char 1110/xxxx/ 10/xxxxxx/ 10/xxxxxx/
-	i++;
-	c = (c & 0x0f) << 6 | (line[i] & 0x3f);
-	i++;
-	c = c << 6 | (line[i] & 0x3f);
-	j++;
-	if (skip_added_spaces) {
-	  unsigned int masked = c & 0xff00; // take care of spaces that were added
-	  if (masked>=0x2000 && masked<0x2c00)
-	    j -= 2;
-	}
-	continue;
-      } 
-      if ( (c & 0xf8) == 0xf0) { // 4 char 11110/xxx/ 10/xxxxxx/ 10/xxxxxx/ 10/xxxxxx/
-	i++;
-	c = (c & 0x07) << 6 | (line[i] & 0x3f);
-	i++;
-	c = c << 6 | (line[i] & 0x3f);
-	i++;
-	c = c << 6 | (line[i] & 0x3f);
-	j++;
-	continue;
-      } 
-      // FIXME complete for 5 and 6 char
-      c = 0xfffd;
-      j++;
-    }
-    return j;
-  }
-
-  unsigned int wstrlen(const char * line, unsigned int n){
-    if (!line) return 0;
-    return utf82unicode(line, NULL, n);
-  }
-
-  // convert UTF8 string to unicode, allocate memory with new
-  wchar_t * utf82unicode(const char * idname){
-    if (!idname)
-      return 0;
-    int l=int(strlen(idname));
-    wchar_t * wname=new wchar_t[l+1];
-    utf82unicode(idname,wname,l);
-    return wname;
-  }
-
-#if defined NSPIRE || defined FXCG
-  unsigned wcslen(const wchar_t * c){
-    unsigned i=0;
-    for (;*c;++i)
-      ++c;
-    return i;
-  }
-#endif
-
-  char * unicode2utf8(const wchar_t * idname){
-    if (!idname)
-      return 0;
-    int l=int(wcslen(idname));
-    char * name=new char[4*l+1];
-    unicode2utf8(idname,name,l);
-    return name;
-  }
-
-  unsigned int wstrlen(const wchar_t * wline){
-    if (!wline)
-      return 0;
-    unsigned int i=0;
-    for (;*wline;wline++){ i++; }
-    return i;
-  }
-
-  // return length required to translate from unicode to UTF8
-  unsigned int utf8length(const wchar_t * wline){
-    return unicode2utf8(wline,0,wstrlen(wline));
-  }
-
-  unsigned int unicode2utf8(const wchar_t * wline,char * line,unsigned int n){
-    if (!wline){
-      if (line) line[0]=0;
-      return 0;
-    }
-
-    unsigned int j = ConvertUTF16toUTF8(
-      (UTF16*)wline, ((wline + n) < wline) ? (const UTF16*)~0 : (const UTF16*)(wline + n),
-      (UTF8*)line, (UTF8*)-1,
-      lenientConversion);
-
-    if (line) line[j]=0;
-
-    return j;
-  }
-
-  // Binary archive format for a gen:
-  // 8 bytes=the gen itself (i.e. type, subtype, etc.)
-  // Additionnally for pointer types
-  // 4 bytes = total size of additionnal data
-  // _CPLX: both real and imaginary parts
-  // _FRAC: numerator and denominator
-  // _MOD: 2 gens
-  // _REAL, _ZINT: long int/real binary archive
-  // _VECT: 4 bytes = #rows #cols (#cols=0 if not a matrix) + list of elements
-  // _SYMB: feuille + sommet
-  // _FUNC: 2 bytes = -1 + string or index
-  // _IDNT or _STRNG: the name
-  // count number of bytes required to save g in a file
-  static size_t countfunction(void const* p, size_t nbBytes,size_t NbElements, void *file)
-  {
-    (*(unsigned *)file)+= unsigned(nbBytes*NbElements);
-    return nbBytes*NbElements;
-  }
-  unsigned archive_count(const gen & g,GIAC_CONTEXT){
-    unsigned size= 0;
-    archive_save((void*)&size, g, countfunction, contextptr, true);
-    return size;
-  }
-
-  /*
-  unsigned archive_count(const gen & g,GIAC_CONTEXT){
-    if (g.type<=_DOUBLE_ || g.type==_FLOAT_)
-      return sizeof(gen);
-    if (g.type==_CPLX)
-      return sizeof(gen)+sizeof(unsigned)+archive_count(*g._CPLXptr,contextptr)+archive_count(*(g._CPLXptr+1),contextptr);
-    if (g.type==_REAL || g.type==_ZINT)
-      return sizeof(gen)+sizeof(unsigned)+g.print(contextptr).size();
-    if (g.type==_FRAC)
-      return sizeof(gen)+sizeof(unsigned)+archive_count(g._FRACptr->num,contextptr)+archive_count(g._FRACptr->den,contextptr);
-    if (g.type==_MOD)
-      return sizeof(gen)+sizeof(unsigned)+archive_count(*g._MODptr,contextptr)+archive_count(*(g._MODptr+1),contextptr);
-    if (g.type==_VECT){
-      unsigned res=sizeof(gen)+sizeof(unsigned)+4;
-      const_iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
-      for (;it!=itend;++it)
-	res += archive_count(*it,contextptr);
-      return res;
-    }
-    if (g.type==_SYMB){
-      if (archive_function_index(g._SYMBptr->sommet)) // ((equalposcomp(archive_function_tab(),g._SYMBptr->sommet))
-	return sizeof(gen)+sizeof(unsigned)+sizeof(short)+archive_count(g._SYMBptr->feuille,contextptr);
-      return sizeof(gen)+sizeof(unsigned)+sizeof(short)+archive_count(g._SYMBptr->feuille,contextptr)+strlen(g._SYMBptr->sommet.ptr()->s);
-    }
-    if (g.type==_IDNT)
-      return sizeof(gen)+sizeof(unsigned)+strlen(g._IDNTptr->id_name);
-    if (g.type==_FUNC){
-      if (archive_function_index(*g._FUNCptr)) // (equalposcomp(archive_function_tab(),*g._FUNCptr))
-	return sizeof(gen)+sizeof(unsigned)+sizeof(short);
-      return sizeof(gen)+sizeof(unsigned)+sizeof(short)+strlen(g._FUNCptr->ptr()->s);
-    }
-    return sizeof(gen)+sizeof(unsigned)+strlen(g.print().c_str()); // not handled
-  }
-  */
-
-#define DBG_ARCHIVE 0
-
-  bool archive_save(void * f,const gen & g,size_t writefunc(void const* p, size_t nbBytes,size_t NbElements, void *file),GIAC_CONTEXT, bool noRecurse){
-    // write the gen first
-    writefunc(&g,sizeof(gen),1,f);
-    if (g.type<=_DOUBLE_ || g.type==_FLOAT_)
-      return true;
-    // heap allocated object, find size
-    unsigned size=0;
-    if (!noRecurse) size=archive_count(g,contextptr);
-    writefunc(&size,sizeof(unsigned),1,f);
-    if (g.type==_CPLX)
-      return archive_save(f,*g._CPLXptr,writefunc,contextptr,noRecurse) && archive_save(f,*(g._CPLXptr+1),writefunc,contextptr,noRecurse);
-    if (g.type==_MOD)
-      return archive_save(f,*g._MODptr,writefunc,contextptr,noRecurse) && archive_save(f,*(g._MODptr+1),writefunc,contextptr,noRecurse);
-    if (g.type==_FRAC)
-      return archive_save(f,g._FRACptr->num,writefunc,contextptr,noRecurse) && archive_save(f,g._FRACptr->den,writefunc,contextptr,noRecurse);
-    if (g.type==_VECT){
-      unsigned short rows=g._VECTptr->size(),cols=0;
-      if (ckmatrix(g))
-	cols=g._VECTptr->front()._VECTptr->size();
-      writefunc(&rows,sizeof(short),1,f);
-      writefunc(&cols,sizeof(short),1,f);
-      const_iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
-      for (;it!=itend;++it){
-	if (!archive_save(f,*it,writefunc,contextptr,noRecurse))
-	  return false;
-      }
-      return true;
-    }
-    if (g.type==_IDNT){
-#if DBG_ARCHIVE
-      std::ofstream ofs;
-      ofs.open ("e:\\tmp\\logsave", std::ofstream::out | std::ofstream::app);
-      ofs << "IDNT " << g << '\n';
-      ofs.close();
-#endif
-      // fprintf(f,"%s",g._IDNTptr->id_name);
-      writefunc(g._IDNTptr->id_name,1,strlen(g._IDNTptr->id_name),f);
-      return true;
-    }
-    if (g.type==_SYMB){
-      if (!archive_save(f,g._SYMBptr->feuille,writefunc,contextptr,noRecurse))
-	return false;
-#if DBG_ARCHIVE
-      std::ofstream ofs;
-      ofs.open ("e:\\tmp\\logsave", std::ofstream::out | std::ofstream::app);
-      ofs << "SYMB " << g << '\n';
-      ofs.close();
-#endif
-      short i=archive_function_index(g._SYMBptr->sommet); // equalposcomp(archive_function_tab(),g._SYMBptr->sommet);
-      writefunc(&i,sizeof(short),1,f);
-      if (i)
-	return true;
-      // fprintf(f,"%s",g._SYMBptr->sommet.ptr()->s);
-      writefunc(g._SYMBptr->sommet.ptr()->s,1,strlen(g._SYMBptr->sommet.ptr()->s),f);
-      return true;
-    }
-    if (g.type==_FUNC){
-      short i=archive_function_index(*g._FUNCptr); // equalposcomp(archive_function_tab(),*g._FUNCptr);
-      writefunc(&i,sizeof(short),1,f);
-      if (!i){
-	// fprintf(f,"%s",g._FUNCptr->ptr()->s);
-	writefunc(g._FUNCptr->ptr()->s,1,strlen(g._FUNCptr->ptr()->s),f);
-      }
-      return true;
-    }
-    string s;
-    if (g.type==_ZINT)
-      s=hexa_print_ZINT(*g._ZINTptr);
-    else
-      s=g.print(contextptr);
-    // fprintf(f,"%s",s.c_str());
-    writefunc(s.c_str(),1,s.size(),f);
-    return true;
-    //return false;
-  }
-
-
-  bool archive_save(void * f,const gen & g,GIAC_CONTEXT){
-    return archive_save(f,g,(size_t (*)(void const* p, size_t nbBytes,size_t NbElements, void *file))fwrite,contextptr);
-  }
-
-#ifdef GIAC_HAS_STO_38
-  // return true/false to tell if s is recognized. return the appropriate gen if true
-  int lexerCompare(void const *a, void const *b) { 
-    charptr_gen_unary const * ptr=(charptr_gen_unary const *)b;
-    const char * aptr=(const char *) a;
-    return strcmp(aptr, ptr->s); 
-  }
-
-  bool casbuiltin(const char *s, gen &g){
-    // binary search in builtin_lexer_functions
-#if 1 // def SMARTPTR64
-    int n=builtin_lexer_functions_number; 
-    charptr_gen_unary const * f = (charptr_gen_unary const *)bsearch(s, builtin_lexer_functions, n, sizeof(builtin_lexer_functions[0]), lexerCompare);
-    if (f != NULL) {
-      g = 0;
-      int pos = int(f - builtin_lexer_functions);
-      size_t val = builtin_lexer_functions_[pos];
-      unary_function_ptr * at_val = (unary_function_ptr *)val;
-      g = at_val;
-      if (builtin_lexer_functions[pos]._FUNC_%2){
-#ifdef SMARTPTR64
-	unary_function_ptr tmp=*at_val;
-	tmp._ptr+=1;
-	g=tmp;
-#else
-	g._FUNC_ +=1;
-#endif // SMARTPTR64
-      }
-      return true;
-    }
-#else
-    charptr_gen_unary const * f = (charptr_gen_unary const *)bsearch(s, builtin_lexer_functions, builtin_lexer_functions_number, sizeof(builtin_lexer_functions[0]), lexerCompare);
-    if (f != NULL) {
-      g = gen(0);
-      int pos=f - builtin_lexer_functions;
-      *(size_t *)(&g) = builtin_lexer_functions_[pos] + f->_FUNC_;
-      g = gen(*g._FUNCptr);
-      return true;
-    }
-#endif
-    if (strlen(s)==1 && s[0]==':'){
-      g=at_deuxpoints;
-      return true;
-    }
-    return false;
-  }
-
-#endif
-
-  // restore a gen from an opened file
-  gen archive_restore(void * f,size_t readfunc(void * p, size_t nbBytes,size_t NbElements, void *file),GIAC_CONTEXT){
-    gen g;
-    if (!readfunc(&g,sizeof(gen),1,f))
-      return undef;
-    if (g.type<=_DOUBLE_ || g.type==_FLOAT_)
-      return g;
-    unsigned char t=g.type;
-    signed char s=g.subtype;
-    g.type=0; // required to avoid destructor of g to mess up the pointer part
-    unsigned size;
-    if (!readfunc(&size,sizeof(unsigned),1,f))
-      return undef;
-    if (t==_CPLX || t==_MOD || t==_FRAC){
-      gen g1=archive_restore(f,readfunc,contextptr);
-      gen g2=archive_restore(f,readfunc,contextptr);
-      if (t==_CPLX)
-	return g1+cst_i*g2;
-      if (t==_FRAC)
-	return fraction(g1,g2);
-      if (t==_MOD)
-	return makemodquoted(g1,g2);
-    }
-    size -= sizeof(gen)+sizeof(unsigned); // adjust for gen size and length
-    if (t==_VECT){
-      unsigned short rows,cols;
-      if (!readfunc(&rows,sizeof(unsigned short),1,f))
-	return undef;
-      if (!readfunc(&cols,sizeof(unsigned short),1,f))
-	return undef;
-//      if (!rows) return undef;
-      vecteur v(rows);
-      for (int i=0;i<rows;++i)
-	v[i]=archive_restore(f,readfunc,contextptr);
-      return gen(v,s);
-    }
-    if (t==_IDNT){
-      char * ch=new char[size+1];
-      ch[size]=0;
-      if (readfunc(ch,1,size,f)!=size){
-	delete [] ch;
-	return undef;
-      }
-      string sch(ch); gen res;
-      delete [] ch;
-      lock_syms_mutex();
-      sym_string_tab::const_iterator it=syms().find(sch),itend=syms().end();
-      if (it!=itend)
-	res=it->second;
-      else {
-	res=identificateur(sch);
-	syms()[sch]=res;
-      }
-      unlock_syms_mutex();  
-#if DBG_ARCHIVE
-      std::ofstream ofs;
-      ofs.open ("e:\\tmp\\logrestore", std::ofstream::out | std::ofstream::app);
-      ofs << "IDNT " << res << '\n';
-      ofs.close();
-#endif
-      return res;
-    }
-    if (t==_SYMB){
-      gen fe=archive_restore(f,readfunc,contextptr);
-      short index;
-      if (!readfunc(&index,sizeof(short),1,f))
-	return undef;
-      if (index>0){
-	const unary_function_ptr * aptr=archive_function_tab();
-	if (index<archive_function_tab_length){
-	  g=symbolic(aptr[index-1],fe);
-	}
-	else {
-#if DBG_ARCHIVE
-	  std::ofstream ofs;
-	  ofs.open ("e:\\tmp\\logrestore", std::ofstream::out | std::ofstream::app);
-	  ofs << "archive_restore error _SYMB index " << index << '\n';
-	  ofs.close();
-#endif
-	  g=fe; // ERROR
-	}
-      }
-      else {
-	gen res;
-	size -= archive_count(fe,contextptr)+sizeof(short);
-	char * ch=new char[size+3];
-	if (0 && abs_calc_mode(contextptr)==38){
-	  ch[0]='\'';
-	  ch[size+1]='\'';
-	  ch[size+2]=0;
-	  if (readfunc(ch+1,1,size,f)!=size){
-	    delete [] ch;
-	    return undef;
-	  }
-	}
-	else {
-	  ch[size]=0;
-	  if (readfunc(ch,1,size,f)!=size){
-	    delete [] ch;
-	    return undef;
-	  }
-#if defined NSPIRE
-	  if (builtin_lexer_functions_()){
-	    std::pair<charptr_gen *,charptr_gen *> p=equal_range(builtin_lexer_functions_begin(),builtin_lexer_functions_end(),std::pair<const char *,gen>(ch,0),tri);
-	    if (p.first!=p.second && p.first!=builtin_lexer_functions_end()){
-	      res = p.first->second;
-	      res.subtype=1;
-	      res=gen(int((*builtin_lexer_functions_())[p.first-builtin_lexer_functions_begin()]+p.first->second.val));
-	      res=gen(*res._FUNCptr);
-	    }
-	  }
-#else	  
-	  if (builtin_lexer_functions_){
-#ifdef GIAC_HAS_STO_38
-	    if (!casbuiltin(ch,res)){
-#if DBG_ARCHIVE
-	      std::ofstream ofs;
-	      ofs.open ("e:\\tmp\\logrestore", std::ofstream::out | std::ofstream::app);
-	      ofs << "archive_restore error _SYMB " << ch << '\n';
-	      ofs.close();
-#endif
-	      res=0;
-	    }
-#else
-	    std::pair<charptr_gen *,charptr_gen *> p=equal_range(builtin_lexer_functions_begin(),builtin_lexer_functions_end(),std::pair<const char *,gen>(ch,0),tri);
-	    if (p.first!=p.second && p.first!=builtin_lexer_functions_end()){
-	      res = p.first->second;
-	      res.subtype=1;
-	      res=gen(int(builtin_lexer_functions_[p.first-builtin_lexer_functions_begin()]+p.first->second.val));
-	      res=gen(*res._FUNCptr);
-	    }
-#endif
-	  }
-#endif 
-	}
-	if (is_zero(res)){
-#if DBG_ARCHIVE
-	  std::ofstream ofs;
-	  ofs.open ("e:\\tmp\\logrestore", std::ofstream::out | std::ofstream::app);
-	  ofs << "archive_restore error _SYMB 0 " << ch << '\n';
-	  ofs.close();
-#endif
-	  res=gen(ch,contextptr);
-	}
-	delete [] ch;
-	if (res.type!=_FUNC){
-	  return undef;
-	}
-	g=symbolic(*res._FUNCptr,fe);
-      }
-      g.subtype=s;
-#if DBG_ARCHIVE
-      std::ofstream ofs;
-      ofs.open ("e:\\tmp\\logrestore", std::ofstream::out | std::ofstream::app);
-      ofs << "SYMB " << g << '\n';
-      ofs.close();
-#endif
-      return g;
-    }
-    if (t==_FUNC){
-      short index;
-      if (!readfunc(&index,sizeof(short),1,f))
-	return undef;
-      if (index>0)
-	g = archive_function_tab()[index-1];
-      else {
-	size -= sizeof(short);
-	char * ch=new char[size+1];
-	ch[size]=0;
-	if (readfunc(ch,1,size,f)!=size){
-	  delete [] ch;
-	  return undef;
-	}
-	g = gen(ch,contextptr);
-	delete [] ch;
-	if (g.type!=_FUNC)
-	  return undef;
-      }
-      g.subtype=s;
-      return g;
-    }
-    char * ch=new char[size+1];
-    ch[size]=0;
-    if (readfunc(ch,1,size,f)!=size){
-      delete [] ch;
-      return undef;
-    }
-    gen res;
-    if (t==_STRNG)
-      res=string2gen(ch,true);
-    else
-      res=gen(ch,contextptr);
-    delete [] ch;
-    return res;
-  }
-
-  gen archive_restore(FILE * f,GIAC_CONTEXT){
-    return archive_restore(f,(size_t (*)(void * p, size_t nbBytes,size_t NbElements, void *file))fread,contextptr);
-  }
-
-  void init_geogebra(bool on,GIAC_CONTEXT){
-#ifndef FXCG
-    setlocale(LC_NUMERIC,"POSIX");
-#endif
-    _decimal_digits_=on?13:12;
-    _all_trig_sol_=on;
-    _withsqrt_=!on;
-    _calc_mode_=on?1:0;
-    _eval_equaltosto_=on?0:1;
-    eval_equaltosto(on?0:1,contextptr);
-    decimal_digits(on?13:12,contextptr);
-    all_trig_sol(on,contextptr);
-    withsqrt(!on,contextptr);
-    calc_mode(on?1:0,contextptr);
-    powlog2float=3e4;
-    MPZ_MAXLOG2=33300;
-#ifdef TIMEOUT
-    //caseval_maxtime=5;
-    caseval_n=0;
-    caseval_mod=10;
-#endif
-  }
-
-  vecteur giac_current_status(bool save_history,GIAC_CONTEXT){
-    // cas and geo config
-    vecteur res;
-    if (abs_calc_mode(contextptr)==38)
-      res.push_back(cas_setup(contextptr));
-    else
-      res.push_back(symbolic(at_cas_setup,cas_setup(contextptr)));
-    res.push_back(xyztrange(gnuplot_xmin,gnuplot_xmax,gnuplot_ymin,gnuplot_ymax,gnuplot_zmin,gnuplot_zmax,gnuplot_tmin,gnuplot_tmax,global_window_xmin,global_window_xmax,global_window_ymin,global_window_ymax,show_axes(contextptr),class_minimum,class_size,
-#ifdef WITH_GNUPLOT
-			    gnuplot_hidden3d,gnuplot_pm3d
-#else
-			    1,1
-#endif
-			    ));
-    if (abs_calc_mode(contextptr)==38)
-      res.back()=res.back()._SYMBptr->feuille;
-    // session
-    res.push_back(save_history?history_in(contextptr):vecteur(0));
-    res.push_back(save_history?history_out(contextptr):vecteur(0));
-    // user variables
-    if (contextptr && contextptr->tabptr){
-      sym_tab::const_iterator jt=contextptr->tabptr->begin(),jtend=contextptr->tabptr->end();
-      for (;jt!=jtend;++jt){
-	gen a=jt->second;
-	gen b=identificateur(jt->first);
-	res.push_back(symb_sto(a,b));
-      }
-    }
-    else {
-      lock_syms_mutex();  
-      sym_string_tab::const_iterator it=syms().begin(),itend=syms().end();
-      for (;it!=itend;++it){
-	gen id=it->second;
-	if (id.type==_IDNT && id._IDNTptr->value)
-	  res.push_back(symb_sto(*id._IDNTptr->value,id));
-      }
-      unlock_syms_mutex();  
-    }
-    int xc=xcas_mode(contextptr);
-    if (xc==0 && python_compat(contextptr))
-      xc=256*python_compat(contextptr);
-    if (abs_calc_mode(contextptr)==38)
-      res.push_back(xc);
-    else
-      res.push_back(symbolic(at_xcas_mode,xc));
-    return res;
-  }
-
-  bool unarchive_session(const gen & g,int level,const gen & replace,GIAC_CONTEXT,bool with_history){
-    int l;
-    if (g.type!=_VECT || (l=int(g._VECTptr->size()))<4)
-      return false;
-    vecteur v=*g._VECTptr;
-    if (v[2].type!=_VECT || v[3].type!=_VECT || (v[2]._VECTptr->size()!=v[3]._VECTptr->size() && v[2]._VECTptr->size()!=v[3]._VECTptr->size()+1))
-      return false;
-    if (v[2]._VECTptr->size()==v[3]._VECTptr->size()+1)
-      v[2]._VECTptr->pop_back();
-#ifndef DONT_UNARCHIVE_HISTORY
-    history_in(contextptr)=*v[2]._VECTptr;
-    history_out(contextptr)=*v[3]._VECTptr;
-#ifndef GNUWINCE
-    if (v[0].type==_VECT)
-      _cas_setup(v[0],contextptr);
-    else
-      protecteval(v[0],eval_level(contextptr),contextptr); 
-    if (v[1].type==_VECT)
-      _xyztrange(v[1],contextptr);
-    else
-      protecteval(v[1],eval_level(contextptr),contextptr); 
-#endif
-#endif
-    // restore variables
-    for (int i=4;i<l;++i)
-      protecteval(v[i],eval_level(contextptr),contextptr); 
-    // restore xcas_mode
-    if (v.back().type==_INT_)
-      xcas_mode(v.back().val,contextptr);
-    if (!with_history)
-      return true;
-    // eval replace if level>=0
-    if (level<0 || level>=l){
-      history_in(contextptr).push_back(replace);
-      history_out(contextptr).push_back(protecteval(replace,eval_level(contextptr),contextptr)); 
-    }
-    else {
-      history_in(contextptr)[level]=replace;
-      for (int i=level;i<l;++i)
-	history_out(contextptr)[i]=protecteval(history_in(contextptr)[i],eval_level(contextptr),contextptr); 
-    }
-    return true;
-  }
-
-  const char * const do_not_autosimplify[]={
-    "Factor",
-    "Gcd",
-    "Int",
-    "POLYFORM",
-    "Quo",
-    "Quorem",
-    "Rem",
-    "animate",
-    "animation",
-    "archive",
-    "autosimplify",
-    "canonical_form",
-    "cfactor",
-    "convert",
-    "cpartfrac",
-    "curve",
-    "developper",
-    "diff",
-    "domain",
-    "element",
-    "evalc",
-    "expand",
-    "expexpand",
-    "factor",
-    "factoriser",
-    "factoriser_entier",
-    "factoriser_sur_C",
-    "ifactor",
-    "list2exp",
-    "lncollect",
-    "lnexpand",
-    "mathml",
-    "mult_c_conjugate",
-    "mult_conjugate",
-    "multiplier_conjugue",
-    "nodisp",
-    "normal",
-    "op",
-    "partfrac",
-    "plotfield",
-    "plotfunc",
-    "plotparam",
-    "plotpolar",
-    "pow2exp",
-    "powexpand",
-    "propFrac",
-    "propfrac",
-    "quote",
-    "regroup",
-    "reorder",
-    "series",
-    "simplifier",
-    "simplify",
-    "tabvar",
-    "taylor",
-    "texpand",
-    "trace",
-    "trigexpand",
-    0
-  };
-
-  int dichotomic_search(const char * const * tab,unsigned tab_size,const char * s){
-    int beg=0,end=tab_size,cur,test;
-    // string index is always >= begin and < end
-    for (;;){
-      cur=(beg+end)/2;
-      test=strcmp(s,tab[cur]);
-      if (!test)
-	return cur;
-      if (cur==beg)
-	return -1;
-      if (test>0)
-	beg=cur;
-      else
-	end=cur;
-    }
-    return -1;
-  }
-
-  gen add_autosimplify(const gen & g,GIAC_CONTEXT){
-    if (g.type==_VECT)
-      return apply(g,add_autosimplify,contextptr);
-    if (g.type==_SYMB){
-      if (g._SYMBptr->sommet==at_program)
-	return g;
-#ifdef GIAC_HAS_STO_38
-      const char * c=g._SYMBptr->sommet.ptr()->s;
-#else
-      string ss=g._SYMBptr->sommet.ptr()->s;
-      if (g._SYMBptr->sommet==at_sto && g._SYMBptr->feuille.type==_VECT){
-	vecteur & v=*g._SYMBptr->feuille._VECTptr;
-	if (v.size()==2 && v.front().type==_SYMB)
-	  ss=v.front()._SYMBptr->sommet.ptr()->s;
-      }
-      ss=unlocalize(ss);
-      const char * c=ss.c_str();
-#endif
-#if 1
-      if (dichotomic_search(do_not_autosimplify,sizeof(do_not_autosimplify)/sizeof(char*)-1,c)!=-1)
-	return g;
-#else
-      const char ** ptr=do_not_autosimplify;
-      for (;*ptr;++ptr){
-	if (!strcmp(*ptr,c))
-	  return g;
-      }
-#endif
-    }
-    std::string s=autosimplify(contextptr);
-    if (s.size()<1 || s=="'nop'")
-      return g;
-    gen a(s,contextptr);
-    if (a.type==_FUNC)
-      return symbolic(*a._FUNCptr,g);
-    if (a.type>=_IDNT)
-      return symb_of(a,g);
-    return g;
-  }
-
-  bool csv_guess(const char * data,int count,char & sep,char & nl,char & decsep){
-    bool ans=true;
-    int nb[256],pointdecsep=0,commadecsep=0; 
-    for (int i=0;i<256;++i)
-      nb[i]=0;
-    // count occurrence of each char
-    // and detect decimal separator between . or ,
-    for (int i=1;i<count-1;++i){
-      if (data[i]=='[' || data[i]==']')
-	ans=false;
-      ++nb[(unsigned char) data[i]];
-      if (data[i-1]>='0' && data[i-1]<='9' && data[i+1]>='0' && data[i+1]<='9'){
-	if (data[i]=='.')
-	  ++pointdecsep;
-	if (data[i]==',')
-	  ++commadecsep;
-      }
-    }
-    decsep=commadecsep>pointdecsep?',':'.';
-    // detect nl (ctrl-M or ctrl-J)
-    nl=nb[10]>nb[13]?10:13;
-    // find in control characters and : ; the most used (except 10/13)
-    int nbmax=0,imax=-1;
-    for (int i=0;i<60;++i){
-      if (i==10 || i==13 || (i>=' ' && i<='9') )
-	continue;
-      if (nb[i]>nbmax){
-	imax=i;
-	nbmax=nb[i];
-      }
-    }
-    // compare . with , (44)
-    if (nb[unsigned(',')] && nb[unsigned(',')]>=nbmax){
-      imax=',';
-      nbmax=nb[unsigned(',')];
-    }
-    if (nbmax && nbmax>=nb[unsigned(nl)] && imax!=decsep)
-      sep=imax;
-    else
-      sep=' ';
-    return ans;
-  }
-
-  void (*my_gprintf)(unsigned special,const string & format,const vecteur & v,GIAC_CONTEXT)=0;
-
-
-#if defined(EMCC) || defined(EMCC2)
-  static void newlinestobr(string &s,const string & add){
-    int l=int(add.size());
-    for (int i=0;i<l;++i){
-      if (add[i]=='\n')
-	s+="<br>";
-      else
-	s+=add[i];
-    }
-  }
-#else
-  static void newlinestobr(string &s,const string & add){
-    s+=add;
-  }
-#endif
-
-  void gprintf(unsigned special,const string & format,const vecteur & v,GIAC_CONTEXT){
-    return gprintf(special,format,v,step_infolevel(contextptr),contextptr);
-  }
-
-  void gprintf(unsigned special,const string & format,const vecteur & v,int step_info,GIAC_CONTEXT){
-    if (step_info==0)
-      return;
-    if (my_gprintf){
-      my_gprintf(special,format,v,contextptr);
-      return;
-    }
-    string s;
-    int pos=0;
-#if defined(EMCC) || defined(EMCC2)
-    *logptr(contextptr) << char(2) << '\n'; // start mixed text/mathml
-#endif
-    for (unsigned i=0;i<v.size();++i){
-      int p=int(format.find("%gen",pos));
-      if (p<0 || p>=int(format.size()))
-	break;
-      newlinestobr(s,format.substr(pos,p-pos));
-#if defined(EMCC) || defined(EMCC2)
-      gen tmp;
-      if (v[i].is_symb_of_sommet(at_pnt))
-	tmp=_svg(v[i],contextptr);
-      else
-	tmp=_mathml(makesequence(v[i],1),contextptr);
-      s = s+((tmp.type==_STRNG)?(*tmp._STRNGptr):v[i].print(contextptr));
-#else
-      s += v[i].print(contextptr);
-#endif
-      pos=p+4;
-    }
-    newlinestobr(s,format.substr(pos,format.size()-pos));
-    *logptr(contextptr) << s << '\n';
-#if defined(EMCC) || defined(EMCC2)
-    *logptr(contextptr) << char(3) << '\n'; // end mixed text/mathml
-    *logptr(contextptr) << '\n';
-#endif
-  }
-
-  void gprintf(const string & format,const vecteur & v,GIAC_CONTEXT){
-    gprintf(step_nothing_special,format,v,contextptr);
-  }
-
-  void gprintf(const string & format,const vecteur & v,int step_info,GIAC_CONTEXT){
-    gprintf(step_nothing_special,format,v,step_info,contextptr);
-  }
-
-  // moved from input_lexer.ll for easier debug
-  const char invalid_name[]="Invalid name";
-
-#if defined USTL || defined GIAC_HAS_STO_38 || (defined KHICAS && !defined(SIMU))
-#if defined GIAC_HAS_STO_38 || defined KHICAS
-void update_lexer_localization(const std::vector<int> & v,std::map<std::string,std::string> &lexer_map,std::multimap<std::string,localized_string> &back_lexer_map,GIAC_CONTEXT){}
-#endif
-#else
-  vecteur * keywords_vecteur_ptr(){
-    static vecteur v;
-    return &v;
-  }
-
-  static void in_update_lexer_localization(istream & f,int lang,const std::vector<int> & v,std::map<std::string,std::string> &lexer_map,std::multimap<std::string,localized_string> &back_lexer_map,GIAC_CONTEXT){
-    char * line = (char *)malloc(1024);
-    std::string giac_kw,local_kw;
-    size_t l;
-    for (;;){
-      f.getline(line,1023,'\n');
-      l=strlen(line);
-      if (f.eof()){
-	break;
-      }
-      if (l>3 && line[0]!='#'){
-	if (line[l-1]=='\n')
-	  --l;
-	// read giac keyword
-	size_t j;
-	giac_kw="";
-	for (j=0;j<l;++j){
-	  if (line[j]==' ')
-	    break;
-	  giac_kw += line[j];
-	}
-	// read corresponding local keywords
-	local_kw="";
-	vecteur * keywordsptr=keywords_vecteur_ptr();
-	for (++j;j<l;++j){
-	  if (line[j]==' '){
-	    if (!local_kw.empty()){
-#if defined(EMCC) || defined(EMCC2)
-	      gen localgen(gen(local_kw,contextptr));
-	      keywordsptr->push_back(localgen);
-	      sto(gen(giac_kw,contextptr),localgen,contextptr);
-#else
-	      lexer_map[local_kw]=giac_kw;
-	      back_lexer_map.insert(pair<string,localized_string>(giac_kw,localized_string(lang,local_kw)));
-#endif
-	    }
-	    local_kw="";
-	  }
-	  else
-	    local_kw += line[j];
-	}
-	if (!local_kw.empty()){
-#if defined(EMCC) || defined(EMCC2)
-	  gen localgen(gen(local_kw,contextptr));
-	  keywordsptr->push_back(localgen);
-	  sto(gen(giac_kw,contextptr),localgen,contextptr);
-#else
-	  lexer_map[local_kw]=giac_kw;
-	  back_lexer_map.insert(pair<string,localized_string>(giac_kw,localized_string(lang,local_kw)));
-#endif
-	}
-      }
-    }
-    free(line);
-  }
-	    
-  void update_lexer_localization(const std::vector<int> & v,std::map<std::string,std::string> &lexer_map,std::multimap<std::string,localized_string> &back_lexer_map,GIAC_CONTEXT){
-    lexer_map.clear();
-    back_lexer_map.clear();
-    int s=int(v.size());
-    for (int i=0;i<s;++i){
-      int lang=v[i];
-      if (lang>=1 && lang<=4){
-	std::string doc=find_doc_prefix(lang);
-	std::string file=giac_aide_dir()+doc+"keywords";
-	//COUT << "keywords " << file << '\n';
-	ifstream f(file.c_str());
-	if (f.good()){
-	  in_update_lexer_localization(f,lang,v,lexer_map,back_lexer_map,contextptr);
-	  // COUT << "// Using keyword file " << file << '\n';
-	} // if (f)
-	else {
-	  if (lang==1){
-#ifdef HAVE_SSTREAM
-      istringstream f(
-#else
-      istrstream f(
-#endif
-		   "# enter couples\n# giac_keyword translation\n# for example, to define integration as a translation for integrate \nintegrate integration\neven est_pair\nodd est_impair\n# geometry\nbarycenter barycentre\nisobarycenter isobarycentre\nmidpoint milieu\nline_segments aretes\nmedian_line mediane\nhalf_line demi_droite\nparallel parallele\nperpendicular perpendiculaire\ncommon_perpendicular perpendiculaire_commune\nenvelope enveloppe\nequilateral_triangle triangle_equilateral\nisosceles_triangle triangle_isocele\nright_triangle triangle_rectangle\nlocus lieu\ncircle cercle\nconic conique\nreduced_conic conique_reduite\nquadric quadrique\nreduced_quadric quadrique_reduite\nhyperbola hyperbole\ncylinder cylindre\nhalf_cone demi_cone\nline droite\nplane plan\nparabola parabole\nrhombus losange\nsquare carre\nhexagon hexagone\npyramid pyramide\nquadrilateral quadrilatere\nparallelogram parallelogramme\northocenter orthocentre\nexbisector exbissectrice\nparallelepiped parallelepipede\npolyhedron polyedre\ntetrahedron tetraedre\ncentered_tetrahedron tetraedre_centre\ncentered_cube cube_centre\noctahedron octaedre\ndodecahedron dodecaedre\nicosahedron icosaedre\nbisector bissectrice\nperpen_bisector mediatrice\naffix affixe\naltitude hauteur\ncircumcircle circonscrit\nexcircle exinscrit\nincircle inscrit\nis_prime est_premier\nis_equilateral est_equilateral\nis_rectangle est_rectangle\nis_parallel est_parallele\nis_perpendicular est_perpendiculaire\nis_orthogonal est_orthogonal\nis_collinear est_aligne\nis_concyclic est_cocyclique\nis_element est_element\nis_included est_inclus\nis_coplanar est_coplanaire\nis_isosceles est_isocele\nis_square est_carre\nis_rhombus est_losange\nis_parallelogram est_parallelogramme\nis_conjugate est_conjugue\nis_harmonic_line_bundle est_faisceau_droite\nis_harmonic_circle_bundle est_faisceau_cercle\nis_inside est_dans\narea aire\nperimeter perimetre\ndistance longueur\ndistance2 longueur2\nareaat aireen\nslopeat penteen\nangleat angleen\nperimeterat perimetreen\ndistanceat distanceen\nareaatraw aireenbrut\nslopeatraw penteenbrut\nangleatraw angleenbrut\nperimeteratraw perimetreenbrut\ndistanceatraw distanceenbrut\nextract_measure extraire_mesure\ncoordinates coordonnees\nabscissa abscisse\nordinate ordonnee\ncenter centre\nradius rayon\npowerpc puissance\nvertices sommets\npolygon polygone\nisopolygon isopolygone\nopen_polygon polygone_ouvert\nhomothety homothetie\nsimilarity similitude\n# affinity affinite\nreflection symetrie\nreciprocation polaire_reciproque\nscalar_product produit_scalaire\n# solid_line ligne_trait_plein\n# dash_line ligne_tiret\n# dashdot_line ligne_tiret_point\n# dashdotdot_line ligne_tiret_pointpoint\n# cap_flat_line ligne_chapeau_plat\n# cap_round_line ligne_chapeau_rond\n# cap_square_line ligne_chapeau_carre\n# line_width_1 ligne_epaisseur_1\n# line_width_2 ligne_epaisseur_2\n# line_width_3 ligne_epaisseur_3\n# line_width_4 ligne_epaisseur_4\n# line_width_5 ligne_epaisseur_5\n# line_width_6 ligne_epaisseur_6\n# line_width_7 ligne_epaisseur_7\n# line_width_8 ligne_epaisseur_8\n# rhombus_point point_losange\n# plus_point point_plus\n# square_point point_carre\n# cross_point point_croix\n# triangle_point point_triangle\n# star_point point_etoile\n# invisible_point point_invisible\ncross_ratio birapport\nradical_axis axe_radical\npolar polaire\npolar_point point_polaire\npolar_coordinates coordonnees_polaires\nrectangular_coordinates coordonnees_rectangulaires\nharmonic_conjugate conj_harmonique\nharmonic_division div_harmonique\ndivision_point point_div\n# harmonic_division_point point_division_harmonique\ndisplay affichage\nvertices_abc sommets_abc\nvertices_abca sommets_abca\nline_inter inter_droite\nsingle_inter inter_unique\ncolor couleur\nlegend legende\nis_harmonic est_harmonique\nbar_plot diagramme_batons\nbarplot diagrammebatons\nhistogram histogramme\nprism prisme\nis_cospherical est_cospherique\ndot_paper papier_pointe\ngrid_paper papier_quadrille\nline_paper papier_ligne\ntriangle_paper papier_triangule\nvector vecteur\nplotarea tracer_aire\nplotproba graphe_probabiliste\nmult_c_conjugate mult_conjugue_C\nmult_conjugate mult_conjugue\ncanonical_form forme_canonique\nibpu integrer_par_parties_u\nibpdv integrer_par_parties_dv\nwhen quand\nslope pente\ntablefunc table_fonction\ntableseq table_suite\nfsolve resoudre_numerique\ninput saisir\nprint afficher\nassume supposons\nabout domaine\nbreakpoint point_arret\nwatch montrer\nrmwatch ne_plus_montrer\nrmbreakpoint suppr_point_arret\nrand alea\nInputStr saisir_chaine\nOx_2d_unit_vector vecteur_unitaire_Ox_2d\nOy_2d_unit_vector vecteur_unitaire_Oy_2d\nOx_3d_unit_vector vecteur_unitaire_Ox_3d\nOy_3d_unit_vector vecteur_unitaire_Oy_3d\nOz_3d_unit_vector vecteur_unitaire_Oz_3d\nframe_2d repere_2d\nframe_3d repere_3d\nrsolve resoudre_recurrence\nassume supposons\ncumulated_frequencies frequences_cumulees\nfrequencies frequences\nnormald loi_normale\nregroup regrouper\nosculating_circle cercle_osculateur\ncurvature courbure\nevolute developpee\nvector vecteur\n");
-	    in_update_lexer_localization(f,1,v,lexer_map,back_lexer_map,contextptr);
-	  }
-	  else
-	    CERR << "// Unable to find keyword file " << file << '\n';
-	}
-      }
-    }
-  }
-#endif
-
-#if !defined NSPIRE 
-
-#include "input_parser.h" 
-
-    bool has_special_syntax(const char * s){
-#ifdef USTL
-      ustl::pair<charptr_gen *,charptr_gen *> p=
-	ustl::equal_range(builtin_lexer_functions_begin(),builtin_lexer_functions_end(),
-		    std::pair<const char *,gen>(s,0),
-		    tri);
-#else
-      std::pair<charptr_gen *,charptr_gen *> p=
-	equal_range(builtin_lexer_functions_begin(),builtin_lexer_functions_end(),
-		    std::pair<const char *,gen>(s,0),
-		    tri);
-#endif
-      if (p.first!=p.second && p.first!=builtin_lexer_functions_end())
-	return (p.first->second.subtype!=T_UNARY_OP-256);
-      map_charptr_gen::const_iterator i = lexer_functions().find(s);
-      if (i==lexer_functions().end())
-	return false;
-      return (i->second.subtype!=T_UNARY_OP-256);
-    }
-    
-    bool lexer_functions_register(const unary_function_ptr & u,const char * s,int parser_token){
-      map_charptr_gen::const_iterator i = lexer_functions().find(s);
-      if (i!=lexer_functions().end())
-	return false;
-      if (doing_insmod){
-	if (debug_infolevel) CERR << "insmod register " << s << '\n';
-	registered_lexer_functions().push_back(user_function(s,parser_token));
-      }
-      if (!builtin_lexer_functions_sorted){
-#ifndef STATIC_BUILTIN_LEXER_FUNCTIONS
-#if defined NSPIRE_NEWLIB || defined KHICAS || defined NUMWORKS
-	builtin_lexer_functions_begin()[builtin_lexer_functions_number]=std::pair<const char *,gen>(s,gen(u));
-#else
-	builtin_lexer_functions_begin()[builtin_lexer_functions_number].first=s;
-	builtin_lexer_functions_begin()[builtin_lexer_functions_number].second.type=0;
-	builtin_lexer_functions_begin()[builtin_lexer_functions_number].second=gen(u);
-#endif
-	if (parser_token==1)
-	  builtin_lexer_functions_begin()[builtin_lexer_functions_number].second.subtype=T_UNARY_OP-256;
-	else
-	  builtin_lexer_functions_begin()[builtin_lexer_functions_number].second.subtype=parser_token-256;
-	builtin_lexer_functions_number++;
-#endif
-	if (debug_infolevel) CERR << "insmod register builtin " << s << '\n';
-      }
-      else {
-	lexer_functions()[s] = gen(u);
-	if (parser_token==1)
-	  lexer_functions()[s].subtype=T_UNARY_OP-256;
-	else
-	  lexer_functions()[s].subtype=parser_token-256;
-	if (debug_infolevel) CERR << "insmod register lexer_functions " << s << '\n';	
-      }
-      // If s is a library function name (with ::), update the library
-      int ss=int(strlen(s)),j=0;
-      for (;j<ss-1;++j){
-	if (s[j]==':' && s[j+1]==':')
-	  break;
-      }
-      if (j<ss-1){
-	string S(s);
-	string libname=S.substr(0,j);
-	string funcname=S.substr(j+2,ss-j-2);
-#ifdef USTL
-	ustl::map<std::string,std::vector<string> >::iterator it=library_functions().find(libname);
-#else
-	std::map<std::string,std::vector<string> >::iterator it=library_functions().find(libname);
-#endif
-	if (it!=library_functions().end())
-	  it->second.push_back(funcname);
-	else
-	  library_functions()[libname]=vector<string>(1,funcname);
-      }
-      return true;
-    }
-
-    bool lexer_function_remove(const vector<user_function> & v){
-      vector<user_function>::const_iterator it=v.begin(),itend=v.end();
-      map_charptr_gen::const_iterator i,iend;
-      bool ok=true;
-      for (;it!=itend;++it){
-	i = lexer_functions().find(it->s.c_str());
-	iend=lexer_functions().end();
-	if (i==iend)
-	  ok=false;
-	else
-	  lexer_functions().erase(it->s.c_str());
-      }
-      return ok;
-    }
-
-    int find_or_make_symbol(const string & s,gen & res,void * scanner,bool check38,GIAC_CONTEXT){
-      int tmpo=opened_quote(contextptr);
-      if (tmpo & 2)
-	check38=false;
-      if (s.size()==1){
-#ifdef GIAC_HAS_STO_38
-	if (0 && s[0]>='a' && s[0]<='z'){
-	  index_status(contextptr)=1; 
-	  res=*tab_one_letter_idnt[s[0]-'a'];
-	  return T_SYMBOL;
-	}
-	if (check38 && s[0]>='a' && s[0]<='z' && calc_mode(contextptr)==38)
-	  giac_yyerror(scanner,invalid_name);
-#else
-	if (s[0]>='a' && s[0]<='z'){
-	  if (check38 && calc_mode(contextptr)==38)
-	    giac_yyerror(scanner,invalid_name);
-	  index_status(contextptr)=1; 
-	  res=*tab_one_letter_idnt[s[0]-'a'];
-	  return T_SYMBOL;
-	}
-#endif
-	switch (s[0]){
-	case '+':
-	  res=at_plus;
-	  return T_UNARY_OP;
-	case '-':
-	  res=at_neg;
-	  return T_UNARY_OP;
-	case '*':
-	  res=at_prod;
-	  return T_UNARY_OP;
-	case '/':
-	  res=at_division;
-	  return T_UNARY_OP;
-	case '^':
-	  res=at_pow;
-	  return T_UNARY_OP;
-	}
-      }
-      string ts(s);
-#ifdef USTL
-      ustl::map<std::string,std::string>::const_iterator trans=lexer_localization_map().find(ts);
-      if (trans!=lexer_localization_map().end())
-	ts=trans->second;
-      ustl::map<std::string,std::vector<string> >::const_iterator j=lexer_translator().find(ts);
-      if (j!=lexer_translator().end() && !j->second.empty())
-	ts=j->second.back();
-      ustl::pair<charptr_gen *,charptr_gen *> p=ustl::equal_range(builtin_lexer_functions_begin(),builtin_lexer_functions_end(),std::pair<const char *,gen>(ts.c_str(),0),tri);
-#else
-      std::map<std::string,std::string>::const_iterator trans=lexer_localization_map().find(ts);
-      if (trans!=lexer_localization_map().end())
-	ts=trans->second;
-      std::map<std::string,std::vector<string> >::const_iterator j=lexer_translator().find(ts);
-      if (j!=lexer_translator().end() && !j->second.empty())
-	ts=j->second.back();
-      std::pair<charptr_gen *,charptr_gen *> p=equal_range(builtin_lexer_functions_begin(),builtin_lexer_functions_end(),std::pair<const char *,gen>(ts.c_str(),0),tri);
-#endif
-      if (p.first!=p.second && p.first!=builtin_lexer_functions_end()){
-	if (p.first->second.subtype==T_TO-256)
-	  res=plus_one;
-	else
-	  res = p.first->second;
-	res.subtype=1;
-	if (builtin_lexer_functions_){
-#ifdef NSPIRE
-	  res=gen(int((*builtin_lexer_functions_())[p.first-builtin_lexer_functions_begin()]+p.first->second.val));
-	  res=gen(*res._FUNCptr);	  
-#else
-#if !defined NSPIRE_NEWLIB || defined KHICAS
-	  res=0;
-	  int pos=int(p.first-builtin_lexer_functions_begin());
-#if defined KHICAS && !defined x86_64
-	  const unary_function_ptr * at_val=*builtin_lexer_functions_[pos];
-#else
-	  size_t val=builtin_lexer_functions_[pos];
-	  unary_function_ptr * at_val=(unary_function_ptr *)val;
-#endif
-	  res=at_val;
-#if defined GIAC_HAS_STO_38 || (defined KHICAS && defined DEVICE)
-	  if (builtin_lexer_functions[pos]._FUNC_%2){
-#ifdef SMARTPTR64
-	    unary_function_ptr tmp=*at_val;
-	    tmp._ptr+=1;
-	    res=tmp;
-#else
-	    res._FUNC_ +=1;
-#endif // SMARTPTR64
-	  }
-#endif // GIAC_HAS_STO_38
-#else // keep this code, required for the nspire otherwise evalf(pi)=reboot
-	  res=gen(int(builtin_lexer_functions_[p.first-builtin_lexer_functions_begin()]+p.first->second.val));
-	  res=gen(*res._FUNCptr);
-#endif
-#endif
-	}
-	index_status(contextptr)=(p.first->second.subtype==T_UNARY_OP-256);
-	int token=p.first->second.subtype;
-	token += (token<0)?512:256 ;	
-	return token;
-      }
-      lexer_tab_int_type tst={ts.c_str(),0,0,0,0};
-#ifdef USTL
-      ustl::pair<const lexer_tab_int_type *,const lexer_tab_int_type *> pp = ustl::equal_range(lexer_tab_int_values,lexer_tab_int_values_end,tst,tri1);
-#else
-      std::pair<const lexer_tab_int_type *,const lexer_tab_int_type *> pp = equal_range(lexer_tab_int_values,lexer_tab_int_values_end,tst,tri1);
-#endif
-      if (pp.first!=pp.second && pp.first!=lexer_tab_int_values_end){
-	index_status(contextptr)=pp.first->status;
-	res=int(pp.first->value);
-	res.subtype=pp.first->subtype;
-	return pp.first->return_value;
-      }
-      // CERR << "lexer_functions search " << ts << '\n';
-      map_charptr_gen::const_iterator i = lexer_functions().find(ts.c_str());
-      if (i!=lexer_functions().end()){
-	// CERR << "lexer_functions found " << ts << '\n';
-	if (i->second.subtype==T_TO-256)
-	  res=plus_one;
-	else
-	  res = i->second;
-	res.subtype=1;
-	index_status(contextptr)=(i->second.subtype==T_UNARY_OP-256);
-	return i->second.subtype+256 ;
-      }
-      lock_syms_mutex();
-      sym_string_tab::const_iterator i2 = syms().find(s),i2end=syms().end();
-      if (i2 == i2end) {
-	unlock_syms_mutex();  
-	const char * S = s.c_str();
-	// std::CERR << "lexer new" << s << '\n';
-	if (check38 && calc_mode(contextptr)==38 && strcmp(S,string_pi) && strcmp(S,string_euler_gamma) && strcmp(S,string_infinity) && strcmp(S,string_undef) && S[0]!='G'&& (!is_known_name_38 || !is_known_name_38(0,S))){
-	  // detect invalid names and implicit multiplication 
-	  size_t ss=strlen(S);
-	  vecteur args;
-	  for (size_t i=0;i<ss;++i){
-	    char ch=S[i];
-	    if (ch=='C' || (ch>='E' && ch<='H') || ch=='L' || ch=='M' || ch=='R'
-		/* || ch=='S' */
-		|| ch=='U' || ch=='V' || (ch>='X' && ch<='Z') ){
-	      string name;
-	      name += ch;
-	      char c=0;
-	      if (i<ss-1)
-		c=s[i+1];
-	      if (c>='0' && c<='9'){
-		name += c;
-		++i;
-	      }
-	      res = identificateur(name);
-	      lock_syms_mutex();
-	      syms()[name] = res;
-	      unlock_syms_mutex();
-	      args.push_back(res);
-	    }
-	    else {
-	      string coeff;
-	      for (++i;i<ss;++i){
-		// up to next alphabetic char
-		if (s[i]>32 && isalpha(s[i])){
-		  --i;
-		  break;
-		}
-		if (scanner && (s[i]<0 || s[i]>'z')){
-		  giac_yyerror(scanner,invalid_name);
-		  res=undef;
-		  return T_SYMBOL;
-		}
-		coeff += s[i];
-	      }
-	      if (coeff.empty())
-		res=1;
-	      else
-		res=strtod(coeff.c_str(),0);
-	      if (ch=='i')
-		res=res*cst_i;
-	      else {
-		if (ch=='e')
-		  res=std::exp(1.0)*res;
-		else {
-		  // Invalid ident name, report error
-		  if ( (ch>'Z' || ch<0) && scanner){
-		    giac_yyerror(scanner,invalid_name);
-		    res=undef;
-		    return T_SYMBOL;
-		  }
-		  coeff=string(1,ch);
-		  gen tmp = identificateur(coeff);
-		  // syms()[coeff.c_str()]=tmp;
-		  res=res*tmp;
-		}
-	      }
-	      args.push_back(res);
-	    }
-	  }
-	  if (args.size()==1)
-	    res=args.front();
-	  else 
-	    res=_prod(args,contextptr);
-	  lock_syms_mutex();
-	  syms()[s]=res;
-	  unlock_syms_mutex();
-	  return T_SYMBOL;
-	} // end 38 compatibility mode
-	res = identificateur(s);
-	lock_syms_mutex();
-	syms()[s] = res;
-	unlock_syms_mutex();
-	return T_SYMBOL;
-      } // end if ==syms.end()
-      res = i2->second;
-      unlock_syms_mutex();  
-      return T_SYMBOL;
-    }
-
-  // Add to the list of predefined symbols
-  void set_lexer_symbols(const vecteur & l,GIAC_CONTEXT){
-    if (initialisation_done(contextptr))
-      return;
-    initialisation_done(contextptr)=true;
-    const_iterateur it=l.begin(),itend=l.end();
-    for (; it!=itend; ++it) {
-      if (it->type!=_IDNT)
-	continue;
-      lock_syms_mutex();
-      sym_string_tab::const_iterator i = syms().find(it->_IDNTptr->id_name),iend=syms().end();
-      if (i==iend)
-	syms()[it->_IDNTptr->name()] = *it;
-      unlock_syms_mutex();  
-    }
-  }
-
-  string replace(const string & s,char c1,char c2){
-    string res;
-    int l=s.size();
-    res.reserve(l);
-    const char * ch=s.c_str();
-    for (int i=0;i<l;++i,++ch){
-      res+= (*ch==c1? c2: *ch);
-    }
-    return res;
-  }
-
-  static string remove_comment(const string & s,const string &pattern,bool rep){
-    string res(s);
-    for (;;){
-      int pos1=res.find(pattern);
-      if (pos1<0 || pos1+3>=int(res.size()))
-	break;
-      int pos2=res.find(pattern,pos1+3);
-      if (pos2<0 || pos2+3>=int(res.size()))
-	break;
-      if (rep)
-	res=res.substr(0,pos1)+'"'+replace(res.substr(pos1+3,pos2-pos1-3),'\n',' ')+'"'+res.substr(pos2+3,res.size()-pos2-3);
-      else
-	res=res.substr(0,pos1)+res.substr(pos2+3,res.size()-pos2-3);
-    }
-    return res;
-  }
-
-  struct int_string {
-    int decal;
-    std::string endbloc;
-    int_string():decal(0){}
-    int_string(int i,string s):decal(i),endbloc(s){}
-  };
-
-  static bool instruction_at(const string & s,int pos,int shift){
-    if (pos && isalphan(s[pos-1]))
-      return false;
-    if (pos+shift<int(s.size()) && isalphan(s[pos+shift]))
-      return false;
-    return true;
-  }
-
-  void convert_python(string & cur,GIAC_CONTEXT){
-    bool indexshift=array_start(contextptr); //xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38;
-    if (cur[0]=='_' && (cur.size()==1 || !isalpha(cur[1])))
-      cur[0]='@'; // python shortcut for ans(-1)
-    bool instring=cur.size() && cur[0]=='"';
-    int openpar=0;
-    for (int pos=1;pos<int(cur.size());++pos){
-      char prevch=cur[pos-1],curch=cur[pos];
-      if (curch=='"' && prevch!='\\')
-	instring=!instring;
-      if (instring)
-	continue;
-      if (curch=='(')
-	++openpar;
-      if (curch==')')
-	--openpar;
-      if (curch==',' && pos<int(cur.size()-1)){
-	char nextch=cur[pos+1];
-	if (nextch=='}' || nextch==']' || nextch==')'){
-	  cur.erase(cur.begin()+pos);
-	  continue;
-	}
-      }
-      if (curch=='}' && prevch=='{'){
-	cur=cur.substr(0,pos-1)+"table()"+cur.substr(pos+1,cur.size()-pos-1);
-	continue;
-      }
-      if (curch==':' && (prevch=='[' || prevch==',')){
-	cur.insert(cur.begin()+pos,indexshift?'1':'0');
-	continue;
-      }
-      if (curch==':' && pos<int(cur.size())-1 && cur[pos+1]!='=' && cur[pos+1]!=';'){
-	int posif=cur.find("if "),curpos,cursize=int(cur.size()),count=0;
-	// check is : for slicing?
-	for (curpos=pos+1;curpos<cursize;++curpos){
-	  if (cur[curpos]=='[')
-	    ++count;
-	  if (cur[curpos]==']')
-	    --count;
-	}
-	if (count==0 && posif>=0 && posif<pos){
-	  cur[pos]=')';
-	  cur.insert(cur.begin()+posif+3,'(');
-	  continue;
-	}
-      }
-      if ( (curch==']' && (prevch==':' || prevch==',')) ||
-	   (curch==',' && prevch==':') ){
-	cur[pos-1]='.';
-	cur.insert(cur.begin()+pos,'.');
-	++pos;
-	if (indexshift)
-	  cur.insert(cur.begin()+pos,'0');
-	else {
-	  cur.insert(cur.begin()+pos,'1');
-	  cur.insert(cur.begin()+pos,'-');
-	}
-	continue;
-      }
-      if (curch==':' && prevch==':'){
-	if (pos+1<int(cur.size()) && cur[pos+1]=='-'){
-	  cur.insert(cur.begin()+pos,'-');
-	  cur.insert(cur.begin()+pos+1,'1');
-	}
-	else
-	  cur.insert(cur.begin()+pos,'0');
-	continue;	
-      }
-      if (curch=='%'){
-	cur.insert(cur.begin()+pos+1,'/');
-	++pos;
-	continue;
-      }
-      if (curch=='=' && openpar==0 && prevch!='>' && prevch!='<' && prevch!='!' && prevch!=':' && prevch!=';' && prevch!='=' && prevch!='+' && prevch!='-' && prevch!='*' && prevch!='/' && prevch!='%' && (pos==int(cur.size())-1 || (cur[pos+1]!='=' && cur[pos+1]!='<'))){
-	cur.insert(cur.begin()+pos,':');
-	++pos;
-	continue;
-      }
-      if (prevch=='/' && curch=='/' && pos>1)
-	cur[pos]='%';
-    }
-  }
-
-  string glue_lines_backslash(const string & s){
-    int ss=s.size();
-    int i=s.find('\\');
-    if (i<0 || i>=ss)
-      return s;
-    string res,line;    
-    for (i=0;i<ss;++i){
-      if (s[i]!='\n'){
-	line += s[i];
-	continue;
-      }
-      int ls=line.size(),j;
-      for (j=ls-1;j>=0;--j){
-	if (line[j]!=' ')
-	  break;
-      }
-      if (line[j]!='\\' || (j && line[j-1]=='\\')){
-	res += line+'\n';
-	line ="";
-      }
-      else
-	line=line.substr(0,j); 
-    }
-    return res+line;
-  }
-
-  static void python_import(string & cur,int cs,int posturtle,int poscmath,int posmath,int posnumpy,int posmatplotlib,GIAC_CONTEXT){
-    if (posmatplotlib>=0 && posmatplotlib<cs){
-      cur += "np:=numpy:;xlim(a,b):=gl_x=a..b:;ylim(a,b):=gl_y=a..b:;scatter:=scatterplot:;bar:=bar_plot:;text:=legend:;xlabel:=gl_x_axis_name:;ylabel:=gl_y_axis_name:;arrow:=vector:;boxplot:=moustache:;";
-      posnumpy=posmatplotlib;
-    }
-    if (posnumpy>=0 && posnumpy<cs){
-      static bool alertnum=true;
-      // add python numpy shortcuts
-      cur += "mat:=matrix:;arange:=range:;resize:=redim:;shape:=dim:;conjugate:=conj:;full:=matrix:;eye:=identity:;ones(n,c):=matrix(n,c,1):; astype:=convert:;float64:=float:;asarray:=array:;astype:=convert:;reshape(m,n,c):=matrix(n,c,flatten(m));";
-      if (alertnum){
-	alertnum=false;
-	alert("mat:=matrix;arange:=range;resize:=redim;shape:=dim;conjugate:=conj;full:=matrix;eye:=idn;ones(n,c):=matrix(n,c,1);reshape(m,n,c):=matrix(n,c,flatten(m));",contextptr);
-      }
-      return;
-    }
-    if (posturtle>=0 && posturtle<cs){
-      // add python turtle shortcuts
-      static bool alertturtle=true;
-#ifdef KHICAS
-      cur += "fd:=forward:;bk:=backward:; rt:=right:; lt:=left:; pos:=position:; seth:=heading:;setheading:=heading:; ";
-#else
-      cur += "pu:=penup:;up:=penup:; pd:=pendown:;down:=pendown:; fd:=forward:;bk:=backward:; rt:=right:; lt:=left:; pos:=position:; seth:=heading:;setheading:=heading:; reset:=efface:;";
-#endif
-      if (alertturtle){
-	alertturtle=false;
-	alert("pu:=penup;up:=penup; pd:=pendown;down:=pendown; fd:=forward;bk:=backward; rt:=right; lt:=left; pos:=position; seth:=heading;setheading:=heading; reset:=efface",contextptr);
-      }
-      return;
-    }
-    if (poscmath>=0 && poscmath<cs){
-      // add python cmath shortcuts
-      static bool alertcmath=true;      
-      if (alertcmath){
-	alertcmath=false;
-	alert(gettext("Assigning phase, j, J and rect."),contextptr);
-      }
-      cur += "phase:=arg:;j:=i:;J:=i:;";
-      posmath=poscmath;
-    }
-    if (posmath>=0 && posmath<cs){
-      // add python math shortcuts
-      static bool alertmath=true;      
-      if (alertmath){
-	alertmath=false;
-	alert(gettext("Assigning gamma, fabs. Not supported: copysign."),contextptr);
-      }
-      cur += "gamma:=Gamma:;fabs:=abs:;";
-    }
-  }
-
-  string replace_deuxpoints_egal(const string & s){
-    string res;
-    int instring=0;
-    for (size_t i=0;i<s.size();++i){
-      char ch=s[i];
-      if (i==0 || s[i-1]!='\\'){
-	if (ch=='\''){
-	  if (instring==2)
-	    res += ch;
-	  else {
-	    res +='"';
-	    instring=instring?0:1;
-	  }
-	  continue;
-	}
-	if (instring){
-	  if (ch=='"'){
-	    if (instring==1)
-	      res +="\"\"";
-	    else {
-	      res += ch;
-	      instring=0;
-	    }
-	  }
-	  else
-	    res += ch;
-	  continue;
-	}
-	if (ch=='"'){
-	  res +='"';
-	  instring=2;
-	  continue;
-	}
-      }
-      switch (ch){
-      case ':':
-	res +="-/-";
-	break;
-      case '{':
-	res += "{/";
-	break;
-      case '}':
-	res += "/}";
-	break;
-      default:
-	res += ch;
-      }
-    }
-    return res;
-  }
-
-  // detect Python like syntax: 
-  // remove """ """ docstrings and ''' ''' comments
-  // cut string in lines, remove comments at the end (search for #)
-  // warning don't take care of # inside strings
-  // if a line of s ends with a :
-  // search for matching def/for/if/else/while
-  // stores matching end keyword in a stack as a vector<[int,string]>
-  // int is the number of white spaces at the start of the next line
-  // def ... : -> function [ffunction]
-  // for ... : -> for ... do [od]
-  // while ... : -> while ... do [od]
-  // if ...: -> if ... then [fi]
-  // else: -> else [nothing in stack]
-  // elif ...: -> elif ... then [nothing in stack]
-  // try: ... except: ...
-  std::string python2xcas(const std::string & s_orig,GIAC_CONTEXT){
-    if (xcas_mode(contextptr)>0 && abs_calc_mode(contextptr)!=38)
-      return s_orig;
-    // quick check for python-like syntax: search line ending with :
-    int first=0,sss=s_orig.size();
-    first=s_orig.find("maple_mode");
-    if (first>=0 && first<sss)
-      return s_orig;
-    first=s_orig.find("xcas_mode");
-    if (first>=0 && first<sss)
-      return s_orig;
-    first=s_orig.find('\n');
-    if (first<0 || first>=sss){
-      first=s_orig.find('\''); // derivative or Python string delimiter?
-      if (first>=0 && first<sss){
-	if (first==sss-1 || s_orig[first+1]=='\'') // '' is a second derivative
-	  return s_orig;
-	first=s_orig.find('\'',first+1);
-	if (first<0 || first>=sss)
-	  return s_orig;
-      }
-    }
-    bool pythoncompat=python_compat(contextptr);
-    bool pythonmode=false;
-    first=0;
-    if (sss>19 && s_orig.substr(first,17)=="add_autosimplify(")
-      first+=17;
-    if (s_orig[first]=='/' )
-      return s_orig;
-    //if (sss>first+2 && s_orig[first]=='@' && s_orig[first+1]!='@') return s_orig.substr(first+1,sss-first-1);
-    if (sss>first+2 && s_orig.substr(first,2)=="@@"){
-      pythonmode=true;
-      pythoncompat=true;
-    }
-    if (s_orig[first]=='#' || (s_orig[first]=='_' && !isalpha(s_orig[first+1])) || s_orig.substr(first,4)=="from" || s_orig.substr(first,7)=="import " || s_orig.substr(first,4)=="def "){
-      pythonmode=true;
-      pythoncompat=true;
-    }
-    if (pythoncompat){
-      int pos=s_orig.find("{");
-      if (pos>=0 && pos<sss)
-	pythonmode=true;
-      pos=s_orig.find("}");
-      if (pos>=0 && pos<sss)
-	pythonmode=true;
-      pos=s_orig.find("//");
-      if (pos>=0 && pos<sss)
-	pythonmode=true;
-      pos=s_orig.find(":");
-      if (pos>=0 && pos<sss-1 && s_orig[pos+1]!=';')
-	pythonmode=true;
-    }
-    for (first=0;!pythonmode && first<sss;){
-      int pos=s_orig.find(":]");
-      if (pos>=0 && pos<sss){
-	pythonmode=true;
-	break;
-      }
-      pos=s_orig.find("[:");
-      if (pos>=0 && pos<sss){
-	pythonmode=true;
-	break;
-      }
-      pos=s_orig.find(",:");
-      if (pos>=0 && pos<sss){
-	pythonmode=true;
-	break;
-      }
-      pos=s_orig.find(":,");
-      if (pos>=0 && pos<sss){
-	pythonmode=true;
-	break;
-      }
-      pos=s_orig.find('#',0);
-      if (pos<0 || pos>=sss){
-	first=s_orig.find(':',first);
-	if (first<0 || first>=sss){
-	  return s_orig; // not Python like
-	}
-      }
-      pos=s_orig.find("lambda");
-      if (pos>=0 && pos<sss)
-	break;
-      int endl=s_orig.find('\n',first);
-      if (endl<0 || endl>=sss)
-	endl=sss;
-      ++first;
-      if (first<endl && (s_orig[first]==';' || s_orig[first]=='=')) 
-	continue; // ignore :;
-      // search for line finishing with : (or with # comment)
-      for (;first<endl;++first){
-	char ch=s_orig[first];
-	if (ch!=' '){
-	  if (ch=='#')
-	    first=endl;
-	  break;
-	}
-      }
-      if (first==endl) 
-	break;
-    }
-    // probably Python-like
-    string res;
-    res.reserve(6*s_orig.size()/5);
-    res=s_orig;
-    if (res.size()>18 && res.substr(0,17)=="add_autosimplify(" 
-	&& res[res.size()-1]==')'
-	)
-      res=res.substr(17,res.size()-18);
-    if (res.size()>2 && res.substr(0,2)=="@@")
-      res=res.substr(2,res.size()-2);
-    res=remove_comment(res,"\"\"\"",true);
-    res=remove_comment(res,"'''",true);
-    res=glue_lines_backslash(res);
-    vector<int_string> stack;
-    string s,cur; 
-    s.reserve(res.capacity());
-    if (pythoncompat) pythonmode=true;
-    for (;res.size();){
-      int pos=-1;
-      bool cherche=true;
-      for (;cherche;){
-	pos=res.find('\n',pos+1);
-	if (pos<0 || pos>=int(res.size()))
-	  break;
-	cherche=false;
-	char ch=0;
-	// check if we should skip to next newline, look at previous non space
-	for (int pos2=0;pos2<pos;++pos2){
-	  ch=res[pos2];
-	  if (ch=='#')
-	    break;
-	}
-	if (ch=='#')
-	  break;
-	for (int pos2=pos-1;pos2>=0;--pos2){
-	  ch=res[pos2];
-	  if (ch!=' ' && ch!=9 && ch!='\r'){
-	    if (ch=='{' || ch=='[' || ch==',' || ch=='-' || ch=='+' ||  ch=='/'){
-	      if (pos2>0 && (ch=='+' || ch=='-') && ch==res[pos2-1])
-		;
-	      else
-		cherche=true;
-	    }
-	    break;
-	  }
-	}
-	for (size_t pos2=pos+1;pos2<res.size();++pos2){
-	  ch=res[pos2];
-	  if (ch!=' ' && ch!=9 && ch!='\r'){
-	    if (ch==']' || ch=='}' || ch==')')
-	      cherche=true;
-	    break;
-	  }
-	}
-      }
-      if (pos<0 || pos>=int(res.size())){
-	cur=res; res="";
-      }
-      else {
-	cur=res.substr(0,pos); // without \n
-	res=res.substr(pos+1,res.size()-pos-1);
-      }
-      // detect comment (outside of a string) and lambda expr:expr
-      bool instring=false,chkfrom=true;
-      for (pos=0;pos<int(cur.size());++pos){
-	char ch=cur[pos];
-	if (ch==' ' || ch==char(9) || ch=='\r')
-	  continue;
-	if (!instring && pythoncompat && ch=='{' && (pos==0 || cur[pos-1]!='\\')){
-	  // find matching }, counting : and , and ;
-	  int c1=0,c2=0,c3=0,cs=int(cur.size()),p;
-	  for (p=pos;p<cs;++p){
-	    char ch=cur[p];
-	    if (ch=='}' && cur[p-1]!='\\')
-	      break;
-	    if (ch==':')
-	      ++c1;
-	    if (ch==',')
-	      ++c2;
-	    if (ch==';')
-	      ++c3;
-	  }
-	  if (p<cs 
-	      //&& c1 
-	      && c3==0){
-	    // table initialization, replace {} by table( ) , 
-	    // cur=cur.substr(0,pos)+"table("+cur.substr(pos+1,p-pos-1)+")"+cur.substr(p+1,cs-pos-1);
-	    cur=cur.substr(0,pos)+"{/"+replace_deuxpoints_egal(cur.substr(pos+1,p-1-pos))+"/}"+cur.substr(p+1,cs-pos-1);
-	  }
-	}
-	if (!instring && pythoncompat &&
-	    ch=='\'' && pos<cur.size()-2 && cur[pos+1]!='\\' && (pos==0 || (cur[pos-1]!='\\' && cur[pos-1]!='\''))){ // workaround for '' string delimiters
-	  static bool alertstring=true;
-	  if (alertstring){
-	    alert("// Python compatibility, please use \"...\" for strings",contextptr);
-	    alertstring=false;
-	  }
-	  int p=pos,q=pos+1,beg; // skip spaces
-	  for (p++;p<int(cur.size());++p)
-	    if (cur[p]!=' ') 
-	      break;
-	  if (p!=cur.size()){
-	    // find matching ' 
-	    beg=q;
-	    for (;p<int(cur.size());++p)
-	      if (cur[p]=='\'') 
-		break;
-	    if (p>0 && p<int(cur.size())){
-	      --p;
-	      // does cur[pos+1..p-1] look like a string?
-	      bool str=!isalpha(cur[q]) || !isalphan(cur[p]);
-	      if (p && cur[p]=='.' && cur[p-1]>'9')
-		str=true;
-	      if (p-q>=minchar_for_quote_as_string(contextptr))
-		str=true;
-	      for (;!str && q<p;++q){
-		char ch=cur[q];
-		if (ch=='"' || ch==' ')
-		  str=true;
-	      }
-	      if (str){ // replace delimiters with " and " inside by \"
-		string rep("\"");
-		for (q=beg;q<=p;++q){
-		  if (cur[q]!='"')
-		    rep+=cur[q];
-		  else
-		    rep+="\\\"";
-		}
-		rep += '"';
-		cur=cur.substr(0,pos)+rep+cur.substr(p+2,cur.size()-(p+2));
-		ch=cur[pos];
-	      }
-	    }
-	  }
-	}
-	if (ch=='"' && (pos==0 || cur[pos-1]!='\\')){
-	  chkfrom=false;
-	  instring=!instring;
-	}
-	if (instring)
-	  continue;
-	if (ch=='#'){
-	  // workaround to declare local variables
-	  if (cur.size()>pos+8 && (cur.substr(pos,8)=="# local " || cur.substr(pos,7)=="#local ")){
-	    cur.erase(cur.begin()+pos);
-	    if (cur[pos]==' ')
-	      cur.erase(cur.begin()+pos);	      
-	  }
-	  else
-	    cur=cur.substr(0,pos);
-	  pythonmode=true;
-	  break;
-	}
-	// skip from * import *
-	if (chkfrom && ch=='f' && pos+15<int(cur.size()) && cur.substr(pos,5)=="from "){
-	  chkfrom=false;
-	  int posi=cur.find(" import ");
-	  if (posi<0 || posi>=int(cur.size()))
-	    posi = cur.find(" import*");
-	  if (posi>pos+5 && posi<int(cur.size())){
-	    int posturtle=cur.find("turtle");
-	    int poscmath=cur.find("cmath");
-	    int posmath=cur.find("math");
-	    int posnumpy=cur.find("numpy");
-	    int posmatplotlib=cur.find("matplotlib");
-	    if (posmatplotlib<0 || posmatplotlib>=cur.size())
-	      posmatplotlib=cur.find("pylab");
-	    int cs=int(cur.size());
-	    pythonmode=true;
-#ifdef KHICAS
-	    if (
-		(posturtle<0 || posturtle>=cs) && 
-		(poscmath<0 || poscmath>=cs) && 
-		(posmath<0 || posmath>=cs) && 
-		(posnumpy<0 || posnumpy>=cs) && 
-		(posmatplotlib<0 || posmatplotlib>=cs) 
-		){
-	      string filename=cur.substr(pos+5,posi-pos-5)+".py";
-	      // CERR << "import " << filename << endl;
-	      const char * ptr=read_file(filename.c_str());
-	      if (ptr)
-		s += python2xcas(ptr,contextptr); // recursive call
-	      cur ="";
-	      // CERR << s << endl;
-	      continue;
-	    }
-	    else
-#endif
-	      {
-		cur=cur.substr(0,pos);
-		python_import(cur,cs,posturtle,poscmath,posmath,posnumpy,posmatplotlib,contextptr);
-	      }
-	    break;
-	  }
-	}
-	chkfrom=false;
-	// import * as ** -> **:=*
-	if (ch=='i' && pos+7<int(cur.size()) && cur.substr(pos,7)=="import "){
-	  int posturtle=cur.find("turtle");
-	  int poscmath=cur.find("cmath");
-	  int posmath=cur.find("math");
-	  int posnumpy=cur.find("numpy");
-	  int posmatplotlib=cur.find("matplotlib");
-	  if (posmatplotlib<0 || posmatplotlib>=cur.size())
-	    posmatplotlib=cur.find("pylab");
-	  int cs=int(cur.size());
-	  int posi=cur.find(" as ");
-	  int posp=cur.find('.');
-	  if (posp>=posi || posp<0)
-	    posp=posi;
-	  if (posi>pos+5 && posi<int(cur.size())){
-	    cur=cur.substr(posi+4,cur.size()-posi-4)+":="+cur.substr(pos+7,posp-(pos+7))+';';
-	  }
-	  else
-	    cur=cur.substr(pos+7,cur.size()-pos-7);
-	  for (int i=0;i<pos;++i)
-	    cur = ' '+cur;
-	  python_import(cur,cs,posturtle,poscmath,posmath,posnumpy,posmatplotlib,contextptr);
-	  pythonmode=true;
-	  break;	    
-	}
-	if (ch=='l' && pos+6<int(cur.size()) && cur.substr(pos,6)=="lambda" && instruction_at(cur,pos,6)){
-	  int posdot=cur.find(':',pos);
-	  if (posdot>pos+7 && posdot<int(cur.size())-1 && cur[posdot+1]!='=' && cur[posdot+1]!=';'){
-	    pythonmode=true;
-	    cur=cur.substr(0,pos)+"("+cur.substr(pos+6,posdot-pos-6)+")->"+cur.substr(posdot+1,cur.size()-posdot-1);
-	  }
-	}
-	if (ch=='e' && pos+4<int(cur.size()) && cur.substr(pos,3)=="end" && instruction_at(cur,pos,3)){
-	  // if next char after end is =, replace by endl
-	  for (size_t tmp=pos+3;tmp<cur.size();++tmp){
-	    if (cur[tmp]!=' '){
-	      if (cur[tmp]=='=')
-		cur.insert(cur.begin()+pos+3,'l');
-	      break;
-	    }
-	  }
-	}
-      }
-      if (instring){
-	*logptr(contextptr) << "Warning: multi-line strings can not be converted from Python like syntax"<<'\n';
-	return s_orig;
-      }
-      // detect : at end of line
-      for (pos=int(cur.size())-1;pos>=0;--pos){
-	if (cur[pos]!=' ' && cur[pos]!=char(9) && cur[pos]!='\r')
-	  break;
-      }
-      if (pos<0){ 
-	s+='\n';  
-	continue;
-      }
-      if (cur[pos]!=':'){ // detect oneliner and function/fonction
-	int p;
-	for (p=0;p<pos;++p){
-	  if (cur[p]!=' ')
-	    break;
-	}
-	if (p<pos-8 && (cur.substr(p,8)=="function" || cur.substr(p,8)=="fonction")){
-	  s = s+cur+'\n';
-	  continue;
-	}
-	bool instr=false;
-	for (p=pos;p>0;--p){
-	  if (instr){
-	    if (cur[p]=='"' && cur[p-1]!='\\')
-	      instr=false;
-	    continue;
-	  }
-	  if (cur[p]==':' && (cur[p+1]!=';' && cur[p+1]!='='))
-	    break;
-	  if (cur[p]=='"' && cur[p-1]!='\\')
-	    instr=true;	  
-	}
-	if (p==0){
-	  // = or return expr if cond else alt_expr => ifte(cond,expr,alt_expr)
-	  int cs=int(cur.size());
-	  int elsepos=cur.find("else");
-	  if (elsepos>0 && elsepos<cs){
-	    int ifpos=cur.find("if");
-	    if (ifpos>0 && ifpos<elsepos){
-	      int retpos=cur.find("return"),endretpos=retpos+6;
-	      if (retpos<0 || retpos>=cs){
-		retpos=cur.find("=");
-		endretpos=retpos+1;
-	      }
-	      if (retpos>=0 && retpos<ifpos){
-		cur=cur.substr(0,endretpos)+" ifte("+cur.substr(ifpos+2,elsepos-ifpos-2)+","+cur.substr(endretpos,ifpos-endretpos)+","+cur.substr(elsepos+4,cs-elsepos-4)+")";
-	      }
-	    }
-	  }
-	}
-	if (p>0){
-	  int cs=int(cur.size()),q=4;
-	  int progpos=cur.find("elif");;
-	  if (progpos<0 || progpos>=cs){
-	    progpos=cur.find("if");
-	    q=2;
-	  }
-	  if (p>progpos && progpos>=0 && progpos<cs && instruction_at(cur,progpos,q)){
-	    pythonmode=true;
-#if 1
-	    res = cur.substr(0,p)+":\n"+string(progpos+4,' ')+cur.substr(p+1,pos-p)+'\n'+res;
-	    continue;
-#else
-	    cur=cur.substr(0,p)+" then "+cur.substr(p+1,pos-p);
-	    convert_python(cur,contextptr);
-	    // no fi if there is an else or elif
-	    for (p=0;p<int(res.size());++p){
-	      if (res[p]!=' ' && res[p]!=char(9) && res[p]!='\r')
-		break;
-	    }
-	    if (p<res.size()+5 && (res.substr(p,4)=="else" || res.substr(p,4)=="elif")){
-	      cur += " ";
-	    }
-	    else
-	      cur += " fi";
-	    p=0;
-#endif
-	  }
-	  progpos=cur.find("def");
-	  if (p>progpos && progpos>=0 && progpos<cs && instruction_at(cur,progpos,3)){
-	    pythonmode=true;
-	    res = cur.substr(0,p)+":\n"+string(progpos+4,' ')+cur.substr(p+1,pos-p)+'\n'+res;
-	    continue;
-	  }
-	  progpos=cur.find("else");
-	  if (p>progpos && progpos>=0 && progpos<cs && instruction_at(cur,progpos,4)){
-	    pythonmode=true;
-#if 1
-	    res = cur.substr(0,p)+":\n"+string(progpos+4,' ')+cur.substr(p+1,pos-p)+'\n'+res;
-	    continue;
-#else
-	    cur=cur.substr(0,p)+' '+cur.substr(p+1,pos-p)+" fi";
-	    convert_python(cur,contextptr);
-	    p=0;
-#endif
-	  }
-	  progpos=cur.find("for");
-	  if (p>progpos && progpos>=0 && progpos<cs && instruction_at(cur,progpos,3)){
-	    pythonmode=true;
-	    cur=cur.substr(0,p)+" do "+cur.substr(p+1,pos-p);
-	    convert_python(cur,contextptr);
-	    cur += " od";
-	    p=0;
-	  }
-	  progpos=cur.find("while");
-	  if (p>progpos && progpos>=0 && progpos<cs && instruction_at(cur,progpos,5)){
-	    pythonmode=true;
-	    cur=cur.substr(0,p)+" do "+cur.substr(p+1,pos-p);
-	    convert_python(cur,contextptr);
-	    cur += " od";
-	    p=0;
-	  }
-	}
-      }
-      // count whitespaces, compare to stack
-      int ws=0;
-      int cs=cur.size();
-      for (ws=0;ws<cs;++ws){
-	if (cur[ws]!=' ' && cur[ws]!=char(9) && cur[ws]!='\r')
-	  break;
-      }
-      if (cur[pos]==':'){
-	// detect else or elif or except
-	int progpos=cur.find("else");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,4)){
-	  pythonmode=true;
-	  if (stack.size()>1){ 
-	    int indent=stack[stack.size()-1].decal;
-	    if (ws<indent){
-	      // remove last \n and add explicit endbloc delimiters from stack
-	      int ss=s.size();
-	      bool nl= ss && s[ss-1]=='\n';
-	      if (nl)
-		s=s.substr(0,ss-1);
-	      while (stack.size()>1 && stack[stack.size()-1].decal>ws){
-		s += ' '+stack.back().endbloc+';';
-		stack.pop_back();
-	      }
-	      if (nl)
-		s += '\n';
-	    }
-	  }
-	  s += cur.substr(0,pos)+"\n";
-	  continue;
-	}
-	progpos=cur.find("except");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,6)){
-	  pythonmode=true;
-	  if (stack.size()>1){ 
-	    int indent=stack[stack.size()-1].decal;
-	    if (ws<indent){
-	      // remove last \n and add explicit endbloc delimiters from stack
-	      int ss=s.size();
-	      bool nl= ss && s[ss-1]=='\n';
-	      if (nl)
-		s=s.substr(0,ss-1);
-	      while (stack.size()>1 && stack[stack.size()-1].decal>ws){
-		s += ' '+stack.back().endbloc+';';
-		stack.pop_back();
-	      }
-	      if (nl)
-		s += '\n';
-	    }
-	  }
-	  s += cur.substr(0,progpos)+"then\n";
-	  continue;
-	}
-	progpos=cur.find("elif");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,4)){
-	  pythonmode=true;
-	  if (stack.size()>1){ 
-	    int indent=stack[stack.size()-1].decal;
-	    if (ws<indent){
-	      // remove last \n and add explicit endbloc delimiters from stack
-	      int ss=s.size();
-	      bool nl= ss && s[ss-1]=='\n';
-	      if (nl)
-		s=s.substr(0,ss-1);
-	      while (stack.size()>1 && stack[stack.size()-1].decal>ws){
-		s += ' '+stack.back().endbloc+';';
-		stack.pop_back();
-	      }
-	      if (nl)
-		s += '\n';
-	    }
-	  }
-	  cur=cur.substr(0,pos);
-	  convert_python(cur,contextptr);
-	  s += cur+" then\n";
-	  continue;
-	}
-      }
-      if (!stack.empty()){ 
-	int indent=stack.back().decal;
-	if (ws<=indent){
-	  // remove last \n and add explicit endbloc delimiters from stack
-	  int ss=s.size();
-	  bool nl= ss && s[ss-1]=='\n';
-	  if (nl)
-	    s=s.substr(0,ss-1);
-	  while (!stack.empty() && stack.back().decal>=ws){
-	    int sb=stack.back().decal;
-	    s += ' '+stack.back().endbloc+';';
-	    stack.pop_back();
-	    // indent must match one of the saved indent
-	    if (sb!=ws && !stack.empty() && stack.back().decal<ws){
-	      return "\"Bad indentation at "+cur+"\"";
-	    }
-	  }
-	  if (nl)
-	    s += '\n';
-	}
-      }
-      if (cur[pos]==':'){
-	// detect matching programming structure
-	int progpos=cur.find("if");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,2)){
-	  pythonmode=true;
-	  cur=cur.substr(0,pos);
-	  convert_python(cur,contextptr);
-	  s += cur +" then\n";
-	  stack.push_back(int_string(ws,"fi"));
-	  continue;
-	}
-	progpos=cur.find("try");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,3)){
-	  pythonmode=true;
-	  cur=cur.substr(0,progpos);
-	  convert_python(cur,contextptr);
-	  s += cur +"IFERR\n";
-	  stack.push_back(int_string(ws,"end"));
-	  continue;
-	}
-	progpos=cur.find("for");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,3)){
-	  pythonmode=true;
-	  // for _ -> for x_
-	  cur=cur.substr(0,pos);
-	  if (progpos+5<cs && cur[progpos+3]==' ' && cur[progpos+4]=='_' && cur[progpos+5]==' '){
-	    cur.insert(cur.begin()+progpos+4,'x');
-	  }
-	  convert_python(cur,contextptr);
-	  s += cur+" do\n";
-	  stack.push_back(int_string(ws,"od"));
-	  continue;
-	}
-	progpos=cur.find("while");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,5)){
-	  pythonmode=true;
-	  cur=cur.substr(0,pos);
-	  convert_python(cur,contextptr);
-	  s += cur +" do\n";
-	  stack.push_back(int_string(ws,"od"));
-	  continue;
-	}
-	progpos=cur.find("def");
-	if (progpos>=0 && progpos<cs && instruction_at(cur,progpos,3)){
-	  pythonmode=true;
-	  if (abs_calc_mode(contextptr)==38) python_compat(1,contextptr); 
-	  pythoncompat=true;
-	  // should remove possible returned type, between -> ... and :
-	  string entete=cur.substr(progpos+3,pos-progpos-3);
-	  int posfleche=entete.find("->");
-	  if (posfleche>0 || posfleche<entete.size())
-	    entete=entete.substr(0,posfleche);
-	  s += cur.substr(0,progpos)+"function"+entete+"\n";
-	  stack.push_back(int_string(ws,"ffunction:")); // ; added later
-	  continue;
-	}
-	// no match found, return s
-	s = s+cur;
-      }
-      else {
-	// normal line add ; at end
-	char curpos=cur[pos];
-	if (pythonmode && !res.empty() && pos>=0 && curpos!=';' && curpos!=',' && curpos!='{' && curpos!='(' && curpos!='[' && curpos!=':' && curpos!='+' && curpos!='-' && curpos!='*' && curpos!='/' && curpos!='%')
-	  cur = cur +';';
-	if (pythonmode)
-	  convert_python(cur,contextptr);
-	cur = cur +'\n';
-	s = s+cur;
-      }
-    }
-    while (!stack.empty()){
-      s += ' '+stack.back().endbloc+';';
-      stack.pop_back();
-    }
-    if (pythonmode){
-      char ch;
-      while (s.size()>1 && 
-	     ( ((ch=s[s.size()-1])==';' && s[s.size()-2]!=':') || (ch=='\n'))
-	     )
-	s=s.substr(0,s.size()-1);
-      // replace ;) by )
-      for (int i=s.size()-1;i>=2;--i){
-	if (s[i]==')' && s[i-1]=='\n' && s[i-2]==';'){
-	  s.erase(s.begin()+i-2);
-	  break;
-	}
-      }
-      if (s.size()>10 && s.substr(s.size()-9,9)=="ffunction")
-	s += ":;";
-      else {
-	int pos=s.find('\n');
-	if (pos>=0 && pos<s.size() && s[s.size()-1]!=';')
-	  s += ";";
-      }
-      if (debug_infolevel)
-	*logptr(contextptr) << "Translated to Xcas as:\n" << s << '\n';
-    }
-    res.clear(); cur.clear();
-    // CERR << s << endl;
-    return string(s.begin(),s.end());
-  }
-  
-    std::string translate_at(const char * ch){
-      if (!strcmp(ch,"∡"))
-	return "polar_complex";
-      if (!strcmp(ch,"."))
-	return "struct_dot";
-      if (!strcmp(ch,"LINEAR?"))
-	return "IS_LINEAR";
-      if (!strcmp(ch,"ΔLIST"))
-	return "DELTALIST";
-      if (!strcmp(ch,"ΠLIST"))
-	return "PILIST";
-      if (!strcmp(ch,"ΣLIST"))
-	return "SIGMALIST";
-      if (!strcmp(ch,"∫"))
-	return "HPINT";
-      if (!strcmp(ch,"∂"))
-	return "HPDIFF";
-      if (!strcmp(ch,"Σ"))
-	return "HPSUM";
-      if (!strcmp(ch,"∑"))
-	return "HPSUM";
-      string res;
-      for (;*ch;++ch){
-        if (*ch=='%')
-          res +="PERCENT";
-        else
-          res += *ch;
-      }
-      return res;
-    }
-    
-    bool builtin_lexer_functions_sorted = false;
-
-    map_charptr_gen & lexer_functions(){
-      static map_charptr_gen * ans=0;
-      if (!ans){
-	ans = new map_charptr_gen;
-	doing_insmod=false;
-	builtin_lexer_functions_sorted=false;
-      }
-      return * ans;
-    }
-
-
-#ifdef STATIC_BUILTIN_LEXER_FUNCTIONS
-    
-    const charptr_gen_unary builtin_lexer_functions[] ={
-#if defined(GIAC_HAS_STO_38) && defined(CAS38_DISABLED)
-#include "static_lexer_38.h"
-#else
-#if defined KHICAS || defined NSPIRE_NEWLIB
-#include "static_lexer_numworks.h"
-#else
-#include "static_lexer.h"
-#endif // KHICAS
-#endif
-    };
-
-    const unsigned builtin_lexer_functions_number=sizeof(builtin_lexer_functions)/sizeof(charptr_gen_unary);
-    // return true/false to tell if s is recognized. return the appropriate gen if true
-#ifdef NSPIRE
-    vector<size_t> * builtin_lexer_functions_(){
-      static vector<size_t> * res=0;
-      if (res) return res;
-      res = new vector<size_t>;
-      res->reserve(builtin_lexer_functions_number+1);
-#include "static_lexer_at.h"
-      return res;
-    }
-#else
-    // Array added because GH compiler stores builtin_lexer_functions in RAM
-#if defined KHICAS || defined NSPIRE_NEWLIB
-    const unary_function_ptr * const * const builtin_lexer_functions_[]={
-#include "static_lexer__numworks.h"
-    };
-#else
-    const size_t builtin_lexer_functions_[]={
-#if defined(GIAC_HAS_STO_38) && defined(CAS38_DISABLED)
-#include "static_lexer_38_.h"
-#else
-#include "static_lexer_.h"
-#endif
-    };
-#endif // KHICAS
-#endif // STATIC_BUILTIN
-
-#ifdef SMARTPTR64
-    charptr_gen * builtin_lexer_functions64(){
-      static charptr_gen * ans=0;
-      if (!ans){
-	ans = new charptr_gen[builtin_lexer_functions_number];
-	for (unsigned i=0;i<builtin_lexer_functions_number;i++){
-	  charptr_gen tmp; tmp.first=builtin_lexer_functions[i].s; tmp.second=builtin_lexer_functions[i]._FUNC_;
-	  tmp.second.subtype=builtin_lexer_functions[i].subtype;
-	  ans[i]=tmp;
-	}
-      }
-      return ans;
-    }
-
-    charptr_gen * builtin_lexer_functions_begin(){
-      return (charptr_gen *) builtin_lexer_functions64();
-    }
-#else
-    charptr_gen * builtin_lexer_functions_begin(){
-      return (charptr_gen *) builtin_lexer_functions;
-    }
-#endif // SMARTPTR64
-
-    charptr_gen * builtin_lexer_functions_end(){
-      return builtin_lexer_functions_begin()+builtin_lexer_functions_number;
-    }
-
-#else
-    unsigned builtin_lexer_functions_number;
-    charptr_gen * builtin_lexer_functions(){
-      static charptr_gen * ans=0;
-      if (!ans){
-	ans = new charptr_gen[1999];
-	builtin_lexer_functions_number=0;
-      }
-      return ans;
-    }
-
-    charptr_gen * builtin_lexer_functions_begin(){
-      return builtin_lexer_functions();
-    }
-
-    charptr_gen * builtin_lexer_functions_end(){
-      return builtin_lexer_functions()+builtin_lexer_functions_number;
-    }
-
-    const size_t * const builtin_lexer_functions_=0;
-
-#endif
-
-#endif // NSPIRE
-
-  gen make_symbolic(const gen & op,const gen & args){
-    return symbolic(*op._FUNCptr,args);
-  }
-
-  // optional, call it just before exiting
-  int release_globals(){
-#if !defined VISUALC && !defined KHICAS
-    delete normal_sin_pi_12_ptr_();
-    delete normal_cos_pi_12_ptr_();
-#endif
-#ifndef STATIC_BUILTIN_LEXER_FUNCTIONS
-    if (debug_infolevel)
-      CERR << "releasing " << builtin_lexer_functions_number << " functions" << '\n';
-    for (int i=0;i<builtin_lexer_functions_number;++i){
-#ifdef SMARTPTR64
-      if (debug_infolevel)
-	CERR << builtin_lexer_functions_begin()[i].first << '\n'; 
-      builtin_lexer_functions_begin()[i].second=0;
-      //delete (ref_unary_function_ptr *) (* ((ulonglong * ) &builtin_lexer_functions_begin()[i].second) >> 16);
-#endif
-    }
-#endif
-    delete &registered_lexer_functions();
-    delete &lexer_functions();
-    delete &library_functions();
-    delete &lexer_translator();
-    delete &back_lexer_localization_map();
-    delete &lexer_localization_map();
-    delete &lexer_localization_vector();
-    delete &syms();
-    delete &unit_conversion_map();
-    delete &xcasrc();
-    //delete &usual_units();
-    if (vector_aide_ptr()) delete vector_aide_ptr();
-    delete &symbolic_rootof_list();
-    delete &proot_list();
-    delete &galoisconj_list();
-    delete &_autoname_();
-    delete &_lastprog_name_();
-    return 0;
-  }
-
-#ifndef NO_NAMESPACE_GIAC
-} // namespace giac
-#endif // ndef NO_NAMESPACE_GIAC
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/global.h b/apps/KhiCAS/src/giac-1.6.0/src/global.h
index fdb6596e9..13a25689b 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/global.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/global.h
@@ -18,6 +18,7 @@
  */
 #ifndef _GIAC_GLOBAL_H
 #define _GIAC_GLOBAL_H
+//#define USE_OBJET_BIDON
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -369,6 +370,7 @@ Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
   extern int GAMMA_LIMIT;
   extern int LIST_SIZE_LIMIT;
   extern int NEWTON_DEFAULT_ITERATION;
+  extern int NEWTON_MAX_RANDOM_RESTART;
   extern int DEFAULT_EVAL_LEVEL;
   extern int PARENTHESIS_NWAIT;
   extern int MAX_PROD_EXPAND_SIZE;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/global.h~ b/apps/KhiCAS/src/giac-1.6.0/src/global.h~
deleted file mode 100755
index b2abf96c1..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/global.h~
+++ /dev/null
@@ -1,1186 +0,0 @@
-/* -*- mode:C++;compile-command: "g++-3.4 -I.. -g -c global.cc" -*- */
-
-/* Global definition and constants (see also dispatch.h)
- *  Copyright (C) 2000,2014 B. Parisse, Institut Fourier, 38402 St Martin d'Heres
- *
- *  This program 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef _GIAC_GLOBAL_H
-#define _GIAC_GLOBAL_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "first.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#define GIAC_CONTEXT const context * contextptr
-#define GIAC_CONTEXT0 const context * contextptr=0
-
-#if !defined(HAVE_NO_SYS_TIMES_H) && !defined(BESTA_OS) && !defined(__MINGW_H) && !defined(NSPIRE) && !defined(FXCG)
-#include <sys/times.h>
-#else
-#if defined VISUALC || defined BESTA_OS || defined FREERTOS
-typedef long pid_t;
-#else // VISUALC
-#if !defined(__MINGW_H) && !defined(NSPIRE) && !defined(FXCG) && !defined(__ANDROID__) && !defined(NSPIRE_NEWLIB) && !defined(OSX) && !defined(IOS) && !defined(OSXIOS) && !defined(FIR_LINUX) && !defined(PRIMEWEBASM)
-#include "wince_replacements.h"
-#endif
-#ifdef __MINGW_H
-#include <sys/types.h>
-#endif
-#endif // VISUALC
-#endif // HAVE_NO_SYS_TIMES_H
-// #ifndef __APPLE__
-#if defined VISUALC || defined BESTA_OS
-#include <math.h>
-#include <float.h>
-#endif
-#ifndef WIN32
-#include <math.h>
-//#define isnan __isnan
-//#define isinf __isinf
-#endif
-// #endif
-
-#ifdef SOFTMATH
-#include "softmath.h"
-#else
-#include <cmath>
-#endif
-
-#ifdef _SOFTMATH_H
-inline double giac_log(double d){
-  return std::giac_gnuwince_log(d);
-}
-#else
-inline double giac_log(double d){
-  return std::log(d);
-}
-#endif
-
-
-#ifdef HAVE_LIBPTHREAD
-#include <semaphore.h>
-#endif
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-#include "vector.h"
-#include <string>
-#if !defined( NSPIRE) && !defined(FXCG)
-#include <cstring>
-#endif
-#include <iostream>
-//#include <fstream>
-#include <map>
-
-#ifdef GNUWINCE
-#define SIGINT 2
-#else
-#ifndef HAVE_NO_SIGNAL_H
-#include <signal.h>
-#endif
-#endif // GNUWINCE
-
-#include <stdexcept>
-#include "help.h"
-#if !defined(FXCG) // !defined(GIAC_HAS_STO_38) // && !defined(ConnectivityKit) && !defined(BESTA_OS)
-#include "tinymt32.h"
-#endif
-
-#if defined(HAVE_NO_SYS_TIMES_H) && defined(__MINGW_H)
-#include <time.h>
-#endif
-
-extern "C" int ctrl_c_interrupted(int exception);
-extern "C" void console_print(const char * s);
-extern "C" const char * console_prompt(const char * s);
-
-bool dfu_get_scriptstore_addr(size_t & start,size_t & taille);
-bool dfu_get_scriptstore(const char * fname);
-bool dfu_send_scriptstore(const char * fname);
-bool dfu_send_rescue(const char * fname);
-const int nwstoresize1=0x8000,nwstoresize2=0x8014;
-bool dfu_send_firmware(const char * fname);
-bool dfu_send_apps(const char * fname);
-bool dfu_update_khicas(const char * fname); 
-
-#if defined HAVE_LIBMICROPYTHON
-#include <string>
-// giac interface to micropython modules
-std::string & python_console();
-#endif
-#ifdef QUICKJS
-#include <string>
-extern std::string js_vars;
-#endif
-int js_token(const char * list,const char * buf);
-int js_token(const char * buf);
-void update_js_vars();
-
-extern bool freezeturtle;
-extern "C" size_t pythonjs_stack_size,pythonjs_heap_size;
-extern "C" void * bf_ctx_ptr;
-extern "C" size_t bf_global_prec;
-
-struct fileinfo_t {
-  std::string filename;
-  std::string type;
-  size_t size;
-  size_t header_offset;
-  int mode;
-};
-size_t tar_totalsize(const char * buffer,size_t byteLength);
-std::vector<fileinfo_t> tar_fileinfo(const char * buffer,size_t byteLength);
-// tar file format: operations on a malloc-ed char * buffer of size buffersize
-// (malloc is assumed if buffer needs to be resized by tar_adddata)
-extern char * buf64k; // a 64k buffer in RAM for flash sector copy
-extern int numworks_maxtarsize; // max tar size on the Numworks
-extern size_t tar_first_modified_offset; // will be used to truncate the file sent to  the Numworks
-int flash_adddata(const char * buffer_,const char * filename,const char * data,size_t datasize,int exec);
-int tar_adddata(char * & buffer,size_t * buffersizeptr,const char * filename,const char * data,size_t datasize,int exec=0); // filename is only used to fill the header
-int flash_addfile(const char * buffer,const char * filename);
-int tar_addfile(char * & buffer,const char * filename,size_t * buffersizeptr);
-const char * tar_loadfile(const char * buffer,const char * filename,size_t * len);
-int tar_filebrowser(const char * buf,const char ** filenames,int maxrecords,const char * extension);
-// by default removefile will mark the file as deleted (this requires 1 sector write)
-// if mark_only==2, this will undelete the file
-// int flash_removefile(const char * buffer,const char * filename,size_t * tar_first_modif_offsetptr,int mark_only=1);
-// write all changes made in records (filename and readable attribut)
-// returns 0 if there is a mismatch between buffer and finfo
-int flash_synchronize(const char * buffer,const std::vector<fileinfo_t> & finfo,size_t * tar_first_modif_offsetptr);
-ulonglong fromstring8(const char * ptr);
-std::string toString8(longlong chksum);
-
-// empty trash: files marked as non readable are really removed
-// this will do 1 sector write from first sector where a file is marked to be removed to the end 
-int flash_emptytrash(const char * buffer,size_t * tar_first_modif_offsetptr);
-int flash_emptytrash(const char * buffer,const std::vector<fileinfo_t> & finfo,size_t * tar_first_modif_offsetptr);
-
-int tar_removefile(char * buffer,const char * filename,size_t * tar_first_modif_offsetptr);
-int tar_savefile(char * buffer,const char * filename);
-std::vector<fileinfo_t> tar_fileinfo(const char * buffer,size_t byteLength);
-char * file_gettar(const char * filename);
-// same as file_gettar but returns an aligned pointer and sets freeptr to the address to be free-ed
-char * file_gettar_aligned(const char * filename,char * & freeptr);
-int file_savetar(const char * filename,char * buffer,size_t buffersize);
-#if !defined KHICAS && !defined USE_GMP_REPLACEMENTS && !defined GIAC_HAS_STO_38// 
-// numworks_gettar return 0 or a buffer of size numworks_maxtarsize
-// initialized with the calculator content
-char * numworks_gettar(size_t & tar_first_modif_offset); 
-bool numworks_sendtar(char * buffer,size_t buffersize,size_t tar_first_modif_offset=0);
-#endif
-
-#ifndef NO_NAMESPACE_GIAC
-namespace giac {
-#endif // ndef NO_NAMESPACE_GIAC
-
-  // 3 or 1 if a list of space separated commandnames includes buf
-  int dichotomic_search(const char * const * tab,unsigned tab_size,const char * s);
-  void opaque_double_copy(void * source,void * target);
-  double opaque_double_val(const void * source);
-
-  double giac_floor(double d);
-  double giac_ceil(double d);
-  unsigned int utf82unicode(const char * line,wchar_t * wline,unsigned int n);
-  unsigned int unicode2utf8(const wchar_t * wline,char * line,unsigned int n);
-  wchar_t * utf82unicode(const char * idname);
-  char * unicode2utf8(const wchar_t * idname);
-
-/* ---------------------------------------------------------------------
-    The following 4 definitions are compiler-specific.
-    The C standard does not guarantee that wchar_t has at least
-    16 bits, so wchar_t is no less portable than unsigned short!
-    All should be unsigned values to avoid sign extension during
-    bit mask & shift operations.
------------------------------------------------------------------------- */
-
-#ifdef GIAC_HAS_STO_38
-typedef unsigned long UTF32; /* at least 32 bits */
-typedef wchar_t UTF16; /* at least 16 bits */
-typedef unsigned char UTF8; /* typically 8 bits */
-typedef unsigned char Boolean; /* 0 or 1 */
-#else
-typedef unsigned long UTF32; /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char UTF8; /* typically 8 bits */
-typedef unsigned char Boolean; /* 0 or 1 */
-#endif
-
-  int system_no_deprecation(const char *command);
-
-/* Some fundamental constants */
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-typedef enum {
-    conversionOK = 0,   /* conversion successful */
-    sourceExhausted = -1, /* partial character in source, but hit end */
-    targetExhausted = -2, /* insuff. room in target for conversion */
-    sourceIllegal = -3 /* source sequence is illegal/malformed */
-} ConversionResult;
-
-typedef enum {
-    strictConversion = 0,
-    lenientConversion
-} ConversionFlags;
-
-/* This is for C++ and does no harm in C */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-unsigned int ConvertUTF8toUTF16 (
-        const UTF8* sourceStart, const UTF8* sourceEnd, 
-        UTF16* targetStart, UTF16* targetEnd, ConversionFlags flags);
-
-unsigned int ConvertUTF16toUTF8 (
-        const UTF16* sourceStart, const UTF16* sourceEnd, 
-        UTF8* targetStart, UTF8* targetEnd, ConversionFlags flags);
-
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
-
-#ifdef __cplusplus
-}
-#endif
-
-  // convert position n in utf8-encoded line into the corresponding position
-  // in the same string encoded with unicode
-  unsigned int utf8pos2unicodepos(const char * line,unsigned int n,bool skip_added_spaces = true);
-  unsigned int wstrlen(const char * line, unsigned int n = ~0u);
-  unsigned int wstrlen(const wchar_t * wline);
-  unsigned int utf8length(const wchar_t * wline);
-
-
-#if defined VISUALC || defined BESTA_OS || defined FREERTOS
-#ifndef R_OK
-  extern int R_OK;
-#endif
-  int access(const char * ch,int mode);
-  void usleep(int );
-#endif
-#if defined NSPIRE_NEWLIB || defined KHICAS
-  void usleep(int );
-#endif
-
-#ifndef HAVE_NO_SYS_TIMES_H
-  double delta_tms(struct tms tmp1,struct tms tmp2);
-#elif defined(__MINGW_H)
-  double delta_tms(clock_t tmp1,clock_t tmp2);
-#endif
-
-#define GIAC_DATA_BEGIN   ((char) 2)
-#define GIAC_DATA_END     ((char) 5)
-#define GIAC_DATA_ESCAPE  ((char) 27)
-
-  std::vector<aide> * & vector_aide_ptr();
-  std::vector<std::string> * & vector_completions_ptr();
-  extern void (*fl_widget_delete_function)(void *);
-#if !defined( NSPIRE) && !defined(FXCG)
-  extern std::ostream & (*fl_widget_archive_function)(std::ostream &,void *);
-#endif
-  extern bool secure_run; // true if used in a non-trusted environment
-  extern bool center_history,in_texmacs,block_signal,synchronize_history;
-  extern bool threads_allowed;
-  extern bool mpzclass_allowed;
-  enum { 
-    smallint=256, // max small int to make modular oply operations with int
-    max_series_expansion_order=64, // max auto order for series expansion
-    max_texpand_expansion_order=64,
-    max_numexp=100
-  };
-  extern const char cas_suffixe[];
-  extern const int BUFFER_SIZE;
-  extern int history_begin_level;
-
-  extern int debug_infolevel; // ==0 normal value
-  extern int printprog; // ==0 normal value, used to force program print at parse
-  // >0 log some informations
-  // <0 for internal use
-  // ==-1:
-  // ==-2: icas.cc reads aide_cas even if STATIC_BUILTIN_LEXER is defined
-  //       write static_lexer.h, static_extern.h
-  // ==-3:
-  // ==-4: write static_lexer.h, static_lexer_.h and static_extern.h
-  // ==-5: do not throw on errors
-  extern int threads;
-  extern unsigned short int GIAC_PADIC;
-
-  extern bool CAN_USE_LAPACK;
-  extern bool simplify_sincosexp_pi;
-#ifndef RTOS_THREADX
-  //#ifndef BESTA_OS
-  extern int CALL_LAPACK; // lapack is used if dim of matrix is >= CALL_LAPACK
-  // can be changed using shell variable GIAC_LAPACK in icas
-  //#endif
-#endif
-  extern int FACTORIAL_SIZE_LIMIT;
-  extern int GAMMA_LIMIT;
-  extern int LIST_SIZE_LIMIT;
-  extern int NEWTON_DEFAULT_ITERATION;
-  extern int DEFAULT_EVAL_LEVEL;
-  extern int PARENTHESIS_NWAIT;
-  extern int MAX_PROD_EXPAND_SIZE;
-
-  extern int TEST_PROBAB_PRIME; // probabilistic primality tests
-  extern int GCDHEU_MAXTRY; // maximal number of retry for heuristic algorithms
-  extern int GCDHEU_DEGREE; // max degree allowed inside gcdheu
-  extern int MODFACTOR_PRIMES; // number of primes used for factorization
-  extern int NTL_MODGCD; // lowest degree for NTL univariate modular GCD 
-  extern int NTL_RESULTANT; // lowest degree for NTL univariate resultant 
-  extern int NTL_XGCD; // lowest degree for NTL univariate extended GCD over Z
-  extern int MODRESULTANT; // lowest degree for modular resultant 
-  extern int HGCD; // lowest degree for half gcd call
-  extern int HENSEL_QUADRATIC_POWER; // above #steps do quadratic Hensel lift
-  extern int KARAMUL_SIZE; // Use Karatsuba multiplication if degree is >
-  extern int INT_KARAMUL_SIZE; // Use Karatsuba multiplication if degree is >
-  extern int FFTMUL_SIZE; // minimal size for fft mult of poly
-  extern int FFTMUL_INT_MAXBITS; // max number of bits for fft mult of int poly 
-  // Should be lower for larger coeff
-  extern int MAX_ALG_EXT_ORDER_SIZE; // x^1/d extension not algebraic if d>
-  extern int MAX_COMMON_ALG_EXT_ORDER_SIZE;
-  extern int TRY_FU_UPRIME;
-  extern int SOLVER_MAX_ITERATE;
-  extern int MAX_PRINTABLE_ZINT;
-  extern int MAX_RECURSION_LEVEL;
-  extern int GBASIS_DETERMINISTIC;
-  extern int GBASISF4_MAX_TOTALDEG;
-  extern int GBASISF4_MAXITER;
-  // extern int GBASISF4_BUCHBERGER;
-  extern unsigned max_pairs_by_iteration; 
-  extern unsigned simult_primes,simult_primes2,simult_primes_seuil2,simult_primes3,simult_primes_seuil3; 
-  // see global.cc for explanations
-  extern double gbasis_reinject_ratio;
-  extern double gbasis_reinject_speed_ratio;
-  extern int gbasis_logz_age_sort,gbasis_stop,rur_do_gbasis,rur_do_certify,rur_certify_maxthreads;
-  extern bool rur_error_ifnot0dimensional; // error code or compute gbasis
-
-  extern int PROOT_FACTOR_MAXDEG;
-  extern int ABS_NBITS_EVALF;
-  extern volatile bool ctrl_c,interrupted,kbd_interrupted;
-  void ctrl_c_signal_handler(int signum);
-#ifdef TIMEOUT
-#if !defined(EMCC) && !defined(EMCC2)
-  double time(int );
-#endif
-  extern time_t caseval_begin,caseval_current;
-  extern double caseval_maxtime;
-  extern int caseval_n,caseval_mod,caseval_unitialized;
-#endif
-  extern double powlog2float;
-  extern int MPZ_MAXLOG2;
-
-#ifdef WITH_MYOSTREAM
-  // replacement for std::cerr
-  extern my_ostream my_cerr;
-#endif
-
-  // void control_c();
-  // note that ctrl_c=false was removed, should be done before calling eval
-#if defined (NSPIRE) || defined(FXCG)
-  void control_c();
-#elif defined FIR
-#define control_c()
-#else
-#if defined TIMEOUT && !defined POCKETCAS
-  void control_c();
-#else
-#if 0
-#define control_c() if (ctrl_c) { interrupted = true; CERR << "Throwing exception for user interruption." << '\n'; throw(std::runtime_error("Stopped by user interruption.")); }
-#else
-#define control_c() if (ctrl_c) { \
-interrupted = true; \
-std::string source_path = __FILE__; \
-std::string source_filename = source_path.substr(source_path.find_last_of("/\\") + 1); \
-CERR << "Throwing exception for user interruption (" << source_filename << ":" << __LINE__ << ")" << '\n'; \
-throw(std::runtime_error("Stopped by user interruption.")); \
-}
-#endif
-#endif // TIMEOUT
-#endif // !NSPIRE, !FIR
-
-  typedef void ( * void_function )();
-  // set to non-0 if you want to hook a function call inside control_c()
-
-#ifdef IMMEDIATE_VECTOR
-  template <class T> class dbgprint_vector: public std::imvector<T> {
-  public:
-    // inherited constructors
-    dbgprint_vector() : std::imvector<T>::imvector() { };
-    dbgprint_vector(const T * b,const T * e) : std::imvector<T>::imvector(b,e) { };
-    dbgprint_vector(size_t i) : std::imvector<T>::imvector(i) { };
-    dbgprint_vector(size_t i,const T & t) : std::imvector<T>::imvector(i,t) { };
-    // ~dbgprint_vector() { };
-    // inherited destructors
-    void dbgprint() const { COUT << *this << '\n'; }
-  };
-#else // IMMEDIATE_VECTOR
-  template <class T> class dbgprint_vector: public std::vector<T> {
-  public:
-    // inherited constructors
-    dbgprint_vector() : std::vector<T>::vector() { };
-#ifndef GIAC_VECTOR
-    dbgprint_vector(const typename std::vector<T>::const_iterator & b,const typename std::vector<T>::const_iterator & e) : std::vector<T>::vector(b,e) { };
-#endif
-    dbgprint_vector(const T * b,const T * e) : std::vector<T>::vector(b,e) { };
-    dbgprint_vector(size_t i) : std::vector<T>::vector(i) { };
-    dbgprint_vector(size_t i,const T & t) : std::vector<T>::vector(i,t) { };
-    // ~dbgprint_vector() { };
-    // inherited destructors
-    void dbgprint() const { COUT << *this << '\n'; }
-  };
-#endif // IMMEDIATE_VECTOR
-  
-  template <class T> class std_matrix: public std::vector< dbgprint_vector<T> > {
-  public:
-    // inherited constructors
-    std_matrix() : std::vector< dbgprint_vector<T> >::vector() { };
-    std_matrix(size_t i) : std::vector< dbgprint_vector<T> >::vector(i) { };
-    std_matrix(size_t i,const dbgprint_vector<T> & v) : std::vector< dbgprint_vector<T> >::vector(i,v) { };
-    std_matrix(size_t i,size_t j) : std::vector< dbgprint_vector<T> >::vector(i,dbgprint_vector<T>(j)) { };
-    std_matrix(size_t i,size_t j,const T & t) : std::vector< dbgprint_vector<T> >::vector(i,dbgprint_vector<T>(j,t)) { };
-    // ~dbgprint_vector() { };
-    // inherited destructors
-    std_matrix<T> transpose() const {
-      if (std::vector< dbgprint_vector<T> >::empty())
-	return *this;
-      int n=int(std::vector< dbgprint_vector<T> >::size());
-      int m=int(std::vector< dbgprint_vector<T> >::front().dbgprint_vector<T>::size());
-      std_matrix<T> res(m,n);
-      typename std_matrix<T>::const_iterator it=std::vector< dbgprint_vector<T> >::begin();
-      for (int i=0;i<n;++i,++it){
-	for (int j=0;j<m;++j)
-	  res[j][i]=(*it)[j];
-      }
-      return res;
-    }
-    std_matrix<T> transconjugate() const {
-      if (std::vector< dbgprint_vector<T> >::empty())
-	return *this;
-      int n=std::vector< dbgprint_vector<T> >::size();
-      int m=std::vector< dbgprint_vector<T> >::front().dbgprint_vector<T>::size();
-      std_matrix<T> res(m,n);
-      typename std_matrix<T>::const_iterator it=std::vector< dbgprint_vector<T> >::begin();
-      for (int i=0;i<n;++i,++it){
-	for (int j=0;j<m;++j)
-	  res[j][i]=conj((*it)[j],0);
-      }
-      return res;
-    }
-    void dbgprint() { COUT << *this << '\n'; }
-  };
-
-  struct user_function {
-    std::string s;
-    int parser_token;
-    user_function():s(""),parser_token(-1) {};
-    user_function(const std::string & mys,int i):s(mys),parser_token(i){};
-  };
-
-  class gen;
-  // vecteurs and dense 1-d polynomilas
-
-  typedef dbgprint_vector<gen> vecteur; // debugging support
-
-  vecteur * keywords_vecteur_ptr(); // idnt assigned to a commandname for localization, like mediatrice for perpen_bissector
-
-  class context;
-  extern const giac::context * python_contextptr;
-  
-  struct debug_struct {
-    int indent_spaces;
-    vecteur args_stack;
-    vecteur debug_breakpoint; // alternate _IDNT and instruction number
-    // count 1 for a normal instruction, 3 for ifte, 4 for a for loop
-    // breakpoint(_IDNT,int) to set a breakpoint at _IDNT, instruction int
-    // rmbreakpoint(int) removes breakpoint number int
-    vecteur debug_watch; 
-    // the value of each element of debug_watch is signaled
-    // to the parent process each time the execution stops
-    // watch(_IDNT) to add _IDNT to the watch
-    // rmwatch(int) or rmwatch(_IDNT) removes _IDNT
-    // halt inside a prog starts debug mode, debug(instruction) 
-    // starts prog in SST mode
-    // kill reset the protection level, instruction_stack and debug_mode to false
-    bool debug_mode;
-    bool sst_mode; // true to single step in this function
-    bool sst_in_mode; // true to single step inside next instruction
-    bool debug_allowed;
-    std::vector<int> current_instruction_stack;
-    int current_instruction;
-    std::vector< std::vector<int> > sst_at_stack;
-    std::vector<int> sst_at;
-    gen * debug_info_ptr, * fast_debug_info_ptr,* debug_prog_name, * debug_localvars;
-    bool debug_refresh;
-    context * debug_contextptr;
-    debug_struct();
-    ~debug_struct();
-    debug_struct & operator =(const debug_struct & dbg);
-  };
-
-  typedef void (* giac_callback)(const giac::gen & ,void * );
-
-  struct thread_param {
-    bool _kill_thread;
-    int thread_eval_status;
-    giac_callback f;
-    void * f_param;
-    giac::vecteur v;
-#ifdef HAVE_LIBPTHREAD
-    pthread_t eval_thread;
-    pthread_attr_t attr;
-    size_t stacksize;
-    void * stackaddr;
-#endif
-    thread_param();
-  };
-
-#if !defined( NSPIRE) && !defined(FXCG)
-  extern gen (*fl_widget_unarchive_function)(std::istream &);
-#endif
-  extern std::string (*fl_widget_texprint_function)(void * ptr);
-  extern gen (*fl_widget_updatepict_function)(const gen & g);
-  // name -> gen table
-  struct ltstring
-  {
-    bool operator()(const std::string & s1, const std::string & s2) const
-    {
-      return strcmp(s1.c_str(), s2.c_str()) < 0;
-    }
-  };
-  typedef std::map<std::string, gen,ltstring> sym_string_tab;
-  struct ltstr
-  {
-    bool operator()(const char* s1, const char* s2) const
-    {
-      return strcmp(s1, s2) < 0;
-    }
-  };
-  
-  typedef std::map<const char *, gen,ltstr> map_charptr_gen;
-  typedef map_charptr_gen sym_tab;
-
-  struct nwsrec {
-    unsigned char type;
-    std::vector<unsigned char> data;
-  };
-  typedef std::map<std::string,nwsrec,ltstring> nws_map;
-  std::string dos2unix(const std::string & res);
-  bool scriptstore2map(const char * fname,nws_map & m);
-  bool map2scriptstore(const nws_map & m,const char * fname);
-  // check that filename content matches a file content signed in sigfilename
-  bool sha256_check(const char * sigfilename,const char * filename);
-  bool nws_certify_firmware(bool with_overwrite,GIAC_CONTEXT); // Numworks certification
-
-  struct parser_lexer {
-    int _index_status_; // 0 if [ -> T_VECT_DISPATCH, 1 if [ -> T_INDEX_BEGIN
-    int _opened_quote_; // 1 if we are inside a quote
-    int _in_rpn_; // 1 inside RPN expression
-    int _lexer_line_number_;
-    int _lexer_column_number_;
-    int _spread_formula_; // beginning = and meaning of :
-    int _initialisation_done_;
-    std::string _comment_s_;
-    std::string _parser_filename_;
-    std::string _parser_error_;
-    int _first_error_line_;
-    std::string _error_token_name_;
-    int _i_sqrt_minus1_;
-  };
-  std::string gen2string(const gen & g);
-  const int turtle_length=10;
-#ifdef KHICAS
-  struct logo_turtle {
-    double x,y;
-    double theta; // theta is given in degrees or radians dep. on angle_mode
-    bool visible; // true if turtle visible
-    bool mark; // true if moving marks
-    bool direct; // true if rond/disque is done in the trigonometric direction
-    char turtle_width;
-    short int s;//std::string s;
-    int color;
-    int radius; // 0 nothing, >0 -> draw a plain disk 
-    // bit 0-8=radius, bit9-17 angle1, bit 18-26 angle2, bit 27=1 filled  or 0 
-    // <0 fill a polygon from previous turtle positions
-    logo_turtle(): x(100),y(100),theta(0),visible(true),mark(true),direct(true),color(0),turtle_width(1),radius(0) {}
-  };
-#else // KHICAS
-  struct logo_turtle {
-    double x,y;
-    double theta; // theta is given in degrees or radians dep. on angle_mode
-    bool visible; // true if turtle visible
-    bool mark; // true if moving marks
-    bool direct; // true if rond/disque is done in the trigonometric direction
-    int color;
-    int turtle_width;
-    int radius; // 0 nothing, >0 -> draw a plain disk 
-    // bit 0-8=radius, bit9-17 angle1, bit 18-26 angle2, bit 27=1 filled  or 0 
-    // <0 fill a polygon from previous turtle positions
-    std::string s;
-    void * widget;
-#ifdef IPAQ
-    logo_turtle(): x(70),y(70),theta(0),visible(true),mark(true),direct(true),color(0),turtle_width(1),radius(0),widget(0) {}
-#else
-    logo_turtle(): x(100),y(100),theta(0),visible(true),mark(true),direct(true),color(0),turtle_width(1),radius(0),widget(0) {}
-#endif
-  };
-#endif // KHICAS
-    
-  // a structure that should contain all global variables
-  class global {
-  public:
-    int _xcas_mode_;
-    int _calc_mode_;
-    int _decimal_digits_;
-    int _minchar_for_quote_as_string_;
-    int _scientific_format_;
-    int _integer_format_;
-    int _latex_format_;
-#ifdef BCD
-    u32 _bcd_decpoint_;
-    u32 _bcd_mantissa_;
-    u32 _bcd_flags_;
-    bool _bcd_printdouble_;
-#endif
-    bool _expand_re_im_;
-    bool _do_lnabs_;
-    bool _eval_abs_;
-    bool _eval_equaltosto_;
-    bool _integer_mode_;
-    bool _complex_mode_;
-    bool _escape_real_;
-    bool _complex_variables_;
-    bool _increasing_power_;
-    bool _approx_mode_;
-    bool _variables_are_files_;
-    bool _local_eval_;
-    bool _withsqrt_;
-    bool _show_point_; // show 3-d point 
-    bool _io_graph_; // show 2-d point in io
-    bool _all_trig_sol_;
-    bool _ntl_on_;
-    bool _lexer_close_parenthesis_;
-    bool _rpn_mode_;
-    bool _try_parse_i_;
-    bool _specialtexprint_double_;
-    bool _atan_tan_no_floor_;
-    bool _keep_acosh_asinh_;
-    bool _keep_algext_;
-    bool _auto_assume_;
-    bool _parse_e_;
-    bool _convert_rootof_;
-    int _python_compat_;
-    int _angle_mode_;
-    int _bounded_function_no_;
-    int _series_flags_; // 1= full simplify, 2=1 for truncation, bit3=atan does not rewrite sin/cos to tan, bit4=no back conversion, bit5=write<<1,1>> with series_variable_name, bit 6=write O() instead of order_size, bit7= 1 diff in subst does not variable substitution
-    int _step_infolevel_; 
-    int _default_color_;
-    double _epsilon_;
-    double _proba_epsilon_; // if not 0, probabilistic algo may be used
-    // the proba should be less than proba_epsilon for giac to return an answer
-    int _show_axes_;
-    int _spread_Row_,_spread_Col_;
-    int _printcell_current_row_,_printcell_current_col_;
-#ifdef NSPIRE
-    nio::console * _logptr_;
-#else
-#if 1 // def WITH_MYOSTREAM
-    my_ostream * _logptr_;
-#else
-    std::ostream * _logptr_;
-#endif
-#endif
-    debug_struct * _debug_ptr;
-    gen * _parsed_genptr_;
-    parser_lexer _pl;
-    int _prog_eval_level_val ;
-    int _eval_level;
-#if defined(FXCG) // defined(GIAC_HAS_STO_38) || defined(ConnectivityKit)
-    unsigned int _rand_seed;
-#else
-    tinymt32_t _rand_seed;
-#endif
-    thread_param * _thread_param_ptr;
-#ifdef HAVE_LIBPTHREAD
-    pthread_mutex_t * _mutexptr,* _mutex_eval_status_ptr ;
-#endif
-    int _language_;
-    const char * _last_evaled_function_name_;
-    const gen * _last_evaled_argptr_;
-    int _max_sum_sqrt_;
-    int _max_sum_add_;
-    logo_turtle _turtle_;
-    std::string _autoname_;
-    std::string _format_double_;
-    std::string _autosimplify_;
-    std::string _lastprog_name_;
-    const char * _currently_scanned_;
-#ifndef KHICAS
-    std::vector<logo_turtle> _turtle_stack_; 
-#endif
-    double _total_time_;
-    void * _evaled_table_;
-    void * _extra_ptr_;
-    char _series_variable_name_;
-    unsigned short _series_default_order_;
-    global();  
-    ~global();
-    global & operator = (const global & g);
-  };
-
-  // Context type to be used for evaluation without global variables
-  // tabptr is the current evaluation context, 
-  // it is a global context if globalcontextptr=0, local otherwise
-  // previous is the upper local or global evaluation context
-  // globalcontextptr points to the current global evaluation context
-  // If globalcontextptr=0 and previous=0, we are at the top folder
-  // The top level local context should have previous=globalcontextptr
-  class context {
-  public:
-    sym_tab * tabptr ;
-    context * globalcontextptr ;
-    context * previous ;
-    global * globalptr; 
-    const context * parent;
-    vecteur * quoted_global_vars, * rootofs;
-    vecteur * history_in_ptr, * history_out_ptr,*history_plot_ptr;
-    context();
-    context(const context & c);
-#ifndef RTOS_THREADX
-#ifndef BESTA_OS
-    context(const std::string & name);
-#endif
-#endif
-    ~context();
-    context * clone() const;
-  };
-
-  context * clone_context(const context *);
-  void init_context(context * ptr);
-
-  extern const context * context0;
-  std::vector<context *> & context_list();
-#ifdef HAVE_LIBPTHREAD
-  extern pthread_mutex_t context_list_mutex;
-#endif
-  
-#if !defined(RTOS_THREADX) && !defined(BESTA_OS) && !defined(NSPIRE) && !defined(FXCG) && !defined KHICAS
-  extern std::map<std::string,context *> * context_names ;
-#endif
-
-  const char * & last_evaled_function_name(GIAC_CONTEXT);
-  const char * & currently_scanned(GIAC_CONTEXT);
-  const gen * & last_evaled_argptr(GIAC_CONTEXT);
-
-  bool make_thread(const giac::gen & g,int level,const giac_callback & f,void * f_param,const context * contextptr);
-
-  std::string autoname(GIAC_CONTEXT);
-  std::string autoname(const std::string & s,GIAC_CONTEXT);
-
-  std::string autosimplify(GIAC_CONTEXT);
-  std::string autosimplify(const std::string & s,GIAC_CONTEXT);
-
-  bool csv_guess(const char * data,int count,char & sep,char & nl,char & decsep);
-  std::string & format_double(GIAC_CONTEXT);
-
-  int check_thread(context * contextptr);
-  int check_threads(int i=0);
-
-  void * & evaled_table(GIAC_CONTEXT);
-  void * & extra_ptr(GIAC_CONTEXT);
-
-  int & xcas_mode(GIAC_CONTEXT);
-  void xcas_mode(int b,GIAC_CONTEXT);
-
-  int & python_compat(GIAC_CONTEXT);
-  void python_compat(int b,GIAC_CONTEXT);
-  int array_start(GIAC_CONTEXT);
-  extern bool python_color; // global variable for syntax highlighting
-  extern bool os_shell; // true if Numworks called from shell
-
-  int & calc_mode(GIAC_CONTEXT);
-  int abs_calc_mode(GIAC_CONTEXT);
-  void calc_mode(int b,GIAC_CONTEXT);
-
-  int & scientific_format(GIAC_CONTEXT);
-  void scientific_format(int b,GIAC_CONTEXT);
-
-  int & decimal_digits(GIAC_CONTEXT);
-  void decimal_digits(int b,GIAC_CONTEXT);
-
-  int & minchar_for_quote_as_string(GIAC_CONTEXT);
-  void minchar_for_quote_as_string(int b,GIAC_CONTEXT);
-
-  int & integer_format(GIAC_CONTEXT);
-  void integer_format(int b,GIAC_CONTEXT);
-  int & latex_format(GIAC_CONTEXT);
-#ifdef BCD
-  u32 & bcd_decpoint(GIAC_CONTEXT);
-  u32 & bcd_mantissa(GIAC_CONTEXT);
-  u32 & bcd_flags(GIAC_CONTEXT);
-  bool & bcd_printdouble(GIAC_CONTEXT);
-#endif
-  bool & expand_re_im(GIAC_CONTEXT);
-  void expand_re_im(bool b,GIAC_CONTEXT);
-
-  bool & integer_mode(GIAC_CONTEXT);
-  void integer_mode(bool b,GIAC_CONTEXT);
-
-  bool & complex_mode(GIAC_CONTEXT);
-  void complex_mode(bool b,GIAC_CONTEXT);
-
-  bool & escape_real(GIAC_CONTEXT); // default=true, if false sqrt(-1) errorsglo
-  void escape_real(bool b,GIAC_CONTEXT);
-
-  bool & try_parse_i(GIAC_CONTEXT);
-  void try_parse_i(bool b,GIAC_CONTEXT);
-
-  bool & specialtexprint_double(GIAC_CONTEXT);
-  void specialtexprint_double(bool b,GIAC_CONTEXT);
-
-  bool & atan_tan_no_floor(GIAC_CONTEXT);
-  void atan_tan_no_floor(bool b,GIAC_CONTEXT);
-
-  bool & keep_acosh_asinh(GIAC_CONTEXT);
-  void keep_acosh_asinh(bool b,GIAC_CONTEXT);
-
-  bool & keep_algext(GIAC_CONTEXT);
-  void keep_algext(bool b,GIAC_CONTEXT);
-
-  bool & auto_assume(GIAC_CONTEXT);
-  void auto_assume(bool b,GIAC_CONTEXT);
-
-  bool & parse_e(GIAC_CONTEXT);
-  void parse_e(bool b,GIAC_CONTEXT);
-
-  bool & convert_rootof(GIAC_CONTEXT);
-  void convert_rootof(bool b,GIAC_CONTEXT);
-
-  bool & do_lnabs(GIAC_CONTEXT);
-  void do_lnabs(bool b,GIAC_CONTEXT);
-
-  bool & eval_abs(GIAC_CONTEXT);
-  void eval_abs(bool b,GIAC_CONTEXT);
-
-  bool & eval_equaltosto(GIAC_CONTEXT);
-  void eval_equaltosto(bool b,GIAC_CONTEXT);
-
-  bool & complex_variables(GIAC_CONTEXT);
-  void complex_variables(bool b,GIAC_CONTEXT);
-
-  bool & increasing_power(GIAC_CONTEXT);
-  void increasing_power(bool b,GIAC_CONTEXT);
-
-  bool & approx_mode(GIAC_CONTEXT);
-  void approx_mode(bool b,GIAC_CONTEXT);
-
-  char & series_variable_name(GIAC_CONTEXT);
-  void series_variable_name(char b,GIAC_CONTEXT);
-
-  unsigned short & series_default_order(GIAC_CONTEXT);
-  void series_default_order(unsigned short b,GIAC_CONTEXT);
-
-  vecteur & history_in(GIAC_CONTEXT);
-  vecteur & history_out(GIAC_CONTEXT);
-  vecteur & history_plot(GIAC_CONTEXT);
-
-  // True if we factor 2nd order polynomials using sqrt
-  bool & withsqrt(GIAC_CONTEXT);
-  void withsqrt(bool b,GIAC_CONTEXT);
-
-  bool & all_trig_sol(GIAC_CONTEXT);
-  void all_trig_sol(bool b,GIAC_CONTEXT);
-
-  bool & ntl_on(GIAC_CONTEXT);
-  void ntl_on(bool b,GIAC_CONTEXT);
-
-  bool & lexer_close_parenthesis(GIAC_CONTEXT);
-  void lexer_close_parenthesis(bool b,GIAC_CONTEXT);
-
-  bool & rpn_mode(GIAC_CONTEXT);
-  void rpn_mode(bool b,GIAC_CONTEXT);
-
-  std::string lastprog_name(GIAC_CONTEXT);
-  std::string lastprog_name(const std::string & b,GIAC_CONTEXT);
-
-#ifdef KHICAS
-  logo_turtle & turtle();
-  std::vector<logo_turtle> & turtle_stack();
-#else
-  logo_turtle & turtle(GIAC_CONTEXT);
-  std::vector<logo_turtle> & turtle_stack(GIAC_CONTEXT);
-#endif
-
-  int & angle_mode(GIAC_CONTEXT);
-  int get_mode_set_radian(GIAC_CONTEXT);
-  void angle_mode(int m,GIAC_CONTEXT);
-  bool angle_radian(GIAC_CONTEXT);
-  void angle_radian(bool b,GIAC_CONTEXT);
-  bool angle_degree(GIAC_CONTEXT);
-
-  bool & show_point(GIAC_CONTEXT);
-  void show_point(bool b,GIAC_CONTEXT);
-
-  int & show_axes(GIAC_CONTEXT);
-  void show_axes(int b,GIAC_CONTEXT);
-
-  bool & io_graph(GIAC_CONTEXT);
-  void io_graph(bool b,GIAC_CONTEXT);
-
-  bool & variables_are_files(GIAC_CONTEXT);
-  void variables_are_files(bool b,GIAC_CONTEXT);
-
-  int & bounded_function_no(GIAC_CONTEXT);
-  void bounded_function_no(int b,GIAC_CONTEXT);
-
-  int & series_flags(GIAC_CONTEXT);
-  void series_flags(int b,GIAC_CONTEXT);
-
-  int & step_infolevel(GIAC_CONTEXT);
-  void step_infolevel(int b,GIAC_CONTEXT);
-
-  bool & local_eval(GIAC_CONTEXT);
-  void local_eval(bool b,GIAC_CONTEXT);
-
-  int & default_color(GIAC_CONTEXT);
-  void default_color(int c,GIAC_CONTEXT);
-
-  int & spread_Row(GIAC_CONTEXT);
-  void spread_Row(int c,GIAC_CONTEXT);
-
-  int & spread_Col(GIAC_CONTEXT);
-  void spread_Col(int c,GIAC_CONTEXT);
-
-  int & printcell_current_row(GIAC_CONTEXT);
-  void printcell_current_row(int c,GIAC_CONTEXT);
-
-  int & printcell_current_col(GIAC_CONTEXT);
-  void printcell_current_col(int c,GIAC_CONTEXT);
-
-  double & total_time(GIAC_CONTEXT);
-  double & epsilon(GIAC_CONTEXT);
-  void epsilon(double c,GIAC_CONTEXT);
-  double & proba_epsilon(GIAC_CONTEXT);
-  extern double min_proba_time; // in seconds, minimal time for proba early termination
-
-#ifdef NSPIRE
-  nio::console * logptr(GIAC_CONTEXT);
-  void logptr(nio::console *,GIAC_CONTEXT);
-#else
-  my_ostream * logptr(GIAC_CONTEXT);
-  void logptr(my_ostream *,GIAC_CONTEXT);
-#endif
-
-  int & eval_level(GIAC_CONTEXT);
-  // void eval_level(int b,GIAC_CONTEXT);
-  thread_param * thread_param_ptr(const context * contextptr);
-
-#if defined(FXCG) // defined(GIAC_HAS_STO_38) || defined(ConnectivityKit)
-  unsigned int & rand_seed(GIAC_CONTEXT);
-#else
-  tinymt32_t * rand_seed(GIAC_CONTEXT);
-#endif
-  void rand_seed(unsigned int b,GIAC_CONTEXT);
-  int giac_rand(GIAC_CONTEXT);
-  int std_rand(); // a congruential random generator without context
-
-  int & prog_eval_level_val(GIAC_CONTEXT);
-  void prog_eval_level_val(int b,GIAC_CONTEXT);
-
-  int & max_sum_sqrt(GIAC_CONTEXT);
-  void max_sum_sqrt(int b,GIAC_CONTEXT);
-
-  int & max_sum_add(GIAC_CONTEXT);
-
-  int & language(GIAC_CONTEXT);
-  void language(int b,GIAC_CONTEXT);
-
-  int & lexer_line_number(GIAC_CONTEXT);
-  int & lexer_column_number(GIAC_CONTEXT);
-  void lexer_line_number(int b,GIAC_CONTEXT);
-  void increment_lexer_line_number(GIAC_CONTEXT);
-
-  std::string parser_error(GIAC_CONTEXT);
-  void parser_error(const std::string & s,GIAC_CONTEXT);
-
-  int & index_status(GIAC_CONTEXT);
-  void index_status(int b,GIAC_CONTEXT);
-
-  int & i_sqrt_minus1(GIAC_CONTEXT);
-  void i_sqrt_minus1(int b,GIAC_CONTEXT);
-
-  int & opened_quote(GIAC_CONTEXT);
-  void opened_quote(int b,GIAC_CONTEXT);
-
-  int & in_rpn(GIAC_CONTEXT);
-  void in_rpn(int b,GIAC_CONTEXT);
-
-  int & spread_formula(GIAC_CONTEXT);
-  void spread_formula(int b,GIAC_CONTEXT);
-
-  int & initialisation_done(GIAC_CONTEXT);
-  void initialisation_done(int b,GIAC_CONTEXT);
-
-  std::string comment_s(GIAC_CONTEXT);
-  void comment_s(const std::string & s,GIAC_CONTEXT);
-  void increment_comment_s(const std::string & s,GIAC_CONTEXT);
-  void increment_comment_s(char ch,GIAC_CONTEXT);
-
-  std::string parser_filename(GIAC_CONTEXT);
-  void parser_filename(const std::string & s,GIAC_CONTEXT);
-
-  int & first_error_line(GIAC_CONTEXT);
-  void first_error_line(int s,GIAC_CONTEXT);
-
-  std::string error_token_name(GIAC_CONTEXT);
-  void error_token_name(const std::string & s,GIAC_CONTEXT);
-
-  gen parsed_gen(GIAC_CONTEXT);
-  void parsed_gen(const gen & g,GIAC_CONTEXT);
-
-  debug_struct * debug_ptr(GIAC_CONTEXT);
-
-  // gen_op is the type of all functions taking 1 or more gen args 
-  // and returning 1 arg of type gen
-  // gen argument has atomic type for an unary op, 
-  // and vecteur type (compttr) otherwise
-  typedef gen ( * gen_op ) (const gen & arg);
-  typedef gen ( * gen_op_context ) (const gen & arg,const context * context_ptr);
-
-  extern pid_t child_id;
-  extern pid_t parent_id;
-#ifdef HAVE_SIGNAL_H_OLD
-  // all this stuff is obsolete, will be removed soon
-  void kill_and_wait_sigusr2(); // called by child for interm. data
-  // subprocess evaluation
-  // return true if entree has been sent to evalation by child process
-  bool child_eval(const std::string & entree,bool numeric,bool is_run_file);
-  bool child_reeval(int history_begin_level);
-  bool update_data(gen & entree,gen & sortie,GIAC_CONTEXT);
-  void updatePICT(const vecteur & args);
-  bool read_data(gen & entree,gen & sortie,std::string & message,GIAC_CONTEXT);
-
-  gen wait_parent(); // wait a SIGUSR2 from parent process, return a gen
-
-  pid_t make_child(); // forks and return child id
-  extern bool running_file;
-  extern volatile bool child_busy;
-  extern volatile bool data_ready;
-  extern volatile bool signal_plot_child;
-  extern volatile bool signal_plot_parent; 
-  extern int run_modif_pos;
-  // end of obsolete section 
-#endif
-
-  void read_config(const std::string & name,GIAC_CONTEXT,bool verbose=true);
-  void protected_read_config(GIAC_CONTEXT,bool verbose=true);
-  vecteur remove_multiples(vecteur & v); // sort v and return list without multiple occurrences
-  int equalposcomp(const std::vector<int> v,int i);
-  int equalposcomp(const std::vector<short int> v,int i);
-  int equalposcomp(int tab[],int f);
-  // replace c1 by c2 in s
-  std::string replace(const std::string & s,char c1,char c2);
-  // attempt to convert Python-like programming structures to Xcas
-  std::string python2xcas(const std::string & s_orig,GIAC_CONTEXT);
-  std::string find_doc_prefix(int i);
-  std::string find_lang_prefix(int i);
-  int string2lang(const std::string & s); // convert "fr" to 1, "es" to 3 etc.
-  void update_completions();
-  void add_language(int i,GIAC_CONTEXT);
-  void remove_language(int i,GIAC_CONTEXT);
-  std::string set_language(int i,GIAC_CONTEXT);
-  std::string read_env(GIAC_CONTEXT,bool verbose=true); // return doc prefix
-  std::string home_directory();
-  std::string cas_entree_name();
-  std::string cas_sortie_name();
-  std::string cas_setup_string(GIAC_CONTEXT);
-  std::string geo_setup_string();
-  std::string giac_aide_dir(); // PATH to the directory of aide_cas
-  bool is_file_available(const char * ch);
-  bool file_not_available(const char * ch);
-  bool check_file_path(const std::string & s); // true if file is in path
-  std::string browser_command(const std::string & orig_file);
-  bool system_browser_command(const std::string & file);
-  // convert doc name to an absolute path name
-  std::string absolute_path(const std::string & orig_file);
-  std::string & xcasrc();
-  std::string & xcasroot();
-  std::string add_extension(const std::string & s,const std::string & ext,const std::string & def);
-  std::string remove_filename(const std::string & s);
-  bool my_isnan(double d);
-  bool my_isinf(double d);
-
-  /* launch a new thread for evaluation only,
-     no more readqueue, readqueue is done by the "parent" thread
-     Ctrl-C will kill the "child" thread
-     wait_001 is a function that should wait 0.001 s and update thinks
-     for example it could remove idle callback of a GUI
-     then call the wait function of the GUI and readd callbacks
-  */
-  giac::gen thread_eval(const giac::gen & g,int level,giac::context * contextptr,void (* wait_001)(giac::context *));
-#ifdef HAVE_LIBPTHREAD
-  // pointer to the context mutex so that thread_eval can be locked
-  // Check this in wait_001 function if you don't want the main thread to
-  // be blocked by a call to thread_eval inside wait_001
-  pthread_mutex_t * mutexptr(GIAC_CONTEXT);
-  extern pthread_mutex_t interactive_mutex,turtle_mutex;
-  
-#endif
-  // Check if a thread_eval is active
-  bool is_context_busy(GIAC_CONTEXT);
-  // Check and set the kill thread flag
-  bool kill_thread(GIAC_CONTEXT);
-  void kill_thread(bool b,GIAC_CONTEXT);
-  // Thread eval status = 0 finished, =1 eval, =2 debug_wait_main
-  int thread_eval_status(GIAC_CONTEXT);
-  void thread_eval_status(int c,GIAC_CONTEXT);
-
-  void clear_prog_status(GIAC_CONTEXT);
-  void cleanup_context(GIAC_CONTEXT);
-
-  // count how many bytes are required to save g in a file
-  unsigned archive_count(const gen & g,GIAC_CONTEXT);
-  // save g in a opened file
-  bool archive_save(void * f,const gen & g,size_t writefunc(void const* p, size_t nbBytes,size_t NbElements, void *file),GIAC_CONTEXT, bool noRecurse=false);
-
-  bool archive_save(void * f,const gen & g,GIAC_CONTEXT);
-  // restore a gen from an opened file
-  gen archive_restore(void * f,size_t readfunc(void * p, size_t nbBytes,size_t NbElements, void *file),GIAC_CONTEXT);
-  gen archive_restore(FILE * f,GIAC_CONTEXT);
-  void init_geogebra(bool on,GIAC_CONTEXT);
-  vecteur giac_current_status(bool save_history,GIAC_CONTEXT);
-  bool unarchive_session(const gen & g,int level,const gen & replace,GIAC_CONTEXT,bool with_history=true);
-
-  gen add_autosimplify(const gen & g,GIAC_CONTEXT);
-
-  extern void (*my_gprintf)(unsigned special,const std::string & format,const vecteur & v,GIAC_CONTEXT);
-  void gprintf(const std::string & format,const vecteur & v,GIAC_CONTEXT);
-  void gprintf(const std::string & format,const vecteur & v,int step_info,GIAC_CONTEXT);
-  void gprintf(unsigned special,const std::string & format,const vecteur & v,GIAC_CONTEXT);
-  void gprintf(unsigned special,const std::string & format,const vecteur & v,int step_info,GIAC_CONTEXT);
-  gen make_symbolic(const gen & op,const gen & args);
-  // optional, call it just before exiting
-  int release_globals();
-  
-#ifndef NO_NAMESPACE_GIAC
-} // namespace giac
-#endif // ndef NO_NAMESPACE_GIAC
-
-
-#endif // _GIAC_GLOBAL_H
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/ifactor.cc b/apps/KhiCAS/src/giac-1.6.0/src/ifactor.cc
index 89c74f691..2db1a7cad 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/ifactor.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/ifactor.cc
@@ -4163,7 +4163,7 @@ namespace giac {
 	  return g;
 	return _matrix(makesequence(g._VECTptr->size()/2,2,g),contextptr);
       }
-#ifndef EMCC
+#if !defined EMCC && defined HAVE_LIBPARI
       if (b.type==_SYMB){
 	gen res;
 	// b is assumed to be a minimal polynomial check if g is a norm 
@@ -4774,7 +4774,7 @@ namespace giac {
     else {
       // is q a power of a prime?
       double d=evalf_double(q,1,contextptr)._DOUBLE_val;
-      int maxpow=int(std::ceil(std::log(d)/std::log(3)));
+      int maxpow=int(std::ceil(std::log(d)/std::log(3.0)));
       for (int i=2;i<=maxpow;++i){
 	if ( (i>2 && i%2==0) ||
 	     (i>3 && i%3==0) ||
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/input_lexer.ll b/apps/KhiCAS/src/giac-1.6.0/src/input_lexer.ll
index d71ff8289..d61f74c77 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/input_lexer.ll
+++ b/apps/KhiCAS/src/giac-1.6.0/src/input_lexer.ll
@@ -1039,11 +1039,18 @@ AN	[0-9a-zA-Z_~ ?\200-\355\357-\376]
 	  }
 	}
 	bool instring=false;
-	// stupid match of bracket then parenthesis
-	int l=s.size(),nb=0,np=0;
+	// stupid match of bracket then parenthesis then quotes
+	int l=s.size(),nb=0,np=0,nq=0;
 	int i=0;
 	if (lexer_close_parenthesis(contextptr)){
 	  for (;i<l;++i){
+	    if (!instring && s[i]=='\''){
+	      nq++;
+	      if (nq%2==1 && i>2 && s[i-2]=='\'' && s[i-1]=='='){
+		s.insert(s.begin()+i-1,' ');
+		++l;
+	      }
+	    }
 	    if (!instring && i && s[i]=='/' && s[i-1]=='/'){
 	      // skip comment until end of line
 	      for (;i<l;++i){
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/intg.cc b/apps/KhiCAS/src/giac-1.6.0/src/intg.cc
index 027b94e9a..75e36b97c 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/intg.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/intg.cc
@@ -1379,6 +1379,8 @@ namespace giac {
 	      res= col0.front();
 	      return 2;
 	    }
+	    if (col0.size()<k-1)
+	      return 2;
 	    reverse(col0.begin(),col0.end()); // C at the beginning, Q at the end
 	    C=2*horner(vecteur(col0.begin(),col0.begin()+k-1),gen_x);
 	    Q=2*horner(vecteur(col0.begin()+k-1,col0.end()),gen_x);
@@ -2774,14 +2776,30 @@ namespace giac {
       }
       if (!is_constant_wrt(vf1,gen_x,contextptr)){
 	curgcd=1;
-	continue;
+	break;
       }
       if (vf1.type==_VECT) 
 	vf1=_gcd(vf1,contextptr);
-      if (curgcd!=0 && vf1!=curgcd)
+      if (curgcd!=0 && vf1!=curgcd){
 	allsame=false;
+      }
       curgcd=gcd(vf1,curgcd);
     }
+    if (!allsame && curgcd==1){ // translate if exists b!=0 with f(x+b)
+      for (int i=1;i<v.size();++i){
+	if (v[i].type!=_SYMB)
+	  continue;
+	gen vf=v[i]._SYMBptr->feuille,a,b;
+	if (is_linear_wrt(vf,gen_x,a,b,contextptr) && (a==1||a==-1)){ 
+	  if (b==0) break; // 
+	  gen e1=complex_subst(e,gen_x,a*(gen_x-b),contextptr);
+	  gen E1=integrate_id_rem(e1,gen_x,remains_to_integrate,contextptr,intmode);
+	  remains_to_integrate=complex_subst(remains_to_integrate,gen_x,a*gen_x+b,contextptr);
+	  E1=complex_subst(E1,gen_x,a*gen_x+b,contextptr);
+	  return a*E1/curgcd;
+	}
+      }
+    }
     if (!allsame && curgcd!=0 && curgcd!=1){
       gen e1=complex_subst(e,gen_x,inv(curgcd,contextptr)*gen_x,contextptr);
       v=vecteur(1,gen_x);
@@ -2790,7 +2808,7 @@ namespace giac {
       for (int i=1;i<v.size();++i){
 	if (v[i].type!=_SYMB)
 	  continue;
-	gen vf=ratnormal(v[i]._SYMBptr->feuille,contextptr);
+	gen vf=expand(ratnormal(v[i]._SYMBptr->feuille,contextptr),contextptr);
 	vrep[i]=symbolic(v[i]._SYMBptr->sommet,vf);
       }
       if (v!=vrep) e1=complex_subst(e1,v,vrep,contextptr);
@@ -5855,7 +5873,7 @@ namespace giac {
       gen af=evalf_double(v[2],1,contextptr),bf=evalf_double(v[3],1,contextptr);
       if (v[1].type==_IDNT && (is_inf(af) || af.type==_DOUBLE_) && (is_inf(bf) || bf.type==_DOUBLE_)){
 	vecteur w;
-#ifndef NSPIRE
+#if !defined FXCG && !defined NSPIRE
 	my_ostream * ptr=logptr(contextptr);
 	logptr(0,contextptr);
 #endif
@@ -5878,7 +5896,7 @@ namespace giac {
 	  v0=v[0];
 	}
 #endif
-#ifndef NSPIRE
+#if !defined FXCG && !defined NSPIRE
 	logptr(ptr,contextptr);
 #endif
 	for (unsigned i=0;i<w.size();++i){
@@ -6804,11 +6822,14 @@ namespace giac {
     return has_num_coeff(an)?an:recursive_normal(an,contextptr);
   }
   bool get_fourier(vecteur & v){
+    if (v.size()<2) return false;
     if (v.size()==2) 
       v=makevecteur(v[0],vx_var,cst_two_pi,v[1],-cst_pi);
     if (v.size()==3) 
       v=makevecteur(v[0],v[1],cst_two_pi,v[2],-cst_pi);
     if (v.size()==4) v.push_back(0);
+    if (equalposcomp(lidnt(v[3]),v[1]))
+      return false;
     return v.size()==5;
   }
   gen _fourier_an(const gen & args,GIAC_CONTEXT){
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/intgab.cc b/apps/KhiCAS/src/giac-1.6.0/src/intgab.cc
index 35965ba29..f329daaf2 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/intgab.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/intgab.cc
@@ -199,7 +199,8 @@ namespace giac {
     if (res)
       return res;
     gen f1=f,f2=subst(f,x,-x,false,contextptr);
-    if (lvar(f)==vecteur(1,x)){ // rational case
+    vecteur v=lvar(f);
+    if (v==vecteur(1,x)){ // rational case
       if (is_zero(normal(f1-f2,contextptr)))
 	return 1;
       if (is_zero(normal(f1+f2,contextptr)))
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/k_csdk.h~ b/apps/KhiCAS/src/giac-1.6.0/src/k_csdk.h~
deleted file mode 100644
index eff46ee45..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/k_csdk.h~
+++ /dev/null
@@ -1,158 +0,0 @@
-/* C header for Khicas interface with calculator OS */
-#ifndef K_CSDK_H
-#define K_CSDK_H
-#include "k_defs.h"
-// Defaults parameters do not work if included from C 
-#define SDK_BLACK 0
-#define SDK_WHITE 65535
-#ifdef __cplusplus
-extern "C" {
-#endif
-  extern short exam_mode,nspire_exam_mode;
-  // nspire_exam_mode==0 normal mode
-  // ==1 led are blinking
-  // ==2 OS exam mode is on but led are not blinking
-  // Set the Nspire in normal exam mode at home, transfer ndless and khicas
-  // activate khicas: will detect led blinking (mode ==1)
-  // prepare exam mode with Khicas menu item (clear led, mode==2),
-  // in that mode menu menu will not leave KhiCAS anymore but
-  // will clean data and do a hardware reset (launch again exam mode and leds)
-  extern unsigned exam_start;
-  extern int exam_duration;
-  int ext_main();
-  bool waitforvblank();
-  bool back_key_pressed() ;
-  // next 3 functions may be void if not inside a window class hierarchy
-  void os_show_graph(); // show graph inside Python shell (Numworks), not used
-  void os_hide_graph(); // hide graph, not used anymore
-  void os_redraw(); // force redraw of window class hierarchy
-#ifdef NUMWORKS
-  void raisememerr();
-  extern unsigned _heap_size;
-  extern void * _heap_ptr;
-  extern void * _heap_base;
-  bool inexammode();
-  int extapp_restorebackup(int mode);
-  void numworks_set_pixel(int x,int y,int c);
-  int numworks_get_pixel(int x,int y);
-  void numworks_fill_rect(int x,int y,int w,int h,int c);
-#ifdef __cplusplus
-  int numworks_draw_string(int x,int y,int c,int bg,const char * s,bool fake=false);
-  int numworks_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake=false);
-#else
-  int numworks_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-  int numworks_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-#endif
-  void numworks_show_graph();
-  void numworks_hide_graph();
-  void numworks_redraw();
-  void numworks_wait_1ms(int ms);
-  // access to Numworks OS, defined in port.cpp (or modkandinsky.cpp)
-  inline void os_set_pixel(int x,int y,int c){
-    numworks_set_pixel(x,y,c);
-  }
-  inline int os_get_pixel(int x,int y){
-    return numworks_get_pixel(x,y);
-  }
-  inline void os_fill_rect(int x,int y,int w,int h,int c){
-    numworks_fill_rect(x,y,w,h,c);
-  }
-  inline int os_draw_string(int x,int y,int c,int bg,const char * s,bool fake){
-    return numworks_draw_string(x,y,c,bg,s,fake);
-  }
-  inline int os_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake){
-    return numworks_draw_string_small(x,y,c,bg,s,fake);
-  }
-  inline void os_shaw_graph(){ return numworks_show_graph(); }
-  inline void os_hide_graph(){ return numworks_hide_graph(); }
-  inline void os_redraw(){ return numworks_redraw(); }
-  inline void os_wait_1ms(int ms) { numworks_wait_1ms(ms); }
-  int getkey_raw(int allow_suspend); // Numworks scan code
-  inline void sync_screen(){}
-#endif // NUMWORKS
-
-  void os_wait_1ms(int ms);
-  bool os_set_angle_unit(int mode);
-  int os_get_angle_unit();
-  double millis(); //extern int time_shift;
-  bool file_exists(const char * filename);
-  bool erase_file(const char * filename);
-  const char * read_file(const char * filename);
-#ifdef __cplusplus
-  bool write_file(const char * filename,const char * s,size_t len=0);
-#else
-  bool write_file(const char * filename,const char * s,size_t len);
-#endif
-#define MAX_NUMBER_OF_FILENAMES 255
-  int os_file_browser(const char ** filenames,int maxrecords,const char * extension,int storage);
-  void sync_screen();
-  void os_set_pixel(int x,int y,int c);
-  void os_fill_rect(int x,int y,int w,int h,int c);
-  inline void drawRectangle(int x,int y,int w,int h,int c){
-    os_fill_rect(x,y,w,h,c);
-  }
-  int os_get_pixel(int x,int y);
-  /* returns new x position */
-#ifdef __cplusplus
-  int os_draw_string(int x,int y,int c,int bg,const char * s,bool fake=false);
-#else
-  int os_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-#endif
-  inline int os_draw_string_(int x,int y,const char * s){ return os_draw_string(x,y,SDK_BLACK,SDK_WHITE,s,false);}
-#ifdef __cplusplus
-  int os_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake=false);
-#else
-  int os_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-#endif
-  inline int os_draw_string_small_(int x,int y,const char * s){ return os_draw_string_small(x,y,SDK_BLACK,SDK_WHITE,s,false);}
-  
-#ifdef __cplusplus
-#ifdef NUMWORKS
-  inline int os_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake=false){ return os_draw_string_small(x,y,c,bg,s,fake);}
-#else
-  int os_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake=false);
-#endif
-#else
-#ifdef NUMWORKS
-  inline int os_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake){ return os_draw_string_small(x,y,c,bg,s,fake);}
-#else
-  int os_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake);
-#endif
-#endif
-  inline int os_draw_string_medium_(int x,int y,const char * s){ return os_draw_string_medium(x,y,SDK_BLACK,SDK_WHITE,s,false);}
-  void GetKey(int * key);
-  int getkey(int allow_suspend); // transformed
-  void enable_back_interrupt();
-  inline void set_abort(){  enable_back_interrupt(); }
-  void disable_back_interrupt();
-  inline void clear_abort(){  disable_back_interrupt(); }
-  bool isalphaactive();
-  bool alphawasactive(int * key);
-  void lock_alpha();
-  void reset_kbd();
-  void statuslinemsg(const char * msg);
-#ifdef __cplusplus
-  void statusline(int mode=0);
-#else
-  void statusline(int mode);
-#endif
-#ifdef NUMWORKS
-  inline bool iskeydown(int key);
-#else
-  bool iskeydown(int key);
-#endif
-  
-#if defined NSPIRE || defined NSPIRE_NEWLIB
-  extern bool nspireemu;
-  extern char nspire_filebuf[NSPIRE_FILEBUFFER];
-  extern bool on_key_enabled;
-  void get_hms(int *h,int *m,int *s);
-  void reset_gc();  
-#endif
-
-  extern int (*shutdown)(); // function called after 2 hours of idle
-  extern short int shutdown_state;
-#ifdef __cplusplus
-}
-#endif
-#endif // K_CSDK_H
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/kadd.cc b/apps/KhiCAS/src/giac-1.6.0/src/kadd.cc
index c98151ff9..6742f0f04 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/kadd.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/kadd.cc
@@ -396,12 +396,14 @@ int finance(int mode,GIAC_CONTEXT){ // mode==-1 pret, 1 placement
   return 0;
 }
 
+int geoapp(GIAC_CONTEXT);
+
 int khicas_addins_menu(GIAC_CONTEXT){
   Menu smallmenu;
 #ifdef NUMWORKS
-  smallmenu.numitems=11; // INCREMENT IF YOU ADD AN APPLICATION
+  smallmenu.numitems=12; // INCREMENT IF YOU ADD AN APPLICATION
 #else
-  smallmenu.numitems=10; // INCREMENT IF YOU ADD AN APPLICATION
+  smallmenu.numitems=11; // INCREMENT IF YOU ADD AN APPLICATION
 #endif  
   // and uncomment first smallmenuitems[app_number].text="Reserved"
   // replace by your application name
@@ -411,14 +413,15 @@ int khicas_addins_menu(GIAC_CONTEXT){
   smallmenu.height=12;
   smallmenu.scrollbar=1;
   smallmenu.scrollout=1;
-  smallmenuitems[0].text = (char*)((lang==1)?"Tableur":"Spreadsheet");
-  smallmenuitems[1].text = (char*)((lang==1)?"Table periodique":"Periodic table");
-  smallmenuitems[2].text = (char*)((lang==1)?"Pret":"Mortgage");
-  smallmenuitems[3].text = (char*)((lang==1)?"Epargne":"TVM");
-  smallmenuitems[4].text = (char*)((lang==1)?"Table caracteres":"Char table");
-  smallmenuitems[5].text = (char*)((lang==1)?"Exemple simple: Syracuse":"Simple example; Syracuse");
-  smallmenuitems[6].text = (char*)((lang==1)?"Exemple de jeu: Mastermind":"Game example: Mastermind");
-  smallmenuitems[7].text = (char*)((lang==1)?"Fractale de Mandelbrot":"Mandelbrot fractal");
+  smallmenuitems[0].text = (char*)((lang==1)?"Geometrie":"Geometry");
+  smallmenuitems[1].text = (char*)((lang==1)?"Tableur":"Spreadsheet");
+  smallmenuitems[2].text = (char*)((lang==1)?"Table periodique":"Periodic table");
+  smallmenuitems[3].text = (char*)((lang==1)?"Pret":"Mortgage");
+  smallmenuitems[4].text = (char*)((lang==1)?"Epargne":"TVM");
+  smallmenuitems[5].text = (char*)((lang==1)?"Table caracteres":"Char table");
+  smallmenuitems[6].text = (char*)((lang==1)?"Exemple simple: Syracuse":"Simple example; Syracuse");
+  smallmenuitems[7].text = (char*)((lang==1)?"Exemple de jeu: Mastermind":"Game example: Mastermind");
+  smallmenuitems[8].text = (char*)((lang==1)?"Fractale de Mandelbrot":"Mandelbrot fractal");
   // smallmenuitems[8].text = (char*)"Mon application"; // adjust numitem !
   // smallmenuitems[9].text = (char*)"Autre application";
   // smallmenuitems[10].text = (char*)"Encore une autre";
@@ -440,9 +443,11 @@ int khicas_addins_menu(GIAC_CONTEXT){
 	handle_flash(contextptr);
 #endif
       // Attention les entrees sont decalees de 1
-      if (smallmenu.selection==1) // tableur
+      if (smallmenu.selection==1) // geometry
+	geoapp(contextptr);
+      if (smallmenu.selection==2) // tableur
 	sheet(contextptr);
-      if (smallmenu.selection==2){ // table periodique
+      if (smallmenu.selection==3){ // table periodique
 	const char * name,*symbol;
 	char protons[32],nucleons[32],mass[32],electroneg[32];
 	int res=periodic_table(name,symbol,protons,nucleons,mass,electroneg);
@@ -481,15 +486,15 @@ int khicas_addins_menu(GIAC_CONTEXT){
 	copy_clipboard(console_buf,true);
 	// return Console_Input(console_buf);
       }
-      if (smallmenu.selection==3){
+      if (smallmenu.selection==4){
 	finance(-1,contextptr);
 	continue;
       }
-      if (smallmenu.selection==4){
+      if (smallmenu.selection==5){
 	finance(1,contextptr);
 	continue;
       }
-      if (smallmenu.selection==5){
+      if (smallmenu.selection==6){
 	int c=chartab();
 	if (c>=0){
 	  char buf[2]={c,0};
@@ -497,7 +502,7 @@ int khicas_addins_menu(GIAC_CONTEXT){
 	}
 	break;
       }
-      if (smallmenu.selection==6){
+      if (smallmenu.selection==7){
 	// Exemple simple d'application tierce: la suite de Syracuse
 	// on entre la valeur de u0
 	double d; int i;
@@ -518,16 +523,16 @@ int khicas_addins_menu(GIAC_CONTEXT){
 	  v.push_back(i);
 	}
 	// representation graphique de la liste en appelant la commande Xcas listplot
-	displaygraph(_listplot(v,contextptr),contextptr);
+	displaygraph(_listplot(v,contextptr),symbolic(at_listplot,v),contextptr);
 	// copie vers presse-papier en l'affichant
 	copy_clipboard(gen(v).print(contextptr),true);
 	continue;
 	// on entre la liste en ligne de commande et on quitte
 	return Console_Input(gen(v).print(contextptr).c_str());
       }
-      if (smallmenu.selection==7) // mastermind, on ne quitte pas
+      if (smallmenu.selection==8) // mastermind, on ne quitte pas
 	mastermind(contextptr);
-      if (smallmenu.selection==8)
+      if (smallmenu.selection==9)
 	fractale(contextptr);
     } // end sres==menu_selection
     Console_Disp(1,contextptr);
@@ -1158,7 +1163,7 @@ void sheet_graph(tableur &t,GIAC_CONTEXT){
   vecteur v;
   sheet_pnt(t.m,v);
   gen g(v);
-  check_do_graph(g,2,contextptr);
+  check_do_graph(g,0,2,contextptr);
 }
 
 int sheet_menu_menu(tableur & t,GIAC_CONTEXT){
@@ -1443,6 +1448,8 @@ giac::gen sheet(GIAC_CONTEXT){
   if (!sheetptr)
     sheetptr=new_tableur(contextptr);
   tableur & t=*sheetptr;
+  sheet_eval(t,contextptr,true);
+  t.changed=false;
   bool status_freeze=false;
   t.keytooltip=false;
   for (;;){
@@ -1786,5 +1793,55 @@ giac::gen sheet(GIAC_CONTEXT){
   }
 }
 
-
+int geoapp(GIAC_CONTEXT){
+  int res=newgeo(contextptr);
+  if (res<0) return res;
+  // load a figure?
+  textArea * text=geoptr->hp;
+  vector<string> fign,figs;
+  vecteur V(gen2vecteur(giac::_VARS(0,contextptr)));
+  for (int i=0;i<V.size();++i){
+    gen tmp(V[i]);
+    gen val=eval(tmp,1,contextptr);
+    if (val.type==_VECT && val._VECTptr->size()==2 && val._VECTptr->front()==at_pnt){
+      vecteur & v=*val._VECTptr;
+      if (v[1].type==_STRNG){
+	fign.push_back(tmp.print(contextptr));
+	figs.push_back(*v[1]._STRNGptr);
+      }
+    }
+  }
+  if (1 || !figs.empty()){
+    if (0 && figs.size()==1){
+      text->elements.clear();
+      add(text,figs[0]);
+      text->filename=fign[0];
+    }
+    else {
+      const char * tab[figs.size()+3]={0};
+      for (int i=0;i<figs.size();++i)
+	tab[i]=fign[i].c_str();
+      tab[figs.size()]=lang==1?"Nouvelle figure 2d":"New 2d figure";
+      tab[figs.size()+1]=lang==1?"Nouvelle figure 3d":"New 3d figure";
+      int s=select_item(tab,lang==1?"Choisir figure":"Choose figure",true);
+      if (s>=0 && s<sizeof(tab)/sizeof(char *) && tab[s]){
+	text->elements.clear();
+	if (s<figs.size()){
+	  add(text,figs[s]);
+	  text->filename=fign[s]+".py";
+	  geoparse(text,contextptr);
+	}
+	else {
+	  geoptr->plot_instructions.clear();
+	  geoptr->symbolic_instructions.clear();
+	  geoptr->is3d=(s==figs.size()+1);
+	  geoptr->orthonormalize();
+	  text->filename="figure"+print_INT_(figs.size()+1)+".py";
+	}
+      }
+      else return -3;
+    }
+  }
+  return geoloop(geoptr);
+}
 #endif
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/kadd.cc~ b/apps/KhiCAS/src/giac-1.6.0/src/kadd.cc~
deleted file mode 100755
index 81c54e768..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/kadd.cc~
+++ /dev/null
@@ -1,1770 +0,0 @@
-#include "config.h"
-#include "giacPCH.h"
-#ifdef KHICAS
-#include "kdisplay.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <ctype.h>
-#define HAVE_TIME_H
-#include <time.h>
-
-#ifndef NO_NAMESPACE_GIAC
-namespace giac {
-#endif // ndef NO_NAMESPACE_GIAC
-  xcas::tableur * new_tableur(GIAC_CONTEXT){
-    xcas::tableur * sheetptr=new xcas::tableur;
-#ifdef NUMWORKS
-    sheetptr->nrows=14; sheetptr->ncols=4;
-#else
-    sheetptr->nrows=20; sheetptr->ncols=5;
-#endif
-    gen g=vecteur(sheetptr->ncols);
-    sheetptr->m=makefreematrice(vecteur(sheetptr->nrows,g));
-    makespreadsheetmatrice(sheetptr->m,contextptr);
-    sheetptr->cur_row=sheetptr->cur_col=sheetptr->disp_row_begin=sheetptr->disp_col_begin=0;
-    sheetptr->sel_row_begin=sheetptr->sel_col_begin=-1;
-    sheetptr->cmd_pos=sheetptr->cmd_row=sheetptr->cmd_col=-1;
-    sheetptr->changed=false;
-    sheetptr->recompute=true;
-    sheetptr->matrix_fill_cells=true;
-    sheetptr->movedown=true;
-    sheetptr->filename="session";
-    return sheetptr;
-  }
-  gen current_sheet(const gen & g,GIAC_CONTEXT){
-    if (!xcas::sheetptr)
-      xcas::sheetptr=new_tableur(contextptr);
-    xcas::tableur & t=*xcas::sheetptr;
-    if (ckmatrix(g,true)){
-      t.m=*g._VECTptr;
-      makespreadsheetmatrice(t.m,contextptr);
-      t.cur_row=t.cur_col=0;
-      t.nrows=t.m.size();
-      t.ncols=t.m.front()._VECTptr->size();
-      t.sel_row_begin=-1;
-      t.cmd_row=t.cmd_pos=-1;
-      return 1;
-    }
-    int r,c;
-    if (iscell(g,c,r,contextptr)){
-      if (r>=t.nrows||c>=t.ncols)
-	return undef;
-      gen tmp=t.m[r];
-      tmp=tmp[c];
-      return tmp[1];
-    }
-    if (g.type==_VECT && g.subtype==0 && g._VECTptr->empty())
-      return gen(extractmatricefromsheet(t.m,false),_SPREAD__VECT);
-    gen m(extractmatricefromsheet(t.m),_MATRIX__VECT);
-    if (g.type==_VECT && g._VECTptr->empty())
-      return m;
-    return m[g];
-  }
-  static const char _current_sheet_s []="current_sheet";
-  static define_unary_function_eval(__current_sheet,&current_sheet,_current_sheet_s);
-  define_unary_function_ptr5( at_current_sheet ,alias_at_current_sheet,&__current_sheet,_QUOTE_ARGUMENTS,true);
-  
-#ifndef NO_NAMESPACE_GIAC
-}
-#endif // ndef NO_NAMESPACE_GIAC
-
-
-using namespace std;
-using namespace giac;
-using namespace xcas;
-
-#if 0
-int ext_main(){
-  while (1){
-    statuslinemsg("Numworks loader");
-    drawRectangle(0,0,LCD_WITH_PX,LCD_HEIGHT_PX,_BLACK);
-    os_draw_string(0,20,_WHITE,_BLACK,"1. Khicas shell");
-    os_draw_string(0,40,_WHITE,_BLACK,"2. Epsilon (Numworks HOME)");
-    int k=getkey(1);
-    if (k=='1' ) run_epsilon();
-    if (k=='2') caseval("*");
-  }
-}
-#else
-int ext_main(){
-  caseval("*");
-  return 0;
-}
-#endif
-
-void handle_flash(GIAC_CONTEXT);
-
-unsigned short mmind_col[]={COLOR_BLUE,COLOR_RED,COLOR_MAGENTA,COLOR_GREEN,COLOR_CYAN,COLOR_YELLOW};
-
-void mastermind_disp(const vector<int> & solution,const vector< vector<int> > & essais,const vector<int> & essai,bool fulldisp,GIAC_CONTEXT){
-  int x0=30,y0=30;
-  if (fulldisp)
-    drawRectangle(0,0,LCD_WIDTH_PX,LCD_HEIGHT_PX,_WHITE);
-  else
-    drawRectangle(0,y0+6*20,LCD_WIDTH_PX,LCD_HEIGHT_PX-(y0+4*20),_WHITE);
-  if (fulldisp){
-    // grille
-    for (int i=y0;i<=y0+4*20;i+=20)
-      draw_line(x0,i,x0+12*20,i,_BLACK);
-    for (int j=x0;j<=x0+12*20;j+=20)
-      draw_line(j,y0,j,y0+4*20,_BLACK);
-    // affichage des coups precedents et resultats
-    for (int c=0;c<essais.size();++c){
-      const vector<int> & essai=essais[c];
-      for (int i=0;i<4;++i){
-	draw_filled_circle(x0+20*c+10,y0+20*i+10,10,mmind_col[essai[i]],true,true,contextptr);
-      }
-      // resultats
-      vector<int> S(solution),E(essai);
-      // bien places
-      int bien=0;
-      for (int i=0;i<S.size();++i){
-	if (S[i]==E[i]){
-	  ++bien;
-	  S.erase(S.begin()+i);
-	  E.erase(E.begin()+i);
-	  --i;
-	}
-      }
-      // mal places
-      int mal=0;
-      sort(S.begin(),S.end());
-      sort(E.begin(),E.end());
-      int s=0,e=0;
-      for (;;){
-	if (s>=S.size() || e>=E.size())
-	  break;
-	if (S[s]==E[e]){
-	  ++mal;
-	  ++s; ++e;
-	  continue;
-	}
-	if (S[s]<E[e])
-	  ++s;
-	else
-	  ++e;
-      }
-      char buf[2]={0,0};
-      buf[0]='0'+bien;
-      os_draw_string(x0+20*c+3,y0+20*4+2,COLOR_GREEN,_WHITE,buf);
-      buf[0]='0'+mal;
-      os_draw_string(x0+20*c+3,y0+20*5+2,COLOR_MAGENTA,_WHITE,buf);
-      //CERR << solution << " " << essai << " " << bien << " " << mal << endl;
-    }
-  }
-  int y=170;
-  int x=os_draw_string_small_(x0,y,"0");
-  draw_filled_circle(x+10,y+10,10,COLOR_BLUE);
-  x=os_draw_string_small_(x+30,y,"1");
-  draw_filled_circle(x+10,y+10,10,COLOR_RED);
-  x=os_draw_string_small_(x+30,y,"2");
-  draw_filled_circle(x+10,y+10,10,COLOR_MAGENTA);
-  x=os_draw_string_small_(x+30,y,"3");
-  draw_filled_circle(x+10,y+10,10,COLOR_GREEN);
-  x=os_draw_string_small_(x+30,y,"4");
-  draw_filled_circle(x+10,y+10,10,COLOR_CYAN);
-  x=os_draw_string_small_(x+30,y,"5");
-  draw_filled_circle(x+10,y+10,10,COLOR_YELLOW);
-  y += 20;
-  // affichage du coup actuel
-  for (int i=0;i<essai.size();++i)
-    draw_filled_circle(x0+20*i+10,y+10,10,mmind_col[essai[i]],true,true,contextptr);
-}    
-  
-int mastermind(GIAC_CONTEXT){
-  // Mastermind
-  vector<int> solution(4),essai;
-  vector< vector<int> > essais;
-  const int nbcouleurs=6;
-  const int nbessais=12;
-  for (int i=0;i<4;++i)
-    solution[i]=giac_rand(contextptr) % nbcouleurs;
-  int i=0,j=0;
-  bool fulldisp=true;
-  for (;;){
-    mastermind_disp(solution,essais,essai,fulldisp,contextptr);
-    // saisie du prochain coup
-    int key=getkey(1);
-    if (key==KEY_SHUTDOWN)
-      return key;
-    fulldisp=false;
-    if (key==KEY_CTRL_MENU)
-      return key;
-    if (key==KEY_PRGM_ACON){
-      fulldisp=true;
-      continue;
-    }
-    if (key>='0' && key<='5'){
-      if (essai.size()==4)
-	continue;
-      essai.push_back(key-'0');
-    }
-    if (key==KEY_CTRL_EXE || key==KEY_CTRL_OK){
-      if (essai.size()==4){
-	if (essai==solution){
-	  char buf[16]; sprint_int(buf,essais.size());
-	  confirm("Vous avez trouve. Essais:",buf);
-	  return i;
-	}
-	fulldisp=true;
-	essais.push_back(essai);
-	essai.clear();
-	if (essais.size()==nbessais){
-	  mastermind_disp(solution,essais,essai,true,contextptr);
-	  for (int i=0;i<solution.size();++i)
-	    draw_filled_circle(30+20*i+10,190+20,10,mmind_col[solution[i]],true,true,contextptr);
-	  confirm("Vous avez perdu.","La solution etait",false,140);
-	  return -1;
-	}
-      }
-    }
-    if (key==KEY_CTRL_DEL){
-      if (!essai.empty())
-	essai.pop_back();
-      continue;
-    }
-  }
-  return 0;
-}
-
-int fractale(GIAC_CONTEXT){
-  freeze=true;
-  int X=320,Y=222,Nmax=10;
-  double d=10;
-  if (inputdouble(lang?"Number of iterations? (default 10)":"Nombre d'iterations? (defaut 10)",d,contextptr) && d>=1 && d<=20)
-    Nmax=d;
-  double w=2.7/X;
-  double h=-1.87/Y;
-  for (int y=0;y<=Y/2;++y){
-    complex<double> c(-2.1,h*y+0.935);
-    for (int x=0;x<X;++x){
-      complex<double> z(0);
-      int j;
-      for (j=0;j<Nmax;++j){
-	z=z*z+c;
-	if (abs(z)>2)
-	  break;
-      }
-      int color=126*j+2079;
-      os_set_pixel(x,y,color);
-      os_set_pixel(x,(Y-y),color);
-      c = c+w;
-    }
-    sync_screen();
-  }
-  statuslinemsg("Ecran fige. Taper EXIT");
-  getkey(1);
-  return 0;
-}
-
-int finance(int mode,GIAC_CONTEXT){ // mode==-1 pret, 1 placement
-  static double pv=(-mode)*10000;
-  static double fv=0;
-  static double ir=3; // % annual
-  static double irpy=12; // per year
-  static double pm=100; // mensualite
-  static double nb=10; // nombre d'annuites
-  double * tabd[6]={&pv,&fv,&ir,&irpy,&pm,&nb};
-  static bool solved=false;
-  Menu smallmenu;
-  smallmenu.numitems=7; 
-  // and uncomment first smallmenuitems[app_number].text="Reserved"
-  // replace by your application name
-  // and add if (smallmenu.selection==app_number-1){ call your code }
-  MenuItem smallmenuitems[smallmenu.numitems];      
-  smallmenu.items=smallmenuitems;
-  smallmenu.height=11;
-  smallmenu.scrollbar=1;
-  smallmenu.scrollout=1;
-  smallmenu.title = (char *) "Pret bancaire";
-  smallmenu.type = MENUTYPE_FKEYS;
-  while(1) {
-    drawRectangle(0,0,LCD_WIDTH_PX,LCD_HEIGHT_PX,_WHITE);
-    string pvs,fvs,pms;
-    if (mode==-1){
-      pvs=((lang==1)?"Somme due actuelle ":"Present due amount ");
-      fvs=((lang==1)?"Somme due future ":"Future due amount "); 
-      pms=((lang==1)?"Mensualite ":"Payment ");
-    } else {
-      pvs=((lang==1)?"Epargne actuelle ":"Present amount ");
-      fvs=((lang==1)?"Epargne future ":"Future amount ");
-      pms=((lang==1)?"Versement mensuel ":"Payment ");
-    }
-    string irs=((lang==1)?"Taux d'interet annuel ":"Annual interest rate ");
-    string irpys=((lang==1)?"Paiements par an ":"Payments per year ");
-    string nbs=((lang==1)?"Nombre d'annees ":"Number of years ");
-    string pvs1=pvs+giac::print_DOUBLE_((-mode)*pv,contextptr),
-      fvs1=fvs+giac::print_DOUBLE_((-mode)*fv,contextptr),
-      irs1=irs+giac::print_DOUBLE_(ir,contextptr)+"%",
-      irpys1=irpys+giac::print_DOUBLE_(irpy,contextptr),
-      pms1=pms+giac::print_DOUBLE_(pm,contextptr),
-      nbs1=nbs+giac::print_DOUBLE_(nb,contextptr);
-    char * tab[6]={(char*)pvs1.c_str(),(char*)fvs1.c_str(), (char*)irs1.c_str(),(char*)irpys1.c_str(), (char*)pms1.c_str(),(char*)nbs1.c_str()};
-    for (int i=0;i<6;i++)
-      smallmenuitems[i].text = tab[i];
-    smallmenuitems[6].text = (char*)((lang==1)?"Quitter ":"Quit ");
-    os_draw_string(0,200,solved?giac::_GREEN:giac::_MAGENTA,_WHITE,"Ans solve|EXE change|Tool help");
-    int sres = doMenu(&smallmenu);
-    if (sres==MENU_RETURN_EXIT)
-      break;
-    int choix=smallmenu.selection-1;
-    if (sres == KEY_CTRL_CATALOG || sres==KEY_BOOK) { // Help
-      xcas::textArea text;
-      text.editable=false;
-      text.clipline=-1;
-      text.title = (char*)((lang==1)?"Calcul d'un pret":"Finance help");
-      text.allowF1=true;
-      text.python=python_compat(contextptr);
-      std::vector<xcas::textElement> & elem=text.elements;
-      elem = std::vector<xcas::textElement> (2);
-      elem[0].s = (lang==1)?"Deplacez le curseur sur une ligne, tapez EXE/OK pour entrer une nouvelle valeur ou tapez sur Ans pour resoudre.":"Move cursor on a line, type EXE/OK to enter a new value or type Ans to solve";
-      elem[0].newLine = 0;
-      if (mode==-1)
-	elem[1].s = (lang==1)?"Par exemple entrez le montant de l'emprunt en 1, 0 en 2, le taux d'interet, le nombre d'annees puis placez le curseur en 5 et tapez Ans.":"For example, enter due amount in 1, 0 in 2, interest rate, number of years then move cursor on 5 and type Ans";
-      else
-	elem[1].s = (lang==1)?"Pour calculer l'evolution d'un placement, entrer le montant place au debut, le taux d'interet, le nombre d'annees, 0 en 5 (paiement) puis deplacez le curseur en 2 et tapez Ans":"";
-      elem[1].newLine = 1;
-      sres=doTextArea(&text,contextptr);
-      continue;
-    }
-    if (sres == KEY_CHAR_ANS){
-      if (choix==3)
-	continue;
-      double t1=std::pow(1+ir/100,1./irpy);
-      double t=t1-1;
-      double & u0=pv;
-      double & un=fv;
-      double & r=pm;
-      double C=r/t;
-      double n=nb*irpy;
-      // un=(1+t)^n*(u0-r/t)+r/t
-      if (choix==0){ // solve for u0=(1+t)^(-n)*(un-r/t)+r/t
-	u0=pow(t1,-n)*(un-C)+C;
-      }
-      if (choix==1){
-	un=pow(t1,n)*(u0-C)+C;
-      }
-      if (choix==2){ // solve for T
-	giac::gen sol=un-pow(1+vx_var,n,contextptr)*(u0-gen(r)/vx_var)-gen(r)/vx_var;
-	sol=giac::_fsolve(makesequence(sol,vx_var,t),contextptr);
-	if (sol.type==_DOUBLE_){
-	  t=sol._DOUBLE_val;
-	  ir=100*(std::pow(1+t,irpy)-1);
-	}
-	else continue;
-      }
-      if (choix==4){ // solve for r=t*(u0*(t+1)**n-un)/((t+1)**n-1)
-	double tmp=pow(t+1,n);
-	r=t*(u0*tmp-un)/(tmp-1);
-      }
-      if (choix==5){ // solve for n=(-ln(t*u0-r)+ln(t*un-r))/ln(t+1)
-	double n=std::log((t*un-r)/(t*u0-r))/std::log(t+1);
-	nb=n/irpy;
-      }
-      solved=true;
-    }
-    if (sres==KEY_CTRL_EXE || sres == MENU_RETURN_SELECTION || sres == KEY_CTRL_OK) {
-      if (smallmenu.selection==7) // quit
-	break;
-      double d=*tabd[choix];
-      if (choix<2 && mode==1) d=-d;
-      if (!inputdouble(tab[choix],d,contextptr))
-	continue;
-      if (choix<2 && mode==1) d=-d;
-      if (choix==3){
-	if (d<1)
-	  d=1;
-	if (d>365)
-	  d=365;
-      }
-      if (choix==5){
-	if (d<=0)
-	  d=1;
-	if (d>365)
-	  d=365;
-      }
-      *tabd[choix]=d;
-      solved=false;
-    }
-  }
-  return 0;
-}
-
-int khicas_addins_menu(GIAC_CONTEXT){
-  Menu smallmenu;
-#ifdef NUMWORKS
-  smallmenu.numitems=10; // INCREMENT IF YOU ADD AN APPLICATION
-#else
-  smallmenu.numitems=9; // INCREMENT IF YOU ADD AN APPLICATION
-#endif  
-  // and uncomment first smallmenuitems[app_number].text="Reserved"
-  // replace by your application name
-  // and add if (smallmenu.selection==app_number-1){ call your code }
-  MenuItem smallmenuitems[smallmenu.numitems];      
-  smallmenu.items=smallmenuitems;
-  smallmenu.height=12;
-  smallmenu.scrollbar=1;
-  smallmenu.scrollout=1;
-  smallmenuitems[0].text = (char*)((lang==1)?"Tableur":"Spreadsheet");
-  smallmenuitems[1].text = (char*)((lang==1)?"Table periodique":"Periodic table");
-  smallmenuitems[2].text = (char*)((lang==1)?"Pret":"Mortgage");
-  smallmenuitems[3].text = (char*)((lang==1)?"Epargne":"TVM");
-  smallmenuitems[4].text = (char*)((lang==1)?"Exemple simple: Syracuse":"Simple example; Syracuse");
-  smallmenuitems[5].text = (char*)((lang==1)?"Exemple de jeu: Mastermind":"Game example: Mastermind");
-  smallmenuitems[6].text = (char*)((lang==1)?"Fractale de Mandelbrot":"Mandelbrot fractal");
-  // smallmenuitems[5].text = (char*)"Mon application"; // adjust numitem !
-  // smallmenuitems[6].text = (char*)"Autre application";
-  // smallmenuitems[7].text = (char*)"Encore une autre";
-  // smallmenuitems[8].text = (char*)"Une avant-derniere";
-  // smallmenuitems[9].text = (char*)"Une derniere";
-#ifdef NUMWORKS
-  smallmenuitems[smallmenu.numitems-3].text = (char*)((lang==1)?"Personnaliser la flash":"Customize flash");
-#endif
-  smallmenuitems[smallmenu.numitems-2].text = (char*)((lang==1)?"Quitter le menu":"Leave menu");
-  smallmenuitems[smallmenu.numitems-1].text = (char*)((lang==1)?"Quitter KhiCAS":"Leave KhiCAS");
-  while(1) {
-    int sres = doMenu(&smallmenu);
-    if(sres == MENU_RETURN_SELECTION || sres==KEY_CTRL_EXE) {
-      if (smallmenu.selection==smallmenu.numitems){
-	return KEY_CTRL_MENU;
-      }
-#ifdef NUMWORKS
-      if (smallmenu.selection==smallmenu.numitems-2)
-	handle_flash(contextptr);
-#endif
-      // Attention les entrees sont decalees de 1
-      if (smallmenu.selection==1) // tableur
-	sheet(contextptr);
-      if (smallmenu.selection==2){ // table periodique
-	const char * name,*symbol;
-	char protons[32],nucleons[32],mass[32],electroneg[32];
-	int res=periodic_table(name,symbol,protons,nucleons,mass,electroneg);
-	if (!res)
-	  continue;
-	char console_buf[64]={0};
-	char * ptr=console_buf;
-	if (res & 1)
-	  ptr=strcpy(ptr,name)+strlen(ptr);
-	if (res & 2){
-	  if (res & 1)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,symbol)+strlen(ptr);
-	}
-	if (res & 4){
-	  if (res&3)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,protons)+strlen(ptr);
-	}
-	if (res & 8){
-	  if (res&7)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,nucleons)+strlen(ptr);
-	}
-	if (res & 16){
-	  if (res&15)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,mass+2)+strlen(ptr);
-	  ptr=strcpy(ptr,"_(g/mol)")+8;
-	}
-	if (res & 32){
-	  if (res&31)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,electroneg+4)+strlen(ptr);
-	}
-	return Console_Input(console_buf);
-      }
-      if (smallmenu.selection==3){
-	finance(-1,contextptr);
-	continue;
-      }
-      if (smallmenu.selection==4){
-	finance(1,contextptr);
-	continue;
-      }
-      if (smallmenu.selection==5){
-	// Exemple simple d'application tierce: la suite de Syracuse
-	// on entre la valeur de u0
-	double d; int i;
-	for (;;){
-	  inputdouble(gettext("Suite de Syracuse. u0?"),d,contextptr);
-	  i=(d);
-	  if (i==d)
-	    break;
-	  confirm(gettext("u0 doit etre entier!"),gettext("Recommencez"));
-	}
-	i=max(i,1);
-	vecteur v(1,i); // initialise une liste avec u0
-	while (i!=1){
-	  if (i%2)
-	    i=3*i+1;
-	  else
-	    i=i/2;
-	  v.push_back(i);
-	}
-	// representation graphique de la liste en appelant la commande Xcas listplot
-	displaygraph(_listplot(v,contextptr),contextptr);
-	// on entre la liste en ligne de commande et on quitte
-	return Console_Input(gen(v).print(contextptr).c_str());
-      }
-      if (smallmenu.selection==6) // mastermind, on ne quitte pas
-	mastermind(contextptr);
-      if (smallmenu.selection==7)
-	fractale(contextptr);
-    } // end sres==menu_selection
-    Console_Disp(1,contextptr);
-    break;
-  } // end endless while
-  return CONSOLE_SUCCEEDED;
-}
-
-/* *******************
- *      FLASH        *
- ********************* */
-#ifdef NUMWORKS
-
-void flash_info(const char * buf,std::vector<fileinfo_t> &v,size_t & first_modif,bool modif,int initpos,GIAC_CONTEXT){
-  Menu smallmenu;
-  smallmenu.numitems=v.size();
-  MenuItem smallmenuitems[smallmenu.numitems];
-  smallmenu.items=smallmenuitems;
-  smallmenu.height=modif?11:12;
-  smallmenu.scrollbar=1;
-  smallmenu.scrollout=1;
-  smallmenu.title = (char*)(lang==1?"Info Flash":"Flash Files");
-  smallmenu.type = MENUTYPE_FKEYS;
-  smallmenu.selection=initpos;
-  if (modif){
-    smallmenu.title = (char*)(lang==1?"Modifier fichiers":"Modify files");
-  }
-  vector<string> vs(v.size());
-  for (int i=0;i<v.size();++i){
-    vs[i]=v[i].filename.c_str();
-    vs[i]+=' ';
-    vs[i]+=print_INT_(v[i].size);
-    smallmenuitems[i].text=(char *)vs[i].c_str();
-    smallmenuitems[i].type = MENUITEM_CHECKBOX;
-    smallmenuitems[i].value= ((v[i].mode/100)&4)==4;
-  }
-  while (1){
-    if (modif){
-      drawRectangle(0,200,LCD_WIDTH_PX,22,giac::_WHITE);
-      os_draw_string(0,200,giac::_WHITE,33333,"Tool: renam | Ans: -/+ | EXE: ok");
-    }
-    int sres = doMenu(&smallmenu);
-    int i=smallmenu.selection-1;
-    if (sres==MENU_RETURN_EXIT){
-      break;
-    }
-    if (modif && sres == KEY_CTRL_CATALOG || sres==KEY_BOOK) { // rename
-      string s=v[i].filename,msg1=(lang==1?"Renommer ":"Rename ")+s;
-      int j=inputline(msg1.c_str(),"",s,false);
-      if (j){
-	v[i].filename=s;
-	vs[i]=v[i].filename.c_str();
-	vs[i]+=' ';
-	vs[i]+=print_INT_(v[i].size);
-	smallmenuitems[i].text=(char *)vs[i].c_str();
-      }
-      continue;
-    }
-    if (sres == MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE) {
-      if (modif){
-	flash_synchronize(buf,v,&first_modif);
-#if defined NUMWORKS && !defined DEVICE
-	// debug
-	file_savetar("file.tar",(char *)buf,tar_totalsize(buf,0));
-#endif
-	break;
-      }
-      string msg1=vs[i];
-      const char * ptr=(buf+v[i].header_offset);
-#ifdef HAVE_TIME_H
-      char tbuf[512];
-      char m[4]={0,0,0,0};
-      strncpy(m,ptr+104,3);
-      string msg2=string("Mode: ")+m;
-      ulonglong ul=fromstring8(ptr+136);
-      if (ul==(ulonglong) -1 || ul<1e8) // timestamp from calculator last reset
-	msg2 += ", RTC " + print_INT_(ul);
-      else {
-	time_t t=ul;
-	tm ts=*localtime(&t);
-	strftime(tbuf, sizeof(tbuf), "%a %Y-%m-%d %H:%M:%S %Z", &ts);
-	msg2 += string(", ")+tbuf;
-      }
-#else
-      string msg2=string("Mode: ")+(ptr+104)+string(" mtime ")+print_INT_(fromstring8(ptr+136));
-#endif
-      confirm(msg1.c_str(),msg2.c_str());
-      continue;
-    }
-    if (sres==KEY_CHAR_ANS){
-      if (i>=0 && i<v.size()){
-	if (modif && i>10){
-	  smallmenuitems[i].value=!smallmenuitems[i].value;
-	  int m=v[i].mode;
-	  if (smallmenuitems[i].value)
-	    m = ((m/100) | 4)*100+(m%100);
-	  else
-	    m = ((m/100) & 3)*100+(m%100);
-	  v[i].mode=m;
-	  if (smallmenuitems[i].value){
-	    // uncheck all files having the same filename
-	    const string & filename=v[i].filename;
-	    for (int j=0;j<v.size();++j){
-	      if (j==i || v[j].filename!=filename)
-		continue;
-	      m=v[j].mode;
-	      m = ((m/100) & 3)*100+(m%100);
-	      v[j].mode=m;
-	      smallmenuitems[j].value=false;
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-void flash_info(const char * buf,size_t & first_modif,bool modif,GIAC_CONTEXT){
-  std::vector<fileinfo_t> v=tar_fileinfo(buf,0);
-  int initpos=1;
-  if (modif)
-    initpos=v.size();
-  flash_info(buf,v,first_modif,modif,initpos,contextptr);
-}
-
-// copy text file from ram scriptstore
-int flash_from_ram(const char * buf,size_t & first_modif,GIAC_CONTEXT){
-  char filename[MAX_FILENAME_SIZE+1];
-  int n=giac_filebrowser(filename,"py",(lang==1?"Choisir fichier a copier":"Select file to copy"),0);
-  if (n==0) return 0;
-  const char * data=read_file(filename);
-  n=flash_adddata(buf,filename,data,strlen(data),0);
-  return n;
-}
-
-void handle_flash(GIAC_CONTEXT){
-  const char flash_fr[]="Cette application, disponible hors mode examen, permet de sauvegarder et gerer des scripts en memoire flash. Elle a besoin de 70K de memoire RAM, lancez-la tout de suite apres avoir ouvert KhiCAS.\nPour eviter une usure trop rapide de la flash, il est conseille de l'utiliser le moins souvent possible et de ne pas vider la corbeille avant que cela ne soit necessaire (ainsi les nouveaux fichiers s'ecriront sur d'autres secteurs).\nL'auteur decline toute responsabilite en cas d'usure prematuree de votre memoire flash.";
-  const char flash_en[]="This app (not available if exam mode is on) lets you save and handle scripts in flash memory. It requires 70K of free RAM, you should run it immediatly after launching KhiCAS.\nIn order to avoid premature wear of your flash, run this app only when required. Don't empty the trash unless it's necessary (that way new files will be written in other sectors).\nThe author declines all responsability in the event of premature wear of your flash memory.";
-  textArea text;
-  text.editable=false;
-  text.clipline=-1;
-  text.title =(lang==1)?"EXIT: annuler, EXE: ok":"EXIT: cancel, EXE: run";
-  add(&text,(lang==1)?flash_fr:flash_en);
-  int key=doTextArea(&text,contextptr);
-  if (key!=1
-#ifdef DEVICE
-      || inexammode()
-#endif
-      )
-    return;
-  text.elements.clear();
-  buf64k=(char *)malloc(1<<16);
-  if (buf64k==0){
-    confirm(lang==1?"Pas assez de memoire RAM.":"RAM Memory full",lang==1?"Purgez et relancez KhiCAS":"Purge and restart KhiCAS");    
-    return;
-  }
-#ifndef NUMWORKS
-  char * freeptr=0;
-  const char * flash_buf=file_gettar_aligned("apps.tar",freeptr);
-#endif
-  Menu smallmenu;
-  smallmenu.numitems=5;
-  MenuItem smallmenuitems[smallmenu.numitems];
-  smallmenu.items=smallmenuitems;
-  smallmenu.height=12;
-  smallmenu.scrollbar=1;
-  smallmenu.scrollout=1;
-  smallmenuitems[0].text = (char*)(lang==1?"Informations flash":"Flash informations");
-  smallmenuitems[1].text = (char*)(lang==1?"Copier RAM->flash":"Copy RAM->flash");
-  smallmenuitems[2].text = (char*)(lang==1?"Modifier infos fichiers":"Modify file infos");
-  smallmenuitems[3].text = (char*)(lang==1?"Vider la corbeille":"Empty trash");
-  smallmenuitems[4].text = (char*)(lang==1?"Quitter":"Leave");
-  while (1){
-    size_t first_modif=tar_totalsize(flash_buf,numworks_maxtarsize);
-    string title=(lang==1?"Flash libre ":"Free flash ");
-    title += print_INT_(numworks_maxtarsize-first_modif);
-    smallmenu.title = (char*)title.c_str();
-    smallmenu.selection = 1;
-    int sres = doMenu(&smallmenu);
-    if (sres==MENU_RETURN_EXIT){
-      break;
-    } 
-    if (sres == MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE) {
-      if (smallmenu.selection == smallmenu.numitems)
-	break;
-      if (smallmenu.selection == 1){
-	flash_info(flash_buf,first_modif,false,contextptr); // info only, no erase
-	continue;
-      }
-      if (smallmenu.selection == 2){
-	if (flash_from_ram(flash_buf,first_modif,contextptr)){
-	  // uncheck files having the same filename
-	  std::vector<fileinfo_t> v=tar_fileinfo(flash_buf,0);
-	  int n=v.size();
-	  if (n){
-	    --n;
-	    string & filename=v[n].filename;
-	    int modif=0;
-	    for (int j=0;j<n;++j){
-	      if ( v[j].filename!=filename)
-		continue;
-	      modif++;
-	      int m=v[j].mode;
-	      m = ((m/100) & 3)*100+(m%100);
-	      v[j].mode=m;
-	    }
-	    if (modif)
-	      flash_info(flash_buf,v,first_modif,true,v.size(),contextptr);
-	  }
-	}
-	continue;
-      }
-      if (smallmenu.selection == 3){
-	flash_info(flash_buf,first_modif,true,contextptr); // erase files
-	continue;
-      }
-      if (smallmenu.selection==4){
-	if (numworks_maxtarsize-first_modif>65536 && do_confirm(lang==1?"Il reste de la place, etes-vous sur?":"There's still room, are you sure?"))
-	  flash_emptytrash(flash_buf,&first_modif);
-      }
-    }
-  }
-  free(buf64k);
-#ifndef DEVICE
-  //free(freeptr);
-#endif
-}
-#else
-void handle_flash(GIAC_CONTEXT){
-  
-}
-#endif
-
-/* **************************
-   * SPREADSHEET CODE       *
-   ************************** */
-const int row_height=20;
-const int col_width=60;
-string printcell(int i,int j){
-  string s="";
-  s+=('A'+j);
-  s+=print_INT_(i);
-  return s;
-}
-string printsel(int r,int c,int R,int C){
-  return printcell(r,c)+":"+printcell(R,C);
-}
-
-void change_undo(tableur & t){
-  t.undo=t.m;
-  t.changed=true;
-}
-
-void save_sheet(tableur & t,GIAC_CONTEXT){
-#if 1
-  string s=print_tableur(t,contextptr);
-#else
-  string s=gen(extractmatricefromsheet(t.m,false),_SPREAD__VECT).print(contextptr);
-#endif
-  string filename(remove_path(remove_extension(t.filename)));
-  filename+=".tab";
-#ifdef NSPIRE_NEWLIB
-  filename+=".tns";
-#endif
-  write_file(filename.c_str(),s.c_str(),s.size());
-}
-void sheet_status(tableur & t,GIAC_CONTEXT){
-  string st;
-  if (python_compat(contextptr))
-    st="tabl Py ";
-  else
-    st="tabl Xcas ";
-  if (t.var.type==_IDNT)
-    st += t.var.print(contextptr);
-  else
-    st += "<>";
-  st += ' ';
-  st += t.filename ;
-  st += " R";
-  st += print_INT_(t.nrows);
-  st += " C";
-  st += print_INT_(t.ncols);
-  if (t.changed)
-    st += " *";
-  else
-    st += " -";
-  if (t.sel_row_begin>=0)
-    st += (lang==1)?" esc: annule selection":" esc: cancel selection";
-  else {
-    if (t.cmd_row>=0)
-      st += (lang==1)?" esc: annule ligne cmd":" esc: cancel cmdline";
-  }
-  statuslinemsg(st.c_str());
-}
-bool sheet_display(tableur &t,GIAC_CONTEXT){
-  int disp_rows=LCD_HEIGHT_PX/row_height-3;
-  int disp_cols=LCD_WIDTH_PX/(col_width+4)-1;
-  if (t.disp_row_begin>t.cur_row)
-    t.disp_row_begin=t.cur_row;
-  if (t.disp_row_begin<t.cur_row-disp_rows+1)
-    t.disp_row_begin=t.cur_row-disp_rows+1;
-  if (t.disp_col_begin>t.cur_col)
-    t.disp_col_begin=t.cur_col;
-  if (t.disp_col_begin<t.cur_col-disp_cols+1)
-    t.disp_col_begin=t.cur_col-disp_cols+1;
-  int I=giacmin(giacmin(t.nrows,t.m.size()),t.disp_row_begin+disp_rows);
-  bool has_sel=t.sel_row_begin>=0 && t.sel_row_begin<t.nrows;
-  int sel_r=t.sel_row_begin,sel_R=t.cur_row,sel_c=t.sel_col_begin,sel_C=t.cur_col;
-  if (sel_r>sel_R)
-    swapint(sel_r,sel_R);
-  if (sel_c>sel_C)
-    swapint(sel_c,sel_C);
-  bool has_cmd=t.cmd_row>=0 && t.cmd_row<t.nrows;
-  waitforvblank();
-  drawRectangle(0,0,LCD_WIDTH_PX,row_height,_WHITE); // clear column indices row
-  string s;
-  if (has_sel)
-    s=printsel(sel_r,sel_c,sel_R,sel_C);
-  else
-    s=printcell(t.cur_row,t.cur_col);
-  os_draw_string(2,1,_BLACK,_WHITE,s.c_str(),false);
-  int y=row_height;
-  int x=col_width;
-  int J=giacmin(t.ncols,t.disp_col_begin+disp_cols);
-  for (int j=t.disp_col_begin;j<J;++j){
-    draw_line(x,0,x,row_height,_BLACK);
-    char colname[3]="A"; 
-    if (j>=26){ // if we accept more than 26 cols
-      colname[0] += j/26;
-      colname[1] = 'A'+(j%26);
-      colname[2]=0;
-    }
-    else
-      colname[0] += (j % 26);
-    os_draw_string(x+col_width/2-4,2,_BLACK,_WHITE,colname);
-    x+=col_width+4;
-  }
-  int waitn=2;
-  for (int i=t.disp_row_begin;i<I;++i){
-    if ( (i-t.disp_row_begin) % waitn==waitn-1)
-      waitforvblank();
-    drawRectangle(0,y,LCD_WIDTH_PX,row_height,_WHITE); // clear current row
-    // draw_line(0,y,LCD_WIDTH_PX,y,_BLACK);
-    os_draw_string(4,y,_BLACK,_WHITE,print_INT_(i).c_str()); // row number
-    gen g=t.m[i];
-    if (g.type!=_VECT)
-      return false;
-    vecteur & v=*g._VECTptr;
-    int J=giacmin(t.ncols,v.size());
-    J=giacmin(J,t.disp_col_begin+disp_cols);
-    x=col_width;
-    for (int j=t.disp_col_begin;j<J;++j){
-      draw_line(x,y,x,y+row_height,_BLACK);
-      gen vj=v[j];
-      if (vj.type<_IDNT)
-	vj=makevecteur(vj,vj,0);
-      if (vj.type==_VECT && vj._VECTptr->size()==3){
-	bool iscur=i==t.cur_row && j==t.cur_col;
-	string s;
-	if (iscur){
-	  if (!has_cmd)
-	    t.cmdline=(*vj._VECTptr)[0].print(contextptr);
-	}
-	bool rev=has_sel?(sel_r<=i && i<=sel_R && sel_c<=j && j<=sel_C):iscur;
-	if (rev)
-	  drawRectangle(x+1,y,col_width+4,row_height,color_gris);	  
-	s=(*vj._VECTptr)[1].print(contextptr);
-	int dx=os_draw_string(0,0,0,0,s.c_str(),true); // find width
-	if (dx<col_width)
-	  os_draw_string(x+2,y,_BLACK,rev?color_gris:_WHITE,s.c_str(),false); // draw
-	else {
-	  if (iscur && !has_sel && t.cmd_row<0)
-	    statuslinemsg(s.c_str());
-	  s=s.substr(0,8)+"...";
-	  os_draw_string_small(x+2,y,_BLACK,rev?color_gris:_WHITE,s.c_str(),false); // draw
-	}
-      }
-      x+=col_width+4;
-    }
-    draw_line(0,y,LCD_WIDTH_PX,y,_BLACK);
-    y+=row_height;
-  }
-  waitforvblank();
-  drawRectangle(0,y,LCD_WIDTH_PX,LCD_HEIGHT_PX-y,_WHITE); // clear cmdline
-  draw_line(0,y,LCD_WIDTH_PX,y,_BLACK);
-  // commandline
-  int p=python_compat(contextptr); python_compat(0,contextptr);
-  int xpe=xcas_python_eval; xcas_python_eval=0;
-  s=t.cmdline;
-  int dx=os_draw_string(0,0,0,0,s.c_str(),true),xend=2; // find width
-  bool small=t.keytooltip || dx>=LCD_WIDTH_PX-50;
-  int sheety=LCD_HEIGHT_PX-2*row_height,xtooltip=0;
-  if (t.cmd_row>=0 && t.cmd_pos>=0 && t.cmd_pos<=s.size()){
-    xend=os_draw_string(xend,sheety,_BLUE,_WHITE,printcell(t.cmd_row,t.cmd_col).c_str())+5;
-    string s1=s.substr(0,t.cmd_pos);
-#if 1
-    xtooltip=xend=print_color(xend,sheety,s1.c_str(),_BLACK,false,small,contextptr);
-#else
-    if (small)
-      xend=os_draw_string_small(xend,sheety,_BLACK,_WHITE,s1.c_str(),false);
-    else
-      xend=os_draw_string(xend,sheety,_BLACK,_WHITE,s1.c_str(),false);
-#endif
-    drawRectangle(xend+1,sheety+2,2,small?10:13,_BLACK);
-    xend+=4;
-    s=s.substr(t.cmd_pos,s.size()-t.cmd_pos);
-    if (has_sel){
-      s1=printsel(sel_r,sel_c,sel_R,sel_C);
-      xend=os_draw_string_small(xend,sheety,_BLACK,color_gris,s1.c_str(),false);
-    }
-    else {
-      if (t.cmd_row!=t.cur_row || t.cmd_col!=t.cur_col)
-	xend=os_draw_string_small(xend,sheety,_BLACK,color_gris,printcell(t.cur_row,t.cur_col).c_str(),false);
-    }
-  } // end cmdline active
-  else
-    xend=os_draw_string(xend,sheety,_BLACK,_WHITE,printcell(t.cur_row,t.cur_col).c_str())+5;    
-  int bg=t.cmd_row>=0?_WHITE:57051;
-#if 1
-    xend=print_color(xend,sheety,s.c_str(),_BLACK,false,small,contextptr);
-#else
-  if (small)
-    xend=os_draw_string_small(xend,sheety,_BLACK,bg,s.c_str(),false);
-  else
-    xend=os_draw_string(xend,sheety,_BLACK,bg,s.c_str(),false);
-#endif
-  if (t.keytooltip)
-    t.keytooltip=tooltip(xtooltip,sheety,t.cmd_pos,t.cmdline.c_str(),contextptr);
-  python_compat(p,contextptr); xcas_python_eval=xpe;
-  // fast menus
-  string menu("shift-1 stat1d|2 2d|3 seq|4 edit|5 view|6 graph|7 R|8 list| ");
-  bg=65039;// bg=52832;
-  drawRectangle(0,205,LCD_WIDTH_PX,17,bg);
-  os_draw_string_small(0,205,_BLACK,bg,menu.c_str());
-  return true;
-}
-
-void activate_cmdline(tableur & t){
-  if (t.cmd_row==-1){
-    t.cmd_row=t.cur_row;
-    t.cmd_col=t.cur_col;
-    t.cmd_pos=t.cmdline.size();
-  }
-}
-
-bool sheet_eval(tableur & t,GIAC_CONTEXT,bool ckrecompute=true){
-  t.changed=true;
-  if (!ckrecompute || t.recompute)
-    spread_eval(t.m,contextptr);
-  return true;
-}
-
-void copy_right(tableur & t,GIAC_CONTEXT){
-  int R=t.cur_row,C=t.cur_col,c=t.ncols;
-  vecteur v=*t.m[R]._VECTptr;
-  gen g=v[C];
-  for (int i=C+1;i<c;++i){
-    v[i]=freecopy(g);
-  }
-  t.m[R]=v;
-  sheet_eval(t,contextptr,true);
-}
-
-void copy_down(tableur & t,GIAC_CONTEXT){
-  int R=t.cur_row,C=t.cur_col,r=giacmin(t.nrows,t.m.size());
-  gen g=t.m[R][C];
-  for (int i=R+1;i<r;++i){
-    vecteur v=*t.m[i]._VECTptr;
-    v[C]=freecopy(g);
-    t.m[i]=v;
-  }
-  sheet_eval(t,contextptr,true);
-}
-
-void paste(tableur & t,const matrice & m,GIAC_CONTEXT){
-  int r=t.cur_row,c=t.cur_col,R=t.nrows,C=t.ncols;
-  int dr=t.clip.size(),dc=0;
-  if (r+dr>R)
-    dr=R-r;
-  if (dr && ckmatrix(m,true)){
-    dc=m.front()._VECTptr->size();
-    if (c+dc>C)
-      dc=C-c;
-    if (dc){
-      for (int i=0;i<dr;++i){
-	const vecteur & w=*m[i]._VECTptr;
-	vecteur v=*t.m[r+i]._VECTptr;
-	for (int j=0;j<dc;++j)
-	  v[c+j]=w[j];
-	t.m[r+i]=v;
-      }
-    }
-  }
-  sheet_eval(t,contextptr,true);
-}
-
-void paste(tableur & t,GIAC_CONTEXT){
-  paste(t,t.clip,contextptr);
-}
-
-void sheet_pntv(const vecteur & v,vecteur & res);
-void sheet_pnt(const gen & g,vecteur & res){
-  if (g.type==_VECT)
-    sheet_pntv(*g._VECTptr,res);
-  if (g.is_symb_of_sommet(at_pnt))
-    res.push_back(g);
-}
-
-void sheet_pntv(const vecteur & v,vecteur & res){
-  for (int i=0;i<v.size();++i){
-    sheet_pnt(v[i],res);
-  }
-}
-
-void resizesheet(tableur &t){
-  int cur_r=t.m.size(),cur_c=t.m.front()._VECTptr->size(),nr=t.nrows,nc=t.ncols;
-  if (nr!=cur_r || nc!=cur_c){
-    if (do_confirm(((lang==1?"Redimensionner ":"Resize ")+print_INT_(cur_r)+"x"+print_INT_(cur_c)+"->"+print_INT_(nr)+"x"+print_INT_(nc)).c_str())){
-      vecteur fill(3,0);
-      if (nr<cur_r) // erase rows
-	t.m.resize(nr);
-      else {
-	for (;cur_r<nr;++cur_r){
-	  vecteur tmp;
-	  for (int j=0;j<nc;++j)
-	    tmp.push_back(freecopy(fill));
-	  t.m.push_back(tmp);
-	}
-      }
-      for (int i=0;i<nr;++i){
-	vecteur & v=*t.m[i]._VECTptr;
-	int cur_c=v.size();
-	if (nc<cur_c){
-	  t.m[i]=vecteur(v.begin(),v.begin()+nc);
-	}
-	else {
-	  for (;cur_c<nc;++cur_c)
-	    v.push_back(freecopy(fill));
-	}
-      }
-      t.cur_row=giacmin(t.cur_row,t.nrows);
-      t.cur_col=giacmin(t.cur_col,t.ncols);
-      t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-    } // end confirmed table resize
-    else {
-      t.nrows=cur_r;
-      t.ncols=cur_c;
-    }
-  }  
-}
-
-void sheet_menu_setup(tableur & t,GIAC_CONTEXT){
-  Menu smallmenu;
-  smallmenu.numitems=7;
-  MenuItem smallmenuitems[smallmenu.numitems];
-  smallmenu.items=smallmenuitems;
-  smallmenu.height=12;
-  smallmenu.scrollbar=1;
-  smallmenu.scrollout=1;
-  smallmenu.title = (char*)(lang==1?"Configuration tableur":"Sheet config");
-  smallmenuitems[3].type = MENUITEM_CHECKBOX;
-  smallmenuitems[3].text = (char*)"Reeval";
-  smallmenuitems[4].type = MENUITEM_CHECKBOX;
-  smallmenuitems[4].text = (char*)(lang==1?"Matrice: remplir cellules":"Matrix: fill cells");
-  smallmenuitems[5].type = MENUITEM_CHECKBOX;
-  smallmenuitems[5].text = (char*)(lang==1?"Deplacement vers le bas":"Move down");
-  smallmenuitems[smallmenu.numitems-1].text = (char*) "Quit";
-  while(1) {
-    string dig("Digits (in Xcas): ");
-    dig += print_INT_(decimal_digits(contextptr));
-    smallmenuitems[0].text = (char*)dig.c_str();
-    string nrows((lang==1?"Lignes ":"Rows ")+print_INT_(t.nrows));
-    smallmenuitems[1].text = (char*)nrows.c_str();
-    string ncols((lang==1?"Colonnes ":"Cols ")+print_INT_(t.ncols));
-    smallmenuitems[2].text = (char*)ncols.c_str();
-    smallmenuitems[3].value = t.recompute;
-    smallmenuitems[4].value = t.matrix_fill_cells;
-    smallmenuitems[5].value = t.movedown;
-    int sres = doMenu(&smallmenu);
-    if (sres==MENU_RETURN_EXIT){
-      resizesheet(t);
-      break;
-    }
-    if (sres == MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE) {
-      if (smallmenu.selection == 1){
-	double d=decimal_digits(contextptr);
-	if (inputdouble("Nombre de digits?",d,contextptr) && d==int(d) && d>0){
-	  decimal_digits(d,contextptr);
-	}
-	continue;
-      }
-      if (smallmenu.selection == 2){
-	double d=t.nrows;
-	if (inputdouble((lang==1?"Nombre de lignes?":"Rows?"),d,contextptr) && d==int(d) && d>0){
-	  t.nrows=d;
-	}
-	continue;
-      }
-      if (smallmenu.selection == 3){
-	double d=t.ncols;
-	if (inputdouble((lang==1?"Nombre de colonnes?":"Colonnes?"),d,contextptr) && d==int(d) && d>0){
-	  t.ncols=d;
-	}
-	continue;
-      }
-      if (smallmenu.selection == 4){
-	t.recompute=!t.recompute;
-	continue;
-      }
-      if (smallmenu.selection==5){
-	t.matrix_fill_cells=!t.matrix_fill_cells;
-	continue;
-      }
-      if (smallmenu.selection == 6){
-	t.movedown=!t.movedown;
-	continue;
-      }
-      if (smallmenu.selection == smallmenu.numitems){
-	change_undo(t);
-	resizesheet(t);
-	break;
-      }	
-    }      
-  } // end endless while
-}
-
-void sheet_graph(tableur &t,GIAC_CONTEXT){
-  vecteur v;
-  sheet_pnt(t.m,v);
-  gen g(v);
-  check_do_graph(g,2,contextptr);
-}
-
-int sheet_menu_menu(tableur & t,GIAC_CONTEXT){
-  t.cmd_row=-1; t.cmd_pos=-1; t.sel_row_begin=-1;
-  Menu smallmenu;
-  smallmenu.numitems=14;
-  MenuItem smallmenuitems[smallmenu.numitems];
-  smallmenu.items=smallmenuitems;
-  smallmenu.height=12;
-  //smallmenu.width=24;
-  smallmenu.scrollbar=1;
-  smallmenu.scrollout=1;
-#ifdef NUMWORKS
-  smallmenu.title = (char*)(lang==1?"Back: annule menu tableur":"Back: cancel sheet menu");
-#else
-  smallmenu.title = (char*)(lang==1?"Esc: annule menu tableur":"Esc: cancel sheet menu");
-#endif
-  smallmenuitems[0].text = (char *)(lang==1?"Sauvegarde tableur (shift sto)":"Save sheet (shift sto)");
-  smallmenuitems[1].text = (char *)(lang==1?"Sauvegarder tableur comme":"Save sheet as");
-  if (nspire_exam_mode==2) smallmenuitems[1].text=smallmenuitems[0].text = (char*)(lang==1?"Sauvegarde desactivee":"Saving disabled");
-  smallmenuitems[2].text = (char*)(lang==1?"Charger":"Load");
-  string cell=(lang==1?"Editer cellule ":"Edit cell ")+printcell(t.cur_row,t.cur_col);
-  smallmenuitems[3].text = (char*)cell.c_str();
-  smallmenuitems[4].text = (char*)(lang==1?"Voir graphique (shift 6)":"View graph (shift 4)");
-#ifdef NUMWORKS
-  smallmenuitems[5].text = (char*)(lang==1?"Copie vers le bas (shift 4)":"Copy down (shift 7)");
-  smallmenuitems[6].text = (char*)(lang==1?"Copie vers droite (shift 4)":"Copy right (shift 7)");
-#else
-  smallmenuitems[5].text = (char*)(lang==1?"Copier vers le bas (ctrl D)":"Copy down (ctrl D)");
-  smallmenuitems[6].text = (char*)(lang==1?"Copier vers la droite (ctrl R)":"Copy right (ctrl R)");
-#endif
-  smallmenuitems[7].text = (char*)(lang==1?"Inserer une ligne":"Insert row");
-  smallmenuitems[8].text = (char*)(lang==1?"Inserer une colonne":"Insert column");
-  smallmenuitems[9].text = (char*)(lang==1?"Effacer ligne courante":"Remove current row");
-  smallmenuitems[10].text = (char*)(lang==1?"Effacer colonne courante":"Remove current column");
-  smallmenuitems[11].text = (char*)(lang==1?"Remplir le tableau de 0":"Fill sheet with 0");
-  smallmenuitems[smallmenu.numitems-2].text = (char*) "Config";
-  smallmenuitems[smallmenu.numitems-1].text = (char*) (lang==1?"Quitter tableur":"Leave sheet");
-  while(1) {
-    int sres = doMenu(&smallmenu);
-    if (sres==MENU_RETURN_EXIT)
-      return -1;
-    if (sres == MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE) {
-      if (smallmenu.selection == 1){
-	// save
-	save_sheet(t,contextptr);
-	return -1;
-      }
-      if (smallmenu.selection == 2 ){
-	// save
-	char buf[270];
-	if (get_filename(buf,".tab")){
-	  t.filename=remove_path(remove_extension(buf));
-	  save_sheet(t,contextptr);
-	  return -1;
-	}
-      }
-      if (smallmenu.selection== 3 && !exam_mode) {
-	char filename[128];
-	if (giac_filebrowser(filename,"tab",(lang==1?"Fichiers tableurs":"Sheet files"),2)){
-	  if (t.changed && do_confirm(lang==1?"Sauvegarder le tableur actuel?":"Save current sheet?"))
-	    save_sheet(t,contextptr);
-	  const char * s=read_file(filename);
-	  if (s){
-	    gen g(s,contextptr);
-	    g=eval(g,1,contextptr);
-	    if (ckmatrix(g,true)){
-	      t.filename=filename;
-	      t.m=*g._VECTptr;
-	      t.nrows=t.m.size();
-	      t.ncols=t.m.front()._VECTptr->size();
-	      t.cur_col=t.cur_row=0;
-	      t.sel_row_begin=t.cmd_row=-1;
-	      fix_sheet(t,contextptr);
-	    }
-	    else
-	      s=0;
-	  }
-	  if (!s)
-	    do_confirm(lang==1?"Erreur de lecture du fichier":"Error reading file");
-	}
-	return -1;
-      } // end load
-      if (smallmenu.selection==4){
-	activate_cmdline(t);
-	t.cmd_pos=t.cmdline.size();
-	return -1;
-      }
-      if (smallmenu.selection==5){
-	sheet_graph(t,contextptr);
-	return -1;
-      }
-      if (smallmenu.selection==6){
-	t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	copy_down(t,contextptr);
-	return -1;
-      }
-      if (smallmenu.selection==7){
-	t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	copy_right(t,contextptr);
-	return -1;
-      }
-      if (smallmenu.selection==8){
-	t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	change_undo(t);
-	t.m=matrice_insert(t.m,t.cur_row,t.cur_col,1,0,makevecteur(0,0,2),contextptr);
-	t.nrows++;
-	return -1;
-      }
-      if (smallmenu.selection==9){
-	t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	change_undo(t);
-	t.m=matrice_insert(t.m,t.cur_row,t.cur_col,0,1,makevecteur(0,0,2),contextptr);
-	t.ncols++;
-	return -1;
-      }
-      if (smallmenu.selection==10 && t.nrows>=2){
-	t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	change_undo(t);
-	t.m=matrice_erase(t.m,t.cur_row,t.cur_col,1,0,contextptr);
-	--t.nrows;
-	return -1;
-      }
-      if (smallmenu.selection==11 && t.ncols>=2){
-	t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	change_undo(t);
-	t.m=matrice_erase(t.m,t.cur_row,t.cur_col,0,1,contextptr);
-	--t.ncols;
-	return -1;
-      }
-      if (smallmenu.selection==12){
-	t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	change_undo(t);
-	gen g=vecteur(t.ncols);
-	t.m=makefreematrice(vecteur(t.nrows,g));
-	makespreadsheetmatrice(t.m,contextptr);
-	return -1;
-      }
-      if (smallmenu.selection == smallmenu.numitems-1){
-	sheet_menu_setup(t,contextptr);
-	continue;
-      }
-      if (smallmenu.selection == smallmenu.numitems){
-	return 0;
-      }
-    }
-  } // end endless while
-  return 1;
-}
-
-bool is_empty_cell(const gen & g){
-  if (g.type==_VECT) return is_zero(g[0]);
-  return is_zero(g);
-}
-
-void sheet_cmd(tableur & t,const char * ans){
-  string s=ans; 
-  if (t.sel_row_begin>=0){
-    t.cmdline="";
-    s="="+s+"matrix("+print_INT_(absint(t.sel_row_begin-t.cur_row)+1)+","+print_INT_(absint(t.sel_col_begin-t.cur_col)+1)+","+printsel(t.sel_row_begin,t.sel_col_begin,t.cur_row,t.cur_col)+")";
-    if (t.cur_row<t.sel_row_begin)
-      t.cur_row=t.sel_row_begin;
-    t.sel_row_begin=-1;
-    if (t.cur_col<t.sel_col_begin)
-      t.cur_col=t.sel_col_begin;
-    int i,j=t.cur_col;
-    // find empty cell in next rows
-    for (i=t.cur_row+1;i<t.nrows;++i){
-      if (is_empty_cell(t.m[i][t.cur_col]))
-	break;
-    }
-    if (i==t.nrows){
-      // find an empty cell in next columns
-      for (j=t.cur_col+1;j<t.ncols;++j){
-	for (i=0;i<t.nrows;++i){
-	  if (is_empty_cell(t.m[i][j]))
-	    break;
-	}
-	if (i<t.nrows)
-	  break;
-      }
-    }
-    if (i<t.nrows && j<t.ncols){
-      t.cur_row=i;
-      t.cur_col=j;
-    }
-    else {
-      do_confirm((lang==1?"Impossible de trouver une cellule libre":"Could not find an empty cell"));
-      return;
-    }
-  }
-  activate_cmdline(t);
-  insert(t.cmdline,t.cmd_pos,s.c_str());
-  t.cmd_pos += s.size();
-  t.keytooltip=true;
-}
-
-void sheet_cmdline(tableur &t,GIAC_CONTEXT){
-  gen g(t.cmdline,contextptr);
-  change_undo(t);
-  bool doit=true;
-  bool tableseq=g.is_symb_of_sommet(at_tableseq);
-  bool tablefunc=g.is_symb_of_sommet(at_tablefunc);
-  if (tableseq || t.matrix_fill_cells){
-    set_abort();
-    gen g1=protecteval(g,1,contextptr);
-    clear_abort();
-    if (g1.type==_VECT){
-      doit=false;
-      matrice & m=*g1._VECTptr;
-      if (!ckmatrix(m) && t.movedown)
-	m=mtran(vecteur(1,m));
-      matrice clip=t.clip;
-      makespreadsheetmatrice(m,contextptr);
-      t.clip=m;
-      paste(t,contextptr);
-      t.clip=clip;
-      if (tableseq && t.cur_row+4<t.nrows){
-	t.cur_row += 4;
-	copy_down(t,contextptr);
-      }
-      if (tablefunc && t.cur_row+3<t.nrows && t.cur_col+1<t.ncols){
-	t.cur_row += 3;
-	copy_down(t,contextptr);
-	t.cur_col++;
-	copy_down(t,contextptr);
-      }
-    }
-  }
-  if (doit) {
-    if (t.cmd_row<t.m.size()){
-      gen v=t.m[t.cmd_row];
-      if (v.type==_VECT && t.cmd_col>=0 && t.cmd_col<v._VECTptr->size()){
-	vecteur w=*v._VECTptr;
-	g=spread_convert(g,t.cur_row,t.cur_col,contextptr);
-	w[t.cmd_col]=makevecteur(g,g,0);
-	t.m[t.cmd_row]=w;
-	sheet_eval(t,contextptr,true);
-      }
-    }
-  }
-  t.cur_row=t.cmd_row;
-  t.cur_col=t.cmd_col;
-  t.cmd_row=-1;
-  t.cmd_pos=-1;
-  if (t.movedown){
-    ++t.cur_row;
-    if (t.cur_row>=t.nrows){
-      t.cur_row=0;
-      ++t.cur_col;
-      if (t.cur_col>=t.ncols)
-	t.cur_col=0;
-    }
-  }
-  else {
-    ++t.cur_col;
-    if (t.cur_col>=t.ncols){
-      t.cur_col=0;
-      ++t.cur_row;
-      if (t.cur_row>=t.nrows){
-	t.cur_row=0;
-      }
-    }
-  }
-}
-
-void sheet_help_insert(tableur & t,int exec,GIAC_CONTEXT){
-  int back;
-  string adds=help_insert(t.cmdline.substr(0,t.cmd_pos).c_str(),back,exec,contextptr);
-  if (back>=t.cmd_pos){
-    t.cmdline=t.cmdline.substr(0,t.cmd_pos-back)+t.cmdline.substr(t.cmd_pos,t.cmdline.size()-t.cmd_pos);
-    t.cmd_pos-=back;
-  }
-  if (!adds.empty())
-    sheet_cmd(t,adds.c_str());
-}
-
-giac::gen sheet(GIAC_CONTEXT){
-  if (!sheetptr)
-    sheetptr=new_tableur(contextptr);
-  tableur & t=*sheetptr;
-  bool status_freeze=false;
-  t.keytooltip=false;
-  for (;;){
-    int R=t.cur_row,C=t.cur_col;
-    if (t.cmd_row>=0){
-      R=t.cmd_row;
-      C=t.cmd_col;
-    }
-    printcell_current_row(contextptr)=R;
-    printcell_current_col(contextptr)=C;
-    if (!status_freeze)
-      sheet_status(t,contextptr);
-    sheet_display(t,contextptr);
-    int key=getkey(1);
-    if (key==KEY_SHUTDOWN)
-      return key;
-    if (t.keytooltip){
-      t.keytooltip=false;
-      if (key==KEY_CTRL_EXIT)
-	continue;
-      if (key==KEY_CTRL_RIGHT && t.cmd_pos==t.cmdline.size())
-	key=KEY_CTRL_OK;
-      if (key==KEY_CTRL_DOWN || key==KEY_CTRL_VARS)
-	key=KEY_BOOK;
-      if (key==KEY_CTRL_OK || key==KEY_CHAR_ANS){
-	sheet_help_insert(t,key,contextptr);
-	continue;
-      }
-    }
-    status_freeze=false;
-    if (key==KEY_CTRL_SETUP){
-      sheet_menu_setup(t,contextptr);
-      continue;
-    }
-    if (key==KEY_CHAR_STORE && t.cmd_row<0){
-      save_sheet(t,contextptr);
-      continue;
-    }
-    if (key==KEY_CTRL_MENU){
-      if (sheet_menu_menu(t,contextptr)==0)
-	return 0;
-    }
-    if (key==KEY_CTRL_EXIT){
-      if (t.sel_row_begin>=0){
-	t.sel_row_begin=-1;
-	continue;
-      }
-      if (t.cmd_row>=0){
-	bool b= t.cmd_row==t.cur_row && t.cmd_col==t.cur_col;
-	t.cur_row=t.cmd_row;
-	t.cur_col=t.cmd_col;
-	if (b)
-	  t.cmd_row=-1;
-	continue;
-      }
-      if (!t.changed || do_confirm("Quit?"))
-	return 0;
-    }
-    switch (key){
-    case KEY_CTRL_UNDO:
-      std::swap(t.m,t.undo);
-      sheet_eval(t,contextptr);
-      continue;
-    case KEY_CTRL_CLIP:
-      if (t.sel_row_begin<0){
-	t.sel_row_begin=t.cur_row;
-	t.sel_col_begin=t.cur_col;
-      }
-      else {
-	int r=t.cur_row,R=t.sel_row_begin,c=t.cur_col,C=t.sel_col_begin;
-	if (r>R)
-	  swapint(r,R);
-	if (c>C)
-	  swapint(c,C);
-	t.clip=matrice_extract(t.m,r,c,R-r+1,C-c+1);
-	copy_clipboard(gen(extractmatricefromsheet(t.clip)).print(contextptr).c_str(),true);
-	t.sel_row_begin=-1;
-      }
-      continue;
-    case KEY_CTRL_PASTE:
-      paste(t,contextptr);
-      status_freeze=true;
-      continue;
-    case KEY_SELECT_RIGHT:
-      if (t.sel_row_begin<0){
-	t.sel_row_begin=t.cur_row;
-	t.sel_col_begin=t.cur_col;
-      }
-    case KEY_CTRL_RIGHT:
-      if (t.cmd_pos>=0 && t.cmd_row==t.cur_row && t.cmd_col==t.cur_col && t.sel_row_begin==-1){
-	++t.cmd_pos;
-	if (t.cmd_pos>t.cmdline.size())
-	  t.cmd_pos=t.cmdline.size();
-      }
-      else {
-	++t.cur_col;
-	if (t.cur_col>=t.ncols)
-	  t.cur_col=0;
-      }
-      continue;
-    case KEY_SHIFT_RIGHT:
-      if (t.cmd_pos>=0 && t.cmd_row==t.cur_row && t.cmd_col==t.cur_col && t.sel_row_begin==-1){
-	t.cmd_pos=t.cmdline.size();
-      }
-      else 
-	t.cur_col=t.ncols-1;
-      break;
-    case KEY_SELECT_LEFT:
-      if (t.sel_row_begin<0){
-	t.sel_row_begin=t.cur_row;
-	t.sel_col_begin=t.cur_col;
-      }
-    case KEY_CTRL_LEFT:
-      if (t.cmd_pos>=0 && t.cmd_row==t.cur_row && t.cmd_col==t.cur_col && t.sel_row_begin==-1){
-	if (t.cmd_pos>0)
-	  --t.cmd_pos;
-      }
-      else {
-	--t.cur_col;
-	if (t.cur_col<0)
-	  t.cur_col=t.ncols-1;
-      }
-      continue;
-    case KEY_SHIFT_LEFT:
-      if (t.cmd_pos>=0 && t.cmd_row==t.cur_row && t.cmd_col==t.cur_col && t.sel_row_begin==-1){
-	t.cmd_pos=0;
-      }
-      else {
-	t.cur_col=0;
-      }
-      break;
-    case KEY_SELECT_UP:
-      if (t.sel_row_begin<0){
-	t.sel_row_begin=t.cur_row;
-	t.sel_col_begin=t.cur_col;
-      }
-    case KEY_CTRL_UP:
-      --t.cur_row;
-      if (t.cur_row<0)
-	t.cur_row=t.nrows-1;
-      continue;
-    case KEY_SELECT_DOWN:
-      if (t.sel_row_begin<0){
-	t.sel_row_begin=t.cur_row;
-	t.sel_col_begin=t.cur_col;
-      }
-    case KEY_CTRL_DOWN:
-      ++t.cur_row;
-      if (t.cur_row>=t.nrows)
-	t.cur_row=0;
-      continue;
-    case KEY_CTRL_DEL:
-      if (t.cmd_row>=0){
-	if (t.cmd_pos>0){
-	  t.cmdline.erase(t.cmdline.begin()+t.cmd_pos-1);
-	  --t.cmd_pos;
-	  t.keytooltip=true;
-	}
-      }
-      else {
-	t.cmdline="";
-	t.cmd_row=t.cur_row;
-	t.cmd_col=t.cur_col;
-	t.cmd_pos=0;
-      }
-      continue;
-    case KEY_CTRL_EXE:
-#if 1
-      if (t.cmd_row<0){
-	sheet_eval(t,contextptr);
-	continue;
-      }
-#else
-      if (t.cmd_row<0){
-	int r=t.sel_row_begin;
-	if (r<0)
-	  return extractmatricefromsheet(t.m);
-	int R=t.cur_row,c=t.sel_col_begin,C=t.cur_col;
-	if (r>R)
-	  swapint(r,R);
-	if (c>C)
-	  swapint(c,C);
-	return extractmatricefromsheet(matrice_extract(t.m,r,c,R-r+1,C-c+1));
-      }
-#endif
-    case KEY_CTRL_OK:
-      if (t.cmd_row>=0){
-	string s;
-	if (t.sel_row_begin>=0){
-	  s=printsel(t.sel_row_begin,t.sel_col_begin,t.cur_row,t.cur_col);
-	  t.cur_row=t.cmd_row;
-	  t.cur_col=t.cmd_col;
-	  t.sel_row_begin=-1;
-	}
-	if (t.cmd_row!=t.cur_row || t.cmd_col!=t.cur_col){
-	  s=printcell(t.cur_row,t.cur_col);
-	  t.cur_row=t.cmd_row;
-	  t.cur_col=t.cmd_col;
-	}
-	if (s.empty())
-	  sheet_cmdline(t,contextptr);
-	else {
-	  insert(t.cmdline,t.cmd_pos,s.c_str());
-	  t.cmd_pos+=s.size();
-	}
-      } // if t.cmd_row>=0
-      else {
-	t.cmd_row=t.cur_row;
-	t.cmd_col=t.cur_col;
-	t.cmd_pos=t.cmdline.size();
-      }
-      continue;
-    case KEY_CTRL_F5: // view
-      {
-	string value((*t.m[t.cur_row]._VECTptr)[t.cur_col][1].print(contextptr));
-	char buf[1024];
-	strcpy(buf,value.substr(0,1024-1).c_str());
-	textedit(buf,1024-1,contextptr );
-      }
-      continue;
-    case KEY_CTRL_F6: // view graph
-      sheet_graph(t,contextptr);
-      continue;
-    case KEY_CTRL_D: // copy down
-      copy_down(t,contextptr);
-      continue;
-#ifndef NUMWORKS
-    case KEY_CTRL_R:
-      copy_right(t,contextptr);
-      continue;
-#endif
-    case KEY_CTRL_CATALOG: case KEY_BOOK: case '\t':
-      {
-	if (t.cmd_pos>=0)
-	  sheet_help_insert(t,0,contextptr);
-      }
-      continue;
-    } // end switch
-    if ( (key >= KEY_CTRL_F1 && key <= KEY_CTRL_F6) ||
-	  (key >= KEY_CTRL_F7 && key <= KEY_CTRL_F14) 
-	 ){
-      const char tmenu[]= "F1 stat1d\nsum(\nmean(\nstddev(\nmedian(\nhistogram(\nbarplot(\nboxwhisker(\nF2 stat2d\nlinear_regression_plot(\nlogarithmic_regression_plot(\nexponential_regression_plot(\npower_regression_plot(\npolynomial_regression_plot(\nsin_regression_plot(\nscatterplot(\npolygonscatterplot(\nF3 seq\nrange(\nseq(\ntableseq(\nplotseq(\ntablefunc(\nrandvector(\nrandmatrix(\nF4 edt\nedit_cell\nundo\ncopy_down\ncopy_right\ninsert_row\ninsert_col\nerase_row\nerase_col\nF6 graph\nreserved\nF= poly\nproot(\npcoeff(\nquo(\nrem(\ngcd(\negcd(\nresultant(\nGF(\nF: arit\n mod \nirem(\nifactor(\ngcd(\nisprime(\nnextprime(\npowmod(\niegcd(\nF8 list\nmakelist(\nrange(\nseq(\nlen(\nappend(\nranv(\nsort(\napply(\nF; plot\nplot(\nplotseq(\nplotlist(\nplotparam(\nplotpolar(\nplotfield(\nhistogram(\nbarplot(\nF7 real\nexact(\napprox(\nfloor(\nceil(\nround(\nsign(\nmax(\nmin(\nF< prog\n:\n&\n#\nhexprint(\nbinprint(\nf(x):=\ndebug(\npython(\nF> cplx\nabs(\narg(\nre(\nim(\nconj(\ncsolve(\ncfactor(\ncpartfrac(\nF= misc\n!\nrand(\nbinomial(\nnormald(\nexponentiald(\n\\\n % \n\n";
-      const char * s=console_menu(key,(char *)tmenu,0);
-      if (s && strlen(s)){
-	if (strcmp(s,"undo")==0){
-	  t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	  std::swap(t.m,t.undo);
-	  sheet_eval(t,contextptr);
-	  continue;
-	}
-	if (strcmp(s,"copy_down")==0){
-	  t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	  copy_down(t,contextptr);
-	  continue;
-	}
-	if (strcmp(s,"copy_right")==0){
-	  t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	  copy_right(t,contextptr);
-	  continue;
-	}
-	if (strcmp(s,"insert_row")==0){
-	  t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	  change_undo(t);
-	  t.m=matrice_insert(t.m,t.cur_row,t.cur_col,1,0,makevecteur(0,0,2),contextptr);
-	  t.nrows++;
-	  continue;
-	}
-	if (strcmp(s,"insert_col")==0){
-	  t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	  change_undo(t);
-	  t.m=matrice_insert(t.m,t.cur_row,t.cur_col,0,1,makevecteur(0,0,2),contextptr);
-	  t.ncols++;
-	  continue;
-	}
-	if (strcmp(s,"erase_row")==0 && t.nrows>=2){
-	  t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	  change_undo(t);
-	  t.m=matrice_erase(t.m,t.cur_row,t.cur_col,1,0,contextptr);
-	  --t.nrows;
-	  continue;
-	}
-	if (strcmp(s,"erase_col")==0 && t.ncols>=2){
-	  t.cmd_pos=t.cmd_row=t.sel_row_begin=-1;
-	  change_undo(t);
-	  t.m=matrice_erase(t.m,t.cur_row,t.cur_col,0,1,contextptr);
-	  --t.ncols;
-	  continue;
-	}
-	if (strcmp(s,"edit_cell")==0){
-	  if (t.cmd_row<0 && t.sel_row_begin<0){
-	    char buf[1024];
-	    strcpy(buf,t.cmdline.substr(0,1024-1).c_str());
-	    if (textedit(buf,1024-1,contextptr )){
-	      t.cmdline=buf;
-	      t.cmd_row=t.cur_row; t.cmd_col=t.cur_col;
-	      sheet_cmdline(t,contextptr);
-	    }
-	  }
-	  continue;
-	}
-	if (t.cmd_row<0)
-	  t.cmdline="";
-	sheet_cmd(t,s);
-      }
-      continue;
-    }
-    if (key==KEY_CHAR_CROCHETS || key==KEY_CHAR_ACCOLADES){
-      if (t.cmd_row<0)
-	t.cmdline="";
-      activate_cmdline(t);
-      t.cmdline.insert(t.cmdline.begin()+t.cmd_pos,key==KEY_CHAR_CROCHETS?'[':'{');
-      ++t.cmd_pos;
-      t.cmdline.insert(t.cmdline.begin()+t.cmd_pos,key==KEY_CHAR_CROCHETS?']':'}');
-      continue;
-    }
-    if (key>=32 && key<128){
-      if (t.cmd_row<0)
-	t.cmdline="";
-      activate_cmdline(t);
-      t.cmdline.insert(t.cmdline.begin()+t.cmd_pos,char(key));
-      ++t.cmd_pos;
-      t.keytooltip=true;
-      continue;
-    }
-    if (const char * ans=keytostring(key,0,false,contextptr)){
-      if (ans && strlen(ans)){
-	if (t.cmd_row<0)
-	  t.cmdline="";
-	sheet_cmd(t,ans);
-      }
-      continue;
-    }
-    if (key==KEY_CTRL_AC && t.cmd_row>=0){
-      if (t.cmdline=="")
-	t.cmd_row=-1;
-      t.cmdline="";
-      t.cmd_pos=0;
-      continue;
-    }
-    
-  }
-}
-
-
-#endif
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.cc b/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.cc
index 17349dfa6..4781d359e 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.cc
@@ -222,7 +222,7 @@ namespace giac {
       s += char(cur);
       s += " ";
       s += print_INT_(cur);
-      s += " 0x";
+      s += " ";
       s += hexa_print_INT_(cur);
       os_draw_string(0,160,_BLACK,_WHITE,s.c_str());
       os_draw_string(0,180,_BLACK,_WHITE,lang==1?"EXE: copier caractere":"EXE: copy char");
@@ -462,17 +462,15 @@ namespace giac {
 		menuitem[0]='0'+cur;
 		menuitem[1]=' ';
 		menuitem[2]=0;
-		strcpy(menuitem+2,menu->items[curitem].text);
 	      }
 	      else {
 		menuitem[0]=cur>=10?('0'+(cur/10)):' ';
 		menuitem[1]='0'+(cur%10);
 		menuitem[2]=' ';
 		menuitem[3]=0;
-		strcpy(menuitem+3,menu->items[curitem].text);
 	      }
 	    }
-	    //strncat(menuitem, menu->items[curitem].text, 68);
+	    strncat(menuitem, menu->items[curitem].text, 250);
 	    if(menu->items[curitem].type != MENUITEM_SEPARATOR) {
 	      //make sure we have a string big enough to have background when item is selected:          
 	      // MB_ElementCount is used instead of strlen because multibyte chars count as two with strlen, while graphically they are just one char, making fillerRequired become wrong
@@ -983,6 +981,7 @@ namespace giac {
     {"csolve(equation,x)", 0, "Resolution exacte dans C d'une equation en x (ou d'un systeme polynomial).","x^2+x+1=0", 0, CAT_CATEGORY_SOLVE | (CAT_CATEGORY_COMPLEXNUM << 8) | XCAS_ONLY},
     {"cube(A,B,C)", 0, "Cube d'arete AB avec une face dans le plan ABC", "[0,0,0],[1,0,0],[0,1,0]","[0,0,0],[0,2,sqrt(5)/2+3/2],[0,0,1]", CAT_CATEGORY_3D},
     {"curl(u,vars)", 0, "Rotationnel du vecteur u.", "[2*x*y,x*z,y*z],[x,y,z]", 0, CAT_CATEGORY_LINALG | XCAS_ONLY},
+    {"curvature([x(t),y(t)],t,t0)", 0, "Courbure de la courbe parametree [x(t),y(t)] en t0", "[t,t^2],t,1", "[t,t^2],t", CAT_CATEGORY_CALCULUS | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
     {"cyan", "cyan", "Option d'affichage", "#display=cyan", 0, CAT_CATEGORY_PROGCMD},
     {"cylinder(A,v,r,[h])", 0, "Cylindre d'axe A,v de rayon r et de hauteur optionnelle h", "[0,0,0],[0,1,0],2", "[0,0,0],[0,1,0],2,3", CAT_CATEGORY_3D},
     {"debug(f(args))", 0, "Execute la fonction f en mode pas a pas.", 0, 0, CAT_CATEGORY_PROG | XCAS_ONLY},
@@ -1029,6 +1028,7 @@ namespace giac {
     {"float(x)", 0, "Convertit x en nombre approche (flottant).", "pi", 0, CAT_CATEGORY_REAL},
     {"floor(x)", 0, "Partie entiere de x", "pi", 0, CAT_CATEGORY_REAL},
     {"fonction f(x)", "fonction", "Definition de fonction (Xcas). Par exemple\nfonction f(x)\n local y;\ny:=x*x;\nreturn y;\nffonction", 0, 0, CAT_CATEGORY_PROG | XCAS_ONLY},
+    {"frenet([x(t),y(t)],t,t0)", 0, "Courbure, centre de courbure et repere de Frenet de la courbe parametree [x(t),y(t)] en t0", "[t,t^2],t,1", "[t,t^2],t", CAT_CATEGORY_CALCULUS | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
     {"from arit import *", "from arit import *", "Instruction pour utiliser les fonctions d'arithmetique entiere en Python", "#from arit import *", "#import arit", CAT_CATEGORY_ARIT},
     {"from cas import *", "from cas import *", "Permet d'utiliser le calcul formel depuis Python", "#from cas import *", "#import cas", CAT_CATEGORY_ALGEBRA|(CAT_CATEGORY_CALCULUS<<8)},
     {"from cmath import *", "from cmath import *", "Instruction pour utiliser les fonctions de maths sur les complexes (trigo, exponentielle, log, ...) en Python", "#from cmath import *;i=1j", "#import cmath", CAT_CATEGORY_COMPLEXNUM},
@@ -1072,6 +1072,11 @@ namespace giac {
     {"iquo(a,b)", 0, "Quotient euclidien de deux entiers.", "23,13", 0, CAT_CATEGORY_ARIT | XCAS_ONLY},
     {"irem(a,b)", 0,"Reste euclidien de deux entiers", "23,13", 0, CAT_CATEGORY_ARIT | XCAS_ONLY},
     {"isprime(n)", 0, "Renvoie 1 si n est premier, 0 sinon.", "11", "10", CAT_CATEGORY_ARIT},
+  {"is_collinear(A,B,C)", 0, "Renvoie 1 ou 2 si A, B, C sont alignes, 0 sinon.", "1,i,-1", "i,0,-i", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_concyclic(A,B,C,D)", 0, "Renvoie 1 si A, B, C, D sont cocyliques, 0 sinon.", "1,i,-1,-i", "1,i,0,-i", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_element(A,G)", 0, "Renvoie 1 si A appartient a G, 0 sinon.", "point(0),circle(0,1)", "point(i),square(0,1)", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_parallel(D,E)", 0, "Renvoie 1 si D et E sont paralleles, 0 sinon.", "line(y=x),line(y=-x)", "line(y=x),line(y=x+1)", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_perpendicular(D,E)", 0, "Renvoie 1 si D et E sont perpendiculaires, 0 sinon.", "line(y=x),line(y=-x)", "line(y=x),line(y=x+1)", CAT_CATEGORY_2D | XCAS_ONLY },
     {"jordan(A)", 0, "Forme normale de Jordan de la matrice A, renvoie P et D tels que P^-1*A*P=D", "[[1,2],[3,4]]", "[[1,1,-1,2,-1],[2,0,1,-4,-1],[0,1,1,1,1],[0,1,2,0,1],[0,0,-3,3,-1]]", CAT_CATEGORY_MATRIX | XCAS_ONLY},
     {"laguerre(n,a,x)", 0, "n-ieme polynome de Laguerre (a=0 par defaut).", "10", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
     {"laplace(f,x,s)", 0, "Transformee de Laplace de f","sin(x),x,s", 0, CAT_CATEGORY_CALCULUS | XCAS_ONLY},
@@ -1110,6 +1115,7 @@ namespace giac {
     {"numer(x)", 0, "Numerateur de x.", "3/4", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
     {"octahedron(A,B,C)", 0, "Octaedre d'arete AB avec une face dans le plan ABC", "[0,0,0],[3,0,0],[0,1,0]", 0, CAT_CATEGORY_3D},
     {"odesolve(f(t,y),[t,y],[t0,y0],t1)", 0, "Solution approchee d'equation differentielle y'=f(t,y) et y(t0)=y0, valeur en t1 (ajouter curve pour les valeurs intermediaires de y)", "sin(t*y),[t,y],[0,1],2", "0..pi,(t,v)->{[-v[1],v[0]]},[0,1]", CAT_CATEGORY_SOLVE | XCAS_ONLY},
+    {"osculating_circle([x(t),y(t)],t,t0)", 0, "Cercle osculateur de la courbe parametree [x(t),y(t)] en t0", "[t,t^2],t,1", "[t,t^2],t", CAT_CATEGORY_CALCULUS | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
     {"parabole(F,A)", 0, "Parabole donnee par foyer et sommet", "-2-i,2+i", 0, CAT_CATEGORY_2D},
     {"parameq(objet)", 0, "Equations parametriques. Utiliser equation pour une equation cartesienne", "circle(0,1)", "ellipse(-1,1,3)", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
     {"partfrac(p,x)", 0, "Decomposition en elements simples. Raccourci p=>+", "1/(x^4-1)", 0, CAT_CATEGORY_ALGEBRA | XCAS_ONLY},
@@ -1461,6 +1467,11 @@ const catalogFunc completeCaten[] = { // list of all functions (including some n
   {"iquo(a,b)", 0, "Integer quotient of a and b.", "23,13", 0, CAT_CATEGORY_ARIT},
   {"irem(a,b)", 0,"Integer remainder of a and b.", "23,13", 0, CAT_CATEGORY_ARIT},
   {"isprime(n)", 0, "Returns 1 if n is prime, 0 otherwise.", "11", "10", CAT_CATEGORY_ARIT},
+  {"is_collinear(A,B,C)", 0, "Returns 1 if A, B, C are collinear, 0 otherwise", "1,i,-1", "i,0,-i", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_concyclic(A,B,C,D)", 0, "Returns 1 if A, B, C, D are concyclic, 0 otherwise", "1,i,-1,-i", "1,i,0,-i", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_element(A,G)", 0, "Returns 1 if A belongs to G, 0 otherwise.", "point(0),circle(0,1)", "point(i),square(0,1)", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_parallel(D,E)", 0, "Returns 1 if D and E are parallel, 0 otherwise", "line(y=x),line(y=-x)", "line(y=x),line(y=x+1)", CAT_CATEGORY_2D | XCAS_ONLY },
+  {"is_perpendicular(D,E)", 0, "Returns 1 if D and E are perpendicular, 0 otherwise", "line(y=x),line(y=-x)", "line(y=x),line(y=x+1)", CAT_CATEGORY_2D | XCAS_ONLY },
   {"jordan(A)", 0, "Jordan normal form of matrix A, returns P and D such that P^-1*A*P=D", "[[1,2],[3,4]]", "[[1,1,-1,2,-1],[2,0,1,-4,-1],[0,1,1,1,1],[0,1,2,0,1],[0,0,-3,3,-1]]", CAT_CATEGORY_MATRIX},
   {"laguerre(n,a,x)", 0, "n-ieme Laguerre polynomial (default a=0).", "10", 0, CAT_CATEGORY_POLYNOMIAL},
   {"laplace(f,x,s)", 0, "Laplace transform of f","sin(x),x,s", 0, CAT_CATEGORY_CALCULUS},
@@ -2267,6 +2278,109 @@ const catalogFunc completeCaten[] = { // list of all functions (including some n
     return i;
   }
 
+  // geo_print / geoprint
+  std::string _pnt2string(const giac::gen & g,const giac::context * contextptr){
+    unsigned ta=taille(g,100);
+    if (ta>100)
+      return "Done";
+    if (g.is_symb_of_sommet(giac::at_pnt)){
+      giac::gen & f=g._SYMBptr->feuille;
+      giac::gen fp=remove_at_pnt(g);
+      if (fp.is_symb_of_sommet(giac::at_hyperplan)){
+	return gettext("plan")+string("(")+_equation(g,contextptr).print(contextptr)+string(")");
+      }
+      if (f.type==giac::_VECT && !f._VECTptr->empty()){
+	giac::gen f0=f._VECTptr->front();
+	if (f0.is_symb_of_sommet(giac::at_legende)){
+	  return g.print(contextptr);
+	}
+	if (f0.is_symb_of_sommet(giac::at_curve)){
+	  giac::gen f1=f[0]._SYMBptr->feuille;
+	  if (f1.type==giac::_VECT && !f1._VECTptr->empty() ){
+	    giac::gen f1f=f1._VECTptr->front();
+	    if (f1f.type==giac::_VECT && f1f._VECTptr->size()>=4){
+	      giac::vecteur f1v=*f1f._VECTptr;
+	      return "plotparam("+_pnt2string(f1v[0],contextptr)+","+f1v[1].print(contextptr)+"="+f1v[2].print(contextptr)+".."+f1v[3].print(contextptr)+")";
+	    }
+	  }
+	}
+	if (f0.is_symb_of_sommet(giac::at_cercle) && f0._SYMBptr->feuille.type==giac::_VECT){
+	  if (f0._SYMBptr->feuille._VECTptr->size()==3 && ((*f0._SYMBptr->feuille._VECTptr)[2]!=giac::cst_two_pi || (*f0._SYMBptr->feuille._VECTptr)[1]!=0))
+	    return f0.print(contextptr);
+	  giac::gen centre,rayon;
+	  if (!giac::centre_rayon(f0,centre,rayon,true,0))
+	    return "cercle_error";
+	  if (!complex_mode(contextptr) && (centre.type<giac::_IDNT || centre.type==giac::_FRAC) )
+	    return gettext("circle")+string("(point(")+giac::re(centre,contextptr).print(contextptr)+","+giac::im(centre,contextptr).print(contextptr)+"),"+rayon.print(contextptr)+")";
+	  else
+	    return gettext("circle")+string("(point(")+centre.print(contextptr)+"),"+rayon.print(contextptr)+")";
+	}
+	if (f0.type==giac::_VECT &&f0.subtype!=giac::_POINT__VECT){
+	  std::string s=gettext("polygon")+string("(");
+	  giac::const_iterateur it=f0._VECTptr->begin(),itend=f0._VECTptr->end();
+	  if ( itend-it==2){ 
+	    switch(f0.subtype){
+	    case giac::_LINE__VECT:
+	      s=gettext("line")+string("(");
+	      break;
+	    case giac::_HALFLINE__VECT:
+	      s=gettext("half_line")+string("(");
+	      break;
+	    case giac::_GROUP__VECT:
+	      s=gettext("segment")+string("(");
+	      break;
+	    }
+	    if (f0.subtype==giac::_LINE__VECT && it->type!=giac::_VECT){ // 2-d line
+	      s += _equation(g,contextptr).print(contextptr) + ")";
+	      return s;
+	    }
+	  }
+	  for (;it!=itend;){
+	    s += "point(";
+	    if (!complex_mode(contextptr) && (it->type<giac::_IDNT || it->type==giac::_FRAC) )
+	      s += giac::re(*it,contextptr).print(contextptr)+","+giac::im(*it,contextptr).print(contextptr);
+	    else {
+	      gen f=*it;
+	      if (f.type==_VECT && f.subtype==_POINT__VECT)
+		f.subtype=_SEQ__VECT;
+	      s += f.print(contextptr);
+	    }
+	    s+=")";
+	    ++it;
+	    s += it==itend?")":",";
+	  }
+	  return s;
+	}
+	if ( (f0.type!=giac::_FRAC && f0.type>=giac::_IDNT) || is3d(g) || complex_mode(contextptr)){
+	  if (f0.type==_VECT && f0.subtype==_POINT__VECT)
+	    f0.subtype=_SEQ__VECT;
+	  return "point("+f0.print(contextptr)+")";
+	}
+	else
+	  return "point("+giac::re(f0,contextptr).print(contextptr)+","+giac::im(f0,contextptr).print(contextptr)+")";
+      }
+    } 
+    if (g.type==giac::_VECT && !g._VECTptr->empty() && g._VECTptr->back().is_symb_of_sommet(giac::at_pnt)){
+      std::string s = "[";
+      giac::const_iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
+      for (;it!=itend;){
+	s += _pnt2string(*it,contextptr);
+	++it;
+	s += it==itend?"]":",";
+      }
+      return s;
+    }
+    return g.print(contextptr);
+  }
+
+  std::string pnt2string(const giac::gen & g,const giac::context * contextptr){
+    int p=python_compat(contextptr);
+    python_compat(0,contextptr);    
+    string s=_pnt2string(g,contextptr);
+    python_compat(p,contextptr);
+    return s;
+  }
+  
   gen select_var(GIAC_CONTEXT){
     kbd_interrupted=giac::ctrl_c=giac::interrupted=false;
 #ifdef QUICKJS
@@ -2340,8 +2454,8 @@ const catalogFunc completeCaten[] = { // list of all functions (including some n
 	vector<int> vi(9);
 	tailles(w,vi);
 	total += vi[8];
-	if (vi[8]<400)
-	  vs[i]+=":="+w.print(contextptr);
+	if (vi[8]<w.is_symb_of_sommet(at_pnt)?1500:500)
+	  vs[i]+=":="+pnt2string(w,contextptr);
 	else {
 	  vs[i] += " ~";
 	  vs[i] += giac::print_INT_(vi[8]);
@@ -3853,7 +3967,7 @@ namespace xcas {
     x=os_draw_string_small(x,y,mode==4?bg:c,mode==4?c:bg,s);// PrintMiniMini( &x, &y, (unsigned char *)s, mode,c, 0 );
     return;
   }
-  
+
   int text_width(int fontsize,const char * s){
 #ifdef NSPIRE_NEWLIB
     int x=0;
@@ -3869,6 +3983,10 @@ namespace xcas {
 #endif
   }
 
+  int fl_width(const char * s){
+    return text_width(14,s);
+  }
+  
   void fl_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int c=COLOR_BLACK){
     rx/=2;
     ry/=2;
@@ -5818,10 +5936,139 @@ namespace xcas {
     double y=m.y+t*v.y;
     double z=m.z+t*v.z;
     gr.XYZ2ij(double3(x,y,z),i,j);
-  }    
+  }
+
+  const int4 tabcolorcplx[]={
+{63488,47104,30720,14336},
+{63489,47105,30720,14336},
+{63491,47106,30721,14336},
+{63492,47107,30722,14337},
+{63494,47108,30723,14337},
+{63495,47109,30723,14337},
+{63497,47110,30724,14338},
+{63498,47111,30725,14338},
+{63500,47113,30726,14339},
+{63501,47114,30726,14339},
+{63503,47115,30727,14339},
+{63504,47116,30728,14340},
+{63506,47117,30729,14340},
+{63507,47118,30729,14340},
+{63509,47119,30730,14341},
+{63510,47120,30731,14341},
+{63512,47122,30732,14342},
+{63513,47123,30732,14342},
+{63515,47124,30733,14342},
+{63516,47125,30734,14343},
+{63518,47126,30735,14343},
+{63519,47127,30735,14343},
+{59423,45079,28687,14343},
+{57375,43031,28687,14343},
+{53279,40983,26639,12295},
+{51231,38935,24591,12295},
+{47135,34839,22543,10247},
+{45087,32791,22543,10247},
+{40991,30743,20495,10247},
+{38943,28695,18447,8199},
+{34847,26647,16399,8199},
+{32799,24599,16399,8199},
+{28703,22551,14351,6151},
+{26655,20503,12303,6151},
+{22559,16407,10255,4103},
+{20511,14359,10255,4103},
+{16415,12311,8207,4103},
+{14367,10263,6159,2055},
+{10271,8215,4111,2055},
+{8223,6167,4111,2055},
+{4127,4119,2063,7},
+{2079,2071,15,7},
+{2079,2071,2063,2055},
+{2175,2135,2095,2055},
+{2271,2199,2159,2087},
+{2367,2263,2191,2119},
+{2463,2359,2255,2151},
+{2559,2423,2287,2151},
+{2655,2487,2351,2183},
+{2751,2551,2383,2215},
+{2847,2647,2447,2247},
+{2943,2711,2479,2247},
+{3039,2775,2543,2279},
+{3135,2839,2575,2311},
+{3231,2935,2639,2343},
+{3327,2999,2671,2343},
+{3423,3063,2735,2375},
+{3519,3127,2767,2407},
+{3615,3223,2831,2439},
+{3711,3287,2863,2439},
+{3807,3351,2927,2471},
+{3903,3415,2959,2503},
+{3999,3511,3023,2535},
+{4063,3575,3055,2535},
+{4061,3574,3054,2535},
+{4060,3573,3054,2535},
+{4058,3572,3053,2534},
+{4057,3571,3052,2534},
+{4055,3569,3051,2533},
+{4054,3568,3051,2533},
+{4052,3567,3050,2533},
+{4051,3566,3049,2532},
+{4049,3565,3048,2532},
+{4048,3564,3048,2532},
+{4046,3563,3047,2531},
+{4045,3562,3046,2531},
+{4043,3560,3045,2530},
+{4042,3559,3045,2530},
+{4040,3558,3044,2530},
+{4039,3557,3043,2529},
+{4037,3556,3042,2529},
+{4036,3555,3042,2529},
+{4034,3554,3041,2528},
+{4033,3553,3040,2528},
+{4032,3552,3040,2528},
+{4032,3552,992,480},
+{8128,5600,3040,480},
+{10176,7648,5088,2528},
+{14272,9696,7136,2528},
+{16320,11744,7136,2528},
+{20416,13792,9184,4576},
+{22464,15840,11232,4576},
+{26560,19936,13280,6624},
+{28608,21984,13280,6624},
+{32704,24032,15328,6624},
+{34752,26080,17376,8672},
+{38848,28128,19424,8672},
+{40896,30176,19424,8672},
+{44992,32224,21472,10720},
+{47040,34272,23520,10720},
+{51136,38368,25568,12768},
+{53184,40416,25568,12768},
+{57280,42464,27616,12768},
+{59328,44512,29664,14816},
+{63424,46560,31712,14816},
+{65472,48608,31712,14816},
+{65376,48512,31648,14784},
+{65280,48448,31616,14784},
+{65184,48384,31552,14752},
+{65088,48320,31520,14720},
+{64992,48224,31456,14688},
+{64896,48160,31424,14688},
+{64800,48096,31360,14656},
+{64704,48032,31328,14624},
+{64608,47936,31264,14592},
+{64512,47872,31232,14592},
+{64416,47808,31168,14560},
+{64320,47744,31136,14528},
+{64224,47648,31072,14496},
+{64128,47584,31040,14496},
+{64032,47520,30976,14464},
+{63936,47456,30944,14432},
+{63840,47360,30880,14400},
+{63744,47296,30848,14400},
+{63648,47232,30784,14368},
+{63552,47168,30752,14336},
+  };
   
   struct hypertriangle_t {
-    int4 * colorptr; // hypersurface color 
+    const int4 * colorptr; // hypersurface color 
     double xmin,xmax,ymin,ymax; // minmax values intersection with plane y-x=Cte
     double a,b,c; // plane equation of triangle
     double zG; // altitude for gravity center 
@@ -5949,7 +6196,22 @@ namespace xcas {
       }
     } // end loop on k
   }
-  
+
+  struct float2 {
+    float f,a;
+  } ;
+  double absarg(const gen & g,double & argcolor){
+    if (g.type==_DOUBLE_){
+      double d=g._DOUBLE_val;
+      if (d>=0){ argcolor=0;  return d; }
+      argcolor=M_PI; return -d;
+    }
+    double x=g._CPLXptr->_DOUBLE_val,y=(g._CPLXptr+1)->_DOUBLE_val;
+    argcolor=std::atan2(x,y);
+    double n=std::sqrt(x*x+y*y); // will be encoded in a float, no overflow care
+    return n;
+  }
+
   // hpersurface encoded as a matrix
   // with lines containing 3 coordinates per point
   bool Graph2d::glsurface(int w,int h,int lcdz,GIAC_CONTEXT,
@@ -6078,6 +6340,7 @@ namespace xcas {
       double hyperxymax=-1e307,hyperxymin=1e307;
       double3 tri[4]; 
       for (int k=0;k<int(hypv.size());k+=2){
+	bool cplx=hyp_color[k].u==0 && hyp_color[k].d==0 && hyp_color[k].du==0 && hyp_color[k].dd==0;
 	vector< vector<float3d> >::const_iterator sbeg=hypv[k],send=hypv[k+1],sprec,scur;
 	vector<float3d>::const_iterator itprec,itcur,itprecend;
 	for (sprec=sbeg,scur=sprec+1;scur<send;++sprec,++scur){
@@ -6134,6 +6397,17 @@ namespace xcas {
 	    double x1=*(itprec-3),x2=*(itprec),x3=*(itcur-3),x4=*(itcur);
 	    double y1=*(itprec-2),y2=*(itprec+1),y3=*(itcur-2),y4=*(itcur+1);
 	    double z1=*(itprec-1),z2=*(itprec+2),z3=*(itcur-1),z4=*(itcur+2);
+	    double a1,a2,a3,a4;
+	    if (cplx){
+	      a1 = ((float2 *)&z1)->a;
+	      z1 = ((float2 *)&z1)->f;
+	      a2 = ((float2 *)&z2)->a;
+	      z2 = ((float2 *)&z2)->f;
+	      a3 = ((float2 *)&z3)->a;
+	      z3 = ((float2 *)&z3)->f;
+	      a4 = ((float2 *)&z4)->a;
+	      z4 = ((float2 *)&z4)->f;
+	    }
 	    yx1=y1-x1; yx2=y2-x2; yx3=y3-x3; yx4=y4-x4;
 #ifdef HYPERQUAD
 	    tri[0]=double3(x1,y1,z1);
@@ -6146,7 +6420,16 @@ namespace xcas {
 	    if (xy123>hyperxymax) hyperxymax=xy123;
 	    do_transform(invtransform,x123,y123,z123,X,Y,Z);
 	    if (Z>=window_zmin && Z<=window_zmax && X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax ){
-	      hypertriangle_t res; res.colorptr=&hyp_color[k];
+	      hypertriangle_t res;
+	      if (cplx){
+		int idx=(a1+M_PI)*sizeof(tabcolorcplx)/(sizeof(int4)*2*M_PI);
+		if (idx<0 || idx >=sizeof(tabcolorcplx)/(sizeof(int4)))
+		  idx = 0;
+		//CERR << idx << " ";
+		res.colorptr=&tabcolorcplx[idx];
+	      }
+	      else
+		res.colorptr=&hyp_color[k];
 	      compute(yx,tri,res);
 	      hypertriangles.push_back(res);
 	    }
@@ -6237,7 +6520,7 @@ namespace xcas {
 	if (plan_filled[k]){ only_hypertri=false; break; }
       }
       if (only_hypertri){
-	if (hypertriangles.empty()) continue;
+	if (hypertriangles.empty()) goto suite3d;
 	int effjmax=(hyperxymax-xc-yc)/yscale/2.0,effjmin=(hyperxymin-xc-yc)/yscale/2.0;
 	if (effjmax+1<jmax)
 	  jmax=effjmax+1;
@@ -6461,6 +6744,7 @@ namespace xcas {
 	  }
 	} // end pixel vertical loop on j
       } // end else only_hypertri
+    suite3d:
       // update jmintab/jmaxtab
       if (i+horiz+w<jmintabsize){
 	for (int I=0;I<w;++I){
@@ -6829,7 +7113,10 @@ namespace xcas {
     return true;
   }
 
-  Graph2d::Graph2d(const giac::gen & g_,const giac::context * cptr):window_xmin(gnuplot_xmin),window_xmax(gnuplot_xmax),window_ymin(gnuplot_ymin),window_ymax(gnuplot_ymax),window_zmin(gnuplot_zmin),window_zmax(gnuplot_zmax),g(g_),display_mode(0x45),show_axes(1),show_edges(1),show_names(1),labelsize(16),precision(1),contextptr(cptr) {
+  Graph2d::Graph2d(const giac::gen & g_,const giac::context * cptr):window_xmin(gnuplot_xmin),window_xmax(gnuplot_xmax),window_ymin(gnuplot_ymin),window_ymax(gnuplot_ymax),window_zmin(gnuplot_zmin),window_zmax(gnuplot_zmax),g(g_),display_mode(0x45),show_axes(1),show_edges(1),show_names(1),labelsize(16),precision(1),contextptr(cptr),hp(0),npixels(5),couleur(0),nparams(0) {
+    current_i=LCD_WIDTH_PX/3;
+    current_j=LCD_HEIGHT_PX/3;
+    push_depth=current_depth=0;
     diffusionz=5; diffusionz_limit=5; hide2nd=false; interval=false;
     default_upcolor=giac3d_default_upcolor;
     default_downcolor=giac3d_default_downcolor;
@@ -6842,8 +7129,8 @@ namespace xcas {
     q=quaternion_double(0,0,0);//rotation_2_quaternion_double(0.707,0.707,0,1); 
     update_scales();
     autoscale(false,!is3d);
+    update_rotation();
     if (is3d){
-      update_rotation();
       if (surfacev.empty()){
 	// no hypersurface inside, 2 for polyhedron
 	precision=1;
@@ -7005,9 +7292,78 @@ namespace xcas {
     }
   }
 
+  vecteur mark_selected(const vecteur & v,const vector<int> & selected,bool is3d){
+    vecteur w(v);
+    vector<int> s(selected); sort(s.begin(),s.end());
+    int pos=0;
+    for (int i=0;i<w.size();++i){
+      if (pos>=s.size())
+	break;
+      if (i==s[pos]){
+	++pos;
+	gen g=w[i];
+	if (g.is_symb_of_sommet(at_pnt)){
+	  g=g._SYMBptr->feuille;
+	  if (g.type==_VECT && g._VECTptr->size()>=2){
+	    vecteur gv(*g._VECTptr);
+	    gv[1]=is3d?_CYAN:_BLUE;
+	    g=gen(gv,g.subtype);
+	    w[i]=symbolic(at_pnt,g);
+	  }
+	}
+      }
+    }
+    return w;
+  }
+
+  vecteur Graph2d::selected_names(bool allobjects,bool withdef) const {
+    vector<int>::const_iterator it=selected.begin(),itend=selected.end();
+    vecteur res;
+    for (;it!=itend;++it){
+      gen g=symbolic_instructions[*it];
+      if (g.is_symb_of_sommet(at_sto)){
+	gen tmp=g._SYMBptr->feuille[0];
+	if (allobjects || tmp.is_symb_of_sommet(at_point) || tmp.is_symb_of_sommet(at_element))
+	  res.push_back(withdef?g:g._SYMBptr->feuille[1]);
+      }
+    }
+    return res;
+  }
+
+  void Graph2d::adjust_cursor_point_type(){
+    if (hp){
+      double newx,newy,newz;
+      find_xyz(current_i,current_j,current_depth,newx,newy,newz);
+      int pos=-1;
+      gen orig;
+      gen res=geometry_round(newx,newy,newz,find_eps(),orig,pos);
+      if (mode==0){
+	if (pos>=0)
+	  selected=vector<int>(1,pos);
+	else
+	  selected.clear();
+      }
+      cursor_point_type=pos>=0?6:3;
+    }
+  }
+
+  void Graph2d::update_g(){
+    if (hp){
+      adjust_cursor_point_type();
+      find_title_plot(title_tmp,plot_tmp);
+      vecteur v(mergevecteur(get_current_animation(),trace_instructions));
+      if (!is_undef(plot_tmp)) v.push_back(plot_tmp);
+      // geometry: update g from plot_instructions
+      g=mergevecteur(selected.empty()?plot_instructions:mark_selected(plot_instructions,selected,is3d),v);
+      if (is3d)
+	update_rotation();
+    }
+  }    
+
   void Graph2d::update(){
+    update_g();
     update_scales();
-    if (is3d) update_rotation();
+    update_rotation();
   }
   
   void mult4(double * c,double k,double * res){
@@ -7054,6 +7410,12 @@ namespace xcas {
     j=LCD_HEIGHT_PX/2-Z*lcdz+(Y+X)/9.6*LCD_WIDTH_PX;    
   }
   
+  void Graph2d::xyz2ij(const double3 &d,double &i,double &j,double3 & d3) const {
+    do_transform(transform,d.x,d.y,d.z,d3.x,d3.y,d3.z);
+    i=LCD_WIDTH_PX/2+(d3.y-d3.x)/4.8*LCD_WIDTH_PX;
+    j=LCD_HEIGHT_PX/2-d3.z*lcdz+(d3.y+d3.x)/9.6*LCD_WIDTH_PX;    
+  }
+  
   void Graph2d::XYZ2ij(const double3 &d,int &i,int &j) const {
     double X=d.x,Y=d.y,Z=d.z;
     i=LCD_WIDTH_PX/2+(Y-X)/4.8*LCD_WIDTH_PX;
@@ -7061,6 +7423,8 @@ namespace xcas {
   }
 
   void Graph2d::update_rotation(){
+    if (!is3d)
+      return;
     solid3d=false;
     double rx,ry,rz,theta;
     get_axis_angle_deg(q,rx,ry,rz,theta);
@@ -7154,31 +7518,33 @@ namespace xcas {
 	continue;
       }
       bool line=G.subtype==_LINE__VECT,halfline=G.subtype==_HALFLINE__VECT,segment= G.subtype==_GROUP__VECT;
-      if (G.type==_VECT && G._VECTptr->size()==2 && (line || halfline || segment)){
-	gen a=evalf_double(G._VECTptr->front(),1,contextptr),b=evalf_double(G._VECTptr->back(),1,contextptr);
-	if (a.type==_VECT && b.type==_VECT && a._VECTptr->size()==3 && b._VECTptr->size()==3){
-	  vecteur & A=*a._VECTptr;
-	  vecteur & B=*b._VECTptr;
-	  if (A[0].type==_DOUBLE_ && A[1].type==_DOUBLE_ && A[2].type==_DOUBLE_ && B[0].type==_DOUBLE_ && B[1].type==_DOUBLE_ && B[2].type==_DOUBLE_ ){
-	    lines.push_back(ptr);
-	    double x=A[0]._DOUBLE_val,y=A[1]._DOUBLE_val,z=A[2]._DOUBLE_val;
+      if (G.type==_VECT && G._VECTptr->size()>=2 && (line || halfline || segment)){
+	for (int n=1;n<G._VECTptr->size();++n){
+	  gen a=evalf_double((*G._VECTptr)[n-1],1,contextptr),b=evalf_double((*G._VECTptr)[n],1,contextptr);
+	  if (a.type==_VECT && b.type==_VECT && a._VECTptr->size()==3 && b._VECTptr->size()==3){
+	    vecteur & A=*a._VECTptr;
+	    vecteur & B=*b._VECTptr;
+	    if (A[0].type==_DOUBLE_ && A[1].type==_DOUBLE_ && A[2].type==_DOUBLE_ && B[0].type==_DOUBLE_ && B[1].type==_DOUBLE_ && B[2].type==_DOUBLE_ ){
+	      lines.push_back(ptr);
+	      double x=A[0]._DOUBLE_val,y=A[1]._DOUBLE_val,z=A[2]._DOUBLE_val;
 #if 0 // ndef OLD_LINE_RENDERING
-	    double3 prev(x,y,z);
-	    linev.push_back(prev);
+	      double3 prev(x,y,z);
+	      linev.push_back(prev);
 #endif
-	    double X,Y,Z;
-	    do_transform(transform,x,y,z,X,Y,Z);
-	    double3 M(X,Y,Z);
-	    x=B[0]._DOUBLE_val;y=B[1]._DOUBLE_val;z=B[2]._DOUBLE_val;
+	      double X,Y,Z;
+	      do_transform(transform,x,y,z,X,Y,Z);
+	      double3 M(X,Y,Z);
+	      x=B[0]._DOUBLE_val;y=B[1]._DOUBLE_val;z=B[2]._DOUBLE_val;
 #if 0 // ndef OLD_LINE_RENDERING
-	    linev.push_back(double3(x-prev.x,y-prev.y,z-prev.z));
-#endif
-	    do_transform(transform,x,y,z,X,Y,Z);
-	    double3 N(X,Y,Z);
-	    double3 v(N.x-M.x,N.y-M.y,N.z-M.z);
-	    linev.push_back(M); linev.push_back(v);
-	    linetypev.push_back(G.subtype);
-	    line_color.push_back(int4(u,d,du,dd));
+	      linev.push_back(double3(x-prev.x,y-prev.y,z-prev.z));
+#endif
+	      do_transform(transform,x,y,z,X,Y,Z);
+	      double3 N(X,Y,Z);
+	      double3 v(N.x-M.x,N.y-M.y,N.z-M.z);
+	      linev.push_back(M); linev.push_back(v);
+	      linetypev.push_back(G.subtype);
+	      line_color.push_back(int4(u,d,du,dd));
+	    }
 	  }
 	}
 	continue;
@@ -7242,24 +7608,37 @@ namespace xcas {
 	if (h.type==_VECT && h.subtype==_POLYEDRE__VECT)
 	  G=h;
 	else if (ckmatrix(h,true)){
+	  bool cplx=has_i(h); // 4d hypersurface, encode color in a float+int
+	  double argcplx;
 	  surfacev.push_back(vector< vector<float3d> >(0));
 	  vector< vector<float3d> > & S=surfacev.back();
 	  const vecteur & V=*h._VECTptr;
 	  S.reserve(V.size());
 	  for (int j=0;j<V.size();++j){
 	    gen Vj=V[j];
-	    vecteur vj=*Vj._VECTptr;
+	    const vecteur & vj=*Vj._VECTptr;
 	    S.push_back(vector<float3d>(0));
 	    vector<float3d> &S_=S.back();
 	    S_.reserve(vj.size());
 	    for (int k=0;k<vj.size();k+=3){
 	      double X,Y,Z;
-	      do_transform(mat,vj[k]._DOUBLE_val,vj[k+1]._DOUBLE_val,vj[k+2]._DOUBLE_val,X,Y,Z);
-	      vj[k]=X; vj[k+1]=Y; vj[k+2]=Z;
-	      S_.push_back(X); S_.push_back(Y); S_.push_back(Z);
+	      if (cplx)
+		do_transform(mat,vj[k]._DOUBLE_val,vj[k+1]._DOUBLE_val,absarg(vj[k+2],argcplx),X,Y,Z);
+	      else
+		do_transform(mat,vj[k]._DOUBLE_val,vj[k+1]._DOUBLE_val,vj[k+2]._DOUBLE_val,X,Y,Z);		
+	      // vj[k]=X; vj[k+1]=Y; vj[k+2]=Z;
+	      S_.push_back(X); S_.push_back(Y);
+	      if (cplx){
+		float2 * fptr=(float2 *) &Z;
+		fptr->f = Z;
+		fptr->a = argcplx;
+		S_.push_back(Z);
+	      }
+	      else
+		S_.push_back(Z);
 	    }
 	  }
-	  hyp_color.push_back(int4(u,d,du,dd));
+	  hyp_color.push_back(cplx?int4(0,0,0,0):int4(u,d,du,dd));
 	  continue;
 	} // end quad hypersurface
       } // end hypersurface
@@ -7555,7 +7934,40 @@ namespace xcas {
     int mxw=LCD_WIDTH_PX,myw=LCD_HEIGHT_PX-STATUS_AREA_PX;
     double i0,j0,i0save,j0save,i1,j1;
     int fs=f.size();
-    if ((fs==4) && (s==at_parameter)){
+    if (fs>=4 && s==at_parameter && f[0].type==_IDNT){
+      // display parameter from the left upper, f[0] name and f[3] value
+      char ch[128];
+      strcpy(ch,f[0]._IDNTptr->id_name);
+      int pos=strlen(ch);
+      ch[pos]='=';
+      ++pos;
+      ch[pos]=0;
+      gen g=evalf_double(f[3],1,contextptr);
+      if (g.type==_DOUBLE_)
+        strcpy(ch+pos,g.print(contextptr).c_str());
+      else {
+        ch[pos]='?';
+        ++pos;
+        ch[pos]=0;
+      }
+      ++Mon_image.nparams;
+      int dw=fl_width(ch);
+      int fheight=14;
+      int ypos=(fheight+1)*Mon_image.nparams+fheight;
+      drawRectangle(1,ypos,dw,fheight-1,Mon_image.is3d?_BLACK:_WHITE);
+      os_draw_string_small_(1,ypos-fheight,ch);
+      if (Mon_image.pushed && Mon_image.moving_param){
+        drawLine(64,ypos-2,192,ypos-2,Mon_image.is3d?_WHITE:_BLACK);
+        drawLine(64,ypos,64,ypos-fheight,Mon_image.is3d?_WHITE:_BLACK);
+        drawLine(192,ypos,192,ypos-fheight,Mon_image.is3d?_WHITE:_BLACK);
+	os_draw_string_small_(65,ypos-fheight-2,f[1].print(contextptr).c_str());
+	os_draw_string_small_(193,ypos-fheight-2,f[2].print(contextptr).c_str());
+	gen gxpos=64+128*(g-f[1])/(f[2]-f[1]);
+	if (gxpos.type==_DOUBLE_){
+	  int xpos=gxpos._DOUBLE_val;
+	  drawLine(xpos,ypos,xpos,ypos-fheight,_RED);
+	}
+      }
       return ;
     }
     string the_legend;
@@ -7656,7 +8068,7 @@ namespace xcas {
 	    return;
 	  }
 	} // end circle
-#if 0
+#if 1
 	if (point._SYMBptr->sommet==at_legende){
 	  gen & f=point._SYMBptr->feuille;
 	  if (f.type==_VECT && f._VECTptr->size()==3){
@@ -7889,6 +8301,20 @@ namespace xcas {
     x/=n; y/=n;
   }
 
+  void Graph2d::adddepth(vector<int2> & polyg,const double3 &A,const double3 &B,int2 & IJmin) const {
+    if ((A.z-current_depth)*(B.z-current_depth)>0)
+      return;
+    double t=(current_depth-A.z)/(B.z-A.z);
+    double x=A.x+t*(B.x-A.x);
+    double y=A.y+t*(B.y-A.y);
+    int I,J;
+    XYZ2ij(double3(x,y,current_depth),I,J);
+    int2 IJ(I,J);
+    polyg.push_back(IJ);
+    if (IJ<IJmin)
+      IJmin=IJ;
+  }
+
   void Graph2d::addpolyg(vector<int2> & polyg,double x,double y,double z,int2 & IJmin) const {
     int I,J;
     xyz2ij(double3(x,y,z),I,J);
@@ -7898,7 +8324,184 @@ namespace xcas {
       IJmin=IJ;
   }
 
+  int roundint (double r) {
+    int tmp = static_cast<int> (r);
+    tmp += (r-tmp>=.5) - (r-tmp<=-.5);
+    return tmp;
+  }
+
+  bool Graph2d::find_dxdy(double & dx, double & dy) const {
+    double xmin=window_xmin,xmax=window_xmax;
+    int hp=LCD_WIDTH_PX-1;
+    dx=(xmax-xmin)/hp;
+    double ymin=window_ymin,ymax=window_ymax;
+    int vp=LCD_HEIGHT_PX-1;
+    dy=(ymax-ymin)/vp;
+    return abs(dx-dy) < 0.000001;
+  }
+
+  void Graph2d::find_xy(double i,double j,double & x,double & y) const {
+    double xmin=window_xmin,xmax=window_xmax;
+    x=xmin+i*(xmax-xmin)/LCD_WIDTH_PX;
+    double ymin=window_ymin,ymax=window_ymax;
+    y=ymax-j*(ymax-ymin)/LCD_HEIGHT_PX;
+  }
+
+  void Graph2d::round_xy(double & x, double & y) const {
+    double dx,dy;
+    find_dxdy(dx,dy);
+    double range = pow(10,log10(1.0/dx));
+    x = roundint(x * range) / range;
+    y = roundint(y * range) / range;
+  }
+  
+  void round3(double & x,double xmin,double xmax){
+    double dx=std::abs(xmax-xmin);
+    double logdx=std::log10(dx);
+    int ndec=int(logdx)-3;
+    double xpow=std::pow(10.0,ndec);
+    int newx=x>=0?int(x/xpow+0.5):int(x/xpow-0.5);
+    x=newx*xpow;
+  }
+
+  vecteur Graph2d::param(double d) const {
+    const_iterateur it=plot_instructions.begin(),itend=plot_instructions.end();
+    vecteur res;
+    double pos=0.5;
+    for (int i=0 ;it!=itend;++i,++it){
+      gen tmp=*it;
+      if (tmp.is_symb_of_sommet(at_parameter)){
+	tmp=tmp._SYMBptr->feuille;
+	if (tmp.type==_VECT && tmp._VECTptr->size()>=4){
+	  if (std::abs(d-pos)<0.50001){
+	    res.push_back(tmp);
+	    res.push_back(i);
+	  }
+	  ++pos;
+	}
+      }
+    }
+    return res;
+  }
+  
+  void Graph2d::draw_decorations(const gen & title_tmp){
+    if (args_tmp.empty()){ // add selected names
+      char s[256]; strcpy(s,modestr.c_str());
+      int pos=0,modestrsize=modestr.size();
+      pos += modestrsize;
+      s[pos++]=' ';
+      if (mode!=0 && drag_name.type==_IDNT){
+	strcpy(s+pos,drag_name._IDNTptr->id_name);
+	pos += strlen(drag_name._IDNTptr->id_name);
+      }
+      else {
+	if (1 || mode==0 || mode==255){ // print selected names 
+	  vecteur v;
+	  if (mode!=255) v=selected_names(true,false);
+	  if (v.empty() && current_i<=192 && current_j<14*nparams+21){
+	    double d=current_j/14.-1;
+	    v=param(d);
+	    if (v.size()!=2)
+	      v.clear();
+	    else
+	      v=vecteur(1,v.front()[0]);
+	  }
+	  int vs=v.size();
+	  if (!vs){ // print current coordinates
+	    double i=current_i,j=current_j,x,y,z;
+	    if (is3d){
+	      find_xyz(i,j,current_depth,x,y,z);
+	      round_xy(x,y); round3(z,window_zmin,window_zmax);
+	      sprintf(s+pos," %.3g,%.3g,%.3g",x,y,z);
+	    }
+	    else {
+	      find_xy(i,j,x,y);
+	      // round to maximum pixel range
+	      round_xy(x,y);
+	      sprintf(s+pos," %.3g,%.3g",x,y);
+	    }
+	    pos=strlen(s);
+	  }
+	  for (int i=0;i<vs && pos<100;++i){
+	    if (v[i].type==_IDNT){
+	      strcpy(s+pos,v[i]._IDNTptr->id_name);
+	      pos += strlen(v[i]._IDNTptr->id_name);
+	      if (i<vs-1){
+		s[pos++]=',';
+	      }
+	    }
+	  }
+	}
+      }
+      s[pos]=0;
+      os_draw_string_small_(LCD_WIDTH_PX-fl_width(s),LCD_HEIGHT_PX-14,s);
+    }
+    if (mode && title.size()<100 && (!title.empty() || !is_zero(title_tmp))){
+      std::string mytitle;
+      if (!is_zero(title_tmp) && function_final.type==_FUNC){
+	if (function_final==at_point && title_tmp.is_symb_of_sommet(at_point))
+	  mytitle=title_tmp.print(contextptr);
+	else
+	  mytitle=function_final._FUNCptr->ptr()->s+('('+title_tmp.print(contextptr)+')'); // gen(symbolic(*function_final._FUNCptr,title_tmp)).print(contextptr);
+      }
+      else
+	mytitle=title;
+      if (!mytitle.empty()){
+	int dt=int(fl_width(mytitle.c_str()));
+	if (dt>LCD_WIDTH_PX)
+	  dt=LCD_WIDTH_PX;
+	os_draw_string_small_((LCD_WIDTH_PX-dt)/2,LCD_HEIGHT_PX-14,mytitle.c_str());
+      }
+    }
+    if (hp){ // draw cursor at current_i,current_j
+      int taille=mode==255?2:5;
+      fl_line(current_i-taille,current_j,current_i+taille,current_j,is3d?_CYAN:_BLUE);
+      fl_line(current_i,current_j-taille,current_i,current_j+taille,is3d?_CYAN:_BLUE);
+      if (cursor_point_type==6){
+	fl_line(current_i-2,current_j+2,current_i+2,current_j+2,_RED);
+	fl_line(current_i-2,current_j+2,current_i+2,current_j+2,_RED);
+	fl_line(current_i-2,current_j-2,current_i-2,current_j+2,_RED);
+	fl_line(current_i+2,current_j-2,current_i+2,current_j+2,_RED);
+      }
+    }
+  }
+
+  void displaypolyg(const vector<int2> & polyg,const int2 & IJmin,int color,int & Px,int & Py,GIAC_CONTEXT){
+    if (polyg.empty())
+      return;
+    // sort list of arguments
+    vector<int2_double2> p;
+    for (int k=0;k<polyg.size();++k){
+      const int2 & cur=polyg[k];
+      if (cur==IJmin){
+	int2_double2 id={cur.i,cur.j,0,0};
+	p.push_back(id);
+      } else {
+	double di=cur.i-IJmin.i,dj=cur.j-IJmin.j;
+	int2_double2 id={cur.i,cur.j,atan2(di,dj),di*di+dj*dj};
+	p.push_back(id);
+      }
+    }
+    sort(p.begin(),p.end());
+    // draw polygon
+    vector< vector<int> > P;
+    for (int k=0;k<p.size();++k){
+      vector<int> vi(2);
+      vi[0]=p[k].i;
+      vi[1]=p[k].j;
+      P.push_back(vi);
+    }
+    draw_polygon(P,color 
+		 // | 0x400000
+		 ,contextptr);
+    Px=P[0][0];
+    Py=P[0][1];
+  }
+
   void Graph2d::draw(){
+    waitforvblank();
+    nparams=0; // reset number of parameters (shown from left upper)
+    if (hp) history_plot(contextptr).clear();
     if (is3d){
       if (lang==1)
 	statuslinemsg("Toolbox: aide");
@@ -7912,16 +8515,21 @@ namespace xcas {
 	F(window_xmin,window_ymax,window_zmax),
 	G(window_xmax,window_ymax,window_zmin),
 	H(window_xmax,window_ymax,window_zmax);
-      xyz2ij(A,Ai,Aj);
-      xyz2ij(B,Bi,Bj);
-      xyz2ij(C,Ci,Cj);
-      xyz2ij(D,Di,Dj);
-      xyz2ij(E,Ei,Ej);
-      xyz2ij(F,Fi,Fj);
-      xyz2ij(G,Gi,Gj);
-      xyz2ij(H,Hi,Hj);
+      double3 A3,B3,C3,D3,E3,F3,G3,H3;
+      xyz2ij(A,Ai,Aj,A3);
+      xyz2ij(B,Bi,Bj,B3);
+      xyz2ij(C,Ci,Cj,C3);
+      xyz2ij(D,Di,Dj,D3);
+      xyz2ij(E,Ei,Ej,E3);
+      xyz2ij(F,Fi,Fj,F3);
+      xyz2ij(G,Gi,Gj,G3);
+      xyz2ij(H,Hi,Hj,H3);
       set_abort();
+      int prec=precision;
+      if (mode==0 && precision<3)
+	precision += 2;
       glsurface(precision,precision,lcdz,contextptr,default_upcolor,default_downcolor,default_downupcolor,default_downdowncolor);
+      precision=prec;
       clear_abort();
       if (show_edges){
 	// polyhedrons
@@ -8049,10 +8657,31 @@ namespace xcas {
 	drawLine(Ci,Cj,Gi,Gj,COLOR_GREEN | 0x800000);
 	drawLine(Di,Dj,Hi,Hj,COLOR_GREEN | 0x800000);
 	// Z
-	drawLine(Ai,Aj,Bi,Bj,12345 | 0x800000);
-	drawLine(Ci,Cj,Di,Dj,12345 | 0x800000);
-	drawLine(Ei,Ej,Fi,Fj,12345 | 0x800000);
-	drawLine(Gi,Gj,Hi,Hj,12345 | 0x800000);
+	drawLine(Ai,Aj,Bi,Bj,COLOR_CYAN | 0x800000);
+	drawLine(Ci,Cj,Di,Dj,COLOR_CYAN | 0x800000);
+	drawLine(Ei,Ej,Fi,Fj,COLOR_CYAN | 0x800000);
+	drawLine(Gi,Gj,Hi,Hj,COLOR_CYAN | 0x800000);
+	// current_depth
+	if (hp){
+	  vector<int2> polyg; int2 IJmin={RAND_MAX,RAND_MAX};
+	  // x: A3-C3, B3-D3; E3-G3,F3-H3
+	  adddepth(polyg,A3,C3,IJmin);
+	  adddepth(polyg,B3,D3,IJmin);
+	  adddepth(polyg,E3,G3,IJmin);
+	  adddepth(polyg,F3,H3,IJmin);
+	  // y: A3-E3; B3-F3; C3-G3, D3-H3
+	  adddepth(polyg,A3,E3,IJmin);
+	  adddepth(polyg,B3,F3,IJmin);
+	  adddepth(polyg,C3,G3,IJmin);
+	  adddepth(polyg,D3,H3,IJmin);
+	  // z: A3-B3, C3-D3, E3-F3, G3-H3
+	  adddepth(polyg,A3,B3,IJmin);
+	  adddepth(polyg,C3,D3,IJmin);
+	  adddepth(polyg,E3,F3,IJmin);
+	  adddepth(polyg,G3,H3,IJmin);
+	  int Px,Py;
+	  displaypolyg(polyg,IJmin,COLOR_YELLOW | 0x400000,Px,Py,contextptr);
+	}
 	// planes
 	vecteur attrv(gen2vecteur(g));
 	for (int i=0;i<attrv.size();++i){
@@ -8126,55 +8755,72 @@ namespace xcas {
 	      if (z>=window_zmin && z<=window_zmax)
 		addpolyg(polyg,window_xmax,window_ymax,z,IJmin);
 	    }
-	    // sort list of arguments
-	    vector<int2_double2> p;
-	    for (int k=0;k<polyg.size();++k){
-	      int2 & cur=polyg[k];
-	      if (cur==IJmin){
-		int2_double2 id={cur.i,cur.j,0,0};
-		p.push_back(id);
-	      } else {
-		double di=cur.i-IJmin.i,dj=cur.j-IJmin.j;
-		int2_double2 id={cur.i,cur.j,atan2(di,dj),di*di+dj*dj};
-		p.push_back(id);
-	      }
-	    }
-	    sort(p.begin(),p.end());
-	    // draw polygon
-	    vector< vector<int> > P;
-	    for (int k=0;k<p.size();++k){
-	      vector<int> vi(2);
-	      vi[0]=p[k].i;
-	      vi[1]=p[k].j;
-	      P.push_back(vi);
-	    }
-	    draw_polygon(P,upcolor 
-			 // | 0x400000
-			 ,contextptr);
+	    int Px,Py;
+	    displaypolyg(polyg,IJmin,upcolor,Px,Py,contextptr);
 	    if (nameptr){
 	      int x=os_draw_string_small(0,0,0,upcolor,nameptr,true);
-	      os_draw_string_small(P[0][0]-x,P[0][1],upcolor,0,nameptr);
+	      os_draw_string_small(Px-x,Py,upcolor,0,nameptr);
 	    }
 	  }
 	}
 	// frame
 	double xi=Ci-Ai,xj=Cj-Aj;
 	normalize(xi,xj);
-	drawLine(20,20,20+20*xi,20+20*xj,COLOR_RED);
-	os_draw_string_small(20+20*xi,20+20*xj,COLOR_RED,COLOR_BLACK,"x");
+	int decal=180;
+	drawLine(20,decal,20+20*xi,decal+20*xj,COLOR_RED);
+	os_draw_string_small(20+20*xi,decal+20*xj,COLOR_RED,COLOR_BLACK,"x");
 	double yi=Ei-Ai,yj=Ej-Aj;
 	normalize(yi,yj);
-	drawLine(20,20,20+20*yi,20+20*yj,COLOR_GREEN);
-	os_draw_string_small(20+20*yi,20+20*yj,COLOR_GREEN,COLOR_BLACK,"y");
+	drawLine(20,decal,20+20*yi,decal+20*yj,COLOR_GREEN);
+	os_draw_string_small(20+20*yi,decal+20*yj,COLOR_GREEN,COLOR_BLACK,"y");
 	double zi=Bi-Ai,zj=Bj-Aj;
 	normalize(zi,zj);
-	drawLine(20,20,20+20*zi,20+20*zj,12345);
-	os_draw_string_small(20+20*zi,20+20*zj,12345,COLOR_BLACK,"z");
+	drawLine(20,decal,20+20*zi,decal+20*zj,COLOR_CYAN);
+	os_draw_string_small(20+20*zi,decal+20*zj,COLOR_CYAN,COLOR_BLACK,"z");
       } // end show_axes
       // now handle legend([x,y],string)
       vecteur V(gen2vecteur(g));
       for (int i=0;i<V.size();++i){
 	gen attr=V[i];
+	if (attr.is_symb_of_sommet(at_parameter) && attr._SYMBptr->feuille.type==_VECT){
+	  vecteur f=*attr._SYMBptr->feuille._VECTptr;
+	  int fs=f.size();
+	  if (fs>=4 && f[0].type==_IDNT){
+	    // display parameter from the left upper, f[0] name and f[3] value
+	    char ch[128];
+	    strcpy(ch,f[0]._IDNTptr->id_name);
+	    int pos=strlen(ch);
+	    ch[pos]='=';
+	    ++pos;
+	    ch[pos]=0;
+	    gen g=evalf_double(f[3],1,contextptr);
+	    if (g.type==_DOUBLE_)
+	      strcpy(ch+pos,g.print(contextptr).c_str());
+	    else {
+	      ch[pos]='?';
+	      ++pos;
+	      ch[pos]=0;
+	    }
+	    ++nparams;
+	    int dw=fl_width(ch);
+	    int fheight=14;
+	    int ypos=(fheight+1)*nparams+fheight;
+	    drawRectangle(1,ypos-fheight,dw,fheight-1,_WHITE);
+	    os_draw_string_small_(1,ypos-fheight,ch);
+	    if (pushed && moving_param){
+	      drawLine(64,ypos-2,192,ypos-2,is3d?_WHITE:_BLACK);
+	      drawLine(64,ypos,64,ypos-fheight,is3d?_WHITE:_BLACK);
+	      drawLine(192,ypos,192,ypos-fheight,is3d?_WHITE:_BLACK);
+	      os_draw_string_small_(65,ypos-fheight-2,f[1].print(contextptr).c_str());
+	      os_draw_string_small_(193,ypos-fheight-2,f[2].print(contextptr).c_str());
+	      gen gxpos=64+128*(g-f[1])/(f[2]-f[1]);
+	      if (gxpos.type==_DOUBLE_){
+		int xpos=gxpos._DOUBLE_val;
+		drawLine(xpos,ypos,xpos,ypos-fheight,_RED);
+	      }
+	    }
+	  }
+	} // end parameter
 	if (attr.is_symb_of_sommet(at_pnt)){
 	  attr=attr._SYMBptr->feuille;
 	  if (attr.type==_VECT && attr._VECTptr->size()>1){
@@ -8205,6 +8851,8 @@ namespace xcas {
       DefineStatusMessage((char*)"+-: zoom, pad: move, EXIT: quit", 1, 0, 0);
 #endif
       DisplayStatusArea();
+      if (hp)
+	draw_decorations(title_tmp);
       return;
     }
     int save_clip_ymin=clip_ymin;
@@ -8301,6 +8949,8 @@ namespace xcas {
     // draw
     fltk_draw(*this,g,x_scale,y_scale,clip_x,clip_y,clip_w,clip_h,contextptr);
     clip_ymin=save_clip_ymin;
+    if (hp)
+      draw_decorations(title_tmp);
   }
   
   void Graph2d::left(double d){ 
@@ -8581,11 +9231,11 @@ namespace xcas {
     } // End logo mode
   }  
   
-
-  int displaygraph(const giac::gen & ge,GIAC_CONTEXT){
+  int displaygraph(const giac::gen & ge,const gen & gs,GIAC_CONTEXT){
     // graph display
     //if (aborttimer > 0) { Timer_Stop(aborttimer); Timer_Deinstall(aborttimer);}
     xcas::Graph2d gr(ge,contextptr);
+    if (gs!=0) gr.symbolic_instructions=gen2vecteur(gs);
     gr.show_axes=global_show_axes;
     // initial setting for x and y
     if (ge.type==_VECT){
@@ -8627,110 +9277,1487 @@ namespace xcas {
 	}
       }
     }
-    // UI
-#ifdef NSPIRE_NEWLIB
-    DefineStatusMessage((char*)"+-: zoom, pad: move, esc: quit", 1, 0, 0);
+    return gr.ui();
+  }
+
+  vecteur Graph2d::get_current_animation() const {
+    if (animation_instructions_pos>=0 && animation_instructions_pos<animation_instructions.size())
+      return gen2vecteur(animation_instructions[animation_instructions_pos]);
+    return 0;
+  }
+
+  void Graph2d::find_title_plot(gen & title_tmp,gen & plot_tmp){
+    title_tmp=plot_tmp=0;
+    if (//in_area &&
+	hp && mode && !args_tmp.empty()){
+      if (args_tmp.size()>=2){
+	gen function=(mode==int(args_tmp.size()))?function_final:function_tmp;
+	if (function.type==_FUNC){
+	  bool dim2=!is3d;
+	  vecteur args2=args_tmp;
+	  if ( *function._FUNCptr==(dim2?at_cercle:at_sphere)){
+	    gen argv1;
+#ifdef NO_STDEXCEPT
+	    argv1=evalf(args_tmp.back(),1,contextptr);
+	    argv1=evalf_double(argv1,1,contextptr);
 #else
-    DefineStatusMessage((char*)"+-: zoom, pad: move, EXIT: quit", 1, 0, 0);
+	    try {
+	      argv1=evalf(args_tmp.back(),1,contextptr);
+	      argv1=evalf_double(argv1,1,contextptr);
+	    }
+	    catch (std::runtime_error & e){
+	      argv1=undef;
+	    }
 #endif
-    DisplayStatusArea();
-    int saveprecision=gr.precision;
-    gr.precision += 2; // fast draw first
-    gr.draw();
-    gr.precision=saveprecision;    
-    bool redraw=true;
-    for (;;){
-      int saveprec=gr.precision;
-      if (gr.doprecise){
-	gr.doprecise=false;
-	gr.precision=1;//gr.precision-=2;
-      }
-      if (redraw)
-	gr.draw();
-      redraw=true;
-      gr.precision=saveprec;
-      DisplayStatusArea();
+	    if (argv1.is_symb_of_sommet(at_pnt) ||argv1.type==_IDNT){
+	      argv1=remove_at_pnt(argv1);
+	      if ( (argv1.type==_VECT && argv1.subtype==_POINT__VECT) || argv1.type==_CPLX || argv1.type==_IDNT)
+		args2.back()=args_tmp.back()-args_tmp.front();
+	    }
+	  }
+	  if (function==at_ellipse)
+	    ;
+	  title_tmp=gen(args2,_SEQ__VECT);
+	  bool b=approx_mode(contextptr);
+	  if (!b)
+	    approx_mode(true,contextptr);
+	  plot_tmp=symbolic(*function._FUNCptr,title_tmp);
+	  if (!lidnt(title_tmp).empty())
+	    ; // cerr << plot_tmp << '\n';
+	  bool bb=io_graph(contextptr);
+	  int locked=0;
+	  if (bb){
+#ifdef HAVE_LIBPTHREAD
+	    // cerr << "plot title lock" << '\n';
+	    locked=pthread_mutex_trylock(&interactive_mutex);
+#endif
+	    if (!locked)
+	      io_graph(false,contextptr);
+	  }
+	  plot_tmp=protecteval(plot_tmp,1,contextptr);
+	  if (bb && !locked){
+	    io_graph(bb,contextptr);
+#ifdef HAVE_LIBPTHREAD
+	    pthread_mutex_unlock(&interactive_mutex);
+	    // cerr << "plot title unlock" << '\n';
+#endif
+	  }
+	  if (!b)
+	    approx_mode(false,contextptr);	
+	} // end function.type==_FUNC
+	else
+	  title_tmp=gen(args_tmp,_SEQ__VECT);
+      } // end size()>=2
+      else	
+	title_tmp=args_tmp;
+    }
+  }
+
+  void Graph2d::eval(int start){
+    plot_instructions.resize(symbolic_instructions.size());
+    if (plot_instructions.empty()) return;
+    int level=prog_eval_level_val(contextptr);
+    for (size_t i=start;i<symbolic_instructions.size();++i){
+      gen g=symbolic_instructions[i];
+      set_abort();
+      g=protecteval(g,level,contextptr);
+      clear_abort();
+      giac::ctrl_c=false;
+      kbd_interrupted=giac::interrupted=false;
+      if (i<plot_instructions.size())
+	plot_instructions[i]=g;
+      else
+	plot_instructions.push_back(g);
+      if (g.is_symb_of_sommet(at_trace)){
+	gen f=symbolic(at_evalf,g._SYMBptr->feuille);
+	f=protecteval(f,1,contextptr);
 #ifdef NUMWORKS
-      os_draw_string(0,LCD_HEIGHT_PX-STATUS_AREA_PX-17,COLOR_BLACK,COLOR_WHITE,"toolbox: cfg");
+	const int maxtrace=128;
 #else
-      os_draw_string(0,LCD_HEIGHT_PX-STATUS_AREA_PX-17,COLOR_BLACK,COLOR_WHITE,"menu: cfg");
+	const int maxtrace=512;
 #endif
-      int key=-1;
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;
-#if 1
-      if (key==KEY_CTRL_CATALOG || key==KEY_BOOK ){
-	char menu_xmin[32],menu_xmax[32],menu_ymin[32],menu_ymax[32],menu_zmin[32],menu_zmax[32];
-	for (;;){
-	  string s;
-	  s="xmin "+print_DOUBLE_(gr.window_xmin,contextptr);
-	  strcpy(menu_xmin,s.c_str());
-	  s="xmax "+print_DOUBLE_(gr.window_xmax,contextptr);
-	  strcpy(menu_xmax,s.c_str());
-	  s="ymin "+print_DOUBLE_(gr.window_ymin,contextptr);
-	  strcpy(menu_ymin,s.c_str());
-	  s="ymax "+print_DOUBLE_(gr.window_ymax,contextptr);
-	  strcpy(menu_ymax,s.c_str());
-	  s="zmin "+print_DOUBLE_(gr.window_zmin,contextptr);
-	  strcpy(menu_zmin,s.c_str());
-	  s="zmax "+print_DOUBLE_(gr.window_zmax,contextptr);
-	  strcpy(menu_zmax,s.c_str());
-	  Menu smallmenu;
-	  smallmenu.numitems=15;
-	  MenuItem smallmenuitems[smallmenu.numitems];
-	  smallmenu.items=smallmenuitems;
-	  smallmenu.height=12;
-	  //smallmenu.title = "KhiCAS";
-	  smallmenuitems[0].text = (char *) menu_xmin;
-	  smallmenuitems[1].text = (char *) menu_xmax;
-	  smallmenuitems[2].text = (char *) menu_ymin;
-	  smallmenuitems[3].text = (char *) menu_ymax;
-	  smallmenuitems[4].text = (char *) menu_zmin;
-	  smallmenuitems[5].text = (char *) menu_zmax;
-	  smallmenuitems[6].text = (char*) "Orthonormalize /";
-	  smallmenuitems[7].text = (char*) "Autoscale *";
-	  smallmenuitems[8].text = (char *) ("Zoom in +");
-	  smallmenuitems[9].text = (char *) ("Zoom out -");
-	  smallmenuitems[10].text = (char *) ("Y-Zoom out (-)");
-	  smallmenuitems[11].text = (char *) ((lang==1)?"raccourcis clavier":"3d shortcuts");
-	  smallmenuitems[12].text = (char*) ((lang==1)?"Voir axes":"Show axes");
-	  smallmenuitems[13].text = (char*) ((lang==1)?"Cacher axes":"Hide axes");
-	  smallmenuitems[14].text = (char*)((lang==1)?"Quitter":"Quit");
-	  drawRectangle(0,180,LCD_WIDTH_PX,60,_BLACK);
-	  int sres = doMenu(&smallmenu);
-	  if (sres == MENU_RETURN_EXIT)
-	    break;
-	  if (sres == MENU_RETURN_SELECTION || sres==KEY_CTRL_EXE) {
-	    const char * ptr=0;
-	    string s1; double d;
-	    if (smallmenu.selection==1){
-	      d=gr.window_xmin;
-	      if (inputdouble(menu_xmin,d,200,contextptr)){
-		gr.window_xmin=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==2){
-	      d=gr.window_xmax;
-	      if (inputdouble(menu_xmax,d,200,contextptr)){
-		gr.window_xmax=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==3){
-	      d=gr.window_ymin;
-	      if (inputdouble(menu_ymin,d,200,contextptr)){
-		gr.window_ymin=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==4){
-	      d=gr.window_ymax;
-	      if (inputdouble(menu_ymax,d,200,contextptr)){
-		gr.window_ymax=d;
-		gr.update();
-	      }
+	if (trace_instructions.size()>=maxtrace)
+	  trace_instructions.erase(trace_instructions.begin(),trace_instructions.begin()+maxtrace/2);
+	trace_instructions.push_back(f);
+      }
+    }
+    is3d=false;
+    for (size_t i=0;i<plot_instructions.size();++i){
+      gen g=plot_instructions[i];
+      if (giac::is3d(g)){
+	is3d=true;
+	update_rotation();
+	break;
+      }
+    }
+    update_g();
+  }
+
+  double Graph2d::find_eps() const {
+    double dx=window_xmax-window_xmin;
+    double dy=window_ymax-window_ymin;
+    double dz=window_zmax-window_zmin;
+    double eps,epsx,epsy;
+    int L=LCD_WIDTH_PX;
+    epsx=(npixels*dx)/L;
+    epsy=(npixels*dy)/(is3d?L:LCD_HEIGHT_PX);
+    eps=(epsx<epsy)?epsy:epsx;
+    if (is3d && dz>dy && dz >dx){
+      eps=npixels*dz/L;
+      eps *= 2;
+    }
+    return eps;
+  }
+
+  void Graph2d::set_gen_value(int n,const giac::gen & g,bool exec){
+    // set n-th entry value, if n==-1 add a level
+    if (!hp) return;
+    if (n==-1 || n>=symbolic_instructions.size()){
+      symbolic_instructions.push_back(g);
+      n=symbolic_instructions.size()-1;
+    } else symbolic_instructions[n]=g;
+    hp->set_string_value(n,g.print(contextptr));
+    if (exec)
+      eval(n);
+  }
+
+  void  Graph2d::find_xyz(double i,double j,double k,double & x,double & y,double & z) const {
+    if (is3d){ // FIXME
+      int horiz=LCD_WIDTH_PX/2,vert=horiz/2;//LCD_HEIGHT_PX/2;
+      double lcdz= LCD_HEIGHT_PX/4;
+      double xmin=-1,ymin=-1,xmax=1,ymax=1,xscale=0.6*(xmax-xmin)/horiz,yscale=0.6*(ymax-ymin)/vert;
+      double Z=current_depth; // -1..1
+      double I=i-horiz;
+      double J=j-LCD_HEIGHT_PX/2+lcdz*Z;
+      double X=yscale*J-xscale*I;
+      double Y=yscale*J+xscale*I;
+      do_transform(invtransform,X,Y,Z,x,y,z);
+    }
+    else {
+      z=k;
+      x=window_xmin+i*(window_xmax-window_xmin)/LCD_WIDTH_PX;
+      y=window_ymax-j*(window_ymax-window_ymin)/LCD_HEIGHT_PX;
+    }
+  }
+
+  gen geometry_round_numeric(double x,double y,double eps,bool approx){
+    return approx?gen(x,y):exact_double(x,eps)+cst_i*exact_double(y,eps);
+  }
+
+  gen geometry_round_numeric(double x,double y,double z,double eps,bool approx){
+    return gen(approx?makevecteur(x,y,z):makevecteur(exact_double(x,eps),exact_double(y,eps),exact_double(z,eps)),_POINT__VECT);
+  }
+
+  gen int2color(int couleur_){
+    gen col;
+    if (couleur_){
+      gen tmp;
+      int val;
+      vecteur colv;
+      if ( (val=(couleur_ & 0x0000ffff))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if ((val =(couleur_ & 0x00070000))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if ((val =(couleur_ & 0x00380000))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if ((val =(couleur_ & 0x01c00000))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if ((val =(couleur_ & 0x0e000000))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if ((val =(couleur_ & 0x30000000))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if ((val =(couleur_ & 0x40000000))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if ((val =(couleur_ & 0x80000000))){
+	tmp=val;
+	tmp.subtype=_INT_COLOR;
+	colv.push_back(tmp);
+      }
+      if (colv.size()==1)
+	col=colv.front();
+      else
+	col=symbolic(at_plus,gen(colv,_SEQ__VECT));
+    }
+    return col;
+  }
+
+  std::string print_color(int couleur){
+    return int2color(couleur).print(context0);
+  }
+
+  giac::gen add_attributs(const giac::gen & g,int couleur_,GIAC_CONTEXT) {
+    if (g.type!=_SYMB)
+      return g;
+    gen & f=g._SYMBptr->feuille;
+    if (g._SYMBptr->sommet==at_couleur && f.type==_VECT && !f._VECTptr->empty()){
+      gen col=couleur_;
+      col.subtype=_INT_COLOR;
+      vecteur v(*f._VECTptr);
+      v.back()=col;
+      return symbolic(at_couleur,gen(v,_SEQ__VECT));
+    }
+    if (couleur_==default_color(contextptr))
+      return g;
+    if (g._SYMBptr->sommet==at_of){
+      gen col=couleur_;
+      col.subtype=_INT_COLOR;
+      return symbolic(at_couleur,gen(makevecteur(g,col),_SEQ__VECT));
+    }
+    vecteur v =gen2vecteur(f);
+    gen col=int2color(couleur_);
+    v.push_back(symbolic(at_equal,gen(makevecteur(at_display,col),_SEQ__VECT)));
+    return symbolic(g._SYMBptr->sommet,(v.size()==1 && f.type!=_VECT)?f:gen(v,f.type==_VECT?f.subtype:_SEQ__VECT));
+  }
+
+  void Graph2d::do_handle(const gen & g){
+    if (hp){
+      set_gen_value(hp_pos,g,true);
+    }
+  }
+
+  void Graph2d::set_mode(const giac::gen & f_tmp,const giac::gen & f_final,int m,const string & help){
+    approx=true;
+    mode=m;
+    selected.clear();
+    redraw();
+    args_help.clear();
+    if (mode!=0 && mode!=255){
+      int oldmode=calc_mode(contextptr);
+      calc_mode(0,contextptr);
+      gen g(help,contextptr);
+      calc_mode(oldmode,contextptr);
+      if (g.type==_VECT){
+	const_iterateur it = g._VECTptr->begin(),itend=g._VECTptr->end();
+	for (;it!=itend;++it)
+	  args_help.push_back(it->print(contextptr));
+      }
+      else
+	args_help.push_back(g.print(contextptr));
+    }
+    if (mode==255)
+      modestr=gettext("Frame");
+    else
+      modestr=mode?gen2string(f_final):gettext("Pointer");
+    if (mode>=-1){
+      pushed=false;
+      moving_param=moving=moving_frame=false;
+      // history_pos=-1;
+      mode=m;
+      function_final=f_final;
+      function_tmp=f_tmp;
+      args_tmp.clear();
+      geo_handle(FL_MOVE,0);
+      update_g();
+    }
+  }
+
+  vecteur Graph2d::selection2vecteur(const vector<int> & v){
+    int n=v.size();
+    vecteur res(n);
+    for (int i=0;i<n;++i){
+      res[i]=plot_instructions[v[i]];
+    }
+    return res;
+  }
+
+  int findfirstclosedcurve(const vecteur & v){
+    int s=v.size();
+    for (int i=0;i<s;++i){
+      gen g=remove_at_pnt(v[i]);
+      if (g.is_symb_of_sommet(at_cercle))
+	return i;
+      if (g.type==_VECT && g.subtype==_GROUP__VECT){
+	vecteur & w=*g._VECTptr;
+	if (!w.empty() && w.front()==w.back())
+	  return i;
+      }
+    }
+    return -1;
+  }
+
+  void Graph2d::geometry_round(double x,double y,double z,double eps,gen & tmp,GIAC_CONTEXT)  {
+    tmp=is3d?geometry_round_numeric(x,y,z,eps,approx):geometry_round_numeric(x,y,eps,approx);
+    selected=nearest_point(plot_instructions,is3d?geometry_round_numeric(x,y,z,eps,true):geometry_round_numeric(x,y,eps,true),eps,contextptr);
+    // bug bonux: when a figure is saved, plot_instructions is saved
+    // if there are sequences in plot_instructions
+    // they are not put back in an individual level
+    while (!selected.empty() && selected.back()>=hp->elements.size())
+      selected.pop_back();
+  }
+
+  gen Graph2d::geometry_round(double x,double y,double z,double eps,gen & original,int & pos,bool selectfirstlevel,bool setscroller) {
+    if (!hp)
+      return undef;
+    gen tmp;
+    pos=-1;
+    geometry_round(x,y,z,eps,tmp,contextptr);
+    if (selected.empty())
+      return tmp;
+    if (function_final==at_areaatraw || function_final==at_areaat || function_final==at_perimeteratraw || function_final==at_perimeterat){
+      int p=findfirstclosedcurve(selection2vecteur(selected));
+      if (p>0){
+	pos=p;
+      }
+    }
+    if (pos==-1){
+      if (selectfirstlevel){
+	sort(selected.begin(),selected.end());
+	// patch so that we move element and not the curve
+	int p=findfirstpoint(selection2vecteur(selected));
+	if (p>0){
+	  pos=p;
+	}
+      }
+      else
+	pos=findfirstpoint(selection2vecteur(selected));
+    }
+    gen g=symbolic_instructions[ (pos<0)?(pos=selected.front()):(pos=selected[pos]) ];
+    if (pos>=0 && pos<hp->elements.size()){
+      // hp->_sel_begin=hp->_sel_end=pos;
+      // if (setscroller) hp->line=pos;
+    }
+    if (g.is_symb_of_sommet(at_plus) && g._SYMBptr->feuille.type==_VECT && !g._SYMBptr->feuille._VECTptr->empty())
+      g=g._SYMBptr->feuille._VECTptr->front();
+    if (g.is_symb_of_sommet(at_sto) && g._SYMBptr->feuille.type==_VECT ){
+      vecteur & v = *g._SYMBptr->feuille._VECTptr;
+      if (v.size()==2){
+	original = v[0];
+	tmp = v[1];
+	if (tmp.type==_IDNT){
+	  gen valeur=protecteval(original,1,contextptr);
+	  if (valeur.is_symb_of_sommet(at_pnt)){
+	    gen & valf = valeur._SYMBptr->feuille;
+	    if (valf.type==_VECT){
+	      vecteur & valv = *valf._VECTptr;
+	      int s=v.size();
+	      if (s>1){
+		gen valv1=valv[1];
+		if (valv1.type==_VECT && valv1._VECTptr->size()>2){
+		  tmp=symbolic(at_extract_measure,v[1]);
+		}
+	      }
+	    }
+	  }
+	}
+      }
+    }
+    return tmp;
+  }
+
+  void Graph2d::autoname_plus_plus(){
+    if (hp){
+      string s=autoname(contextptr);
+      giac::autoname_plus_plus(s);
+      autoname(s,contextptr);
+    }
+  }
+  
+  int Graph2d::geo_handle(int event,int key){
+    double eps=find_eps();
+    int pos;
+    gen tmp,tmp2,decal;
+    if (event==FL_PUSH)
+      moving_param=false;
+    if ( pushed && !moving && !moving_frame && mode ==0 && in_area && event==FL_DRAG){
+      // FIXME? redraw();
+      return 1;
+    }
+    if (mode>=2 && event==FL_MOVE && args_tmp.size()>mode)
+      event=FL_RELEASE;
+    if ( in_area && ((mode!=1 && event==FL_DRAG) || event==FL_PUSH || event==FL_RELEASE || (mode>=2 && event==FL_MOVE)) ){
+      double newx,newy,newz;
+      find_xyz(current_i,current_j,current_depth,newx,newy,newz);
+      round3(newx,window_xmin,window_xmax);
+      round3(newy,window_ymin,window_ymax);
+      if (is3d)
+	round3(newz,window_zmin,window_zmax);
+      tmp=geometry_round(newx,newy,newz,eps,tmp2,pos,mode==0 || (args_tmp.size()==mode && function_final.type==_FUNC && equalposcomp(transformation_functions,*function_final._FUNCptr)),event==FL_RELEASE);
+      if (tmp.type!=_IDNT && !tmp.is_symb_of_sommet(at_extract_measure)){
+	bool done=false;
+	if (mode==0 && event==FL_PUSH && current_i<192 && current_j<14*nparams+21){
+	  double d=current_j/14.-1;
+	  vecteur vp=param(d);
+	  if (vp.size()==2){
+	    tmp=vp[0][0];
+	    tmp2=vp[0];
+	    pos=vp[1].val;
+	    done=moving_param=true;
+	    param_min=evalf_double(tmp2[1],1,contextptr)._DOUBLE_val;
+	    param_max=evalf_double(tmp2[2],1,contextptr)._DOUBLE_val;
+	    param_step=evalf_double(tmp2[4],1,contextptr)._DOUBLE_val;
+	    param_orig=param_value=evalf_double(tmp2[3],1,contextptr)._DOUBLE_val;
+	  }
+	}
+	if (!done){
+	  if (tmp.type==_VECT && tmp._VECTptr->size()==3){
+	    tmp.subtype=_SEQ__VECT;
+	    tmp=symbolic(at_point,tmp);
+	  }
+	  else
+	    tmp=symbolic(at_point,makevecteur(re(tmp,contextptr),im(tmp,contextptr)));
+	}
+      }
+    }
+    double newx,newy,newz;
+    if (is3d){
+      double x1,y1,z1,x2,y2,z2;
+      find_xyz(current_i,current_j,current_depth,x1,y1,z1);
+      find_xyz(push_i,push_j,push_depth,x2,y2,z2);
+      newx=x1-x2; newy=y1-y2; newz=z1-z2;
+    } else {
+      int dw=LCD_WIDTH_PX,dh=LCD_HEIGHT_PX;
+      double dx=window_xmax-window_xmin;
+      double dy=window_ymax-window_ymin;
+      double x_scale=dx/dw,y_scale=dy/dh;
+      newx=(current_i-push_i)*x_scale;
+      newy=(push_j-current_j)*y_scale;
+      newz=0;
+    }
+    round3(newx,window_xmin,window_xmax);
+    round3(newy,window_ymin,window_ymax);      
+    if (is3d){
+      round3(newz,window_zmin,window_zmax);
+      decal=in_area?geometry_round_numeric(newx,newy,newz,eps,approx):0;
+      if (decal.type==_VECT && decal.subtype==_POINT__VECT)
+	decal.subtype=0;
+    }
+    else
+      decal=in_area?geometry_round_numeric(newx,newy,eps,approx):0;
+    // cerr << in_area << " " << decal << '\n';
+    if (mode==0 || mode==255) {
+      if (event==FL_PUSH){ 
+	// select object && flag to move it 
+	if (mode==0 && pos>=0){
+	  if (tmp.type==_IDNT){
+	    drag_original_value=tmp2;
+	    drag_name=tmp;
+	  }
+	  else {
+	    drag_original_value=symbolic_instructions[pos];
+	    drag_name=0;
+	  }
+	  hp_pos=pos;
+	  moving = true;
+	}
+	else { // nothing selected, move frame
+	  if (!(display_mode & 0x80)) // disabled by default in 3-d 
+	    moving_frame=true;
+	}
+	return 1;
+      }
+      if (moving_frame && (event==FL_DRAG || event==FL_RELEASE) ){
+	window_xmin -= newx;
+	window_xmax -= newx;
+	window_ymin -= newy;
+	window_ymax -= newy;
+	window_zmin -= newz;
+	window_zmax -= newz;
+	push_i = current_i;
+	push_j = current_j;
+	push_depth = current_depth;
+	redraw();
+	if (event==FL_RELEASE)
+	  moving_frame=false;
+	return 1;
+      }
+      if (mode==255)
+	return 0;
+      if (moving_param && (event==FL_DRAG || event==FL_RELEASE) ){
+	// key ->
+	if (key==KEY_CTRL_EXIT)
+	  param_value=param_orig;
+	double ps=param_step;
+	if (ps<=0)
+	  ps=(param_max-param_min)/100;
+	if (key==KEY_CTRL_LEFT)
+	  param_value -= ps;
+	if (key==KEY_SHIFT_LEFT)
+	  param_value -= 10*ps;
+	if (key==KEY_CTRL_RIGHT)
+	  param_value += ps;
+	if (key==KEY_SHIFT_RIGHT)
+	  param_value += 10*ps;
+	if (param_value<param_min)
+	  param_value=param_min;
+	if (param_value>param_max)
+	  param_value=param_max;
+	current_i=64+128*(param_value-param_min)/(param_max-param_min);
+	if (param_step<=0)
+	  do_handle(symbolic(at_assume,symb_equal(drag_name,param_value)));
+	else {
+	  gen newval=symbolic(at_element,makesequence(symb_interval(param_min,param_max),param_value));
+	  do_handle(symbolic(at_sto,makevecteur(newval,drag_name)));
+	}
+	if (event==FL_RELEASE){
+	  moving_param=moving=false;
+	}
+	return 1;
+      }
+      if (moving && (event==FL_DRAG || event==FL_RELEASE) ){
+	// cerr << current_i << " " << current_j << '\n';
+	// avoid point()+complex+complex+complex
+	gen newval=drag_original_value;
+	if (in_area && key!=KEY_CTRL_EXIT){
+	  if (drag_original_value.is_symb_of_sommet(at_plus) && drag_original_value._SYMBptr->feuille.type==_VECT && drag_original_value._SYMBptr->feuille._VECTptr->size()>=2){
+	    vecteur v=*drag_original_value._SYMBptr->feuille._VECTptr;
+	    if (v[1].is_symb_of_sommet(at_nop))
+	      v[1]=v[1]._SYMBptr->feuille;
+	    newval=symbolic(at_plus,makevecteur(v[0],symbolic(at_nop,ratnormal(_plus(vecteur(v.begin()+1,v.end()),contextptr)+decal))));
+	  }
+	  else {
+	    newval=is_zero(decal)?drag_original_value:symbolic(at_plus,makevecteur(drag_original_value,symbolic(at_nop,decal)));
+	  }
+	}
+	int dclick = 0 || drag_original_value.type==_VECT;
+	if (!dclick){
+	  if (drag_name.type==_IDNT)
+	    do_handle(symbolic(at_sto,makevecteur(newval,drag_name)));
+	  else
+	    do_handle(newval);
+	}
+	if (event==FL_RELEASE)
+	  moving=false;
+	selected.clear();
+	redraw();
+	return 1;
+      }
+      return 0;
+    }
+    selected.clear();
+    if (mode==1){
+      if (function_final!=at_point){
+	if (event==FL_RELEASE){
+	  string args=autoname(contextptr)+":=";
+	  if (function_final.type==_FUNC)
+	    args += function_final._FUNCptr->ptr()->s;
+	  args +="(";
+	  if (function_final==at_plotode)
+	    args += fcnfield + "," + fcnvars + "," +tmp.print(contextptr) + ",plan)";
+	  else
+	    args += tmp.print(contextptr) + ")";
+	  autoname_plus_plus();
+	  set_gen_value(-1,gen(args,contextptr),true);
+	}
+	if (event==FL_PUSH || event==FL_DRAG || event==FL_RELEASE)
+	  return 1;
+	return 0;
+      }
+      // point|segment mode
+      if (event==FL_RELEASE){
+	hp_pos=-1;
+	if (hp && !args_tmp.empty() && (std::abs(push_i-current_i)>npixels || std::abs(push_j-current_j)>npixels || (is3d && std::abs(push_depth-current_depth) >0)) ){
+	  // make a segment
+	  gen val1,val2;
+	  if (in_area && args_tmp.front().is_symb_of_sommet(at_point)){
+	    val1=gen(autoname(contextptr),contextptr);
+	    // put in last history pack level
+	    set_gen_value(-1,symbolic(at_sto,makevecteur(add_attributs(args_tmp.front(),couleur,contextptr),val1)),false);
+	    hp_pos=hp->elements.size()-1;
+	    autoname_plus_plus();
+	  }
+	  else 
+	    val1=args_tmp.front();
+	  if (in_area && tmp.is_symb_of_sommet(at_point)){
+	    val2=gen(autoname(contextptr),contextptr);
+	    gen tmp3=symbolic(at_sto,makevecteur(add_attributs(tmp,couleur,contextptr),val2));
+	    set_gen_value(-1,tmp3,false);
+	    if (hp_pos<0) hp_pos=hp->elements.size()-1;
+	    autoname_plus_plus();
+	  }
+	  else 
+	    val2=tmp;
+	  if (in_area){
+	    gen tmp3=add_attributs(symbolic(at_segment,makevecteur(val1,val2)),couleur,contextptr);
+	    string v1v2=val1.print(contextptr)+val2.print(contextptr);
+	    gen g1g2(v1v2,contextptr);
+	    if (g1g2.type!=_IDNT)
+	      g1g2=gen(v1v2+"_",contextptr);
+	    tmp3=symbolic(at_sto,makevecteur(tmp3,g1g2));
+	    set_gen_value(-1,tmp3,false);
+	    if (hp_pos<0) hp_pos=hp->elements.size()-1;
+	    eval(hp_pos);
+	  }
+	  return 1;
+	}
+	if (in_area && tmp.type!=_IDNT)
+	  do_handle(symbolic(at_sto,makevecteur(add_attributs(tmp,couleur,contextptr),gen(autoname(contextptr),contextptr))));
+	// element
+	if (tmp.type==_IDNT && tmp2.type==_SYMB && !equalposcomp(point_sommet_tab_op,tmp2._SYMBptr->sommet)){
+	  // tmp2 is the geo object, find parameter value
+	  double newx,newy,newz;
+	  find_xyz(current_i,current_j,current_depth,newx,newy,newz);
+	  round3(newx,window_xmin,window_xmax);
+	  round3(newy,window_ymin,window_ymax);
+	  gen t=projection(evalf(tmp2,1,contextptr),gen(newx,newy),contextptr);
+	  if (is_undef(t))
+	    return 0;
+	  gen tmp3=symbolic(at_element,( (t.type<_IDNT || t.type==_VECT)?gen(makevecteur(tmp,t),_SEQ__VECT):tmp));
+	  tmp3=symbolic(at_sto,makevecteur(add_attributs(tmp3,couleur,contextptr),gen(autoname(contextptr),contextptr)));
+	  set_gen_value(-1,tmp3,false);
+	  if (hp_pos<0) hp_pos=hp->elements.size()-1;
+	  eval(hp_pos);
+	}
+	return 1;
+      }
+      if (event==FL_PUSH){
+	args_tmp=vecteur(1,tmp);
+	return 1;
+      }
+      if (event==FL_DRAG){
+	redraw();
+	return 1;
+      }
+      return 0;
+    }
+    gen tmpval=remove_at_pnt(tmp.eval(1,contextptr));
+    gen somm=symbolic(at_sommets,tmp);
+    int npoints=1;
+    if (!equalposcomp(nosplit_polygon_function,*function_final._FUNCptr)){
+      if (tmpval.type==_VECT && tmpval.subtype==_GROUP__VECT)
+	npoints=tmpval._VECTptr->size();
+      if (tmpval.is_symb_of_sommet(at_cercle))
+	npoints=is3d?3:2;
+    }
+    unsigned args_size=args_tmp.size();
+    // mode>=2
+    if (event==FL_MOVE || event==FL_DRAG || event==FL_RELEASE || event==FL_PUSH){
+      if (args_size<args_tmp_push_size)
+	args_tmp_push_size=args_size;
+      args_tmp.erase(args_tmp.begin()+args_tmp_push_size,args_tmp.end());
+    }
+    unsigned new_args_size=args_tmp.size();
+    gen tmp_push=tmp;
+    bool swapargs=false;
+    if (npoints==2 && (new_args_size==2 || new_args_size==1) && (function_final==at_angleat || function_final==at_angleatraw) ){
+      // search if args_tmp[0] or args_tmp[1] is a vertex of tmp
+      gen tmp2=remove_at_pnt(evalf(tmp,1,contextptr));
+      gen somm=symbolic(at_sommets,tmp);
+      if (tmp2.type==_VECT && tmp2._VECTptr->size()==2){
+	gen tmpa=remove_at_pnt(evalf(args_tmp[0],1,contextptr));
+	gen tmpb=new_args_size==2?remove_at_pnt(evalf(args_tmp[1],1,contextptr)):undef;
+	if (npoints==2 && tmpa==tmp2._VECTptr->front() && tmpb!=tmp2._VECTptr->back()){
+	  tmp=symbolic(at_at,gen(makevecteur(somm,1),_SEQ__VECT));
+	  npoints=1;
+	}
+	if (npoints==2 && tmpa==tmp2._VECTptr->back() && tmpb!=tmp2._VECTptr->front()){
+	  tmp=symbolic(at_at,gen(makevecteur(somm,0),_SEQ__VECT));
+	  npoints=1;
+	}
+	if (npoints==2 && tmpb==tmp2._VECTptr->front() && tmpa!=tmp2._VECTptr->back() ){
+	  swapargs=true;
+	  tmp=symbolic(at_at,gen(makevecteur(somm,1),_SEQ__VECT));
+	  npoints=1;
+	}
+	if (npoints==2 && tmpb==tmp2._VECTptr->back() && tmpa!=tmp2._VECTptr->front()){
+	  swapargs=true;
+	  tmp=symbolic(at_at,gen(makevecteur(somm,0),_SEQ__VECT));
+	  npoints=1;
+	}
+      }
+    }
+    if (npoints+args_tmp.size()>mode)
+      npoints=1;
+    if (event==FL_MOVE || event==FL_DRAG || event==FL_RELEASE){
+      if (args_size && args_tmp_push_size && args_push!=tmp_push){
+	// replace by current mouse position
+	if (npoints==1)
+	  args_tmp.push_back(tmp);
+	else {
+	  gen somm=symbolic(at_sommets,tmp);
+	  for (int i=0;i<npoints;++i){
+	    args_tmp.push_back(symbolic(at_at,gen(makevecteur(somm,i),_SEQ__VECT)));
+	  }
+	}
+	redraw();
+	if (event!=FL_RELEASE || (abs(push_i-current_i)<=5 && abs(push_j-current_j)<=5))
+	  return 1;
+      }
+    }
+    if (event==FL_PUSH){
+      if (swapargs)
+	swapgen(args_tmp[0],args_tmp[1]);
+      args_push=tmp_push;
+      if (npoints==1)
+	args_tmp.push_back(tmp);
+      else {
+	for (int i=0;i<npoints;++i){
+	  args_tmp.push_back(symbolic(at_at,gen(makevecteur(somm,i),_SEQ__VECT)));
+	}
+      }
+      args_tmp_push_size=args_tmp.size();
+      redraw();
+      return 1;
+    }
+    if (event==FL_RELEASE){
+      int s=args_tmp.size();
+      args_tmp_push_size=s;
+      if (mode>1 && s>=mode){
+	if (s>mode){ 
+	  args_tmp=vecteur(args_tmp.begin(),args_tmp.begin()+mode);
+	  s=mode;
+	}
+	gen tmp_plot;
+	if (in_area && function_final.type==_FUNC) {
+	  gen res,objname=gen(autoname(contextptr),contextptr);
+	  hp_pos=hp->elements.size();
+	  if (hp_pos && hp->elements[hp_pos-1].s.empty())
+	    --hp_pos;
+	  // hp->update_pos=hp_pos;
+	  int pos0=hp_pos;
+	  unary_function_ptr * ptr=function_final._FUNCptr;
+	  int ifinal=mode;
+	  if (equalposcomp(measure_functions,*ptr))
+	    ifinal--;
+	  // first replace points in args_tmp by assignations
+	  for (int i=0;i<ifinal;++i){
+	    tmp_plot=args_tmp[i];
+	    if (tmp_plot.is_symb_of_sommet(at_point)){
+	      tmp_plot=symbolic(at_sto,makevecteur(add_attributs(tmp_plot,couleur,contextptr),objname));
+	      args_tmp[i]=objname;
+	      set_gen_value(hp_pos,tmp_plot,false);
+	      add_entry(hp_pos+1);
+	      ++hp_pos;
+	      autoname_plus_plus();
+	      objname=gen(autoname(contextptr),contextptr);
+	    }
+	  }
+	  vecteur argv=args_tmp;
+	  if (*ptr==(is3d?at_sphere:at_cercle)){
+	    gen argv1;
+#ifdef NO_STDEXCEPT
+	    argv1=evalf(args_tmp.back(),1,contextptr);
+	    argv1=evalf_double(argv1,1,contextptr);
+#else
+	    try {
+	      argv1=evalf(args_tmp.back(),1,contextptr);
+	      argv1=evalf_double(argv1,1,contextptr);
+	    }
+	    catch (std::runtime_error & e){
+	      argv1=undef;
+	    }
+#endif
+	    if (argv1.is_symb_of_sommet(at_pnt) ||argv1.type==_IDNT){
+	      argv1=remove_at_pnt(argv1);
+	      if ( (argv1.type==_VECT && argv1.subtype==_POINT__VECT) || argv1.type==_CPLX || argv1.type==_IDNT)
+	      argv.back()=args_tmp.back()-args_tmp.front();
+	    }
+	  }
+	  tmp_plot=symbolic(*ptr,gen(argv,_SEQ__VECT));
+#ifdef NO_STDEXCEPT
+	  res=evalf(tmp_plot,1,contextptr);
+#else
+	  try {
+	    res=evalf(tmp_plot,1,contextptr);
+	  }
+	  catch (std::runtime_error & err){
+	    res=undef;
+	  }
+#endif
+	  tmp_plot=symbolic(at_sto,makevecteur(add_attributs(tmp_plot,couleur,contextptr),objname));
+	  set_gen_value(hp_pos,tmp_plot,false);
+	  add_entry(hp_pos+1);
+	  ++hp_pos;
+	  if (res.is_symb_of_sommet(at_pnt)){
+	    res=remove_at_pnt(res);
+	    int ns=0;
+	    if (res.type==_VECT && res.subtype==_GROUP__VECT && (ns=res._VECTptr->size())>2){
+	      vecteur l;
+	      if (res._VECTptr->back()==res._VECTptr->front())
+		--ns;
+	      if (function_final.type==_FUNC && equalposcomp(transformation_functions,*function_final._FUNCptr)){
+		vecteur argv;
+		gen objn,som=symbolic(at_sommets,objname);
+		for (int i=1;i<=ns;++i){
+		  tmp_plot=symbolic(at_at,gen(makevecteur(som,i-1),_SEQ__VECT));
+		  objn=gen(autoname(contextptr)+print_INT_(i),contextptr);
+		  argv.push_back(objn);
+		  set_gen_value(hp_pos,symbolic(at_sto,gen(makevecteur(tmp_plot,objn),_SEQ__VECT)),false);
+		  add_entry(hp_pos+1);
+		  ++hp_pos;
+		}
+		for (int i=1;i<=ns;++i){
+		  tmp_plot=symbolic(at_segment,makevecteur(argv[i-1],argv[i%ns]));
+		  set_gen_value(hp_pos,symbolic(at_sto,makevecteur(add_attributs(tmp_plot,couleur,contextptr),gen(autoname(contextptr)+print_INT_(ns+i),contextptr))),false);
+		  add_entry(hp_pos+1);
+		  ++hp_pos;
+		}		
+	      }
+	      else {
+		for (int i=mode;i<ns;++i){
+		  tmp_plot=symb_at(
+				   symbolic(at_sommets,gen(autoname(contextptr),contextptr))
+				   ,i,contextptr);
+		  gen newname=gen(autoname(contextptr)+print_INT_(i),contextptr);
+		  set_gen_value(hp_pos,symbolic(at_sto,makevecteur(tmp_plot,newname)),false);
+		  args_tmp.push_back(newname);
+		  add_entry(hp_pos+1);
+		  ++hp_pos;
+		}
+		for (int i=1;i<=ns;++i){
+		  tmp_plot=symbolic(at_segment,makevecteur(args_tmp[i-1],args_tmp[i%ns]));
+		  set_gen_value(hp_pos,symbolic(at_sto,makevecteur(add_attributs(tmp_plot,couleur,contextptr),gen(autoname(contextptr)+print_INT_(ns+i),contextptr))),false);
+		  add_entry(hp_pos+1);
+		  ++hp_pos;
+		}
+	      }
+	    } // if res.type==_VECT
+	  }
+	  autoname_plus_plus();
+	  // hp->undo_position=save_undo_position;
+	  eval(pos0);
+	}
+	args_tmp.clear();
+	args_tmp_push_size=0;
+      }
+      redraw();
+      return 1;
+    }
+    return 0;
+  }
+
+  void geosave(textArea * text,GIAC_CONTEXT){
+    string s=remove_extension(text->filename);
+    gen tmp(s,contextptr);
+    if (tmp.type==_IDNT){
+      sto(makevecteur(at_pnt,string2gen(merge_area(text->elements),false)),tmp,contextptr);
+      return;
+    }
+    else {
+      for (int i=0;i<10;++i){
+	string s1=s+print_INT_(i);
+	tmp=gen(s1,contextptr);
+	if (tmp.type==_IDNT){
+	  confirm(lang==1?"Nom de sauvegarde reserve":"Unable to use reserved name",((lang==1?"Nom utilise ":"Name used ")+s1).c_str());
+	  sto(makevecteur(at_pnt,string2gen(merge_area(text->elements),false)),tmp,contextptr);
+	  return;
+	}
+      }
+    }
+    confirm(lang==1?"Nom de sauvegarde reserve":"Unable to use reserved name",lang==1?"Sauvegarde impossible":"Unable to save");
+  }
+
+  void geohelp(GIAC_CONTEXT){
+    textArea text;
+    text.editable=false;
+    text.clipline=-1;
+    text.title = (char*)((lang==1)?"Aide":"Help");
+    text.allowF1=false;
+    text.python=false;
+    add(&text,lang==1?
+	"haut/bas/droit/gauche: change point de vue\ny^x ou e^x: trace 3d precis\nEsc/Back: quitte ou interrompt le trace 3d en cours\n( et ): modifie le rendu des surfaces raides 3d\n0: surfaces cachees 3d ON/OFF\n.: remplissage surface 3d raide ON/OFF\n5 reset 3d view\n7,8,9,1,2,3: deplacement 3d\n\nGeometrie\nF4: change le mode\nLe mode repere (shift 7) permet de changer le point de vue\nLe mode pointeur (shift 8) permet de bouger un objet et les objets dependants avec enter/OK et les touches de deplacement\nLes autres modes permettent de creer des objets\nEsc/Back: permet de passer en vue symbolique et de creer/modifier des objets par des commandes, taper enter/OK pour revenir en vue graphique\n4,6: modifie la profondeur du clic":
+	"up/down/right/left: modify viewpoint\nEsc/Back: leave or interrupt 3d rendering\ny^x or e^x: precise 3d\n( and ): modify stiff surfaces 3d rendering\n0: hidden 3d surfaces ON/OFF\n.: fill stiff 3d surfacesON/OFF\n5 reset 3d view\n7,8,9,1,2,3: move 3d view\n\nGeometry\nF4: change geometry mode\nFrame mode (shift F1): modify viewpoint\nPointer mode (shift F2): select an object and move it with enter/OK and cursor keys\nOther modes: create an object\nEsc/Back: go to symbolic view where you can create/modify objects with commands, press enter/OK to go back to graphic view");
+    int exec=doTextArea(&text,contextptr);
+  }
+
+  string inputparam(char curname,int symbolic,GIAC_CONTEXT){
+    Menu paramenu;
+    paramenu.numitems=7;
+    MenuItem paramenuitems[paramenu.numitems];
+    paramenu.items=paramenuitems;
+    paramenu.height=8;
+    paramenu.title = (char *)"Parameter";
+    char menu_xcur[32],menu_xmin[32],menu_xmax[32],menu_xstep[32],menu_name[16]="name a";
+    menu_name[5]=curname;
+    double pcur=0,pmin=-5,pmax=5,pstep=0.1;
+    std::string s;
+    bool doit; 
+    for (;;){
+      s="cur "+giac::print_DOUBLE_(pcur,contextptr);
+      strcpy(menu_xcur,s.c_str());
+      s="min "+giac::print_DOUBLE_(pmin,contextptr);
+      strcpy(menu_xmin,s.c_str());
+      s="max "+giac::print_DOUBLE_(pmax,contextptr);
+      strcpy(menu_xmax,s.c_str());
+      s="step "+giac::print_DOUBLE_(pstep,contextptr);
+      strcpy(menu_xstep,s.c_str());
+      paramenuitems[0].text = (char *) "OK";
+      paramenuitems[1].text = (char *) menu_name;
+      paramenuitems[2].text = (char *) menu_xcur;
+      paramenuitems[3].text = (char *) menu_xmin;
+      paramenuitems[4].text = (char *) menu_xmax;
+      paramenuitems[5].text = (char *) menu_xstep;
+      paramenuitems[6].text = (char *) "Symbolic";      
+      paramenuitems[6].type = MENUITEM_CHECKBOX;
+      paramenuitems[6].value = symbolic;
+      int sres = doMenu(&paramenu);
+      doit = sres==MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE;
+      if (doit) {
+	std::string s1; double d;
+	if (paramenu.selection==2){
+	  handle_f5();
+	  if (inputline(menu_name,(lang==1)?"Nouvelle valeur?":"New value?",s1,false)==KEY_CTRL_EXE && s1.size()>0 && isalpha(s1[0])){
+	    if (s1.size()>10)
+	      s1=s1.substr(0,10);
+	    strcpy(menu_name,("name "+s1).c_str());
+	  }
+	  continue;
+	}	
+	if (paramenu.selection==3){
+	  inputdouble(menu_xcur,pcur,contextptr);
+	  continue;
+	}
+	if (paramenu.selection==4){
+	  inputdouble(menu_xmin,pmin,contextptr);
+	  continue;
+	}
+	if (paramenu.selection==5){
+	  inputdouble(menu_xmax,pmax,contextptr);
+	  continue;
+	}
+	if (paramenu.selection==6){
+	  inputdouble(menu_xstep,pstep,contextptr);
+	  pstep=fabs(pstep);
+	  continue;
+	}
+	if (paramenu.selection==7){
+	  symbolic=1-symbolic;
+	  continue;
+	}
+	// if (paramenu.selection==6) break;
+      } // end menu
+      break;
+    } // end for (;;)
+    if (doit && pmin<pmax && pstep>0){
+      if (symbolic){
+	s="assume(";
+	s += (menu_name+5);
+	s += "=[";
+	s += (menu_xcur+4);
+	s += ',';
+	s += (menu_xmin+4);
+	s += ',';
+	s += (menu_xmax+4);
+	s += ',';
+	s += (menu_xstep+5);
+	s += "])";
+      }
+      else {
+	s=(menu_name+5);
+	s += ":=element(";
+	s += (menu_xmin+4);
+	s += "..";
+	s += (menu_xmax+4);
+	s += ',';
+	s += (menu_xcur+4);
+	s += ")";
+      }
+    } else s="";
+    return s;
+  }  
+
+  int Graph2d::ui(){
+    Graph2d & gr=*this;
+    // UI
+    int saveprecision=gr.precision;
+    gr.precision += 2; // fast draw first
+    gr.draw();
+    gr.precision=saveprecision;    
+    gr.must_redraw=true;
+#ifdef NSPIRE_NEWLIB
+    const char * msg="+-: zoom, pad: move, esc: quit";
+#else
+    const char * msg="+-: zoom, pad: move, EXIT: quit";
+#endif
+    DefineStatusMessage((char *)msg,1,0,0);
+    DisplayStatusArea();
+    for (;;){
+      int saveprec=gr.precision;
+      if (gr.doprecise){
+	gr.doprecise=false;
+	gr.precision=1;//gr.precision-=2;
+      }
+      if (gr.must_redraw)
+	gr.draw();
+      if (hp){
+	string msg=hp->filename+":"+(mode==255?" Frame. Shift-1: help":modestr);
+	// help
+	int help_pos=args_tmp.empty()?0:args_tmp.size()-1;
+	if (help_pos<args_help.size()){
+	  msg += " "+args_help[help_pos];
+	}
+	DefineStatusMessage((char *)msg.c_str(),1,0,0);
+	DisplayStatusArea();
+      }
+      gr.must_redraw=true;
+      gr.precision=saveprec;
+      if (!hp){
+#ifdef NUMWORKS
+	os_draw_string(0,LCD_HEIGHT_PX-STATUS_AREA_PX-17,COLOR_BLACK,COLOR_WHITE,"home: cfg");
+#else
+	os_draw_string(0,LCD_HEIGHT_PX-STATUS_AREA_PX-17,COLOR_BLACK,COLOR_WHITE,"doc: cfg");
+#endif
+      }
+      int key=-1;
+      GetKey(&key);
+      if (key==KEY_SHUTDOWN)
+	return key;
+      if (key==KEY_CTRL_F1){
+	geohelp(contextptr);
+	continue;
+      }
+      if (hp){
+	if (key==KEY_CTRL_F7 )
+	  set_mode(0,0,255,"");
+	if (key==KEY_CTRL_F8 )
+	  set_mode(0,0,0,"");
+	if (key==KEY_CTRL_F9 )
+	  set_mode(at_point,at_point,1,"Point");
+	if (key==KEY_CTRL_F10)
+	  set_mode(at_segment,is3d?at_sphere:at_cercle,2,"Center,Point");
+	if (key==KEY_CTRL_F11)
+	  set_mode(at_segment,at_triangle,3,"Point1,Point2,Point3");
+	if (key>='a' && key<='z'){
+	  bool found=false;
+	  char ch=key;
+	  gen tmp=gen(string("")+ch,contextptr);
+	  if (tmp.type==_IDNT){
+	    int pos=0;
+	    for (int i=0;i<plot_instructions.size();++i){
+	      if (plot_instructions[i].is_symb_of_sommet(at_parameter)){
+		gen name=plot_instructions[i]._SYMBptr->feuille[0];
+		++pos;
+		if (name==tmp){
+		  current_j=7+14*pos;
+		  found=true;
+		  break;
+		}
+	      }
+	    }
+	  }
+	  if (found)
+	    continue;
+	  key -= 'a'-'A';
+	}
+	if (key>='A' && key<='Z'){
+	  char ch=key;
+	  gen tmp=gen(string("")+ch,contextptr);
+	  if (tmp.type==_IDNT){
+	    tmp=evalf(tmp,1,contextptr);
+	    if (tmp.is_symb_of_sommet(at_pnt)){
+	      tmp=remove_at_pnt(tmp);
+	      if (tmp.is_symb_of_sommet(at_cercle))
+		tmp=(tmp._SYMBptr->feuille[0]+tmp._SYMBptr->feuille[1])/2;
+	      if (tmp.type==_SYMB)
+		tmp=tmp._SYMBptr->feuille;
+	      if (tmp.type==_VECT && tmp.subtype!=_POINT__VECT && !tmp._VECTptr->empty())
+		tmp=tmp._VECTptr->front();
+	      if (is3d && tmp.type==_VECT && tmp._VECTptr->size()==3 && tmp.subtype==_POINT__VECT){
+		const vecteur & tv=*tmp._VECTptr;
+		gen x=tv[0],y=tv[1],z=tv[2];
+		x=evalf_double(x,1,contextptr); 
+		y=evalf_double(y,1,contextptr); 
+		z=evalf_double(z,1,contextptr);
+		if (x.type==_DOUBLE_ && y.type==_DOUBLE_ && z.type==_DOUBLE_){
+		  double i,j; double3 d3;
+		  xyz2ij(double3(x._DOUBLE_val,y._DOUBLE_val,z._DOUBLE_val),i,j,d3);
+		  current_i=i; current_j=j; current_depth=d3.z;
+		}
+	      }
+	      if (!is3d && (tmp.type==_DOUBLE_ || tmp.type==_CPLX)){
+		double x_scale=LCD_WIDTH_PX/(window_xmax-window_xmin);
+		double y_scale=LCD_HEIGHT_PX/(window_ymax-window_ymin);
+		double i,j;
+		findij(tmp,x_scale,y_scale,i,j,contextptr);
+		current_i=int(i+.5);
+		current_j=int(j+.5);
+		adjust_cursor_point_type();
+		geo_handle(moving?FL_DRAG:FL_MOVE,key);
+		continue;
+	      }
+	    }
+	  }
+	}
+      }
+      if (hp && (key==KEY_CTRL_CATALOG || key==KEY_BOOK )){
+	const char *
+	  tab[]={
+		 lang==1?"Mode repere":"Frame mode", // 0
+		 lang==1?"Pointeur":"Pointer",
+		 lang==1?"Point":"Point", // 2
+		 is3d?"Sphere":"Circle",
+		 lang==1?"Triangle":"Triangle", // 4
+		 lang==1?"Points":"Points",
+		 lang==1?"Droites, plans":"Lines, planes", // 6
+		 lang==1?"Polygone, polyedre":"Polygon, polyhedron",
+		 lang==1?"Cercle, conique, sphere":"Circle, conic, sphere", // 8
+		 lang==1?"Courbe, surface":"Curve, surface", // 9
+		 lang==1?"Curseur":"Cursor", // 10
+		 lang==1?"Transformations":"Transforms",
+		 lang==1?"Mesures":"Mesures", // 12
+		 lang==1?"Effacer trace":"Clear trace", // -1
+		 0};
+	const int s=sizeof(tab)/sizeof(char *);
+	int choix=select_item(tab,"Mode",true);
+	if (choix<0 || choix>s)
+	  continue;
+	if (choix==s-1){
+	  trace_instructions.clear();
+	  update_g();
+	  continue;
+	}
+	if (choix<=4){
+	  gen ftmp[]={0,0,at_point,at_segment,at_segment};
+	  gen ffinal[]={0,0,at_point,is3d?at_sphere:at_cercle,at_triangle};
+	  int mode[]={255,0,1,2,3};
+	  const char * help[]={"","","Point","Center,Point","Point1,Point2,Point3"};
+	  set_mode(ftmp[choix],ffinal[choix],mode[choix],help[choix]);
+	  continue;
+	}
+	draw(); // for small choosebox, we must clean up previous choosebox
+	if (choix==5){ // Points
+	  const char *
+	    tab[]={
+		   lang==1?"Point":"Point",
+		   lang==1?"Milieu":"Middle point",
+		   lang==1?"Centre":"Center",
+		   lang==1?"Intersection unique":"Single intersection",
+		   lang==1?"Liste d'intersections":"List of intersections",
+		   lang==1?"Element":"Element",
+		   0};
+	  const int s=sizeof(tab)/sizeof(char *);
+	  int choix=select_item(tab,"Points",true);
+	  if (choix<0 || choix>s)
+	    continue;
+	  gen ftmp[]={at_point,at_segment,at_centre,at_inter_unique,at_inter,at_element};
+	  gen ffinal[]={at_point,at_milieu,at_centre,at_inter_unique,at_inter,at_element};
+	  int mode[]={1,2,1,2,2,1};
+	  const char * help[]={
+			       "Point",
+			       "Point1,Point2",
+			       "Circle",
+			       "Line1,Line2",
+			       "Curve1,Curve2",
+			       "Curve",
+	  };
+	  set_mode(ftmp[choix],ffinal[choix],mode[choix],help[choix]);
+	  continue;
+	}
+	if (choix==6){ // Droites
+	  const char *
+	    tab[]={
+		   lang==1?"Segment":"Segment", 
+		   lang==1?"Vecteur":"Vector",
+		   lang==1?"Demi-droite":"Halfline",
+		   lang==1?"Droite":"Line",
+		   lang==1?"Plan":"Plane",
+		   lang==1?"Parallele":"Parallel",
+		   lang==1?"Perpendiculaire":"Perpendicular",
+		   lang==1?"Mediatrice":"Perpen_bisector",
+		   lang==1?"Bissectrice":"Bisector",
+		   lang==1?"Mediane":"Median line",
+		   lang==1?"Tangente":"Tangent",
+		   0};
+	  const int s=sizeof(tab)/sizeof(char *);
+	  int choix=select_item(tab,"Droites, segments...",true);
+	  if (choix<0 || choix>s)
+	    continue;
+	  gen ftmp[]={at_segment,at_vector,at_demi_droite,at_droite,at_segment,at_parallele,at_perpendiculaire,at_mediatrice,at_segment,at_segment,at_segment};
+	  gen ffinal[]={at_segment,at_vector,at_demi_droite,at_droite,at_plan,at_parallele,at_perpendiculaire,at_mediatrice,at_bissectrice,at_mediane,at_tangent};
+	  int mode[]={2,2,2,2,2,3,2,2,3,3,2};
+	  const char * help[]={
+			       "Point1,Point2",
+			       "Point1,Point2",
+			       "Point1,Point2",
+			       "Point1,Point2",
+			       "Point1,Point2,Point3",
+			       "Point,Line",
+			       "Point,Line",
+			       "Point1,Point2",
+			       "Sommet_angle,Point2,Point3",
+			       "Sommet_angle,Point2,Point3",
+			       "Curve,Point"
+	  };
+	  set_mode(ftmp[choix],ffinal[choix],mode[choix],help[choix]);
+	  continue;
+	}
+	if (choix==7){ // Polygons
+	  const char *
+	    tab[]={
+		   lang==1?"Triangle":"Triangle",
+		   lang==1?"Triangle equilateral":"Equilateral triangle",
+		   lang==1?"Carre":"Square",
+		   lang==1?"Quadrilatere":"Quadrilateral",
+		   lang==1?"Polygone":"Polygon",
+		   lang==1?"Tetraedre (pyramide)":"Tetrahedron (Pyramid)",
+		   lang==1?"Tetraedre regulier":"Regular tetrahedron",
+		   lang==1?"Cube":"Cube",
+		   lang==1?"Octaedre":"Octahedron",
+		   lang==1?"Dodecaedre":"Dodecahedron",
+		   lang==1?"Icosaedre":"Icosahedron",
+		   0};
+	  const int s=sizeof(tab)/sizeof(char *);
+	  int choix=select_item(tab,"Droites, segments...",true);
+	  if (choix<0 || choix>s)
+	    continue;
+	  gen ftmp[]={at_polygone_ouvert,at_segment,at_segment,at_polygone_ouvert,at_polygone_ouvert,at_polygone_ouvert,at_polygone_ouvert,at_polygone_ouvert,at_polygone_ouvert,at_polygone_ouvert,at_polygone_ouvert};
+	  gen ffinal[]={at_triangle,at_triangle_equilateral,at_carre,at_quadrilatere,at_polygone,at_tetraedre,at_tetraedre,at_cube,at_octaedre,at_dodecaedre,at_icosaedre};
+	  int mode[]={3,2,2,4,5,4,3,3,3,3,3};
+	  int m=mode[choix];
+	  if (choix==4){
+	    double d=5;
+	    if (inputdouble(lang==1?"Nombre de sommets?":"Number of vertices?",d,contextptr) && d==int(d) && d>=3 && d<20){
+	      m=d;
+	    }
+	    else continue;
+	  }
+	  const char * help[]={
+			       "Point1,Point2,Point3",
+			       "Point1,Point2",
+			       "Point1,Point2",
+			       "Point1,Point2,Point3,Point4",
+			       "Point1,Point2,Point3,Point4,Point5",
+			       "Point1,Point2,Point3,Point4",
+			       "Point1,Point2,Point3",
+			       "Point1,Point2,Point3",
+			       "Point1,Point2,Point3",
+			       "Point1,Point2,Point3",
+			       "Point1,Point2,Point3",
+	  };
+	  set_mode(ftmp[choix],ffinal[choix],m,help[choix]);
+	  continue;
+	}
+	if (choix==8){ // Conics
+	  const char *
+	    tab[]={
+		   lang==1?"cercle":"circle",
+		   lang==1?"circonscrit":"circumcircle",
+		   lang==1?"inscrit":"incircle",
+		   lang==1?"ellipse":"ellipse",
+		   lang==1?"hyperbole":"hyperbola",
+		   lang==1?"parabole":"parabola",
+		   lang==1?"sphere":"sphere",
+		   0};
+	  const int s=sizeof(tab)/sizeof(char *);
+	  int choix=select_item(tab,"Conic",true);
+	  if (choix<0 || choix>s)
+	    continue;
+	  gen ftmp[]={at_segment,at_segment,at_segment,at_segment,at_segment,at_segment,at_segment};
+	  gen ffinal[]={at_cercle,at_circonscrit,at_inscrit,at_ellipse,at_hyperbole,at_parabole,at_sphere};
+	  int mode[]={2,3,3,3,3,2,2};
+	  const char * help[]={
+			       "Center,Point",
+			       "Point1,Point2,Point3",
+			       "Point1,Point2,Point3",
+			       "Focus1,Focus2,Point_on_ellipse",
+			       "Focus1,Focus2,Point_on_hyperbola",
+			       "Focus,Point_or_line",
+			       "Center,Point",
+	  };
+	  set_mode(ftmp[choix],ffinal[choix],mode[choix],help[choix]);
+	  continue;
+	}
+	if (choix==9){ // Curves
+	  const char *
+	    tab[]={
+		   lang==1?"Fonction plot(sin(x))":"Function plot(sin(x))",
+		   lang==1?"Param. plotparam([x^2,x^3])":"Param. plotparam([x^2,x^3])",
+		   lang==1?"Polaire plotpolar(x)":"Polar plotpolar(x)",
+		   lang==1?"Implicit plot(x^2+y^4=6)":"Implicit plot(x^2+y^4=6)",
+		   lang==1?"Champ des tangentes":"Plotfield",
+		   lang==1?"Solution equa. diff.":"Diff. equa. solution",
+		   0};
+	  const int s=sizeof(tab)/sizeof(char *);
+	  int choix=select_item(tab,"Courbe",true);
+	  if (choix<0 || choix>s)
+	    continue;
+	  const char * cmd[]={"plot()","plotparam()","plotpolar()","plot()","plotfield()","plotode()"};
+	  hp->line=hp->add_entry(-1);
+	  string mycmd=autoname(contextptr)+":="+cmd[choix];
+	  autoname_plus_plus();
+	  hp->set_string_value(hp->line,mycmd);
+	  hp->pos=mycmd.size()-1;
+	  return KEY_CTRL_OK;
+	}
+	if (choix==10){
+	  gen param=0;
+	  for (char ch='a';ch<='z';++ch){
+	    gen tmp(string("")+ch,contextptr);
+	    if (tmp.type!=_IDNT) continue;
+	    param=tmp.eval(1,contextptr);
+	    if (param==tmp)
+	      break;
+	  }
+	  if (param==0){
+	    confirm(lang==1?"Plus de variables libres.":"No more free variable available",lang==1?"Essayez purge(a) ou purge(b) ou ...":"Try purge(a) or purge(b) or ...");
+	    continue;
+	  }
+	  string mycmd=inputparam(param.print()[0],0,contextptr);
+	  if (!mycmd.empty()){
+	    hp->line=hp->add_entry(-1);
+	    // string mycmd=param.print()+":=element(0..1,0.5)";
+	    // autoname_plus_plus();
+	    hp->set_string_value(hp->line,mycmd);
+	    hp->pos=mycmd.size()-1;
+	  }
+	  return KEY_CTRL_OK;	  
+	}
+	if (choix==11){ // Transforms
+	  const char *
+	    tab[]={
+		   lang==1?"symetrie":"reflexion",
+		   lang==1?"rotation":"rotation",
+		   lang==1?"translation":"translation",
+		   lang==1?"projection":"projection",
+		   lang==1?"homothetie":"homothety",
+		   lang==1?"similitude":"similarity",
+		   // lang==1?"":"",
+		   // lang==1?"":"",
+		   0};
+	  const int s=sizeof(tab)/sizeof(char *);
+	  int choix=select_item(tab,"Transform",true);
+	  if (choix<0 || choix>s)
+	    continue;
+	  gen ftmp[]={at_segment,at_polygone_ouvert,at_segment,at_segment,at_segment,at_polygone_ouvert};
+	  gen ffinal[]={at_symetrie,at_rotation,at_translation,at_projection,at_homothetie,at_similitude};
+	  int mode[]={2,3,2,2,2,3};
+	  const char * help[]={
+			       "Symmetry_center_axis,Object",
+			       "Center,Angle,Object",
+			       "Vector,Object",
+			       "Curve,Object",
+			       "Center,Ratio,Object",
+			       "Center,Ratio,Angle,Object"
+	  };
+	  set_mode(ftmp[choix],ffinal[choix],mode[choix],help[choix]);
+	  continue;
+	}
+	if (choix==12){ // Mesures
+	  const char *
+	    tab[]={
+		   lang==1?"distance":"distance",
+		   lang==1?"angle":"angle",
+		   lang==1?"aire":"area",
+		   lang==1?"perimetre":"perimeter",
+		   lang==1?"pente":"slope",
+		   lang==1?"distance seule":"distance raw",
+		   lang==1?"angle seul":"angle raw",
+		   lang==1?"aire seule":"area raw",
+		   lang==1?"perimetre seul":"perimeter raw",
+		   lang==1?"pente seule":"slope raw",
+		   0};
+	  const int s=sizeof(tab)/sizeof(char *);
+	  int choix=select_item(tab,"Mesures",true);
+	  if (choix<0 || choix>s)
+	    continue;
+	  gen ftmp[]={at_segment,at_triangle,at_areaat,at_perimeterat,at_slopeat,at_segment,at_triangle,at_areaatraw,at_perimeteratraw,at_slopeatraw};
+	  gen ffinal[]={at_distanceat,at_angleat,at_areaat,at_perimeterat,at_slopeat,at_distanceatraw,at_angleatraw,at_areaatraw,at_perimeteratraw,at_slopeatraw};
+	  int mode[]={3,4,2,2,2,3,4,2,2,2};
+	  const char * help[]={
+			       "Object1,Object2,Position",
+			       "Angle_vertex,Direction1,Direction2,Position",
+			       "Object,Position",
+			       "Object,Position",
+			       "Object,Position",
+			       "Object1,Object2,Position",
+			       "Angle_vertex,Direction1,Direction2,Position",
+			       "Object,Position",
+			       "Object,Position",
+			       "Object,Position",
+	  };
+	  set_mode(ftmp[choix],ffinal[choix],mode[choix],help[choix]);
+	  continue;
+	}
+	continue;
+      }      
+
+      if (key==KEY_CTRL_MENU || key==KEY_CTRL_F6){
+	char menu_xmin[32],menu_xmax[32],menu_ymin[32],menu_ymax[32],menu_zmin[32],menu_zmax[32],menu_depth[32];
+	for (;;){
+	  string s;
+	  s="xmin "+print_DOUBLE_(gr.window_xmin,contextptr);
+	  strcpy(menu_xmin,s.c_str());
+	  s="xmax "+print_DOUBLE_(gr.window_xmax,contextptr);
+	  strcpy(menu_xmax,s.c_str());
+	  s="ymin "+print_DOUBLE_(gr.window_ymin,contextptr);
+	  strcpy(menu_ymin,s.c_str());
+	  s="ymax "+print_DOUBLE_(gr.window_ymax,contextptr);
+	  strcpy(menu_ymax,s.c_str());
+	  s="zmin 3d "+print_DOUBLE_(gr.window_zmin,contextptr);
+	  strcpy(menu_zmin,s.c_str());
+	  s="zmax 3d "+print_DOUBLE_(gr.window_zmax,contextptr);
+	  strcpy(menu_zmax,s.c_str());
+	  s="depth 3d "+print_DOUBLE_(gr.current_depth,contextptr);
+	  strcpy(menu_depth,s.c_str());
+	  Menu smallmenu;
+	  smallmenu.numitems=19;
+	  MenuItem smallmenuitems[smallmenu.numitems];
+	  smallmenu.items=smallmenuitems;
+	  smallmenu.height=12;
+	  //smallmenu.title = "KhiCAS";
+	  smallmenuitems[0].text = (char *) menu_xmin;
+	  smallmenuitems[1].text = (char *) menu_xmax;
+	  smallmenuitems[2].text = (char *) menu_ymin;
+	  smallmenuitems[3].text = (char *) menu_ymax;
+	  smallmenuitems[4].text = (char *) menu_zmin;
+	  smallmenuitems[5].text = (char *) menu_zmax;
+	  smallmenuitems[6].text = (char *) menu_depth;
+	  smallmenuitems[7].text = (char *) ((lang==1)?"Aide":"Help");
+	  smallmenuitems[8].text = (char*) (lang==1?"Sauvegarder figure":"Save figure");
+	  smallmenuitems[9].text = (char*) (lang==1?"Sauvegarder comme":"Save as");
+	  smallmenuitems[10].text = (char*)((lang==1)?"Quitter":"Quit");
+	  smallmenuitems[11].text = (char*) "Orthonormalize /";
+	  smallmenuitems[12].text = (char*) "Autoscale *";
+	  smallmenuitems[13].text = (char *) ("Zoom in +");
+	  smallmenuitems[14].text = (char *) ("Zoom out -");
+	  smallmenuitems[15].text = (char *) ("Y-Zoom out (-)");
+	  smallmenuitems[16].text = (char*) ((lang==1)?"Voir axes":"Show axes");
+	  smallmenuitems[17].text = (char*) ((lang==1)?"Cacher axes":"Hide axes");
+	  smallmenuitems[18].text = (char*) ((lang==1)?"Effacer trace":"Clear trace");
+	  drawRectangle(0,180,LCD_WIDTH_PX,60,_BLACK);
+	  int sres = doMenu(&smallmenu);
+	  if (sres == MENU_RETURN_EXIT)
+	    break;
+	  if (sres == MENU_RETURN_SELECTION || sres==KEY_CTRL_EXE) {
+	    const char * ptr=0;
+	    string s1; double d;
+	    if (smallmenu.selection==1){
+	      d=gr.window_xmin;
+	      if (inputdouble(menu_xmin,d,200,contextptr)){
+		gr.window_xmin=d;
+		gr.update();
+	      }
+	    }
+	    if (smallmenu.selection==2){
+	      d=gr.window_xmax;
+	      if (inputdouble(menu_xmax,d,200,contextptr)){
+		gr.window_xmax=d;
+		gr.update();
+	      }
+	    }
+	    if (smallmenu.selection==3){
+	      d=gr.window_ymin;
+	      if (inputdouble(menu_ymin,d,200,contextptr)){
+		gr.window_ymin=d;
+		gr.update();
+	      }
+	    }
+	    if (smallmenu.selection==4){
+	      d=gr.window_ymax;
+	      if (inputdouble(menu_ymax,d,200,contextptr)){
+		gr.window_ymax=d;
+		gr.update();
+	      }
 	    }
 	    if (smallmenu.selection==5){
 	      d=gr.window_zmin;
@@ -8746,40 +10773,105 @@ namespace xcas {
 		gr.update();
 	      }
 	    }
-	    if (smallmenu.selection==7)
+	    if (smallmenu.selection==7){
+	      d=gr.current_depth;
+	      if (inputdouble(menu_depth,d,200,contextptr)){
+		if (d<-1) d=-1;
+		if (d>1) d=1;
+		gr.current_depth=d;
+		gr.update();
+	      }
+	    }
+	    if (smallmenu.selection==8){
+	      geohelp(contextptr); continue;
+	      // gr.q=quaternion_double(0,0,0); gr.update();
+	    }
+	    if (hp && smallmenu.selection==9){
+	      // save
+	      geosave(hp,contextptr);
+	      continue;
+	    }
+	    if (smallmenu.selection==9 || smallmenu.selection==10){
+	      // save as
+	      char filename[MAX_FILENAME_SIZE+1];
+	      if (get_filename(filename,".py") && newgeo(contextptr)==0){
+		geoptr->hp->filename=filename;
+		if (geoptr!=this && !symbolic_instructions.empty()){
+		  geoptr->symbolic_instructions=symbolic_instructions;
+		  geoptr->hp->elements.clear();
+		  for (int i=0;i<symbolic_instructions.size();++i){
+		    geoptr->hp->set_string_value(i,symbolic_instructions[i].print(contextptr));
+		  }
+		  geoloop(geoptr);
+		  return 0;
+		}
+	      }
+	    }
+	    if (smallmenu.selection==11)
+	      return -4;
+	    if (smallmenu.selection==12)
 	      gr.orthonormalize();
-	    if (smallmenu.selection==8)
+	    if (smallmenu.selection==13)
 	      gr.autoscale();	
-	    if (smallmenu.selection==9)
+	    if (smallmenu.selection==14)
 	      gr.zoom(0.7);	
-	    if (smallmenu.selection==10)
+	    if (smallmenu.selection==15)
 	      gr.zoom(1/0.7);	
-	    if (smallmenu.selection==11)
+	    if (smallmenu.selection==16)
 	      gr.zoomy(1/0.7);
-	    if (smallmenu.selection==12){
-	      xcas::textArea text;
-	      text.editable=false;
-	      text.clipline=-1;
-	      text.title = (char*)((lang==1)?"Raccourcis clavier 3d":"3d Keyboard shortcuts");
-	      text.allowF1=false;
-	      text.python=false;
-	      add(&text,lang==1?"haut/bas/droit/gauche: change point de vue\ny^x ou e^x: trace precis\nON/Back: interrompt le trace en cours\n( et ): modifie le rendu des surfaces raides\n0: surfaces cachees ON/OFF\n.: remplissage surface raide ON/OFF\n5 reset view\n7,8,9,1,2,3: deplacement":"up/down/right/left: modify viewpoint\nON/Back: interrupt\ny^x or e^x: precise\n( and ): modify stiff surfaces rendering\n0: hidden surfaces ON/OFF\n.: fill stiff surfacesON/OFF\n5 reset view\n7,8,9,1,2,3: move view");
-	      int exec=doTextArea(&text,contextptr);
-	      // gr.q=quaternion_double(0,0,0); gr.update();
-	    }
-	    if (smallmenu.selection==13)
+	    if (smallmenu.selection==17)
 	      gr.show_axes=true;	
-	    if (smallmenu.selection==14)
+	    if (smallmenu.selection==18)
 	      gr.show_axes=false;	
-	    if (smallmenu.selection==15)
-	      break;
+	    if (smallmenu.selection==19){
+	      gr.trace_instructions.clear();
+	      update_g();
+	    }
 	  }
 	}
+	gr.draw();
+	gr.must_redraw=false;
+	continue;
+      }
+
+      if (hp && key==KEY_CTRL_OK){
+	if (mode==255)
+	  return key;
+	if (!moving){
+	  pushed=true;
+	  push_i=current_i;
+	  push_j=current_j;
+	  push_depth = current_depth;
+	  geo_handle(FL_PUSH,KEY_CTRL_OK);
+	  if (moving){
+	    update_g();
+	    continue;
+	  }
+	}
+	int res=geo_handle(FL_RELEASE,KEY_CTRL_OK);
+	pushed=false;
+	update_g();
+	continue;
+      }
+      if (hp && key==KEY_CTRL_EXIT && mode!=255){
+	if (mode==0){ // restore original value and reeval
+	  geo_handle(FL_RELEASE,KEY_CTRL_EXIT);
+	  // do_handle(symbolic(at_sto,makevecteur(drag_original_value,drag_name)));
+	  if (!pushed)
+	    set_mode(0,0,255,"");
+	}
+	else
+	  if (args_tmp.empty())
+	    set_mode(0,0,255,"");
+	pushed=false;
+	moving=moving_frame=false;
+	args_tmp.clear();
+	update_g();
+	continue;
       }
-#endif
       if (key==KEY_CTRL_EXIT || key==KEY_CTRL_OK){
 	os_hide_graph();
-	break;
+	return key;
       }
       if (key==KEY_CHAR_NORMAL || key=='>'){ // shift-+
 	if (gr.is3d && gr.precision<9)
@@ -8790,6 +10882,16 @@ namespace xcas {
 	 gr.precision--;
       }
       if (key==KEY_CTRL_UP){
+	if (hp && mode!=255){
+	  --current_j;
+	  if (current_j<0){
+	    gr.up((gr.window_ymax-gr.window_ymin)/5);
+	    current_j += LCD_HEIGHT_PX/5;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
 	if (gr.is3d){
 	  int curprec=gr.precision;
 	  gr.precision += 2;
@@ -8803,7 +10905,7 @@ namespace xcas {
 	    gr.q=rotation_2_quaternion_double(0.707,0.707,0,15)*gr.q;// quaternion_double(15,0,0)*gr.q;
 	    gr.update_rotation();
 	    gr.draw();
-	    redraw=gr.solid3d;
+	    gr.must_redraw=gr.solid3d;
 #ifndef SIMU
 	    if (!iskeydown(KEY_CTRL_UP))
 	      break;
@@ -8814,12 +10916,32 @@ namespace xcas {
 	  gr.precision=curprec;
 	  continue;
 	}
-	gr.up((gr.window_ymax-gr.window_ymin)/5);
+	gr.up((gr.window_ymax-gr.window_ymin)/16);
       }
       if (key==KEY_CTRL_PAGEUP) {
-	gr.up((gr.window_ymax-gr.window_ymin)/2);
+	if (hp && mode!=255){
+	  current_j-=LCD_HEIGHT_PX/5;;
+	  if (current_j<0){
+	    gr.up((gr.window_ymax-gr.window_ymin)/2);
+	    current_j += LCD_HEIGHT_PX/2;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
+	gr.up((gr.window_ymax-gr.window_ymin)/4);
       }
       if (key==KEY_CTRL_DOWN) {
+	if (hp && mode!=255){
+	  ++current_j;
+	  if (current_j>=LCD_HEIGHT_PX-24){
+	    gr.down((gr.window_ymax-gr.window_ymin)/5);
+	    current_j -= LCD_HEIGHT_PX/5;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
 	if (gr.is3d){
 	  int curprec=gr.precision;
 	  gr.precision += 2;
@@ -8833,7 +10955,7 @@ namespace xcas {
 	    gr.q=rotation_2_quaternion_double(0.707,0.707,0,-15)*gr.q; // quaternion_double(-15,0,0)*gr.q;
 	    gr.update_rotation();
 	    gr.draw();
-	    redraw=gr.solid3d;
+	    gr.must_redraw=gr.solid3d;
 #ifndef SIMU
 	    if (!iskeydown(KEY_CTRL_DOWN))
 	      break;
@@ -8844,12 +10966,32 @@ namespace xcas {
 	  gr.precision=curprec;
 	  continue;
 	}
-	gr.down((gr.window_ymax-gr.window_ymin)/5);
+	gr.down((gr.window_ymax-gr.window_ymin)/16);
       }
       if (key==KEY_CTRL_PAGEDOWN) {
-	gr.down((gr.window_ymax-gr.window_ymin)/2);
+	if (hp && mode!=255){
+	  current_j += LCD_HEIGHT_PX/5;
+	  if (current_j>=LCD_HEIGHT_PX-24){
+	    gr.down((gr.window_ymax-gr.window_ymin)/2);
+	    current_j -= LCD_HEIGHT_PX/2;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
+	gr.down((gr.window_ymax-gr.window_ymin)/4);
       }
       if (key==KEY_CTRL_LEFT) {
+	if (hp && mode!=255){
+	  --current_i;
+	  if (current_i<0){
+	    gr.left((gr.window_xmax-gr.window_xmin)/5);
+	    current_i += LCD_WIDTH_PX/5;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
 	if (gr.is3d){
 	  int curprec=gr.precision;
 	  gr.precision += 2;
@@ -8858,7 +11000,7 @@ namespace xcas {
 	    gr.q=quaternion_double(0,15,0)*gr.q;
 	    gr.update_rotation();
 	    gr.draw();
-	    redraw=gr.solid3d;
+	    gr.must_redraw=gr.solid3d;
 #ifndef SIMU
 	    if (!iskeydown(KEY_CTRL_LEFT))
 	      break;
@@ -8869,10 +11011,32 @@ namespace xcas {
 	  gr.precision=curprec;
 	  continue;
 	}
-	gr.left((gr.window_xmax-gr.window_xmin)/5);
+	gr.left((gr.window_xmax-gr.window_xmin)/16);
+      }
+      if (key==KEY_SHIFT_LEFT) {
+	if (hp && mode!=255){
+	  current_i -= LCD_WIDTH_PX/5;
+	  if (current_i<0){
+	    gr.left((gr.window_xmax-gr.window_xmin)/2);
+	    current_i += LCD_WIDTH_PX/2;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
+	gr.left((gr.window_xmax-gr.window_xmin)/4);
       }
-      if (key==KEY_SHIFT_LEFT) { gr.left((gr.window_xmax-gr.window_xmin)/2); }
       if (key==KEY_CTRL_RIGHT) {
+	if (hp && mode!=255){
+	  ++current_i;
+	  if (current_i>=LCD_WIDTH_PX){
+	    gr.right((gr.window_xmax-gr.window_xmin)/5);
+	    current_i -= LCD_WIDTH_PX/5;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
 	if (gr.is3d){
 	  int curprec=gr.precision;
 	  gr.precision += 2;
@@ -8881,7 +11045,7 @@ namespace xcas {
 	    gr.q=quaternion_double(0,-15,0)*gr.q;
 	    gr.update_rotation();
 	    gr.draw();
-	    redraw=gr.solid3d;
+	    gr.must_redraw=gr.solid3d;
 #ifndef SIMU
 	    if (!iskeydown(KEY_CTRL_RIGHT))
 	      break;
@@ -8892,9 +11056,21 @@ namespace xcas {
 	  gr.precision=curprec;
 	  continue;
 	}
-	gr.right((gr.window_xmax-gr.window_xmin)/5);
+	gr.right((gr.window_xmax-gr.window_xmin)/16);
+      }
+      if (key==KEY_SHIFT_RIGHT) {
+	if (hp && mode!=255){
+	  current_i += LCD_WIDTH_PX/5;
+	  if (current_i>=LCD_WIDTH_PX){
+	    gr.right((gr.window_xmax-gr.window_xmin)/2);
+	    current_i -= LCD_WIDTH_PX/2;
+	  }
+	  geo_handle(moving?FL_DRAG:FL_MOVE,key);
+	  update_g();
+	  continue;
+	}
+	gr.right((gr.window_xmax-gr.window_xmin)/4);
       }
-      if (key==KEY_SHIFT_RIGHT) { gr.right((gr.window_xmax-gr.window_xmin)/5); }
       if (key==KEY_CHAR_PLUS) {
 	gr.zoom(0.7);
       }
@@ -8920,6 +11096,14 @@ namespace xcas {
 	if (key==KEY_CHAR_ANS){
 	  gr.show_edges=!gr.show_edges;
 	}
+	if (key==KEY_CHAR_4){
+	  if (current_depth>-1)
+	    current_depth-=0.1;
+	}
+	if (key==KEY_CHAR_6){
+	  if (current_depth<1)
+	    current_depth+=0.1;
+	}
 	if (key==KEY_CHAR_5){
 	  gr.q=quaternion_double(0,0,0);
 	  gr.update();
@@ -8955,8 +11139,17 @@ namespace xcas {
 	if (key==KEY_CHAR_RPAR && gr.diffusionz>2)
 	  gr.diffusionz--;
       }
-      if (key==KEY_CTRL_VARS) {
+      if (key==KEY_CHAR_SIN) {
 	gr.show_axes=!gr.show_axes;
+	gr.update();
+	gr.draw();
+	gr.must_redraw=false;
+      }
+      if (key==KEY_CTRL_VARS){
+	select_var(contextptr);
+	gr.update();
+	gr.draw();
+	gr.must_redraw=false;
       }
     }
     // aborttimer = Timer_Install(0, check_execution_abort, 100); if (aborttimer > 0) { Timer_Start(aborttimer); }
@@ -10208,7 +12401,7 @@ namespace xcas {
 	return 0;
       }
       if (ispnt(ge)){
-	if (displaygraph(ge,contextptr)==KEY_SHUTDOWN)
+	if (displaygraph(ge,g,contextptr)==KEY_SHUTDOWN)
 	  return KEY_SHUTDOWN;
 	// aborttimer = Timer_Install(0, check_execution_abort, 100); if (aborttimer > 0) { Timer_Start(aborttimer); }
 	return 0;
@@ -10306,7 +12499,7 @@ namespace xcas {
     }
   }
 
-  int check_do_graph(giac::gen & ge,int do_logo_graph_eqw,GIAC_CONTEXT) {
+  int check_do_graph(giac::gen & ge,const gen & gs,int do_logo_graph_eqw,GIAC_CONTEXT) {
     if (ge.type==giac::_SYMB || (ge.type==giac::_VECT && !ge._VECTptr->empty() && !is_numericv(*ge._VECTptr)) ){
       if (islogo(ge)){
 	if (do_logo_graph_eqw & 4){
@@ -10317,7 +12510,7 @@ namespace xcas {
       }
       if (ispnt(ge)){
 	if (do_logo_graph_eqw & 2){
-	  if (displaygraph(ge,contextptr)==KEY_SHUTDOWN)
+	  if (displaygraph(ge,gs,contextptr)==KEY_SHUTDOWN)
 	    return KEY_SHUTDOWN;
 	}
 	// aborttimer = Timer_Install(0, check_execution_abort, 100); if (aborttimer > 0) { Timer_Start(aborttimer); }
@@ -10472,12 +12665,13 @@ namespace xcas {
     }
     else {
       set_abort();
+      gen gs=g;
       g=protecteval(g,1,contextptr);
       clear_abort();
       giac::ctrl_c=false;
       kbd_interrupted=giac::interrupted=false;
       // define the function
-      if (check_do_graph(g,7,contextptr)==KEY_SHUTDOWN)
+      if (check_do_graph(g,gs,7,contextptr)==KEY_SHUTDOWN)
 	return KEY_SHUTDOWN;
       DefineStatusMessage((char *)((lang==1)?"Syntaxe correcte":"Parse OK"),1,0,0);
     }
@@ -10566,6 +12760,50 @@ namespace xcas {
     fix_newlines(edptr);
   }
 
+  void textArea::set_string_value(int n,const string & s){    
+    if (n==-1 || n>=elements.size()){
+      textElement t; t.s=s;
+      if (!elements.empty())
+	t.newLine=1;
+      elements.push_back(t);
+    }
+    else {
+      elements[n].s=s;
+      if (n)
+	elements[n].newLine=1;
+    }
+    changed=true;
+  }
+
+  int textArea::add_entry(int n){
+    textElement t; 
+    if (n==-1 || n>=elements.size()){
+      if (elements.empty())
+	elements.push_back(t);
+      else {
+	t.newLine=1;
+	if (!elements.back().s.empty())
+	  elements.push_back(t);
+      }
+      n=elements.size()-1;
+    }
+    else {
+      if (n) t.newLine=1;
+      elements.insert(elements.begin()+n,t);
+    }
+    return n;
+  }
+
+  void Graph2d::add_entry(int n){
+    if (!hp)
+      return;
+    if (n==-1 || n>=symbolic_instructions.size()){
+      symbolic_instructions.push_back(0);
+      n=symbolic_instructions.size();
+    }
+    hp->add_entry(n);
+  }
+
   int find_indentation(const std::string & s){
     size_t indent=0;
     for (;indent<s.size();++indent){
@@ -11150,6 +13388,7 @@ namespace xcas {
     bool editable=text->editable;
     int showtitle = !editable && (text->title != NULL);
     std::vector<textElement> & v=text->elements;
+    if (v.empty()) v.push_back(textElement());
     //drawRectangle(text->x, text->y+24, text->width, LCD_HEIGHT_PX-24, COLOR_WHITE);
     // insure cursor is visible
     if (editable && !isFirstDraw){
@@ -11178,6 +13417,11 @@ namespace xcas {
 	  deltax=27;
       }
     }
+    if (v.empty()){
+      textElement cur;
+      cur.s="";
+      v.push_back(cur);
+    }
     int & clipline=text->clipline;
     int & clippos=text->clippos;
     int & textline=text->line;
@@ -11484,7 +13728,10 @@ namespace xcas {
     if (editable){
       waitforvblank();
       drawRectangle(0,205,LCD_WIDTH_PX,17,44444);
-      PrintMiniMini(0,205,text->python>0?"shift-1 test|2 loop|3 undo|4 misc|5 +-|6 logo|7 lin|8 list|9arit":"shift-1 test|2 loop|3 undo|4 misc|5 +-|6 logo|7 matr|8 cplx",4,44444,giac::_BLACK);
+      if (text->gr)
+	PrintMiniMini(0,205,"shift-1 pnts|2 lines|3 undo|4 disp|5 +-|6 curves|7 triangle|8 polygon|9 solid",4,giac::_CYAN,giac::_BLACK);
+      else
+	PrintMiniMini(0,205,text->python>0?"shift-1 test|2 loop|3 undo|4 misc|5 +-|6 logo|7 lin|8 list|9arit":"shift-1 test|2 loop|3 undo|4 misc|5 +-|6 logo|7 matr|8 cplx",4,44444,giac::_BLACK);
       //draw_menu(1);
     }
 #ifdef SCROLLBAR
@@ -12059,12 +14306,16 @@ namespace xcas {
 	       (key >= KEY_CTRL_F6 && key <= KEY_CTRL_F16)
 	       ){
 	    string le_menu;
-	    if (xcas_python_eval==1)//text->python?
-	      le_menu="F1 test\nif \nelse \n<\n>\n==\n!=\n&&\n||\nF2 loop\nfor \nfor in\nrange(\nwhile \nbreak\ndef\nreturn \n#\nF4 misc\n:\n;\n_\n!\n%\nfrom  import *\nprint(\ninput(\nF6 tortue\nforward(\nbackward(\nleft(\nright(\npencolor(\ncircle(\nreset()\nfrom turtle import *\nF: plot\nplot(\ntext(\narrow(\nlinear_regression_plot(\nscatter(\naxis(\nbar(\nfrom matplotl import *\nF7 linalg\nadd(\nsub(\nmul(\ninv(\ndet(\nrref(\ntranspose(\nfrom linalg import *\nF< color\nred\nblue\ngreen\ncyan\nyellow\nmagenta\nblack\nwhite\nF; draw\nset_pixel(\ndraw_line(\ndraw_rectangle(\nfill_rect(\ndraw_polygon(\ndraw_circle(\ndraw_string(\nfrom graphic import *\nF8 numpy\narray(\nreshape(\narange(\nlinspace(\nsolve(\neig(\ninv(\nfrom numpy import *\nF9 arit\npow(\nisprime(\nnextprime(\nifactor(\ngcd(\nlcm(\niegcd(\nfrom arit import *\n";
-	    if (xcas_python_eval<=0)
-	      le_menu="F1 test\nif \nelse \n<\n>\n==\n!=\nand\nor\nF2 loop\nfor \nfor in\nrange(\nwhile \nbreak\nf(x):=\nreturn \nvar\nF4 misc\n;\n:\n_\n!\n%\n&\nprint(\ninput(\nF6 tortue\navance\nrecule\ntourne_gauche\ntourne_droite\nrond\ndisque\nrepete\nefface\nF7 lin\nmatrix(\ndet(\nmatpow(\nranm(\nrref(\ntran(\negvl(\negv(\nF9 arit\n mod \nirem(\nifactor(\ngcd(\nisprime(\nnextprime(\npowmod(\niegcd(\nF< plot\nplot(\nplotseq(\nplotlist(\nplotparam(\nplotpolar(\nplotfield(\nhistogram(\nbarplot(\nF: misc\n<\n>\n_\n!\n % \nrand(\nbinomial(\nnormald(\nF8 cplx\nabs(\narg(\nre(\nim(\nconj(\ncsolve(\ncfactor(\ncpartfrac(\n";
-	    if (xcas_python_eval>=0)
-	      le_menu += "F= list\nmakelist(\nrange(\nseq(\nlen(\nappend(\nranv(\nsort(\napply(\nF; real\nexact(\napprox(\nfloor(\nceil(\nround(\nsign(\nmax(\nmin(\nF> prog\n;\n:\n\\\n&\n?\n!\ndebug(\npython(\nF? geo\npoint(\nline(\nsegment(\ncircle(\ntriangle(\nplane(\nsphere(\nsingle_inter(\nF@ color\ncolor=\nred\ncyan\ngreen\nblue\nmagenta\nyellow\nlegend(";
+	    if (text->gr) { // geometry menu
+	      le_menu="F1 points\npoint(\nmidpoint(\ncenter(\nelement(\nsingle_inter(\ninter(\nlegende(\ntrace(\nF2 lines\nsegment(\nline(\nhalf_line(\nvector(\nparallel(\nperpendicular(\ntangent(\nplane(\ncircle(\nF4 disp\ndisplay=\nfilled\nred\nblue\ngreen\ncyan\nmagenta\nyellow\nF6 curves\ncircle(\nellipse(\nhyperbola(\nparabola(\nplot(\nplotparam(\nplotpolar(\nplotode(\nF7 triangle\ntriangle(\nequilateral_triangle(\nmedian(\nperpen_bisector(\nbisector(\nisobarycenter(\nF8 polygon\nsquare(\nrectangle(\nquadrilateral(\nhexagon(\npolygon(\nisopolygon(\nvertices(\nF9 3d\nplane(\ncube(\ntetrahedron(\nsphere(\ncone(\nhalf_cone(\ncylinder(\nplot3d(\nF: transf\nprojection(\nreflection(\ntranslation(\nrotation(\nhomothety(\nsimilarity(\nF; geodiff\ntangent(\nosculating_circle(\nevolute(\ncurvature(\nfrenet(\noctahedron(\ndodecahedron(\nicosahedron(\nF< mesures\ndistance(\ndistance2(\nradius(\naire(\nperimetre(\npente(\nangle(\nF= test\nis_collinear(\nis_concyclic(\nis_coplanar(\nis_cospherical(\nis_element(\nis_parallel(\nis_perpendicular(\nF> analyt\ncoordonnees(\nequation(\nparameq(\nabscisse(\nordonnee(\naffixe(\narg(\n";
+	    } else {
+	      if (xcas_python_eval==1)//text->python?
+		le_menu="F1 test\nif \nelse \n<\n>\n==\n!=\n&&\n||\nF2 loop\nfor \nfor in\nrange(\nwhile \nbreak\ndef\nreturn \n#\nF4 misc\n:\n;\n_\n!\n%\nfrom  import *\nprint(\ninput(\nF6 tortue\nforward(\nbackward(\nleft(\nright(\npencolor(\ncircle(\nreset()\nfrom turtle import *\nF: plot\nplot(\ntext(\narrow(\nlinear_regression_plot(\nscatter(\naxis(\nbar(\nfrom matplotl import *\nF7 linalg\nadd(\nsub(\nmul(\ninv(\ndet(\nrref(\ntranspose(\nfrom linalg import *\nF< color\nred\nblue\ngreen\ncyan\nyellow\nmagenta\nblack\nwhite\nF; draw\nset_pixel(\ndraw_line(\ndraw_rectangle(\nfill_rect(\ndraw_polygon(\ndraw_circle(\ndraw_string(\nfrom graphic import *\nF8 numpy\narray(\nreshape(\narange(\nlinspace(\nsolve(\neig(\ninv(\nfrom numpy import *\nF9 arit\npow(\nisprime(\nnextprime(\nifactor(\ngcd(\nlcm(\niegcd(\nfrom arit import *\n";
+	      if (xcas_python_eval<=0)
+		le_menu="F1 test\nif \nelse \n<\n>\n==\n!=\nand\nor\nF2 loop\nfor \nfor in\nrange(\nwhile \nbreak\nf(x):=\nreturn \nvar\nF4 misc\n;\n:\n_\n!\n%\n&\nprint(\ninput(\nF6 tortue\navance\nrecule\ntourne_gauche\ntourne_droite\nrond\ndisque\nrepete\nefface\nF7 lin\nmatrix(\ndet(\nmatpow(\nranm(\nrref(\ntran(\negvl(\negv(\nF9 arit\n mod \nirem(\nifactor(\ngcd(\nisprime(\nnextprime(\npowmod(\niegcd(\nF< plot\nplot(\nplotseq(\nplotlist(\nplotparam(\nplotpolar(\nplotfield(\nhistogram(\nbarplot(\nF: misc\n<\n>\n_\n!\n % \nrand(\nbinomial(\nnormald(\nF8 cplx\nabs(\narg(\nre(\nim(\nconj(\ncsolve(\ncfactor(\ncpartfrac(\n";
+	      if (xcas_python_eval>=0)
+		le_menu += "F= list\nmakelist(\nrange(\nseq(\nlen(\nappend(\nranv(\nsort(\napply(\nF; real\nexact(\napprox(\nfloor(\nceil(\nround(\nsign(\nmax(\nmin(\nF> prog\n;\n:\n\\\n&\n?\n!\ndebug(\npython(\nF? geo\npoint(\nline(\nsegment(\ncircle(\ntriangle(\nplane(\nsphere(\nsingle_inter(\nF@ color\ncolor=\nred\ncyan\ngreen\nblue\nmagenta\nyellow\nlegend(";
+	    } // else not geometry
 	    const char * ptr=console_menu(key,(char*)(le_menu.c_str()),2);
 	    if (!ptr){
 	      show_status(text,search,replace);
@@ -12190,7 +14441,7 @@ namespace xcas {
 	}
 	continue;
       case KEY_CTRL_OK:
-	if (text->allowEXE || !text->editable) return TEXTAREA_RETURN_EXE;
+	if (text->gr || text->allowEXE || !text->editable) return TEXTAREA_RETURN_EXE;
 	if (search.size()){
 	  for (;;){
 	    if (!move_to_word(text,search,replace,isFirstDraw,totalTextY,scroll,textY,contextptr))
@@ -13397,7 +15648,7 @@ namespace xcas {
 	vout.erase(vout.begin());
       vout.push_back(ge);
     }
-    if (check_do_graph(ge,do_logo_graph_eqw,contextptr)==KEY_SHUTDOWN)
+    if (check_do_graph(ge,g,do_logo_graph_eqw,contextptr)==KEY_SHUTDOWN)
       return KEY_SHUTDOWN;
     string s_;
     if (ge.type==giac::_STRNG)
@@ -14564,7 +16815,7 @@ namespace xcas {
       numworks_certify_internal();
       Bdisp_AllClr_VRAM();
       int x=0,y=0;
-      PrintMini(x,y,"KhiCAS 1.7 (c) 2022 B. Parisse",TEXT_MODE_NORMAL, COLOR_BLACK, COLOR_WHITE);
+      PrintMini(x,y,"KhiCAS 1.9 (c) 2022 B. Parisse",TEXT_MODE_NORMAL, COLOR_BLACK, COLOR_WHITE);
       y +=18;
       PrintMini(x,y,"et al, License GPL 2",TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
       y += 18;
@@ -15350,80 +17601,10 @@ namespace xcas {
 	      break;
 	    }
 	    if (smallmenu.selection == 15){
-	      Menu paramenu;
-	      paramenu.numitems=6;
-	      MenuItem paramenuitems[paramenu.numitems];
-	      paramenu.items=paramenuitems;
-	      paramenu.height=12;
-	      paramenu.title = (char *)"Parameter";
-	      char menu_xcur[32],menu_xmin[32],menu_xmax[32],menu_xstep[32],menu_name[16]="name a";
 	      static char curname='a';
-	      menu_name[5]=curname;
-	      ++curname;
-	      double pcur=0,pmin=-5,pmax=5,pstep=0.1;
-	      std::string s;
-	      bool doit;
-	      for (;;){
-		s="cur "+giac::print_DOUBLE_(pcur,contextptr);
-		strcpy(menu_xcur,s.c_str());
-		s="min "+giac::print_DOUBLE_(pmin,contextptr);
-		strcpy(menu_xmin,s.c_str());
-		s="max "+giac::print_DOUBLE_(pmax,contextptr);
-		strcpy(menu_xmax,s.c_str());
-		s="step "+giac::print_DOUBLE_(pstep,contextptr);
-		strcpy(menu_xstep,s.c_str());
-		paramenuitems[0].text = (char *) "OK";
-		paramenuitems[1].text = (char *) menu_name;
-		paramenuitems[2].text = (char *) menu_xcur;
-		paramenuitems[3].text = (char *) menu_xmin;
-		paramenuitems[4].text = (char *) menu_xmax;
-		paramenuitems[5].text = (char *) menu_xstep;
-		int sres = doMenu(&paramenu);
-		doit = sres==MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE;
-		if (doit) {
-		  std::string s1; double d;
-		  if (paramenu.selection==2){
-		    handle_f5();
-		    if (inputline(menu_name,(lang==1)?"Nouvelle valeur?":"New value?",s1,false)==KEY_CTRL_EXE && s1.size()>0 && isalpha(s1[0])){
-		      if (s1.size()>10)
-			s1=s1.substr(0,10);
-		      strcpy(menu_name,("name "+s1).c_str());
-		    }
-		    continue;
-		  }	
-		  if (paramenu.selection==3){
-		    inputdouble(menu_xcur,pcur,contextptr);
-		    continue;
-		  }
-		  if (paramenu.selection==4){
-		    inputdouble(menu_xmin,pmin,contextptr);
-		    continue;
-		  }
-		  if (paramenu.selection==5){
-		    inputdouble(menu_xmax,pmax,contextptr);
-		    continue;
-		  }
-		  if (paramenu.selection==6){
-		    inputdouble(menu_xstep,pstep,contextptr);
-		    pstep=fabs(pstep);
-		    continue;
-		  }
-		  // if (paramenu.selection==6) break;
-		} // end menu
-		break;
-	      } // end for (;;)
-	      if (doit && pmin<pmax && pstep>0){
-		s="assume(";
-		s += (menu_name+5);
-		s += "=[";
-		s += (menu_xcur+4);
-		s += ',';
-		s += (menu_xmin+4);
-		s += ',';
-		s += (menu_xmax+4);
-		s += ',';
-		s += (menu_xstep+5);
-		s += "])";
+	      string s=inputparam(curname,1,contextptr);
+	      if (!s.empty()){
+		++curname;
 		return Console_Input((const char *)s.c_str());
 	      }
 	      continue;
@@ -16360,6 +18541,123 @@ namespace xcas {
   }
 #endif
 
+  Graph2d * geoptr=0;
+
+  // return true if there is a syntax error and user asked to correct
+  bool geoparse(textArea *text,GIAC_CONTEXT){
+    Graph2d * geoptr=text->gr;
+    if (!geoptr)
+      return false;
+    std::vector<textElement> & v=text->elements;
+    geoptr->symbolic_instructions.resize(v.size());
+    int pos=-1,i=0;
+    for (;i<int(v.size());++i){
+      std::string s=v[i].s; 
+      giac::python_compat(0,contextptr);
+      freeze=true;
+      giac::gen g(s,contextptr);
+      freeze=false;
+      g=equaltosto(g,contextptr);
+      int lineerr=giac::first_error_line(contextptr);
+      char status[256]={0};
+      geoptr->symbolic_instructions[i]=g;
+      if (lineerr){
+	std::string tok=giac::error_token_name(contextptr);
+	if (lineerr==1){
+	  pos=v[i].s.find(tok);
+	  const std::string & err=v[i].s;
+	  if (pos>=err.size())
+	    pos=-1;
+	}
+	else {
+	  tok=(lang==1)?"la fin":"end";
+	  pos=0;
+	}
+	if (pos>=0)
+	  sprintf(status,(lang==1)?"Erreur ligne %i a %s":"Error line %i at %s",i+1,tok.c_str());
+	else
+	  sprintf(status,(lang==1)?"Erreur ligne %i %s":"Error line %i %s",i+1,(pos==-2?((lang==1)?", : manquant ?":", missing :?"):""));
+	if (confirm(status,(lang==1)?"OK: corrige, back: continue":"OK: fix",1)==KEY_CTRL_F1){
+	  text->line=i;
+	  if (pos>=0 && pos<v[i].s.size()) text->pos=pos;
+	  return true;
+	}
+      }
+    } // loop on lines
+    return false;
+  }
+
+  int geoloop(Graph2d * geoptr){
+    if (!geoptr || !geoptr->hp) return -1;
+    const context * contextptr=geoptr->contextptr;
+    textArea * text=geoptr->hp;
+    // main loop: alternate between plot and symb view
+    // start in plot view
+    // end plot view with EXIT or OK -> symb view editor
+    // end with OK or EXIT: OK will modify, EXIT will leave geo app
+    // (press twice EXIT to leave geo app from plot view)
+    for (;;){
+      geoptr->eval();
+      geoptr->update();
+      if (geoptr->is3d)
+	geoptr->update_rotation();
+      int key=geoptr->ui();
+      if (key==KEY_SHUTDOWN){
+	geosave(text,contextptr);
+	return key;
+      }
+      // symb view editor
+      for (;;){
+	key=doTextArea(text,contextptr);
+	if (key== TEXTAREA_RETURN_EXIT || key==KEY_SHUTDOWN){
+	  geosave(text,contextptr);
+	  return key;
+	}
+	// key was OK, parse step: synchronize symbolic_instructions from text
+	bool corrige=geoparse(text,contextptr);
+	if (!corrige)
+	  break;
+      } // end edition loop
+    } // end plot/symb view infinite loop
+  }
+
+  void cleargeo(){
+    if (!geoptr)
+      return;
+    if (geoptr->hp)
+      delete geoptr->hp;
+    delete geoptr;
+    geoptr=0;
+  }
+
+  int newgeo(GIAC_CONTEXT){
+    if (!geoptr){
+      geoptr=new Graph2d(0,contextptr);
+      geoptr->window_xmin=-5;
+      geoptr->window_ymin=-5;
+      geoptr->window_zmin=-5;
+      geoptr->window_xmax=5;
+      geoptr->window_ymax=5;
+      geoptr->window_zmax=5;
+      geoptr->orthonormalize();
+    }
+    if (!geoptr)
+      return -1;
+    if (!geoptr->hp){
+      geoptr->hp=new textArea;
+      geoptr->hp->filename="figure0.py";
+      geoptr->hp->python=0;
+    }
+    if (!geoptr->hp)
+      return -2;
+    textArea * text=geoptr->hp;
+    text->editable=true;
+    text->clipline=-1;
+    text->gr=geoptr;
+    geoptr->set_mode(0,0,255,""); // start in frame mode
+    return 0;
+  }
+  
   tableur * sheetptr=0;
 
   string print_tableur(const tableur & t,GIAC_CONTEXT){
@@ -16372,6 +18670,11 @@ namespace xcas {
       vecteur & v=*g._VECTptr;
       for (int j=0;j<t.ncols;++j){
 	gen vj=v[j];
+	if (vj.type==_VECT && vj._VECTptr->size()==3){
+	  vecteur vjv=*vj._VECTptr;
+	  vjv[1]=0;
+	  vj=gen(vjv,vj.subtype);
+	}
 	printcell_current_col(contextptr)=j;
 	s += vj.print(contextptr);
 	if (j==t.ncols-1)
@@ -17001,7 +19304,7 @@ int select_item(const char ** ptr,const char * title,bool askfor1){
   Menu smallmenu;
   smallmenu.numitems=nitems; 
   smallmenu.items=smallmenuitems;
-  smallmenu.height=12;
+  smallmenu.height=nitems<12?nitems+1:12;
   smallmenu.scrollbar=1;
   smallmenu.scrollout=1;
   smallmenu.title = (char*) title;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.cc~ b/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.cc~
deleted file mode 100755
index 1c8701bcd..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.cc~
+++ /dev/null
@@ -1,17378 +0,0 @@
-// -*- mode:C++ ; compile-command: "g++-3.4 -I. -I.. -g -c Equation.cc -DHAVE_CONFIG_H -DIN_GIAC -Wall" -*-
-/*
- *  Copyright (C) 2005,2014 B. Parisse, Institut Fourier, 38402 St Martin d'Heres
- *
- *  This program 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "config.h"
-#include "giacPCH.h"
-#if defined HAVE_UNISTD_H && !defined NUMWORKS
-#include <dirent.h>
-#endif
-#ifdef NSPIRE_NEWLIB
-#include <fstream>
-#include <libndls.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <os.h>
-#include <syscall.h>
-#include "sha256.h"
-#endif
-#ifndef is_cx2
-#define is_cx2 false
-#endif
-
-
-
-#ifdef KHICAS
-
-#ifdef NUMWORKS
-char * freeptr=0;
-#ifndef DEVICE
-const char * flash_buf=file_gettar_aligned("apps.tar",freeptr);
-extern "C" const char * flash_read(const char * filename){
-  return tar_loadfile(flash_buf,filename,0);
-}
-extern "C" int flash_filebrowser(const char ** filenames,int maxrecords,const char * extension){
-  return tar_filebrowser(flash_buf,filenames,maxrecords,extension);
-}
-#else
-const char * flash_buf=(const char *)0x90200000;
-#endif
-#endif
-
-#if defined NUMWORKS && !defined DEVICE //ndef NSPIRE_NEWLIB
-extern "C" {
-  short int nspire_exam_mode=0;
-}
-#endif
-#define XWASPY 1 // save .xw file as _xw.py (to be recognized by Numworks workshop)
-const int xwaspy_shift=33; // must be between 32 and 63, reflect in xcas.js and History.cc
-#include "kdisplay.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <ctype.h>
-#include "input_lexer.h"
-#include "input_parser.h"
-#if defined NUMWORKS && defined DEVICE
-  void py_ck_ctrl_c(){
-    if (giac::ctrl_c || giac::interrupted)
-      raisememerr();
-  }
-#else
-  void py_ck_ctrl_c(){}
-#endif
-//giac::context * contextptr=0;
-int clip_ymin=0;
-int lang=1;
-short int nspirelua=0;
-bool warn_nr=true; 
-bool xthetat=false;
-//bool freezeturtle=false;
-bool global_show_axes=true;
-int esc_flag=0;
-int xcas_python_eval=0;
-char * python_heap=0;
-
-#ifdef QUICKJS
-#include "qjsgiac.h"
-#endif
-
-#ifdef MICROPY_LIB
-extern "C" int mp_token(const char * line);
-
-void python_free(){
-  if (!python_heap) return;
-  mp_deinit(); free(python_heap); python_heap=0;
-}
-
-int python_init(int stack_size,int heap_size){
-#if 1 // defined NUMWORKS
-  python_free();
-  python_heap=micropy_init(stack_size,heap_size);
-  if (!python_heap)
-    return 0;
-#endif
-  return 1;
-}
-
-int micropy_ck_eval(const char *line){
-#if 1 // def NUMWORKS
-  giac::ctrl_c=giac::interrupted=false;
-  if (python_heap && line[0]==0)
-    return 1;
-  if (!python_heap){
-    python_init(pythonjs_stack_size,pythonjs_heap_size);
-  }
-  if (!python_heap){
-    console_output("Memory full",11);
-    return RAND_MAX;
-  }
-#endif
-  return micropy_eval(line);
-  // if MP_PARSE_SINGLE_INPUT is used, split input if newline not followed by a space, return shift
-  int shift=0,nl=0;
-  const char * ptr=line;
-  for (;;++ptr){
-    if (*ptr=='\n')
-      ++nl;
-    if (*ptr==0 || (*ptr=='\n' && *(ptr+1)!=' ')){
-      int n=ptr-line;
-      char buf[n+1];
-      strncpy(buf,line,n);
-      buf[n]=0;
-      micropy_eval(buf);
-      if (parser_errorline)
-	return shift;
-      if (*ptr==0)
-	return 0;
-      line=ptr+1;
-      shift=nl;
-    }
-  }
-  return 0;
-}
-#endif
-
-using namespace std;
-using namespace giac;
-const int LCD_WIDTH_PX=320;
-const int LCD_HEIGHT_PX=222;
-char* fmenu_cfg=0;
-int khicas_addins_menu(GIAC_CONTEXT); // in kadd.cc
-#ifdef MICROPY_LIB
-extern "C" const char * const * mp_vars();
-#endif
-#if defined NUMWORKS && defined DEVICE
-extern "C" void extapp_clipboardStore(const char *text);
-extern "C" const char * extapp_clipboardText();
-#endif
-
-// Numworks Logo commands
-#ifndef NO_NAMESPACE_GIAC
-namespace giac {
-#endif // ndef NO_NAMESPACE_GIAC
-  void Bdisp_PutDisp_DD(){
-    sync_screen();
-  }
-  void Bdisp_AllClr_VRAM(){
-    waitforvblank();
-    drawRectangle(0,0,LCD_WIDTH_PX,LCD_HEIGHT_PX,_WHITE);
-  }
-  void drawLine(int x1,int y1,int x2,int y2,int c){
-    draw_line(x1,y1,x2,y2,c,context0);
-  }
-  void stroke_rectangle(int x,int y,int w,int h,int c){
-    drawLine(x,y,x+w,y,c);
-    drawLine(x,y+h,x+w,y+h,c);
-    drawLine(x,y,x,y+h,c);
-    drawLine(x+w,y,x+w,y+h,c);
-  }
-  void DefineStatusMessage(const char * s,int a,int b,int c){
-    statuslinemsg(s);
-  }
-
-  void DisplayStatusArea(){
-    sync_screen();
-  }
-
-  void set_xcas_status(){
-    statusline(1+2*xcas_python_eval);
-  }
-  int GetSetupSetting(int mode){
-    return 0;
-  }
-
-  void SetSetupSetting(int mode,int){
-  }
-
-  void handle_f5(){
-    lock_alpha();
-  }
-
-  void delete_clipboard(){}
-
-  bool clip_pasted=true;
-  
-  string * clipboard(){
-    static string * ptr=0;
-    if (!ptr)
-      ptr=new string;
-    return ptr;
-  }
-  
-  void copy_clipboard(const string & s,bool status){
-#if defined NUMWORKS && defined DEVICE
-    extapp_clipboardStore(s.c_str());
-#else
-    if (1 || clip_pasted) // adding to clipboard is sometimes annoying
-      *clipboard()=s;
-    else
-      *clipboard()+=s;
-#endif
-    clip_pasted=false;
-    if (status){
-      DefineStatusMessage((char*)((lang==1)?"Selection copiee vers presse-papiers.":"Selection copied to clipboard"), 1, 0, 0);
-      DisplayStatusArea();
-    }
-  }
-  
-  const char * paste_clipboard(){
-    clip_pasted=true;
-#if defined NUMWORKS && defined DEVICE
-    return extapp_clipboardText();
-#endif
-    return clipboard()->c_str();
-  }
-  
-  int print_msg12(const char * msg1,const char * msg2,int textY=40){
-    drawRectangle(0, textY+10, LCD_WIDTH_PX, 44, COLOR_WHITE);
-    drawRectangle(3,textY+10,316,3, COLOR_BLACK);
-    drawRectangle(3,textY+10,3,44, COLOR_BLACK);
-    drawRectangle(316,textY+10,3,44, COLOR_BLACK);
-    drawRectangle(3,textY+54,316,3, COLOR_BLACK);
-    int textX=30;
-    if (msg1){
-      if (strlen(msg1)>=30)
-	os_draw_string_small_(textX,textY+15,msg1);
-      else
-	os_draw_string_(textX,textY+15,msg1);
-    }
-    textX=10;
-    textY+=33;
-    if (msg2){
-      if (strlen(msg2)>=30)
-	os_draw_string_small_(textX,textY,msg2);
-      else      
-	textX=os_draw_string_(textX,textY,msg2);
-    }
-    return textX;
-  }
-  
-  void insert(string & s,int pos,const char * add){
-    if (pos>s.size())
-      pos=s.size();
-    if (pos<0)
-      pos=0;
-    s=s.substr(0,pos)+add+s.substr(pos,s.size()-pos);
-  }
-  
-  bool do_confirm(const char * s){
-#ifdef NSPIRE_NEWLIB
-    return confirm(s,((lang==1)?"enter: oui,  esc:annuler":"enter: yes,   esc: cancel"))==KEY_CTRL_F1;
-#else
-    return confirm(s,((lang==1)?"OK: oui,  Back:annuler":"OK: yes,   Back: cancel"))==KEY_CTRL_F1;
-#endif
-  }
-  
-  int confirm(const char * msg1,const char * msg2,bool acexit,int y){
-    int key=0;
-    print_msg12(msg1,msg2,y);
-    while (key!=KEY_CTRL_F1 && key!=KEY_CTRL_F6){
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;
-      if (key==KEY_CTRL_EXE || key==KEY_CTRL_OK)
-	key=KEY_CTRL_F1;
-      if (key==KEY_CTRL_AC || key==KEY_CTRL_EXIT || key==KEY_CTRL_MENU){
-	if (acexit) return -1;
-	key=KEY_CTRL_F6;
-      }
-      set_xcas_status();
-    }
-    return key;
-  }  
-  
-  bool confirm_overwrite(){
-#ifdef NSPIRE_NEWLIB
-    return do_confirm((lang==1)?"enter: oui,  esc:annuler":"enter: yes,   esc: cancel")==KEY_CTRL_F1;
-#else
-    return do_confirm((lang==1)?"OK: oui,  Back:annuler":"OK: yes,   Back: cancel")==KEY_CTRL_F1;
-#endif
-  }
-  
-  void invalid_varname(){
-    confirm((lang==1)?"Nom de variable incorrect":"Invalid variable name",
-#ifdef NSPIRE_NEWLIB
-	    (lang==1)?"enter: ok":"enter: ok"
-#else
-	    (lang==1)?"OK: ok":"OK: ok"
-#endif
-	    );
-  }
-
-
-#ifdef SCROLLBAR
-  typedef scrollbar TScrollbar;
-#endif
-
-#define C24 18 // 24 on 90
-#define C18 18 // 18
-#define C10 10 // 18
-#define C6 6 // 6
-
-  int MB_ElementCount(const char * s){
-    return strlen(s); // FIXME for UTF8
-  }
-
-  void PrintXY(int x,int y,const char * s,int mode,int c=giac::_BLACK,int bg=giac::_WHITE){
-    if (mode==TEXT_MODE_NORMAL)
-      os_draw_string(x,y,c,bg,s);
-    else {
-      if (c==giac::_BLACK && bg==giac::_WHITE)
-	os_draw_string(x,y,c,color_gris,s);
-      else
-	os_draw_string(x,y,bg,c,s);
-    }
-  }
-
-  int PrintMiniMini(int x,int y,const char * s,int mode,int c=giac::_BLACK,int bg=giac::_WHITE,bool fake=false){
-    if (mode==TEXT_MODE_NORMAL)
-      return os_draw_string_small(x,y,c,bg,s,fake);
-    else {
-      if (c==giac::_BLACK && bg==giac::_WHITE)
-	return os_draw_string_small(x,y,c,color_gris,s,fake);
-      else
-	return os_draw_string_small(x,y,bg,c,s,fake);	
-    }
-  }
-  
-  int PrintMini(int x,int y,const char * s,int mode,int c=giac::_BLACK,int bg=giac::_WHITE,bool fake=false){
-    if (mode==TEXT_MODE_NORMAL)
-      return os_draw_string(x,y,c,bg,s,fake);
-    else {
-      if (c==giac::_BLACK && bg==giac::_WHITE)
-	return os_draw_string(x,y,c,color_gris,s,fake);
-      else
-	return os_draw_string(x,y,bg,c,s,fake);
-    }
-  }
-  
-  void printCentered(const char* text, int y) {
-    int len = strlen(text);
-    int x = LCD_WIDTH_PX/2-(len*6)/2;
-    PrintXY(x,y,text,0);
-  }
-
-  int doMenu(Menu* menu, MenuItemIcon* icontable) { // returns code telling what user did. selection is on menu->selection. menu->selection starts at 1!
-    int itemsStartY=menu->startY; // char Y where to start drawing the menu items. Having a title increases this by one
-    int itemsHeight=menu->height;
-    int showtitle = menu->title != NULL;
-    if (showtitle) {
-      itemsStartY++;
-      itemsHeight--;
-    }
-    char keyword[5];
-    keyword[0]=0;
-    if(menu->selection > menu->scroll+(menu->numitems>itemsHeight ? itemsHeight : menu->numitems))
-      menu->scroll = menu->selection -(menu->numitems>itemsHeight ? itemsHeight : menu->numitems);
-    if(menu->selection-1 < menu->scroll)
-      menu->scroll = menu->selection -1;
-  
-    while(1) {
-      // Cursor_SetFlashOff();
-      if (menu->selection <=1)
-	menu->selection=1;
-      if (menu->selection > menu->scroll+(menu->numitems>itemsHeight ? itemsHeight : menu->numitems))
-	menu->scroll = menu->selection -(menu->numitems>itemsHeight ? itemsHeight : menu->numitems);
-      if (menu->selection-1 < menu->scroll)
-	menu->scroll = menu->selection -1;
-      if(menu->statusText != NULL) DefineStatusMessage(menu->statusText, 1, 0, 0);
-      // Clear the area of the screen we are going to draw on
-      if(0 == menu->pBaRtR) {
-	int x=C10*menu->startX-1,
-	  y=C24*(menu->miniMiniTitle ? itemsStartY:menu->startY)-1,
-	  w=2+C10*menu->width /* + ((menu->scrollbar && menu->scrollout)?C10:0) */,
-	  h=2+C24*menu->height-(menu->miniMiniTitle ? C24:0);
-	// drawRectangle(x, y, w, h, COLOR_WHITE);
-	draw_line(x,y,x+w,y,COLOR_BLACK,context0);
-	draw_line(x,y+h,x+w,y+h,COLOR_BLACK,context0);
-	draw_line(x,y,x,y+h,COLOR_BLACK,context0);
-	draw_line(x+w,y,x+w,y+h,COLOR_BLACK,context0);
-      }
-      if (menu->numitems>0) {
-	for(int curitem=0; curitem < menu->numitems; curitem++) {
-	  // print the menu item only when appropriate
-	  if(menu->scroll <= curitem && menu->scroll > curitem-itemsHeight) {
-	    if ((curitem-menu->scroll) % 6==0)
-	      waitforvblank();
-	    char menuitem[256] = "";
-	    if(menu->numitems>=100 || menu->type == MENUTYPE_MULTISELECT){
-	      strcpy(menuitem, "  "); //allow for the folder and selection icons on MULTISELECT menus (e.g. file browser)
-	      strcpy(menuitem+2,menu->items[curitem].text);
-	    }
-	    else if (menu->type==MENUTYPE_NO_NUMBER)
-	      strcpy(menuitem,menu->items[curitem].text);
-	    else {
-	      int cur=curitem+1;
-	      if (menu->numitems<10){
-		menuitem[0]='0'+cur;
-		menuitem[1]=' ';
-		menuitem[2]=0;
-		strcpy(menuitem+2,menu->items[curitem].text);
-	      }
-	      else {
-		menuitem[0]=cur>=10?('0'+(cur/10)):' ';
-		menuitem[1]='0'+(cur%10);
-		menuitem[2]=' ';
-		menuitem[3]=0;
-		strcpy(menuitem+3,menu->items[curitem].text);
-	      }
-	    }
-	    //strncat(menuitem, menu->items[curitem].text, 68);
-	    if(menu->items[curitem].type != MENUITEM_SEPARATOR) {
-	      //make sure we have a string big enough to have background when item is selected:          
-	      // MB_ElementCount is used instead of strlen because multibyte chars count as two with strlen, while graphically they are just one char, making fillerRequired become wrong
-	      int fillerRequired = menu->width - MB_ElementCount(menu->items[curitem].text) - (menu->type == MENUTYPE_MULTISELECT ? 2 : 3);
-	      for(int i = 0; i < fillerRequired; i++)
-		strcat(menuitem, " ");
-	      drawRectangle(C10*menu->startX,C18*(curitem+itemsStartY-menu->scroll),C10*menu->width,C24,(menu->selection == curitem+1 ? color_gris : _WHITE));
-	      PrintXY(C10*menu->startX,C18*(curitem+itemsStartY-menu->scroll),menuitem, (menu->selection == curitem+1 ? TEXT_MODE_INVERT : TEXT_MODE_NORMAL));
-	    } else {
-	      /*int textX = (menu->startX-1) * C18;
-		int textY = curitem*C24+itemsStartY*C24-menu->scroll*C24-C24+C10;
-		clearLine(menu->startX, curitem+itemsStartY-menu->scroll, (menu->selection == curitem+1 ? textColorToFullColor(menu->items[curitem].color) : COLOR_WHITE));
-		drawLine(textX, textY+C24-4, LCD_WIDTH_PX-2, textY+C24-4, COLOR_GRAY);
-		PrintMini(&textX, &textY, (unsigned char*)menuitem, 0, 0xFFFFFFFF, 0, 0, (menu->selection == curitem+1 ? COLOR_WHITE : textColorToFullColor(menu->items[curitem].color)), (menu->selection == curitem+1 ? textColorToFullColor(menu->items[curitem].color) : COLOR_WHITE), 1, 0);*/
-	    }
-	    // deal with menu items of type MENUITEM_CHECKBOX
-	    if(menu->items[curitem].type == MENUITEM_CHECKBOX) {
-	      PrintXY(C10*(menu->startX+menu->width-4),C18*(curitem+itemsStartY-menu->scroll),
-		      (menu->items[curitem].value == MENUITEM_VALUE_CHECKED ? " [+]" : " [-]"),
-		      (menu->selection == curitem+1 ? TEXT_MODE_INVERT : (menu->pBaRtR == 1? TEXT_MODE_NORMAL : TEXT_MODE_NORMAL)));
-	    }
-	    // deal with multiselect menus
-	    if(menu->type == MENUTYPE_MULTISELECT) {
-	      if((curitem+itemsStartY-menu->scroll)>=itemsStartY &&
-		 (curitem+itemsStartY-menu->scroll)<=(itemsStartY+itemsHeight) &&
-		 icontable != NULL
-		 ) {
-#if 0
-		if (menu->items[curitem].isfolder == 1) {
-		  // assumes first icon in icontable is the folder icon
-		  CopySpriteMasked(icontable[0].data, (menu->startX)*C18, (curitem+itemsStartY-menu->scroll)*C24, 0x12, 0x18, 0xf81f  );
-		} else {
-		  if(menu->items[curitem].icon >= 0) CopySpriteMasked(icontable[menu->items[curitem].icon].data, (menu->startX)*C18, (curitem+itemsStartY-menu->scroll)*C24, 0x12, 0x18, 0xf81f  );
-		}
-#endif
-	      }
-	      if (menu->items[curitem].isselected) {
-		if (menu->selection == curitem+1) {
-		  PrintXY(C10*menu->startX,C18*(curitem+itemsStartY-menu->scroll),"\xe6\x9b", TEXT_MODE_NORMAL);
-		} else {
-		  PrintXY(C10*menu->startX,C18*(curitem+itemsStartY-menu->scroll),"\xe6\x9b", TEXT_MODE_NORMAL);
-		}
-	      }
-	    }
-	  }
-	} // end for curitem<menu->numitem
-	int dh=menu->height-menu->numitems-(showtitle?1:0);
-	if (dh>0)
-	  drawRectangle(C10*menu->startX,C24*(menu->numitems+(showtitle?1:0)),C10*menu->width,C24*dh,_WHITE);
-	if (menu->scrollbar) {
-#ifdef SCROLLBAR
-	  TScrollbar sb;
-	  sb.I1 = 0;
-	  sb.I5 = 0;
-	  sb.indicatormaximum = menu->numitems;
-	  sb.indicatorheight = itemsHeight;
-	  sb.indicatorpos = menu->scroll;
-	  sb.barheight = itemsHeight*C24;
-	  sb.bartop = (itemsStartY-1)*C24;
-	  sb.barleft = menu->startX*C18+menu->width*C18 - C18 - (menu->scrollout ? 0 : 5);
-	  sb.barwidth = C10;
-	  Scrollbar(&sb);
-#endif
-	}
-	//if(menu->type==MENUTYPE_MULTISELECT && menu->fkeypage == 0) drawFkeyLabels(0x0037); // SELECT (white)
-      } else {
-	giac::printCentered(menu->nodatamsg, (itemsStartY*C24)+(itemsHeight*C24)/2-12);
-      }
-      if(showtitle) {
-	int textX = C10*menu->startX, textY=menu->startY*C24;
-	drawRectangle(textX,textY,C10*menu->width,C24,_WHITE);
-	if (menu->miniMiniTitle) 
-	  PrintMini( textX, textY, menu->title, 0 );
-	else
-	  PrintXY(textX, textY, menu->title, TEXT_MODE_NORMAL);
-	if(menu->subtitle != NULL) {
-	  int textX=(MB_ElementCount(menu->title)+menu->startX-1)*C18+C10, textY=C10;
-	  PrintMini(textX, textY, menu->subtitle, 0);
-	}
-	PrintXY(textX+C10*(menu->width-5), 1, "____", 0);
-	PrintXY(textX+C10*(menu->width-5), 1, keyword, 0);
-      }
-      /*if(menu->darken) {
-	DrawFrame(COLOR_BLACK);
-	VRAMInvertArea(menu->startX*C18-C18, menu->startY*C24, menu->width*C18-(menu->scrollout || !menu->scrollbar ? 0 : 5), menu->height*C24);
-	}*/
-      if(menu->type == MENUTYPE_NO_KEY_HANDLING) return MENU_RETURN_INSTANT; // we don't want to handle keys
-      int key;
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;
-      if (key==KEY_CTRL_MENU){
-	menu->selection=menu->numitems;
-	return MENU_RETURN_SELECTION;
-      }
-      if (key<256 && isalpha(key)){
-	key=tolower(key);
-	int pos=strlen(keyword);
-	if (pos>=4)
-	  pos=0;
-	keyword[pos]=key;
-	keyword[pos+1]=0;
-	int cur=0;
-	for (;cur<menu->numitems;++cur){
-#if 1
-	  if (strcmp(menu->items[cur].text,keyword)>=0)
-	    break;
-#else
-	  char c=menu->items[cur].text[0];
-	  if (key<=c)
-	    break;
-#endif
-	}
-	if (cur<menu->numitems){
-	  menu->selection=cur+1;
-	  if(menu->selection > menu->scroll+(menu->numitems>itemsHeight ? itemsHeight : menu->numitems))
-	    menu->scroll = menu->selection -(menu->numitems>itemsHeight ? itemsHeight : menu->numitems);
-	  if(menu->selection-1 < menu->scroll)
-	    menu->scroll = menu->selection -1;
-	}
-	continue;
-      }
-      switch(key) {
-      case KEY_CTRL_PAGEDOWN:
-	menu->selection+=6;
-	if (menu->selection >= menu->numitems)
-	  menu->selection=menu->numitems;
-	if(menu->selection > menu->scroll+(menu->numitems>itemsHeight ? itemsHeight : menu->numitems))
-	  menu->scroll = menu->selection -(menu->numitems>itemsHeight ? itemsHeight : menu->numitems);
-	break;
-      case KEY_CTRL_DOWN:
-	if(menu->selection == menu->numitems)
-	  {
-	    if(menu->returnOnInfiniteScrolling) {
-	      return MENU_RETURN_SCROLLING;
-	    } else {
-	      menu->selection = 1;
-	      menu->scroll = 0;
-	    }
-	  }
-	else
-	  {
-	    menu->selection++;
-	    if(menu->selection > menu->scroll+(menu->numitems>itemsHeight ? itemsHeight : menu->numitems))
-	      menu->scroll = menu->selection -(menu->numitems>itemsHeight ? itemsHeight : menu->numitems);
-	  }
-	if(menu->pBaRtR==1) return MENU_RETURN_INSTANT;
-	break;
-      case KEY_CTRL_PAGEUP:
-	menu->selection-=6;
-	if (menu->selection <=1)
-	  menu->selection=1;
-	if(menu->selection-1 < menu->scroll)
-	  menu->scroll = menu->selection -1;
-	break;
-      case KEY_CTRL_UP:
-	if(menu->selection == 1)
-	  {
-	    if(menu->returnOnInfiniteScrolling) {
-	      return MENU_RETURN_SCROLLING;
-	    } else {
-	      menu->selection = menu->numitems;
-	      menu->scroll = menu->selection-(menu->numitems>itemsHeight ? itemsHeight : menu->numitems);
-	    }
-	  }
-	else
-	  {
-	    menu->selection--;
-	    if(menu->selection-1 < menu->scroll)
-	      menu->scroll = menu->selection -1;
-	  }
-	if(menu->pBaRtR==1) return MENU_RETURN_INSTANT;
-	break;
-      case KEY_CTRL_F1:
-	if(menu->type==MENUTYPE_MULTISELECT && menu->fkeypage == 0 && menu->numitems > 0) {
-          /*if(menu->items[menu->selection-1].isselected) {
-            menu->items[menu->selection-1].isselected=0;
-            menu->numselitems = menu->numselitems-1;
-	    } else {
-            menu->items[menu->selection-1].isselected=1;
-            menu->numselitems = menu->numselitems+1;
-	    }
-	    return key; //return on F1 too so that parent subroutines have a chance to e.g. redraw fkeys*/
-	} else if (menu->type == MENUTYPE_FKEYS || menu->type==MENUTYPE_NO_NUMBER) {
-	  return key;
-	}
-	break;
-      case KEY_CTRL_F2:
-      case KEY_CTRL_F3:
-      case KEY_CTRL_F4:
-      case KEY_CTRL_F5:
-      case KEY_CTRL_F6: case KEY_CTRL_CATALOG: case KEY_BOOK: case '\t':
-      case KEY_CHAR_ANS: 
-	if (menu->type == MENUTYPE_FKEYS || menu->type==MENUTYPE_NO_NUMBER || menu->type==MENUTYPE_MULTISELECT) return key; // MULTISELECT also returns on Fkeys
-	break;
-      case KEY_CTRL_PASTE:
-	if (menu->type==MENUTYPE_MULTISELECT) return key; // MULTISELECT also returns on paste
-      case KEY_CTRL_OPTN:
-	if (menu->type==MENUTYPE_FKEYS || menu->type==MENUTYPE_MULTISELECT) return key;
-	break;
-      case KEY_CTRL_FORMAT:
-	if (menu->type==MENUTYPE_FKEYS) return key; // return on the Format key so that event lists can prompt to change event category
-	break;
-      case KEY_CTRL_RIGHT:
-	if(menu->type != MENUTYPE_MULTISELECT) return KEY_BOOK; // break;
-	// else fallthrough
-      case KEY_CTRL_EXE: case KEY_CTRL_OK:
-	if(menu->numitems>0) return key==KEY_CTRL_OK?MENU_RETURN_SELECTION:key;
-	break;
-      case KEY_CTRL_LEFT:
-	if(menu->type != MENUTYPE_MULTISELECT) break;
-	// else fallthrough
-      case KEY_CTRL_DEL:
-	if (strlen(keyword))
-	  keyword[strlen(keyword)-1]=0;
-	else {
-	  if (strcmp(menu->title,"Variables")==0)
-	    return key;
-	}
-	break;
-      case KEY_CTRL_AC:
-	if (strlen(keyword)){
-	  keyword[0]=0;
-	  lock_alpha();//SetSetupSetting( (unsigned int)0x14, 0x88);	
-	  //DisplayStatusArea();
-	  break;
-	}
-      case KEY_CTRL_EXIT: 
-	return MENU_RETURN_EXIT;
-	break;
-      case KEY_CHAR_1:
-      case KEY_CHAR_2:
-      case KEY_CHAR_3:
-      case KEY_CHAR_4:
-      case KEY_CHAR_5:
-      case KEY_CHAR_6:
-      case KEY_CHAR_7:
-      case KEY_CHAR_8:
-      case KEY_CHAR_9:
-	if (menu->type==MENUTYPE_NO_NUMBER)
-	  return key;
-	if(menu->numitems>=(key-0x30)) {
-	  menu->selection = (key-0x30);
-	  if (menu->type != MENUTYPE_FKEYS) return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_0:
-	if (menu->type==MENUTYPE_NO_NUMBER)
-	  return key;
-	if(menu->numitems>=10) {
-	  menu->selection = 10;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_EXPN:
-	if(menu->numitems>=11) {
-	  menu->selection = 11;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_LN:
-	if(menu->numitems>=12) {
-	  menu->selection = 12;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_LOG:
-	if(menu->numitems>=13) {
-	  menu->selection = 13;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_IMGNRY:
-	if(menu->numitems>=14) {
-	  menu->selection = 14;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_COMMA:
-	if(menu->numitems>=15) {
-	  menu->selection = 15;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_POW:
-	if(menu->numitems>=16) {
-	  menu->selection = 16;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_SIN:
-      case KEY_CHAR_COS:
-      case KEY_CHAR_TAN:
-	if(menu->numitems>=(key-112)) {
-	  menu->selection = (key-112);
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_PI:
-	if(menu->numitems>=20) {
-	  menu->selection = 20;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_ROOT:
-	if(menu->numitems>=21) {
-	  menu->selection = 21;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_SQUARE:
-	if(menu->numitems>=22) {
-	  menu->selection = 22;
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      case KEY_CHAR_LPAR:
-      case KEY_CHAR_RPAR:
-	if(menu->numitems>=(key-17)) {
-	  menu->selection = (key-17);
-	  if (menu->type != MENUTYPE_FKEYS)  return MENU_RETURN_SELECTION;
-	}
-	break;
-      }
-    }
-    return MENU_RETURN_EXIT;
-  }
-
-#define CAT_CATEGORY_ALL 0
-#define CAT_CATEGORY_ALGEBRA 1
-#define CAT_CATEGORY_LINALG 2
-#define CAT_CATEGORY_CALCULUS 3
-#define CAT_CATEGORY_ARIT 4
-#define CAT_CATEGORY_COMPLEXNUM 5
-#define CAT_CATEGORY_PLOT 6
-#define CAT_CATEGORY_POLYNOMIAL 7
-#define CAT_CATEGORY_PROBA 8
-#define CAT_CATEGORY_PROGCMD 9
-#define CAT_CATEGORY_REAL 10
-#define CAT_CATEGORY_SOLVE 11
-#define CAT_CATEGORY_STATS 12
-#define CAT_CATEGORY_TRIG 13
-#define CAT_CATEGORY_OPTIONS 14
-#define CAT_CATEGORY_LIST 15
-#define CAT_CATEGORY_MATRIX 16
-#define CAT_CATEGORY_PROG 17
-#define CAT_CATEGORY_SOFUS 18
-#define CAT_CATEGORY_PHYS 19
-#define CAT_CATEGORY_UNIT 20
-#define CAT_CATEGORY_2D 21
-#define CAT_CATEGORY_3D 22
-#define CAT_CATEGORY_LOGO 23 // should be the last one
-#define XCAS_ONLY 0x80000000
-  void init_locale(){
-    lang=1;
-  }
-
-  const catalogFunc completeCatfr[] = { // list of all functions (including some not in any category)
-    // {"cosh(x)", 0, "Hyperbolic cosine of x.", 0, 0, CAT_CATEGORY_TRIG},
-    // {"exp(x)", 0, "Renvoie e^x.", "1.2", 0, CAT_CATEGORY_REAL},
-    // {"log(x)", 0, "Logarithme naturel de x.", 0, 0, CAT_CATEGORY_REAL},
-    // {"sinh(x)", 0, "Hyperbolic sine of x.", 0, 0, CAT_CATEGORY_TRIG},
-    // {"tanh(x)", 0, "Hyperbolic tangent of x.", 0, 0, CAT_CATEGORY_TRIG},
-    {" boucle for (pour)", "for ", "Boucle definie pour un indice variant entre 2 valeurs fixees", "#\nfor ", 0, CAT_CATEGORY_PROG},
-    {" boucle liste", "for in", "Boucle sur tous les elements d'une liste.", "#\nfor in", 0, CAT_CATEGORY_PROG},
-    {" boucle while (tantque)", "while ", "Boucle indefinie tantque.", "#\nwhile ", 0, CAT_CATEGORY_PROG},
-    {" test si alors", "if ", "Test", "#\nif ", 0, CAT_CATEGORY_PROG},
-    {" test sinon", "else ", "Clause fausse du test", 0, 0, CAT_CATEGORY_PROG},
-    {" fonction def.", "f(x):=", "Definition de fonction.", "#\nf(x):=", 0, CAT_CATEGORY_PROG},
-    {" local j,k;", "local ", "Declaration de variables locales Xcas", 0, 0, CAT_CATEGORY_PROG | XCAS_ONLY},
-    {" range(a,b)", "in range(", "Dans l'intervalle [a,b[ (a inclus, b exclus)", "# in range(1,10)", 0, CAT_CATEGORY_PROG},
-    {" return res;", "return ", "return ou retourne quitte la fonction et renvoie le resultat res", 0, 0, CAT_CATEGORY_PROG},
-    //{" edit list ", "list(", "Assistant creation de liste.", 0, 0, CAT_CATEGORY_LIST},
-    //{" edit matrix ", "matrix(", "Assistant creation de matrice.", 0, 0, CAT_CATEGORY_MATRIX },
-    {" mksa(x)", 0, "Conversion en unites MKSA", 0, 0, CAT_CATEGORY_PHYS | (CAT_CATEGORY_UNIT << 8)  | XCAS_ONLY},
-    {" ufactor(a,b)", 0, "Factorise l'unite b dans a", "100_J,1_kW", 0, CAT_CATEGORY_PHYS | (CAT_CATEGORY_UNIT << 8) | XCAS_ONLY},
-    {" usimplify(a)", 0, "Simplifie l'unite dans a", "100_l/10_cm^2", 0, CAT_CATEGORY_PHYS | (CAT_CATEGORY_UNIT << 8) | XCAS_ONLY},
-    //{"fonction def Xcas", "fonction f(x) local y;   ffonction:;", "Definition de fonction.", "#fonction f(x) local y; y:=x^2; return y; ffonction:;", 0, CAT_CATEGORY_PROG},
-    {"!", "!", "Non logique (prefixe) ou factorielle de n (suffixe).", "#7!", "#!b", CAT_CATEGORY_PROGCMD},
-    {"#", "#", "Commentaire Python, en Xcas taper //.", 0, 0, CAT_CATEGORY_PROG},
-    {"%", "%", "a % b signifie a modulo b", 0, 0, CAT_CATEGORY_ARIT | (CAT_CATEGORY_PROGCMD << 8)},
-    {"&", "&", "Et logique ou +", "#1&2", 0, CAT_CATEGORY_PROGCMD},
-    {":=", ":=", "Affectation vers la gauche (inverse de =>).", "#a:=3", 0, CAT_CATEGORY_PROGCMD|(CAT_CATEGORY_SOFUS<<8)|XCAS_ONLY},
-    {"<", "<", "Inferieur strict. Raccourci SHIFT F2", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"=>", "=>", "Affectation vers la droite ou conversion en (touche ->). Par exemple 5=>a ou x^4-1=>* ou (x+1)^2=>+ ou sin(x)^2=>cos.", "#5=>a", "#15_m=>_cm", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_PHYS <<8) | (CAT_CATEGORY_UNIT << 16) | XCAS_ONLY},
-    {">", ">", "Superieur strict. Raccourci F2.", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"\\", "\\", "Caractere \\", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"_", "_", "Caractere _. Prefixe d'unites.", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"_(km/h)", "_(km/h)", "Vitesse en kilometre/heure", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_(m/s)", "_(m/s)", "Vitesse en metre/seconde", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_(m/s^2)", "_(m/s^2)", "Acceleration en metre par seconde au carre", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_(m^2/s)", "_(m^2/s)", "Viscosite", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_A", 0, "Intensite electrique en Ampere", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Bq", 0, "Radioactivite: Becquerel", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_C", 0, "Charge electrique en Coulomb", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Ci", 0, "Radioactivite: Curie", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_F", 0, "Farad", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_F_", 0, "constante de Faraday (charge globale d'une mole de charges élémentaires).", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_G_", 0, "constante de gravitation universelle. Force=_G_*m1*m2/r^2", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_H", 0, "Henry", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Hz", 0, "Hertz", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_J", 0, "Energie en Joule=kg*m^2/s^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_K", 0, "Temperature en Kelvin", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Kcal", 0, "Energie en kilo-calorier", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_MeV", 0, "Energie en mega-electron-Volt", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_N", 0, "Force en Newton=kg*m/s^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_NA_", 0, "Avogadro", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_Ohm", 0, "Resistance electrique en Ohm", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_PSun_", 0, "puissance du Soleil", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_Pa", 0, "Pression en Pascal=kg/m/s^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_REarth_", 0, "Rayon de la Terre", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_RSun_", 0, "rayon du Soleil", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_R_", 0, "constante des gaz (de Boltzmann par mole)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_S", 0, "", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_StdP_", 0, "Pression standard (au niveau de la mer)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_StdT_", 0, "temperature standard (0 degre Celsius exprimes en Kelvins)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_Sv", 0, "Radioactivite: Sievert", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_T", 0, "Tesla", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_V", 0, "Tension electrique en Volt", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Vm_", 0, "Volume molaire", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_W", 0, "Puissance en Watt=kg*m^2/s^3", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Wb", 0, "Weber", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_alpha_", 0, "constante de structure fine", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_c_", 0, "vitesse de la lumiere", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_cd", 0, "Luminosite en candela", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_cdf", "_cdf", "Suffixe pour obtenir une distribution cumulee. Taper F2 pour la distribution cumulee inverse.", "#_icdf", 0, CAT_CATEGORY_PROBA|XCAS_ONLY},
-    {"_d", 0, "Temps: jour", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_deg", 0, "Angle en degres", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_eV", 0, "Energie en electron-Volt", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_epsilon0_", 0, "permittivite du vide", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_ft", 0, "Longueur en pieds", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_g_", 0, "gravite au sol", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_grad", 0, "Angle en grades", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_h", 0, "Heure", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_h_", 0, "constante de Planck", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_ha", 0, "Aire en hectare", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_hbar_", 0, "constante de Planck/(2*pi)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_inch", 0, "Longueur en pouces", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_kWh", 0, "Energie en kWh", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_k_", 0, "constante de Boltzmann", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_kg", 0, "Masse en kilogramme", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_l", 0, "Volume en litre", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_m", 0, "Longueur en metre", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_mEarth_", 0, "masse de la Terre", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_m^2", 0, "Aire en m^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_m^3", 0, "Volume en m^3", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_me_", 0, "masse electron", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_miUS", 0, "Longueur en miles US", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_mn", 0, "Temps: minute", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_mp_", 0, "masse proton", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_mpme_", 0, "ratio de masse proton/electron", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_mu0_", 0, "permeabilite du vide", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_phi_", 0, "quantum flux magnetique", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_plot", "_plot", "Suffixe pour obtenir le graphe d'une regression.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];polynomial_regression_plot(X,Y,2);scatterplot(X,Y)", 0, CAT_CATEGORY_STATS| XCAS_ONLY},
-    {"_qe_", 0, "charge de l'electron", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_qme_", 0, "_q_/_me_", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_rad", 0, "Angle en radians", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_rem", 0, "Radioactivite: rem", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_s", 0, "Temps: seconde", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_sd_", 0, "Jour sideral", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_syr_", 0, "Annee siderale", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_tr", 0, "Angle en tours", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_yd", 0, "Longueur en yards", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"a and b", " and ", "Et logique", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"a or b", " or ", "Ou logique", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"abcuv(a,b,c)", 0, "Cherche 2 polynomes u,v tels que a*u+b*v=c","x+1,x^2-2,x", 0, CAT_CATEGORY_POLYNOMIAL| XCAS_ONLY},
-    {"abs(x)", 0, "Valeur absolue, module ou norme de x", "-3", "[1,2,3]", CAT_CATEGORY_COMPLEXNUM | (CAT_CATEGORY_REAL<<8)},
-    {"add(u,v)", 0, "En Python, additionne des listes ou listes de listes u et v comme des vecteurs ou matrices.","[1,2,3],[0,1,3]", "[[1,2]],[[3,4]]", CAT_CATEGORY_LINALG},
-    {"append", 0, "Ajoute un element en fin de liste l","#l.append(x)", 0, CAT_CATEGORY_LIST},
-    {"approx(x)", 0, "Valeur approchee de x. Raccourci S-D", "pi", 0, CAT_CATEGORY_REAL| XCAS_ONLY},
-    {"aire(objet)", 0, "Aire algebrique", "cercle(0,1)", "triangle(-1,1+i,3)", CAT_CATEGORY_2D  },
-    {"arg(z)", 0, "Argument du complexe z.", "1+i", 0, CAT_CATEGORY_COMPLEXNUM | XCAS_ONLY},
-    {"asc(string)", 0, "Liste des codes ASCII d'une chaine", "\"Bonjour\"", 0, CAT_CATEGORY_ARIT},
-    {"assume(hyp)", 0, "Hypothese sur une variable.", "x>1", "x>-1 and x<1", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_SOFUS<<8) | XCAS_ONLY},
-    {"avance n", "avance ", "La tortue avance de n pas, par defaut n=10", "#avance 40", 0, CAT_CATEGORY_LOGO},
-    {"axes", "axes", "Axes visibles ou non axes=1 ou 0", "#axes=0", "#axes=1", CAT_CATEGORY_PROGCMD << 8|XCAS_ONLY},
-    {"baisse_crayon ", "baisse_crayon ", "La tortue se deplace en marquant son passage.", 0, 0, CAT_CATEGORY_LOGO},
-    {"barplot(list)", 0, "Diagramme en batons d'une serie statistique 1d.", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS | (CAT_CATEGORY_PLOT<<8)},
-    {"barycentre([pnt,coeff],...)", 0, "Barycentre d'une sequnence de [points,coefficients]. Utiliser isobarycenter si tous les coefficients sont egaux.", "[1,1],[i,1],[2,3]", 0, CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"binomial(n,p,k)", 0, "binomial(n,p,k) probabilite de k succes avec n essais ou p est la proba de succes d'un essai. binomial_cdf(n,p,k) est la probabilite d'obtenir au plus k succes avec n essais. binomial_icdf(n,p,t) renvoie le plus petit k tel que binomial_cdf(n,p,k)>=t", "10,.5,4", 0, CAT_CATEGORY_PROBA | XCAS_ONLY},
-    {"bissectrice(A,B,C)", 0, "Bissectrice de l'angle AB,AC", "1,i,2+i", 0,CAT_CATEGORY_2D},
-    {"bitxor", "bitxor", "Ou exclusif", "#bitxor(1,2)", 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"black", "black", "Option d'affichage", "#display=black", 0, CAT_CATEGORY_PROGCMD},
-    {"blue", "blue", "Option d'affichage", "#display=blue", 0, CAT_CATEGORY_PROGCMD},
-    {"caseval", "caseval", "Evalue une chaine de caractere en appelant le CAS.", "caseval(\"limit(sin(x)/x,x=0)\")", "caseval(\"factor(x^10-1)\")", CAT_CATEGORY_ALGEBRA | (CAT_CATEGORY_CALCULUS <<8)},
-    {"cache_tortue ", "cache_tortue ", "Cache la tortue apres avoir trace le dessin.", 0, 0, CAT_CATEGORY_LOGO},
-    {"camembert(list)", 0, "Diagramme en camembert d'une serie statistique 1d.", "[[\"France\",6],[\"Allemagne\",12],[\"Suisse\",5]]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"ceil(x)", 0, "Partie entiere superieure", "1.2", 0, CAT_CATEGORY_REAL},
-    {"centre(objet)", 0, "Centre d'un cercle ou d'une sphere. Pour une conique a centre, renvoie le centre, un foyer et un point de la conique. Pour une parabole, renvoie le foyer et le sommet.", "cercle(0,1)", "sphere([0,0,0],[1,1,1])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"cercle(centre,rayon)", 0, "Cercle donne par centre et rayon ou par un diametre", "2+i,3", "1-i,1+i", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-    {"circonscrit(A,B,C)", 0, "Cercle circonscrit", "-1,2+i,3", 0, CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-    {"cfactor(p)", 0, "Factorisation sur C.", "x^4-1", 0, CAT_CATEGORY_ALGEBRA | (CAT_CATEGORY_COMPLEXNUM << 8) | XCAS_ONLY},
-    {"char(liste)", 0, "Chaine donnee par une liste de code ASCII", "[97,98,99]", 0, CAT_CATEGORY_ARIT},
-    {"charpoly(M,x)", 0, "Polynome caracteristique de la matrice M en la variable x.", "[[1,2],[3,4]],x", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"clearscreen()", "clearscreen()", "Efface l'ecran.", 0, 0, CAT_CATEGORY_PROGCMD|XCAS_ONLY},
-    {"coeff(p,x,n)", 0, "Coefficient de x^n dans le polynome p.", "(1+x)^6,x,3", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"comb(n,k)", 0, "Renvoie k parmi n.", "10,4", 0, CAT_CATEGORY_PROBA | XCAS_ONLY},
-    {"cond(A,[1,2,inf])", 0, "Nombre de condition d'une matrice par rapport a la norme specifiee (par defaut 1)", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"cone(A,v,theta,[h])", 0, "Cone de sommet A, axe v, angle theta, hauteur h optionnelle", "[0,0,0],[0,0,1],pi/6", "[0,0,0],[0,0,1],pi/6,4", CAT_CATEGORY_3D},
-    {"conique(expression)", 0, "Conique donnee par une equation polynomiale de degre 2 ou passant par 5 points", "x^2+x*y+y^2=5", "1,i,2+i,3-i,4+2i", CAT_CATEGORY_2D},
-    {"coordonnees(object)", 0, "Coordonnees (cartesiennes)", "point(1,2)", "point(1,2,3)", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"conj(z)", 0, "Conjugue complexe de z.", "1+i", 0, CAT_CATEGORY_COMPLEXNUM},
-    {"correlation(l1,l2)", 0, "Correlation listes l1 et l2", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"covariance(l1,l2)", 0, "Covariance listes l1 et l2", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"cpartfrac(p,x)", 0, "Decomposition en elements simples sur C.", "1/(x^4-1)", 0, CAT_CATEGORY_ALGEBRA | (CAT_CATEGORY_COMPLEXNUM << 8) | XCAS_ONLY},
-    {"crayon ", "crayon ", "Couleur de trace de la tortue", "#crayon rouge", 0, CAT_CATEGORY_LOGO},
-    {"cross(u,v)", 0, "Produit vectoriel de u et v.","[1,2,3],[0,1,3]", 0, CAT_CATEGORY_LINALG | (CAT_CATEGORY_2D << 8)},
-    {"csolve(equation,x)", 0, "Resolution exacte dans C d'une equation en x (ou d'un systeme polynomial).","x^2+x+1=0", 0, CAT_CATEGORY_SOLVE | (CAT_CATEGORY_COMPLEXNUM << 8) | XCAS_ONLY},
-    {"cube(A,B,C)", 0, "Cube d'arete AB avec une face dans le plan ABC", "[0,0,0],[1,0,0],[0,1,0]","[0,0,0],[0,2,sqrt(5)/2+3/2],[0,0,1]", CAT_CATEGORY_3D},
-    {"curl(u,vars)", 0, "Rotationnel du vecteur u.", "[2*x*y,x*z,y*z],[x,y,z]", 0, CAT_CATEGORY_LINALG | XCAS_ONLY},
-    {"cyan", "cyan", "Option d'affichage", "#display=cyan", 0, CAT_CATEGORY_PROGCMD},
-    {"cylinder(A,v,r,[h])", 0, "Cylindre d'axe A,v de rayon r et de hauteur optionnelle h", "[0,0,0],[0,1,0],2", "[0,0,0],[0,1,0],2,3", CAT_CATEGORY_3D},
-    {"debug(f(args))", 0, "Execute la fonction f en mode pas a pas.", 0, 0, CAT_CATEGORY_PROG | XCAS_ONLY},
-    {"degree(p,x)", 0, "Degre du polynome p en x.", "x^4-1", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"denom(x)", 0, "Denominateur de l'expression x.", "3/4", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"desolve(equation,t,y)", 0, "Resolution exacte d'equation differentielle ou de systeme differentiel lineaire a coefficients constants.", "[y'+y=exp(x),y(0)=1]", "[y'=[[1,2],[2,1]]*y+[x,x+1],y(0)=[1,2]]", CAT_CATEGORY_SOLVE | (CAT_CATEGORY_CALCULUS << 8) | XCAS_ONLY},
-    {"det(A)", 0, "Determinant de la matrice A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"diff(f,var,[n])", 0, "Derivee de l'expression f par rapport a var (a l'ordre n, n=1 par defaut), par exemple diff(sin(x),x) ou diff(x^3,x,2). Pour deriver f par rapport a x, utiliser f' (raccourci F3). Pour le gradient de f, var est la liste des variables.", "sin(x),x", "sin(x^2),x,3", CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"display", "display", "Option d'affichage", "#display=red", 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"disque n", "disque ", "Cercle rempli tangent a la tortue, de rayon n. Utiliser disque n,theta pour remplir un morceau de camembert ou disque n,theta,segment pour remplir un segment de disque", "#disque 30", "#disque(30,90)", CAT_CATEGORY_LOGO},
-  {"distance(A,B)", 0, "Distance de 2 objets geometriques", "point(1,2,3),point(4,1,2)", 0, CAT_CATEGORY_3D | (CAT_CATEGORY_2D << 8) },
-    {"dot(a,b)", 0, "Produit scalaire de 2 vecteurs. Raccourci: *", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_LINALG | (CAT_CATEGORY_2D << 8)},
-    {"dodecahedron(A,B,C)", 0, "Dodecaedre d'arete AB avec une face dans le plan ABC", "[0,0,0],[0,2,sqrt(5)/2+3/2],[0,0,1]", 0, CAT_CATEGORY_3D},
-    {"draw_arc(x1,y1,rx,ry,theta1,theta2,c)", 0, "Arc d'ellipse pixelise.", "100,100,60,80,0,pi,magenta", 0, CAT_CATEGORY_PROGCMD},
-    {"draw_circle(x1,y1,r,c)", 0, "Cercle pixelise. Option filled pour le remplir.", "100,100,60,cyan+filled", 0, CAT_CATEGORY_PROGCMD},
-    {"draw_line(x1,y1,x2,y2,c)", 0, "Droite pixelisee.", "100,50,300,200,blue", 0, CAT_CATEGORY_PROGCMD},
-    {"draw_pixel(x,y,color)", 0, "Colorie le pixel x,y. Faire draw_pixel() pour synchroniser l'ecran.", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"draw_polygon([[x1,y1],...],c)", 0, "Polygone pixelise.", "[[100,50],[30,20],[60,70]],red+filled", 0, CAT_CATEGORY_PROGCMD},
-    {"draw_rectangle(x,y,w,h,c)", 0, "Rectangle pixelise.", "100,50,30,20,red+filled", 0, CAT_CATEGORY_PROGCMD},
-    {"draw_string(s,x,y,c)", 0, "Affiche la chaine s en x,y", "\"Bonjour\",80,60", 0, CAT_CATEGORY_PROGCMD},
-    {"droite(equation)", 0, "Droite donnee par une equation ou 2 points", "y=2x+1", "1+i,2-i", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | (CAT_CATEGORY_2D << 16) | XCAS_ONLY},
-    {"ecris ", "ecris ", "Ecrire a la position de la tortue", "#ecris \"coucou\"", 0, CAT_CATEGORY_LOGO},
-    {"efface", "efface", "Remise a zero de la tortue", 0, 0, CAT_CATEGORY_LOGO | XCAS_ONLY},
-    {"egcd(A,B)", 0, "Cherche des polynomes U,V,D tels que A*U+B*V=D=gcd(A,B)","x^2+3x+1,x^2-5x-1", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"eigenvals(A)", 0, "Valeurs propres de la matrice A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"eigenvects(A)", 0, "Vecteurs propres de la matrice A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-    {"elif (test)", "elif", "Tests en cascade", 0, 0, CAT_CATEGORY_PROG | XCAS_ONLY},
-				     //{"end", "end", "Fin de bloc", 0, 0, CAT_CATEGORY_PROG},
-    {"ellipse(F1,F2,M)", 0, "Ellipse donnee par les 2 foyers et un point", "-1,1,2", 0, CAT_CATEGORY_2D},
-    {"equation(objet)", 0, "Equation cartesienne. Utiliser parameq pour parametrique.", "circle(0,1)", "ellipse(-1,1,3)", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"erf(x)", 0, "Fonction erreur en x.", "1.2", 0, CAT_CATEGORY_PROBA},
-    {"erfc(x)", 0, "Fonction erreur complementaire en x.", "1.2", 0, CAT_CATEGORY_PROBA},
-    {"euler(n)",0,"Indicatrice d'Euler: nombre d'entiers < n premiers avec n","25",0,CAT_CATEGORY_ARIT},
-    {"eval(f)", 0, "Evalue f.", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"evalc(z)", 0, "Ecrit z=x+i*y.", "1/(1+i*sqrt(3))", 0, CAT_CATEGORY_COMPLEXNUM | XCAS_ONLY},
-    {"exact(x)", 0, "Convertit x en rationnel. Raccourci shift S-D", "1.2", 0, CAT_CATEGORY_REAL | XCAS_ONLY},
-    {"exp2trig(expr)", 0, "Conversion d'exponentielles complexes en sin/cos", "exp(i*x)", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"exponential_regression(Xlist,Ylist)", 0, "Regression exponentielle.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"exponential_regression_plot(Xlist,Ylist)", 0, "Graphe d'une regression exponentielle.", "#X,Y:=[1,2,3,4,5],[1,3,4,6,8];exponential_regression_plot(X,Y);", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"exponentiald(lambda,x)", 0, "Loi exponentielle de parametre lambda. exponentiald_cdf(lambda,x) probabilite que \"loi exponentielle <=x\" par ex. exponentiald_cdf(2,3). exponentiald_icdf(lambda,t) renvoie x tel que \"loi exponentielle <=x\" vaut t, par ex. exponentiald_icdf(2,0.95) ", "5.1,3.4", 0, CAT_CATEGORY_PROBA | XCAS_ONLY},
-    {"extend", 0, "Concatene 2 listes. Attention en Xcas, ne pas utiliser + qui effectue l'addition de 2 vecteurs.","#l1.extend(l2)", 0, CAT_CATEGORY_LIST},
-    {"factor(p,[x])", 0, "Factorisation du polynome p (utiliser ifactor pour un entier). Raccourci: p=>*", "x^4-1", "x^6+1,sqrt(3)", CAT_CATEGORY_ALGEBRA | (CAT_CATEGORY_POLYNOMIAL << 8) | XCAS_ONLY},
-    {"filled", "filled", "Option d'affichage", 0, 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"float(x)", 0, "Convertit x en nombre approche (flottant).", "pi", 0, CAT_CATEGORY_REAL},
-    {"floor(x)", 0, "Partie entiere de x", "pi", 0, CAT_CATEGORY_REAL},
-    {"fonction f(x)", "fonction", "Definition de fonction (Xcas). Par exemple\nfonction f(x)\n local y;\ny:=x*x;\nreturn y;\nffonction", 0, 0, CAT_CATEGORY_PROG | XCAS_ONLY},
-    {"from arit import *", "from arit import *", "Instruction pour utiliser les fonctions d'arithmetique entiere en Python", "#from arit import *", "#import arit", CAT_CATEGORY_ARIT},
-    {"from cas import *", "from cas import *", "Permet d'utiliser le calcul formel depuis Python", "#from cas import *", "#import cas", CAT_CATEGORY_ALGEBRA|(CAT_CATEGORY_CALCULUS<<8)},
-    {"from cmath import *", "from cmath import *", "Instruction pour utiliser les fonctions de maths sur les complexes (trigo, exponentielle, log, ...) en Python", "#from cmath import *;i=1j", "#import cmath", CAT_CATEGORY_COMPLEXNUM},
-    {"from linalg import *", "from linalg import *", "Instruction pour utiliser les fonctions d'algebre lineaire en Python", "#from linalg import *;i=1j", "#import linalg", CAT_CATEGORY_LINALG | (CAT_CATEGORY_MATRIX<<8) | (CAT_CATEGORY_POLYNOMIAL<<16)},
-    {"from numpy import *", "from numpy import *", "Instruction pour utiliser les fonctions sur les matrice en Python", "#from numpy import *;i=1j", "#import numpy", CAT_CATEGORY_LINALG | (CAT_CATEGORY_MATRIX <<8) | (CAT_CATEGORY_COMPLEXNUM << 16)},
-    {"from math import *", "from math import *", "Instruction pour utiliser les fonctions de maths (trigo, exponentielle, log, ...) en Python", "#from math import *", "#import math", CAT_CATEGORY_REAL},
-    {"from matplotl import *", "from matplotl import *", "Instruction pour utiliser les fonctions de trace en Python", "#from matplotl import *", "#import matplotl", CAT_CATEGORY_PROBA|(CAT_CATEGORY_PLOT <<8)|(CAT_CATEGORY_STATS<<16)},
-    {"from random import *", "from random import *", "Instruction pour utiliser les fonctions aleatoires en Python", "#from random import *", "#import random", CAT_CATEGORY_PROBA},
-    {"from turtle import *", "from turtle import *", "Instruction pour utiliser la tortue en Python", "#from turtle import *", "#import turtle", CAT_CATEGORY_LOGO},
-    {"fsolve(equation,x=a[..b])", 0, "Resolution approchee de equation pour x dans l'intervalle a..b ou en partant de x=a.","cos(x)=x,x=0..1", "cos(x)-x,x=0.0", CAT_CATEGORY_SOLVE | XCAS_ONLY},
-    {"gauss(q)", 0, "Reduction de Gauss d'une forme quadratique q", "x^2+x*y+x*z,[x,y,z]", "x^2+4*x*y,[]", CAT_CATEGORY_LINALG | XCAS_ONLY },
-    {"gcd(a,b,...)", 0, "Plus grand commun diviseur. En Python ne fonctionne qu'avec des entiers. Voir iegcd ou egcd pour Bezout.", "23,13", "x^2-1,x^3-1", CAT_CATEGORY_ARIT | (CAT_CATEGORY_POLYNOMIAL << 8)},
-    {"gl_x", "gl_x", "Reglage graphique X gl_x=xmin..xmax", "#gl_x=0..2", 0, CAT_CATEGORY_PROGCMD << 8 | XCAS_ONLY},
-    {"gl_y", "gl_y", "Reglage graphique Y gl_y=ymin..ymax", "#gl_y=-1..1", 0, CAT_CATEGORY_PROGCMD << 8 | XCAS_ONLY},
-    {"green", "green", "Option d'affichage", "#display=green", 0, CAT_CATEGORY_PROGCMD},
-    {"halftan(expr)", 0, "Exprime cos, sin, tan avec tan(angle/2).","cos(x)", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"hauteur(A,B,C)", 0, "Hauteur du triangle ABC issue de A", "1,i,2+i", 0,CAT_CATEGORY_2D},
-    {"hermite(n)", 0, "n-ieme polynome de Hermite", "10", "10,t", CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"hilbert(n)", 0, "Matrice de Hilbert de taille n.", "4", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"histogram(list,min,size)", 0, "Histogramme d'une liste de donneees, classes commencant a min de taille size.","ranv(100,uniformd,0,1),0,0.1", 0, CAT_CATEGORY_STATS | (CAT_CATEGORY_PLOT<<8)},
-    {"homothetie(centre,rapport,objet)", 0, "Image de l'objet par homothetie de rapport", "0,2,circle(1,1)", 0, CAT_CATEGORY_2D },
-    {"hyperbole(F1,F2,M)", 0, "Hyperbole donnee par 2 foyers et un point", "-2-i,2+i,1", 0, CAT_CATEGORY_2D},
-    {"iabcuv(a,b,c)", 0, "Cherche 2 entiers u,v tels que a*u+b*v=c","23,13,15", 0, CAT_CATEGORY_ARIT | XCAS_ONLY},
-    {"ichinrem([a,m],[b,n])", 0,"Restes chinois entiers de a mod m et b mod n.", "[3,13],[2,7]", 0, CAT_CATEGORY_ARIT | XCAS_ONLY},
-    {"icosahedron(A,B,C)", 0, "Icosaedre de centre A, de sommet B où le plan ABC contient le sommet le plus proche (parmi les 5) de B", "[0,0,0],[sqrt(5),0,0],[1,2,0]", 0, CAT_CATEGORY_3D},
-    {"idivis(n)", 0, "Liste des diviseurs d'un entier n.", "10", 0, CAT_CATEGORY_ARIT},
-    {"idn(n)", 0, "matrice identite n * n", "4", 0, CAT_CATEGORY_MATRIX},
-    {"iegcd(a,b)", 0, "Determine les entiers u,v,d tels que a*u+b*v=d=gcd(a,b)","23,13", 0, CAT_CATEGORY_ARIT},
-    {"ifactor(n)", 0, "Factorisation d'un entier (pas trop grand!). Raccourci n=>*", "1234", 0, CAT_CATEGORY_ARIT},
-    {"ilaplace(f,s,x)", 0, "Transformee inverse de Laplace de f", "s/(s^2+1),s,x", 0, CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"im(z)", 0, "Partie imaginaire (z.im en Python)", "1+i", 0, CAT_CATEGORY_COMPLEXNUM},
-    {"inscrit(A,B,C)", 0, "Cercle inscrit", "-1,2+i,3", 0, CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-    {"inf", "inf", "Plus l'infini. Utiliser -inf pour moins l'infini ou infinity pour l'infini complexe. Raccourci shift INS.", "-inf", "infinity", CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"input()", "input()", "Lire une chaine au clavier", "\"Valeur ?\"", 0, CAT_CATEGORY_PROG},
-    {"integrate(f,x,[,a,b])", 0, "Primitive de f par rapport a la variable x, par ex. integrate(x*sin(x),x). Pour calculer une integrale definie, entrer les arguments optionnels a et b, par ex. integrate(x*sin(x),x,0,pi). Raccourci SHIFT F3.", "x*sin(x),x", "cos(x)/(1+x^4),x,0,inf", CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"interp(X,Y[,interp])", 0, "Interpolation de Lagrange aux points (xi,yi) avec X la liste des xi et Y des yi. Renvoie la liste des differences divisees si interp est passe en parametre.", "[1,2,3,4,5],[0,1,3,4,4]", "[1,2,3,4,5],[0,1,3,4,4],interp", CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"inter(A,B)", 0, "Liste des intersections. Utiliser single_inter si l'intersection est unique.", "line(y=x),circle(0,1)", 0, CAT_CATEGORY_3D | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-    {"inter_unique(A,B)", 0, "Premiere intersection. Utiliser inter pour une liste d'intersections.", "line(y=x),line(x+y=3)", 0, CAT_CATEGORY_3D | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-    {"inv(A)", 0, "Inverse de A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX|(CAT_CATEGORY_LINALG<<8)},
-    {"inverser(v)", "inverser ", "La variable v est remplacee par son inverse", "#v:=3; inverser v", 0, CAT_CATEGORY_SOFUS | XCAS_ONLY},
-    {"iquo(a,b)", 0, "Quotient euclidien de deux entiers.", "23,13", 0, CAT_CATEGORY_ARIT | XCAS_ONLY},
-    {"irem(a,b)", 0,"Reste euclidien de deux entiers", "23,13", 0, CAT_CATEGORY_ARIT | XCAS_ONLY},
-    {"isprime(n)", 0, "Renvoie 1 si n est premier, 0 sinon.", "11", "10", CAT_CATEGORY_ARIT},
-    {"jordan(A)", 0, "Forme normale de Jordan de la matrice A, renvoie P et D tels que P^-1*A*P=D", "[[1,2],[3,4]]", "[[1,1,-1,2,-1],[2,0,1,-4,-1],[0,1,1,1,1],[0,1,2,0,1],[0,0,-3,3,-1]]", CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"laguerre(n,a,x)", 0, "n-ieme polynome de Laguerre (a=0 par defaut).", "10", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"laplace(f,x,s)", 0, "Transformee de Laplace de f","sin(x),x,s", 0, CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"lcm(a,b,...)", 0, "Plus petit commun multiple.", "23,13", "x^2-1,x^3-1", CAT_CATEGORY_ARIT | (CAT_CATEGORY_POLYNOMIAL << 8) | XCAS_ONLY},
-    {"lcoeff(p,x)", 0, "Coefficient dominant du polynome p.", "x^4-1", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"legendre(n)", 0, "n-ieme polynome de Legendre.", "10", "10,t", CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-#ifdef RELEASE
-    {"len(l)", 0, "Taille d'une liste.", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_LIST},
-#endif
-    {"leve_crayon ", "leve_crayon ", "La tortue se deplace sans marquer son passage", 0, 0, CAT_CATEGORY_LOGO},
-    {"limit(f,x=a)", 0, "Limite de f en x = a. Ajouter 1 ou -1 pour une limite a droite ou a gauche, limit(sin(x)/x,x=0) ou limit(abs(x)/x,x=0,1). Raccourci: SHIFT MIXEDFRAC", "sin(x)/x,x=0", "exp(-1/x),x=0,1", CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"droite(A,B)", 0, "Droite donnee par equation ou 2 points", "y=x-1", "[0,0,0],[1,-2,3]", CAT_CATEGORY_2D | XCAS_ONLY},
-    {"line_width_", "line_width_", "Prefixe d'epaisseur (2 a 8)", 0, 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"linear_regression(Xlist,Ylist)", 0, "Regression lineaire.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"linear_regression_plot(Xlist,Ylist)", 0, "Graphe d'une regression lineaire.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];linear_regression_plot(X,Y);", 0, CAT_CATEGORY_STATS | (CAT_CATEGORY_PLOT<<8)},
-    {"linetan(expr,x,x0)", 0, "Tangente au graphe en x=x0.", "sin(x),x,pi/2", 0, CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"linsolve([eq1,eq2,..],[x,y,..])", 0, "Resolution de systeme lineaire. Peut utiliser le resultat de lu pour resolution en O(n^2).","[x+y=1,x-y=2],[x,y]", "#p,l,u:=lu([[1,2],[3,4]]); linsolve(p,l,u,[5,6])", CAT_CATEGORY_SOLVE | (CAT_CATEGORY_LINALG <<8) | (CAT_CATEGORY_MATRIX << 16) | XCAS_ONLY},
-    {"logarithmic_regression(Xlist,Ylist)", 0, "Regression logarithmique.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"logarithmic_regression_plot(Xlist,Ylist)", 0, "Graphe d'une regression logarithmique.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];logarithmic_regression_plot(X,Y);", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"lu(A)", 0, "decomposition LU de la matrice A, P*A=L*U, renvoie P permutation, L et U triangulaires inferieure et superieure", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"magenta", "magenta", "Option d'affichage", "#display=magenta", 0, CAT_CATEGORY_PROGCMD},
-    {"map(f,l)", 0, "Applique f aux elements de la liste l.","lambda x:x*x,[1,2,3]", 0, CAT_CATEGORY_LIST},
-    {"matpow(A,n)", 0, "Renvoie A^n, la matrice A la puissance n", "[[1,2],[3,4]],n","#assume(n>=1);matpow([[0,2],[0,4]],n)", CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"matrix(l,c,func)", 0, "Matrice de terme general donne.", "2,3,(j,k)->j^k", 0, CAT_CATEGORY_MATRIX},
-    {"mean(l)", 0, "Moyenne arithmetique liste l", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"median(l)", 0, "Mediane", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"mediane(A,B,C)", 0, "Mediane du triangle ABC issue de A", "1,i,2+i", 0,CAT_CATEGORY_2D},
-    {"mediatrice(A,B)", 0, "Mediatrice du segment AB", "1,i", 0,CAT_CATEGORY_2D},
-    {"milieu(A,B)", 0, "Milieu de AB", "1,i", 0,CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8)},
-    {"montre_tortue ", "montre_tortue ", "Affiche la tortue", 0, 0, CAT_CATEGORY_LOGO},
-    {"mul(A,B)", 0, "En Python, multiplie des listes de listes u et v comme des matrices.","[[1,2],[3,4]],[5,6]", "[[1,2],[3,4]].[[5,6],[7,8]]", CAT_CATEGORY_LINALG},
-    {"mult_c_conjugate", 0, "Multiplier par le conjugue complexe.", "1+2*i", 0,  (CAT_CATEGORY_COMPLEXNUM << 8) | XCAS_ONLY},
-    {"mult_conjugate", 0, "Multiplier par le conjugue (sqrt).", "sqrt(2)-sqrt(3)", 0, CAT_CATEGORY_ALGEBRA | XCAS_ONLY},
-    {"normald([mu,sigma],x)", 0, "Loi normale, par defaut mu=0 et sigma=1. normald_cdf([mu,sigma],x) probabilite que \"loi normale <=x\" par ex. normald_cdf(1.96). normald_icdf([mu,sigma],t) renvoie x tel que \"loi normale <=x\" vaut t, par ex. normald_icdf(0.975) ", "1.2", 0, CAT_CATEGORY_PROBA | XCAS_ONLY},
-    {"not(x)", 0, "Non logique.", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"numer(x)", 0, "Numerateur de x.", "3/4", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"octahedron(A,B,C)", 0, "Octaedre d'arete AB avec une face dans le plan ABC", "[0,0,0],[3,0,0],[0,1,0]", 0, CAT_CATEGORY_3D},
-    {"odesolve(f(t,y),[t,y],[t0,y0],t1)", 0, "Solution approchee d'equation differentielle y'=f(t,y) et y(t0)=y0, valeur en t1 (ajouter curve pour les valeurs intermediaires de y)", "sin(t*y),[t,y],[0,1],2", "0..pi,(t,v)->{[-v[1],v[0]]},[0,1]", CAT_CATEGORY_SOLVE | XCAS_ONLY},
-    {"parabole(F,A)", 0, "Parabole donnee par foyer et sommet", "-2-i,2+i", 0, CAT_CATEGORY_2D},
-    {"parameq(objet)", 0, "Equations parametriques. Utiliser equation pour une equation cartesienne", "circle(0,1)", "ellipse(-1,1,3)", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"partfrac(p,x)", 0, "Decomposition en elements simples. Raccourci p=>+", "1/(x^4-1)", 0, CAT_CATEGORY_ALGEBRA | XCAS_ONLY},
-    {"pas_de_cote n", "pas_de_cote ", "Saut lateral de la tortue, par defaut n=10", "#pas_de_cote 30", 0, CAT_CATEGORY_LOGO},
-    {"plan(equation)", 0, "Plan donne par equation ou 3 points", "z=x+y-1", "[0,0,0],[1,0,0],[0,1,0]", CAT_CATEGORY_3D | XCAS_ONLY},
-    {"plot(expr,x)", 0, "Xcas: graphe de fonction, par exemple plot(sin(x)), plot(ln(x),x.0,5), plot(x^2-y^2), plot(x^2-y^2<1), plot(x^2-y^2=1). Python et Xcas: plot(Xlist,Ylist) ligne polygonale", "[1,2,3,4,5,6],[2,3,5,2,1,4]","ln(x),x=0..5,xstep=0.1", CAT_CATEGORY_PLOT },
-    {"plotfunc(expr,[x,y])", 0, "Xcas: graphe de fonction 3d", "x^2-y^2,[x,y]","x^2-y^2,[x=-2..2,y=-2..2],nstep=700", CAT_CATEGORY_PLOT | (CAT_CATEGORY_3D << 8) | XCAS_ONLY },
-    {"plotarea(expr,x=a..b,[n,meth])", 0, "Aire sous la courbe selon une methode d'integration.", "1/x,x=1..5,4,rectangle_gauche", 0, CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plotcontour(expr,[x=xm..xM,y=ym..yM],niveaux)", 0, "Lignes de niveau de expr.", "x^2+2y^2, [x=-2..2,y=-2..2],[1,2]", 0, CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plotdensity(expr,[x=xm..xM,y=ym..yM])", 0, "Representation en niveaux de couleurs d'une expression de 2 variables.", "x^2-y^2,[x=-3..3,y=-2..2]", 0, CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plotfield(f(t,y), [t=tmin..tmax,y=ymin..ymax])", 0, "Champ des tangentes de y'=f(t,y), optionnellement graphe avec plotode=[t0,y0]", "sin(t*y), [t=-3..3,y=-3..3],plotode=[0,1]", "5*[-y,x], [x=-1..1,y=-1..1]", CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plotlist(list)", 0, "Graphe d'une liste", "[3/2,2,1,1/2,3,2,3/2]", "[1,13],[2,10],[3,15],[4,16]", CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plotode(f(t,y), [t=tmin..tmax,y],[t0,y0])", 0, "Graphe de solution d'equation differentielle y'=f(t,y), y(t0)=y0.", "sin(t*y),[t=-3..3,y],[0,1]", 0, CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plotparam([x,y],t)", 0, "Graphe en parametriques. Par exemple plotparam([sin(3t),cos(2t)],t,0,pi) ou plotparam(exp(i*t),t,0,pi)", "[sin(3t),cos(2t)],t,0,pi", "[t^2,t^3],t=-1..1,tstep=0.1", CAT_CATEGORY_PLOT | (CAT_CATEGORY_3D << 8) | XCAS_ONLY},
-    {"plotpolar(r,theta)", 0, "Graphe en polaire.","cos(3*x),x,0,pi", "1/(1+cos(x)),x=0..pi,xstep=0.05", CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plotseq(f(x),x=[u0,m,M],n)", 0, "Trace f(x) sur [m,M] et n termes de la suite recurrente u_{n+1}=f(u_n) de 1er terme u0.","sqrt(2+x),x=[6,0,7],5", 0, CAT_CATEGORY_PLOT | XCAS_ONLY},
-    {"plus_point", "plus_point", "Option d'affichage", "#display=blue+plus_point", 0, CAT_CATEGORY_PROGCMD  | XCAS_ONLY},
-    {"point(x,y[,z])", 0, "Point", "1,2", "1,2,3", CAT_CATEGORY_PLOT | (CAT_CATEGORY_2D << 8) |  (CAT_CATEGORY_3D << 16) | XCAS_ONLY},
-    {"polygone(list)", 0, "Polygone ferme donne par la liste de ses sommets.", "1-i,2+i,3,3-2i", 0, CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-    {"polygonscatterplot(Xlist,Ylist)", 0, "Nuage de points relies.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"polyhedron(A,B,C,D,...)", 0, "Polyedre convexe dont les sommets sont parmi A,B,C,D,...", "[0,0,0],[0,5,0],[0,0,5],[1,2,6]", 0, CAT_CATEGORY_3D},
-    {"polynomial_regression(Xlist,Ylist,n)", 0, "Regression polynomiale de degre <= n.", "[1,2,3,4,5],[0,1,3,4,4],2", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"polynomial_regression_plot(Xlist,Ylist,n)", 0, "Graphe d'une regression polynomiale de degre <= n.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];polynomial_regression_plot(X,Y,2);scatterplot(X,Y);", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"pour (boucle Xcas)", "pour  de  to  faire  fpour;", "Boucle definie.","#pour j de 1 to 10 faire print(j,j^2); fpour;", 0, CAT_CATEGORY_PROG | XCAS_ONLY},
-    {"power_regression(Xlist,Ylist,n)", 0, "Regression puissance.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"power_regression_plot(Xlist,Ylist,n)", 0, "Graphe d'une regression puissance.", "#X,Y:=[1,2,3,4,5],[1,1,3,4,4];power_regression_plot(X,Y);", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"pow(a,n,p)", 0, "Renvoie a^n mod p","123,456,789", 0, CAT_CATEGORY_ARIT},
-    {"powmod(a,n,p[,P,x])", 0, "Renvoie a^n mod p, ou a^n mod un entier p et un polynome P en x.","123,456,789", "x+1,452,19,x^4+x+1,x", CAT_CATEGORY_ARIT | XCAS_ONLY},
-    {"print(expr)", 0, "Afficher dans la console", 0, 0, CAT_CATEGORY_PROG},
-    {"projection(obj1,obj2)", 0, "Projection sur obj1 de obj2", "line(y=x),point(2,3)", 0, CAT_CATEGORY_2D },
-    {"pcoeff(p)", 0, "Polynome unitaire dont on donne la liste des racines (fonction reciproque de proot)", "[1,2,3]", 0, CAT_CATEGORY_POLYNOMIAL},
-    {"peval(p,x)", 0, "Valeur d'un polynome en un point", "[1,2,3],4", 0, CAT_CATEGORY_POLYNOMIAL},
-    {"proot(p)", 0, "Racines reelles et complexes approchees d'un polynome. Exemple proot([1,2.1,3,4.2]) ou proot(x^3+2.1*x^2+3x+4.2)", "[1.,2.1,3,4.2]","x^3+2.1*x^2+3x+4.2", CAT_CATEGORY_POLYNOMIAL|(CAT_CATEGORY_SOLVE<<8)},
-    {"purge(x)", 0, "Purge le contenu de la variable x. Raccourci SHIFT-FORMAT", 0, 0, CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_SOFUS<<8) | XCAS_ONLY},
-    {"pyramid(A,B,C)", 0, "Tetraedre d'arete AB avec une face dans le plan ABC", "[0,0,0],[3,0,0],[0,1,0]", "[0,0,0],[3,0,0],[0,3,0],[0,0,4]", CAT_CATEGORY_3D},
-    {"python(f)", 0, "Affiche la fonction f en syntaxe Python.", 0, 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"python_compat(0|1|2|4)", 0, "python_compat(0) syntaxe Xcas, python_compat(1) syntaxe Python avec ^ interprete comme puissance, python_compat(2) ^ interprete comme ou exclusif bit a bit", "0", "1", CAT_CATEGORY_PROG | XCAS_ONLY},
-    {"qr(A)", 0, "Factorisation A=Q*R avec Q orthogonale et R triangulaire superieure", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"quadric(equation)", 0, "Quadrique donnee par une equation (ou 9 points)", "x^2-y^2+z^2", "x^2+x*y+y^2+z^2-3", CAT_CATEGORY_3D},
-    {"quartile1(l)", 0, "1er quartile", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"quartile3(l)", 0, "3eme quartile", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"quo(p,q,x)", 0, "Quotient de division euclidienne polynomiale en x.", 0, 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"quote(x)", 0, "Renvoie l'expression x non evaluee.", 0, 0, CAT_CATEGORY_ALGEBRA | XCAS_ONLY},
-    {"rayon(objet)", 0, "Rayon d'un cercle ou d'une sphere", "circle(0,1)", "sphere([0,0,0],[1,1,1])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"rand()", "rand()", "Reel aleatoire entre 0 et 1", 0, 0, CAT_CATEGORY_PROBA},
-    {"randint(a,b)", 0, "Entier aleatoire entre a et b. En Xcas, avec un seul argument n, entier entre 1 et n.", "5,20", "6", CAT_CATEGORY_PROBA},
-    {"ranm(n,m,[loi,parametres])", 0, "Matrice aleatoire a coefficients entiers ou selon une loi de probabilites (ranv pour un vecteur). Exemples ranm(2,3), ranm(3,2,binomial,20,.3), ranm(4,2,normald,0,1)", "3,3","4,2,normald,0,1",  CAT_CATEGORY_MATRIX},
-    {"ranv(n,[loi,parametres])", 0, "Vecteur aleatoire", "4,normald,0,1", "10,30", CAT_CATEGORY_LINALG},
-    {"ratnormal(x)", 0, "Ecrit sous forme d'une fraction irreductible.", "(x+1)/(x^2-1)^2", 0, CAT_CATEGORY_ALGEBRA | XCAS_ONLY},
-    {"re(z)", 0, "Partie reelle (z.re en Python)", "1+i", 0, CAT_CATEGORY_COMPLEXNUM},
-    {"read(\"filename\")", "read(\"", "Lire un fichier. Voir aussi write", 0, 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"rectangle_plein a,b", "rectangle_plein ", "Rectangle direct rempli depuis la tortue de cotes a et b (si b est omis, la tortue remplit un carre)", "#rectangle_plein 30", "#rectangle_plein(20,40)", CAT_CATEGORY_LOGO | XCAS_ONLY},
-    {"recule n", "recule ", "La tortue recule de n pas, par defaut n=10", "#recule 30", 0, CAT_CATEGORY_LOGO},
-    {"red", "red", "Option d'affichage", "#display=red", 0, CAT_CATEGORY_PROGCMD},
-    {"reflection(obj1,obj2)", 0, "Symetrique de obj2", "line(y=x),cercle(1,1)", 0, CAT_CATEGORY_2D },
-    {"rem(p,q,x)", 0, "Reste de division euclidienne polynomiale en x", 0, 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"repete(n,...)", "repete( ", "Repete plusieurs fois les instructions", "#repete(4,avance,tourne_gauche)", 0, CAT_CATEGORY_LOGO | XCAS_ONLY},
-#ifdef RELEASE
-    {"residue(f(z),z,z0)", 0, "Residu de l'expression en z0.", "1/(x^2+1),x,i", 0, CAT_CATEGORY_COMPLEXNUM | XCAS_ONLY},
-#endif
-    {"resultant(p,q,x)", 0, "Resultant en x des polynomes p et q.", "#P:=x^3+p*x+q;resultant(P,P',x);", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"revert(p[,x])", 0, "Developpement de Taylor reciproque, p doit etre nul en 0","x+x^2+x^4", 0, CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"rgb(r,g,b)", 0, "couleur definie par niveau de rouge, vert, bleu entre 0 et 255", "255,0,255", 0, CAT_CATEGORY_PROGCMD},
-    {"rhombus_point", "rhombus_point", "Option d'affichage", "#display=magenta+rhombus_point", 0, CAT_CATEGORY_PROGCMD  | XCAS_ONLY},
-    {"rond n", "rond ", "Cercle tangent a la tortue de rayon n. Utiliser rond n,theta pour un arc de cercle.", "#rond 30", "#rond(30,90)", CAT_CATEGORY_LOGO},
-    {"rotation(centre,angle,objet)", 0, "Image de l'objet par la rotation de centre et angle donnes en argyment", "2-i,pi/2,circle(0,1)", "sphere([0,0,0],[1,1,1])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"rref(M)","rref","Reduction d'une matrice par le pivot de Gauss.","[[1,2,3],[4,5,6]]",0,CAT_CATEGORY_MATRIX|(CAT_CATEGORY_LINALG<<8)},
-    {"rsolve(equation,u(n),[init])", 0, "Expression d'une suite donnee par une recurrence.","u(n+1)=2*u(n)+3,u(n),u(0)=1", "([u(n+1)=3*v(n)+u(n),v(n+1)=v(n)+u(n)],[u(n),v(n)],[u(0)=1,v(0)=2]", CAT_CATEGORY_SOLVE | XCAS_ONLY},
-    {"saute n", "saute ", "La tortue fait un saut de n pas, par defaut n=10", "#saute 30", 0, CAT_CATEGORY_LOGO},
-    {"scatterplot(Xlist,Ylist)", 0, "Nuage de points (scatter en Python)", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS| (CAT_CATEGORY_PLOT<<8)},
-    {"segment(A,B)", 0, "Segment", "1,2+i", "[1,2,1],[-1,3,2]", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-    {"seq(expr,var,a,b[,pas])", 0, "Liste de terme general donne.","j^2,j,1,10", "j^2,j,1,10,2", CAT_CATEGORY_LIST | XCAS_ONLY},
-    {"si (test Xcas)", "si  alors  sinon  fsi;", "Test.", "#f(x):=si x>0 alors x; sinon -x; fsi;", 0, CAT_CATEGORY_PROG | XCAS_ONLY},
-    {"sign(x)", 0, "Renvoie -1 si x est negatif, 0 si x est nul et 1 si x est positif.", 0, 0, CAT_CATEGORY_REAL | XCAS_ONLY},
-    {"similitude(centre,rapport,angle,objet)", 0, "Image de l'objet par similitude", "0,2,pi/2,circle(1,1)", 0, CAT_CATEGORY_2D },
-    {"simplify(expr)", 0, "Renvoie en general expr sous forme simplifiee. Raccourci expr=>/", "sin(3x)/sin(x)", "ln(4)-ln(2)", CAT_CATEGORY_ALGEBRA | XCAS_ONLY},
-    {"sin_regression(Xlist,Ylist)", 0, "Regression trigonometrique.", "[1,2,3,4,5,6,7,8,9,10,11,12,13,14],[0.1,0.5,0.8,1,0.7,0.5,0.05,-.5,-.75,-1,-.7,-.4,0.1,.5]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"sin_regression_plot(Xlist,Ylist)", 0, "Graphe d'une regression trigonometrique.", "#X,Y:=[1,2,3,4,5,6,7,8,9,10,11,12,13,14],[0.1,0.5,0.8,1,0.7,0.5,0.05,-.5,-.75,-1,-.7,-.4,0.1,.5];sin_regression_plot(X,Y);", 0, CAT_CATEGORY_STATS  | XCAS_ONLY},
-    {"solve()", 0, "Xcas: solve(equation,x) resolution exacte d'une equation en x (ou d'un systeme polynomial). Utiliser csolve pour les solutions complexes, linsolve pour un systeme lineaire. Python et Xcas: solve(A,b) resolution d'un systeme de Cramer A*x=b", "x^2-x-1=0,x", "[x^2-y^2=0,x^2-z^2=0],[x,y,z]", CAT_CATEGORY_SOLVE},
-    {"sommets(objet)", 0, "Liste des sommets d'un polygone ou polyedre", "triangle(1,i,2)", "cube([0,0,0],[1,0,0],[0,1,0])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-    {"sorted(l)", 0, "Trie une liste.","[3/2,2,1,1/2,3,2,3/2]", "[[1,2],[2,3],[4,3]],(x,y)->when(x[1]==y[1],x[0]>y[0],x[1]>y[1]", CAT_CATEGORY_LIST},
-    {"sphere(A,r)", 0, "Sphere de centre A et rayon r ou de diametre AB", "[0,0,0],1", "[0,0,0],[1,1,1]", CAT_CATEGORY_3D},
-    {"square_point", "square_point", "Option d'affichage", "#display=cyan+square_point", 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY },
-    {"star_point", "star_point", "Option d'affichage", "#display=magenta+star_point", 0, CAT_CATEGORY_PROGCMD  | XCAS_ONLY},
-    {"stddev(l)", 0, "Ecart-type d'une liste l", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS | XCAS_ONLY},
-    {"sub(u,v)", 0, "En Python, soustrait des listes ou listes de listes u et v comme des vecteurs ou matrices.","[1,2,3],[0,1,3]", "[[1,2]],[[3,4]]", CAT_CATEGORY_LINALG},
-    {"subst(a,b=c)", 0, "Remplace b par c dans a. Raccourci a(b=c). Pour faire plusieurs remplacements, saisir subst(expr,[b1,b2...],[c1,c2...])", "x^2,x=3", "x+y^2,[x,y],[1,2]", CAT_CATEGORY_ALGEBRA | XCAS_ONLY},
-    {"sum(f,k,m,M)", 0, "Somme de l'expression f dependant de k pour k variant de m a M. Exemple sum(k^2,k,1,n)=>*. Raccourci ALPHA F3", "k,k,1,n", "k^2,k", CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"svd(A)", 0, "Singular Value Decomposition, renvoie U orthogonale, S vecteur des valeurs singulières, Q orthogonale tels que A=U*diag(S)*tran(Q).", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX | XCAS_ONLY},
-    {"tabvar(f,[x=a..b])", 0, "Tableau de variations de l'expression f, avec arguments optionnels la variable x dans l'intervalle a..b.", "sqrt(x^2+x+1)", "[cos(2t),sin(3t)],t", CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"tantque (boucle Xcas)", "tantque  faire  ftantque;", "Boucle indefinie.", "#j:=13; tantque j!=1 faire j:=ifte(even(j),j/2,3j+1); print(j); ftantque;", 0, CAT_CATEGORY_PROG | XCAS_ONLY},
-    {"taylor(f,x=a,n,[polynom])", 0, "Developpement de Taylor de l'expression f en x=a a l'ordre n, ajouter le parametre polynom pour enlever le terme de reste.","sin(x),x=0,5", "sin(x),x=0,5,polynom", CAT_CATEGORY_CALCULUS | XCAS_ONLY},
-    {"tchebyshev1(n)", 0, "Polynome de Tchebyshev de 1ere espece: cos(n*x)=T_n(cos(x))", "10", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"tchebyshev2(n)", 0, "Polynome de Tchebyshev de 2eme espece: sin((n+1)*x)=sin(x)*U_n(cos(x))", "10", 0, CAT_CATEGORY_POLYNOMIAL | XCAS_ONLY},
-    {"tcollect(expr)", 0, "Linearisation trigonometrique et regroupement.","sin(x)+cos(x)", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"texpand(expr)", 0, "Developpe les fonctions trigonometriques, exp et ln.","sin(3x)", "ln(x*y)", CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"time(cmd)", 0, "Temps pour effectuer une commande ou mise a l'heure de horloge","int(1/(x^4+1),x)","8,0", CAT_CATEGORY_PROG},
-    {"tlin(expr)", 0, "Linearisation trigonometrique de l'expression.","sin(x)^3", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"tourne_droite n", "tourne_droite ", "La tortue tourne de n degres, par defaut n=90", "#tourne_droite 45", 0, CAT_CATEGORY_LOGO},
-    {"tourne_gauche n", "tourne_gauche ", "La tortue tourne de n degres, par defaut n=90", "#tourne_gauche 45", 0, CAT_CATEGORY_LOGO},
-    {"trace(A)", 0, "Trace de la matrice A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-    {"transpose(A)", 0, "Transposee de la matrice A. Pour la transconjuguee utiliser trn(A) ou A^*.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-    {"translation(vect,obj)", 0, "Translation par vect de obj", "[1,2],cercle(0,1)", 0, CAT_CATEGORY_2D },
-    {"triangle(A,B,C)", 0, "Triangle donne par 3 sommets", "1+i,1-i,-1", "A,B,C", CAT_CATEGORY_2D},
-    {"triangle_point", "triangle_point", "Option d'affichage", "#display=yellow+triangle_point", 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"trig2exp(expr)", 0, "Convertit les fonctions trigonometriques en exponentielles.","cos(x)^3", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"trigcos(expr)", 0, "Exprime sin^2 et tan^2 avec cos^2.","sin(x)^4", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"trigsin(expr)", 0, "Exprime cos^2 et tan^2 avec sin^2.","cos(x)^4", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"trigtan(expr)", 0, "Exprime cos^2 et sin^2 avec tan^2.","cos(x)^4", 0, CAT_CATEGORY_TRIG | XCAS_ONLY},
-    {"uniformd(a,b,x)", 0, "loi uniforme sur [a,b] de densite 1/(b-a)", 0, 0, CAT_CATEGORY_PROBA | XCAS_ONLY},
-    {"v augmente_de n", " augmente_de ", "La variable v augmente de n, ou de n %", "#v:=3; v augmente_de 1", 0, CAT_CATEGORY_SOFUS | XCAS_ONLY},
-    {"v diminue_de n", " diminue_de ", "La variable v diminue de n, ou de n %", "#v:=3; v diminue_de 1", 0, CAT_CATEGORY_SOFUS | XCAS_ONLY},
-    {"v est_divise_par n", " est_divise_par ", "La variable v est divisee par n", "#v:=3; v est_divise_par 2", 0, CAT_CATEGORY_SOFUS | XCAS_ONLY},
-    {"v est_eleve_puissance n", " est_eleve_puissance ", "La variable v est eleveee a la puissance n", "#v:=3; v est_eleve_puissance 2", 0, CAT_CATEGORY_SOFUS | XCAS_ONLY},
-    {"v est_multiplie_par n", " est_multiplie_par ", "La variable v est multipliee par n", "#v:=3; v est_multiplie_par 2", 0, CAT_CATEGORY_SOFUS | XCAS_ONLY},
-  {"vector(A,B)", 0, "vecteur AB", 0, 0, CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8)},
-  {"volume(P)", 0, "volume d'un polyedre ou d'une sphere", 0, 0, (CAT_CATEGORY_3D )},
-				     //{"version", "version()", "Khicas 1.5.0, (c) B. Parisse et al. www-fourier.ujf-grenoble.fr/~parisse. License GPL version 2. Interface adaptee d'Eigenmath pour Casio, G. Maia, http://gbl08ma.com", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"write(\"filename\",var)", "write(\"", "Sauvegarde une ou plusieurs variables dans un fichier. Par exemple f(x):=x^2; write(\"func_f\",f).",  0, 0, CAT_CATEGORY_PROGCMD | XCAS_ONLY},
-    {"yellow", "yellow", "Option d'affichage", "#display=yellow", 0, CAT_CATEGORY_PROGCMD},
-    {"|", "|", "Ou logique", "#1|2", 0, CAT_CATEGORY_PROGCMD},
-    {"~", "~", "Complement", "#~7", 0, CAT_CATEGORY_PROGCMD},
-  };
-
-const catalogFunc completeCaten[] = { // list of all functions (including some not in any category)
-  {" loop for", "for ", "Defined loop.", "#\nfor ", 0, CAT_CATEGORY_PROG},
-  {" loop in list", "for in", "Loop on all elements of a list.", "#\nfor in", 0, CAT_CATEGORY_PROG},
-  {" loop while", "while ", "Undefined loop.", "#\nwhile ", 0, CAT_CATEGORY_PROG},
-  {" test if", "if ", "Test", "#\nif ", 0, CAT_CATEGORY_PROG},
-  {" test else", "else ", "Test false case", 0, 0, CAT_CATEGORY_PROG},
-  {" function def", "f(x):=", "Definition of function.", "#\nf(x):=", 0, CAT_CATEGORY_PROG},
-  {" local j,k;", "local ", "Local variables declaration (Xcas)", 0, 0, CAT_CATEGORY_PROG},
-  {" range(a,b)", 0, "In range [a,b) (a included, b excluded)", "# in range(1,10)", 0, CAT_CATEGORY_PROG},
-  {" return res", "return ", "Leaves current function and returns res.", 0, 0, CAT_CATEGORY_PROG},
-  {" edit list ", "list ", "List creation wizzard.", 0, 0, CAT_CATEGORY_LIST},
-  {" edit matrix ", "matrix ", "Matrix creation wizzard.", 0, 0, CAT_CATEGORY_MATRIX},
-    {" mksa(x)", 0, "Conversion to MKSA units", 0, 0, CAT_CATEGORY_PHYS | (CAT_CATEGORY_UNIT << 8) | XCAS_ONLY},
-    {" ufactor(a,b)", 0, "Factorize unit b in a", "100_J,1_kW", 0, CAT_CATEGORY_PHYS | (CAT_CATEGORY_UNIT << 8) | XCAS_ONLY},
-    {" usimplify(a)", 0, "Simplify unit", "100_l/10_cm^2", 0, CAT_CATEGORY_PHYS | (CAT_CATEGORY_UNIT << 8) | XCAS_ONLY},
-  {"!", "!", "Logical not (prefix) or factorial of n (suffix).", "#7!", "~!b", CAT_CATEGORY_PROGCMD},
-  {"#", "#", "Python comment, for Xcas comment type //. Shortcut ALPHA F2", 0, 0, CAT_CATEGORY_PROG},
-  {"%", "%", "a % b means a modulo b", 0, 0, CAT_CATEGORY_ARIT | (CAT_CATEGORY_PROGCMD << 8)},
-  {"&", "&", "Logical and or +", "#1&2", 0, CAT_CATEGORY_PROGCMD},
-  {":=", ":=", "Set variable value. Shortcut SHIFT F1", "#a:=3", 0, CAT_CATEGORY_PROGCMD|(CAT_CATEGORY_SOFUS<<8)|XCAS_ONLY},
-  {"<", "<", "Shortcut SHIFT F2", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"=>", "=>", "Store value in variable or conversion (touche ->). For example 5=>a or x^4-1=>* or (x+1)^2=>+ or sin(x)^2=>cos.", "#5=>a", "#15_ft=>_cm", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_PHYS <<8) | (CAT_CATEGORY_UNIT << 16) | XCAS_ONLY},
-  {">", ">", "Shortcut F2.", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"\\", "\\", "\\ char", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"_", "_", "_ char, shortcut (-).", 0, 0, CAT_CATEGORY_PROGCMD},
-    {"_(km/h)", "_(km/h)", "Speed kilometer per hour", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_(m/s)", "_(m/s)", "Speed meter/second", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_(m/s^2)", "_(m/s^2)", "Acceleration", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_(m^2/s)", "_(m^2/s)", "Viscosity", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_A", 0, "Ampere", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Bq", 0, "Becquerel", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_C", 0, "Coulomb", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Ci", 0, "Curie", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_F", 0, "Farad", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_F_", 0, "Faraday constant", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_G_", 0, "Gravitation force=_G_*m1*m2/r^2", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_H", 0, "Henry", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Hz", 0, "Hertz", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_J", 0, "Joule=kg*m^2/s^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_K", 0, "Temperature in Kelvin", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Kcal", 0, "Energy kilo-calorie", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_MeV", 0, "Energy mega-electron-Volt", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_N", 0, "Force Newton=kg*m/s^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_NA_", 0, "Avogadro constant", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_Ohm", 0, "Ohm", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_PSun_", 0, "Sun power", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_Pa", 0, "Pressure in Pascal=kg/m/s^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_REarth_", 0, "Earth radius", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_RSun_", 0, "Sun radius", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_R_", 0, "Boltzmann constant (per mol)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_S", 0, "", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_StdP_", 0, "Standard pressure", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_StdT_", 0, "Standard temperature (0 degre Celsius in Kelvins)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_Sv", 0, "Sievert", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_T", 0, "Tesla", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_V", 0, "Volt", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Vm_", 0, "Volume molaire", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_W", 0, "Watt=kg*m^2/s^3", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_Wb", 0, "Weber", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_alpha_", 0, "fine structure constant", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_c_", 0, "speed of light", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_cd", 0, "candela", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-  {"_cdf", "_cdf", "Suffix to get a cumulative distribution function. Type F2 for inverse cumulative distribution function _icdf suffix.", "#_icdf", 0, CAT_CATEGORY_PROBA|XCAS_ONLY},
-    {"_d", 0, "day", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_deg", 0, "degree", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_eV", 0, "electron-Volt", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_epsilon0_", 0, "vacuum permittivity", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_ft", 0, "feet", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_g_", 0, "Earth gravity (ground)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_grad", 0, "grades (angle unit(", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_h", 0, "Hour", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_h_", 0, "Planck constant", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_ha", 0, "hectare", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_hbar_", 0, "Planck constant/(2*pi)", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_inch", 0, "inches", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_kWh", 0, "kWh", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_k_", 0, "Boltzmann constant", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_kg", 0, "kilogram", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_l", 0, "liter", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_m", 0, "meter", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_mEarth_", 0, "Earth mass", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_m^2", 0, "Area in m^2", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_m^3", 0, "Volume in m^3", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_me_", 0, "electron mass", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_miUS", 0, "US miles", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_mn", 0, "minute", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_mp_", 0, "proton mass", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_mpme_", 0, "proton/electron mass-ratio", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_mu0_", 0, "", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_phi_", 0, "magnetic flux quantum", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_plot", "_plot", "Suffix for a regression graph.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];polynomial_regression_plot(X,Y,2);scatterplot(X,Y)", 0, CAT_CATEGORY_STATS},
-    {"_qe_", 0, "electron charge", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_qme_", 0, "_q_/_me_", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_rad", 0, "radians", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_rem", 0, "rem", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_s", 0, "second", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_sd_", 0, "Sideral day", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_syr_", 0, "Siderale year", 0, 0, CAT_CATEGORY_PHYS | XCAS_ONLY},
-    {"_tr", 0, "tour (angle unit)", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-    {"_yd", 0, "yards", 0, 0, CAT_CATEGORY_UNIT | XCAS_ONLY},
-  {"a and b", " and ", "Logical and", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"a or b", " or ", "Logical or", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"abcuv(a,b,c)", 0, "Find 2 polynomial u,v such that a*u+b*v=c","x+1,x^2-2,x", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"abs(x)", 0, "Absolute value or norm of x x", "-3", "[1,2,3]", CAT_CATEGORY_COMPLEXNUM | (CAT_CATEGORY_REAL<<8)},
-  {"altitude(A,B,C)", 0, "Altitude in triangle ABC from A", "1,i,2+i", 0,CAT_CATEGORY_2D},
-  {"append", 0, "Adds an element at the end of a list","#l.append(x)", 0, CAT_CATEGORY_LIST},
-  {"approx(x)", 0, "Approx. value x. Shortcut S-D", "pi", 0, CAT_CATEGORY_REAL},
-  {"area(objet)", 0, "Algebric area", "circle(0,1)", "triangle(-1,1+i,3)", CAT_CATEGORY_2D  },
-  {"arg(z)", 0, "Angle of complex z.", "1+i", 0, CAT_CATEGORY_COMPLEXNUM},
-  {"asc(string)", 0, "List of ASCII codes os a string", "\"Hello\"", 0, CAT_CATEGORY_ARIT},
-  {"assume(hyp)", 0, "Assumption on variable.", "x>1", "x>-1 and x<1", CAT_CATEGORY_PROGCMD|(CAT_CATEGORY_SOFUS<<8)},
-  {"avance n", "avance ", "Turtle forward n steps, default n=10", "#avance 30", 0, CAT_CATEGORY_LOGO},
-  {"axes", "axes", "Axes visible or not axes=1 or 0", "#axes=0", 0, CAT_CATEGORY_PROGCMD << 8|XCAS_ONLY},
-  {"baisse_crayon ", "baisse_crayon ", "Turtle moves with the pen writing.", 0, 0, CAT_CATEGORY_LOGO},
-  {"barplot(list)", 0, "Bar plot of 1-d statistic series data in list.", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS},
-  {"barycenter([pnt,coeff],...)", 0, "Barycenter of a sequence of [point,coefficient]. Run isobarycenter if all coefficients are equal", "[1,1],[i,1],[2,3]", 0, CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  {"binomial(n,p,k)", 0, "binomial(n,p,k) probability to get k success with n trials where p is the probability of success of 1 trial. binomial_cdf(n,p,k) is the probability to get at most k successes. binomial_icdf(n,p,t) returns the smallest k such that binomial_cdf(n,p,k)>=t", "10,.5,4", 0, CAT_CATEGORY_PROBA},
-    {"bisector(A,B,C)", 0, "Bisector of angle AB,AC", "1,i,2+i", 0,CAT_CATEGORY_2D},
-  {"bitxor", "bitxor", "Exclusive or", "#bitxor(1,2)", 0, CAT_CATEGORY_PROGCMD},
-  {"black", "black", "Display option", "#display=black", 0, CAT_CATEGORY_PROGCMD},
-  {"blue", "blue", "Display option", "#display=blue", 0, CAT_CATEGORY_PROGCMD},
-  {"camembert(list)", 0, "Camembert pie-chart of a 1-d statistical series.", "[[\"France\",6],[\"Germany\",12],[\"Switzerland\",5]]", 0, CAT_CATEGORY_STATS},
-  {"cache_tortue ", "cache_tortue ", "Hide turtle (once the picture has been drawn).", 0, 0, CAT_CATEGORY_LOGO},
-  {"ceil(x)", 0, "Smallest integer not less than x", "1.2", 0, CAT_CATEGORY_REAL},
-  {"center(objet)", 0, "Circle or sphere center. For ellipse or hyperbola, returns center, one focus and a point on the conic. For a parabola, returns focus and vertex.", "circle(0,1)", "sphere([0,0,0],[1,1,1])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  {"cfactor(p)", 0, "Factorization over C.", "x^4-1", 0, CAT_CATEGORY_ALGEBRA | (CAT_CATEGORY_COMPLEXNUM << 8)},
-  {"char(liste)", 0, "Converts a list of ASCII codes to a string.", "[97,98,99]", 0, CAT_CATEGORY_ARIT},
-  {"charpoly(M,x)", 0, "Characteristic polynomial of matrix M in variable x.", "[[1,2],[3,4]],x", 0, CAT_CATEGORY_MATRIX},
-  {"circle(center,radius)", 0, "Circle", "2+i,3", "1-i,1+i", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8)},
-  {"circumcircle(A,B,C)", 0, "Circumcircle", "-1,2+i,3", 0, CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-  {"clearscreen()", "clearscreen()", "Clear screen.", 0, 0, CAT_CATEGORY_PROGCMD|XCAS_ONLY},
-  {"coeff(p,x,n)", 0, "Coefficient of x^n in polynomial p.", 0, 0, CAT_CATEGORY_POLYNOMIAL},
-  {"comb(n,k)", 0, "Returns nCk", "10,4", 0, CAT_CATEGORY_PROBA},
-  {"cond(A,[1,2,inf])", 0, "Nombre de condition d'une matrice par rapport a la norme specifiee (par defaut 1)", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"cone(A,v,theta,[h])", 0, " cone with vertex A, direction v, and with half_angle t [and with altitudes h and -h]", "[0,0,0],[0,0,1],pi/6", "[0,0,0],[0,0,1],pi/6,4", CAT_CATEGORY_3D},
-  {"conic(expression)", 0, "Conic given by a polynomial equation of degree 2 or by 5 vertices", "x^2+x*y+y^2=5", "1,i,2+i,3-i,4+2i", CAT_CATEGORY_2D},
-  {"coordinates(object)", 0, "Coordonnees (cartesian))", "point(1,2)", "point(1,2,3)", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  {"conj(z)", 0, "Complex conjugate of z.", "1+i", 0, CAT_CATEGORY_COMPLEXNUM},
-  {"correlation(l1,l2)", 0, "Correlation of lists l1 and l2", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"covariance(l1,l2)", 0, "Covariance of lists l1 and l2", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"cpartfrac(p,x)", 0, "Partial fraction decomposition over C.", "1/(x^4-1)", 0, CAT_CATEGORY_ALGEBRA | (CAT_CATEGORY_COMPLEXNUM << 8)},
-  {"crayon ", "crayon ", "Turtle drawing color", "#crayon red", 0, CAT_CATEGORY_LOGO},
-  {"cross(u,v)", 0, "Cross product of vectors u and v.","[1,2,3],[0,1,3]", 0, CAT_CATEGORY_LINALG},
-  {"csolve(equation,x)", 0, "Solve equation (or polynomial system) in exact mode over the complex numbers.","x^2+x+1=0", 0, CAT_CATEGORY_SOLVE| (CAT_CATEGORY_COMPLEXNUM << 8)},
-  {"cube(A,B,C)", 0, "Cube of edge AB with one face in plane ABC", "[0,0,0],[1,0,0],[0,1,0]","[0,0,0],[0,2,sqrt(5)/2+3/2],[0,0,1]", CAT_CATEGORY_3D},
-  {"curl(u,vars)", 0, "Curl of vector u.", "[2*x*y,x*z,y*z],[x,y,z]", 0, CAT_CATEGORY_LINALG},
-  {"cyan", "cyan", "Display option", "#display=cyan", 0, CAT_CATEGORY_PROGCMD},
-  {"cylinder(A,v,r,[h])", 0, "Cylinder of axis A,v and radius r [and optional altitude h]", "[0,0,0],[0,1,0],2", "[0,0,0],[0,1,0],2,3", CAT_CATEGORY_3D},
-  {"debug(f(args))", 0, "Runs user function f in step by step mode.", 0, 0, CAT_CATEGORY_PROG},
-  {"degree(p,x)", 0, "Degre of polynomial p in x.", "x^4-1", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"denom(x)", 0, "Denominator of expression x.", "3/4", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"desolve(equation,t,y)", 0, "Exact differential equation solving.", "desolve([y'+y=exp(x),y(0)=1])", "[y'=[[1,2],[2,1]]*y+[x,x+1],y(0)=[1,2]]", CAT_CATEGORY_SOLVE | (CAT_CATEGORY_CALCULUS << 8)},
-  {"det(A)", 0, "Determinant of matrix A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"diff(f,var,[n])", 0, "Derivative of expression f with respect to var (order n, n=1 by default), for example diff(sin(x),x) or diff(x^3,x,2). For derivation with respect to x, run f' (shortcut F3). For the gradient of f, var is the list of variables.", "sin(x),x", "sin(x^2),x,3", CAT_CATEGORY_CALCULUS},
-  {"display", "display", "Display option", "#display=red", 0, CAT_CATEGORY_PROGCMD},
-  {"disque n", "disque ", "Filled circle tangent to the turtle, radius n. Run disque n,theta for a filled arc of circle, theta in degrees, or disque n,theta,segment for a segment of circle.", "#disque 30", "#disque(30,90)", CAT_CATEGORY_LOGO},
-  {"dodecahedron(A,B,C)", 0, "Dodecahedron of edge AB with one face in plane ABC", "[0,0,0],[0,2,sqrt(5)/2+3/2],[0,0,1]", 0, CAT_CATEGORY_3D},
-  {"dot(a,b)", 0, "Dot product of 2 vectors. Shortcut: *", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_LINALG},
-  {"draw_arc(x1,y1,rx,ry,theta1,theta2,c)", 0, "Pixelised arc of ellipse.", "100,100,60,80,0,pi,magenta", 0, CAT_CATEGORY_PROGCMD},
-  {"draw_circle(x1,y1,r,c)", 0, "Pixelised circle. Option: filled", "100,100,60,cyan+filled", 0, CAT_CATEGORY_PROGCMD},
-  {"draw_line(x1,y1,x2,y2,c)", 0, "Pixelised line.", "100,50,300,200,blue", 0, CAT_CATEGORY_PROGCMD},
-  {"draw_pixel(x,y,color)", 0, "Colors pixel x,y. Run draw_pixel() to synchronise screen.", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"draw_polygon([[x1,y1],...],c)", 0, "Pixelised polygon.", "[[100,50],[30,20],[60,70]],red+filled", 0, CAT_CATEGORY_PROGCMD},
-  {"draw_rectangle(x,y,w,h,c)", 0, "Rectangle.", "100,50,30,20,red+filled", 0, CAT_CATEGORY_PROGCMD},
-  {"draw_string(s,x,y,c)", 0, "Draw string s at pixel x,y", "\"Bonjour\",80,60", 0, CAT_CATEGORY_PROGCMD},
-#ifndef TURTLETAB
-  {"ecris ", "ecris ", "Write at turtle position", "#ecris \"hello\"", 0, CAT_CATEGORY_LOGO},
-#endif
-  {"efface", "efface", "Reset turtle", 0, 0, CAT_CATEGORY_LOGO},
-  {"egcd(A,B)", 0, "Find polynomials U,V,D such that A*U+B*V=D=gcd(A,B)","x^2+3x+1,x^2-5x-1", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"elif test", "elif ", "Test cascade", 0, 0, CAT_CATEGORY_PROG},
-  {"ellipse(F1,F2,M)", 0, "Ellipse given by 2 focus and one point", "-1,1,2", 0, CAT_CATEGORY_2D},
-  {"eigenvals(A)", 0, "Eigenvalues of matrix  A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX |XCAS_ONLY},
-  {"eigenvects(A)", 0, "Eigenvectors of matrix A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"equation(object)", 0, "Cartesian equation. Run parameq for parametric equation", "circle(0,1)", "ellipse(-1,1,3)", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  {"erf(x)", 0, "Error function of x.", "1.2", 0, CAT_CATEGORY_PROBA},
-  {"erfc(x)", 0, "Complementary error function of x.", "1.2", 0, CAT_CATEGORY_PROBA},
-  {"euler(n)",0,"Euler indicatrix: number of integers < n coprime with n","25",0,CAT_CATEGORY_ARIT},
-  {"eval(f)", 0, "Evals f.", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"evalc(z)", 0, "Write z=x+i*y.", "1/(1+i*sqrt(3))", 0, CAT_CATEGORY_COMPLEXNUM},
-  {"exact(x)", 0, "Converts x to a rational. Shortcut shift S-D", "1.2", 0, CAT_CATEGORY_REAL},
-  {"exp2trig(expr)", 0, "Convert complex exponentials to sin/cos", "exp(i*x)", 0, CAT_CATEGORY_TRIG},
-  {"exponential_regression(Xlist,Ylist)", 0, "Exponential regression.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"exponential_regression_plot(Xlist,Ylist)", 0, "Exponential regression plot.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];exponential_regression_plot(X,Y);scatterplot(X,Y)", 0, CAT_CATEGORY_STATS},
-  {"exponentiald(lambda,x)", 0, "Exponential distribution law of  parameter lambda. exponentiald_cdf(lambda,x) probability that \"exponential distribution <=x\" e.g. exponentiald_cdf(2,3). exponentiald_icdf(lambda,t) returns x such that \"exponential distribution <=x\" has probability t, e.g, exponentiald_icdf(2,0.95) ", "5.1,3.4", 0, CAT_CATEGORY_PROBA},
-  {"extend", 0, "Merge 2 lists. Note that + does not merge lists, it adds vectors","#l1.extend(l2)", 0, CAT_CATEGORY_LIST},
-  {"factor(p,[x])", 0, "Factors polynomial p (run ifactor for an integer). Shortcut: p=>*", "x^4-1", "x^6+1,sqrt(3)", CAT_CATEGORY_ALGEBRA| (CAT_CATEGORY_POLYNOMIAL << 8)},
-  {"filled", "filled", "Display option", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"float(x)", 0, "Converts x to a floating point value.", "pi", 0, CAT_CATEGORY_REAL},
-  {"floor(x)", 0, "Largest integer not greater than x", "pi", 0, CAT_CATEGORY_REAL},
-  {"fourier_an(f,x,T,n,a)", 0, "Cosine Fourier coefficients of f", "x^2,x,2*pi,n,-pi", 0, CAT_CATEGORY_CALCULUS},
-  {"fourier_bn(f,x,T,n,a)", 0, "Sine Fourier coefficients of f", "x^2,x,2*pi,n,-pi", 0, CAT_CATEGORY_CALCULUS},
-  {"fourier_cn(f,x,T,n,a)", 0, "Exponential Fourier coefficients of f", "x^2,x,2*pi,n,-pi", 0, CAT_CATEGORY_CALCULUS},
-  {"from math/... import *", "from math import *", "Access to math or to random functions ([random]) or turtle with English commandnames [turtle]. Math import is not required in KhiCAS", "#from random import *", "#from turtle import *", CAT_CATEGORY_PROG},
-  {"fsolve(equation,x=a..b)", 0, "Approx equation solving in interval a..b.","cos(x)=x,x=0..1", "cos(x)-x,x=0.0", CAT_CATEGORY_SOLVE},
-  // {"function f(x):...", "function f(x) local y;   ffunction:;", "Function definition.", "#function f(x) local y; y:=x^2; return y; ffunction:;", 0, CAT_CATEGORY_PROG},
-  {"gauss(q)", 0, "Quadratic form reduction", "x^2+x*y+x*z+y^2+z^2,[x,y,z]", 0, CAT_CATEGORY_LINALG},
-  {"gcd(a,b,...)", 0, "Greatest common divisor. See also iegcd and egcd for extended GCD.", "23,13", "x^2-1,x^3-1", CAT_CATEGORY_ARIT | (CAT_CATEGORY_POLYNOMIAL << 8)},
-  {"gl_x", "gl_x", "Display settings X gl_x=xmin..xmax", "#gl_x=0..2", 0, CAT_CATEGORY_PROGCMD},
-  {"gl_y", "gl_y", "Display settings Y gl_y=ymin..ymax", "#gl_y=-1..1", 0, CAT_CATEGORY_PROGCMD},
-  {"gramschmidt(M)", 0, "Gram-Schmidt orthonormalization (line vectors or linearly independent set of vectors)", "[[1,2,3],[4,5,6]]", "[1,1+x],(p,q)->integrate(p*q,x,-1,1)", CAT_CATEGORY_LINALG},
-  {"green", "green", "Display option", "#display=green", 0, CAT_CATEGORY_PROGCMD},
-  {"halftan(expr)", 0, "Convert cos, sin, tan with tan(angle/2).","cos(x)", 0, CAT_CATEGORY_TRIG},
-  {"hermite(n)", 0, "n-th Hermite polynomial", "10", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"hilbert(n)", 0, "Hilbert matrix of order n.", "4", 0, CAT_CATEGORY_MATRIX},
-  {"histogram(list,min,size)", 0, "Histogram of data in list, classes begin at min of size size.","ranv(100,uniformd,0,1),0,0.1", 0, CAT_CATEGORY_STATS},
-  {"homothety(center,ratio,object)", 0, "Image of object by homothety of ratio", "0,2,circle(1,1)", 0, CAT_CATEGORY_2D },
-  {"hyperbola(F1,F2,M)", 0, "Hyperbola given by 2 focus and one point", "-2-i,2+i,1", 0, CAT_CATEGORY_2D},
-  {"iabcuv(a,b,c)", 0, "Find 2 integers u,v such that a*u+b*v=c","23,13,15", 0, CAT_CATEGORY_ARIT},
-  {"ichinrem([a,m],[b,n])", 0,"Integer chinese remainder of a mod m and b mod n.", "[3,13],[2,7]", 0, CAT_CATEGORY_ARIT},
-  {"icosahedron(A,B,C)", 0, "Icosahedron with center A, vertex B and such that the plane ABC contains one vertex among the 5 nearest vertices from B ", "[0,0,0],[sqrt(5),0,0],[1,2,0]", 0, CAT_CATEGORY_3D},
-   {"idivis(n)", 0, "Returns the list of divisors of an integer n.", "10", 0, CAT_CATEGORY_ARIT},
-  {"idn(n)", 0, "Identity matrix of order n", "4", 0, CAT_CATEGORY_MATRIX},
-  {"iegcd(a,b)", 0, "Find integers u,v,d such that a*u+b*v=d=gcd(a,b)","23,13", 0, CAT_CATEGORY_ARIT},
-  {"ifactor(n)", 0, "Factorization of an integer (not too large!). Shortcut n=>*", 0, 0, CAT_CATEGORY_ARIT},
-  {"ilaplace(f,s,x)", 0, "Inverse Laplace transform of f", "s/(s^2+1),s,x", 0, CAT_CATEGORY_CALCULUS},
-  {"im(z)", 0, "Imaginary part.", "1+i", 0, CAT_CATEGORY_COMPLEXNUM},
-  {"incircle(A,B,C)", 0, "Incircle", "-1,2+i,3", 0, CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-  {"inf", "inf", "Plus infinity. -inf for minus infinity and infinity for unsigned/complex infinity. Shortcut shift INS.", "oo", 0, CAT_CATEGORY_CALCULUS},
-  {"input()", "input()", "Read a string from keyboard", 0, 0, CAT_CATEGORY_PROG},
-  {"integrate(f,x,[a,b])", 0, "Antiderivative of f with respect to x, like integrate(x*sin(x),x). For definite integral enter optional arguments a and b, like integrate(x*sin(x),x,0,pi). Shortcut SHIFT F3.", "x*sin(x),x", "cos(x)/(1+x^4),x,0,inf", CAT_CATEGORY_CALCULUS},
-  {"interp(X,Y)", 0, "Lagrange interpolation at points (xi,yi) where X is the list of xi and Y of yi. If interp is passed as 3rd argument, returns the divided differences list.", "[1,2,3,4,5],[0,1,3,4,4]", "[1,2,3,4,5],[0,1,3,4,4],interp", CAT_CATEGORY_POLYNOMIAL},
-  {"inter(A,B)", 0, "Intersections list. Run single_inter if intersection is unique.", "line(y=x),circle(0,1)", 0, CAT_CATEGORY_3D | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-  {"inv(A)", 0, "Inverse of A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"iquo(a,b)", 0, "Integer quotient of a and b.", "23,13", 0, CAT_CATEGORY_ARIT},
-  {"irem(a,b)", 0,"Integer remainder of a and b.", "23,13", 0, CAT_CATEGORY_ARIT},
-  {"isprime(n)", 0, "Returns 1 if n is prime, 0 otherwise.", "11", "10", CAT_CATEGORY_ARIT},
-  {"jordan(A)", 0, "Jordan normal form of matrix A, returns P and D such that P^-1*A*P=D", "[[1,2],[3,4]]", "[[1,1,-1,2,-1],[2,0,1,-4,-1],[0,1,1,1,1],[0,1,2,0,1],[0,0,-3,3,-1]]", CAT_CATEGORY_MATRIX},
-  {"laguerre(n,a,x)", 0, "n-ieme Laguerre polynomial (default a=0).", "10", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"laplace(f,x,s)", 0, "Laplace transform of f","sin(x),x,s", 0, CAT_CATEGORY_CALCULUS},
-  {"lcm(a,b,...)", 0, "Least common multiple.", "23,13", "x^2-1,x^3-1", CAT_CATEGORY_ARIT | (CAT_CATEGORY_POLYNOMIAL << 8)},
-  {"lcoeff(p,x)", 0, "Leading coefficient of polynomial p in x.", "x^4-1", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"legendre(n)", 0, "n-the Legendre polynomial.", "10", "10,t", CAT_CATEGORY_POLYNOMIAL},
-#ifdef RELEASE
-  {"len(l)", 0, "Size of a list.", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_LIST},
-#endif
-  {"leve_crayon ", "leve_crayon ", "Turtle moves without trace.", 0, 0, CAT_CATEGORY_LOGO},
-  {"limit(f,x=a)", 0, "Limit of f at x = a. Add 1 or -1 for unidirectional limits, e.g. limit(sin(x)/x,x=0) or limit(abs(x)/x,x=0,1). Shortcut: SHIFT MIXEDFRAC", "sin(x)/x,x=0", "exp(-1/x),x=0,1", CAT_CATEGORY_CALCULUS},
-  {"line(equation)", 0, "Line of equation", "y=2x+1", "[0,0,0],[1,-2,3]", CAT_CATEGORY_PROGCMD |(CAT_CATEGORY_2D << 8)|(CAT_CATEGORY_2D << 16)},
-  {"line_width_", "line_width_", "Width prefix (2 to 8)", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"linear_regression(Xlist,Ylist)", 0, "Linear regression.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"linear_regression_plot(Xlist,Ylist)", 0, "Linear regression plot.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];linear_regression_plot(X,Y);scatterplot(X,Y)", 0, CAT_CATEGORY_STATS},
-  {"linetan(expr,x,x0)", 0, "Tangent to the graph at x=x0.", "sin(x),x,pi/2", 0, CAT_CATEGORY_PLOT},
-  {"linsolve([eq1,eq2,..],[x,y,..])", 0, "Linear system solving. May use the output of lu for O(n^2) solving (see example 2).","[x+y=1,x-y=2],[x,y]", "#p,l,u:=lu([[1,2],[3,4]]); linsolve(p,l,u,[5,6])", CAT_CATEGORY_SOLVE | (CAT_CATEGORY_LINALG <<8) | (CAT_CATEGORY_MATRIX << 16)},
-  {"logarithmic_regression(Xlist,Ylist)", 0, "Logarithmic egression.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"logarithmic_regression_plot(Xlist,Ylist)", 0, "Logarithmic regression plot.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];logarithmic_regression_plot(X,Y);scatterplot(X,Y)", 0, CAT_CATEGORY_STATS},
-  {"lu(A)", 0, "LU decomposition LU of matrix A, P*A=L*U", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"magenta", "magenta", "Display option", "#display=magenta", 0, CAT_CATEGORY_PROGCMD},
-  {"map(f,l)", 0, "Maps f on element of list l.","lambda x:x*x,[1,2,3]", 0, CAT_CATEGORY_LIST},
-  {"matpow(A,n)", 0, "Returns matrix A^n", "[[1,2],[3,4]],n","#assume(n>=1);matpow([[0,2],[0,4]],n)",  CAT_CATEGORY_MATRIX},
-  {"matrix(r,c,func)", 0, "Matrix from a defining function.", "2,3,(j,k)->j^k", 0, CAT_CATEGORY_MATRIX},
-  {"mean(l)", 0, "Arithmetic mean of list l", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS},
-  {"median(l)", 0, "Median", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS},
-  {"median_line(A,B,C)", 0, "Median line of triangle ABC from vertex A", "1,i,2+i", 0,CAT_CATEGORY_2D},
-  {"midpoint(A,B)", 0, "Midpoint of segment AB", "1,i", 0,CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8)},
-  {"montre_tortue ", "montre_tortue ", "Displays the turtle", 0, 0, CAT_CATEGORY_LOGO},
-  {"mult_c_conjugate", 0, "Multiplier par le conjugue complexe.", "1+2*i", 0,  (CAT_CATEGORY_COMPLEXNUM << 8)},
-  {"mult_conjugate", 0, "Multiplier par le conjugue (sqrt).", "sqrt(2)-sqrt(3)", 0, CAT_CATEGORY_ALGEBRA},
-  {"normald([mu,sigma],x)", 0, "Normal distribution probability density, by default mu=0 and sigma=1. normald_cdf([mu,sigma],x) probability that \"normal distribution <=x\" e.g. normald_cdf(1.96). normald_icdf([mu,sigma],t) returns x such that \"normal distribution <=x\" has probability t, e.g. normald_icdf(0.975) ", "1.2", 0, CAT_CATEGORY_PROBA},
-  {"not(x)", 0, "Logical not.", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"numer(x)", 0, "Numerator of x.", "3/4", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"octahedron(A,B,C)", 0, "Octahedron of edge AB with one face in plane ABC", "[0,0,0],[3,0,0],[0,1,0]", 0, CAT_CATEGORY_3D},
-  {"odesolve(f(t,y),[t,y],[t0,y0],t1)", 0, "Approx. solution of differential equation y'=f(t,y) and y(t0)=y0, value for t=t1 (add curve to get intermediate values of y)", "sin(t*y),[t,y],[0,1],2", "0..pi,(t,v)->{[-v[1],v[0]]},[0,1]", CAT_CATEGORY_SOLVE},
-  {"parabola(F,A)", 0, "Parabola given by focus and vertex", "-2-i,2+i", 0, CAT_CATEGORY_2D},
-  {"parameq(object)", 0, "Parametric equations. Run equation for cartesian equation", "circle(0,1)", "ellipse(-1,1,3)", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  {"partfrac(p,x)", 0, "Partial fraction expansion. Shortcut p=>+", "1/(x^4-1)", 0, CAT_CATEGORY_ALGEBRA},
-  {"pas_de_cote n", "pas_de_cote ", "Turtle side jump from n steps, by default n=10", "#pas_de_cote 30", 0, CAT_CATEGORY_LOGO},
-  {"perpen_bisector(A,B)", 0, "Perpendicular bisector of segment AB", "1,i", 0,CAT_CATEGORY_2D},
-  {"plane(equation)", 0, "Plane given by equation or by 3 points", "z=x+y-1", "[0,0,0],[1,0,0],[0,1,0]", CAT_CATEGORY_3D | XCAS_ONLY},
-  {"plot(expr,x)", 0, "Plot an expression. For example plot(sin(x)), plot(ln(x),x.0,5), plot(x^2-y^2), plot(x^2-y^2<1), plot(x^2-y^2=1)", "ln(x),x,0,5", "1/x,x=1..5,xstep=1", (CAT_CATEGORY_PLOT << 8) | (CAT_CATEGORY_3D)},
-#ifdef RELEASE
-  {"plotarea(expr,x=a..b,[n,meth])", 0, "Area under curve with specified quadrature.", "1/x,x=1..3,2,trapezoid", 0, CAT_CATEGORY_PLOT},
-#endif
-  {"plotcontour(expr,[x=xm..xM,y=ym..yM],levels)", 0, "Levels of expr.", "x^2+2y^2,[x=-2..2,y=-2..2],[1,2]", 0, CAT_CATEGORY_PLOT},
-  {"plotfield(f(t,y),[t=tmin..tmax,y=ymin..ymax])", 0, "Plot field of differential equation y'=f(t,y), an optionally one solution by adding plotode=[t0,y0]", "sin(t*y),[t=-3..3,y=-3..3],plotode=[0,1]", 0, CAT_CATEGORY_PLOT},
-  {"plotfunc(expr,[x,y])", 0, "Xcas: graph of a 3d function", "x^2-y^2,[x,y]","x^2-y^2,[x=-2..2,y=-2..2],nstep=700", CAT_CATEGORY_PLOT | (CAT_CATEGORY_3D << 8) | XCAS_ONLY },
-  {"plotlist(list)", 0, "Plot a list", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_PLOT},
-  {"plotode(f(t,y),[t=tmin..tmax,y],[t0,y0])", 0, "Plot solution of differential equation y'=f(t,y), y(t0)=y0.", "sin(t*y),[t=-3..3,y],[0,1]", 0, CAT_CATEGORY_PLOT},
-  {"plotparam([x,y],t)", 0, "Parametric plot. For example plotparam([sin(3t),cos(2t)],t,0,pi) or plotparam(exp(i*t),t,0,pi)", "[sin(3t),cos(2t)],t,0,pi", "[t^2,t^3],t=-1..1,tstep=0.1", CAT_CATEGORY_PLOT},
-  {"plotpolar(r,theta)", 0, "Polar plot.","cos(3*x),x,0,pi", "1/(1+cos(x)),x=0..pi,xstep=0.05", CAT_CATEGORY_PLOT},
-  {"plotseq(f(x),x=[u0,m,M],n)", 0, "Plot f(x) on [m,M] and n terms of the sequence defined by u_{n+1}=f(u_n) and u0.","sqrt(2+x),x=[6,0,7],5", 0, CAT_CATEGORY_PLOT},
-  {"plus_point", "plus_point", "Display option", "#display=blue+plus_point", 0, CAT_CATEGORY_PROGCMD},
-  {"point(x,y[,z])", 0, "Point", "1,2", "1,2,3", CAT_CATEGORY_PLOT | (CAT_CATEGORY_2D << 8)},
-  {"polygon(list)", 0, "Closed polygon given by a list of vertices.", "1-i,2+i,3,3-2i", 0, CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) },
-  {"polygonscatterplot(Xlist,Ylist)", 0, "Plot points and polygonal line.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"polyhedron(A,B,C,D,...)", 0, "Convex polyhedron of vertices in A,B,C,D,...", "[0,0,0],[0,5,0],[0,0,5],[1,2,6]", 0, CAT_CATEGORY_3D},
-  {"polynomial_regression(Xlist,Ylist,n)", 0, "Polynomial regression, degree <= n.", "[1,2,3,4,5],[0,1,3,4,4],2", 0, CAT_CATEGORY_STATS},
-  {"polynomial_regression_plot(Xlist,Ylist,n)", 0, "Polynomial regression plot, degree <= n.", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];polynomial_regression_plot(X,Y,2);scatterplot(X,Y)", 0, CAT_CATEGORY_STATS},
-  //{"pour", "pour j de 1 jusque  faire  fpour;", "For loop.","#pour j de 1 jusque 10 faire print(j,j^2); fpour;", 0, CAT_CATEGORY_PROG},
-  {"power_regression(Xlist,Ylist,n)", 0, "Power regression.", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"power_regression_plot(Xlist,Ylist,n)", 0, "Power regression graph", "#X,Y:=[1,2,3,4,5],[0,1,3,4,4];power_regression_plot(X,Y);scatterplot(X,Y)", 0, CAT_CATEGORY_STATS},
-  {"powmod(a,n,p)", 0, "Returns a^n mod p.","123,456,789", 0, CAT_CATEGORY_ARIT},
-  {"print(expr)", 0, "Print expr in console", 0, 0, CAT_CATEGORY_PROG},
-  {"projection(obj1,obj2)", 0, "Projection on obj1 of obj2", "line(y=x),point(2,3)", 0, CAT_CATEGORY_2D },
-  {"proot(p)", 0, "Returns real and complex roots, of polynomial p. Exemple proot([1,2.1,3,4.2]) or proot(x^3+2.1*x^2+3x+4.2)", "x^3+2.1*x^2+3x+4.2", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"purge(x)", 0, "Clear assigned variable x. Shortcut SHIFT-FORMAT", 0, 0, CAT_CATEGORY_PROGCMD|(CAT_CATEGORY_SOFUS<<8)},
-  {"python(f)", 0, "Displays f in Python syntax.", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"python_compat(0|1|2)", 0, "python_compat(0) Xcas syntax, python_compat(1) Python syntax with ^ interpreted as power, python_compat(2) ^ as bit xor", "0", "1", CAT_CATEGORY_PROG},
-  {"qr(A)", 0, "A=Q*R factorization with Q orthogonal and R upper triangular", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"quadric(equation)", 0, "Quadric given by equation (or 9 points)", "x^2-y^2+z^2", "x^2+x*y+y^2+z^2-3", CAT_CATEGORY_3D},
-  {"quartile1(l)", 0, "1st quartile", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS},
-  {"quartile3(l)", 0, "3rd quartile", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS},
-  {"quo(p,q,x)", 0, "Quotient of synthetic division of polynomials p and q (variable x).", 0, 0, CAT_CATEGORY_POLYNOMIAL},
-  {"quote(x)", 0, "Returns expression x unevaluated.", 0, 0, CAT_CATEGORY_ALGEBRA},
-  {"radius(objet)", 0, "Radius of a circle or sphere", "circle(0,1)", "sphere([0,0,0],[1,1,1])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  {"rand()", "rand()", "Random real between 0 and 1", 0, 0, CAT_CATEGORY_PROBA},
-  {"randint(a,b)", 0, "Random integer between a and b. With 1 argument in Xcas, random integer between 1 and n.", "5,25", "6", CAT_CATEGORY_PROBA},
-  {"ranm(n,m,[loi,parametres])", 0, "Random matrix with integer coefficients or according to a probability law (ranv for a vector). Examples ranm(2,3), ranm(3,2,binomial,20,.3), ranm(4,2,normald,0,1)", "3,3","4,2,normald,0,1",  CAT_CATEGORY_MATRIX},
-  {"ranv(n,[loi,parametres])", 0, "Random vector.", "10","4,normald,0,1", CAT_CATEGORY_LINALG},
-  {"ratnormal(x)", 0, "Puts everything over a common denominator.", 0, 0, CAT_CATEGORY_ALGEBRA},
-  {"re(z)", 0, "Real part.", "1+i", 0, CAT_CATEGORY_COMPLEXNUM},
-  {"read(\"filename\")", "read(\"", "Read a file.", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"rectangle_plein a,b", "rectangle_plein ", "Direct filled rectangle from turtle position, if b is omitted b==a", "#rectangle_plein 30","#rectangle_plein 20,40", CAT_CATEGORY_LOGO},
-  {"recule n", "recule ", "Turtle backward n steps, n=10 by default", "#recule 30", 0, CAT_CATEGORY_LOGO},
-  {"red", "red", "Display option", "#display=red", 0, CAT_CATEGORY_PROGCMD},
-  {"reflection(obj1,obj2)", 0, "Reflection or symmetrical of obj2", "line(y=x),cercle(1,1)", 0, CAT_CATEGORY_2D },
-  {"rem(p,q,x)", 0, "Remainder of synthetic division of polynomials p and q (variable x)", 0, 0, CAT_CATEGORY_POLYNOMIAL},
-#ifdef RELEASE
-  {"residue(f(z),z,z0)", 0, "Residue of an expression at z0.", "1/(x^2+1),x,i", 0, CAT_CATEGORY_COMPLEXNUM},
-#endif
-  {"resultant(p,q,x)", 0, "Resultant in x of polynomials p and q.", "#P:=x^3+p*x+q;resultant(P,P',x);", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"revert(p[,x])", 0, "Revert Taylor series","x+x^2+x^4", 0, CAT_CATEGORY_CALCULUS},
-  {"rgb(r,g,b)", 0, "color defined from red, green, blue from 0 to 255", "255,0,255", 0, CAT_CATEGORY_PROGCMD},
-  {"rhombus_point", "rhombus_point", "Display option", "#display=magenta+rhombus_point", 0, CAT_CATEGORY_PROGCMD},
-  {"rond n", "rond ", "Circle tangent to the turtle, radius n. Run rond n,theta for an arc of circle of theta degrees", 0, 0, CAT_CATEGORY_LOGO},
-  {"rotation(center,angle,objcet)", 0, "Image of object by rotation", "2-i,pi/2,circle(0,1)", "sphere([0,0,0],[1,1,1])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  {"rsolve(equation,u(n),[init])", 0, "Solve a recurrence relation.","u(n+1)=2*u(n)+3,u(n),u(0)=1", "([u(n+1)=3*v(n)+u(n),v(n+1)=v(n)+u(n)],[u(n),v(n)],[u(0)=1,v(0)=2]", CAT_CATEGORY_SOLVE},
-  {"saute n", "saute ", "Turtle jumps n steps, by default n=10", "#saute 30", 0, CAT_CATEGORY_LOGO},
-  {"scatterplot(Xlist,Ylist)", 0, "Draws points", "[1,2,3,4,5],[0,1,3,4,4]", 0, CAT_CATEGORY_STATS},
-  {"segment(A,B)", 0, "Segment", "1,2+i", "[1,2,1],[-1,3,2]", CAT_CATEGORY_PROGCMD | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-  {"seq(expr,var,a,b)", 0, "Generates a list from an expression.","j^2,j,1,10", 0, CAT_CATEGORY_PROGCMD},
-  //{"si", "si  alors  sinon  fsi;", "Test.", "#f(x):=si x>0 alors x; sinon -x; fsi;// valeur absolue", 0, CAT_CATEGORY_PROG},
-  {"sign(x)", 0, "Returns -1 if x is negative, 0 if x is zero and 1 if x is positive.", 0, 0, CAT_CATEGORY_REAL|XCAS_ONLY},
-  {"similarity(center,ratio,angle,object)", 0, "Image of object by similarity", "0,2,pi/2,circle(1,1)", 0, CAT_CATEGORY_2D },
-  {"simplify(expr)", 0, "Returns x in a simpler form. Shortcut expr=>/", "sin(3x)/sin(x)", 0, CAT_CATEGORY_ALGEBRA},
-  {"single_inter(A,B)", 0, "First intersection. Run inter for a list of intersections.", "line(y=x),line(x+y=3)", 0, CAT_CATEGORY_3D | (CAT_CATEGORY_2D << 8) | XCAS_ONLY},
-  {"solve(equation,x)", 0, "Exact solving of equation w.r.t. x (or of a polynomial system). Run csolve for complex solutions, linsolve for a linear system. Shortcut SHIFT XthetaT", "x^2-x-1=0,x", "[x^2-y^2=0,x^2-z^2=0],[x,y,z]", CAT_CATEGORY_SOLVE},
-  {"sorted(l)", 0, "Sorts a list.","[3/2,2,1,1/2,3,2,3/2]", "[[1,2],[2,3],[4,3]],(x,y)->when(x[1]==y[1],x[0]>y[0],x[1]>y[1]", CAT_CATEGORY_LIST},
-  {"sphere(A,r)", 0, "Sphere of center A and radius r or diameter AB", "[0,0,0],1", "[0,0,0],[1,1,1]", CAT_CATEGORY_3D},
-  {"square_point", "square_point", "Display option", "#display=cyan+square_point", 0, CAT_CATEGORY_PROGCMD},
-  {"star_point", "star_point", "Display option", "#display=magenta+star_point", 0, CAT_CATEGORY_PROGCMD},
-  {"stddev(l)", 0, "Standard deviation of list l", "[3/2,2,1,1/2,3,2,3/2]", 0, CAT_CATEGORY_STATS},
-  {"subst(a,b=c)", 0, "Substitutes b for c in a. Shortcut a(b=c).", "x^2,x=3", 0, CAT_CATEGORY_ALGEBRA},
-  {"sum(f,k,m,M)", 0, "Summation of expression f for k from m to M. Exemple sum(k^2,k,1,n)=>*. Shortcut ALPHA F3", "k,k,1,n", 0, CAT_CATEGORY_CALCULUS},
-  {"svd(A)", 0, "Singular Value Decomposition, returns U orthogonal, S vector of singular values, Q orthogonal such that A=U*diag(S)*tran(Q).", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"tabvar(f,[x=a..b])", 0, "Table of variations of expression f, optional arguments variable x in interval a..b", "sqrt(x^2+x+1)",  "[cos(t),sin(3t)],t", CAT_CATEGORY_CALCULUS},
-  //{"tantque", "tantque  faire   ftantque;", "While loop.", "#j:=13; tantque j!=1 faire j:=when(even(j),j/2,3j+1); print(j); ftantque;", 0, CAT_CATEGORY_PROG},
-  {"taylor(f,x=a,n,[polynom])", 0, "Taylor expansion of f of x at a order n, add parameter polynom to remove remainder term.","sin(x),x=0,5", "sin(x),x=0,5,polynom", CAT_CATEGORY_CALCULUS},
-  {"tchebyshev1(n)", 0, "Tchebyshev polynomial 1st kind: cos(n*x)=T_n(cos(x))", "10", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"tchebyshev2(n)", 0, "Tchebyshev polynomial 2nd kind: sin((n+1)*x)=sin(x)*U_n(cos(x))", "10", 0, CAT_CATEGORY_POLYNOMIAL},
-  {"tcollect(expr)", 0, "Linearize and collect trig functions.","sin(x)+cos(x)", 0, CAT_CATEGORY_TRIG},
-  {"texpand(expr)", 0, "Expand trigonometric, exp and ln functions.","sin(3x)", 0, CAT_CATEGORY_TRIG},
-  {"time(cmd)", 0, "Time to run a command or set the clock","int(1/(x^4+1),x)","8,0", CAT_CATEGORY_PROG},
-  {"tlin(expr)", 0, "Trigonometric linearization of expr.","sin(x)^3", 0, CAT_CATEGORY_TRIG},
-  {"tourne_droite n", "tourne_droite ", "Turtle turns right n degrees, n=90 by default", 0, 0, CAT_CATEGORY_LOGO},
-  {"tourne_gauche n", "tourne_gauche ", "Turtle turns left n degrees, n=90 by default", 0, 0, CAT_CATEGORY_LOGO},
-  {"trace(A)", 0, "Trace of the matrix A.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"transpose(A)", 0, "Transposes matrix A. Transconjugate command is trn(A) or A^*.", "[[1,2],[3,4]]", 0, CAT_CATEGORY_MATRIX},
-  {"translation(vect,obj)", 0, "Translate by vect obj", "[1,2],cercle(0,1)", 0, CAT_CATEGORY_2D },
-  {"triangle(A,B,C)", 0, "Triangle given by 3 vertices", "1+i,1-i,-1", "A,B,C", CAT_CATEGORY_2D},
-  {"triangle_point", "triangle_point", "Display option", "#display=yellow+triangle_point", 0, CAT_CATEGORY_PROGCMD},
-  {"trig2exp(expr)", 0, "Convert complex exponentials to trigonometric functions","cos(x)^3", 0, CAT_CATEGORY_TRIG},
-  {"trigcos(expr)", 0, "Convert sin^2 and tan^2 to cos^2.","sin(x)^4", 0, CAT_CATEGORY_TRIG},
-  {"trigsin(expr)", 0, "Convert cos^2 and tan^2 to sin^2.","cos(x)^4", 0, CAT_CATEGORY_TRIG},
-  {"trigtan(expr)", 0, "Convert cos^2 and sin^2 to tan^2.","cos(x)^4", 0, CAT_CATEGORY_TRIG},
-  {"uniformd(a,b,x)", "uniformd", "uniform law on [a,b] of density 1/(b-a)", 0, 0, CAT_CATEGORY_PROBA},
-  {"vertices(objet)", 0, "List of vertices of a polygon or polyhedra", "triangle(1,i,2)", "cube([0,0,0],[1,0,0],[0,1,0])", CAT_CATEGORY_2D | (CAT_CATEGORY_3D << 8) },
-  //{"version", "version()", "Khicas 1.5.0, (c) B. Parisse et al. www-fourier.ujf-grenoble.fr/~parisse\nLicense GPL version 2. Interface adapted from Eigenmath for Casio, G. Maia, http://gbl08ma.com. Do not use if CAS calculators are forbidden.", 0, 0, CAT_CATEGORY_PROGCMD},
-  {"write(\"filename\",var)", "write(\"", "Save 1 or more variables in a file. For example f(x):=x^2; write(\"func_f\",f).",  0, 0, CAT_CATEGORY_PROGCMD},
-  {"yellow", "yellow", "Display option", "#display=yellow", 0, CAT_CATEGORY_PROGCMD},
-  {"|", "|", "Logical or", "#1|2", 0, CAT_CATEGORY_PROGCMD},
-  {"~", "~", "Complement", "#~7", 0, CAT_CATEGORY_PROGCMD},
-};
-
-  const char aide_khicas_string[]="Aide Khicas";
-#ifdef NUMWORKS
-  const char shortcuts_fr_string[]="Raccourcis clavier (shell et editeur)\nshift-/: %\nalpha shift \": '\nshift--: \\\nshift-ans: completion\nshift-*: factor\nshift-+: normal\nshift-1 a 6: selon bandeau en bas\nshift-7: matrices\nshift-8: complexes\nshift-9:arithmetique entiere\nshift-0: probas\nshift-.: reels\nshift-10^: polynomes\nvar: liste des variables\nans: figure tortue (editeur)\n\nshift-x^y (sto) renvoie =>\n=>+: partfrac\n=>*: factor\n=>sin/cos/tan\n=>=>: solve\n\nShell:\nshift-5: Editeur 2d ou graphique ou texte selon objet\nshift-6: editeur texte\n+ ou - modifie un parametre en surbrillance\n\nEditeur d'expressions\nshift-cut: defaire/refaire (1 fois)\npave directionnel: deplace la selection dans l'arborescence de l'expression\nshift-droit/gauche echange selection avec argument a droite ou a gauche\nalpha-droit/gauche dans une somme ou un produit: augmente la selection avec argument droit ou gauche\nshift-4: Editer selection, shift-5: taille police + ou - grande\nEXE: evaluer la selection\nshift-6: valeur approchee\nBackspace: supprime l'operateur racine de la selection\n\nEditeur de scripts\nEXE: passage a la ligne\nshift-CUT: documentation\nshift COPY (ou shift et deplacement curseur simultanement): marque le debut de la selection, deplacer le curseur vers la fin puis Backspace pour effacer ou shift-COPY pour copier sans effacer. shift-PASTE pour coller.\nHome-6 recherche seule: entrer un mot puis EXE puis EXE. Taper EXE pour l'occurence suivante, Back pour annuler.\nHome-6 remplacer: entrer un mot puis EXE puis le remplacement et EXE. Taper EXE ou Back pour remplacer ou non et passer a l'occurence suivante, AC pour annuler\nOK: tester syntaxe\n\nRaccourcis Graphes:\n+ - zoom\n(-): zoomout selon y\n*: autoscale\n/: orthonormalisation\nOPTN: axes on/off";
-  const char shortcuts_en_string[]="Keyboard shortcuts (shell and editor)\nshift-/: %\nalpha shift \": '\nshift--: \\\nshift ans: completion\nshift-*: factor\nshift-+: normal\nshift-1 to 6: cf. screen bottom\nshift-7: matrices\nshift-8: complexes\nshift-9:arithmetic\nshift-0: proba\nshift-.: reals\nshift-10^: polynomials\nvar: variables list\nans: turtle screen (editor)\n\nshift-x^y (sto) returns =>\n=>+: partfrac\n=>*: factor\n=>sin/cos/tan\n=>=>: solve\n\nShell:\nshift-5: 2d editor or graph or text\nshift-6: text edit\n+ ou - modifies selected slider\n\nExpressions editor\nshift-cut: undo/redo (1 fois)\nkeypad: move selection inside expression tree\nshift-right/left exchange selection with right or left argument\nalpha-right/left: inside a sum or product: increase selection with right or left argument\nshift-4: Edit selection, shift-5: change fontsize\nEXE: eval selection\nshift-6: approx value\nBackspace: suppress selection's rootnode operator\n\nScript Editor\nEXE: newline\nshift-CUT: documentation\nshift-COPY: marks selection begin, move the cursor to the end, then hit Backspace to erase or shift-COPY to copy (no erase). shift-PASTE to paste.\nHome-6 search: enter a word then EXE then again EXE. Type EXE for next occurence, Back to cancel.\nHome-6 replace: enter a word then EXE then replacement word then EXE. Type EXE or Back to replace or ignore and go to next occurence, AC to cancel\nOK: test syntax\n\nGraph shortcuts:\n+ - zoom\n(-): zoomout along y\n*: autoscale\n/: orthonormalization\nOPTN: axes on/off";
-#else
-  const char shortcuts_fr_string[]="Raccourcis clavier (shell et editeur)\nlivre: aide/complete\ntab: complete (shell)/indente (editeur)\nshift-/: %\nshift *: '\nctrl-/: \\\nshift-1 a 6: selon bandeau en bas\nshift-7: matrices\nshift-8: complexes\nshift-9:arithmetique\nshift-0: probas\nshift-.: reels\nctrl P: programme\nvar: liste des variables\nans (shift (-)): figure tortue (editeur)\n\nctrl-var (sto) renvoie =>\n=>+: partfrac\n=>*: factor\n=>sin/cos/tan\n=>=>: solve\n\nShell:\nshift-5: Editeur 2d ou graphique ou texte selon objet\nshift-4: editeur texte\n+ ou - modifie un parametre en surbrillance\n\nEditeur d'expressions\nctrl z: defaire/refaire (1 fois)\npave directionnel: deplace la selection dans l'arborescence de l'expression\nshift-droit/gauche echange selection avec argument a droite ou a gauche\nctrl droit/gauche dans une somme ou un produit: augmente la selection avec argument droit ou gauche\nshift-4: Editer selection, shift-5: taille police + ou - grande\nenter: evaluer la selection\nshift-6: valeur approchee\nDel: supprime l'operateur racine de la selection\n\nEditeur de scripts\nenter: passage a la ligne\nctrl z: defaire/refaire (1 fois)\nctrl c ou shift et touche curseur simultanement: marque le debut de la selection, deplacer le curseur vers la fin puis Del pour effacer ou ctrl c pour copier sans effacer. ctrl v pour coller.\ndoc-6 recherche seule: entrer un mot puis enter puis enter. Taper enter pour l'occurence suivante, esc pour annuler.\ndoc-6 remplacer: entrer un mot puis enter puis le remplacement et enter. Taper enter ou esc pour remplacer ou non et passer a l'occurence suivante, ctrl del pour annuler\nvalidation (a droite de U): tester syntaxe\n\nRaccourcis Graphes:\n+ - zoom\n(-): zoomout selon y\n*: autoscale\n/: orthonormalisation\nOPTN: axes on/off";
-  const char shortcuts_en_string[]="Keyboard shortcuts (shell and editor)\nbook: help or completion\ntab: completion (shell), indent (editor)\nshift-/: %\nalpha shift *: '\nctrl-/: \\\nshift-1 a 6: see at bottom\nshift-7: matrices\nshift-8: complexes\nshift-9:arithmetic\nshift-0: probas\nshift-.: reals\nctrl P: program\nvar: variables list\n ans (shift (-)): turtle screen (editor)\n\nctrl var (sto) returns =>\n=>+: partfrac\n=>*: factor\n=>sin/cos/tan\n=>=>: solve\n\nShell:\nshift-5: 2d editor or graph or text\nshift-4: text edit\n+ ou - modifies selected slider\n\nExpressions editor\nctrl z: undo/redo (1 fois)\nkeypad: move selection inside expression tree\nshift-right/left exchange selection with right or left argument\nalpha-right/left: inside a sum or product: increase selection with right or left argument\nshift-4: Edit selection, shift-5: change fontsize\nenter: eval selection\nshift-6: approx value\nDel: suppress selection's rootnode operator\n\nScript Editor\nenter: newline\nctrl z: undo/redo (1 time)\nctrl c or shift + cursor key simultaneously: marks selection begin, move the cursor to the end, then hit Del to erase or ctrl c to copy (no erase). ctrl v to paste.\ndoc-6 search: enter a word then enter then again enter. Type enter for next occurence, esc to cancel.\ndoc-6 replace: enter a word then enter then replacement word then enter. Type enter or esc to replace or ignore and go to next occurence, AC to cancel\nOK: test syntax\n\nGraph shortcuts:\n+ - zoom\n(-): zoomout along y\n*: autoscale\n/: orthonormalization\nOPTN: axes on/off";
-#endif
-  
-  const char apropos_fr_string[]="Giac/Xcas 1.6.0, (c) 2020 B. Parisse et R. De Graeve, www-fourier.univ-grenoble-alpes.fr/~parisse.\nKhicas, interface pour calculatrices par B. Parisse, license GPL version 2, adaptee de l'interface d'Eigenmath pour Casio, G. Maia (http://gbl08ma.com), Mike Smith, Nemhardy, LePhenixNoir, ...\nPortage sur Numworks par Damien Nicolet. Remerciements a Jean-Baptiste Boric et Maxime Friess\nPortage sur Nspire grace a Fabian Vogt (firebird-emu, ndless...).\nTable periodique d'apres Maxime Friess\nRemerciements au site tiplanet, en particulier Xavier Andreani, Adrien Bertrand, Lionel Debroux";
-
-  const char apropos_en_string[]="Giac/Xcas 1.6.0, (c) 2020 B. Parisse et R. De Graeve, www-fourier.univ-grenoble-alpes.fr/~parisse.\nKhicas, calculators interface by B. Parisse, GPL license version 2, adapted from Eigenmath for Casio, G. Maia (http://gbl08ma.com), Mike Smith, Nemhardy, LePhenixNoir, ...\nPorted on Numworks by Damien Nicolet. Thanks to Jean-Baptiste Boric and Maxime Friess\nPorted on Nspire thanks to Fabian Vogt (firebird-emu, ndless...)\nPeriodic table by Maxime Friess\nThanks to tiplanet, especially Xavier Andreani, Adrien Bertrand, Lionel Debroux";
-
-  const int CAT_COMPLETE_COUNT_FR=sizeof(completeCatfr)/sizeof(catalogFunc);
-  const int CAT_COMPLETE_COUNT_EN=sizeof(completeCaten)/sizeof(catalogFunc);
-
-  std::string insert_string(int index){
-    std::string s;
-    const catalogFunc * completeCat=(lang==1)?completeCatfr:completeCaten;
-    if (completeCat[index].insert)
-      s=completeCat[index].insert;
-    else {
-      s=completeCat[index].name;
-      int pos=s.find('(');
-      if (pos>=0 && pos<s.size())
-	s=s.substr(0,pos+1);
-    }
-    return s;//s+' ';
-  }
-
-  // not tested
-  void aide2catalogFunc(const giac::aide & a,catalogFunc & c){
-    static aide as=a;
-    static string desc;
-    string descrip;
-    c.name=as.cmd_name.c_str();
-    c.insert=c.name;
-    desc=as.syntax+'\n';
-    for (int i=0;i<as.blabla.size();++i){
-      localized_string & ls=as.blabla[i];
-      if (ls.language==lang){ // exact match
-	descrip=as.blabla[i].chaine.c_str();
-	break;
-      }
-      if (ls.language==0) // default
-	descrip=as.blabla[i].chaine.c_str();
-    }
-    desc += descrip;
-    c.desc=desc.c_str();
-    c.example=as.examples.size()?as.examples[0].c_str():0;
-    c.example2=as.examples.size()>=2?as.examples[1].c_str():0;
-    c.category=-1;
-  }
-  int showCatalog(char* insertText,int preselect,int menupos,GIAC_CONTEXT) {
-    // returns 0 on failure (user exit) and 1 on success (user chose a option)
-    MenuItem menuitems[CAT_CATEGORY_LOGO+1];
-    menuitems[CAT_CATEGORY_ALL].text = (char*)((lang==1)?"Tout":"All");
-    menuitems[CAT_CATEGORY_ALGEBRA].text = (char*)((lang==1)?"Algebre":"Algebra");
-    menuitems[CAT_CATEGORY_LINALG].text = (char*)((lang==1)?"Algebre lineaire":"Linear algebra");
-    menuitems[CAT_CATEGORY_CALCULUS].text = (char*)((lang==1)?"Analyse":"Calculus");
-    menuitems[CAT_CATEGORY_ARIT].text = (char*)"Arithmetic, crypto";
-    menuitems[CAT_CATEGORY_COMPLEXNUM].text = (char*)"Complexes";
-    menuitems[CAT_CATEGORY_PLOT].text = (char*)((lang==1)?"Courbes":"Curves");
-    menuitems[CAT_CATEGORY_POLYNOMIAL].text = (char*)((lang==1)?"Polynomes":"Polynomials");
-    menuitems[CAT_CATEGORY_PROBA].text = (char*)((lang==1)?"Probabilites":"Probabilities");
-    menuitems[CAT_CATEGORY_PROGCMD].text = (char*)((lang==1)?"Programmes cmds (0)":"Program cmds (0)");
-    menuitems[CAT_CATEGORY_REAL].text = (char*)((lang==1)?"Reels (e^)":"Reals");
-    menuitems[CAT_CATEGORY_SOLVE].text = (char*)((lang==1)?"Resoudre (ln)":"Solve (ln)");
-    menuitems[CAT_CATEGORY_STATS].text = (char*)((lang==1)?"Statistiques (log)":"Statistics (log)");
-    menuitems[CAT_CATEGORY_TRIG].text = (char*)((lang==1)?"Trigonometrie (i)":"Trigonometry (i)");
-    menuitems[CAT_CATEGORY_OPTIONS].text = (char*)"Options (,)";
-    menuitems[CAT_CATEGORY_LIST].text = (char*)((lang==1)?"Listes (x^y)":"Lists (x^y)");
-    menuitems[CAT_CATEGORY_MATRIX].text = (char*)"Matrices (sin)";
-    menuitems[CAT_CATEGORY_PROG].text = (char*)((lang==1)?"Programmes (cos)":"Programs");
-    menuitems[CAT_CATEGORY_SOFUS].text = (char*)((lang==1)?"Modifier variables (tan)":"Change variables (tan)");
-    menuitems[CAT_CATEGORY_PHYS].text = (char*)((lang==1)?"Constantes physique (pi)":"Physics constants (pi)");
-    menuitems[CAT_CATEGORY_UNIT].text = (char*)((lang==1)?"Unites physiques (sqrt)":"Units (sqrt)");
-    menuitems[CAT_CATEGORY_2D].text = (char*)((lang==1)?"Geometrie (x^2)":"Geometry (x^2)");
-    menuitems[CAT_CATEGORY_3D].text = (char*)((lang==1)?"3D (()":"3D (()");
-    menuitems[CAT_CATEGORY_LOGO].text = (char*)((lang==1)?"Tortue ())":"Turtle ())");
-  
-    Menu menu;
-    menu.items=menuitems;
-    menu.numitems=sizeof(menuitems)/sizeof(MenuItem);
-    menu.scrollout=1;
-    menu.title = (char*)((lang==1)?"Liste de commandes":"Commands list");
-    //puts("catalog 1");
-    while(1) {
-      if (preselect)
-	menu.selection=preselect;
-      else {
-	if (menupos>0)
-	  menu.selection=menupos;
-	int sres = doMenu(&menu);
-	if (sres != MENU_RETURN_SELECTION && sres!=KEY_CTRL_EXE)
-	  return 0;
-      }
-      // puts("catalog 3");
-      if(doCatalogMenu(insertText, menuitems[menu.selection-1].text, menu.selection-1,contextptr)) 
-	return 1;
-      if (preselect)
-	return 0;
-    }
-    return 0;
-  }
-
-  int showCatalog(char * text,int nmenu,GIAC_CONTEXT){
-    return showCatalog(text,0,nmenu,contextptr);
-  }
-
-  bool isalphanum(char c){
-    return (c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9');
-  }
-
-  string remove_accents(const string & s){
-    string r;
-    for (int i=0;i<s.size();++i){
-      unsigned char ch=s[i];
-      if (ch==195 && i<s.size()-1){
-	++i;
-	switch ((unsigned char)s[i]){
-	case 160: case 161: case 162:
-	  r+='a';
-	  continue;
-	case 168: case 169: case 170:
-	  r+='e';
-	  continue;
-	case 172: case 173: case 174:
-	  r+='i';
-	  continue;
-	case 178: case 179: case 180:
-	  r += 'o';
-	  continue;
-	case 185: case 186: case 187:
-	  r+='u';
-	  continue;
-	}
-	r += '?';
-	continue;
-      }
-      r+=ch;
-    }
-    return r;
-  }
-
-  // back is the number of char that should be deleted before inserting
-  string help_insert(const char * cmdline,int & back,int exec,GIAC_CONTEXT,bool warn){
-    if (exec==KEY_CTRL_OK)
-      exec=MENU_RETURN_SELECTION;
-    back=0;
-    int l=strlen(cmdline);
-    char buf[l+1];
-    strcpy(buf,cmdline);
-    bool openpar=l && buf[l-1]=='(';
-    if (openpar){
-      buf[l-1]=0;
-      --l;
-      ++back;
-    }
-    for (;l>0;--l){
-      if (!isalphanum(buf[l-1]) && buf[l-1]!='_')
-	break;
-    }
-    // cmdname in buf+l
-    const char * cmdname=buf+l,*cmdnameorig=cmdname;
-    l=strlen(cmdname);
-    // search in catalog: dichotomy would be more efficient
-    // but leading spaces cmdnames would be missed
-    int nfunc=(lang==1)?CAT_COMPLETE_COUNT_FR:CAT_COMPLETE_COUNT_EN;//sizeof(completeCat)/sizeof(catalogFunc);
-#if defined NSPIRE_NEWLIB || defined NUMWORKS // should match static_help[] in help.cc
-    int iii=nfunc; // no search in completeCat, directly in static_help.h
-    //if (xcas_python_eval) iii=0;
-#else
-    int iii=0;
-#endif
-    const catalogFunc * completeCat=(lang==1)?completeCatfr:completeCaten;
-    for (;iii<nfunc;++iii){
-      if (xcas_python_eval>0 && (completeCat[iii].category & XCAS_ONLY) )
-	continue;
-      const char * name=completeCat[iii].name;
-      while (*name==' ')
-	++name;
-      int j=0;
-      for (;j<l;++j){
-	if (name[j]!=cmdname[j])
-	  break;
-      }
-      if (j==l)
-	break;
-    }
-    const catalogFunc * catf=iii==nfunc?0:completeCat+iii;
-    const char * fhowto=0,* fsyntax=0,* frelated=0,* fexamples=0;
-    string cf="";
-    char fbuf[1024];
-    if (iii==nfunc){
-      if (!has_static_help(cmdname,exec?(lang==0?-2:-lang):lang,fhowto,fsyntax,fexamples,frelated)){
-	if (warn) confirm("Pas d'aide disponible pour",cmdname,true);
-	return "";
-      }
-      cf=frelated;
-      if (!fexamples || fexamples[0]==0){
-	fexamples=frelated;
-	frelated=0;
-      }
-      // cut example at ; if there is one
-      for (int i=0;i<sizeof(fbuf);++i){
-	if (fexamples[i]==0)
-	  break;
-	if (i>0 && fexamples[i]==';' && fexamples[i-1]!=' '){
-	  strcpy(fbuf,fexamples);
-	  fbuf[i]=0;
-	  fexamples=fbuf;
-	  frelated=fbuf+i+1;
-	  while (*frelated==' ')
-	    ++frelated;
-	  for (++i;i<sizeof(fbuf);++i){
-	    if (fbuf[i]==0)
-	      break;
-	    if (fbuf[i]==';'){
-	      fbuf[i]=0;
-	      break;
-	    }
-	  }
-	  break;
-	}
-      }
-    }
-    const char * example=catf?catf->example:fexamples;
-    const char * example2=catf?catf->example2:frelated;
-    if (exec){
-      if (!fsyntax){
-	cmdname=example;
-	example=example2;
-      }
-    }
-    else {
-      xcas::textArea text;
-      text.editable=false;
-      text.clipline=-1;
-      text.title = (char*)((lang==1)?"Aide sur la commande":"Help on command");
-      text.allowF1=true;
-      text.python=false;
-      std::vector<xcas::textElement> & elem=text.elements;
-      elem = std::vector<xcas::textElement> (example2?5:4);
-      elem[0].s = catf?catf->name:cmdname;
-      elem[0].newLine = 0;
-      elem[1].lineSpacing = 0;
-      if (fsyntax){
-	elem[1].newLine = 1;
-	elem[1].s=(lang==1?"Syntaxe: ":"Syntax: ")+elem[0].s+"("+(strlen(fsyntax)?fsyntax:"arg")+")";
-      }
-      else {
-	elem[1].newLine = 0;
-	elem[1].s=elem[0].s;
-      }
-      if (cf.size())
-	elem[0].s += " (cf. "+cf+")";
-      if (elem[0].s.size()<16)
-	elem[0].s=string(16-elem[0].s.size()/2,' ')+elem[0].s;
-      //elem[0].color = COLOR_BLUE;
-      elem[2].newLine = 1;
-      elem[2].lineSpacing = 1;
-      elem[2].minimini=1;
-      std::string autoexample;
-      if (catf && catf->desc==0){
-	// if (token==T_UNARY_OP || token==T_UNARY_OP_38)
-	elem[2].s=elem[0].s+"(args)";
-      }
-      else {
-#ifdef NUMWORKS
-	elem[2].s = remove_accents(catf?catf->desc:fhowto);
-#else
-	elem[2].s = catf?catf->desc:fhowto;
-#endif
-      }
-#ifdef NSPIRE_NEWLIB
-      std::string ex("tab: ");
-#else
-      std::string ex("Ans: ");
-#endif
-      elem[3].newLine = 1;
-      elem[3].lineSpacing = 0;
-      //elem[2].minimini=1;
-      if (example){
-	if (example[0]=='#')
-	  ex += example+1;
-	else {
-	  if (iii==nfunc)
-	    ex += fexamples;
-	  else {
-	    ex += insert_string(iii);
-	    ex += example;
-	    ex += ")";
-	  }
-	}
-	elem[3].s = ex;
-	if (example2){
-#ifdef NSPIRE_NEWLIB
-	  string ex2="ret: ";
-#else
-	  string ex2="EXE: ";
-#endif
-	  if (example2[0]=='#')
-	    ex2 += example2+1;
-	  else {
-	    if (iii==nfunc)
-	      ex2 += example2;
-	    else {
-	      ex2 += insert_string(iii);
-	      ex2 += example2;
-	      ex2 += ")";
-	    }
-	  }
-	  elem[4].newLine = 1;
-	  // elem[3].lineSpacing = 0;
-	  //elem[3].minimini=1;
-	  elem[4].s=ex2;
-	}
-      }
-      else {
-	if (autoexample.size())
-	  elem[3].s=ex+autoexample;
-	else
-	  elem.pop_back();
-      }
-      exec=doTextArea(&text,contextptr);
-    }
-    if (exec==KEY_SHUTDOWN)
-      return "";
-    if (exec==MENU_RETURN_SELECTION){
-      while (*cmdname && *cmdname==*cmdnameorig){
-	++cmdname; ++cmdnameorig;
-      }
-      return cmdname;
-    }
-    if (exec == KEY_CHAR_ANS || exec==KEY_BOOK || exec=='\t' || exec==KEY_CTRL_EXE) {
-      reset_kbd();
-      std::string s;
-      const char * example=0;
-      if (exec==KEY_CHAR_ANS || exec==KEY_BOOK || exec=='\t')
-	example=catf?catf->example:fexamples;
-      else
-	example=catf?catf->example2:frelated;
-      if (example){
-	while (*example && *example==*cmdnameorig){
-	  ++example; ++cmdnameorig;
-	}
-	while (*cmdnameorig){
-	  ++back;
-	  ++cmdnameorig;
-	}
-	if (example[0]=='#')
-	  s=example+1;
-	else {
-	  s += example;
-	  //if (catf && s[s.size()-1]!=')') s += ")";
-	}
-      }
-      if (python_compat(contextptr)<0 || (python_compat(contextptr) & 4)){
-	// replace := by =
-	for (int i=1;i<s.size();++i){
-	  if (s[i]=='=' && s[i-1]==':')
-	    s.erase(s.begin()+i-1);
-	}
-      }
-      return s;
-    }
-    return "";
-  }
-
-#if 0 // def NUMWORKS
-#define MENUITEM_MALLOC
-#endif
-
-  // 0 on exit, 1 on success
-  int doCatalogMenu(char* insertText, const char* title, int category,GIAC_CONTEXT) {
-    const catalogFunc * completeCat=(lang==1)?completeCatfr:completeCaten;
-    for (;;){
-      int allcmds=builtin_lexer_functions_end()-builtin_lexer_functions_begin();
-      int allopts=lexer_tab_int_values_end-lexer_tab_int_values_begin;
-      bool isall=category==CAT_CATEGORY_ALL;
-      bool isopt=category==CAT_CATEGORY_OPTIONS;
-      const int CAT_COMPLETE_COUNT=((lang==1)?CAT_COMPLETE_COUNT_FR:CAT_COMPLETE_COUNT_EN);
-      int nitems = isall? allcmds:(isopt?allopts:CAT_COMPLETE_COUNT);
-#ifdef MENUITEM_MALLOC
-      int memsize=sizeof(MenuItem)*nitems;
-      *logptr(contextptr) << "malloc " << memsize << ' ' << (size_t) &memsize << '\n';
-      MenuItem *menuitems=(MenuItem *) malloc(memsize);
-      if (!menuitems)
-	return 0;
-#else
-      MenuItem menuitems[nitems];
-#endif
-      int cur = 0,curmi = 0,i=0;
-#ifdef MICROPY_LIB
-      if (xcas_python_eval==1)
-	micropy_ck_eval("1");
-#endif
-      gen g;
-      while(cur<nitems) {
-	menuitems[curmi].type = MENUITEM_NORMAL;
-	menuitems[curmi].color = _BLACK;    
-	if (isall || isopt) {
-	  const char * text=isall?(builtin_lexer_functions_begin()+cur)->first:(lexer_tab_int_values_begin+curmi)->keyword;
-#ifdef MICROPY_LIB
-	  if (xcas_python_eval==1 && xcas::find_color(text,contextptr)!=3){
-	    ++cur;
-	    continue;
-	  }
-#endif
-	  menuitems[curmi].text = (char*) text;
-	  menuitems[curmi].isfolder = allcmds; // assumes allcmds>allopts
-	  menuitems[curmi].token=isall?((builtin_lexer_functions_begin()+curmi)->second.subtype+256):((lexer_tab_int_values_begin+curmi)->subtype+(lexer_tab_int_values_begin+curmi)->return_value*256);
-	  // menuitems[curmi].token=isall?find_or_make_symbol(text,g,0,false,contextptr):((lexer_tab_int_values_begin+curmi)->subtype+(lexer_tab_int_values_begin+curmi)->return_value*256);
-	  for (;i<CAT_COMPLETE_COUNT;++i){
-	    const char * catname=completeCat[i].name;
-	    int tmp=strcmp(catname,text);
-	    if (tmp>=0){
-	      size_t st=strlen(text),j=tmp?0:st;
-	      for (;j<st;++j){
-		if (catname[j]!=text[j])
-		  break;
-	      }
-	      if (j==st && (!isalphanum(catname[j]))){
-		menuitems[curmi].isfolder = i;
-		++i;
-	      }
-	      break;
-	    }
-	  }
-	  // compare text with completeCat
-	  ++curmi;
-	}
-	else {
-	  int cat=completeCat[cur].category;
-	  if (
-	      (xcas_python_eval==0 || !(cat & XCAS_ONLY) ) &&
-	      ((cat & 0xff) == category ||
-	       (cat & 0xff00) == (category<<8) ||
-	       (cat & 0xff0000) == (category <<16) )
-	      ){
-	    menuitems[curmi].isfolder = cur; // little hack: store index of the command in the full list in the isfolder property (unused by the menu system in this case)
-	    menuitems[curmi].text = (char *) completeCat[cur].name;
-	    curmi++;
-	  }
-	}
-	cur++;
-      }
-      
-      Menu menu;
-      menu.items=menuitems;
-      menu.numitems=curmi;
-      if (isopt){ menu.selection=5; menu.scroll=4; }
-      if (curmi>=100)
-	lock_alpha(); //SetSetupSetting( (unsigned int)0x14, 0x88);	
-      // DisplayStatusArea();
-      menu.scrollout=1;
-      menu.title = (char *) title;
-      menu.type = MENUTYPE_FKEYS;
-      menu.height = 11;
-      while(1) {
-	drawRectangle(0,200,LCD_WIDTH_PX,22,giac::_WHITE);
-#ifdef NSPIRE_NEWLIB
-	PrintMini(0,200,(category==CAT_CATEGORY_ALL?"menu: help | ret: ex1 | tab: ex2":"menu: help | ret ex1 | tab ex2"),4,33333,giac::_WHITE);
-#else
-	PrintMini(0,200,(category==CAT_CATEGORY_ALL?"Toolbox help | Ans ex1 | EXE  ex2":"Toolbox help | EXE ex1 | Ans ex2"),4,33333,giac::_WHITE);
-#endif
-	int sres = 0;
-	if (curmi==0){
-	  do_confirm(lang==1?"Commandes seulement en mode Xcas":"Commands only in Xcas mode");
-	  sres=MENU_RETURN_EXIT;
-	}
-	else
-	  sres=doMenu(&menu);
-	if (sres==KEY_CTRL_F4 && category!=CAT_CATEGORY_ALL){
-	  break;
-	}
-	if(sres == MENU_RETURN_EXIT){
-	  reset_kbd();
-#ifdef MENUITEM_MALLOC
-	  free(menuitems);
-#endif
-	  return sres;
-	}
-	int index=menuitems[menu.selection-1].isfolder;
-	if(sres == KEY_CTRL_CATALOG || sres==KEY_BOOK) {
-	  const char * example=index<allcmds?completeCat[index].example:0;
-	  const char * example2=index<allcmds?completeCat[index].example2:0;
-	  xcas::textArea text;
-	  text.editable=false;
-	  text.clipline=-1;
-	  text.title = (char*)((lang==1)?"Aide sur la commande":"Help on command");
-	  text.allowF1=true;
-	  text.python=python_compat(contextptr);
-	  std::vector<xcas::textElement> & elem=text.elements;
-	  elem = std::vector<xcas::textElement> (example2?4:3);
-	  elem[0].s = index<allcmds?completeCat[index].name:menuitems[menu.selection-1].text;
-	  if (index<allcmds && (completeCat[index].category & XCAS_ONLY) )
-	    elem[0].s += lang==1?" (Xcas seulement)":" (Xcas only)";
-	  elem[0].newLine = 0;
-	  //elem[0].color = COLOR_BLUE;
-	  elem[1].newLine = 1;
-	  elem[1].lineSpacing = 1;
-	  elem[1].minimini=1;
-	  std::string autoexample;
-	  if (index<allcmds)
-	    elem[1].s = completeCat[index].desc;
-	  else {
-	    int token=menuitems[menu.selection-1].token;
-	    elem[1].s="Desole, pas d'aide disponible...";
-	    const char *fcmdname=menuitems[menu.selection-1].text,* fhowto=0,*fsyntax=0,*fexamples=0,*frelated=0;
-	    if (has_static_help(fcmdname,lang,fhowto,fsyntax,fexamples,frelated)){
-	      elem[1].s=fhowto;
-	      example=fexamples;
-	    }
-	    else {
-	      // *logptr(contextptr) << token << endl;
-	      if (isopt){
-		if (token==_INT_PLOT+T_NUMBER*256){
-		  autoexample="display="+elem[0].s;
-		  elem[1].s ="Option d'affichage: "+ autoexample;
-		}
-		if (token==_INT_COLOR+T_NUMBER*256){
-		  autoexample="display="+elem[0].s;
-		  elem[1].s="Option de couleur: "+ autoexample;
-		}
-		if (token==_INT_SOLVER+T_NUMBER*256){
-		  autoexample=elem[0].s;
-		  elem[1].s="Option de fsolve: " + autoexample;
-		}
-		if (token==_INT_TYPE+T_TYPE_ID*256){
-		  autoexample=elem[0].s;
-		  elem[1].s="Type d'objet: " + autoexample;
-		}
-	      }
-	      if (isall){
-		if (token==T_UNARY_OP || token==T_UNARY_OP_38)
-		  elem[1].s=elem[0].s+"(args)";
-	      }
-	    }
-	  }
-#ifdef NSPIRE_NEWLIB
-	  std::string ex("ret: ");
-#else
-	  std::string ex("EXE: ");
-#endif
-	  elem[2].newLine = 1;
-	  elem[2].lineSpacing = 0;
-	  //elem[2].minimini=1;
-	  if (example){
-	    if (example[0]=='#')
-	      ex += example+1;
-	    else {
-	      if (index<allcmds){
-		ex += insert_string(index);
-		ex += example;
-		ex += ")";
-	      }
-	      else ex+=example;
-	    }
-	    elem[2].s = ex;
-	    if (example2){
-#ifdef NSPIRE_NEWLIB
-	      string ex2="tab: ";
-#else
-	      string ex2="Ans: ";
-#endif
-	      if (example2[0]=='#')
-		ex2 += example2+1;
-	      else {
-		if (index<allcmds){
-		  ex2 += insert_string(index);
-		  ex2 += example2;
-		  ex2 += ")";
-		}
-		else
-		  ex2 += example2;
-	      }
-	      elem[3].newLine = 1;
-	      // elem[3].lineSpacing = 0;
-	      //elem[3].minimini=1;
-	      elem[3].s=ex2;
-	    }
-	  }
-	  else {
-	    if (autoexample.size())
-	      elem[2].s=ex+autoexample;
-	    else
-	      elem.pop_back();
-	  }
-	  sres=doTextArea(&text,contextptr);
-	}
-	if (sres == KEY_CHAR_ANS || sres=='\t' ||sres==KEY_BOOK || sres==KEY_CTRL_EXE) {
-	  reset_kbd();
-	  const char * example=0;
-	  std::string s;
-	  if (index<allcmds ){
-	    s=insert_string(index);
-	    if (sres==KEY_CHAR_ANS || sres=='\t' || sres==KEY_BOOK)
-	      example=completeCat[index].example2;
-	    else
-	      example=completeCat[index].example;
-	  }
-	  else {
-	    const char *fcmdname=menuitems[menu.selection-1].text,* fhowto=0,*fsyntax=0,*fexamples=0,*frelated=0;
-	    if (has_static_help(fcmdname,lang,fhowto,fsyntax,fexamples,frelated)){
-	      example=fexamples;
-	    }
-	  }
-	  if (example){
-	    if (example[0]=='#')
-	      s=example+1;
-	    else {
-	      s += example;
-	      if (s[s.size()-1]!=')')
-		s += ")";
-	    }
-	    strcpy(insertText, s.c_str());
-#ifdef MENUITEM_MALLOC
-	    free(menuitems);
-#endif
-	    return 1;
-	  }
-	  else {
-	    if (isopt){
-	      int token=menuitems[menu.selection-1].token;
-	      if (token==_INT_PLOT+T_NUMBER*256 || token==_INT_COLOR+T_NUMBER*256)
-		strcpy(insertText,"display=");
-	      else
-		*insertText=0;
-	      strcat(insertText,menuitems[menu.selection-1].text);
-#ifdef MENUITEM_MALLOC
-	      free(menuitems);
-#endif
-	      return 1;
-	    }
-	  }
-	  sres=KEY_CTRL_OK;
-	}
-	if(sres == MENU_RETURN_SELECTION || sres == KEY_CTRL_OK) {
-	  reset_kbd();
-	  strcpy(insertText,index<allcmds?insert_string(index).c_str():menuitems[menu.selection-1].text);
-#ifdef MENUITEM_MALLOC
-	  free(menuitems);
-#endif
-	  return 1;
-	}
-      }
-      title="CATALOG";
-      category=0;
-    } // end endless for
-    return 0; // never reached
-  }
-
-  int trialpha(const void *p1,const void * p2){
-    int i=strcmp(* (char * const *) p1, * (char * const *) p2);
-    return i;
-  }
-
-  gen select_var(GIAC_CONTEXT){
-    kbd_interrupted=giac::ctrl_c=giac::interrupted=false;
-#ifdef QUICKJS
-    if (xcas_python_eval<0){
-      update_js_vars();
-      size_t vs=js_vars.size();
-      char s[vs+1];
-      strcpy(s,js_vars.c_str());
-      unsigned n=0,N=0;
-      for (size_t i=0;i<vs;++i){
-	if (s[i]==' ') 
-	  ++N;
-      }
-      const char * tab[N+1];
-      tab[0]=s;
-      for (size_t i=0;i<js_vars.size();++i){
-	if (s[i]==' '){
-	  s[i]=0;
-	  ++i; ++n;
-	  tab[n]=s+i;
-	}
-      }
-      tab[N]=0;
-      qsort(tab,N,sizeof(char *),trialpha);
-      int i=select_item(tab,"VARS",true);
-      gen g=undef;
-      if (i>=0 && tab[i])
-	g=string2gen(tab[i],false);
-      return g;
-    }
-#endif
-#ifdef MICROPY_LIB
-    if (xcas_python_eval==1){
-      micropy_ck_eval("");
-      const char ** tab=(const char **)mp_vars();
-      const char **ptr=tab;
-      for (;*ptr;)
-	++ptr;
-      // del at end should not be sorted
-      if (ptr-tab>=1 && strcmp(*(ptr-1),"del ")==0)
-	--ptr;
-      qsort(tab,ptr-tab,sizeof(char *),trialpha);
-      if (tab){
-	int i=select_item(tab,"VARS",true);
-	gen g=undef;
-	if (i>=0 && tab[i])
-	  g=string2gen(tab[i],false);
-	free(tab);
-	return g;
-      }
-    }
-#endif
-    gen g(_VARS(0,contextptr));
-    if (g.type!=_VECT
-	//|| g._VECTptr->empty()
-	){
-      confirm((lang==1)?"Pas de variables. Exemples pour en creer":"No variables. Examples to create",(lang==1)?"a=1 ou f(x):=sin(x^2)":"a=1 or f(x):=sin(x^2)",true);
-      return undef;
-    }
-    vecteur & v=*g._VECTptr;
-    MenuItem smallmenuitems[v.size()+3];
-    vector<std::string> vs(v.size()+1);
-    int i,total=0;
-    const char typ[]="idzDcpiveSfEsFRmuMwgPF";
-    for (i=0;i<v.size();++i){
-      vs[i]=v[i].print(contextptr);
-      if (v[i].type==giac::_IDNT){
-	giac::gen w;
-	v[i]._IDNTptr->in_eval(0,v[i],w,contextptr,true);
-#if 1
-	vector<int> vi(9);
-	tailles(w,vi);
-	total += vi[8];
-	if (vi[8]<400)
-	  vs[i]+=":="+w.print(contextptr);
-	else {
-	  vs[i] += " ~";
-	  vs[i] += giac::print_INT_(vi[8]);
-	  vs[i] += ',';
-	  vs[i] += typ[w.type];
-	}
-#else
-	if (taille(w,50)<50)
-	  vs[i]+=": "+w.print(contextptr);
-#endif
-      }
-      smallmenuitems[i].text=(char *) vs[i].c_str();
-    }
-    total +=
-      // giac::syms().capacity()*(sizeof(string)+sizeof(giac::gen)+8)+sizeof(giac::sym_string_tab) +
-      giac::turtle_stack().capacity()*sizeof(giac::logo_turtle) +
-      // sizeof(giac::context)+contextptr->tabptr->capacity()*(sizeof(const char *)+sizeof(giac::gen)+8)+
-      bytesize(giac::history_in(contextptr))+bytesize(giac::history_out(contextptr));
-    vs[i]="purge(~"+giac::print_INT_(total)+')';
-    smallmenuitems[i].text=(char *)vs[i].c_str();
-    smallmenuitems[i+1].text=(char *)"assume(";
-    smallmenuitems[i+2].text=(char *)"restart";
-    Menu smallmenu;
-    smallmenu.numitems=v.size()+3; 
-    smallmenu.items=smallmenuitems;
-    smallmenu.height=12;
-    smallmenu.scrollbar=1;
-    smallmenu.scrollout=1;
-    string vars="Variables";
-#if defined NUMWORKS && defined DEVICE
-    vars += ", free >= ";
-    vars += print_INT_(_heap_size-((int)_heap_ptr-(int)_heap_base));
-#endif
-    smallmenu.title = (char*) vars.c_str();
-    //MsgBoxPush(5);
-    int sres = doMenu(&smallmenu);
-    //MsgBoxPop();
-    if (sres==KEY_CTRL_DEL && smallmenu.selection<=v.size())
-      return symbolic(at_purge,v[smallmenu.selection-1]);
-    if (sres!=MENU_RETURN_SELECTION && sres!=KEY_CTRL_EXE)
-      return undef;
-    if (smallmenu.selection==1+v.size())
-      return string2gen("purge(",false);
-    if (smallmenu.selection==2+v.size())
-      return string2gen("assume(",false);
-    if (smallmenu.selection==3+v.size())
-      return string2gen("restart",false);
-    return v[smallmenu.selection-1];
-  }
-  
-  const char * keytostring(int key,int keyflag,bool py,const giac::context * contextptr){
-    const int textsize=512;
-    static char text[textsize];
-    if (key>=0x20 && key<=0x7e){
-      text[0]=key;
-      text[1]=0;
-      return text;
-    }
-    switch (key){
-    case KEY_CHAR_PLUS:
-      return "+";
-    case KEY_CHAR_MINUS:
-      return "-";
-    case KEY_CHAR_PMINUS:
-      return "_";
-    case KEY_CHAR_MULT:
-      return "*";
-    case KEY_CHAR_FRAC:
-      return py?"\\":"solve(";
-    case KEY_CHAR_DIV: 
-      return "/";
-    case KEY_CHAR_POW:
-      return "^";
-    case KEY_CHAR_ROOT:
-      return "sqrt(";
-    case KEY_CHAR_SQUARE:
-      return py?"**2":"^2";
-    case KEY_CHAR_CUBEROOT:
-      return py?"**(1/3)":"^(1/3)";
-    case KEY_CHAR_POWROOT:
-      return py?"**(1/":"^(1/";
-    case KEY_CHAR_RECIP:
-      return py?"**-1":"^-1";
-    case KEY_CHAR_THETA:
-      return "arg(";
-    case KEY_CHAR_VALR:
-      return "abs(";
-    case KEY_CHAR_ANGLE:
-      return "polar_complex(";
-    case KEY_CTRL_XTT:
-      return xthetat?"t":"x";
-    case KEY_CHAR_LN:
-      return "ln(";
-    case KEY_CHAR_LOG:
-      return "log10(";
-    case KEY_CHAR_EXPN10:
-      return "10^";
-    case KEY_CHAR_EXPN:
-      return "exp(";
-    case KEY_CHAR_SIN:
-      return "sin(";
-    case KEY_CHAR_COS:
-      return "cos(";
-    case KEY_CHAR_TAN:
-      return "tan(";
-    case KEY_CHAR_ASIN:
-      return "asin(";
-    case KEY_CHAR_ACOS:
-      return "acos(";
-    case KEY_CHAR_ATAN:
-      return "atan(";
-    case KEY_CTRL_MIXEDFRAC:
-      return "limit(";
-    case KEY_CTRL_FRACCNVRT:
-      return "exact(";
-      // case KEY_CTRL_FORMAT: return "purge(";
-    case KEY_CTRL_FD:
-      return "approx(";
-    case KEY_CHAR_STORE:
-      // if (keyflag==1) return "inf";
-      return "=>";
-    case KEY_CHAR_IMGNRY:
-      return "i";
-    case KEY_CHAR_PI:
-      return "pi";
-    case KEY_CTRL_VARS: {
-      giac::gen var=select_var(contextptr);
-      if (!giac::is_undef(var)){
-	strcpy(text,(var.type==giac::_STRNG?*var._STRNGptr:var.print(contextptr)).c_str());
-	return text;
-      }
-      return "";//"VARS()";
-    }
-    case KEY_CHAR_EXP:
-      return "e";
-    case KEY_CHAR_ANS:
-      return "ans()";
-    case KEY_CHAR_CROCHETS:
-      return "[]";
-    case KEY_CHAR_ACCOLADES:
-      return "{}";
-    case KEY_CTRL_INS:
-      return ":=";
-    case KEY_CHAR_MAT:{
-      const char * ptr=xcas::input_matrix(false,contextptr); if (ptr) return ptr;
-      if (showCatalog(text,17,contextptr)) return text;
-      return "";
-    }
-    case KEY_CHAR_LIST: {
-      const char * ptr=xcas::input_matrix(true,contextptr); if (ptr) return ptr;
-      if (showCatalog(text,16,contextptr)) return text;
-      return "";
-    }
-    case KEY_CTRL_PRGM:
-      // open functions catalog, prgm submenu
-      if(showCatalog(text,18,contextptr))
-	return text;
-      return "";
-    case KEY_CTRL_CATALOG: case KEY_BOOK:
-      if(showCatalog(text,0,contextptr)) 
-	return text;
-      return "";
-    case KEY_CTRL_F4:
-      if(showCatalog(text,0,contextptr)) 
-	return text;
-      return "";
-    case KEY_CTRL_OPTN:
-      if(showCatalog(text,15,contextptr))
-	return text;
-      return "";
-    case KEY_CTRL_QUIT: 
-      if(showCatalog(text,20,contextptr))
-	return text;
-      return "";
-    case KEY_CTRL_PASTE:
-      return paste_clipboard();
-    case KEY_CHAR_DQUATE:
-      return "\"";
-    case KEY_CHAR_FACTOR:
-      return "factor(";
-    case KEY_CHAR_NORMAL:
-      return "normal(";
-    }
-    return 0;
-  }
-  
-  const char * keytostring(int key,int keyflag,GIAC_CONTEXT){
-    return keytostring(key,keyflag,python_compat(contextptr),contextptr);
-  }
-  
-  bool stringtodouble(const string & s1,double & d){
-    gen g(s1,context0);
-    g=evalf(g,1,context0);
-    if (g.type!=_DOUBLE_){
-      confirm("Invalid value",s1.c_str());
-      return false;
-    }
-    d=g._DOUBLE_val;
-    return true;
-  }
-
-  bool inputdouble(const char * msg1,double & d,GIAC_CONTEXT){
-    int di=d;
-    string s1;
-    if (di==d)
-      s1=print_INT_(di);
-    else
-      s1=print_DOUBLE_(d,3);
-    inputline(msg1,((lang==1)?"Nouvelle valeur? ":"New value? "),s1,false,65,contextptr);
-    return stringtodouble(s1,d);
-  }
-  
-  bool inputdouble(const char * msg1,double & d,int ypos,GIAC_CONTEXT){
-    int di=d;
-    string s1;
-    if (di==d)
-      s1=print_INT_(di);
-    else
-      s1=print_DOUBLE_(d,3);
-    inputline(msg1,((lang==1)?"Nouvelle valeur? ":"New value? "),s1,false,ypos,contextptr);
-    return stringtodouble(s1,d);
-  }
-  
-  int inputline(const char * msg1,const char * msg2,string & s,bool numeric,int ypos,GIAC_CONTEXT){
-    //s=msg2;
-    int pos=s.size(),beg=0;
-    for (;;){
-      int X1=print_msg12(msg1,msg2,ypos-30);
-      int textX=X1,textY=ypos;
-      drawRectangle(textX,textY,LCD_WIDTH_PX-textX-4,18,COLOR_WHITE);
-      if (pos-beg>36)
-	beg=pos-12;
-      if (int(s.size())-beg<36)
-	beg=giac::giacmax(0,int(s.size())-36);
-      if (beg>pos)
-	beg=pos;
-      textX=X1;
-#if 0
-      os_draw_string_(textX,textY,(s.substr(beg,pos-beg)+"|"+s.substr(pos,s.size()-pos)).c_str());
-#else
-      textX=os_draw_string_(textX,textY+2,s.substr(beg,pos-beg).c_str());
-      os_draw_string_(textX,textY+2,s.substr(pos,s.size()-pos).c_str());
-      drawRectangle(textX,textY+4,2,13,COLOR_BLACK); // cursor
-      // PrintMini(0,58,"         |        |        |        |  A<>a  |       ",4);
-#endif
-      int key;
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;      
-      // if (!giac::freeze) set_xcas_status();    
-      if (key==KEY_CTRL_EXE || key==KEY_CTRL_OK)
-	return KEY_CTRL_EXE;
-      if (key>=32 && key<128){
-	if (!numeric || key=='-' || (key>='0' && key<='9')){
-	  s.insert(s.begin()+pos,char(key));
-	  ++pos;
-	}
-	continue;
-      }
-      if (key==KEY_CHAR_ACCOLADES || key==KEY_CHAR_CROCHETS){
-	s.insert(s.begin()+pos,key==KEY_CHAR_ACCOLADES?'}':']');
-	s.insert(s.begin()+pos,key==KEY_CHAR_ACCOLADES?'{':'[');
-	++pos;
-	continue;	
-      }
-      if (key==KEY_CTRL_DEL){
-	if (pos){
-	  s.erase(s.begin()+pos-1);
-	  --pos;
-	}
-	continue;
-      }
-      if (key==KEY_CTRL_AC){
-	if (s=="")
-	  return KEY_CTRL_EXIT;
-	s="";
-	pos=0;
-	continue;
-      }
-      if (key==KEY_CTRL_EXIT)
-	return key;
-      if (key==KEY_CTRL_RIGHT){
-	if (pos<s.size())
-	  ++pos;
-	continue;
-      }
-      if (key==KEY_SHIFT_RIGHT){
-	pos=s.size();
-	continue;
-      }
-      if (key==KEY_CTRL_LEFT){
-	if (pos)
-	  --pos;
-	continue;
-      }
-      if (key==KEY_SHIFT_LEFT){
-	pos=0;
-	continue;
-      }
-      if (const char * ans=keytostring(key,0,false,contextptr)){
-	insert(s,pos,ans);
-	pos+=strlen(ans);
-	continue;
-      }
-    }
-  }
-
-  logo_turtle * turtleptr=0;
-  
-  logo_turtle & turtle(){
-    if (!turtleptr)
-      turtleptr=new logo_turtle;
-    return * turtleptr;
-  }
-
-#ifdef NSPIRE_NEWLIB
-  const int MAX_LOGO=8192; 
-#else
-  const int MAX_LOGO=368; // 512?
-#endif
-
-  std::vector<logo_turtle> & turtle_stack(){
-    static std::vector<logo_turtle> * ans = 0;
-    if (!ans){
-      // initialize from python app storage
-      ans=new std::vector<logo_turtle>(1,(*turtleptr));
-     
-    }
-    return *ans;
-  }
-
-  logo_turtle vecteur2turtle(const vecteur & v){
-    int s=int(v.size());
-    if (s>=5 && v[0].type==_DOUBLE_ && v[1].type==_DOUBLE_ && v[2].type==_DOUBLE_ && v[3].type==_INT_ && v[4].type==_INT_ ){
-      logo_turtle t;
-      t.x=v[0]._DOUBLE_val;
-      t.y=v[1]._DOUBLE_val;
-      t.theta=v[2]._DOUBLE_val;
-      int i=v[3].val;
-      t.mark=(i%2)!=0;
-      i=i >> 1;
-      t.visible=(i%2)!=0;
-      i=i >> 1;
-      t.direct = (i%2)!=0;
-      i=i >> 1;
-      t.turtle_width = i & 0xff;
-      i=i >> 8;
-      t.color = i;
-      t.radius = v[4].val;
-      if (s>5 && v[5].type==_INT_)
-	t.s=v[5].val;
-      else
-	t.s=-1;
-      return t;
-    }
-#ifndef NO_STDEXCEPT
-    setsizeerr(gettext("vecteur2turtle")); // FIXME
-#endif
-    return logo_turtle();
-  }
-
-  static int turtle_status(const logo_turtle & turtle){
-    int status= (turtle.color << 11) | ( (turtle.turtle_width & 0xff) << 3) ;
-    if (turtle.direct)
-      status += 4;
-    if (turtle.visible)
-      status += 2;
-    if (turtle.mark)
-      status += 1;
-    return status;
-  }
-
-#if defined NUMWORKS && defined DEVICE
-  bool ck_turtle_size(){
-    vector<logo_turtle> & v=turtle_stack();
-    if (v.size()<v.capacity())
-      return true;
-    int l=2*v.size();
-    if (1024+l*sizeof(logo_turtle)<_heap_size-((int)_heap_ptr-(int)_heap_base))
-      return true;
-    ctrl_c=interrupted=true;
-    return false;
-  }
-
-#else
-  int ck_turtle_size(){
-      return 1;
-  }
-#endif
-
-  bool set_turtle_state(const vecteur & v,GIAC_CONTEXT){
-    if (v.size()>=2 && v[0].type==_DOUBLE_ && v[1].type==_DOUBLE_){
-      vecteur w(v);
-      int s=int(w.size());
-      if (s==2)
-	w.push_back(double((*turtleptr).theta));
-      if (s<4)
-	w.push_back(turtle_status((*turtleptr)));
-      if (s<5)
-	w.push_back(0);
-      if (w[2].type==_DOUBLE_ && w[3].type==_INT_ && w[4].type==_INT_){
-	(*turtleptr)=vecteur2turtle(w);
-	if (!ck_turtle_size())
-	  return false;
-#ifdef TURTLETAB
-	turtle_stack_push_back(*turtleptr);
-#else
-	turtle_stack().push_back((*turtleptr));
-#endif
-	return true;
-      }
-    }
-    return false;
-  }
-
-  gen turtle2gen(const logo_turtle & turtle){
-    return gen(makevecteur(turtle.x,turtle.y,double(turtle.theta),turtle_status(turtle),turtle.radius,turtle.s),_LOGO__VECT);
-  }
-
-  gen turtle_state(GIAC_CONTEXT){
-    return turtle2gen((*turtleptr));
-  }
-
-  static gen update_turtle_state(bool clrstring,GIAC_CONTEXT){
-#if defined NUMWORKS && defined DEVICE
-    if (!ck_turtle_size()){
-      if (ctrl_c || interrupted)
-	return undef;
-      ctrl_c=true; interrupted=true;
-      return gensizeerr("Not enough memory");
-    }
-#else
-#ifdef TURTLETAB
-    if (turtle_stack_size>=MAX_LOGO)
-      return gensizeerr("Not enough memory");
-#else
-    if (turtle_stack().size()>=MAX_LOGO){
-      ctrl_c=true; interrupted=true;
-      return gensizeerr("Not enough memory");
-    }
-#endif
-#endif
-    if (clrstring)
-      (*turtleptr).s=-1;
-    (*turtleptr).theta = (*turtleptr).theta - floor((*turtleptr).theta/360)*360;
-    bool push=true;
-    if (push){
-#ifdef TURTLETAB
-      turtle_stack_push_back((*turtleptr));
-#else
-      if (!turtle_stack().empty()){
-	logo_turtle & t=turtle_stack().back();
-	if (t.equal_except_nomark(*turtleptr)){
-	  t.theta=turtleptr->theta;
-	  t.mark=turtleptr->mark;
-	  t.visible=turtleptr->visible;
-	  t.color=turtleptr->color;
-	  push=false;
-	}
-      }
-      turtle_stack().push_back((*turtleptr));
-#endif
-    }
-    gen res=turtle_state(contextptr);
-#if defined EMCC || defined (EMCC2) // should directly interact with canvas
-    return gen(turtlevect2vecteur(turtle_stack()),_LOGO__VECT);
-#endif
-    return res;
-  }
-
-  int turtle_speed=0;
-  gen _speed(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g._VECTptr->empty())
-      return turtle_speed;
-    if (g.type!=_INT_)
-      return gensizeerr(contextptr);
-    int i=g.val;
-    if (i<0) i=0;
-    if (i>1000) i=1000;
-    turtle_speed=i;
-    return i;
-  }  
-  static const char _speed_s []="speed";
-  static define_unary_function_eval2 (__speed,&_speed,_speed_s,&printastifunction);
-  define_unary_function_ptr5( at_speed ,alias_at_speed,&__speed,0,T_LOGO);
-
-  gen _avance(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    double i;
-    if (g.type!=_INT_){
-      if (g.type==_VECT)
-	i=turtle_length;
-      else {
-	gen g1=evalf_double(g,1,contextptr);
-	if (g1.type==_DOUBLE_)
-	  i=g1._DOUBLE_val;
-	else
-	  return gensizeerr(contextptr);
-      }
-    }
-    else
-      i=g.val;
-    (*turtleptr).x += i * std::cos((*turtleptr).theta*deg2rad_d);
-    (*turtleptr).y += i * std::sin((*turtleptr).theta*deg2rad_d) ;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _avance_s []="avance";
-  static define_unary_function_eval2 (__avance,&_avance,_avance_s,&printastifunction);
-  define_unary_function_ptr5( at_avance ,alias_at_avance,&__avance,0,T_LOGO);
-
-  static const char _forward_s []="forward";
-  static define_unary_function_eval (__forward,&_avance,_forward_s);
-  define_unary_function_ptr5( at_forward ,alias_at_forward,&__forward,0,true);
-
-  gen _recule(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    if (g.type==_VECT)
-      return _avance(-turtle_length,contextptr);
-    return _avance(-g,contextptr);
-  }
-  static const char _recule_s []="recule";
-  static define_unary_function_eval2 (__recule,&_recule,_recule_s,&printastifunction);
-  define_unary_function_ptr5( at_recule ,alias_at_recule,&__recule,0,T_LOGO);
-
-  gen _towards(const gen & g,GIAC_CONTEXT){
-    // logo instruction
-    if (g.type!=_VECT || g._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    gen z=g._VECTptr->front()-(*turtleptr).x+cst_i*(g._VECTptr->back()-(*turtleptr).y);
-    int m=get_mode_set_radian(contextptr);
-    z=arg(z,contextptr);
-    angle_mode(m,contextptr);
-    return 180/M_PI*z;
-  }
-  static const char _towards_s []="towards";
-  static define_unary_function_eval2 (__towards,&_towards,_towards_s,&printastifunction);
-  define_unary_function_ptr5( at_towards ,alias_at_towards,&__towards,0,T_LOGO);
-
-  static const char _backward_s []="backward";
-  static define_unary_function_eval (__backward,&_recule,_backward_s);
-  define_unary_function_ptr5( at_backward ,alias_at_backward,&__backward,0,true);
-
-  gen _position(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    if (g.type!=_VECT)
-      return makevecteur((*turtleptr).x,(*turtleptr).y);
-    // return turtle_state();
-    vecteur v = *g._VECTptr;
-    int s=int(v.size());
-    if (!s)
-      return makevecteur((*turtleptr).x,(*turtleptr).y);
-    v[0]=evalf_double(v[0],1,contextptr);
-    if (s>1)
-      v[1]=evalf_double(v[1],1,contextptr);
-    if (s>2)
-      v[2]=evalf_double(v[2],1,contextptr); 
-    if (set_turtle_state(v,contextptr))
-      return update_turtle_state(true,contextptr);
-    return zero;
-  }
-  static const char _position_s []="position";
-  static define_unary_function_eval2 (__position,&_position,_position_s,&printastifunction);
-  define_unary_function_ptr5( at_position ,alias_at_position,&__position,0,T_LOGO);
-
-  gen _cap(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    gen gg=evalf_double(g,1,contextptr);
-    if (gg.type!=_DOUBLE_)
-      return double((*turtleptr).theta);
-    (*turtleptr).theta=gg._DOUBLE_val;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _cap_s []="cap";
-  static define_unary_function_eval2 (__cap,&_cap,_cap_s,&printastifunction);
-  define_unary_function_ptr5( at_cap ,alias_at_cap,&__cap,0,T_LOGO);
-
-  static const char _heading_s []="heading";
-  static define_unary_function_eval (__heading,&_cap,_heading_s);
-  define_unary_function_ptr5( at_heading ,alias_at_heading,&__heading,0,true);
-
-
-  gen _tourne_droite(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    if (g.type!=_INT_){
-      if (g.type==_VECT)
-	(*turtleptr).theta -= 90;
-      else {
-	gen g1=evalf_double(g,1,contextptr);
-	if (g1.type==_DOUBLE_)
-	  (*turtleptr).theta -= g1._DOUBLE_val;
-	else
-	  return gensizeerr(contextptr);
-      }
-    }
-    else
-      (*turtleptr).theta -= g.val;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _tourne_droite_s []="tourne_droite";
-  static define_unary_function_eval2 (__tourne_droite,&_tourne_droite,_tourne_droite_s,&printastifunction);
-  define_unary_function_ptr5( at_tourne_droite ,alias_at_tourne_droite,&__tourne_droite,0,T_LOGO);
-
-  gen _tourne_gauche(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    if (g.type==_VECT){
-      (*turtleptr).theta += 90;
-      (*turtleptr).radius = 0;
-      return update_turtle_state(true,contextptr);
-    }
-    return _tourne_droite(-g,contextptr);
-  }
-  static const char _tourne_gauche_s []="tourne_gauche";
-  static define_unary_function_eval2 (__tourne_gauche,&_tourne_gauche,_tourne_gauche_s,&printastifunction);
-  define_unary_function_ptr5( at_tourne_gauche ,alias_at_tourne_gauche,&__tourne_gauche,0,T_LOGO);
-
-  gen _leve_crayon(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    (*turtleptr).mark = false;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _leve_crayon_s []="leve_crayon";
-  static define_unary_function_eval2 (__leve_crayon,&_leve_crayon,_leve_crayon_s,&printastifunction);
-  define_unary_function_ptr5( at_leve_crayon ,alias_at_leve_crayon,&__leve_crayon,0,T_LOGO);
-
-  static const char _penup_s []="penup";
-  static define_unary_function_eval (__penup,&_leve_crayon,_penup_s);
-  define_unary_function_ptr5( at_penup ,alias_at_penup,&__penup,0,T_LOGO);
-
-  gen _baisse_crayon(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    (*turtleptr).mark = true;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _baisse_crayon_s []="baisse_crayon";
-  static define_unary_function_eval2 (__baisse_crayon,&_baisse_crayon,_baisse_crayon_s,&printastifunction);
-  define_unary_function_ptr5( at_baisse_crayon ,alias_at_baisse_crayon,&__baisse_crayon,0,T_LOGO);
-
-  static const char _pendown_s []="pendown";
-  static define_unary_function_eval (__pendown,&_baisse_crayon,_pendown_s);
-  define_unary_function_ptr5( at_pendown ,alias_at_pendown,&__pendown,0,T_LOGO);
-
-  vector<string> * ecrisptr=0;
-  vector<string> & ecristab(){
-    if (!ecrisptr)
-      ecrisptr=new vector<string>;
-    return * ecrisptr;
-  }
-  gen _ecris(const gen & g,GIAC_CONTEXT){    
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-#if 0 //def TURTLETAB
-    return gensizeerr("String support does not work with static turtle table");
-#endif
-    // logo instruction
-    (*turtleptr).radius=14;
-    if (g.type==_VECT){ 
-      vecteur & v =*g._VECTptr;
-      int s=int(v.size());
-      if (s==2 && v[1].type==_INT_){
-	(*turtleptr).radius=absint(v[1].val);
-	(*turtleptr).s=ecristab().size();
-	ecristab().push_back(gen2string(v.front()));
-	return update_turtle_state(false,contextptr);
-      }
-      if (s==4 && v[1].type==_INT_ && v[2].type==_INT_ && v[3].type==_INT_){
-	logo_turtle t=(*turtleptr);
-	_leve_crayon(0,contextptr);
-	_position(makevecteur(v[2],v[3]),contextptr);
-	(*turtleptr).radius=absint(v[1].val);
-	(*turtleptr).s=ecristab().size();
-	ecristab().push_back(gen2string(v.front()));
-	update_turtle_state(false,contextptr);
-	(*turtleptr)=t;
-	return update_turtle_state(true,contextptr);
-      }
-    }
-    (*turtleptr).s=ecristab().size();
-    ecristab().push_back(gen2string(g));
-    return update_turtle_state(false,contextptr);
-  }
-  static const char _ecris_s []="ecris";
-  static define_unary_function_eval2 (__ecris,&_ecris,_ecris_s,&printastifunction);
-  define_unary_function_ptr5( at_ecris ,alias_at_ecris,&__ecris,0,T_LOGO);
-
-  gen _signe(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    return _ecris(makevecteur(g,20,10,10),contextptr);
-  }
-  static const char _signe_s []="signe";
-  static define_unary_function_eval2 (__signe,&_signe,_signe_s,&printastifunction);
-  define_unary_function_ptr5( at_signe ,alias_at_signe,&__signe,0,T_LOGO);
-
-  gen _saute(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    _leve_crayon(0,contextptr);
-    _avance(g,contextptr);
-    return _baisse_crayon(0,contextptr);
-  }
-  static const char _saute_s []="saute";
-  static define_unary_function_eval2 (__saute,&_saute,_saute_s,&printastifunction);
-  define_unary_function_ptr5( at_saute ,alias_at_saute,&__saute,0,T_LOGO);
-
-  static const char _jump_s []="jump";
-  static define_unary_function_eval2 (__jump,&_saute,_jump_s,&printastifunction);
-  define_unary_function_ptr5( at_jump ,alias_at_jump,&__jump,0,T_LOGO);
-
-  gen _pas_de_cote(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    _leve_crayon(0,contextptr);
-    _tourne_droite(-90,contextptr);
-    _avance(g,contextptr);
-    _tourne_droite(90,contextptr);
-    return _baisse_crayon(0,contextptr);
-  }
-  static const char _pas_de_cote_s []="pas_de_cote";
-  static define_unary_function_eval2 (__pas_de_cote,&_pas_de_cote,_pas_de_cote_s,&printastifunction);
-  define_unary_function_ptr5( at_pas_de_cote ,alias_at_pas_de_cote,&__pas_de_cote,0,T_LOGO);
-
-  static const char _skip_s []="skip";
-  static define_unary_function_eval2 (__skip,&_pas_de_cote,_skip_s,&printastifunction);
-  define_unary_function_ptr5( at_skip ,alias_at_skip,&__skip,0,T_LOGO);
-
-  gen _cache_tortue(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    (*turtleptr).visible=false;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _cache_tortue_s []="cache_tortue";
-  static define_unary_function_eval2 (__cache_tortue,&_cache_tortue,_cache_tortue_s,&printastifunction);
-  define_unary_function_ptr5( at_cache_tortue ,alias_at_cache_tortue,&__cache_tortue,0,T_LOGO);
-
-  static const char _hideturtle_s []="hideturtle";
-  static define_unary_function_eval (__hideturtle,&_cache_tortue,_hideturtle_s);
-  define_unary_function_ptr5( at_hideturtle ,alias_at_hideturtle,&__hideturtle,0,true);
-
-  gen _montre_tortue(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    (*turtleptr).visible=true;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _montre_tortue_s []="montre_tortue";
-  static define_unary_function_eval2 (__montre_tortue,&_montre_tortue,_montre_tortue_s,&printastifunction);
-  define_unary_function_ptr5( at_montre_tortue ,alias_at_montre_tortue,&__montre_tortue,0,T_LOGO);
-
-  static const char _showturtle_s []="showturtle";
-  static define_unary_function_eval (__showturtle,&_montre_tortue,_showturtle_s);
-  define_unary_function_ptr5( at_showturtle ,alias_at_showturtle,&__showturtle,0,true);
-
-
-  gen _repete(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    // logo instruction
-    vecteur v = *g._VECTptr;
-    v[0]=eval(v[0],contextptr);
-    if (v.front().type!=_INT_)
-      return gentypeerr(contextptr);
-    gen prog=vecteur(v.begin()+1,v.end());
-    int i=absint(v.front().val);
-    gen res;
-    for (int j=0;j<i;++j){
-      res=eval(prog,contextptr);
-    }
-    return res;
-  }
-  static const char _repete_s []="repete";
-  static define_unary_function_eval_quoted (__repete,&_repete,_repete_s);
-  define_unary_function_ptr5( at_repete ,alias_at_repete,&__repete,_QUOTE_ARGUMENTS,T_RETURN);
-
-  gen _crayon(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_STRNG) return _crayon(gen(*g._STRNGptr,contextptr),contextptr);
-    // logo instruction
-    if (g.type==_VECT && g._VECTptr->size()==3)
-      return _crayon(_rgb(g,contextptr),contextptr);
-    if (g.type!=_INT_){
-      gen res=(*turtleptr).color;
-      res.subtype=_INT_COLOR;
-      return res;
-    }
-    if (g.val<0){
-      if (g.val<-64)
-	return (*turtleptr).turtle_width;
-      (*turtleptr).turtle_width=-g.val;
-    }
-    else
-      (*turtleptr).color=g.val;
-    (*turtleptr).radius = 0;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _crayon_s []="crayon";
-  static define_unary_function_eval2 (__crayon,&_crayon,_crayon_s,&printastifunction);
-  define_unary_function_ptr5( at_crayon ,alias_at_crayon,&__crayon,0,T_LOGO);
-
-  static const char _pencolor_s []="pencolor";
-  static define_unary_function_eval (__pencolor,&_crayon,_pencolor_s);
-  define_unary_function_ptr5( at_pencolor ,alias_at_pencolor,&__pencolor,0,T_LOGO);
-
-  gen _efface_logo(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_INT_){
-      _crayon(int(FL_WHITE),contextptr);
-      _recule(g,contextptr);
-      return _crayon(0,contextptr);
-    }
-    // logo instruction
-    (*turtleptr) = logo_turtle();
-#ifdef TURTLETAB
-    turtle_stack_size=0;
-#else
-    turtle_stack().clear();
-#endif
-    ecristab().clear();
-    if (g.type==_VECT && g._VECTptr->size()==2){
-      vecteur v = *g._VECTptr;
-      int s=int(v.size());
-      v[0]=evalf_double(v[0],1,contextptr);
-      if (s>1)
-	v[1]=evalf_double(v[1],1,contextptr);
-      (*turtleptr).mark = false; // leve_crayon
-      (*turtleptr).radius = 0;
-      update_turtle_state(true,contextptr);
-      set_turtle_state(v,contextptr); // baisse_crayon
-      update_turtle_state(true,contextptr);
-      (*turtleptr).mark = true;
-      (*turtleptr).radius = 0;
-    }
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _efface_logo_s []="efface";
-  static define_unary_function_eval2 (__efface_logo,&_efface_logo,_efface_logo_s,&printastifunction);
-  define_unary_function_ptr5( at_efface_logo ,alias_at_efface_logo,&__efface_logo,0,T_LOGO);
-
-  static const char _efface_s []="efface";
-  static define_unary_function_eval2 (__efface,&_efface_logo,_efface_s,&printastifunction);
-  define_unary_function_ptr5( at_efface ,alias_at_efface,&__efface,0,T_LOGO);
-
-  static const char _reset_s []="reset";
-  static define_unary_function_eval2 (__reset,&_efface_logo,_reset_s,&printastifunction);
-  define_unary_function_ptr5( at_reset ,alias_at_reset,&__reset,0,T_LOGO);
-
-  static const char _clearscreen_s []="clearscreen";
-  static define_unary_function_eval2 (__clearscreen,&_efface_logo,_clearscreen_s,&printastifunction);
-  define_unary_function_ptr5( at_clearscreen ,alias_at_clearscreen,&__clearscreen,0,T_LOGO);
-
-  gen _debut_enregistrement(const gen &g,GIAC_CONTEXT){
-    return undef;
-  }
-  static const char _debut_enregistrement_s []="debut_enregistrement";
-  static define_unary_function_eval2 (__debut_enregistrement,&_debut_enregistrement,_debut_enregistrement_s,&printastifunction);
-  define_unary_function_ptr5( at_debut_enregistrement ,alias_at_debut_enregistrement,&__debut_enregistrement,0,T_LOGO);
-
-  static const char _fin_enregistrement_s []="fin_enregistrement";
-  static define_unary_function_eval2 (__fin_enregistrement,&_debut_enregistrement,_fin_enregistrement_s,&printastifunction);
-  define_unary_function_ptr5( at_fin_enregistrement ,alias_at_fin_enregistrement,&__fin_enregistrement,0,T_LOGO);
-
-  static const char _turtle_stack_s []="turtle_stack";
-  static define_unary_function_eval2 (__turtle_stack,&_debut_enregistrement,_turtle_stack_s,&printastifunction);
-  define_unary_function_ptr5( at_turtle_stack ,alias_at_turtle_stack,&__turtle_stack,0,T_LOGO);
-
-  gen _vers(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    if (g.type!=_VECT || g._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    gen x=evalf_double(g._VECTptr->front(),1,contextptr),
-      y=evalf_double(g._VECTptr->back(),1,contextptr);
-    if (x.type!=_DOUBLE_ || y.type!=_DOUBLE_)
-      return gensizeerr(contextptr);
-    double xv=x._DOUBLE_val,yv=y._DOUBLE_val,xt=(*turtleptr).x,yt=(*turtleptr).y;
-    double theta=atan2(yv-yt,xv-xt);
-    return _cap(theta*180/M_PI,contextptr);
-  }
-  static const char _vers_s []="vers";
-  static define_unary_function_eval2 (__vers,&_vers,_vers_s,&printastifunction);
-  define_unary_function_ptr5( at_vers ,alias_at_vers,&__vers,0,T_LOGO);
-
-  static int find_radius(const gen & g,int & r,int & theta2,bool & direct){
-    int radius;
-    direct=true;
-    theta2 = 360 ;
-    // logo instruction
-    if (g.type==_VECT && !g._VECTptr->empty()){
-      vecteur v = *g._VECTptr;
-      bool seg=false;
-      if (v.back()==at_segment){
-	v.pop_back();
-	seg=true;
-      }
-      if (v.size()<2)
-	return RAND_MAX; // setdimerr(contextptr);
-      if (v[0].type==_INT_)
-	r=v[0].val;
-      else {
-	gen v0=evalf_double(v[0],1,context0);
-	if (v0.type==_DOUBLE_)
-	  r=int(v0._DOUBLE_val+0.5);
-	else 
-	  return RAND_MAX; // setsizeerr(contextptr);
-      }
-      if (r<0){
-	r=-r;
-	direct=false;
-      }
-      int theta1;
-      if (v[1].type==_DOUBLE_)
-	theta1=int(v[1]._DOUBLE_val+0.5);
-      else { 
-	if (v[1].type==_INT_)
-	  theta1=v[1].val;
-	else return RAND_MAX; // setsizeerr(contextptr);
-      }
-      while (theta1<0)
-	theta1 += 360;
-      if (v.size()>=3){
-	if (v[2].type==_DOUBLE_)
-	  theta2 = int(v[2]._DOUBLE_val+0.5);
-	else {
-	  if (v[2].type==_INT_)
-	    theta2 = v[2].val;
-	  else return RAND_MAX; // setsizeerr(contextptr);
-	}
-	while (theta2<0)
-	  theta2 += 360;
-	radius = giacmin(r,512) | (giacmin(theta1,360) << 9) | (giacmin(theta2,360) << 18 ) | (seg?(1<<28):0);
-      }
-      else {// angle 1=0
-	theta2 = theta1;
-	if (theta2<0)
-	  theta2 += 360;
-	radius = giacmin(r,512) | (giacmin(theta2,360) << 18 ) | (seg?(1<<28):0);
-      }
-      return radius;
-    }
-    radius = 10;
-    if (g.type==_INT_)
-      radius= (r=g.val);
-    if (g.type==_DOUBLE_)
-      radius= (r=int(g._DOUBLE_val));
-    if (radius<=0){
-      radius = -radius;
-      direct=false;
-    }
-    radius = giacmin(radius,512 )+(360 << 18) ; // 2nd angle = 360 degrees
-    return radius;
-  }
-
-  static void turtle_move(int r,int theta2,GIAC_CONTEXT){
-    double theta0;
-    if ((*turtleptr).direct)
-      theta0=(*turtleptr).theta-90;
-    else {
-      theta0=(*turtleptr).theta+90;
-      theta2=-theta2;
-    }
-    (*turtleptr).x += r*(std::cos(M_PI/180*(theta2+theta0))-std::cos(M_PI/180*theta0));
-    (*turtleptr).y += r*(std::sin(M_PI/180*(theta2+theta0))-std::sin(M_PI/180*theta0));
-    (*turtleptr).theta = (*turtleptr).theta+theta2 ;
-    if ((*turtleptr).theta<0)
-      (*turtleptr).theta += 360;
-    if ((*turtleptr).theta>360)
-      (*turtleptr).theta -= 360;
-  }
-
-  gen _rond(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int r,theta2,tmpr;
-    tmpr=find_radius(g,r,theta2,(*turtleptr).direct);
-    if (tmpr==RAND_MAX)
-      return gensizeerr(contextptr);
-    (*turtleptr).radius=tmpr;
-    turtle_move(r,theta2,contextptr);
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _rond_s []="rond";
-  static define_unary_function_eval2 (__rond,&_rond,_rond_s,&printastifunction);
-  define_unary_function_ptr5( at_rond ,alias_at_rond,&__rond,0,T_LOGO);
-
-  gen _disque(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int r,theta2,tmpr=find_radius(g,r,theta2,(*turtleptr).direct);
-    if (tmpr==RAND_MAX)
-      return gensizeerr(contextptr);
-    (*turtleptr).radius=tmpr;
-    turtle_move(r,theta2,contextptr);
-    (*turtleptr).radius += 1 << 27;
-    return update_turtle_state(true,contextptr);
-  }
-  static const char _disque_s []="disque";
-  static define_unary_function_eval2 (__disque,&_disque,_disque_s,&printastifunction);
-  define_unary_function_ptr5( at_disque ,alias_at_disque,&__disque,0,T_LOGO);
-
-  gen _disque_centre(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int r,theta2;
-    bool direct;
-    int radius=find_radius(g,r,theta2,direct);
-    if (radius==RAND_MAX)
-      return gensizeerr(contextptr);
-    r=absint(r);
-    _saute(r,contextptr);
-    _tourne_gauche(direct?90:-90,contextptr);
-    (*turtleptr).radius = radius;
-    (*turtleptr).direct=direct;
-    turtle_move(r,theta2,contextptr);
-    (*turtleptr).radius += 1 << 27;
-    update_turtle_state(true,contextptr);
-    _tourne_droite(direct?90:-90,contextptr);
-    return _saute(-r,contextptr);
-  }
-  static const char _disque_centre_s []="disque_centre";
-  static define_unary_function_eval2 (__disque_centre,&_disque_centre,_disque_centre_s,&printastifunction);
-  define_unary_function_ptr5( at_disque_centre ,alias_at_disque_centre,&__disque_centre,0,T_LOGO);
-
-  gen _polygone_rempli(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    static int turtle_fill_begin=-1,turtle_fill_color=-1;
-    if (g.type==_VECT && g._VECTptr->size()==3){
-      turtle_fill_color=_rgb(g,contextptr).val;
-      return change_subtype(turtle_fill_color,_INT_COLOR);
-    }
-    if (g.type==_VECT && !g._VECTptr->empty() && g._VECTptr->front().type==_INT_){
-      if (g._VECTptr->front().val>=0)
-	turtle_fill_color= g._VECTptr->front().val;
-      return change_subtype(turtle_fill_color,_INT_COLOR);
-    }
-    if (g.type==_INT_ 
-	//&& g.subtype==_INT_COLOR
-	){
-      if (g.val<-1 && g.val>-1024){
-	(*turtleptr).radius=-absint(g.val);
-	if ((*turtleptr).radius<-1)
-	  return update_turtle_state(true,contextptr);
-      }
-      turtle_fill_color= g.val;
-      return g;
-    }
-    if (g.type!=_VECT && is_zero(g)){ // 0.0
-      turtle_fill_begin=turtle_stack().size();
-      return 1;
-    }
-    if (g.type==_VECT && g._VECTptr->empty()){
-      if (turtle_fill_begin<0){
-	if (g.subtype==0)
-	  turtle_fill_begin=turtle_stack().size();
-	else
-	  return gensizeerr();
-	return 1;
-      }
-      int c=turtleptr->color;
-      if (turtle_fill_color>=0)
-	_crayon(turtle_fill_color,contextptr);
-      int n=turtle_stack().size()- turtle_fill_begin;
-      turtle_fill_begin=-1;
-      turtleptr->radius=-absint(n);
-      gen res=update_turtle_state(true,contextptr);
-      if (turtle_fill_color>=0){
-	turtleptr->radius=0;
-	_crayon(c,contextptr);
-      }
-      return res;
-    }
-    return gensizeerr(gettext("Integer argument >= 2"));
-  }
-  static const char _polygone_rempli_s []="polygone_rempli";
-  static define_unary_function_eval2 (__polygone_rempli,&_polygone_rempli,_polygone_rempli_s,&printastifunction);
-  define_unary_function_ptr5( at_polygone_rempli ,alias_at_polygone_rempli,&__polygone_rempli,0,T_LOGO);
-
-  gen _rectangle_plein(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen gx=g,gy=g;
-    if (g.type==_VECT && g._VECTptr->size()==2){
-      gx=g._VECTptr->front();
-      gy=g._VECTptr->back();
-    }
-    for (int i=0;i<2;++i){
-      _avance(gx,contextptr);
-      _tourne_droite(-90,contextptr);
-      _avance(gy,contextptr);
-      _tourne_droite(-90,contextptr);
-    }
-    //for (int i=0;i<turtle_stack().size();++i){ *logptr(contextptr) << turtle2gen(turtle_stack()[i]) <<endl;}
-    return _polygone_rempli(-8,contextptr);
-  }
-  static const char _rectangle_plein_s []="rectangle_plein";
-  static define_unary_function_eval2 (__rectangle_plein,&_rectangle_plein,_rectangle_plein_s,&printastifunction);
-  define_unary_function_ptr5( at_rectangle_plein ,alias_at_rectangle_plein,&__rectangle_plein,0,T_LOGO);
-
-  gen _triangle_plein(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen gx=g,gy=g,gtheta=60;
-    if (g.type==_VECT && g._VECTptr->size()>=2){
-      vecteur & v=*g._VECTptr;
-      gx=v.front();
-      gy=v[1];
-      gtheta=90;
-      if (v.size()>2)
-	gtheta=v[2];
-    }
-    logo_turtle t=(*turtleptr);
-    _avance(gx,contextptr);
-    double save_x=(*turtleptr).x,save_y=(*turtleptr).y;
-    _recule(gx,contextptr);
-    _tourne_gauche(gtheta,contextptr);
-    _avance(gy,contextptr);
-    (*turtleptr).x=save_x;
-    (*turtleptr).y=save_y;
-    update_turtle_state(true,contextptr);
-    (*turtleptr)=t;
-    (*turtleptr).radius=0;
-    update_turtle_state(true,contextptr);
-    return _polygone_rempli(-3,contextptr);
-  }
-  static const char _triangle_plein_s []="triangle_plein";
-  static define_unary_function_eval2 (__triangle_plein,&_triangle_plein,_triangle_plein_s,&printastifunction);
-  define_unary_function_ptr5( at_triangle_plein ,alias_at_triangle_plein,&__triangle_plein,0,T_LOGO);
-
-  gen _dessine_tortue(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // logo instruction
-    /*
-      _triangle_plein(makevecteur(17,5));
-      _tourne_droite(90);
-      _triangle_plein(makevecteur(5,17));
-      return _tourne_droite(-90);
-    */
-    double save_x=(*turtleptr).x,save_y=(*turtleptr).y;
-    _tourne_droite(90,contextptr);
-    _avance(5,contextptr);
-    _tourne_gauche(106,contextptr);
-    _avance(18,contextptr);
-    _tourne_gauche(148,contextptr);
-    _avance(18,contextptr);
-    _tourne_gauche(106,contextptr);
-    _avance(5,contextptr);
-    (*turtleptr).x=save_x; (*turtleptr).y=save_y;
-    gen res(_tourne_gauche(90,contextptr));
-    if (is_one(g))
-      return res;
-    return _polygone_rempli(-9,contextptr);
-  }
-  static const char _dessine_tortue_s []="dessine_tortue";
-  static define_unary_function_eval2 (__dessine_tortue,&_dessine_tortue,_dessine_tortue_s,&printastifunction);
-  define_unary_function_ptr5( at_dessine_tortue ,alias_at_dessine_tortue,&__dessine_tortue,0,T_LOGO);
-  
-#ifndef NO_NAMESPACE_GIAC
-} // namespace giac
-#endif // ndef NO_NAMESPACE_GIAC
-
-
-#ifndef NO_NAMESPACE_XCAS
-namespace xcas {
-#endif // ndef NO_NAMESPACE_XCAS
-  void drawRectangle(int x,int y,int w,int h,int c){
-    draw_rectangle(x,y,w,h,c,context0);
-  }
-  void draw_rectangle(int x,int y,int w,int h,int c){
-    draw_rectangle(x,y,w,h,c,context0);
-  }
-  void draw_line(int x0,int y0,int x1,int y1,int c){
-    if (x0==x1){
-      if (y0<=y1)
-	draw_rectangle(x0,y0,1,y1-y0+1,c);
-      else
-	draw_rectangle(x0,y1,1,y0-y1+1,c);
-    }
-    else {
-      if (y0==y1){
-	if (x0<=x1)
-	  draw_rectangle(x0,y0,x1-x0+1,1,c);
-	else
-	  draw_rectangle(x1,y0,x0-x1+1,1,c);
-      }
-      else
-	draw_line(x0,y0,x1,y1,c,context0);
-    }
-  }
-  void draw_circle(int xc,int yc,int r,int color,bool q1,bool q2,bool q3,bool q4){
-    draw_circle(xc,yc,r,color,q1,q2,q3,q4,context0);
-  }
-  void draw_filled_circle(int xc,int yc,int r,int color,bool left,bool right){
-    draw_filled_circle(xc,yc,r,color,left,right,context0);
-  }
-  void draw_polygon(std::vector< std::vector<int> > & v1,int color){
-    draw_polygon(v1,color,context0);
-  }
-  void draw_filled_polygon(std::vector< vector<int> > &L,int xmin,int xmax,int ymin,int ymax,int color){
-    draw_filled_polygon(L,xmin,xmax,ymin,ymax,color,context0);
-  }
-  void draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2){
-    draw_arc(xc,yc,rx,ry,color,theta1,theta2,giac::context0);
-  }
-  void draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment){
-    draw_filled_arc(x,y,rx,ry,theta1_deg,theta2_deg,color,xmin,xmax,ymin,ymax,segment,context0);
-  }
-
-
-  unsigned max_prettyprint_equation=256;
-
-  // make a free copy of g
-  gen Equation_copy(const gen & g){
-    if (g.type==_EQW)
-      return *g._EQWptr;
-    if (g.type!=_VECT)
-      return g;
-    vecteur & v = *g._VECTptr;
-    const_iterateur it=v.begin(),itend=v.end();
-    vecteur res;
-    res.reserve(itend-it);
-    for (;it!=itend;++it)
-      res.push_back(Equation_copy(*it));
-    return gen(res,g.subtype);
-  }
-
-  // matrix/list select
-  bool do_select(gen & eql,bool select,gen & value){
-    if (eql.type==_VECT && !eql._VECTptr->empty()){
-      vecteur & v=*eql._VECTptr;
-      size_t s=v.size();
-      if (v[s-1].type!=_EQW)
-	return false;
-      v[s-1]._EQWptr->selected=select;
-      gen sommet=v[s-1]._EQWptr->g;
-      --s;
-      vecteur args(s);
-      for (size_t i=0;i<s;++i){
-	if (!do_select(v[i],select,args[i]))
-	  return false;
-	if (args[i].type==_EQW)
-	  args[i]=args[i]._EQWptr->g;
-      }
-      gen va=s==1?args[0]:gen(args,_SEQ__VECT);
-      if (sommet.type==_FUNC)
-	va=symbolic(*sommet._FUNCptr,va);
-      else
-	va=sommet(va,context0);
-      //cout << "va " << va << endl;
-      value=*v[s]._EQWptr;
-      value._EQWptr->g=va;
-      //cout << "value " << value << endl;
-      return true;
-    }
-    if (eql.type!=_EQW)
-      return false;
-    eql._EQWptr->selected=select;
-    value=eql;
-    return true;
-  }
-  
-  bool Equation_box_sizes(const gen & g,int & l,int & h,int & x,int & y,attributs & attr,bool & selected){
-    if (g.type==_EQW){
-      eqwdata & w=*g._EQWptr;
-      x=w.x;
-      y=w.y;
-      l=w.dx;
-      h=w.dy;
-      selected=w.selected;
-      attr=w.eqw_attributs;
-      //cout << g << endl;
-      return true;
-    }
-    else {
-      if (g.type!=_VECT || g._VECTptr->empty() ){
-	l=0;
-	h=0;
-	x=0;
-	y=0;
-	attr=attributs(0,0,0);
-	selected=false;
-	return true;
-      }
-      gen & g1=g._VECTptr->back();
-      Equation_box_sizes(g1,l,h,x,y,attr,selected);
-      return false;
-    }
-  }
-
-  // return true if g has some selection inside, gsel points to the selection
-  bool Equation_adjust_xy(gen & g,int & xleft,int & ytop,int & xright,int & ybottom,gen * & gsel,gen * & gselparent,int &gselpos,std::vector<int> * goto_ptr){
-    gsel=0;
-    gselparent=0;
-    gselpos=0;
-    int x,y,w,h;
-    attributs f(0,0,0);
-    bool selected;
-    Equation_box_sizes(g,w,h,x,y,f,selected);
-    if ( (g.type==_EQW__VECT) || selected ){ // terminal or selected
-      xleft=x;
-      ybottom=y;
-      if (selected){ // g is selected
-	ytop=y+h;
-	xright=x+w;
-	gsel =  &g;
-	//cout << "adjust " << *gsel << endl;
-	return true;
-      }
-      else { // no selection
-	xright=x;
-	ytop=y;
-	return false;
-      }
-    }
-    if (g.type!=_VECT)
-      return false;
-    // last not selected, recurse
-    iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end()-1;
-    for (;it!=itend;++it){
-      if (Equation_adjust_xy(*it,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,goto_ptr)){
-	if (goto_ptr){
-	  goto_ptr->push_back(it-g._VECTptr->begin());
-	  //cout << g << ":" << *goto_ptr << endl;
-	}
-	if (gsel==&*it){
-	  // check next siblings
-	  
-	  gselparent= &g;
-	  gselpos=it-g._VECTptr->begin();
-	  //cout << "gselparent " << g << endl;
-	}
-	return true;
-      }
-    }
-    return false;
-  }
- 
-  // select or deselect part of the current eqution
-  // This is done *in place*
-  void Equation_select(gen & g,bool select){
-    if (g.type==_EQW){
-      eqwdata & e=*g._EQWptr;
-      e.selected=select;
-    }
-    if (g.type!=_VECT)
-      return;
-    vecteur & v=*g._VECTptr;
-    iterateur it=v.begin(),itend=v.end();
-    for (;it!=itend;++it)
-      Equation_select(*it,select);
-  }
-
-  // decrease selection (like HP49 eqw Down key)
-  int eqw_select_down(gen & g){
-    int xleft,ytop,xright,ybottom,gselpos;
-    int newxleft,newytop,newxright,newybottom;
-    gen * gsel,*gselparent;
-    if (Equation_adjust_xy(g,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos)){
-      //cout << "select down before " << *gsel << endl;
-      if (gsel->type==_VECT && !gsel->_VECTptr->empty()){
-	Equation_select(*gsel,false);
-	Equation_select(gsel->_VECTptr->front(),true);
-	//cout << "select down after " << *gsel << endl;
-	Equation_adjust_xy(g,newxleft,newytop,newxright,newybottom,gsel,gselparent,gselpos);
-	return newytop-ytop;
-      }
-    }
-    return 0;
-  }
-
-  int eqw_select_up(gen & g){
-    int xleft,ytop,xright,ybottom,gselpos;
-    int newxleft,newytop,newxright,newybottom;
-    gen * gsel,*gselparent;
-    if (Equation_adjust_xy(g,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos) && gselparent){
-      Equation_select(*gselparent,true);
-      //cout << "gselparent " << *gselparent << endl;
-      Equation_adjust_xy(g,newxleft,newytop,newxright,newybottom,gsel,gselparent,gselpos);
-      return newytop-ytop;
-    }
-    return false;
-  }
-
-  // exchange==0 move selection to left or right sibling, ==2 add left or right
-  // sibling, ==1 exchange selection with left or right sibling
-  int eqw_select_leftright(Equation & eq,bool left,int exchange,GIAC_CONTEXT){
-    gen & g=eq.data;
-    int xleft,ytop,xright,ybottom,gselpos;
-    int newxleft,newytop,newxright,newybottom;
-    gen * gsel,*gselparent;
-    vector<int> goto_sel;
-    if (Equation_adjust_xy(g,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,&goto_sel) && gselparent && gselparent->type==_VECT){
-      vecteur & gselv=*gselparent->_VECTptr;
-      int n=gselv.size()-1,gselpos_orig=gselpos;
-      if (n<1) return 0;
-      if (left) {
-	if (gselpos==0)
-	  gselpos=n-1;
-	else
-	  gselpos--;
-      }
-      else {
-	if (gselpos==n-1)
-	  gselpos=0;
-	else
-	  gselpos++;
-      }
-      if (exchange==1){ // exchange gselpos_orig and gselpos
-	swapgen(gselv[gselpos],gselv[gselpos_orig]);
-	gsel=&gselv[gselpos_orig];
-	gen value;
-	if (xcas::do_select(*gsel,true,value) && value.type==_EQW)
-	  replace_selection(eq,value._EQWptr->g,gsel,&goto_sel,contextptr);
-      }
-      else {
-	// increase selection to next sibling possible for + and * only
-	if (n>2 && exchange==2 && gselv[n].type==_EQW && (gselv[n]._EQWptr->g==at_plus || gselv[n]._EQWptr->g==at_prod)){
-	  gen value1, value2,tmp;
-	  if (gselpos_orig<gselpos)
-	    swapint(gselpos_orig,gselpos);
-	  // now gselpos<gselpos_orig
-	  xcas::do_select(gselv[gselpos_orig],true,value1);
-	  xcas::do_select(gselv[gselpos],true,value2);
-	  if (value1.type==_EQW && value2.type==_EQW){
-	    tmp=gselv[n]._EQWptr->g==at_plus?value1._EQWptr->g+value2._EQWptr->g:value1._EQWptr->g*value2._EQWptr->g;
-	    gselv.erase(gselv.begin()+gselpos_orig);
-	    replace_selection(eq,tmp,&gselv[gselpos],&goto_sel,contextptr);
-	  }
-	}
-	else {
-	  Equation_select(*gselparent,false);
-	  gen & tmp=(*gselparent->_VECTptr)[gselpos];
-	  Equation_select(tmp,true);
-	}
-      }
-      Equation_adjust_xy(g,newxleft,newytop,newxright,newybottom,gsel,gselparent,gselpos);
-      return newxleft-xleft;
-    }
-    return 0;
-  }
-
-  bool eqw_select(const gen & eq,int l,int c,bool select,gen & value){
-    value=undef;
-    if (l<0 || eq.type!=_VECT || eq._VECTptr->size()<=l)
-      return false;
-    gen & eql=(*eq._VECTptr)[l];
-    if (c<0)
-      return do_select(eql,select,value);
-    if (eql.type!=_VECT || eql._VECTptr->size()<=c)
-      return false;
-    gen & eqlc=(*eql._VECTptr)[c];
-    return do_select(eqlc,select,value);
-  }
-
-  gen Equation_compute_size(const gen & g,const attributs & a,int windowhsize,GIAC_CONTEXT);
-  
-  // void Bdisp_MMPrint(int x, int y, const char* string, int mode_flags, int xlimit, int P6, int P7, int color, int back_color, int writeflag, int P11); 
-  // void PrintCXY(int x, int y, const char *cptr, int mode_flags, int P5, int color, int back_color, int P8, int P9)
-  // void PrintMini( int* x, int* y, const char* string, int mode_flags, unsigned int xlimit, int P6, int P7, int color, int back_color, int writeflag, int P11) 
-  void text_print(int fontsize,const char * s,int x,int y,int c=COLOR_BLACK,int bg=COLOR_WHITE,int mode=0){
-    // *logptr(contextptr) << x << " " << y << " " << fontsize << " " << s << endl; return;
-    c=(unsigned short) c;
-    if (mode==4 && c==COLOR_BLACK && bg==COLOR_WHITE){
-      bg=color_gris;
-      mode=0;
-    }
-    if (x>LCD_WIDTH_PX) return;
-    int ss=strlen(s);
-    if (ss==1 && s[0]==0x1e){ // arrow for limit
-      if (mode==4)
-	c=bg;
-      draw_line(x,y-4,x+fontsize/2,y-4,c);
-      draw_line(x,y-3,x+fontsize/2,y-3,c);
-      draw_line(x+fontsize/2-4,y,x+fontsize/2,y-4,c);
-      draw_line(x+fontsize/2-3,y,x+fontsize/2+1,y-4,c);
-      draw_line(x+fontsize/2-4,y-7,x+fontsize/2,y-3,c);   
-      draw_line(x+fontsize/2-3,y-7,x+fontsize/2+1,y-3,c);   
-      return;
-    }
-    if (ss==2 && strcmp(s,"pi")==0){
-      if (mode==4){
-	drawRectangle(x,y+2-fontsize,fontsize,fontsize,c);
-	c=bg;
-      }
-      draw_line(x+fontsize/3-1,y+1,x+fontsize/3,y+6-fontsize,c);
-      draw_line(x+fontsize/3-2,y+1,x+fontsize/3-1,y+6-fontsize,c);
-      draw_line(x+2*fontsize/3,y+1,x+2*fontsize/3,y+6-fontsize,c);
-      draw_line(x+2*fontsize/3+1,y+1,x+2*fontsize/3+1,y+6-fontsize,c);
-      draw_line(x+2,y+6-fontsize,x+fontsize,y+6-fontsize,c);
-      draw_line(x+2,y+5-fontsize,x+fontsize,y+5-fontsize,c);
-      return;
-    }
-    if (fontsize>=16 && ss==2 && s[0]==char(0xe5) && (s[1]==char(0xea) || s[1]==char(0xeb))) // special handling for increasing and decreasing in tabvar output
-      fontsize=18;
-    if (fontsize>=18){
-      y -= 16;// status area shift
-      os_draw_string(x,y,mode==4?bg:c,mode==4?c:bg,s);
-      // PrintMini(&x,&y,(unsigned char *)s,mode,0xffffffff,0,0,c,bg,1,0);
-      return;
-    }
-    y -= 12;
-    x=os_draw_string_small(x,y,mode==4?bg:c,mode==4?c:bg,s);// PrintMiniMini( &x, &y, (unsigned char *)s, mode,c, 0 );
-    return;
-  }
-  
-  int text_width(int fontsize,const char * s){
-#ifdef NSPIRE_NEWLIB
-    int x=0;
-    if (fontsize>=18)
-      x=os_draw_string(0,0,0,1,s,true);
-    else
-      x=os_draw_string_small(0,0,0,1,s,true);
-    return x;
-#else
-    if (fontsize>=18)
-      return strlen(s)*11;
-    return strlen(s)*7;
-#endif
-  }
-
-  void fl_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int c=COLOR_BLACK){
-    rx/=2;
-    ry/=2;
-    // *logptr(contextptr) << "theta " << theta1_deg << " " << theta2_deg << endl;
-    if (ry==rx){
-      if (theta2_deg-theta1_deg==360){
-	draw_circle(x+rx,y+rx,rx,c);
-	return;
-      }
-      if (theta1_deg==0 && theta2_deg==180){
-	draw_circle(x+rx,y+rx,rx,c,true,true,false,false);
-	return;
-      }
-      if (theta1_deg==180 && theta2_deg==360){
-	draw_circle(x+rx,y+rx,rx,c,false,false,true,true);
-	return;
-      }
-    }
-    // *logptr(contextptr) << "draw_arc" << theta1_deg*M_PI/180. << " " << theta2_deg*M_PI/180. << endl;
-    draw_arc(x+rx,y+ry,rx,ry,c,theta1_deg*M_PI/180.,theta2_deg*M_PI/180.,context0);
-  }
-
-  void fl_pie(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int c=COLOR_BLACK,bool segment=false){
-    //cout << "fl_pie " << theta1_deg << " " << theta2_deg << " " << c << endl;
-    if (!segment && ry==rx){
-      if (theta2_deg-theta1_deg>=360){
-	rx/=2;
-	draw_filled_circle(x+rx,y+rx,rx,c);
-	return;
-      }
-      if (theta1_deg==-90 && theta2_deg==90){
-	rx/=2;
-	draw_filled_circle(x+rx,y+rx,rx,c,false,true);
-	return;
-      }
-      if (theta1_deg==90 && theta2_deg==270){
-	rx/=2;
-	draw_filled_circle(x+rx,y+rx,rx,c,true,false);
-	return;
-      }
-    }
-    // approximation by a filled polygon
-    // points: (x,y), (x+rx*cos(theta)/2,y+ry*sin(theta)/2) theta=theta1..theta2
-    while (theta2_deg<theta1_deg)
-      theta2_deg+=360;
-    if (theta2_deg-theta1_deg>=360){
-      theta1_deg=0;
-      theta2_deg=360;
-    }
-    int N0=theta2_deg-theta1_deg+1;
-    // reduce N if rx or ry is small
-    double red=double(rx)/LCD_WIDTH_PX*double(ry)/LCD_HEIGHT_PX;
-    if (red>1) red=1;
-    if (red<0.1) red=0.1;
-    int N=red*N0;
-    if (N<5)
-      N=N0>5?5:N0;
-    if (N<2)
-      N=2;
-    vector< vector<int> > v(segment?N+1:N+2,vector<int>(2));
-    x += rx/2;
-    y += ry/2;
-    int i=0;
-    if (!segment){
-      v[0][0]=x;
-      v[0][1]=y;
-      ++i;
-    }
-    double theta=theta1_deg*M_PI/180;
-    double thetastep=(theta2_deg-theta1_deg)*M_PI/(180*(N-1));
-    for (;i<v.size()-1;++i){
-      v[i][0]=int(x+rx*std::cos(theta)/2+.5);
-      v[i][1]=int(y-ry*std::sin(theta)/2+.5); // y is inverted
-      theta += thetastep;
-    }
-    v.back()=v.front();
-    draw_filled_polygon(v,0,LCD_WIDTH_PX,24,LCD_HEIGHT_PX,c);
-  }
-
-  bool binary_op(const unary_function_ptr & u){
-    const unary_function_ptr binary_op_tab_ptr []={*at_plus,*at_prod,*at_pow,*at_and,*at_ou,*at_xor,*at_different,*at_same,*at_equal,*at_unit,*at_compose,*at_composepow,*at_deuxpoints,*at_tilocal,*at_pointprod,*at_pointdivision,*at_pointpow,*at_division,*at_normalmod,*at_minus,*at_intersect,*at_union,*at_interval,*at_inferieur_egal,*at_inferieur_strict,*at_superieur_egal,*at_superieur_strict,*at_equal2,0};
-    return equalposcomp(binary_op_tab_ptr,u);
-  }
-  
-  eqwdata Equation_total_size(const gen & g){
-    if (g.type==_EQW)
-      return *g._EQWptr;
-    if (g.type!=_VECT || g._VECTptr->empty())
-      return eqwdata(0,0,0,0,attributs(0,0,0),undef);
-    return Equation_total_size(g._VECTptr->back());
-  }
-
-  // find smallest value of y and height
-  void Equation_y_dy(const gen & g,int & y,int & dy){
-    y=0; dy=0;
-    if (g.type==_EQW){
-      y=g._EQWptr->y;
-      dy=g._EQWptr->dy;
-    }
-    if (g.type==_VECT){
-      iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
-      for (;it!=itend;++it){
-	int Y,dY;
-	Equation_y_dy(*it,Y,dY);
-	// Y, Y+dY and y,y+dy
-	int ymax=giacmax(y+dy,Y+dY);
-	if (Y<y)
-	  y=Y;
-	dy=ymax-y;
-      }
-    }
-  }
-
-  void Equation_translate(gen & g,int deltax,int deltay){
-    if (g.type==_EQW){
-      g._EQWptr->x += deltax;
-      g._EQWptr->y += deltay;
-      g._EQWptr->baseline += deltay;
-      return ;
-    }
-    if (g.type!=_VECT)
-      setsizeerr();
-    vecteur & v=*g._VECTptr;
-    iterateur it=v.begin(),itend=v.end();
-    for (;it!=itend;++it)
-      Equation_translate(*it,deltax,deltay);
-  }
-
-  gen Equation_change_attributs(const gen & g,const attributs & newa){
-    if (g.type==_EQW){
-      gen res(*g._EQWptr);
-      res._EQWptr->eqw_attributs = newa;
-      return res;
-    }
-    if (g.type!=_VECT)
-      return gensizeerr();
-    vecteur v=*g._VECTptr;
-    iterateur it=v.begin(),itend=v.end();
-    for (;it!=itend;++it)
-      *it=Equation_change_attributs(*it,newa);
-    return gen(v,g.subtype);
-  }
-
-  vecteur Equation_subsizes(const gen & arg,const attributs & a,int windowhsize,GIAC_CONTEXT){
-    vecteur v;
-    if ( (arg.type==_VECT) && ( (arg.subtype==_SEQ__VECT) 
-				// || (!ckmatrix(arg)) 
-				) ){
-      const_iterateur it=arg._VECTptr->begin(),itend=arg._VECTptr->end();
-      for (;it!=itend;++it)
-	v.push_back(Equation_compute_size(*it,a,windowhsize,contextptr));
-    }
-    else {
-      v.push_back(Equation_compute_size(arg,a,windowhsize,contextptr));
-    }
-    return v;
-  }
-
-  // vertical merge with same baseline
-  // for vertical merge of hp,yp at top (like ^) add fontsize to yp
-  // at bottom (like lower bound of int) subtract fontsize from yp
-  void Equation_vertical_adjust(int hp,int yp,int & h,int & y){
-    int yf=min(y,yp);
-    h=max(y+h,yp+hp)-yf;
-    y=yf;
-  }
-
-  gen Equation_compute_symb_size(const gen & g,const attributs & a,int windowhsize,GIAC_CONTEXT){
-    if (g.type!=_SYMB)
-      return Equation_compute_size(g,a,windowhsize,contextptr);
-    unary_function_ptr & u=g._SYMBptr->sommet;
-    gen arg=g._SYMBptr->feuille,rootof_value;
-    if (u==at_makevector){
-      vecteur v(1,arg);
-      if (arg.type==_VECT)
-	v=*arg._VECTptr;
-      iterateur it=v.begin(),itend=v.end();
-      for (;it!=itend;++it){
-	if ( (it->type==_SYMB) && (it->_SYMBptr->sommet==at_makevector) )
-	  *it=_makevector(it->_SYMBptr->feuille,contextptr);
-      }
-      return Equation_compute_size(v,a,windowhsize,contextptr);
-    }
-    if (u==at_makesuite){
-      if (arg.type==_VECT)
-	return Equation_compute_size(gen(*arg._VECTptr,_SEQ__VECT),a,windowhsize,contextptr);
-      else
-	return Equation_compute_size(arg,a,windowhsize,contextptr);
-    }
-    if (u==at_sqrt)
-      return Equation_compute_size(symb_pow(arg,plus_one_half),a,windowhsize,contextptr);
-    if (u==at_division){
-      if (arg.type!=_VECT || arg._VECTptr->size()!=2)
-	return Equation_compute_size(arg,a,windowhsize,contextptr);
-      gen tmp=Tfraction<gen>(arg._VECTptr->front(),arg._VECTptr->back());
-      return Equation_compute_size(tmp,a,windowhsize,contextptr);
-    }
-    if (u==at_prod){
-      gen n,d;
-      if (rewrite_prod_inv(arg,n,d)){
-	if (n.is_symb_of_sommet(at_neg))
-	  return Equation_compute_size(symbolic(at_neg,Tfraction<gen>(-n,d)),a,windowhsize,contextptr);
-	return Equation_compute_size(Tfraction<gen>(n,d),a,windowhsize,contextptr);
-      }
-    }
-    if (u==at_inv){
-      if ( (is_integer(arg) && is_positive(-arg,contextptr))
-	   || (arg.is_symb_of_sommet(at_neg)))
-	return Equation_compute_size(symbolic(at_neg,Tfraction<gen>(plus_one,-arg)),a,windowhsize,contextptr);
-      return Equation_compute_size(Tfraction<gen>(plus_one,arg),a,windowhsize,contextptr);
-    }
-    if (u==at_expr && arg.type==_VECT && arg.subtype==_SEQ__VECT && arg._VECTptr->size()==2 && arg._VECTptr->back().type==_INT_){
-      gen varg1=Equation_compute_size(arg._VECTptr->front(),a,windowhsize,contextptr);
-      eqwdata vv(Equation_total_size(varg1));
-      gen varg2=eqwdata(0,0,0,0,a,arg._VECTptr->back());
-      vecteur v12(makevecteur(varg1,varg2));
-      v12.push_back(eqwdata(vv.dx,vv.dy,0,vv.y,a,at_expr,0));
-      return gen(v12,_SEQ__VECT);
-    }
-    int llp=int(text_width(a.fontsize,("(")))-1;
-    int lrp=llp;
-    int lc=int(text_width(a.fontsize,(",")));
-    string us=u.ptr()->s;
-    int ls=int(text_width(a.fontsize,(us.c_str())));
-    // if (isalpha(u.ptr()->s[0])) ls += 1;
-    if (u==at_abs)
-      ls = 2;
-    // special cases first int, sigma, /, ^
-    // and if printed as printsommetasoperator
-    // otherwise print with usual functional notation
-    int x=0;
-    int h=a.fontsize;
-    int y=0;
-#if 1
-    if ((u==at_integrate) || (u==at_sum) ){ // Int
-      int s=1;
-      if (arg.type==_VECT)
-	s=arg._VECTptr->size();
-      else
-	arg=vecteur(1,arg);
-      // s==1 -> general case
-      if ( (s==1) || (s==2) ){ // int f(x) dx and sum f(n) n
-	vecteur v(Equation_subsizes(gen(*arg._VECTptr,_SEQ__VECT),a,windowhsize,contextptr));
-	eqwdata vv(Equation_total_size(v[0]));
-	if (s==1){
-	  x=a.fontsize;
-	  Equation_translate(v[0],x,0);
-	  x += int(text_width(a.fontsize,(" dx")));
-	}
-	if (s==2){
-	  if (u==at_integrate){
-	    x=a.fontsize;
-	    Equation_translate(v[0],x,0);
-	    x += vv.dx+int(text_width(a.fontsize,(" d")));
-	    Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	    vv=Equation_total_size(v[1]);
-	    Equation_translate(v[1],x,0);
-	    Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	  }
-	  else {
-	    Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	    eqwdata v1=Equation_total_size(v[1]);
-	    x=max((int)a.fontsize,(int)v1.dx)+2*a.fontsize/3; // var name size
-	    Equation_translate(v[1],0,-v1.dy-v1.y);
-	    Equation_vertical_adjust(v1.dy,-v1.dy,h,y);
-	    Equation_translate(v[0],x,0);
-	    x += vv.dx; // add function size
-	  }
-	}
-	if (u==at_integrate){
-	  x += vv.dx;
-	  if (h==a.fontsize)
-	    h+=2*a.fontsize/3;
-	  if (y==0){
-	    y=-2*a.fontsize/3;
-	    h+=2*a.fontsize/3;
-	  }
-	}
-	v.push_back(eqwdata(x,h,0,y,a,u,0));
-	return gen(v,_SEQ__VECT);
-      }
-      if (s>=3){ // int _a^b f(x) dx
-	vecteur & intarg=*arg._VECTptr;
-	gen tmp_l,tmp_u,tmp_f,tmp_x;
-	attributs aa(a);
-	if (a.fontsize>=10)
-	  aa.fontsize -= 2;
-	tmp_f=Equation_compute_size(intarg[0],a,windowhsize,contextptr);
-	tmp_x=Equation_compute_size(intarg[1],a,windowhsize,contextptr);
-	tmp_l=Equation_compute_size(intarg[2],aa,windowhsize,contextptr);
-	if (s==4)
-	  tmp_u=Equation_compute_size(intarg[3],aa,windowhsize,contextptr);
-	x=a.fontsize+(u==at_integrate?-2:+4);
-	eqwdata vv(Equation_total_size(tmp_l));
-	Equation_translate(tmp_l,x,-vv.y-vv.dy);
-	vv=Equation_total_size(tmp_l);
-	Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	int lx = vv.dx;
-	if (s==4){
-	  vv=Equation_total_size(tmp_u);
-	  Equation_translate(tmp_u,x,a.fontsize-3-vv.y);
-	  vv=Equation_total_size(tmp_u);
-	  Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	}
-	x += max(lx,(int)vv.dx);
-	Equation_translate(tmp_f,x,0);
-	vv=Equation_total_size(tmp_f);
-	Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	if (u==at_integrate){
-	  x += vv.dx+int(text_width(a.fontsize,(" d")));
-	  Equation_translate(tmp_x,x,0);
-	  vv=Equation_total_size(tmp_x);
-	  Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	  x += vv.dx;
-	}
-	else {
-	  x += vv.dx;
-	  Equation_vertical_adjust(vv.dy,vv.y,h,y);
-	  vv=Equation_total_size(tmp_x);
-	  x=max(x,(int)vv.dx)+a.fontsize/3;
-	  Equation_translate(tmp_x,0,-vv.dy-vv.y);
-	  //Equation_translate(tmp_l,0,-1);	  
-	  if (s==4) Equation_translate(tmp_u,-2,0);	  
-	  Equation_vertical_adjust(vv.dy,-vv.dy,h,y);
-	}
-	vecteur res(makevecteur(tmp_f,tmp_x,tmp_l));
-	if (s==4)
-	  res.push_back(tmp_u);
-	res.push_back(eqwdata(x,h,0,y,a,u,0));
-	return gen(res,_SEQ__VECT);
-      }
-    }
-    if (u==at_limit && arg.type==_VECT){ // limit
-      vecteur limarg=*arg._VECTptr;
-      int s=limarg.size();
-      if (s==2 && limarg[1].is_symb_of_sommet(at_equal)){
-	limarg.push_back(limarg[1]._SYMBptr->feuille[1]);
-	limarg[1]=limarg[1]._SYMBptr->feuille[0];
-	++s;
-      }
-      if (s>=3){
-	gen tmp_l,tmp_f,tmp_x,tmp_dir;
-	attributs aa(a);
-	if (a.fontsize>=10)
-	  aa.fontsize -= 2;
-	tmp_f=Equation_compute_size(limarg[0],a,windowhsize,contextptr);
-	tmp_x=Equation_compute_size(limarg[1],aa,windowhsize,contextptr);
-	tmp_l=Equation_compute_size(limarg[2],aa,windowhsize,contextptr);
-	if (s==4)
-	  tmp_dir=Equation_compute_size(limarg[3],aa,windowhsize,contextptr);
-	eqwdata vf(Equation_total_size(tmp_f));
-	eqwdata vx(Equation_total_size(tmp_x));
-	eqwdata vl(Equation_total_size(tmp_l));
-	eqwdata vdir(Equation_total_size(tmp_dir));
-	int sous=max(vx.dy,vl.dy);
-	if (s==4)
-	  Equation_translate(tmp_f,vx.dx+vl.dx+vdir.dx+a.fontsize+4,0);
-	else
-	  Equation_translate(tmp_f,vx.dx+vl.dx+a.fontsize+2,0);
-	Equation_translate(tmp_x,0,-sous-vl.y);
-	Equation_translate(tmp_l,vx.dx+a.fontsize+2,-sous-vl.y);
-	if (s==4)
-	  Equation_translate(tmp_dir,vx.dx+vl.dx+a.fontsize+4,-sous-vl.y);
-	h=vf.dy;
-	y=vf.y;
-	vl=Equation_total_size(tmp_l);
-	Equation_vertical_adjust(vl.dy,vl.y,h,y);
-	vecteur res(makevecteur(tmp_f,tmp_x,tmp_l));
-	if (s==4){
-	  res.push_back(tmp_dir);
-	  res.push_back(eqwdata(vf.dx+vx.dx+a.fontsize+4+vl.dx+vdir.dx,h,0,y,a,u,0));
-	}
-	else
-	  res.push_back(eqwdata(vf.dx+vx.dx+a.fontsize+2+vl.dx,h,0,y,a,u,0));
-	return gen(res,_SEQ__VECT);
-      }
-    }
-#endif
-    if ( (u==at_of || u==at_at) && arg.type==_VECT && arg._VECTptr->size()==2 ){
-      // user function, function in 1st arg, arguments in 2nd arg
-      gen varg1=Equation_compute_size(arg._VECTptr->front(),a,windowhsize,contextptr);
-      eqwdata vv=Equation_total_size(varg1);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      gen arg2=arg._VECTptr->back();
-      if (u==at_at && xcas_mode(contextptr)!=0){
-	if (arg2.type==_VECT)
-	  arg2=gen(addvecteur(*arg2._VECTptr,vecteur(arg2._VECTptr->size(),plus_one)),_SEQ__VECT);
-	else
-	  arg2=arg2+plus_one; 
-      }
-      gen varg2=Equation_compute_size(arg2,a,windowhsize,contextptr);
-      Equation_translate(varg2,vv.dx+llp,0);
-      vv=Equation_total_size(varg2);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      vecteur res(makevecteur(varg1,varg2));
-      res.push_back(eqwdata(vv.dx+vv.x+lrp,h,0,y,a,u,0));
-      return gen(res,_SEQ__VECT);
-    }
-    if (u==at_pow){ 
-      // first arg not translated
-      gen varg=Equation_compute_size(arg._VECTptr->front(),a,windowhsize,contextptr);
-      eqwdata vv=Equation_total_size(varg);
-      // 1/2 ->sqrt, otherwise as exponent
-      if (arg._VECTptr->back()==plus_one_half){
-	Equation_translate(varg,a.fontsize,0);
-	vecteur res(1,varg);
-	res.push_back(eqwdata(vv.dx+a.fontsize,vv.dy+4,vv.x,vv.y,a,at_sqrt,0));
-	return gen(res,_SEQ__VECT);
-      }
-      bool needpar=vv.g.type==_FUNC || vv.g.is_symb_of_sommet(at_pow) || need_parenthesis(vv.g);
-      if (needpar)
-	x=llp;
-      Equation_translate(varg,x,0);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      vecteur res(1,varg);
-      // 2nd arg translated 
-      if (needpar)
-	x+=vv.dx+lrp;
-      else
-	x+=vv.dx+1;
-      int arg1dy=vv.dy,arg1y=vv.y;
-      if (a.fontsize>=16){
-	attributs aa(a);
-	aa.fontsize -= 2;
-	varg=Equation_compute_size(arg._VECTptr->back(),aa,windowhsize,contextptr);
-      }
-      else
-	varg=Equation_compute_size(arg._VECTptr->back(),a,windowhsize,contextptr);
-      vv=Equation_total_size(varg);
-      Equation_translate(varg,x,arg1y+(3*arg1dy)/4-vv.y);
-      res.push_back(varg);
-      vv=Equation_total_size(varg);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      x += vv.dx;
-      res.push_back(eqwdata(x,h,0,y,a,u,0));
-      return gen(res,_SEQ__VECT);
-    }
-    if (u==at_factorial){
-      vecteur v;
-      gen varg=Equation_compute_size(arg,a,windowhsize,contextptr);
-      eqwdata vv=Equation_total_size(varg);
-      bool paren=need_parenthesis(vv.g) || vv.g==at_prod || vv.g==at_division || vv.g==at_pow;
-      if (paren)
-	x+=llp;
-      Equation_translate(varg,x,0);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      v.push_back(varg);
-      x += vv.dx;
-      if (paren)
-	x+=lrp;
-      varg=eqwdata(x+4,h,0,y,a,u,0);
-      v.push_back(varg);
-      return gen(v,_SEQ__VECT);
-    }
-    if (u==at_sto){ // A:=B, *it -> B
-      gen varg=Equation_compute_size(arg._VECTptr->back(),a,windowhsize,contextptr);
-      eqwdata vv=Equation_total_size(varg);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      Equation_translate(varg,x,0);
-      vecteur v(2);
-      v[1]=varg;
-      x+=vv.dx;
-      x+=ls+3;
-      // first arg not translated
-      varg=Equation_compute_size(arg._VECTptr->front(),a,windowhsize,contextptr);
-      vv=Equation_total_size(varg);
-      if (need_parenthesis(vv.g))
-	x+=llp;
-      Equation_translate(varg,x,0);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      v[0]=varg;
-      x += vv.dx;
-      if (need_parenthesis(vv.g))
-	x+=lrp;
-      v.push_back(eqwdata(x,h,0,y,a,u,0));
-      return gen(v,_SEQ__VECT);
-    }
-    if (u==at_program && arg._VECTptr->back().type!=_VECT && !arg._VECTptr->back().is_symb_of_sommet(at_local) ){
-      gen varg=Equation_compute_size(arg._VECTptr->front(),a,windowhsize,contextptr);
-      eqwdata vv=Equation_total_size(varg);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      Equation_translate(varg,x,0);
-      vecteur v(2);
-      v[0]=varg;
-      x+=vv.dx;
-      x+=int(text_width(a.fontsize,("->")))+3;
-      varg=Equation_compute_size(arg._VECTptr->back(),a,windowhsize,contextptr);
-      vv=Equation_total_size(varg);
-      Equation_translate(varg,x,0);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      v[1]=varg;
-      x += vv.dx;
-      v.push_back(eqwdata(x,h,0,y,a,u,0));
-      return gen(v,_SEQ__VECT);      
-    }
-    bool binaryop= (u.ptr()->printsommet==&printsommetasoperator) || binary_op(u);
-    if ( u!=at_sto && u.ptr()->printsommet!=NULL && !binaryop ){
-      gen tmp=string2gen(g.print(contextptr),false);
-      return Equation_compute_size(symbolic(at_expr,makesequence(tmp,xcas_mode(contextptr))),a,windowhsize,contextptr);
-    }
-    vecteur v;
-    if (!binaryop || arg.type!=_VECT)
-      v=Equation_subsizes(arg,a,windowhsize,contextptr);
-    else
-      v=Equation_subsizes(gen(*arg._VECTptr,_SEQ__VECT),a,windowhsize,contextptr);
-    iterateur it=v.begin(),itend=v.end();
-    if ( it==itend || (itend-it==1) ){ 
-      gen gtmp;
-      if (it==itend)
-	gtmp=Equation_compute_size(gen(vecteur(0),_SEQ__VECT),a,windowhsize,contextptr);
-      else
-	gtmp=*it;
-      // unary op, shift arg position horizontally
-      eqwdata vv=Equation_total_size(gtmp);
-      bool paren = u!=at_neg || (vv.g!=at_prod && need_parenthesis(vv.g)) ;
-      x=ls+(paren?llp:0);
-      gen tmp=gtmp; Equation_translate(tmp,x,0);
-      x=x+vv.dx+(paren?lrp:0);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      return gen(makevecteur(tmp,eqwdata(x,h,0,y,a,u,0)),_EQW__VECT);
-    }
-    if (binaryop){ // op (default with par)
-      int currenth=h,largeur=0;
-      iterateur itprec=v.begin();
-      h=0;
-      if (u==at_plus){ // op without parenthesis
-	if (it->type==_VECT && !it->_VECTptr->empty() && it->_VECTptr->back().type==_EQW && it->_VECTptr->back()._EQWptr->g==at_equal)
-	  ;
-	else {
-	  llp=0;
-	  lrp=0;
-	}
-      }
-      for (;;){
-	eqwdata vv=Equation_total_size(*it);
-	if (need_parenthesis(vv.g))
-	  x+=llp;
-	if (u==at_plus && it!=v.begin() &&
-	    ( 
-	     (it->type==_VECT && it->_VECTptr->back().type==_EQW && it->_VECTptr->back()._EQWptr->g==at_neg) 
-	     || 
-	     ( it->type==_EQW && (is_integer(it->_EQWptr->g) || it->_EQWptr->g.type==_DOUBLE_) && is_strictly_positive(-it->_EQWptr->g,contextptr) ) 
-	      ) 
-	    )
-	  x -= ls;
-#if 0 //
-	if (x>windowhsize-vv.dx && x>windowhsize/2 && (itend-it)*vv.dx>windowhsize/2){
-	  largeur=max(x,largeur);
-	  x=0;
-	  if (need_parenthesis(vv.g))
-	    x+=llp;
-	  h+=currenth;
-	  Equation_translate(*it,x,0);
-	  for (iterateur kt=v.begin();kt!=itprec;++kt)
-	    Equation_translate(*kt,0,currenth);
-	  if (y){
-	    for (iterateur kt=itprec;kt!=it;++kt)
-	      Equation_translate(*kt,0,-y);
-	  }
-	  itprec=it;
-	  currenth=vv.dy;
-	  y=vv.y;
-	}
-	else
-#endif
-	  {
-	    Equation_translate(*it,x,0);
-	    vv=Equation_total_size(*it);
-	    Equation_vertical_adjust(vv.dy,vv.y,currenth,y);
-	  }
-	x+=vv.dx;
-	if (need_parenthesis(vv.g))
-	  x+=lrp;
-	++it;
-	if (it==itend){
-	  for (iterateur kt=v.begin();kt!=itprec;++kt)
-	    Equation_translate(*kt,0,currenth+y);
-	  h+=currenth;
-	  v.push_back(eqwdata(max(x,largeur),h,0,y,a,u,0));
-	  //cout << v << endl;
-	  return gen(v,_SEQ__VECT);
-	}
-	x += ls+3;
-      } 
-    }
-    // normal printing
-    x=ls+llp;
-    for (;;){
-      eqwdata vv=Equation_total_size(*it);
-      Equation_translate(*it,x,0);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      x+=vv.dx;
-      ++it;
-      if (it==itend){
-	x+=lrp;
-	v.push_back(eqwdata(x,h,0,y,a,u,0));
-	return gen(v,_SEQ__VECT);
-      }
-      x+=lc;
-    }
-  }
-
-  // windowhsize is used for g of type HIST__VECT (history) right justify answers
-  // Returns either a eqwdata type object (terminal) or a vector 
-  // (of subtype _EQW__VECT or _HIST__VECT)
-  gen Equation_compute_size(const gen & g,const attributs & a,int windowhsize,GIAC_CONTEXT){
-    /*****************
-     *   FRACTIONS   *
-     *****************/
-    if (g.type==_FRAC){
-      if (is_integer(g._FRACptr->num) && is_positive(-g._FRACptr->num,contextptr))
-	return Equation_compute_size(symbolic(at_neg,fraction(-g._FRACptr->num,g._FRACptr->den)),a,windowhsize,contextptr);
-      gen v1=Equation_compute_size(g._FRACptr->num,a,windowhsize,contextptr);
-      eqwdata vv1=Equation_total_size(v1);
-      gen v2=Equation_compute_size(g._FRACptr->den,a,windowhsize,contextptr);
-      eqwdata vv2=Equation_total_size(v2);
-      // Center the fraction
-      int w1=vv1.dx,w2=vv2.dx;
-      int w=max(w1,w2)+6;
-      vecteur v(3);
-      v[0]=v1; Equation_translate(v[0],(w-w1)/2,11-vv1.y);
-      v[1]=v2; Equation_translate(v[1],(w-w2)/2,5-vv2.dy-vv2.y);
-      v[2]=eqwdata(w,a.fontsize/2+vv1.dy+vv2.dy+1,0,(a.fontsize<=14?4:3)-vv2.dy,a,at_division,0);
-      return gen(v,_SEQ__VECT);
-    }
-    /***************
-     *   VECTORS   *
-     ***************/
-    if ( (g.type==_VECT) && !g._VECTptr->empty() ){
-      vecteur v;
-      const_iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
-      int x=0,y=0,h=a.fontsize; 
-      /***************
-       *   MATRICE   *
-       ***************/
-      bool gmat=ckmatrix(g);
-      vector<int> V; int p=0;
-      if (!gmat && is_mod_vecteur(*g._VECTptr,V,p) && p!=0){
-	gen gm=makemodquoted(unmod(g),p);
-	return Equation_compute_size(gm,a,windowhsize,contextptr);
-      }
-      vector< vector<int> > M; 
-      if (gmat && is_mod_matrice(*g._VECTptr,M,p) && p!=0){
-	gen gm=makemodquoted(unmod(g),p);
-	return Equation_compute_size(gm,a,windowhsize,contextptr);
-      }
-      if (gmat && g.subtype!=_SEQ__VECT && g.subtype!=_SET__VECT && g.subtype!=_POLY1__VECT && g._VECTptr->front().subtype!=_SEQ__VECT){
-	gen mkvect(at_makevector);
-	mkvect.subtype=_SEQ__VECT;
-	gen mkmat(at_makevector);
-	mkmat.subtype=_MATRIX__VECT;
-	int nrows,ncols;
-	mdims(*g._VECTptr,nrows,ncols);
-	if (ncols){
-	  vecteur all_sizes;
-	  all_sizes.reserve(nrows);
-	  vector<int> row_heights(nrows),row_bases(nrows),col_widths(ncols);
-	  // vertical gluing
-	  for (int i=0;it!=itend;++it,++i){
-	    gen tmpg=*it;
-	    tmpg.subtype=_SEQ__VECT;
-	    vecteur tmp(Equation_subsizes(tmpg,a,max(windowhsize/ncols-a.fontsize,230),contextptr));
-	    int h=a.fontsize,y=0;
-	    const_iterateur jt=tmp.begin(),jtend=tmp.end();
-	    for (int j=0;jt!=jtend;++jt,++j){
-	      eqwdata w(Equation_total_size(*jt));
-	      Equation_vertical_adjust(w.dy,w.y,h,y);
-	      col_widths[j]=max(col_widths[j],(int)w.dx);
-	    }
-	    if (i)
-	      row_heights[i]=row_heights[i-1]+h+a.fontsize/2;
-	    else
-	      row_heights[i]=h;
-	    row_bases[i]=y;
-	    all_sizes.push_back(tmp);
-	  }
-	  // accumulate col widths
-	  col_widths.front() +=(3*a.fontsize)/2;
-	  vector<int>::iterator iit=col_widths.begin()+1,iitend=col_widths.end();
-	  for (;iit!=iitend;++iit)
-	    *iit += *(iit-1)+a.fontsize;
-	  // translate each cell
-	  it=all_sizes.begin();
-	  itend=all_sizes.end();
-	  int h,y,prev_h=0;
-	  for (int i=0;it!=itend;++it,++i){
-	    h=row_heights[i];
-	    y=row_bases[i];
-	    iterateur jt=it->_VECTptr->begin(),jtend=it->_VECTptr->end();
-	    for (int j=0;jt!=jtend;++jt,++j){
-	      eqwdata w(Equation_total_size(*jt));
-	      if (j)
-		Equation_translate(*jt,col_widths[j-1]-w.x,-h-y);
-	      else
-		Equation_translate(*jt,-w.x+a.fontsize/2,-h-y);
-	    }
-	    it->_VECTptr->push_back(eqwdata(col_widths.back(),h-prev_h,0,-h,a,mkvect,0));
-	    prev_h=h;
-	  }
-	  all_sizes.push_back(eqwdata(col_widths.back(),row_heights.back(),0,-row_heights.back(),a,mkmat,-row_heights.back()/2));
-	  gen all_sizesg=all_sizes; Equation_translate(all_sizesg,0,row_heights.back()/2); return all_sizesg;
-	}
-      } // end matrices
-      /*************************
-       *   SEQUENCES/VECTORS   *
-       *************************/
-      // horizontal gluing
-      if (g.subtype!=_PRINT__VECT) x += a.fontsize/2;
-      int ncols=itend-it;
-      //ncols=min(ncols,5);
-      for (;it!=itend;++it){
-	gen cur_size=Equation_compute_size(*it,a,
-					   max(windowhsize/ncols-a.fontsize,
-#ifdef IPAQ
-					       200
-#else
-					       480
-#endif
-					       ),contextptr);
-	eqwdata tmp=Equation_total_size(cur_size);
-	Equation_translate(cur_size,x-tmp.x,0); v.push_back(cur_size);
-	x=x+tmp.dx+((g.subtype==_PRINT__VECT)?2:a.fontsize);
-	Equation_vertical_adjust(tmp.dy,tmp.y,h,y);
-      }
-      gen mkvect(at_makevector);
-      if (g.subtype==_SEQ__VECT)
-	mkvect=at_makesuite;
-      else
-	mkvect.subtype=g.subtype;
-      v.push_back(eqwdata(x,h,0,y,a,mkvect,0));
-      return gen(v,_EQW__VECT);
-    } // end sequences
-    if (g.type==_MOD){ 
-      int x=0;
-      int h=a.fontsize;
-      int y=0;
-      int py=python_compat(contextptr);
-      int modsize=int(text_width(a.fontsize,(py?" mod":"%")))+4;
-      bool paren=is_positive(-*g._MODptr,contextptr);
-      int llp=int(text_width(a.fontsize,("(")));
-      int lrp=int(text_width(a.fontsize,(")")));
-      gen varg1=Equation_compute_size(*g._MODptr,a,windowhsize,contextptr);
-      if (paren) Equation_translate(varg1,llp,0);
-      eqwdata vv=Equation_total_size(varg1);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      gen arg2=*(g._MODptr+1);
-      gen varg2=Equation_compute_size(arg2,a,windowhsize,contextptr);
-      if (paren)
-	Equation_translate(varg2,vv.dx+modsize+lrp,0);
-      else
-	Equation_translate(varg2,vv.dx+modsize,0);
-      vv=Equation_total_size(varg2);
-      Equation_vertical_adjust(vv.dy,vv.y,h,y);
-      vecteur res(makevecteur(varg1,varg2));
-      res.push_back(eqwdata(vv.dx+vv.x,h,0,y,a,at_normalmod,0));
-      return gen(res,_SEQ__VECT);
-    }
-    if (g.type!=_SYMB){
-      string s=g.type==_STRNG?*g._STRNGptr:g.print(contextptr);
-      //if (g==cst_pi) s=char(129);
-      if (s.size()>2000)
-	s=s.substr(0,2000)+"...";
-      int i=int(text_width(a.fontsize,(s.c_str())));
-      gen tmp=eqwdata(i,a.fontsize,0,0,a,g);
-      return tmp;
-    }
-    /**********************
-     *  SYMBOLIC HANDLING *
-     **********************/
-    return Equation_compute_symb_size(g,a,windowhsize,contextptr);
-    // return Equation_compute_symb_size(aplatir_fois_plus(g),a,windowhsize,contextptr);
-    // aplatir_fois_plus is a problem for Equation_replace_selection
-    // because it will modify the structure of the data
-  }
-
-  void Equation_draw(const eqwdata & e,int x,int y,int rightx,int lowery,Equation * eq,GIAC_CONTEXT){
-    if ( (e.dx+e.x<x) || (e.x>rightx) || (e.y>y) || e.y+e.dy<lowery)
-      ; // return; // nothing to draw, out of window
-    gen gg=e.g;
-    int fontsize=e.eqw_attributs.fontsize;
-    int text_color=COLOR_BLACK;
-    int background=COLOR_WHITE;
-    string s=gg.type==_STRNG?*gg._STRNGptr:gg.print(contextptr);
-    if (gg.type==_IDNT && !s.empty() && s[0]=='_')
-      s=s.substr(1,s.size()-1);
-    // if (gg==cst_pi){      s="p";      s[0]=(unsigned char)129;    }
-    if (s.size()>2000)
-      s=s.substr(0,2000)+"...";
-    // cerr << s.size() << endl;
-    text_print(fontsize,s.c_str(),eq->x()+e.x-x,eq->y()+y-e.y,text_color,background,e.selected?4:0);
-    return;
-  }
-
-  inline void check_fl_rectf(int x,int y,int w,int h,int imin,int jmin,int di,int dj,int delta_i,int delta_j,int c){
-    drawRectangle(x+delta_i,y+delta_j,w,h,c);
-    //fl_rectf(x+delta_i,y+delta_j,w,h,c);
-  }
-
-  void Equation_draw(const gen & g,int x,int y,int rightx,int lowery,Equation * equat,GIAC_CONTEXT){
-    int eqx=equat->x(),eqy=equat->y();
-    if (g.type==_EQW){ // terminal
-      eqwdata & e=*g._EQWptr;
-      Equation_draw(e,x,y,rightx,lowery,equat,contextptr);
-    }
-    if (g.type!=_VECT)
-      return;
-    vecteur & v=*g._VECTptr;
-    if (v.empty())
-      return;
-    gen tmp=v.back();
-    if (tmp.type!=_EQW){
-      cout << "EQW error:" << v << endl;
-      return;
-    }
-    eqwdata & w=*tmp._EQWptr;
-    if ( (w.dx+w.x-x<0) || (w.x>rightx) || (w.y>y) || (w.y+w.dy<lowery) )
-      ; // return; // nothing to draw, out of window
-    /*******************
-     * draw the vector *
-     *******************/
-    // v is the vector, w the master operator eqwdata
-    gen oper=w.g; 
-    bool selected=w.selected ;
-    int fontsize=w.eqw_attributs.fontsize;
-    int background=w.eqw_attributs.background;
-    int text_color=w.eqw_attributs.text_color;
-    int mode=selected?4:0;
-    int draw_line_color=text_color; // selected?background:text_color;
-    int x0=w.x;
-    int y0=w.y; // lower coordinate of the master vector
-    int y1=y0+w.dy; // upper coordinate of the master vector
-    if (selected)
-      drawRectangle(eqx+w.x-x,eqy+y-w.y-w.dy+1,w.dx,w.dy+1,color_gris); // text_color);
-    // draw arguments of v
-    const_iterateur it=v.begin(),itend=v.end()-1;
-    if (oper==at_expr && v.size()==3){
-      Equation_draw(*it,x,y,rightx,lowery,equat,contextptr);
-      return;
-    }
-    for (;it!=itend;++it)
-      Equation_draw(*it,x,y,rightx,lowery,equat,contextptr);
-    if (oper==at_multistring)
-      return;
-    string s;
-    if (oper.type==_FUNC){
-      // catch here special cases user function, vect/matr, ^, int, sqrt, etc.
-      unary_function_ptr & u=*oper._FUNCptr;
-      if (u==at_at){ // draw brackets around 2nd arg
-	gen arg2=v[1]; // 2nd arg of at_of, i.e. what's inside the parenth.
-	eqwdata varg2=Equation_total_size(arg2);
-	x0=varg2.x;
-	y0=varg2.y;
-	y1=y0+varg2.dy;
-	fontsize=varg2.eqw_attributs.fontsize;
-	if (x0<rightx)
-	  text_print(fontsize,"[",eqx+x0-x-int(text_width(fontsize,("["))),eqy+y-varg2.baseline,text_color,background,mode);
-	x0 += varg2.dx ;
-	if (x0<rightx)
-	  text_print(fontsize,"]",eqx+x0-x,eqy+y-varg2.baseline,text_color,background,mode);
-	return;
-      }
-      if (u==at_of){ // do we need to draw some parenthesis?
-	gen arg2=v[1]; // 2nd arg of at_of, i.e. what's inside the parenth.
-	if (arg2.type!=_VECT || arg2._VECTptr->back().type !=_EQW || arg2._VECTptr->back()._EQWptr->g!=at_makesuite){ // Yes (if not _EQW it's a sequence with parent)
-	  eqwdata varg2=Equation_total_size(arg2);
-	  x0=varg2.x;
-	  y0=varg2.y;
-	  y1=y0+varg2.dy;
-	  fontsize=varg2.eqw_attributs.fontsize;
-	  int pfontsize=max(fontsize,(fontsize+(varg2.baseline-varg2.y))/2);
-	  if (x0<rightx)
-	    text_print(pfontsize,"(",eqx+x0-x-int(text_width(fontsize,("("))),eqy+y-varg2.baseline,text_color,background,mode);
-	  x0 += varg2.dx ;
-	  if (x0<rightx)
-	    text_print(pfontsize,")",eqx+x0-x,eqy+y-varg2.baseline,text_color,background,mode);
-	}
-	return;
-      }
-      if (u==at_makesuite){
-	bool paren=v.size()!=2; // Sequences with 1 arg don't show parenthesis
-	int pfontsize=max(fontsize,(fontsize+(w.baseline-w.y))/2);
-	if (paren && x0<rightx)
-	  text_print(pfontsize,"(",eqx+x0-x-int(text_width(fontsize,("(")))/2,eqy+y-w.baseline,text_color,background,mode);
-	x0 += w.dx;
-	if (paren && x0<rightx)
-	  text_print(pfontsize,")",eqx+x0-x-int(text_width(fontsize,("(")))/2,eqy+y-w.baseline,text_color,background,mode);
-	// print commas between args
-	it=v.begin(),itend=v.end()-2;
-	for (;it!=itend;++it){
-	  eqwdata varg2=Equation_total_size(*it);
-	  fontsize=varg2.eqw_attributs.fontsize;
-	  if (varg2.x+varg2.dx<rightx)
-	    text_print(fontsize,",",eqx+varg2.x+varg2.dx-x+1,eqy+y-varg2.baseline,text_color,background,mode);
-	}
-	return;
-      }
-      if (u==at_makevector){ // draw [] delimiters for vector/matrices
-	if (oper.subtype!=_SEQ__VECT && oper.subtype!=_PRINT__VECT){
-	  int decal=1;
-	  switch (oper.subtype){
-	  case _MATRIX__VECT: decal=2; break;
-	  case _SET__VECT: decal=4; break;
-	  case _POLY1__VECT: decal=6; break;
-	  }
-	  if (eqx+x0-x+1>=0){
-	    draw_line(eqx+x0-x+1,eqy+y-y0+1,eqx+x0-x+1,eqy+y-y1+1,draw_line_color);
-	    draw_line(eqx+x0-x+decal,eqy+y-y0+1,eqx+x0-x+decal,eqy+y-y1+1,draw_line_color);
-	    draw_line(eqx+x0-x+1,eqy+y-y0+1,eqx+x0-x+fontsize/4,eqy+y-y0+1,draw_line_color);
-	    draw_line(eqx+x0-x+1,eqy+y-y1+1,eqx+x0-x+fontsize/4,eqy+y-y1+1,draw_line_color);
-	  }
-	  x0 += w.dx ;
-	  if (eqx+x0-x-1<LCD_WIDTH_PX){
-	    draw_line(eqx+x0-x-1,eqy+y-y0+1,eqx+x0-x-1,eqy+y-y1+1,draw_line_color);
-	    draw_line(eqx+x0-x-decal,eqy+y-y0+1,eqx+x0-x-decal,eqy+y-y1+1,draw_line_color);
-	    draw_line(eqx+x0-x-1,eqy+y-y0+1,eqx+x0-x-fontsize/4,eqy+y-y0+1,draw_line_color);
-	    draw_line(eqx+x0-x-1,eqy+y-y1+1,eqx+x0-x-fontsize/4,eqy+y-y1+1,draw_line_color);
-	  }
-	} // end if oper.subtype!=SEQ__VECT
-	if (oper.subtype!=_MATRIX__VECT && oper.subtype!=_PRINT__VECT){
-	  // print commas between args
-	  it=v.begin(),itend=v.end()-2;
-	  for (;it!=itend;++it){
-	    eqwdata varg2=Equation_total_size(*it);
-	    fontsize=varg2.eqw_attributs.fontsize;
-	    if (varg2.x+varg2.dx<rightx)
-	      text_print(fontsize,",",eqx+varg2.x+varg2.dx-x+1,eqy+y-varg2.baseline,text_color,background,mode);
-	  }
-	}
-	return;
-      }
-      int lpsize=int(text_width(fontsize,("(")));
-      int rpsize=int(text_width(fontsize,(")")));
-      eqwdata tmp=Equation_total_size(v.front()); // tmp= 1st arg eqwdata
-      if (u==at_sto)
-	tmp=Equation_total_size(v[1]);
-      x0=w.x-x;
-      y0=y-w.baseline;
-      if (u==at_pow){
-	if (!need_parenthesis(tmp.g)&& tmp.g!=at_pow && tmp.g!=at_prod && tmp.g!=at_division)
-	  return;
-	if (tmp.g==at_pow){
-	  fontsize=tmp.eqw_attributs.fontsize+2;
-	}
-	if (tmp.x-lpsize<rightx)
-	  text_print(fontsize,"(",eqx+tmp.x-x-lpsize,eqy+y-tmp.baseline,text_color,background,mode);
-	if (tmp.x+tmp.dx<rightx)
-	  text_print(fontsize,")",eqx+tmp.x+tmp.dx-x,eqy+y-tmp.baseline,text_color,background,mode);
-	return;
-      }
-      if (u==at_program){
-	if (tmp.x+tmp.dx<rightx)
-	  text_print(fontsize,"->",eqx+tmp.x+tmp.dx-x,eqy+y-tmp.baseline,text_color,background,mode);
-	return;
-      }
-#if 1
-      if (u==at_sum){
-	if (x0<rightx){
-	  draw_line(eqx+x0,eqy+y0,eqx+x0+(2*fontsize)/3,eqy+y0,draw_line_color);
-	  draw_line(eqx+x0,eqy+y0-fontsize,eqx+x0+(2*fontsize)/3,eqy+y0-fontsize,draw_line_color);
-	  draw_line(eqx+x0,eqy+y0,eqx+x0+fontsize/2,eqy+y0-fontsize/2,draw_line_color);
-	  draw_line(eqx+x0+fontsize/2,eqy+y0-fontsize/2,eqx+x0,eqy+y0-fontsize,draw_line_color);
-	  if (v.size()>2){ // draw the =
-	    eqwdata ptmp=Equation_total_size(v[1]);
-	    if (ptmp.x+ptmp.dx<rightx)
-	      text_print(fontsize,"=",eqx+ptmp.x+ptmp.dx-x-2,eqy+y-ptmp.baseline,text_color,background,mode);
-	  }
-	}
-	return;
-      }
-#endif
-      if (u==at_abs){
-	y0 =1+y-w.y;
-	int h=w.dy;
-	if (x0<rightx){
-	  draw_line(eqx+x0+2,eqy+y0-1,eqx+x0+2,eqy+y0-h+3,draw_line_color);
-	  draw_line(eqx+x0+1,eqy+y0-1,eqx+x0+1,eqy+y0-h+3,draw_line_color);
-	  draw_line(eqx+x0+w.dx-1,eqy+y0-1,eqx+x0+w.dx-1,eqy+y0-h+3,draw_line_color);
-	  draw_line(eqx+x0+w.dx,eqy+y0-1,eqx+x0+w.dx,eqy+y0-h+3,draw_line_color);
-	}
-	return;
-      }
-      if (u==at_sqrt){
-	y0 =1+y-w.y;
-	int h=w.dy;
-	if (x0<rightx){
-	  draw_line(eqx+x0+2,eqy+y0-h/2,eqx+x0+fontsize/2,eqy+y0-1,draw_line_color);
-	  draw_line(eqx+x0+fontsize/2,eqy+y0-1,eqx+x0+fontsize,eqy+y0-h+3,draw_line_color);
-	  draw_line(eqx+x0+fontsize,eqy+y0-h+3,eqx+x0+w.dx-1,eqy+y0-h+3,draw_line_color);
-	  ++y0;
-	  draw_line(eqx+x0+2,eqy+y0-h/2,eqx+x0+fontsize/2,eqy+y0-1,draw_line_color);
-	  draw_line(eqx+x0+fontsize/2,eqy+y0-1,eqx+x0+fontsize,eqy+y0-h+3,draw_line_color);
-	  draw_line(eqx+x0+fontsize,eqy+y0-h+3,eqx+x0+w.dx-1,eqy+y0-h+3,draw_line_color);
-	}
-	return;
-      }
-      if (u==at_factorial){
-	text_print(fontsize,"!",eqx+w.x+w.dx-4-x,eqy+y-w.baseline,text_color,background,mode);
-	if (!need_parenthesis(tmp.g)
-	    && tmp.g!=at_pow && tmp.g!=at_prod && tmp.g!=at_division
-	    )
-	  return;
-	if (tmp.x-lpsize<rightx)
-	  text_print(fontsize,"(",eqx+tmp.x-x-lpsize,eqy+y-tmp.baseline,text_color,background,mode);
-	if (tmp.x+tmp.dx<rightx)
-	  text_print(fontsize,")",eqx+tmp.x+tmp.dx-x,eqy+y-tmp.baseline,text_color,background,mode);
-	return;
-      }
-#if 1
-      if (u==at_integrate){
-	x0+=2;
-	y0+=fontsize/2;
-	if (x0<rightx){
-	  fl_arc(eqx+x0,eqy+y0,fontsize/3,fontsize/3,180,360,draw_line_color);
-	  draw_line(eqx+x0+fontsize/3,eqy+y0,eqx+x0+fontsize/3,eqy+y0-2*fontsize+4,draw_line_color);
-	  fl_arc(eqx+x0+fontsize/3,eqy+y0-2*fontsize+3,fontsize/3,fontsize/3,0,180,draw_line_color);
-	}
-	if (v.size()!=2){ // if arg has size > 1 draw the d
-	  eqwdata ptmp=Equation_total_size(v[1]);
-	  if (ptmp.x<rightx)
-	    text_print(fontsize," d",eqx+ptmp.x-x-int(text_width(fontsize,(" d"))),eqy+y-ptmp.baseline,text_color,background,mode);
-	}
-	else {
-	  eqwdata ptmp=Equation_total_size(v[0]);
-	  if (ptmp.x+ptmp.dx<rightx)
-	    text_print(fontsize," dx",eqx+ptmp.x+ptmp.dx-x,eqy+y-ptmp.baseline,text_color,background,mode);
-	}
-	return;
-      }
-#endif
-      if (u==at_division){
-	if (x0<rightx){
-	  int yy=eqy+y0-8;
-	  draw_line(eqx+x0+2,yy,eqx+x0+w.dx-2,yy,draw_line_color);
-	  ++yy;
-	  draw_line(eqx+x0+2,yy,eqx+x0+w.dx-2,yy,draw_line_color);
-	}
-	return;
-      }
-#if 1
-      if (u==at_limit && v.size()>=4){
-	if (x0<rightx)
-	  text_print(fontsize,"lim",eqx+w.x-x,eqy+y-w.baseline,text_color,background,mode);
-	gen arg2=v[1]; // 2nd arg of limit, i.e. the variable
-	if (arg2.type==_EQW){ 
-	  eqwdata & varg2=*arg2._EQWptr;
-	  if (varg2.x+varg2.dx+2<rightx)
-	    text_print(fontsize,"\x1e",eqx+varg2.x+varg2.dx+2-x,eqy+y-varg2.y,text_color,background,mode);
-	}
-	if (v.size()>=5){
-	  arg2=v[2]; // 3rd arg of lim, the point, draw a comma after if dir.
-	  if (arg2.type==_EQW){ 
-	    eqwdata & varg2=*arg2._EQWptr;
-	    if (varg2.x+varg2.dx<rightx)
-	      text_print(fontsize,",",eqx+varg2.x+varg2.dx-x,eqy+y-varg2.baseline,text_color,background,mode);
-	  }
-	}
-	return;
-      } // limit
-#endif
-      bool parenthesis=true;
-      string opstring(",");
-      if (u.ptr()->printsommet==&printsommetasoperator || binary_op(u) ){
-	if (u==at_normalmod && python_compat(contextptr))
-	  opstring=" mod";
-	else
-	  opstring=u.ptr()->s;
-      }
-      else {
-	if (u==at_sto)
-	  opstring=":=";
-	parenthesis=false;
-      }
-      // int yy=y0; // y0 is the lower coordinate of the whole eqwdata
-      // int opsize=int(text_width(fontsize,(opstring.c_str())))+3;
-      it=v.begin();
-      itend=v.end()-1;
-      // Reminder: here tmp is the 1st arg eqwdata, w the whole eqwdata
-      if ( (itend-it==1) && ( (u==at_neg) 
-			      || (u==at_plus) // uncommented for +infinity
-			      ) ){ 
-	if ( (u==at_neg &&need_parenthesis(tmp.g) && tmp.g!=at_prod)){
-	  if (tmp.x-lpsize<rightx)
-	    text_print(fontsize,"(",eqx+tmp.x-x-lpsize,eqy+y-tmp.baseline,text_color,background,mode);
-	  if (tmp.x+tmp.dx<rightx)
-	    text_print(fontsize,")",eqx+tmp.x-x+tmp.dx,eqy+y-tmp.baseline,text_color,background,mode);
-	}
-	if (w.x<rightx){
-	  text_print(fontsize,u.ptr()->s,eqx+w.x-x,eqy+y-w.baseline,text_color,background,mode);
-	}
-	return;
-      }
-      // write first open parenthesis
-      if (u==at_plus && tmp.g!=at_equal)
-	parenthesis=false;
-      else {
-	if (parenthesis && need_parenthesis(tmp.g)){
-	  if (w.x<rightx){
-	    int pfontsize=max(fontsize,(fontsize+(tmp.baseline-tmp.y))/2);
-	    text_print(pfontsize,"(",eqx+w.x-x,eqy+y-tmp.baseline,text_color,background,mode);
-	  }
-	}
-      }
-      for (;;){
-	// write close parenthesis at end
-	int xx=tmp.dx+tmp.x-x;
-	if (parenthesis && need_parenthesis(tmp.g)){
-	  if (xx<rightx){
-	    int pfontsize=min(max(fontsize,(fontsize+(tmp.baseline-tmp.y))/2),fontsize*2);
-	    int deltapary=(2*(pfontsize-fontsize))/3;
-	    text_print(pfontsize,")",eqx+xx,eqy+y-tmp.baseline+deltapary,text_color,background,mode);
-	  }
-	  xx +=rpsize;
-	}
-	++it;
-	if (it==itend){
-	  if (u.ptr()->printsommet==&printsommetasoperator || u==at_sto || binary_op(u))
-	    return;
-	  else
-	    break;
-	}
-	// write operator
-	if (u==at_prod){
-	  // text_print(fontsize,".",eqx+xx+3,eqy+y-tmp.baseline-fontsize/3);
-	  text_print(fontsize,opstring.c_str(),eqx+xx+1,eqy+y-tmp.baseline,text_color,background,mode);
-	}
-	else {
-	  gen tmpgen;
-	  if (u==at_plus && ( 
-			     (it->type==_VECT && it->_VECTptr->back().type==_EQW && it->_VECTptr->back()._EQWptr->g==at_neg) 
-			     || 
-			     ( it->type==_EQW && (is_integer(it->_EQWptr->g) || it->_EQWptr->g.type==_DOUBLE_) && is_strictly_positive(-it->_EQWptr->g,contextptr) ) 
-			      )
-	      )
-	    ;
-	  else {
-	    if (xx+1<rightx)
-	      // fl_draw(opstring.c_str(),xx+1,y-tmp.y-tmp.dy/2+fontsize/2);
-	      text_print(fontsize,opstring.c_str(),eqx+xx+1,eqy+y-tmp.baseline,text_color,background,mode);
-	  }
-	}
-	// write right parent, update tmp
-	tmp=Equation_total_size(*it);
-	if (parenthesis && (need_parenthesis(tmp.g)) ){
-	  if (tmp.x-lpsize<rightx){
-	    int pfontsize=min(max(fontsize,(fontsize+(tmp.baseline-tmp.y))/2),fontsize*2);
-	    int deltapary=(2*(pfontsize-fontsize))/3;
-	    text_print(pfontsize,"(",eqx+tmp.x-pfontsize*lpsize/fontsize-x,eqy+y-tmp.baseline+deltapary,text_color,background,mode);
-	  }
-	}
-      } // end for (;;)
-      if (w.x<rightx){
-	s = u.ptr()->s;
-	s += '(';
-	text_print(fontsize,s.c_str(),eqx+w.x-x,eqy+y-w.baseline,text_color,background,mode);
-      }
-      if (w.x+w.dx-rpsize<rightx)
-	text_print(fontsize,")",eqx+w.x+w.dx-x-rpsize+2,eqy+y-w.baseline,text_color,background,mode);
-      return;
-    }
-    s=oper.print(contextptr);
-    if (w.x<rightx){
-      text_print(fontsize,s.c_str(),eqx+w.x-x,eqy+y-w.baseline,text_color,background,mode);
-    }
-  }
-
-  Equation::Equation(int x_, int y_, const gen & g,const giac::context * cptr){
-    _x=x_;
-    _y=y_;
-    attr=attributs(18,COLOR_WHITE,COLOR_BLACK);
-    contextptr=cptr;
-    if (taille(g,max_prettyprint_equation)<max_prettyprint_equation)
-      data=Equation_compute_size(g,attr,LCD_WIDTH_PX,contextptr);
-    else
-      data=Equation_compute_size(string2gen("Object_too_large",false),attr,LCD_WIDTH_PX,contextptr);
-    undodata=Equation_copy(data);
-  }
-
-  void replace_selection(Equation & eq,const gen & tmp,gen * gsel,const vector<int> * gotoptr,GIAC_CONTEXT){
-    int xleft,ytop,xright,ybottom,gselpos; gen *gselparent;
-    vector<int> goto_sel;
-    eq.undodata=Equation_copy(eq.data);
-    if (gotoptr==0){
-      if (xcas::Equation_adjust_xy(eq.data,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,&goto_sel) && gsel)
-	gotoptr=&goto_sel;
-      else
-	return;
-    }
-    *gsel=xcas::Equation_compute_size(tmp,eq.attr,LCD_WIDTH_PX,contextptr);
-    gen value;
-    xcas::do_select(eq.data,true,value);
-    if (value.type==_EQW)
-      eq.data=xcas::Equation_compute_size(value._EQWptr->g,eq.attr,LCD_WIDTH_PX,contextptr);
-    //cout << "new value " << value << " " << eq.data << " " << *gotoptr << endl;
-    xcas::Equation_select(eq.data,false);
-    gen * gptr=&eq.data;
-    for (int i=gotoptr->size()-1;i>=0;--i){
-      int pos=(*gotoptr)[i];
-      if (gptr->type==_VECT &&gptr->_VECTptr->size()>pos)
-	gptr=&(*gptr->_VECTptr)[pos];
-    }
-    xcas::Equation_select(*gptr,true);
-    //cout << "new sel " << *gptr << endl;
-  }
-
-  void display(Equation & eq,int x,int y,GIAC_CONTEXT){
-    // Equation_draw(eq.data,x,y,LCD_WIDTH_PX,0,&eq,contextptr);
-    int xleft,ytop,xright,ybottom,gselpos; gen * gsel,*gselparent;
-    eqwdata eqdata=Equation_total_size(eq.data);
-    if ( (eqdata.dx>LCD_WIDTH_PX || eqdata.dy>LCD_HEIGHT_PX-STATUS_AREA_PX) && Equation_adjust_xy(eq.data,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos)){
-      if (x<xleft){
-	if (x+LCD_WIDTH_PX<xright)
-	  x=giacmin(xleft,xright-LCD_WIDTH_PX);
-      }
-      if (x>=xleft && x+LCD_WIDTH_PX>=xright){
-	if (xright-x<LCD_WIDTH_PX)
-	  x=giacmax(xright-LCD_WIDTH_PX,0);
-      }
-#if 0
-      cout << "avant " << y << " " << ytop << " " << ybottom << endl;
-      if (y<ytop){
-	if (y+LCD_HEIGHT_PX<ybottom)
-	  y=giacmin(ytop,ybottom-LCD_HEIGHT_PX);
-      }
-      if (y>=ytop && y+LCD_HEIGHT_PX>=ybottom){
-	if (ybottom-y<LCD_HEIGHT_PX)
-	  y=giacmax(ybottom-LCD_HEIGHT_PX,0);
-      }
-      cout << "apres " << y << " " << ytop << " " << ybottom << endl;
-#endif
-    }
-    int save_ymin_clip=clip_ymin;
-    clip_ymin=STATUS_AREA_PX;
-    Equation_draw(eq.data,x,y,RAND_MAX,0,&eq,contextptr);
-    clip_ymin=save_ymin_clip;
-  }
-  
-  /* ******************* *
-   *      GRAPH          *
-   * ******************* *
-   */
-#if 1
-
-  double find_tick(double dx){
-    double d=std::pow(10.0,std::floor(std::log10(absdouble(dx))));
-    if (dx<2*d)
-      d=d/5;
-    else {
-      if (dx<5*d)
-	d=d/2;
-    }
-    return d;
-  }
-
-  // check if point is inside triangle
-  inline bool inside(double x0,double x1,double x2,
-		     double y0,double y1,double y2,
-		     double x,double y){
-#if 1
-    double y02=y2-y0,y10=y0-y1;
-    double invarea = x0*(y1-y2) + x1*y02 + x2*y10;
-    if (invarea==0) return false;
-    invarea=1/invarea;
-    double yy0=y0-y, s=invarea*(x*y02 + x2*yy0 + x0*(y-y2));
-    if (s<-1e-12) return false;
-    double t = invarea*(x*y10 + x0*(y1-y) - x1*yy0);
-    return t>=-1e-12 && s+t<=1+1e-12;
-#else
-    double as_x = x-x0;
-    double as_y = y-y0;
-    bool s_01 = (x1-x0)*as_y-(y1-y0)*as_x>0; // dot product P0P1.P0P>0
-    if ( (x2-x0)*as_y-(y2-y0)*as_x>0 == s_01)
-      return false;
-    if ((x2-x1)*(y-y1)-(y2-y1)*(x-x1) > 0 != s_01)
-      return false;
-    return true;
-#endif
-  }
-
-  /* 3d rotation handling */
-  void normalize(double & a,double &b,double &c){
-    double n=std::sqrt(a*a+b*b+c*c);
-    a /= n;
-    b /= n;
-    c /= n;
-  }
-
-  inline int Min(int i,int j) {return i>j?j:i;}
-
-  inline int Max(int i,int j) {return i>j?i:j;}
-
-  quaternion_double::quaternion_double(double theta_x,double theta_y,double theta_z) { 
-    *this=euler_deg_to_quaternion_double(theta_x,theta_y,theta_z); 
-  }
-
-  quaternion_double euler_deg_to_quaternion_double(double a,double b,double c){
-    double phi=a*M_PI/180, theta=b*M_PI/180, psi=c*M_PI/180;
-    double c1 = std::cos(phi/2);
-    double s1 = std::sin(phi/2);
-    double c2 = std::cos(theta/2);
-    double s2 = std::sin(theta/2);
-    double c3 = std::cos(psi/2);
-    double s3 = std::sin(psi/2);
-    double c1c2 = c1*c2;
-    double s1s2 = s1*s2;
-    double w =c1c2*c3 - s1s2*s3;
-    double x =c1c2*s3 + s1s2*c3;
-    double y =s1*c2*c3 + c1*s2*s3;
-    double z =c1*s2*c3 - s1*c2*s3;
-    return quaternion_double(w,x,y,z);
-  }
-
-  void quaternion_double_to_euler_deg(const quaternion_double & q,double & phi,double & theta, double & psi){
-    double test = q.x*q.y + q.z*q.w;
-    if (test > 0.499) { // singularity at north pole
-      phi = 2 * atan2(q.x,q.w) * 180/M_PI;
-      theta = 90; 
-      psi = 0;
-      return;
-    }
-    if (test < -0.499) { // singularity at south pole
-      phi = -2 * atan2(q.x,q.w) * 180/M_PI;
-      theta = - 90;
-      psi = 0;
-      return;
-    }
-    double sqx = q.x*q.x;
-    double sqy = q.y*q.y;
-    double sqz = q.z*q.z;
-    phi = atan2(2*q.y*q.w-2*q.x*q.z , 1 - 2*sqy - 2*sqz) * 180/M_PI;
-    theta = asin(2*test) * 180/M_PI;
-    psi = atan2(2*q.x*q.w-2*q.y*q.z , 1 - 2*sqx - 2*sqz) * 180/M_PI;
-  }
-
-  quaternion_double operator * (const quaternion_double & q1,const quaternion_double & q2){ 
-    double z=q1.w*q2.z+q2.w*q1.z+q1.x*q2.y-q2.x*q1.y;
-    double x=q1.w*q2.x+q2.w*q1.x+q1.y*q2.z-q2.y*q1.z;
-    double y=q1.w*q2.y+q2.w*q1.y+q1.z*q2.x-q2.z*q1.x;
-    double w=q1.w*q2.w-q1.x*q2.x-q1.y*q2.y-q1.z*q2.z;
-    return quaternion_double(w,x,y,z);
-  }
-
-  // q must be a unit
-  void get_axis_angle_deg(const quaternion_double & q,double &x,double &y,double & z, double &theta){
-    double scale=1-q.w*q.w;
-    if (scale>1e-6){
-      scale=std::sqrt(scale);
-      theta=2*std::acos(q.w)*180/M_PI;
-      x=q.x/scale;
-      y=q.y/scale;
-      z=q.z/scale;
-    }
-    else {
-      x=0; y=0; z=1;
-      theta=0;
-    }
-  }
-
-  quaternion_double rotation_2_quaternion_double(double x, double y, double z,double theta){
-    double t=theta*M_PI/180;
-    double qx,qy,qz,qw,s=std::sin(t/2),c=std::cos(t/2);
-    qx=x*s;
-    qy=y*s;
-    qz=z*s;
-    qw=c;
-    double n=std::sqrt(qx*qx+qy*qy+qz*qz+qw*qw);
-    return quaternion_double(qw/n,qx/n,qy/n,qz/n);
-  }
-
-  // image of (x,y,z) by rotation around axis r(rx,ry,rz) of angle theta
-  void rotate(double rx,double ry,double rz,double theta,double x,double y,double z,double & X,double & Y,double & Z){
-    /*
-    quaternion_double q=rotation_2_quaternion_double(rx,ry,rz,theta);
-    quaternion_double qx(x,y,z,0);
-    quaternion_double qX=conj(q)*qx*q;
-    */
-    // r(rx,ry,rz) the axis, v(x,y,z) projects on w=a*r with a such that
-    // w.r=a*r.r=v.r
-    double r2=rx*rx+ry*ry+rz*rz;
-    double r=std::sqrt(r2);
-    double a=(rx*x+ry*y+rz*z)/r2;
-    // v=w+V, w remains stable, V=v-w=v-a*r rotates
-    // Rv=w+RV, where RV=cos(theta)*V+sin(theta)*(r cross V)/sqrt(r2)
-    double Vx=x-a*rx,Vy=y-a*ry,Vz=z-a*rz;
-    // cross product of k with V
-    double kVx=ry*Vz-rz*Vy, kVy=rz*Vx-rx*Vz,kVz=rx*Vy-ry*Vx;
-    double c=std::cos(theta),s=std::sin(theta);
-    X=a*rx+c*Vx+s*kVx/r;
-    Y=a*ry+c*Vy+s*kVy/r;
-    Z=a*rz+c*Vz+s*kVz/r;
-  }
-
-  int diffuse(int color_orig,double diffusionz){
-    if (diffusionz<1.1)
-      return color_orig;
-    int color=rgb565to888(color_orig);
-    int r=(color&0xff0000)>>16,g=(color & 0xff00)>>8,b=192;
-    double attenuate=(.3*(diffusionz-1));
-    attenuate=1.0/(1+attenuate*attenuate);
-    r*=attenuate; g*=attenuate; b*=attenuate;
-    return rgb888to565((r<<16)|(g<<8)|b);
-  }
-  
-  void glinter1(double z,double dz,
-		double *zmin,double *zmax,double ZMIN,double ZMAX,
-		int ih,int lcdz,
-		int upcolor,int downcolor,int diffusionz,int diffusionz_limit,bool interval
-		){
-    if (ZMIN<z && z<ZMAX)
-      return;
-    // lcdz tests below: avoid marking too large regions
-    if (*zmax<*zmin || z<*zmin-lcdz || z>*zmax+lcdz)
-      *zmax=*zmin=z;
-    bool diffus=diffusionz<diffusionz_limit;
-    double deltaz;
-    if (interval){
-      bool intervalonly=false;
-      if (z<0) {
-	// return;
-	z=0; intervalonly=true;
-      }
-      if (z>=LCD_HEIGHT_PX) {
-	// return;
-	z=LCD_HEIGHT_PX-1; intervalonly=true;
-      }
-      deltaz=diffus?1:diffusionz;
-      if (z>*zmax+deltaz){
-	if (diffus){
-	  drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),diffuse(downcolor,diffusionz));
-	  if (!intervalonly)
-	    os_set_pixel(ih,z,downcolor);
-	}
-	else {
-	  drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),_BLACK);
-	  // draw interval
-	  int nstep=int(z-*zmax)/diffusionz;
-	  double zstep=(z-*zmax)/nstep;
-	  for (double zz=*zmax+zstep;zz<=z;zz+=zstep)
-	    os_set_pixel(ih,zz,downcolor);
-	}
-	*zmax=z;
-	return;
-      }
-      else if (z<*zmin-deltaz){
-	if (diffus){
-	  drawRectangle(ih,z,1,std::ceil(*zmin-z),diffuse(upcolor,diffusionz));
-	  if (!intervalonly)
-	    os_set_pixel(ih,z,upcolor);
-	}
-	else {
-	  drawRectangle(ih,z,1,std::ceil(*zmin-z),_BLACK);
-	  // draw interval
-	  int nstep=int(*zmin-z)/diffusionz;
-	  double zstep=(z-*zmin)/nstep; // zstep<0
-	  for (double zz=*zmin+zstep;zz>=z;zz+=zstep)
-	    os_set_pixel(ih,zz,upcolor);
-	}
-	*zmin=z;
-	return;
-      }
-    } // end if interval
-    if (z>=0 &&  z<=LCD_HEIGHT_PX){
-      int color=-1;
-      if (diffus){
-	if (z<=*zmin){
-	  // mark all points with diffuse color from upcolor
-	  drawRectangle(ih,z,1,std::ceil(*zmin-z),diffuse(upcolor,std::min(double(diffusionz),std::max(-dz,1.0))));
-	  color=upcolor;
-	  *zmin=z;
-	}
-	if (z>=*zmax){
-	  // mark all points with diffuse color from downcolor
-	  drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),diffuse(downcolor,std::min(double(diffusionz),std::max(dz,1.0))));
-	  *zmax=z;
-	}
-	return;
-      }
-      if (z>*zmax){ // mark only 1 point
-	color=downcolor;
-	drawRectangle(ih,*zmax+1,1,z-*zmax-1,_BLACK);
-	*zmax=z;
-      }
-      if (z<*zmin){ // mark 1 point
-	color=upcolor;
-	drawRectangle(ih,z+1,1,*zmin-z-1,_BLACK);
-	*zmin=z;
-      }
-      if (color>=0) os_set_pixel(ih,z,color);
-    }
-  }
-  
-  void glinter(double a,double b,double c,
-	       double xscale,double xc,double yscale,double yc,
-	       double *zmin,double *zmax,double ZMIN,double ZMAX,
-	       int i,int horiz,int j,int w,int h,int lcdz,
-	       int upcolor,int downcolor,int diffusionz,int diffusionz_limit,bool interval
-	       ){
-    double dz=lcdz*(a+b)*yscale-1;
-    //if (dz<-10 || dz>10) cout << "dz=" << dz << "\n";
-    // plane equation solved
-    if (//0
-	h==1 && w==1
-	){
-      int ih=i+horiz;
-      double x = yscale*j-xscale*i + xc;
-      // if (x<xmin) continue;
-      double y = yscale*j+xscale*i + yc;
-      // if (y<ymin) continue;
-      double z = (a*x+b*y+c);
-      z=LCD_HEIGHT_PX/2+j-lcdz*z;
-      if (ZMIN<z && z<ZMAX)
-	return;
-      bool intervalonly=false;
-      // lcdz tests below: avoid marking too large regions
-      if (*zmax<*zmin || z<*zmin-lcdz || z>*zmax+lcdz)
-	*zmax=*zmin=z;
-      if (0 && (*zmax<50 || *zmin<50 || z<50))
-	cout << *zmax << " "; // debug
-      bool diffus=diffusionz<diffusionz_limit;
-      double deltaz;
-      if (interval){
-	if (z<0) {
-	  // return;
-	  z=0; intervalonly=true;
-	}
-	if (z>=LCD_HEIGHT_PX) {
-	  // return;
-	  z=LCD_HEIGHT_PX-1; intervalonly=true;
-	}
-	deltaz=diffus?1:diffusionz;
-	if (z>*zmax+deltaz){
-	  if (diffus){
-	    drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),diffuse(downcolor,diffusionz));
-	    if (!intervalonly)
-	      os_set_pixel(ih,z,downcolor);
-	  }
-	  else {
-	    drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),_BLACK);
-	    // draw interval
-	    int nstep=int(z-*zmax)/diffusionz;
-	    double zstep=(z-*zmax)/nstep;
-	    for (double zz=*zmax+zstep;zz<=z;zz+=zstep)
-	      os_set_pixel(ih,zz,downcolor);
-	  }
-	  *zmax=z;
-	  return;
-	}
-	else if (z<*zmin-deltaz){
-	  if (diffus){
-	    drawRectangle(ih,z,1,std::ceil(*zmin-z),diffuse(upcolor,diffusionz));
-	    if (!intervalonly)
-	      os_set_pixel(ih,z,upcolor);
-	  }
-	  else {
-	    drawRectangle(ih,z,1,std::ceil(*zmin-z),_BLACK);
-	    // draw interval
-	    int nstep=int(*zmin-z)/diffusionz;
-	    double zstep=(z-*zmin)/nstep; // zstep<0
-	    for (double zz=*zmin+zstep;zz>=z;zz+=zstep)
-	      os_set_pixel(ih,zz,upcolor);
-	  }
-	  *zmin=z;
-	  return;
-	}
-      } // end if interval
-      if (z>=0 &&  z<=LCD_HEIGHT_PX){
-	int color=-1;
-	if (diffus){
-	  if (z<=*zmin){
-	    // mark all points with diffuse color from upcolor
-	    drawRectangle(ih,z,1,std::ceil(*zmin-z),diffuse(upcolor,std::min(double(diffusionz),std::max(-dz,1.0))));
-	    color=upcolor;
-	    *zmin=z;
-	  }
-	  if (z>=*zmax){
-	    // mark all points with diffuse color from downcolor
-	    drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),diffuse(downcolor,std::min(double(diffusionz),std::max(dz,1.0))));
-	    *zmax=z;
-	  }
-	  return;
-	}
-	if (z>=*zmax){ // mark only 1 point
-	  color=downcolor;
-	  // drawRectangle(ih,*zmax,1,z-*zmax,color);
-	  // drawRectangle(ih,*zmax,1,z-*zmax,_BLACK);
-	  *zmax=z;
-	}
-	if (z<=*zmin){ // mark 1 point
-	  color=upcolor;
-	  //drawRectangle(ih,z,1,*zmin-z,color);
-	  //drawRectangle(ih,z,1,*zmin-z,_BLACK);
-	  *zmin=z;
-	}
-	if (color>=0) os_set_pixel(ih,z,color);
-      }
-      return; // end h==1 and w==1
-    }
-    for (int I=i;I<i+w;++I,++zmax,++zmin){
-      int ih=I+horiz;
-      double x = yscale*j-xscale*I + xc;
-      // if (x<xmin) continue;
-      double y = yscale*j+xscale*I + yc;
-      // if (y<ymin) continue;
-      double z = (a*x+b*y+c);
-      bool intervalonly=false;
-      z=LCD_HEIGHT_PX/2+j-lcdz*z;
-      if (ZMIN<z && z<ZMAX)
-	return;
-      if (interval){
-	if (z<0) {
-	  z=0; intervalonly=true;
-	}
-	if (z>=LCD_HEIGHT_PX) {
-	  z=LCD_HEIGHT_PX-1; intervalonly=true;
-	}
-      }
-      if (i==0)
-	; // cout << "i=" << i << " j=" << j << ", zmin=" << *zmin << " z=" << z << " zmax=" << *zmax << " dz=" << dz << ", a=" << a << " b=" << b << " c=" << c <<"\n";
-      if (*zmax<*zmin || z<*zmin-lcdz || z>*zmax+lcdz)
-	*zmax=*zmin=z;
-      int deltaz=(diffusionz<diffusionz_limit?1:diffusionz);
-      if (interval && z>*zmax+deltaz){
-	if (//0
-	    diffusionz<diffusionz_limit
-	    )	  
-	  drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),diffuse(downcolor,diffusionz));
-	else {
-	  drawRectangle(ih,*zmax,1,std::ceil(z-*zmax),_BLACK);
-	  // draw interval
-	  int nstep=int(z-*zmax)/diffusionz;
-	  double zstep=(z-*zmax)/nstep;
-	  for (double zz=*zmax+zstep;zz<=z;zz+=zstep)
-	    os_set_pixel(ih,zz,downcolor);
-	}
-	if (intervalonly){
-	  *zmax=z;
-	  continue;
-	}
-      }
-      if (interval && z<*zmin-deltaz){
-	if (//0
-	    diffusionz<diffusionz_limit
-	    )
-	  drawRectangle(ih,z,1,std::ceil(*zmin-z),diffuse(upcolor,diffusionz));
-	else {
-	  drawRectangle(ih,z,1,std::ceil(*zmin-z),_BLACK);
-	  // draw interval
-	  int nstep=int(*zmin-z)/diffusionz;
-	  double zstep=(z-*zmin)/nstep; // zstep<0
-	  for (double zz=*zmin+zstep;zz>=z;zz+=zstep)
-	    os_set_pixel(ih,zz,upcolor);
-	}
-	if (intervalonly){
-	  *zmin=z;
-	  continue;
-	}
-      }
-      if (//x-(h-1)*yscale>xmin && y-(h-1)*yscale>ymin &&
-	  z>=0 && z+(h-1)*dz>=0 && z<=LCD_HEIGHT_PX && z+(h-1)*dz<=LCD_HEIGHT_PX
-	  ){
-	int color=-1;
-	if ( (h>1 || diffusionz<diffusionz_limit) && dz>0 && z>=*zmax){
-	  // mark all points with downcolor
-	  *zmax=z+(h-1)*dz;
-	  color=downcolor;
-	  if (diffusionz>=diffusionz_limit && dz>diffusionz){
-	    drawRectangle(ih,z,1,std::ceil(*zmax-z),_BLACK);
-	    // draw interval
-	    int nstep=int(std::ceil((*zmax-z)/diffusionz));
-	    double zstep=(*zmax-z)/nstep;
-	    for (int i=0;i<=nstep;++i)
-	      os_set_pixel(ih,z+i*zstep,color);		    
-	    continue;
-	  }
-	}
-	if ( (h>1 || diffusionz<diffusionz_limit) && dz<0 && z<=*zmin){
-	  // mark all points with upcolor
-	  *zmin=z+(h-1)*dz;
-	  color=upcolor;
-	  if (diffusionz>=diffusionz_limit && dz<-diffusionz){
-	    drawRectangle(ih,z,1,std::ceil(z-*zmin),_BLACK);
-	    // draw interval
-	    int nstep=int(std::ceil((z-*zmin)/diffusionz));
-	    double zstep=(*zmin-z)/nstep;
-	    for (int i=0;i<=nstep;++i)
-	      os_set_pixel(ih,z+i*zstep,color);
-	    continue;
-	  }
-	}
-	if (color>=0){
-	  if (diffusionz<diffusionz_limit){
-	    if (dz>0)
-	      drawRectangle(ih,z,1,std::ceil(h*dz),diffuse(color,std::min(double(diffusionz),std::max(dz,1.0))));
-	    else
-	      drawRectangle(ih,z-std::ceil(-h*dz),1,std::ceil(-h*dz),diffuse(color,std::min(double(diffusionz),std::max(-dz,1.0))));
-	    continue;
-	  }
-	  if (dz>1)
-	    drawRectangle(ih,z,1,std::ceil(h*dz),_BLACK);
-	  os_set_pixel(ih,z,color);
-	  if (h==1) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  if (h==2) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  if (h==3) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  if (h==4) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  if (h==5) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  if (h==6) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  if (h==7) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  if (h==8) continue;
-	  z += dz;
-	  os_set_pixel(ih,z,color);
-	  continue;
-	}
-	if (dz<=0 && z>=*zmax && z+(h-1)*dz>=*zmin){ // mark only 1 point
-	  *zmax=z;
-	  color=downcolor;
-	}
-	if (dz>=0 && z<=*zmin && z+(h-1)*dz<=*zmax){ // mark 1 point
-	  *zmin=z;
-	  color=upcolor;
-	}
-	if (color>=0){
-	  os_set_pixel(ih,z,color);
-	  continue;
-	}
-      }
-      for (int J=0;J<h
-	     // && x>=xmin && y>=ymin
-	     ;++J,z+=dz,x-=yscale,y-=yscale){
-	int color=-1;
-	if (z>*zmax){
-	  drawRectangle(i,*zmax,1,z-*zmax,_BLACK);
-	  *zmax=z;
-	  color=downcolor;
-	}
-	if (z<*zmin){
-	  drawRectangle(i,z,1,*zmin-z,_BLACK);
-	  *zmin=z;
-	  color=upcolor;
-	}
-	if (z<=-0.5 || z>=LCD_HEIGHT_PX)
-	  continue;
-	if (color>=0)
-	  os_set_pixel(ih,z,color); // drawRectangle(i,z,w,h,color);
-      }
-    }
-  }
-
-  void find_abc(double x1,double x2,double x3,
-		double y1,double y2,double y3,
-		double z1,double z2,double z3,
-		double &a,double &b,double &c){
-    // solve([a*x1+b*y1+c=z1,a*x2+b*y2+c=z2,a*x3+b*y3+c=z3],[a,b,c])
-    // double d=(x1*y2-x1*y3-x2*y1+x2*y3+x3*y1-x3*y2);
-    double d=(x1*(y2-y3)+x2*(y3-y1)+x3*(y1-y2));
-    if (d==0) return;
-    d=1/d;
-    double z12=z2-z1,z23=z3-z2,z31=z1-z3;
-    //double a=(-y1*z2+y1*z3+y2*z1-y2*z3-y3*z1+y3*z2)/d;
-    a=d*(y1*z23+y2*z31+y3*z12);
-    // double b=(x1*z2-x1*z3-x2*z1+x2*z3+x3*z1-x3*z2)/d;
-    b=-d*(x1*z23+x2*z31+x3*z12);
-    //double c=(x1*y2*z3-x1*y3*z2-x2*y1*z3+x2*y3*z1+x3*y1*z2-x3*y2*z1)/d;
-    c=d*(x1*(y2*z3-y3*z2)+x2*(y3*z1-y1*z3)+x3*(y1*z2-y2*z1));
-  }
-
-  void glinter(double x1,double x2,double x3,
-	       double y1,double y2,double y3,
-	       double z1,double z2,double z3,
-	       double xscale,double xc,double yscale,double yc,
-	       double *zmin,double *zmax,double ZMIN,double ZMAX,
-	       int i,int horiz,int j,int w,int h,int lcdz,
-	       int upcolor,int downcolor,int diffusionz,int diffusionz_limit,bool interval
-	       ){
-    double a,b,c;
-    find_abc(x1,x2,x3,y1,y2,y3,z1,z2,z3,a,b,c);
-    glinter(a,b,c,xscale,xc,yscale,yc,zmin,zmax,ZMIN,ZMAX,i,horiz,j,w,h,lcdz,upcolor,downcolor,diffusionz,diffusionz_limit,interval);
-  }
-  
-  void update12(bool & found,bool &found2,
-		double x1,double x2,double x3,double y1,double y2,double y3,double z1,double z2,double z3,
-		int upcolor,int downcolor,int downupcolor,int downdowncolor,
-		double & curx1, double &curx2, double &curx3, double &cury1, double &cury2, double &cury3, double &curz1, double &curz2, double &curz3, 
-		double &cur2x1, double &cur2x2, double &cur2x3, double &cur2y1, double &cur2y2, double &cur2y3, double &cur2z1, double &cur2z2, double &cur2z3,
-		int & u,int & d,int & du,int & dd){
-    if (found){
-      if (z1+z2+z3<curz1+curz2+curz3){
-	// no need to update cur, perhaps cur2?
-	if (found2 && cur2z1+cur2z2+cur2z3<z1+z2+z3)
-	  return;
-	found2=true;
-	cur2x1=x1; cur2x2=x2; cur2x3=x3;
-	cur2y1=y1; cur2y2=y2; cur2y3=y3;
-	cur2z1=z1; cur2z2=z2; cur2z3=z3;
-	du=downupcolor; dd=downdowncolor;
-	return;
-      }
-      else { // need to update cur, and perhaps cur2
-	if (!found2 || curz1+curz2+curz3<cur2z1+cur2z2+cur2z3){
-	  found2=true;
-	  cur2x1=curx1; cur2x2=curx2; cur2x3=curx3;
-	  cur2y1=cury1; cur2y2=cury2; cur2y3=cury3;
-	  cur2z1=curz1; cur2z2=curz2; cur2z3=curz3;
-	  du=downupcolor; dd=downdowncolor;
-	}
-	curx1=x1; curx2=x2; curx3=x3;
-	cury1=y1; cury2=y2; cury3=y3;
-	curz1=z1; curz2=z2; curz3=z3;
-	u=upcolor; d=downcolor;
-	return;
-      }
-    }
-    found=true;
-    curx1=x1; curx2=x2; curx3=x3;
-    cury1=y1; cury2=y2; cury3=y3;
-    curz1=z1; curz2=z2; curz3=z3;
-    u=upcolor; d=downcolor;
-  }
-	      
-  void update12(bool & found,bool &found2,
-		double a,double b,double c,double z,
-		int upcolor,int downcolor,int downupcolor,int downdowncolor,
-		double & cura1,double & curb1,double & curc1,double & curz1,
-		double & cura2,double & curb2,double & curc2,double & curz2,
-		int & u,int & d,int & du,int & dd){
-    if (found){
-      if (z<curz1){
-	// no need to update cur, perhaps cur2?
-	if (found2 && curz2<z)
-	  return;
-	found2=true;
-	cura2=a; curb2=b; curc2=c; curz2=z;
-	du=downupcolor; dd=downdowncolor;
-	return;
-      }
-      else { // need to update cur, and perhaps cur2
-	if (!found2 || curz1<curz2){
-	  found2=true;
-	  cura2=cura1; curb2=curb1; curc2=curc1; curz2=curz1;
-	  du=downupcolor; dd=downdowncolor;
-	}
-	cura1=a; curb1=b; curc1=c; curz1=z;
-	u=upcolor; d=downcolor;
-	return;
-      }
-    }
-    found=true;
-    cura1=a; curb1=b; curc1=c; curz1=z;
-    u=upcolor; d=downcolor;
-  }
-	      
-  
-  // 3d demo prototype
-  void do_transform(const double mat[16],double x,double y,double z,double & X,double & Y,double &Z){
-    X=mat[0]*x+mat[1]*y+mat[2]*z+mat[3];
-    Y=mat[4]*x+mat[5]*y+mat[6]*z+mat[7];
-    Z=mat[8]*x+mat[9]*y+mat[10]*z+mat[11];
-    // double t=mat[12]*x+mat[13]*y+mat[14]*z+mat[15];
-    // X/=t; Y/=t; Z/=t;
-  }
-
-#if 1
-  bool inside(const vector<double3> & v,double x,double y){
-    int n=0;
-    for (int i=1;i<v.size();++i){
-      const double3 & prev=v[i-1];
-      const double3 & cur=v[i];
-      double prevx=prev.x,prevy=prev.y,curx=cur.x,cury=cur.y,m=cur.z;
-      if (prevx==curx){
-	if (x==curx && (y-prevy)*(cury-y)>0) // on vertical edge
-	  return false;
-	continue;
-      }
-      if (x==prevx) 
-	continue;
-      if ((x-prevx)*(curx-x)<0)
-	continue;
-      //double Y=cury+m*(x-curx);
-      double Y=cury+(cur.y-prev.y)/(cur.x-prev.x)*(x-curx);
-      if (Y>=y)
-	++n; 
-    }
-    if (n%2)
-      return true;
-    return false;
-  }
-#else
-  bool inside(const vector<double3> & v,double x,double y){
-    int n=0;
-    for (int i=1;i<v.size();++i){
-      double3 prev=v[i-1],cur=v[i];
-      double prevx=prev.x,prevy=prev.y,curx=cur.x,cury=cur.y,m=cur.z;
-      if (prevx==curx){
-	if (prevx!=x) continue;
-	if (y==cury || (y-prevy)*(cury-y)>0)
-	  ++n;
-	continue;
-      }
-      if (x==prevx || (x-prevx)*(curx-x)<0)
-	continue;
-      double Y=cury+m*(x-curx);
-      if (Y>=y)
-	++n; 
-    }
-    if (n%2)
-      return true;
-    return false;
-  }
-#endif
-  
-  // intersect plane x-y=xy with line m+t*v
-  // m.x+t*v.x-m.y-t*v.y=-xy
-  double intersect(const double3 & m,const double3 & v,double xy){
-    return (-xy+m.y-m.x)/(v.x-v.y);
-  }
-
-  // returns true if filled, false otherwise
-  bool get_colors(gen attr,int & upcolor,int & downcolor,int & downupcolor,int & downdowncolor){
-    if (attr.is_symb_of_sommet(at_pnt)){
-      attr=attr[1];
-    }
-    if (attr.type==_INT_ && (attr.val & 0xffff)!=0){
-      upcolor=attr.val &0xffff;
-      int color=rgb565to888(upcolor);
-      int r=(color&0xff0000)>>16,g=(color & 0xff00)>>8,b=192;
-      r >>= 2;
-      g >>= 2;
-      downcolor=rgb888to565((r<<16)|(g<<8)|b);
-      r >>= 1;
-      g >>= 1;
-      downupcolor=rgb888to565((r<<16)|(g<<8)|b);
-      r >>= 2;
-      g >>= 2;
-      downdowncolor=rgb888to565((r<<16)|(g<<8)|b);
-    }
-    if (attr.type==_INT_)
-      return attr.val & 0x40000000;
-    return false;
-  }
-
-#define ABC3D
-
-  // 2d coordinates of m+t*v
-  void grmtv2ij(const Graph2d & gr,const double3 & m,const double3 & v,double t,int & i,int & j){
-    double x=m.x+t*v.x;
-    double y=m.y+t*v.y;
-    double z=m.z+t*v.z;
-    gr.XYZ2ij(double3(x,y,z),i,j);
-  }    
-  
-  struct hypertriangle_t {
-    int4 * colorptr; // hypersurface color 
-    double xmin,xmax,ymin,ymax; // minmax values intersection with plane y-x=Cte
-    double a,b,c; // plane equation of triangle
-    double zG; // altitude for gravity center 
-  }  ; // data struct for hypesurface triangulation cache
-
-#define HYPERQUAD
-#ifdef HYPERQUAD
-  
-  void compute(double yx,double3 * cur,hypertriangle_t & res){
-    double xmin=1e307,xmax=-1e307,ymin=1e307,ymax=-1e307;
-    for (int l=0;l<4;++l){
-      int prev=l==0?3:l-1;
-      double3 & d3=cur[prev];
-      double x0=d3.x,y0=d3.y,x1=cur[l].x,y1=cur[l].y;
-      double yx0=y0-x0,yx1=y1-x1,m=yx1-yx0;
-      if (m==0){
-	if (yx==yx1){
-	  if (x0>xmax) xmax=x0; if (x0<xmin) xmin=x0;
-	  if (x1>xmax) xmax=x1; if (x1<xmin) xmin=x1;
-	  if (y0>ymax) ymax=y0; if (y0<ymin) ymin=y0;
-	  if (y1>ymax) ymax=y1; if (y1<ymin) ymin=y1;
-	}
-	continue;
-      }
-      double t=(yx-yx0)/m;
-      if (t>=0 && t<=1){
-	double X=x0+t*(x1-x0),Y=y0+t*(y1-y0);
-	if (X>xmax) xmax=X; if (X<xmin) xmin=X;
-	if (Y>ymax) ymax=Y; if (Y<ymin) ymin=Y;
-      }
-    }
-    res.zG=(cur[0].z+cur[1].z+cur[2].z+cur[3].z)/4;
-    res.xmin=xmin; res.xmax=xmax; res.ymin=ymin; res.ymax=ymax;
-    find_abc(cur[0].x,cur[1].x,cur[2].x,
-	     cur[0].y,cur[1].y,cur[2].y,
-	     cur[0].z,cur[1].z,cur[2].z,
-	     res.a,res.b,res.c);
-  }
-
-  
-#else
-  void compute(double yx,double3 * cur,hypertriangle_t & res){
-    res.zG=(cur[0].z+cur[1].z+cur[2].z)/3;
-    double xmin=1e307,xmax=-1e307,ymin=1e307,ymax=-1e307;
-    for (int l=0;l<3;++l){
-      double3 & d3=cur[l?l-1:2];
-      double x0=d3.x,y0=d3.y,x1=cur[l].x,y1=cur[l].y;
-      double yx0=y0-x0,yx1=y1-x1,m=yx1-yx0;
-      if (m==0){
-	if (yx==yx1){
-	  if (x0>xmax) xmax=x0; if (x0<xmin) xmin=x0;
-	  if (x1>xmax) xmax=x1; if (x1<xmin) xmin=x1;
-	  if (y0>ymax) ymax=y0; if (y0<ymin) ymin=y0;
-	  if (y1>ymax) ymax=y1; if (y1<ymin) ymin=y1;
-	}
-	continue;
-      }
-      double t=(yx-yx0)/m;
-      if (t>=0 && t<=1){
-	double X=x0+t*(x1-x0),Y=y0+t*(y1-y0);
-	if (X>xmax) xmax=X; if (X<xmin) xmin=X;
-	if (Y>ymax) ymax=Y; if (Y<ymin) ymin=Y;
-      }
-    }
-    res.xmin=xmin; res.xmax=xmax; res.ymin=ymin; res.ymax=ymax;
-    find_abc(cur[0].x,cur[1].x,cur[2].x,
-	     cur[0].y,cur[1].y,cur[2].y,
-	     cur[0].z,cur[1].z,cur[2].z,
-	     res.a,res.b,res.c);
-  }
-#endif
-
-  void update_hypertri(const vector<hypertriangle_t> & hypertriangles,double x,double y,
-		       bool & found,bool &found2,
-		       double3 & curabc1,double & curz1,
-		       double3 & curabc2,double & curz2,
-		       int & upcolor,int & downcolor,int & downupcolor,int & downdowncolor){
-    vector<hypertriangle_t>::const_iterator it=hypertriangles.begin(),itend=hypertriangles.end();
-    for (;it!=itend;++it){
-      if (x<it->xmin){
-	++it;
-	if (it==itend) break;
-	if (x<it->xmin){
-	  ++it;
-	  if (it==itend) break;
-	  if (x<it->xmin){
-	    ++it;
-	    if (it==itend) break;
-	  }
-	}
-      }
-      else if (x>it->xmax){
-	++it;
-	if (it==itend) break;
-	if (x>it->xmax){
-	  ++it;
-	  if (it==itend) break;
-	  if (x>it->xmax){
-	    ++it;
-	    if (it==itend) break;
-	  }
-	}
-      }
-      const hypertriangle_t & cur=*it;
-      if (x<cur.xmin || x>cur.xmax || y<cur.ymin || y>cur.ymax)
-	continue;
-      if (!found || cur.zG>curz1){
-	if (found){
-	  found2=true;
-	  curabc2=curabc1;
-	  curz2=curz1;
-	}
-	found=true;
-	curabc1.x=cur.a; curabc1.y=cur.b; curabc1.z=cur.c;
-	curz1=cur.zG;
-	upcolor=cur.colorptr->u; downcolor=cur.colorptr->d;
-	continue;
-      }
-      if (cur.zG>curz2){
-	found2=true;
-	curabc2.x=cur.a; curabc2.y=cur.b; curabc2.z=cur.c;
-	curz2=cur.zG;
-	downupcolor=cur.colorptr->du; downdowncolor=cur.colorptr->dd;
-	continue;
-      }
-    } // end loop on k
-  }
-    
-  // hpersurface encoded as a matrix
-  // with lines containing 3 coordinates per point
-  bool Graph2d::glsurface(int w,int h,int lcdz,GIAC_CONTEXT,
-			  int upcolor_,int downcolor_,int downupcolor_,int downdowncolor_)  {
-    if (w>9) w=9; if (w<1) w=1;
-    if (h>9) h=9; if (h<1) h=1;
-    // save zmin/zmax on the stack (4K required)
-    const int jmintabsize=512;
-    ALLOCA(short int,jmintab,jmintabsize*sizeof(short int));
-    ALLOCA(short int,jmaxtab,jmintabsize*sizeof(short int));
-    // short int *jmintab=(short int *)alloca(jmintabsize*sizeof(short int)), * jmaxtab=(short int *)alloca(jmintabsize*sizeof(short int)); // assumes LCD_WIDTH_PX<=jmintabsize
-    for (int i=0;i<jmintabsize;++i){
-      jmintab[i]=LCD_HEIGHT_PX;
-      jmaxtab[i]=0;
-    }
-    vecteur attrv(gen2vecteur(g));
-    std::vector< std::vector< vector<float3d> >::const_iterator > hypv; // 3 iterateurs per hypersurface
-    int upcolor,downcolor,downupcolor,downdowncolor;
-    for (int i=0;i<int(attrv.size());++i){
-      gen attr=attrv[i];
-      upcolor=upcolor_;downcolor=downcolor_;downupcolor=downupcolor_;downdowncolor=downdowncolor_;
-      get_colors(attrv[i],upcolor,downcolor,downupcolor,downdowncolor);
-    }
-    for (int i=0;i<int(surfacev.size());++i){
-      hypv.push_back(surfacev[i].begin());
-      hypv.push_back(surfacev[i].end());
-    }
-    int horiz=LCD_WIDTH_PX/2,vert=horiz/2;//LCD_HEIGHT_PX/2;
-    int imin=Ai,imax=Ai,itmp;
-    // 12 segments from cube visualization
-    double segments_x1[12]={Ai,Bi,Ei,Fi,Ai,Bi,Ci,Di,Ai,Ci,Ei,Gi};
-    double segments_x2[12]={Ci,Di,Gi,Hi,Ei,Fi,Gi,Hi,Bi,Di,Fi,Hi};
-    double segments_y1[12]={Aj,Bj,Ej,Fj,Aj,Bj,Cj,Dj,Aj,Cj,Ej,Gj};
-    double segments_y2[12]={Cj,Dj,Gj,Hj,Ej,Fj,Gj,Hj,Bj,Dj,Fj,Hj};
-    double segments_m[12];
-    for (int i=0;i<12;++i){
-      segments_m[i]=(segments_y2[i]-segments_y1[i])/(segments_x2[i]-segments_x1[i]);
-      itmp=segments_x1[i];
-      if (itmp<imin) imin=itmp; if (itmp>imax) imax=itmp;
-      itmp=segments_x2[i];
-      if (itmp<imin) imin=itmp; if (itmp>imax) imax=itmp;      
-    }
-    double xmin=-1,ymin=-1,xmax=1,ymax=1,xscale=0.6*(xmax-xmin)/horiz,yscale=0.6*(ymax-ymin)/vert,x,y,z,xc=(xmin+xmax)/2,yc=(ymin+ymax)/2;
-    drawRectangle(0,0,imin,LCD_HEIGHT_PX,COLOR_BLACK); // clear    
-    drawRectangle(imax,0,LCD_WIDTH_PX-imax,LCD_HEIGHT_PX,COLOR_BLACK); // clear
-    sync_screen();
-    int count=0;
-    vector<int> polyedrei; polyedrei.reserve(polyedrev.size()); // cache for polyedres polygons edges
-    vector<double> polyedrexmin,polyedrexmax,polyedreymin,polyedreymax;
-    polyedrexmin.reserve(polyedrev.size());polyedrexmax.reserve(polyedrev.size());
-    polyedreymin.reserve(polyedrev.size());polyedreymax.reserve(polyedrev.size());
-    vector<hypertriangle_t> hypertriangles;
-    for (int i=imin-horiz;i<imax-horiz;i+=w,++count){
-    //for (int i=-horiz;i<horiz;i+=w){
-#ifdef NSPIRE_NEWLIB
-      if (count%16==15)
-	sync_screen();
-      control_c();
-      if (ctrl_c || interrupted){
-	// w+=2; h+=2;
-	ctrl_c=interrupted=false;
-	return true;
-      }
-#endif
-#if defined NUMWORKS && defined DEVICE
-      if (iskeydown(KEY_CTRL_EXIT))
-	return true;
-      if (iskeydown(KEY_CTRL_OK)){
-	w++; h++;
-      }
-#endif
-      drawRectangle(i+horiz,0,w,LCD_HEIGHT_PX,COLOR_BLACK); // clear
-      // find min and max values for j using vertical intersections of line x=i
-      // with segments
-      int ih=i+horiz+w/2,jmin=RAND_MAX,jmax=-RAND_MAX;
-      for (int k=0;k<12;++k){
-	if ( !is_inf(segments_m[k]) && (ih-segments_x1[k])*(segments_x2[k]-ih)>=0 ){
-	  double y=segments_y1[k]+segments_m[k]*(ih-segments_x1[k]);
-	  if (y<=jmin)
-	    jmin=std::floor(y);
-	  if (y>=jmax)
-	    jmax=std::ceil(y);
-	}
-      }
-      if (jmin>jmax) continue;
-      if (jmin<0) jmin=0;
-      if (jmax>LCD_HEIGHT_PX) jmax=LCD_HEIGHT_PX;
-      jmin -= LCD_HEIGHT_PX/2;
-      jmax -= LCD_HEIGHT_PX/2;
-      // optimization caches for this vertical
-      double yx=2*xscale*(i+(w-1)/2.0)+yc-xc;
-      // poledrev indices for yx, and xmin/xmax/ymin/ymax values
-      // (xmin/xmax should be enough, except limit cases)
-      polyedrei.clear(); polyedrexmin.clear(); polyedrexmax.clear(); polyedreymin.clear(); polyedreymax.clear();
-      for (int k=0;k<int(polyedrev.size());++k){
-	double facemin=polyedre_xyminmax[2*k],facemax=polyedre_xyminmax[2*k+1];
-	if (yx<facemin || yx>facemax)
-	  continue;
-	polyedrei.push_back(k);
-	vector<double3> & cur=polyedrev[k];
-	double xmin=1e307,xmax=-1e307,ymin=1e307,ymax=-1e307;
-	for (int l=0;l<int(cur.size());++l){
-	  double3 & d3=cur[l?l-1:cur.size()-1];
-	  double x0=d3.x,y0=d3.y,x1=cur[l].x,y1=cur[l].y;
-	  double yx0=y0-x0,yx1=y1-x1,m=yx1-yx0;
-	  if (m==0){
-	    if (yx==yx1){
-	      if (x0>xmax) xmax=x0; if (x0<xmin) xmin=x0;
-	      if (x1>xmax) xmax=x1; if (x1<xmin) xmin=x1;
-	      if (y0>ymax) ymax=y0; if (y0<ymin) ymin=y0;
-	      if (y1>ymax) ymax=y1; if (y1<ymin) ymin=y1;
-	    }
-	    continue;
-	  }
-	  double t=(yx-yx0)/m;
-	  if (t>=0 && t<=1){
-	    double X=x0+t*(x1-x0),Y=y0+t*(y1-y0);
-	    if (X>xmax) xmax=X; if (X<xmin) xmin=X;
-	    if (Y>ymax) ymax=Y; if (Y<ymin) ymin=Y;
-	  }
-	}
-	polyedrexmin.push_back(xmin);
-	polyedrexmax.push_back(xmax);
-	polyedreymin.push_back(ymin);
-	polyedreymax.push_back(ymax);
-      }
-      // hypersurfaces: find triangles
-      hypertriangles.clear();
-      double hyperxymax=-1e307,hyperxymin=1e307;
-      double3 tri[4]; 
-      for (int k=0;k<int(hypv.size());k+=2){
-	vector< vector<float3d> >::const_iterator sbeg=hypv[k],send=hypv[k+1],sprec,scur;
-	vector<float3d>::const_iterator itprec,itcur,itprecend;
-	for (sprec=sbeg,scur=sprec+1;scur<send;++sprec,++scur){
-	  itprec=sprec->begin(); 
-	  itprecend=sprec->end();
-	  itcur=scur->begin();
-	  double yx1,yx2=*(itprec+1)-*itprec,yx3,yx4=*(itcur+1)-*itcur;
-	  for (itprec+=3,itcur+=3;itprec<itprecend;itprec+=3,itcur+=3){
-	    yx1=yx2;
-	    yx2=*(itprec+1)-*itprec;
-	    yx3=yx4;
-	    yx4=*(itcur+1)-*itcur;
-	    if (yx<yx1 && yx<yx2 && yx<yx3 && yx<yx4){
-	      for (;;){
-		// per iteration: 2 incr, 1 test, 2 read, 2 comp, && , test
-		itprec+=3;itcur+=3;
-		if (itprec<itprecend && yx<(yx2=*(itprec+1)-*itprec) && yx<(yx4=*(itcur+1)-*itcur)){
-		  itprec+=3;itcur+=3;
-		  if (itprec<itprecend && yx<(yx2=*(itprec+1)-*itprec) && yx<(yx4=*(itcur+1)-*itcur)){
-		    itprec+=3;itcur+=3;
-		    if (itprec<itprecend && yx<(yx2=*(itprec+1)-*itprec) && yx<(yx4=*(itcur+1)-*itcur)){
-		      itprec+=3;itcur+=3;
-		      if (itprec<itprecend && yx<(yx2=*(itprec+1)-*itprec) && yx<(yx4=*(itcur+1)-*itcur)){
-			continue;
-		      }
-		    }
-		  }
-		}
-		break;
-	      }
-	      if (yx<yx2 && yx<yx4) continue;
-	    } // end yx<yxk
-	    else if (yx>yx1 && yx>yx2 && yx>yx3 && yx>yx4){
-	      for (;;){
-		// per iteration: 2 incr, 1 test, 2 read, 2 comp, && , test
-		itprec+=3;itcur+=3;
-		if (itprec<itprecend && yx>(yx2=*(itprec+1)-*itprec) && yx>(yx4=*(itcur+1)-*itcur)){
-		  itprec+=3;itcur+=3;
-		  if (itprec<itprecend && yx>(yx2=*(itprec+1)-*itprec) && yx>(yx4=*(itcur+1)-*itcur)){
-		    itprec+=3;itcur+=3;
-		    if (itprec<itprecend && yx>(yx2=*(itprec+1)-*itprec) && yx>(yx4=*(itcur+1)-*itcur)){
-		      itprec+=3;itcur+=3;
-		      if (itprec<itprecend && yx>(yx2=*(itprec+1)-*itprec) && yx>(yx4=*(itcur+1)-*itcur)){
-			continue;
-		      }
-		    }
-		  }
-		}
-		break;
-	      }
-	      if (yx>yx2 && yx>yx4) continue;
-	    }
-	    // found one quad intersecting plane
-	    double x1=*(itprec-3),x2=*(itprec),x3=*(itcur-3),x4=*(itcur);
-	    double y1=*(itprec-2),y2=*(itprec+1),y3=*(itcur-2),y4=*(itcur+1);
-	    double z1=*(itprec-1),z2=*(itprec+2),z3=*(itcur-1),z4=*(itcur+2);
-	    yx1=y1-x1; yx2=y2-x2; yx3=y3-x3; yx4=y4-x4;
-#ifdef HYPERQUAD
-	    tri[0]=double3(x1,y1,z1);
-	    tri[1]=double3(x2,y2,z2);
-	    tri[2]=double3(x4,y4,z4);
-	    tri[3]=double3(x3,y3,z3);
-	    double x123=(x1+x2+x3+x4)/4,y123=(y1+y2+y3+y4)/4,z123=(z1+z2+z3+z4)/4,X,Y,Z;
-	    double xy123=x123+y123;
-	    if (xy123<hyperxymin) hyperxymin=xy123;
-	    if (xy123>hyperxymax) hyperxymax=xy123;
-	    do_transform(invtransform,x123,y123,z123,X,Y,Z);
-	    if (Z>=window_zmin && Z<=window_zmax && X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax ){
-	      hypertriangle_t res; res.colorptr=&hyp_color[k];
-	      compute(yx,tri,res);
-	      hypertriangles.push_back(res);
-	    }
-#else // HYPERQUAD
-	    tri[1]=double3(x2,y2,z2);
-	    tri[2]=double3(x3,y3,z3);
-	    if ( (yx>yx1 && yx>yx2 && yx>yx3) ||
-		 (yx<yx1 && yx<yx2 && yx<yx3) )
-	      ; // not intersecting
-	    else {
-	      double x123=(x1+x2+x3)/3,y123=(y1+y2+y3)/3,z123=(z1+z2+z3)/3,X,Y,Z;
-	      double xy123=x123+y123;
-	      if (xy123<hyperxymin) hyperxymin=xy123;
-	      if (xy123>hyperxymax) hyperxymax=xy123;
-	      do_transform(invtransform,x123,y123,z123,X,Y,Z);
-	      if (Z>=window_zmin && Z<=window_zmax && X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax ){
-		tri[0]=double3(x1,y1,z1);
-		hypertriangle_t res; res.colorptr=&hyp_color[k];
-		compute(yx,tri,res);
-		hypertriangles.push_back(res);
-	      }
-	    }
-	    if ( (yx>yx4 && yx>yx2 && yx>yx3) ||
-		 (yx<yx4 && yx<yx2 && yx<yx3) )
-	      ; // not intersecting
-	    else {
-	      double x423=(x4+x2+x3)/3,y423=(y4+y2+y3)/3,z423=(z4+z2+z3)/3,X,Y,Z;
-	      double xy423=x423+y423;
-	      if (xy423<hyperxymin) hyperxymin=xy423;
-	      if (xy423>hyperxymax) hyperxymax=xy423;
-	      do_transform(invtransform,x423,y423,z423,X,Y,Z);
-	      if (Z>=window_zmin && Z<=window_zmax && X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax ){
-		tri[0]=double3(x4,y4,z4);
-		hypertriangle_t res; res.colorptr=&hyp_color[k];
-		compute(yx,tri,res);
-		hypertriangles.push_back(res);
-	      }
-	    }
-#endif // HYPERQUAD
-	  }
-	}
-      }
-      vector<int> spheres(sphere_centerv.size()); // is plane y-x=yx intersecting sphere
-      for (int k=0;k<int(sphere_centerv.size());++k){
-	const double3 & c=sphere_centerv[k];
-	double xc=c.x,yc=c.y;
-	double r=sphere_radiusv[k];
-	const matrice & m=*sphere_quadraticv[k]._VECTptr;
-	const vecteur & m0=*m[0]._VECTptr;
-	const vecteur & m1=*m[1]._VECTptr;
-	const vecteur & m2=*m[2]._VECTptr;
-	double m00=m0[0]._DOUBLE_val,m01=m0[1]._DOUBLE_val,m02=m0[2]._DOUBLE_val,m11=m1[1]._DOUBLE_val,m12=m1[2]._DOUBLE_val,m22=m2[2]._DOUBLE_val;
-	/* q0:=m00*x^2+2*m01*x*y+2*m02*x*z+m11*y^2+2*m12*y*z+m22*z^2; q:=subst(q0,[x,y],[x-xc,y-yc]);
-	   a,b,c:=coeffs(q(y=yx+x)-r^2,x);
-	   delta:=b^2-4*a*c; 
-	   // if delta<0 for all z, there is no intersection
-	   // delta is a second order polynomial in z, check discriminant
-	   A,B,C:=coeffs(delta,z);
-	   D:=B^2-4*A*C;  // if D<0 no intersection
-	*/
-	double A=4*m02*m02+4*m12*m12-4*m00*m22-8*m01*m22+8*m02*m12-4*m11*m22,
-	  B=-8*m00*m12*xc+8*m00*m12*yc-8*m00*m12*yx+8*m01*m02*xc-8*m01*m02*yc+8*m01*m02*yx-8*m01*m12*xc+8*m01*m12*yc-8*m01*m12*yx+8*m02*m11*xc-8*m02*m11*yc+8*m02*m11*yx,
-	  C=4*m01*m01*xc*xc+4*m01*m01*yc*yc+4*m01*m01*yx*yx-4*m00*m11*xc*xc-4*m00*m11*yc*yc-4*m00*m11*yx*yx-8*m01*m01*xc*yc+8*m01*m01*xc*yx-8*m01*m01*yc*yx+8*m00*m11*xc*yc-8*m00*m11*xc*yx+8*m00*m11*yc*yx+4*m00*r*r+8*m01*r*r+4*m11*r*r,
-	  D=B*B-4*A*C;
-	spheres[k]=D>=0;
-      }
-      double zmin[10]={220.220,220,220,220,220,220,220,220,220},
-	zmax[10]={0,0,0,0,0,0,0,0,0,0},
-	zmin2[10]={220.220,220,220,220,220,220,220,220,220},
-	zmax2[10]={0,0,0,0,0,0,0,0,0,0}	; // initialize for these vertical lines
-#ifdef ABC3D
-      double3 curabc1,curabc2; 
-      double curz1=-1e306,curz2=1e306;
-#else
-      double curx1,curx2,curx3,cury1,cury2,cury3,curz1=-1e306,curz2=-1e306,curz3=-1e306;
-      double cur2x1,cur2x2,cur2x3,cur2y1,cur2y2,cur2y3,cur2z1=-1e306,cur2z2=-1e306,cur2z3=-1e306;
-#endif
-      int u,d,du,dd;
-      // loop earlier if there are only hypersurfaces
-      bool only_hypertri=true;
-      for (int ki=0;ki<int(polyedrei.size());++ki){
-	if (polyedrexmin[ki]<=polyedrexmax[ki]){ only_hypertri=false; break; }
-      }
-      for (int k=0;k<int(sphere_centerv.size());++k){
-	if (spheres[k]){ only_hypertri=false; break; }
-      }
-      for (int k=0;k<int(plan_abcv.size());++k){
-	if (plan_filled[k]){ only_hypertri=false; break; }
-      }
-      if (only_hypertri){
-	if (hypertriangles.empty()) continue;
-	int effjmax=(hyperxymax-xc-yc)/yscale/2.0,effjmin=(hyperxymin-xc-yc)/yscale/2.0;
-	if (effjmax+1<jmax)
-	  jmax=effjmax+1;
-	if (effjmin-1>jmin)
-	  jmin=effjmin-1;
-	x = yscale*(jmax-(h-1)/2.0)-xscale*(i+(w-1)/2.0) + xc;
-	y = yscale*(jmax-(h-1)/2.0)+xscale*(i+(w-1)/2.0) + yc;
-	for (int j=jmax;j>=jmin;j-=h,x-=yscale*h,y-=yscale*h){
-	  bool found=false,found2=false;
-	  update_hypertri(hypertriangles,x,y,found,found2,curabc1,curz1,curabc2,curz2,upcolor,downcolor,downupcolor,downdowncolor);
-	  if (!found) continue;
-	  if (h==1 && w==1){
-	    if (found2 && !hide2nd){
-	      double dz=lcdz*(curabc2.x+curabc2.y)*yscale-1;
-	      // if (y<ymin) continue;
-	      double z = (curabc2.x*x+curabc2.y*y+curabc2.z);
-	      z=LCD_HEIGHT_PX/2+j-lcdz*z;
-	      glinter1(z,dz,
-		       zmin2,zmax2,zmin[0],zmax[0],
-		       ih,lcdz,
-		       downupcolor,downdowncolor,diffusionz,diffusionz_limit,interval);
-	    }
-	    double dz=lcdz*(curabc1.x+curabc1.y)*yscale-1;
-	    // if (y<ymin) continue;
-	    double z = (curabc1.x*x+curabc1.y*y+curabc1.z);
-	    z=LCD_HEIGHT_PX/2+j-lcdz*z;
-
-	    glinter1(z,dz,
-		     zmin,zmax,1e307,-1e307,
-		     ih,lcdz,
-		     upcolor,downcolor,diffusionz,diffusionz_limit,interval);
-	  }
-	  else {
-	    if (found2 && !hide2nd)
-	    glinter(curabc2.x,curabc2.y,curabc2.z,xscale,xc,yscale,yc,zmin2,zmax2,zmin[0],zmax[0],i,horiz,j,w,h,lcdz,downupcolor,downdowncolor,diffusionz,diffusionz_limit,interval);
-	    glinter(curabc1.x,curabc1.y,curabc1.z,xscale,xc,yscale,yc,zmin,zmax,1e307,-1e307,i,horiz,j,w,h,lcdz,upcolor,downcolor,diffusionz,diffusionz_limit,interval);
-	  }
-	}
-      }
-      else {
-	x = yscale*(jmax-(h-1)/2.0)-xscale*(i+(w-1)/2.0) + xc;
-	y = yscale*(jmax-(h-1)/2.0)+xscale*(i+(w-1)/2.0) + yc;
-	for (int j=jmax;j>=jmin;j-=h,x-=yscale*h,y-=yscale*h){
-	  if (0 && i==-35 && j==-44)
-	    u=0; // debug
-	  // x = yscale*(j-(h-1)/2.0)-xscale*(i+(w-1)/2.0) + xc;
-	  // y = yscale*(j-(h-1)/2.0)+xscale*(i+(w-1)/2.0) + yc;
-	  bool found=false,found2=false;
-	  update_hypertri(hypertriangles,x,y,found,found2,curabc1,curz1,curabc2,curz2,upcolor,downcolor,downupcolor,downdowncolor);
-	  for (int ki=0;ki<int(polyedrei.size());++ki){
-	    int k=polyedrei[ki];
-	    vector<double3> & cur=polyedrev[k];
-	    if (
-#if 1
-		x>=polyedrexmin[ki] && x<=polyedrexmax[ki] && y>=polyedreymin[ki] && y<=polyedreymax[ki]
-#else
-		inside(cur,x,y)
-#endif
-		){
-	      const double3 & abc=polyedre_abcv[k];
-	      const int4 & color=polyedre_color[k];
-	      // std::cout << k << " " << x << " " << y << " " << color.u << "\n";
-	      double a=abc.x,b=abc.y,c=abc.z;
-	      z=a*x+b*y+c;
-	      bool is_clipped=polyedre_faceisclipped[k];
-	      if (!is_clipped){
-		double X,Y,Z;
-		do_transform(invtransform,x,y,z,X,Y,Z);
-		is_clipped=X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax && Z>=window_zmin && Z<=window_zmax;
-	      }
-	      if (is_clipped){
-#ifdef ABC3D
-		update12(found,found2,
-			 a,b,c,z,
-			 color.u,color.d,color.du,color.dd,
-			 curabc1.x,curabc1.y,curabc1.z,curz1,
-			 curabc2.x,curabc2.y,curabc2.z,curz2,
-			 upcolor,downcolor,downupcolor,downdowncolor);
-#else
-		update12(found,found2,
-			 x-.5,x-.5,x+1,y+0.866,y-0.866,y,z-.5*a+.866*b,z-.5*a-.866*b,z+a,color.u,color.d,color.du,color.dd,
-			 curx1,curx2,curx3,cury1,cury2,cury3,curz1,curz2,curz3,
-			 cur2x1,cur2x2,cur2x3,cur2y1,cur2y2,cur2y3,cur2z1,cur2z2,cur2z3,
-			 upcolor,downcolor,downupcolor,downdowncolor);
-#endif
-	      }
-	    } // end if inside(cur,x,y)
-	  }
-	  for (int k=0;k<int(sphere_centerv.size());++k){
-	    if (!spheres[k]) continue;
-	    const double3 & c=sphere_centerv[k];
-	    double R=sphere_radiusv[k];
-	    const matrice & m=*sphere_quadraticv[k]._VECTptr;
-	    const vecteur & m0=*m[0]._VECTptr;
-	    const vecteur & m1=*m[1]._VECTptr;
-	    const vecteur & m2=*m[2]._VECTptr;
-	    double v0=x-c.x,v1=y-c.y;
-	    double a=m2[2]._DOUBLE_val,b=2*(m0[2]._DOUBLE_val*v0+m1[2]._DOUBLE_val*v1),C=(m0[0]._DOUBLE_val*v0+2*m0[1]._DOUBLE_val*v1)*v0+m1[1]._DOUBLE_val*v1*v1-R*R;
-	    double delta=b*b-4*a*C;
-	    if (delta<0)
-	      continue;
-	    const int4 & color=sphere_color[k];
-	    delta=std::sqrt(delta);
-	    double sol1,sol2;
-	    if (b>0){
-	      sol1=(-b-delta)/2/a;
-	      sol2=2*C/(-b-delta); // (-b+delta)/2/a;
-	    }
-	    else {
-	      sol1=2*C/(-b+delta);//(-b-delta)/2/a;
-	      sol2=(-b+delta)/2/a;
-	    }
-	    double v2=sol1;
-	    z=v2+c.z;
-	    bool is_clipped=sphere_isclipped[k];
-	    if (!is_clipped){
-	      double X,Y,Z;
-	      do_transform(invtransform,x,y,z,X,Y,Z);
-	      is_clipped=X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax && Z>=window_zmin && Z<=window_zmax;
-	    }
-	    if (is_clipped){
-	      double w0=v0*m0[0]._DOUBLE_val+v1*m1[0]._DOUBLE_val+v2*m2[0]._DOUBLE_val;
-	      double w1=v0*m0[1]._DOUBLE_val+v1*m1[1]._DOUBLE_val+v2*m2[1]._DOUBLE_val;
-	      double w2=v0*m0[2]._DOUBLE_val+v1*m1[2]._DOUBLE_val+v2*m2[2]._DOUBLE_val;
-#ifdef ABC3D
-	      double a=-w0/w2,b=-w1/w2,c=z-(a*x+b*y);
-	      update12(found,found2,
-		       a,b,c,z,
-		       color.u,color.d,color.du,color.dd,
-		       curabc1.x,curabc1.y,curabc1.z,curz1,
-		       curabc2.x,curabc2.y,curabc2.z,curz2,
-		       upcolor,downcolor,downupcolor,downdowncolor);
-#else
-	      update12(found,found2,
-		       //x-w2,x,x,y,y,y-w2,z+w0,z,z+w1,
-		       x-0.5,x-.5,x+1,y+.866,y-.866,y,z+.5*w0/w2-.866*w1/w2,z+.5*w0/w2+.866*w1/w2,z-w0/w2,
-		       color.u,color.d,color.du,color.dd,
-		       curx1,curx2,curx3,cury1,cury2,cury3,curz1,curz2,curz3,
-		       cur2x1,cur2x2,cur2x3,cur2y1,cur2y2,cur2y3,cur2z1,cur2z2,cur2z3,
-		       upcolor,downcolor,downupcolor,downdowncolor);
-#endif
-	    }
-	    if (delta<=0) continue; // delta==0, twice the same point
-	    v2=sol2;
-	    z=v2+c.z;
-	    is_clipped=sphere_isclipped[k];
-	    if (!is_clipped){
-	      double X,Y,Z;
-	      do_transform(invtransform,x,y,z,X,Y,Z);
-	      is_clipped=X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax && Z>=window_zmin && Z<=window_zmax;
-	    }
-	    if (is_clipped){
-	      double w0=v0*m0[0]._DOUBLE_val+v1*m1[0]._DOUBLE_val+v2*m2[0]._DOUBLE_val;
-	      double w1=v0*m0[1]._DOUBLE_val+v1*m1[1]._DOUBLE_val+v2*m2[1]._DOUBLE_val;
-	      double w2=v0*m0[2]._DOUBLE_val+v1*m1[2]._DOUBLE_val+v2*m2[2]._DOUBLE_val;
-#ifdef ABC3D
-	      double a=-w0/w2,b=-w1/w2,c=z-(a*x+b*y);
-	      update12(found,found2,
-		       a,b,c,z,
-		       color.u,color.d,color.du,color.dd,
-		       curabc1.x,curabc1.y,curabc1.z,curz1,
-		       curabc2.x,curabc2.y,curabc2.z,curz2,
-		       upcolor,downcolor,downupcolor,downdowncolor);
-#else
-	      update12(found,found2,
-		       //x-w2,x,x,y,y,y-w2,z+w0,z,z+w1,
-		       x-0.5,x-.5,x+1,y+.866,y-.866,y,z+.5*w0/w2-.866*w1/w2,z+.5*w0/w2+.866*w1/w2,z-w0/w2,
-		       color.u,color.d,color.du,color.dd,
-		       curx1,curx2,curx3,cury1,cury2,cury3,curz1,curz2,curz3,
-		       cur2x1,cur2x2,cur2x3,cur2y1,cur2y2,cur2y3,cur2z1,cur2z2,cur2z3,
-		       upcolor,downcolor,downupcolor,downdowncolor);
-#endif
-	    }
-	  } // end hypersphere loop
-	  for (int k=0;k<int(plan_abcv.size());++k){
-	    if (!plan_filled[k])
-	      continue;
-	    double3 abc=plan_abcv[k];
-	    int4 color=plan_color[k];
-	    // z=a*x+b*y+c
-	    double z=abc.x*x+abc.y*y+abc.z,X,Y,Z;
-	    do_transform(invtransform,x,y,z,X,Y,Z);
-	    if (X>=window_xmin && X<=window_xmax && Y>=window_ymin && Y<=window_ymax && Z>=window_zmin && Z<=window_zmax)
-#ifdef ABC3D
-	      update12(found,found2,
-		       abc.x,abc.y,abc.z,z,
-		       color.u,color.d,color.du,color.dd,
-		       curabc1.x,curabc1.y,curabc1.z,curz1,
-		       curabc2.x,curabc2.y,curabc2.z,curz2,
-		       upcolor,downcolor,downupcolor,downdowncolor);
-#else
-	    update12(found,found2,
-		     x-1,x,x,y,y,y+1,z-abc.x,z,z+abc.y,color.u,color.d,color.du,color.dd,
-		     curx1,curx2,curx3,cury1,cury2,cury3,curz1,curz2,curz3,
-		     cur2x1,cur2x2,cur2x3,cur2y1,cur2y2,cur2y3,cur2z1,cur2z2,cur2z3,
-		     upcolor,downcolor,downupcolor,downdowncolor);
-#endif
-	  } // end hyperplan loop
-	  if (found){
-#ifdef ABC3D
-	    if (found2){
-	      if (!hide2nd)
-		glinter(curabc2.x,curabc2.y,curabc2.z,xscale,xc,yscale,yc,zmin2,zmax2,zmin[0],zmax[0],i,horiz,j,w,h,lcdz,downupcolor,downdowncolor,diffusionz,diffusionz_limit,interval);
-	      glinter(curabc1.x,curabc1.y,curabc1.z,xscale,xc,yscale,yc,zmin,zmax,1e307,-1e307,i,horiz,j,w,h,lcdz,upcolor,downcolor,diffusionz,diffusionz_limit,interval);
-	    }
-	    else
-	      glinter(curabc1.x,curabc1.y,curabc1.z,xscale,xc,yscale,yc,zmin,zmax,1e307,-1e307,i,horiz,j,w,h,lcdz,upcolor,downcolor,diffusionz,diffusionz_limit,interval);
-#else
-	    if (found2){
-	      if (!hide2nd)
-		glinter(cur2x1,cur2x2,cur2x3,cur2y1,cur2y2,cur2y3,cur2z1,cur2z2,cur2z3,xscale,xc,yscale,yc,zmin2,zmax2,zmin[0],zmax[0],i,horiz,j,w,h,lcdz,downupcolor,downdowncolor,diffusionz,diffusionz_limit,interval);
-	      glinter(curx1,curx2,curx3,cury1,cury2,cury3,curz1,curz2,curz3,xscale,xc,yscale,yc,zmin,zmax,1e307,-1e307,i,horiz,j,w,h,lcdz,upcolor,downcolor,diffusionz,diffusionz_limit,interval);
-	    }
-	    else
-	      glinter(curx1,curx2,curx3,cury1,cury2,cury3,curz1,curz2,curz3,xscale,xc,yscale,yc,zmin,zmax,1e307,-1e307,i,horiz,j,w,h,lcdz,upcolor,downcolor,diffusionz,diffusionz_limit,interval);
-#endif
-	  }
-	  else {
-	    //std::cout << "not inside " << i << " " << j << " " << x << " " << y << "\n";	      
-	  }
-	} // end pixel vertical loop on j
-      } // end else only_hypertri
-      // update jmintab/jmaxtab
-      if (i+horiz+w<jmintabsize){
-	for (int I=0;I<w;++I){
-	  jmintab[i+horiz+I]=zmin[I];
-	  jmaxtab[i+horiz+I]=zmax[I];
-	}
-      }
-      // now render line/segments/curves: find intersection with plane
-      // y-x=yc-xc+xscale*(2*i+I), 0<=I<w
-      for (int j=0;j<int(curvev.size());++j){
-	vector<double3> & cur=curvev[j];
-	int s=cur.size();
-	if (s<2) continue;
-	int4 color=curve_color[j];
-	double xy=yc-xc+xscale*2*i;
-	for (int l=0;l<s-1;++l){
-	  double3 m=cur[l];
-	  double3 n=cur[l+1];
-	  double3 v(n.x-m.x,n.y-m.y,n.z-m.z);
-	  if (std::abs(v.y-v.x)<1e-4*(std::abs(v.y)+std::abs(v.x))){
-	    v.y=v.x+1e-4*(std::abs(v.y)+std::abs(v.x));
-	  }
-	  double t1=intersect(m,v,xy);
-	  if (t1<0 || t1>1)
-	    continue;
-	  double dt=2*xscale/(v.y-v.x); // di==1
-	  double x1=m.x+t1*v.x;
-	  double y1=m.y+t1*v.y;
-	  double z1=m.z+t1*v.z;
-	  double X1,Y1,Z1;
-	  do_transform(invtransform,x1,y1,z1,X1,Y1,Z1);
-	  if (X1<window_xmin || X1>window_xmax || Y1<window_ymin || Y1>window_ymax || Z1<window_zmin || Z1>window_zmax)
-	    continue;
-	  z1=LCD_HEIGHT_PX/2-lcdz*z1+(x1+y1)/2/yscale;
-	  double dz=-dt*v.z*lcdz+dt*(v.x+v.y)/2/yscale;
-	  int horiz=LCD_WIDTH_PX/2;
-	  for (int k=0;k<w;++k){
-	    double Z1=z1,Z2=z1+dz;
-	    z1=Z2;
-	    if (Z1>Z2) std::swap(Z1,Z2);
-	    // line [ (i+k,Z1), (i+k,Z2) ]
-	    if (Z2<zmin[k]){
-	      drawRectangle(i+horiz+k,Z1,1,std::ceil(Z2-Z1),color.u);
-	      continue;
-	    }
-	    if (Z1>zmax[k]){
-	      drawRectangle(i+horiz+k,Z1,1,std::ceil(Z2-Z1),color.d);
-	      continue;
-	    }
-	    drawRectangle(i+horiz+k,Z1,1,std::ceil(Z2-Z1),color.du);
-	    if (Z1<zmin[k])
-	      drawRectangle(i+horiz+k,Z1,1,std::ceil(zmin[k]-Z1),color.u);
-	    if (Z2>zmax[k])
-	      drawRectangle(i+horiz+k,zmax[k],1,std::ceil(Z2-zmax[k]),color.d);
-	  }
-	} // end l loop on curve discretization
-      } // end loop on curves
-#ifdef OLD_LINE_RENDERING
-      for (int j=0;j<linetypev.size();j++){
-	double3 m=linev[2*j];
-	double3 v=linev[2*j+1];
-	int4 color=line_color[j];
-	if (std::abs(v.y-v.x)<1e-4*(std::abs(v.y)+std::abs(v.x))){
-	  v.y=v.x+1e-6*(std::abs(v.y)+std::abs(v.x));
-	}
-	double xy=yc-xc+xscale*2*i;
-	double t1=intersect(m,v,xy);
-	// for halfline, t1 must be >=0, for segments between 0 and 1
-	if (linetypev[j]==_HALFLINE__VECT && t1<0)
-	  continue;
-	if (linetypev[j]==_GROUP__VECT && (t1<0 || t1>1))
-	  continue;
-	double dt=2*xscale/(v.y-v.x); // di==1
-	double x1=m.x+t1*v.x;
-	double y1=m.y+t1*v.y;
-	double z1=m.z+t1*v.z;
-	double X1,Y1,Z1;
-	do_transform(invtransform,x1,y1,z1,X1,Y1,Z1);
-	// int dbgi,dbgj; xyz2ij(double3(x1,y1,z1),dbgi,dbgj);
-	/// double x2=x1+dt*v.x,y2=y1+dt*v.y,z2=z1+dt*v.z;
-	if (X1<window_xmin || X1>window_xmax || Y1<window_ymin || Y1>window_ymax || Z1<window_zmin || Z1>window_zmax)
-	  continue;
-	z1=LCD_HEIGHT_PX/2-lcdz*z1+(x1+y1)/2/yscale;
-	double dz=-dt*v.z*lcdz+dt*(v.x+v.y)/2/yscale;
-	int horiz=LCD_WIDTH_PX/2;
-	for (int k=0;k<w;++k){
-	  double Z1=z1,Z2=z1+dz;
-	  z1=Z2;
-	  if (Z1>Z2) std::swap(Z1,Z2);
-	  // line [ (i+k,Z1), (i+k,Z2) ]
-	  if (Z2<zmin[k]){
-	    drawRectangle(i+horiz+k,Z1,1,std::ceil(Z2-Z1),color.u);
-	    continue;
-	  }
-	  if (Z1>zmax[k]){
-	    drawRectangle(i+horiz+k,Z1,1,std::ceil(Z2-Z1),color.d);
-	    continue;
-	  }
-	  drawRectangle(i+horiz+k,Z1,1,std::ceil(Z2-Z1),color.du);
-	  if (Z1<zmin[k])
-	    drawRectangle(i+horiz+k,Z1,1,std::ceil(zmin[k]-Z1),color.u);
-	  if (Z2>zmax[k])
-	    drawRectangle(i+horiz+k,zmax[k],1,std::ceil(Z2-zmax[k]),color.d);	    
-	}
-      } // end lines rendering
-#endif
-      // points rendering
-      for (int j=0;j<int(pointv.size());++j){
-	const double3 & m=pointv[j];
-	if (m.x<i+horiz || m.x>=i+horiz+w)
-	  continue;
-	const int4 & c=point_color[j];
-	int k=m.x-i-horiz,color=-1;
-	double mz=LCD_HEIGHT_PX/2-lcdz*m.z;
-	double dz=(zmax[k]-zmin[k])*1e-3;
-	if (mz>=zmax[k]-dz)
-	  color=c.u;
-	else if (mz<=zmin[k]+dz)
-	  color=c.u; // c.d?
-	else color=color_gris;//c.du;
-	drawRectangle(m.x,m.y,3,3,color);
-	if (points[j]){
-	  // int dx=RAND_MAX+os_draw_string(-RAND_MAX,0,color,0,points[j],false); // fake print
-	  int dx=os_draw_string_small(0,0,color,0,points[j],true); // fake print
-	  os_draw_string_small(m.x-dx,m.y,color,0,points[j],false); 
-	}
-      } // end points rendering
-    } // end pixel horizontal loop on i
-#ifndef OLD_LINE_RENDERING
-    // new line rendering
-    for (int j=0;j<int(linetypev.size());j++){
-      double mx,my,mz,vx,vy,vz;
-      double3 m=linev[2*j];
-      do_transform(invtransform,m.x,m.y,m.z,mx,my,mz);
-      double3 v=linev[2*j+1];
-      do_transform(invtransform,m.x+v.x,m.y+v.y,m.z+v.z,vx,vy,vz);
-      vx -= mx; vy -= my; vz -= mz;
-      int4 color=line_color[j];
-      // find min/max parameter value for hidden/visible
-      double tmax=1e306,tmin=-1e306;
-      if (linetypev[j]==_HALFLINE__VECT){
-	tmin=0;
-      }
-      if (linetypev[j]==_GROUP__VECT){
-	tmin=0;
-	tmax=1;
-      }
-      if (vx!=0){ // intersect with x=window_xmin and x=window_xmax
-	// m.x+v.x*t=window_xmin/max
-	double t1=(window_xmin-mx)/vx;
-	double t2=(window_xmax-mx)/vx;
-	if (t1>t2)
-	  std::swap<double>(t1,t2);
-	if (t1>tmin)
-	  tmin=t1;
-	if (t2<tmax)
-	  tmax=t2;
-      }
-      if (vy!=0){ // intersect with y=window_ymin and y=window_ymax
-	double t1=(window_ymin-my)/vy;
-	double t2=(window_ymax-my)/vy;
-	if (t1>t2)
-	  std::swap<double>(t1,t2);
-	if (t1>tmin)
-	  tmin=t1;
-	if (t2<tmax)
-	  tmax=t2;
-      }
-      if (vz!=0){ // intersect with z=window_zmin and z=window_zmax
-	double t1=(window_zmin-mz)/vz;
-	double t2=(window_zmax-mz)/vz;
-	if (t1>t2)
-	  std::swap<double>(t1,t2);
-	if (t1>tmin)
-	  tmin=t1;
-	if (t2<tmax)
-	  tmax=t2;
-      }
-      // find which intersection we want
-      bool usetmax=v.x+v.y==0?v.z>=0:v.x+v.y>0; 
-      double tmin_=usetmax?tmin:tmax,
-	tmax_=usetmax?tmin:tmax;
-      for (int k=0;k<int(plan_abcv.size());++k){
-	if (!plan_filled[k]) continue;
-	// z >= z_plan=a*x+b*y+c where (x,y,z)=m+t*v
-	// m.z+t*v.z >= a*m.x+t*a*v.x+b*m.y+t*b*v.y+c
-	// t*(v.z-a*v.x-b.v.y) >= a*m.x+b*m.y+c-m.z
-	double3 abc=plan_abcv[k];
-	double A=v.z-abc.x*v.x-abc.y*v.y,B=abc.x*m.x+abc.y*m.y+abc.z-m.z;
-	if (A==0) continue;
-	double t=B/A;
-	if (t<=tmin || t>=tmax)
-	  continue;
-	if (tmax_<t)
-	  tmax_=t;
-	if (tmin_>t)
-	  tmin_=t;
-      }
-      for (int k=0;k<int(sphere_centerv.size());++k){
-	// sphere interesect line 
-	double3 c=sphere_centerv[k];
-	double R=sphere_radiusv[k];
-	int4 color=sphere_color[k];
-	double cx,cy,cz;
-	do_transform(invtransform,c.x,c.y,c.z,cx,cy,cz);
-	// (mx+t*vx-cx)^2+(my+t*vy-cy)^2+(mz+t*vz-cz)^2=R^2
-	double a=vx*vx+vy*vy+vz*vz,b=(vx*(mx-cx)+vy*(my-cy)+vz*(mz-cz)),C=(mx-cx)*(mx-cx)+(my-cy)*(my-cy)+(mz-cz)*(mz-cz)-R*R;
-	double deltaprime=b*b-a*C;
-	if (deltaprime>0){
-	  deltaprime=std::sqrt(deltaprime);
-	  double t1=(-b-deltaprime)/a,t2=(-b+deltaprime)/a;
-	  if (t1>t2)
-	    std::swap(t1,t2);
-	  if (t1<tmin || t1>tmax)
-	    t1=t2;
-	  if (t2<tmin || t2>tmax)
-	    t2=t1;
-	  double t=usetmax?t2:t1;
-	  if (t<=tmin || t>=tmax)
-	    continue;
-	  if (tmin_>t)
-	    tmin_=t;
-	  if (tmax_<t)
-	    tmax_=t;	  
-	}
-      }
-      vector<double> interpoly;
-      for (int k=0;k<int(polyedre_abcv.size());++k){
-	if (!polyedre_filled[k]) continue;
-	double3 abc=polyedre_abcv[k];
-	double a=abc.x,b=abc.y,c=abc.z;
-	// intersect z=a*x+b*y+c with line m+t*v
-	// m.z+t*v.z=a*(m.x+t*v.x)+b*(m.y+t*v.y)+c
-	double A=v.z-a*v.x-b*v.y,B=a*m.x+b*m.y+c-m.z;
-	if (A!=0){
-	  double t=B/A;
-	  double x=m.x+t*v.x;
-	  double y=m.y+t*v.y;
-	  if (t>tmin && t<tmax && inside(polyedrev[k],x,y)){
-	    interpoly.push_back(t);
-	  }
-	}
-      }
-      if (interpoly.size()>=1){
-	sort(interpoly.begin(),interpoly.end());
-	double t=usetmax?interpoly.back():interpoly.front();
-	if (tmin_>t)
-	  tmin_=t;
-	if (tmax_<t)
-	  tmax_=t;
-      }
-      vecteur sv(gen2vecteur(g));
-      for (int k=0;k<int(sv.size());++k){
-	gen surf=remove_at_pnt(sv[k]);
-	if (surf.is_symb_of_sommet(at_hypersurface)){
-	  const vecteur & hyp=*surf._SYMBptr->feuille._VECTptr;
-	  if (hyp.size()>2 && !is_undef(hyp[1])){
-	    gen eq=hyp[1],vars=hyp[2];
-	    if (_is_polynomial(makesequence(eq,vars[0]),contextptr)==1 && _is_polynomial(makesequence(eq,vars[1]),contextptr)==1 && _is_polynomial(makesequence(eq,vars[2]),contextptr)==1){
-	      vecteur V(makevecteur(mx+vx*t__IDNT_e,my+vy*t__IDNT_e,mz+vz*t__IDNT_e));
-	      gen eqt=subst(eq,vars,V,false,contextptr);
-	      gen gradeq=subst(derive(eq,vars,contextptr),vars,V,false,contextptr); // not used
-	      vecteur tval_=gen2vecteur(_sort(solve(eqt,t__IDNT_e,0,contextptr),contextptr));
-	      int s=tval_.size();
-	      vector<double> tval;
-	      for (int l=0;l<s;++l){
-		gen tg=evalf_double(tval_[l],1,contextptr);
-		if (tg.type==_DOUBLE_){
-		  double t=tg._DOUBLE_val;
-		  if (t>=tmin && t<=tmax){
-		    if (tval.size()>1)
-		      tval.back()=t;
-		    else
-		      tval.push_back(t);
-		  }
-		}
-	      }
-#if 1
-	      if (!tval.empty()){
-		double t=usetmax?tval.back():tval.front();
-		if (tmin_>t)
-		  tmin_=t;
-		if (tmax_<t)
-		  tmax_=t;
-	      }
-#else
-	      if (tval.size()==1){
-		// grad of eq dot [vx,vy.vz] is positive if entering surface
-		gen gradt=subst(gradeq,t__IDNT_e,tval[0],false,contextptr);
-		gen dotp=dotvecteur(gen2vecteur(gradt),makevecteur(vx,vy,vz));
-		if (is_positive(dotp,contextptr)){
-		  if (tmin_>tval[0])
-		    tmin_=tval[0];
-		  tmax_=tmax;
-		}
-		else {
-		  if (tmax_<tval[0])
-		    tmax_=tval[0];
-		  tmin_=tmin;
-		}
-	      }
-	      else if (tval.size()==2){
-		if (tmin_>tval[0])
-		  tmin_=tval[0];
-		if (tmax_<tval[1])
-		  tmax_=tval[1];
-	      }
-#endif
-	    } // end polynomial hypersurface
-	  }
-	} // end hypersurface	
-      }
-      int i1,j1,i2,j2;
-      grmtv2ij(*this,m,v,tmin,i1,j1);
-      grmtv2ij(*this,m,v,tmax,i2,j2);
-      if (tmin==tmin_ && tmax==tmax_){
-	int curcolor=color.u;
-	if (0 && i1<jmintabsize){
-	  if (jmaxtab[i1]>=jmintab[i1] && j1>=jmaxtab[i1] )
-	    curcolor=color.d;
-	}
-	drawLine(i1,j1,i2,j2,curcolor);
-      }
-      else {
-	int curcolor=color.d;
-	if (0 && i1<jmintabsize){
-	  if (jmaxtab[i1]>=jmintab[i1] && j1<jmintab[i1])
-	    curcolor=color.u;
-	}
-	drawLine(i1,j1,i2,j2,curcolor | 0x400000);
-      }
-      bool name=show_names && lines[j];
-      if (tmin<tmin_){
-	grmtv2ij(*this,m,v,tmin,i1,j1);
-	grmtv2ij(*this,m,v,tmin_,i2,j2);
-	int curcolor=color.u;
-	if (0 && i1<jmintabsize){
-	  if (jmaxtab[i1]>=jmintab[i1] && j1>=jmaxtab[i1] )
-	    curcolor=color.d;
-	}
-	drawLine(i1,j1,i2,j2,curcolor);
-	if (name){
-	  os_draw_string_small(i1,j1,color.u,0,lines[j],false);
-	  name=false;
-	}
-	if (tmin_!=tmax) os_fill_rect(i2-2,j2-2,4,4,curcolor);
-      }
-      if (tmax>tmax_){
-	grmtv2ij(*this,m,v,tmax_,i1,j1);
-	grmtv2ij(*this,m,v,tmax,i2,j2);
-	int curcolor=color.u;
-	if (0 && i1<jmintabsize){
-	  if (jmaxtab[i1]>=jmintab[i1] && j1>=jmaxtab[i1] )
-	    curcolor=color.d;
-	}
-	drawLine(i1,j1,i2,j2,curcolor);
-	if (name){
-	  os_draw_string_small(i2,j2,color.u,0,lines[j],false);
-	  name=false;
-	}
-	if (tmax_!=tmin) os_fill_rect(i1-2,j1-2,4,4,curcolor);
-      }
-    }
-#endif // OLD_LINE_RENDERING
-    sync_screen();
-    return true;
-  }
-
-  Graph2d::Graph2d(const giac::gen & g_,const giac::context * cptr):window_xmin(gnuplot_xmin),window_xmax(gnuplot_xmax),window_ymin(gnuplot_ymin),window_ymax(gnuplot_ymax),window_zmin(gnuplot_zmin),window_zmax(gnuplot_zmax),g(g_),display_mode(0x45),show_axes(1),show_edges(1),show_names(1),labelsize(16),precision(1),contextptr(cptr) {
-    diffusionz=5; diffusionz_limit=5; hide2nd=false; interval=false;
-    default_upcolor=giac3d_default_upcolor;
-    default_downcolor=giac3d_default_downcolor;
-    default_downupcolor=giac3d_default_downupcolor;
-    default_downdowncolor=giac3d_default_downdowncolor;
-    doprecise=false;
-    lcdz= LCD_HEIGHT_PX/4;
-    is3d=giac::is3d(g);
-    //theta_x=theta_y=theta_z=0;
-    q=quaternion_double(0,0,0);//rotation_2_quaternion_double(0.707,0.707,0,1); 
-    update_scales();
-    autoscale(false,!is3d);
-    if (is3d){
-      update_rotation();
-      if (surfacev.empty()){
-	// no hypersurface inside, 2 for polyhedron
-	precision=1;
-      }
-    }
-  }
-
-  // q=quaternion_double(dragi*180/h(),0,0)*rotation_2_quaternion_double(1,0,0,dragj*180/w())*q;
-  
-  void Graph2d::zoomx(double d,bool round,bool doupdate){
-    double x_center=(window_xmin+window_xmax)/2;
-    double dx=(window_xmax-window_xmin);
-    if (dx==0)
-      dx=gnuplot_xmax-gnuplot_xmin;
-    dx *= d/2;
-    x_tick = find_tick(dx);
-    window_xmin = x_center - dx;
-    if (round) 
-      window_xmin=int( window_xmin/x_tick -1)*x_tick;
-    window_xmax = x_center + dx;
-    if (round)
-      window_xmax=int( window_xmax/x_tick +1)*x_tick;
-    if (doupdate)
-      update();
-  }
-
-  void Graph2d::zoomy(double d,bool round,bool doupdate){
-    double y_center=(window_ymin+window_ymax)/2;
-    double dy=(window_ymax-window_ymin);
-    if (dy==0)
-      dy=gnuplot_ymax-gnuplot_ymin;
-    dy *= d/2;
-    y_tick = find_tick(dy);
-    window_ymin = y_center - dy;
-    if (round)
-      window_ymin=int( window_ymin/y_tick -1)*y_tick;
-    window_ymax = y_center + dy;
-    if (round)
-      window_ymax=int( window_ymax/y_tick +1)*y_tick;
-    if (doupdate)
-      update();
-  }
-
-  void Graph2d::zoomz(double d,bool round,bool doupdate){
-    double z_center=(window_zmin+window_zmax)/2;
-    double dz=(window_zmax-window_zmin);
-    if (dz==0)
-      dz=gnuplot_zmax-gnuplot_zmin;
-    dz *= d/2;
-    z_tick = find_tick(dz);
-    window_zmin = z_center - dz;
-    if (round) 
-      window_zmin=int( window_zmin/z_tick -1)*z_tick;
-    window_zmax = z_center + dz;
-    if (round)
-      window_zmax=int( window_zmax/z_tick +1)*z_tick;
-    if (doupdate)
-      update();
-  }
-
-  void Graph2d::zoom(double d,bool doupdate){ 
-    zoomx(d,false,false);
-    zoomy(d,false,false);
-    zoomz(d,false,false);
-    if (doupdate)
-      update();
-  }
-
-  void Graph2d::autoscale(bool fullview,bool doupdate){
-    // Find the largest and lowest x/y/z in objects (except lines/plans)
-    vector<double> vx,vy,vz;
-    int s;
-    bool ortho=autoscaleg(g,vx,vy,vz,contextptr);
-    autoscaleminmax(vx,window_xmin,window_xmax,fullview);
-    double zf=is3d?1.03:1+1e-14;
-    zoomx(zf,false,false);
-    autoscaleminmax(vy,window_ymin,window_ymax,fullview);
-    zoomy(zf,false,false);
-    autoscaleminmax(vz,window_zmin,window_zmax,fullview);
-    zoomz(zf,false,false);
-    if (window_xmax-window_xmin<1e-100){
-      window_xmax=gnuplot_xmax;
-      window_xmin=gnuplot_xmin;
-    }
-    if (window_ymax-window_ymin<1e-100){
-      window_ymax=gnuplot_ymax;
-      window_ymin=gnuplot_ymin;
-    }
-    if (window_zmax-window_zmin<1e-100){
-      window_zmax=gnuplot_zmax;
-      window_zmin=gnuplot_zmin;
-    }
-    bool do_ortho=ortho;
-    if (!do_ortho){
-      double w=LCD_WIDTH_PX;
-      double h=LCD_HEIGHT_PX-STATUS_AREA_PX;
-      double window_w=window_xmax-window_xmin,window_h=window_ymax-window_ymin;
-      double tst=h/w*window_w/window_h;
-      double tst2=(window_xmax-window_zmin)/window_h;
-      if (tst>0.7 && tst<1.4 && (!is3d || (tst2>0.7 && tst2<1.4))){
-	do_ortho=true;
-      }
-    }
-    if (do_ortho )
-      orthonormalize(false);
-    y_tick=find_tick(window_ymax-window_ymin);
-    if (doupdate)
-      update();
-  }
-
-  void Graph2d::orthonormalize(bool doupdate){
-    // Center of the directions, orthonormalize
-    double w=LCD_WIDTH_PX;
-    double h=LCD_HEIGHT_PX-STATUS_AREA_PX;
-    double window_w=window_xmax-window_xmin,window_h=window_ymax-window_ymin;
-    if (is3d){
-      double window_xcenter=(window_xmin+window_xmax)/2;
-      double window_ycenter=(window_ymin+window_ymax)/2;
-      double window_zcenter=(window_zmin+window_zmax)/2;
-      double window_z=window_zmax-window_zmin;
-      double wmax=std::max(window_w,std::max(window_h,window_z));
-      window_xmin=window_xcenter-wmax/2;
-      window_xmax=window_xcenter+wmax/2;
-      window_ymin=window_ycenter-wmax/2;
-      window_ymax=window_ycenter+wmax/2;
-      window_zmin=window_zcenter-wmax/2;
-      window_zmax=window_zcenter+wmax/2;
-      z_tick=find_tick(window_zmax-window_zmin);
-    }
-    else {
-      double window_hsize=h/w*window_w;
-      if (window_h > window_hsize*1.01){ // enlarge horizontally
-	double window_xcenter=(window_xmin+window_xmax)/2;
-	double window_wsize=w/h*window_h;
-	window_xmin=window_xcenter-window_wsize/2;
-      window_xmax=window_xcenter+window_wsize/2;
-      }
-      if (window_h < window_hsize*0.99) { // enlarge vertically
-	double window_ycenter=(window_ymin+window_ymax)/2;
-	window_ymin=window_ycenter-window_hsize/2;
-	window_ymax=window_ycenter+window_hsize/2;
-      }
-    }
-    x_tick=find_tick(window_xmax-window_xmin);
-    y_tick=find_tick(window_ymax-window_ymin);
-    if (doupdate)
-      update();
-  }
-
-  void Graph2d::update_scales(){
-    if (is3d){
-      x_scale=1.414*(LCD_HEIGHT_PX-STATUS_AREA_PX)/(window_xmax-window_xmin);    
-      y_scale=1.414*(LCD_HEIGHT_PX-STATUS_AREA_PX)/(window_ymax-window_ymin);    
-      z_scale=(LCD_HEIGHT_PX-STATUS_AREA_PX)/(window_zmax-window_zmin);    
-    }
-    else {
-      x_scale=LCD_WIDTH_PX/(window_xmax-window_xmin);    
-      y_scale=(LCD_HEIGHT_PX-STATUS_AREA_PX)/(window_ymax-window_ymin);    
-    }
-  }
-
-  void Graph2d::update(){
-    update_scales();
-    if (is3d) update_rotation();
-  }
-  
-  void mult4(double * c,double k,double * res){
-    for (int i=0;i<16;i++)
-      res[i]=k*c[i];
-  }
-  
-  double det4(double * c){
-    return c[0]*c[5]*c[10]*c[15]-c[0]*c[5]*c[14]*c[11]-c[0]*c[9]*c[6]*c[15]+c[0]*c[9]*c[14]*c[7]+c[0]*c[13]*c[6]*c[11]-c[0]*c[13]*c[10]*c[7]-c[4]*c[1]*c[10]*c[15]+c[4]*c[1]*c[14]*c[11]+c[4]*c[9]*c[2]*c[15]-c[4]*c[9]*c[14]*c[3]-c[4]*c[13]*c[2]*c[11]+c[4]*c[13]*c[10]*c[3]+c[8]*c[1]*c[6]*c[15]-c[8]*c[1]*c[14]*c[7]-c[8]*c[5]*c[2]*c[15]+c[8]*c[5]*c[14]*c[3]+c[8]*c[13]*c[2]*c[7]-c[8]*c[13]*c[6]*c[3]-c[12]*c[1]*c[6]*c[11]+c[12]*c[1]*c[10]*c[7]+c[12]*c[5]*c[2]*c[11]-c[12]*c[5]*c[10]*c[3]-c[12]*c[9]*c[2]*c[7]+c[12]*c[9]*c[6]*c[3];
-  }
-
-  void inv4(double * c,double * res){
-    res[0]=c[5]*c[10]*c[15]-c[5]*c[14]*c[11]-c[10]*c[7]*c[13]-c[15]*c[9]*c[6]+c[14]*c[9]*c[7]+c[11]*c[6]*c[13];
-    res[1]=-c[1]*c[10]*c[15]+c[1]*c[14]*c[11]+c[10]*c[3]*c[13]+c[15]*c[9]*c[2]-c[14]*c[9]*c[3]-c[11]*c[2]*c[13];
-    res[2]=c[1]*c[6]*c[15]-c[1]*c[14]*c[7]-c[6]*c[3]*c[13]-c[15]*c[5]*c[2]+c[14]*c[5]*c[3]+c[7]*c[2]*c[13];
-    res[3]=-c[1]*c[6]*c[11]+c[1]*c[10]*c[7]+c[6]*c[3]*c[9]+c[11]*c[5]*c[2]-c[10]*c[5]*c[3]-c[7]*c[2]*c[9];
-    res[4]=-c[4]*c[10]*c[15]+c[4]*c[14]*c[11]+c[10]*c[7]*c[12]+c[15]*c[8]*c[6]-c[14]*c[8]*c[7]-c[11]*c[6]*c[12];
-    res[5]=c[0]*c[10]*c[15]-c[0]*c[14]*c[11]-c[10]*c[3]*c[12]-c[15]*c[8]*c[2]+c[14]*c[8]*c[3]+c[11]*c[2]*c[12];
-    res[6]=-c[0]*c[6]*c[15]+c[0]*c[14]*c[7]+c[6]*c[3]*c[12]+c[15]*c[4]*c[2]-c[14]*c[4]*c[3]-c[7]*c[2]*c[12];
-    res[7]=c[0]*c[6]*c[11]-c[0]*c[10]*c[7]-c[6]*c[3]*c[8]-c[11]*c[4]*c[2]+c[10]*c[4]*c[3]+c[7]*c[2]*c[8];
-    res[8]=c[4]*c[9]*c[15]-c[4]*c[13]*c[11]-c[9]*c[7]*c[12]-c[15]*c[8]*c[5]+c[13]*c[8]*c[7]+c[11]*c[5]*c[12];
-    res[9]=-c[0]*c[9]*c[15]+c[0]*c[13]*c[11]+c[9]*c[3]*c[12]+c[15]*c[8]*c[1]-c[13]*c[8]*c[3]-c[11]*c[1]*c[12];
-    res[10]=c[0]*c[5]*c[15]-c[0]*c[13]*c[7]-c[5]*c[3]*c[12]-c[15]*c[4]*c[1]+c[13]*c[4]*c[3]+c[7]*c[1]*c[12];
-    res[11]=-c[0]*c[5]*c[11]+c[0]*c[9]*c[7]+c[5]*c[3]*c[8]+c[11]*c[4]*c[1]-c[9]*c[4]*c[3]-c[7]*c[1]*c[8];
-    res[12]=-c[4]*c[9]*c[14]+c[4]*c[13]*c[10]+c[9]*c[6]*c[12]+c[14]*c[8]*c[5]-c[13]*c[8]*c[6]-c[10]*c[5]*c[12];
-    res[13]=c[0]*c[9]*c[14]-c[0]*c[13]*c[10]-c[9]*c[2]*c[12]-c[14]*c[8]*c[1]+c[13]*c[8]*c[2]+c[10]*c[1]*c[12];
-    res[14]=-c[0]*c[5]*c[14]+c[0]*c[13]*c[6]+c[5]*c[2]*c[12]+c[14]*c[4]*c[1]-c[13]*c[4]*c[2]-c[6]*c[1]*c[12];
-    res[15]=c[0]*c[5]*c[10]-c[0]*c[9]*c[6]-c[5]*c[2]*c[8]-c[10]*c[4]*c[1]+c[9]*c[4]*c[2]+c[6]*c[1]*c[8];
-    double det=det4(c);
-    mult4(res,1/det,res);
-  }
-  
-  void Graph2d::xyz2ij(const double3 &d,int &i,int &j) const {
-    double X,Y,Z;
-    do_transform(transform,d.x,d.y,d.z,X,Y,Z);
-    i=LCD_WIDTH_PX/2+(Y-X)/4.8*LCD_WIDTH_PX;
-    j=LCD_HEIGHT_PX/2-Z*lcdz+(Y+X)/9.6*LCD_WIDTH_PX;    
-  }
-  
-  void Graph2d::xyz2ij(const double3 &d,double &i,double &j) const {
-    double X,Y,Z;
-    do_transform(transform,d.x,d.y,d.z,X,Y,Z);
-    i=LCD_WIDTH_PX/2+(Y-X)/4.8*LCD_WIDTH_PX;
-    j=LCD_HEIGHT_PX/2-Z*lcdz+(Y+X)/9.6*LCD_WIDTH_PX;    
-  }
-  
-  void Graph2d::XYZ2ij(const double3 &d,int &i,int &j) const {
-    double X=d.x,Y=d.y,Z=d.z;
-    i=LCD_WIDTH_PX/2+(Y-X)/4.8*LCD_WIDTH_PX;
-    j=LCD_HEIGHT_PX/2-Z*lcdz+(Y+X)/9.6*LCD_WIDTH_PX;    
-  }
-
-  void Graph2d::update_rotation(){
-    solid3d=false;
-    double rx,ry,rz,theta;
-    get_axis_angle_deg(q,rx,ry,rz,theta);
-    // rx=-0.51; ry=-.197; rz=-.835; theta=327.88;
-    // rx=0;ry=1;rz=0; //theta=60;
-    // cout << rx << " " << ry << " " << rz << " " << theta << "\n";
-    // rx=0;ry=0;rz=1;
-    // theta=10;
-    theta *= M_PI/180;
-    double r2=rx*rx+ry*ry+rz*rz,invr2=1/r2;
-    double r=std::sqrt(r2);
-    double c=std::cos(theta),s=std::sin(theta);
-    // mkisom([[rx,ry,rz],theta],1)
-    // 1/r2*[[rx*rx+ry*ry*c+rz*rz*c,rx*ry-rx*ry*c-rz*s*r,rx*rz-rx*rz*c+ry*s*r],[rx*ry-rx*ry*c+rz*s*r,ry*ry+rx*rx*c+rz*rz*c,ry*rz-rx*s*r-ry*rz*c],[rx*rz-rx*rz*c-ry*s*r,ry*rz+rx*s*r-ry*rz*c,rz*rz+rx*rx*c+ry*ry*c]]
-    double a11=invr2*(rx*rx+ry*ry*c+rz*rz*c),a12=invr2*(rx*ry-rx*ry*c-rz*s*r),a13=invr2*(rx*rz-rx*rz*c+ry*s*r);
-    double a21=invr2*(rx*ry-rx*ry*c+rz*s*r),a22=invr2*(ry*ry+rx*rx*c+rz*rz*c),a23=invr2*(ry*rz-rx*s*r-ry*rz*c);
-    double a31=invr2*(rx*rz-rx*rz*c-ry*s*r),a32=invr2*(ry*rz+rx*s*r-ry*rz*c),a33=invr2*(rz*rz+rx*rx*c+ry*ry*c);
-    double xt=(window_xmin+window_xmax)/2,xs=2.0/(window_xmax-window_xmin),yt=(window_ymin+window_ymax)/2,ys=2.0/(window_ymax-window_ymin),zt=(window_zmin+window_zmax)/2,zs=2.0/(window_zmax-window_zmin);
-    double mat[16]={a11*xs,a12*ys,a13*zs,-a11*xt*xs-a12*yt*ys-a13*zt*zs,
-		    a21*xs,a22*ys,a23*zs,-a21*xt*xs-a22*yt*ys-a23*zt*zs,
-		    a31*xs,a32*ys,a33*zs,-a31*xt*xs-a32*yt*ys-a33*zt*zs,
-		    0,0,0,1
-    };
-    for (int i=0;i<sizeof(mat)/sizeof(double);++i)
-      transform[i]=mat[i];
-    inv4(transform,invtransform);
-    surfacev.clear();
-    polyedrev.clear(); polyedre_xyminmax.clear(); polyedre_abcv.clear(); polyedre_faceisclipped.clear(); polyedre_filled.clear();
-    plan_pointv.clear(); plan_abcv.clear(); plan_filled.clear();
-    sphere_centerv.clear(); sphere_radiusv.clear(); sphere_quadraticv.clear();
-    linev.clear(); linetypev.clear(); curvev.clear();
-    pointv.clear(); points.clear();
-    plan_color.clear();sphere_color.clear();polyedre_color.clear();polyedre_faceisclipped.clear();line_color.clear();curve_color.clear(); hyp_color.clear(); point_color.clear();
-    // rotate+translate+scale g
-    vecteur v;
-    aplatir(gen2vecteur(g),v);
-    for (int i=0;i<v.size();++i){
-      int u=default_upcolor,d=default_downcolor,du=default_downupcolor,dd=default_downdowncolor;
-      const char * ptr=0;
-      bool fill_polyedre=false;
-      if (v[i].is_symb_of_sommet(at_pnt)){
-	vecteur & attrv=*v[i]._SYMBptr->feuille._VECTptr;
-	if (attrv.size()>1){
-	  gen attr=attrv[1];
-	  fill_polyedre=get_colors(attr,u,d,du,dd);
-	  if (fill_polyedre) solid3d=true;
-	  if (attrv.size()>2){
-	    attr=attrv[2];
-	    if (attr.type==_STRNG)
-	      ptr=attr._STRNGptr->c_str();
-	    if (attr.type==_IDNT)
-	      ptr=attr._IDNTptr->id_name;
-	  }
-	}
-      }
-      gen G=remove_at_pnt(v[i]);
-      if (G.is_symb_of_sommet(at_curve)){
-	gen f=G._SYMBptr->feuille;
-	f=f[0];
-	f=f[4];
-	if (ckmatrix(f)){
-	  vecteur v=*f._VECTptr;
-	  int n=v.size();
-	  curvev.push_back(vector<double3>(n));
-	  curve_color.push_back(int4(u,d,du,dd));
-	  vector<double3> & cur=curvev.back();
-	  for (int k=0;k<n;++k){
-	    gen P=v[k];
-	    if (P.type==_VECT && P._VECTptr->size()==3){
-	      double X,Y,Z;
-	      do_transform(transform,P[0]._DOUBLE_val,P[1]._DOUBLE_val,P[2]._DOUBLE_val,X,Y,Z);
-	      cur[k]=double3(X,Y,Z);
-	    }
-	  }
-	}
-	continue;
-      }
-      if (G.type==_VECT && G.subtype==_POINT__VECT){
-	gen m=evalf_double(G,1,contextptr);
-	if (m.type==_VECT && m._VECTptr->size()==3){
-	  vecteur & A=*m._VECTptr;
-	  if (A[0].type==_DOUBLE_ && A[1].type==_DOUBLE_ && A[2].type==_DOUBLE_ ){
-	    double X,Y,Z; int I,J;
-	    do_transform(transform,A[0]._DOUBLE_val,A[1]._DOUBLE_val,A[2]._DOUBLE_val,X,Y,Z);
-	    xyz2ij(double3(A[0]._DOUBLE_val,A[1]._DOUBLE_val,A[2]._DOUBLE_val),I,J);
-	    pointv.push_back(double3(I,J,Z));
-	    points.push_back(ptr);
-	    point_color.push_back(int4(u,d,du,dd));
-	  }
-	}
-	continue;
-      }
-      bool line=G.subtype==_LINE__VECT,halfline=G.subtype==_HALFLINE__VECT,segment= G.subtype==_GROUP__VECT;
-      if (G.type==_VECT && G._VECTptr->size()==2 && (line || halfline || segment)){
-	gen a=evalf_double(G._VECTptr->front(),1,contextptr),b=evalf_double(G._VECTptr->back(),1,contextptr);
-	if (a.type==_VECT && b.type==_VECT && a._VECTptr->size()==3 && b._VECTptr->size()==3){
-	  vecteur & A=*a._VECTptr;
-	  vecteur & B=*b._VECTptr;
-	  if (A[0].type==_DOUBLE_ && A[1].type==_DOUBLE_ && A[2].type==_DOUBLE_ && B[0].type==_DOUBLE_ && B[1].type==_DOUBLE_ && B[2].type==_DOUBLE_ ){
-	    lines.push_back(ptr);
-	    double x=A[0]._DOUBLE_val,y=A[1]._DOUBLE_val,z=A[2]._DOUBLE_val;
-#if 0 // ndef OLD_LINE_RENDERING
-	    double3 prev(x,y,z);
-	    linev.push_back(prev);
-#endif
-	    double X,Y,Z;
-	    do_transform(transform,x,y,z,X,Y,Z);
-	    double3 M(X,Y,Z);
-	    x=B[0]._DOUBLE_val;y=B[1]._DOUBLE_val;z=B[2]._DOUBLE_val;
-#if 0 // ndef OLD_LINE_RENDERING
-	    linev.push_back(double3(x-prev.x,y-prev.y,z-prev.z));
-#endif
-	    do_transform(transform,x,y,z,X,Y,Z);
-	    double3 N(X,Y,Z);
-	    double3 v(N.x-M.x,N.y-M.y,N.z-M.z);
-	    linev.push_back(M); linev.push_back(v);
-	    linetypev.push_back(G.subtype);
-	    line_color.push_back(int4(u,d,du,dd));
-	  }
-	}
-	continue;
-      }
-      if (G.is_symb_of_sommet(at_hypersphere)){
-	solid3d=true;
-	vecteur hyp=*G._SYMBptr->feuille._VECTptr;
-	gen c=evalf_double(hyp[0],1,contextptr);
-	double x=c[0]._DOUBLE_val,y=c[1]._DOUBLE_val,z=c[2]._DOUBLE_val,X,Y,Z;
-	do_transform(transform,x,y,z,X,Y,Z);
-	sphere_centerv.push_back(double3(X,Y,Z));
-	gen R=evalf(hyp[1],1,contextptr);
-	double r=R._DOUBLE_val;
-	sphere_radiusv.push_back(r);
-	double * mat=invtransform;
-	matrice qmat(makevecteur(
-				 makevecteur(mat[0],mat[4],mat[8]),
-				 makevecteur(mat[1],mat[5],mat[9]),
-				 makevecteur(mat[2],mat[6],mat[10])
-				 ));
-	qmat=mmult(mtran(qmat),qmat);
-	sphere_quadraticv.push_back(qmat);
-	sphere_color.push_back(int4(u,d,du,dd));
-	bool isclipped=x>=window_xmin+r && x<=window_xmax-r && y>=window_ymin+r && y<=window_ymax-r && z>=window_zmin+r && z<=window_zmax-r;
-	// check if distance of center to window_x/y/xmin/max is <=R
-	sphere_isclipped.push_back(isclipped);
-	continue;
-      }
-      if (G.is_symb_of_sommet(at_hyperplan)){
-	plan_filled.push_back(fill_polyedre);
-	vecteur hyp=*G._SYMBptr->feuille._VECTptr;
-	gen hyp1=evalf_double(hyp[1],1,contextptr);
-	vecteur & hyp1v=*hyp1._VECTptr;
-	double A,B,C,x,y,z,X,Y,Z;
-	A=hyp1v[0]._DOUBLE_val;B=hyp1v[1]._DOUBLE_val;C=hyp1v[2]._DOUBLE_val;
-	do_transform(transform,A,B,C,X,Y,Z);
-	gen hyp0=evalf_double(hyp[0],1,contextptr);
-	vecteur & hyp0v=*hyp0._VECTptr;
-	x=hyp0v[0]._DOUBLE_val;y=hyp0v[1]._DOUBLE_val;z=hyp0v[2]._DOUBLE_val;
-	double * mat=invtransform;
-	A=mat[0]*x+mat[4]*y+mat[8]*z;
-	B=mat[1]*x+mat[5]*y+mat[9]*z;
-	C=mat[2]*x+mat[6]*y+mat[10]*z;
-	double AB=std::abs(A)+std::abs(B);
-	if (std::abs(C)<1e-2*AB){
-	  // almost vertical plane, equation A*(x-X)+B*(y-Y)=0
-	  continue;
-	}
-	A/=C; B/=C;
-	plan_pointv.push_back(double3(X,Y,Z));	
-	plan_abcv.push_back(double3(-A,-B,Z+A*X+B*Y));
-	plan_color.push_back(int4(u,d,du,dd));
-	continue;
-      }
-      if (G.is_symb_of_sommet(at_hypersurface)){
-	solid3d=true;
-	const vecteur & hyp=*G._SYMBptr->feuille._VECTptr;
-	gen hyp0=hyp[0];
-	const vecteur & hyp0v=*hyp0._VECTptr;
-	gen h=hyp0v[4];
-	if (h.type==_VECT && h.subtype==_POLYEDRE__VECT)
-	  G=h;
-	else if (ckmatrix(h,true)){
-	  surfacev.push_back(vector< vector<float3d> >(0));
-	  vector< vector<float3d> > & S=surfacev.back();
-	  const vecteur & V=*h._VECTptr;
-	  S.reserve(V.size());
-	  for (int j=0;j<V.size();++j){
-	    gen Vj=V[j];
-	    vecteur vj=*Vj._VECTptr;
-	    S.push_back(vector<float3d>(0));
-	    vector<float3d> &S_=S.back();
-	    S_.reserve(vj.size());
-	    for (int k=0;k<vj.size();k+=3){
-	      double X,Y,Z;
-	      do_transform(mat,vj[k]._DOUBLE_val,vj[k+1]._DOUBLE_val,vj[k+2]._DOUBLE_val,X,Y,Z);
-	      vj[k]=X; vj[k+1]=Y; vj[k+2]=Z;
-	      S_.push_back(X); S_.push_back(Y); S_.push_back(Z);
-	    }
-	  }
-	  hyp_color.push_back(int4(u,d,du,dd));
-	  continue;
-	} // end quad hypersurface
-      } // end hypersurface
-      if (G.type==_VECT && G.subtype==_GROUP__VECT){
-	G=gen(makevecteur(G),_POLYEDRE__VECT);
-      }
-      if (G.type==_VECT && G.subtype==_POLYEDRE__VECT){
-	vecteur p=*G._VECTptr;
-	polyedrev.reserve(polyedrev.size()+p.size());
-	polyedre_color.reserve(polyedre_color.size()+p.size());
-	polyedre_xyminmax.reserve(polyedre_xyminmax.size()+2*p.size());
-	for (int j=0;j<p.size();++j){
-	  bool is_clipped=false;
-	  gen g=p[j];
-	  if (g.type==_VECT){
-	    vector<double3> cur;
-	    vecteur w=*g._VECTptr;
-	    cur.reserve(w.size()+1);
-	    for (int k=0;k<w.size();++k){
-	      gen P=evalf_double(w[k],1,contextptr);
-	      if (P.type==_VECT && P._VECTptr->size()==3){
-		double x=P[0]._DOUBLE_val,y=P[1]._DOUBLE_val,z=P[2]._DOUBLE_val;
-		if (is_clipped && (x<window_xmin || x>window_xmax || y<window_ymin || y>window_ymax || z<window_zmin || z>window_zmax) )
-		  is_clipped=false;
-		double X,Y,Z;
-		do_transform(transform,x,y,z,X,Y,Z);
-		cur.push_back(double3(X,Y,Z));
-	      }
-	    }
-	    if (cur.size()>=3){
-	      double Z3;int l=0;
-	      for (;l<cur.size()-2;++l){
-		double x0=cur[l].x,y0=cur[l].y,z0=cur[l].z;
-		double x1=cur[l+1].x,y1=cur[l+1].y,z1=cur[l+1].z;
-		double x2=cur[l+2].x,y2=cur[l+2].y,z2=cur[l+2].z;
-		double X1=x1-x0,Y1=y1-y0,Z1=z1-z0;
-		double X2=x2-x0,Y2=y2-y0,Z2=z2-z0;
-		double X3=Y1*Z2-Y2*Z1,Y3=X2*Z1-X1*Z2;Z3=X1*Y2-X2*Y1;
-		double prec=1e-3;
-#if 1
-		if ( (X3!=0 || Y3!=0) && std::abs(Z3)<prec*(std::abs(X3)+std::abs(Y3))){
-		  Z3=1.0001*prec*(std::abs(X3)+std::abs(Y3));
-		}
-#endif
-		if (std::abs(Z3)>prec*(std::abs(X3)+std::abs(Y3))){
-		  // X3*(x-x0)+Y3*(y-y0)+Z3*(z-z0)=0
-		  X3/=Z3; Y3/=Z3;
-		  polyedre_abcv.push_back(double3(-X3,-Y3,z0+X3*x0+Y3*y0));
-		  break;
-		}
-	      }
-	      if (l==cur.size()-2)
-		continue;
-	      cur.push_back(cur.front());
-	      double facemin=1e306,facemax=-1e306;
-	      if (fill_polyedre){
-		for (int l=1;l<cur.size();++l){
-		  double xy=cur[l].y-cur[l].x;
-		  if (xy<facemin)
-		    facemin=xy;
-		  if (xy>facemax)
-		    facemax=xy;
-		  // replace unused z coordinate by slope
-		  // cur[l].z=(cur[l].y-cur[l-1].y)/(cur[l].x-cur[l-1].x);
-		}
-	      }
-	      polyedrev.push_back(vector<double3>(0)); polyedrev.back().swap(cur); // polyedrev.push_back(cur);
-	      polyedre_color.push_back(int4(u,d,du,dd));
-	      polyedre_xyminmax.push_back(facemin);
-	      polyedre_xyminmax.push_back(facemax);
-	      polyedre_faceisclipped.push_back(is_clipped);
-	      polyedre_filled.push_back(fill_polyedre);
-	    } // end cur.size()>=3
-	  } // end g.type==_VECT
-	}
-	continue;
-      }      
-    }
-  }
-
-  bool Graph2d::findij(const gen & e0,double x_scale,double y_scale,double & i0,double & j0,GIAC_CONTEXT) const {
-    gen e,f0,f1;
-    evalfdouble2reim(e0,e,f0,f1,contextptr);
-    if ((f0.type==_DOUBLE_) && (f1.type==_DOUBLE_)){
-      if (display_mode & 0x400){
-	if (f0._DOUBLE_val<=0)
-	  return false;
-	f0=std::log10(f0._DOUBLE_val);
-      }
-      i0=(f0._DOUBLE_val-window_xmin)*x_scale;
-      if (display_mode & 0x800){
-	if (f1._DOUBLE_val<=0)
-	  return false;
-	f1=std::log10(f1._DOUBLE_val);
-      }
-      j0=(window_ymax-f1._DOUBLE_val)*y_scale;
-      return true;
-    }
-    // cerr << "Invalid drawing data" << endl;
-    return false;
-  }
-
-  inline void swapint(int & i0,int & i1){
-    int tmp=i0;
-    i0=i1;
-    i1=tmp;
-  }
-
-  void check_fl_draw(int fontsize,const char * ch,int i0,int j0,int imin,int jmin,int di,int dj,int delta_i,int delta_j,int c){
-    /* int n=fl_size();
-       if (j0>=jmin-n && j0<=jmin+dj+n) */
-    // cerr << i0 << " " << j0 << endl;
-    if (strlen(ch)>200)
-      text_print(fontsize,"String too long",i0+delta_i,j0+delta_j,c);
-    else
-      text_print(fontsize,ch,i0+delta_i,j0+delta_j,c);
-  }
-
-  inline void check_fl_point(int i0,int j0,int imin,int jmin,int di,int dj,int delta_i,int delta_j,int c){
-    /* if (i0>=imin && i0<=imin+di && j0>=jmin && j0<=jmin+dj) */
-    os_set_pixel(i0+delta_i,j0+delta_j,c);
-  }
-
-  static unsigned short int fl_line_width=1;
-  void fl_line(int x0,int y0,int x1,int y1,int c){
-    if (fl_line_width==0)
-      return;
-    if (fl_line_width==1){
-      draw_line(x0,y0,x1,y1,c);
-      return;
-    }
-    double dx=x1-x0,dy=y1-y0;
-    double n=sqrt(dx*dx+dy*dy);
-    dx/=n; dy/=n;
-    for (int d=-fl_line_width/2;d<=(fl_line_width+1)/2;++d){
-      draw_line(x0-d*dy,y0+d*dx,x1-d*dy,y1+d*dx,c);
-    }
-    draw_filled_circle(x0,y0,(fl_line_width-1)/2,c,true,true);
-    draw_filled_circle(x1,y1,(fl_line_width-1)/2,c,true,true);
-  }
-
-  inline void fl_polygon(int x0,int y0,int x1,int y1,int x2,int y2,int c){
-    fl_line(x0,y0,x1,y1,c);
-    fl_line(x1,y1,x2,y2,c);
-    fl_line(x2,y2,x0,y0,c);
-  }
-
-  inline void check_fl_line(int i0,int j0,int i1,int j1,int imin,int jmin,int di,int dj,int delta_i,int delta_j,int c){
-    fl_line(i0+delta_i,j0+delta_j,i1+delta_i,j1+delta_j,c);
-  }
-
-  int logplot_points=20;
-
-  void checklog_fl_line(double i0,double j0,double i1,double j1,double deltax,double deltay,bool logx,bool logy,double window_xmin,double x_scale,double window_ymax,double y_scale,int c){
-    if (!logx && !logy){
-      fl_line(round(i0+deltax),round(j0+deltay),round(i1+deltax),round(j1+deltay),c);
-      return;
-    }
-  }
-
-  void find_dxdy(const string & legendes,int labelpos,int labelsize,int & dx,int & dy){
-    int l=text_width(labelsize,legendes.c_str());
-    dx=3;
-    dy=1;
-    switch (labelpos){
-    case 1:
-      dx=-l-3;
-      break;
-    case 2:
-      dx=-l-3;
-      dy=labelsize-2;
-      break;
-    case 3:
-      dy=labelsize-2;
-      break;
-    }
-    //dy += labelsize;
-  }
-
-  void draw_legende(const vecteur & f,int i0,int j0,int labelpos,const Graph2d * iptr,int clip_x,int clip_y,int clip_w,int clip_h,int deltax,int deltay,int c,GIAC_CONTEXT){
-    if (f.empty() ||!iptr->show_names )
-      return;
-    string legendes;
-    if (f[0].is_symb_of_sommet(at_curve)){
-      gen & f0=f[0]._SYMBptr->feuille;
-      if (f0.type==_VECT && !f0._VECTptr->empty()){
-	gen & f1 = f0._VECTptr->front();
-	if (f1.type==_VECT && f1._VECTptr->size()>4 && (!is_zero((*f1._VECTptr)[4]) || (iptr->show_names & 2)) ){
-	  gen legende=f1._VECTptr->front();
-	  gen var=(*f1._VECTptr)[1];
-	  gen r=re(legende,contextptr),i=im(legende,contextptr),a,b;
-	  if (var.type==_IDNT && is_linear_wrt(r,*var._IDNTptr,a,b,contextptr)){
-	    i=subst(i,var,(var-b)/a,false,contextptr);
-	    legendes=i.print(contextptr);
-	  }
-	  else
-	    legendes=r.print(contextptr)+","+i.print(contextptr);
-	  if (legendes.size()>18){
-	    if (legendes.size()>30)
-	      legendes="";
-	    else
-	      legendes=legendes.substr(0,16)+"...";
-	  }
-	}
-      }
-    }
-    if (f.size()>2)
-      legendes=gen2string(f[2])+(legendes.empty()?"":":")+legendes;
-    if (legendes.empty())
-      return;
-    int fontsize=iptr->labelsize;
-    int dx=3,dy=1;
-    find_dxdy(legendes,labelpos,fontsize,dx,dy);
-    check_fl_draw(fontsize,legendes.c_str(),i0+dx,j0+dy,clip_x,clip_y,clip_w,clip_h,deltax,deltay,c);
-  }
-
-  void petite_fleche(double i1,double j1,double dx,double dy,int deltax,int deltay,int width,int c){
-    double dxy=std::sqrt(dx*dx+dy*dy);
-    if (dxy){
-      dxy/=max(2,min(5,int(dxy/10)))+width;
-      dx/=dxy;
-      dy/=dxy;
-      double dxp=-dy,dyp=dx; // perpendicular
-      dx*=std::sqrt(3.0);
-      dy*=sqrt(3.0);
-      fl_polygon(round(i1)+deltax,round(j1)+deltay,round(i1+dx+dxp)+deltax,round(j1+dy+dyp)+deltay,round(i1+dx-dxp)+deltax,round(j1+dy-dyp)+deltay,c);
-    }
-  }
-
-  void fltk_point(int deltax,int deltay,int i0,int j0,int epaisseur_point,int type_point,int c){
-    switch (type_point){
-    case 1: // losange
-      fl_line(deltax+i0-epaisseur_point,deltay+j0,deltax+i0,deltay+j0-epaisseur_point,c);
-      fl_line(deltax+i0,deltay+j0-epaisseur_point,deltax+i0+epaisseur_point,deltay+j0,c);
-      fl_line(deltax+i0-epaisseur_point,deltay+j0,deltax+i0,deltay+j0+epaisseur_point,c);
-      fl_line(deltax+i0,deltay+j0+epaisseur_point,deltax+i0+epaisseur_point,deltay+j0,c);
-      break;
-    case 2: // croix verticale
-      fl_line(deltax+i0,deltay+j0-epaisseur_point,deltax+i0,deltay+j0+epaisseur_point,c);
-      fl_line(deltax+i0-epaisseur_point,deltay+j0,deltax+i0+epaisseur_point,deltay+j0,c);
-      break;
-    case 3: // carre
-      fl_line(deltax+i0-epaisseur_point,deltay+j0-epaisseur_point,deltax+i0-epaisseur_point,deltay+j0+epaisseur_point,c);
-      fl_line(deltax+i0+epaisseur_point,deltay+j0-epaisseur_point,deltax+i0+epaisseur_point,deltay+j0+epaisseur_point,c);
-      fl_line(deltax+i0-epaisseur_point,deltay+j0-epaisseur_point,deltax+i0+epaisseur_point,deltay+j0-epaisseur_point,c);
-      fl_line(deltax+i0-epaisseur_point,deltay+j0+epaisseur_point,deltax+i0+epaisseur_point,deltay+j0+epaisseur_point,c);
-      break;
-    case 5: // triangle
-      fl_line(deltax+i0-epaisseur_point,deltay+j0,deltax+i0,deltay+j0-epaisseur_point,c);
-      fl_line(deltax+i0,deltay+j0-epaisseur_point,deltax+i0+epaisseur_point,deltay+j0,c);
-      fl_line(deltax+i0-epaisseur_point,deltay+j0,deltax+i0+epaisseur_point,deltay+j0,c);
-      break;
-    case 7: // point
-      if (epaisseur_point>2)
-	fl_arc(deltax+i0-(epaisseur_point-1),deltay+j0-(epaisseur_point-1),2*(epaisseur_point-1),2*(epaisseur_point-1),0,360,c);
-      else
-	fl_line(deltax+i0,deltay+j0,deltax+i0+1,deltay+j0,c);
-      break;
-    case 6: // etoile
-      fl_line(deltax+i0-epaisseur_point,deltay+j0,deltax+i0+epaisseur_point,deltay+j0,c);
-      // no break to add the following lines
-    case 0: // 0 croix diagonale
-      fl_line(deltax+i0-epaisseur_point,deltay+j0-epaisseur_point,deltax+i0+epaisseur_point,deltay+j0+epaisseur_point,c);
-      fl_line(deltax+i0-epaisseur_point,deltay+j0+epaisseur_point,deltax+i0+epaisseur_point,deltay+j0-epaisseur_point,c);
-      break;
-    default: // 4 nothing drawn
-      break;
-    }
-  }
-
-  int horiz_or_vert(const_iterateur jt,GIAC_CONTEXT){
-    gen tmp(*(jt+1)-*jt),r,i;
-    reim(tmp,r,i,contextptr);
-    if (is_zero(r,contextptr)) return 1;
-    if (is_zero(i,contextptr)) return 2;
-    return 0;
-  }
-
-  void fltk_draw(Graph2d & Mon_image,const gen & g,double x_scale,double y_scale,int clip_x,int clip_y,int clip_w,int clip_h,GIAC_CONTEXT){
-    int deltax=0,deltay=STATUS_AREA_PX,fontsize=Mon_image.labelsize;
-    if (g.type==_VECT){
-      const vecteur & v=*g._VECTptr;
-      const_iterateur it=v.begin(),itend=v.end();
-      for (;it!=itend;++it)
-	fltk_draw(Mon_image,*it,x_scale,y_scale,clip_x,clip_y,clip_w,clip_h,contextptr);
-    }
-    if (g.type!=_SYMB)
-      return;
-    unary_function_ptr s=g._SYMBptr->sommet;
-    if (g._SYMBptr->feuille.type!=_VECT)
-      return;
-    vecteur f=*g._SYMBptr->feuille._VECTptr;
-    int mxw=LCD_WIDTH_PX,myw=LCD_HEIGHT_PX-STATUS_AREA_PX;
-    double i0,j0,i0save,j0save,i1,j1;
-    int fs=f.size();
-    if ((fs==4) && (s==at_parameter)){
-      return ;
-    }
-    string the_legend;
-    vecteur style(get_style(f,the_legend));
-    int styles=style.size();
-    // color
-    int ensemble_attributs = style.front().val;
-    bool hidden_name = false;
-    if (style.front().type==_ZINT){
-      ensemble_attributs = mpz_get_si(*style.front()._ZINTptr);
-      hidden_name=true;
-    }
-    else
-      hidden_name=ensemble_attributs<0;
-    int width           =(ensemble_attributs & 0x00070000) >> 16; // 3 bits
-    int epaisseur_point =(ensemble_attributs & 0x00380000) >> 19; // 3 bits
-    int type_line       =(ensemble_attributs & 0x01c00000) >> 22; // 3 bits
-    if (type_line>4)
-      type_line=(type_line-4)<<8;
-    int type_point      =(ensemble_attributs & 0x0e000000) >> 25; // 3 bits
-    int labelpos        =(ensemble_attributs & 0x30000000) >> 28; // 2 bits
-    bool fill_polygon   =(ensemble_attributs & 0x40000000) >> 30;
-    int couleur         =(ensemble_attributs & 0x0007ffff);
-    epaisseur_point += 2;
-    if (s==at_pnt){ 
-      // f[0]=complex pnt or vector of complex pnts or symbolic
-      // f[1] -> style 
-      // f[2] optional=label
-      gen point=f[0];
-      if (point.type==_VECT && point.subtype==_POINT__VECT)
-	return;
-      if ( (f[0].type==_SYMB) && (f[0]._SYMBptr->sommet==at_curve) && (f[0]._SYMBptr->feuille.type==_VECT) && (f[0]._SYMBptr->feuille._VECTptr->size()) ){
-	// Mon_image.show_mouse_on_object=false;
-	point=f[0]._SYMBptr->feuille._VECTptr->back();
-	if (type_line>=4 && point.type==_VECT && point._VECTptr->size()>2){
-	  vecteur v=*point._VECTptr;
-	  int vs=v.size()/2; // 3 -> 1
-	  if (Mon_image.findij(v[vs],x_scale,y_scale,i0,j0,contextptr) && Mon_image.findij(v[vs+1],x_scale,y_scale,i1,j1,contextptr)){
-	    bool logx=Mon_image.display_mode & 0x400,logy=Mon_image.display_mode & 0x800;
-	    checklog_fl_line(i0,j0,i1,j1,deltax,deltay,logx,logy,Mon_image.window_xmin,x_scale,Mon_image.window_ymax,y_scale,couleur);
-	    double dx=i0-i1,dy=j0-j1;
-	    petite_fleche(i1,j1,dx,dy,deltax,deltay,width+3,couleur);
-	  }
-	}
-      }
-      if (is_undef(point))
-	return;
-      // fl_line_style(type_line,width+1,0); 
-      if (point.type==_SYMB) {
-	if (point._SYMBptr->sommet==at_cercle){
-	  vecteur v=*point._SYMBptr->feuille._VECTptr;
-	  gen diametre=remove_at_pnt(v[0]);
-	  gen e1=diametre._VECTptr->front().evalf_double(1,contextptr),e2=diametre._VECTptr->back().evalf_double(1,contextptr);
-	  gen centre=rdiv(e1+e2,2.0,contextptr);
-	  gen e12=e2-e1;
-	  double ex=evalf_double(re(e12,contextptr),1,contextptr)._DOUBLE_val,ey=evalf_double(im(e12,contextptr),1,contextptr)._DOUBLE_val;
-	  if (!Mon_image.findij(centre,x_scale,y_scale,i0,j0,contextptr))
-	    return;
-	  gen diam=std::sqrt(ex*ex+ey*ey);
-	  gen angle=std::atan2(ey,ex);
-	  gen a1=v[1].evalf_double(1,contextptr),a2=v[2].evalf_double(1,contextptr);
-	  bool full=v[1]==0 && v[2]==cst_two_pi;
-	  if ( (diam.type==_DOUBLE_) && (a1.type==_DOUBLE_) && (a2.type==_DOUBLE_) ){
-	    i1=diam._DOUBLE_val*x_scale/2.0;
-	    j1=diam._DOUBLE_val*y_scale/2.0;
-	    double a1d=a1._DOUBLE_val,a2d=a2._DOUBLE_val,angled=angle._DOUBLE_val;
-	    bool changer_sens=a1d>a2d;
-	    if (changer_sens){
-	      double tmp=a1d;
-	      a1d=a2d;
-	      a2d=tmp;
-	    }
-	    double anglei=(angled+a1d),anglef=(angled+a2d),anglem=(anglei+anglef)/2;
-	    if (fill_polygon)
-	      fl_pie(deltax+round(i0-i1),deltay+round(j0-j1),round(2*i1),round(2*j1),full?0:anglei*180/M_PI+.5,full?360:anglef*180/M_PI+.5,couleur,false);
-	    else {
-	      fl_arc(deltax+round(i0-i1),deltay+round(j0-j1),round(2*i1),round(2*j1),full?0:anglei*180/M_PI+.5,full?360:anglef*180/M_PI+.5,couleur);
-	      if (v.size()>=4){ // if cercle has the optional 5th arg
-		if (v[3]==2)
-		  petite_fleche(i0+i1*std::cos(anglem),j0-j1*std::sin(anglem),-i1*std::sin(anglem),-j1*std::cos(anglem),deltax,deltay,width,couleur);
-		else {
-		  if (changer_sens)
-		    petite_fleche(i0+i1*std::cos(anglei),j0-j1*std::sin(anglei),-i1*std::sin(anglei),-j1*std::cos(anglei),deltax,deltay,width,couleur);
-		  else
-		    petite_fleche(i0+i1*std::cos(anglef),j0-j1*std::sin(anglef),i1*std::sin(anglef),j1*std::cos(anglef),deltax,deltay,width,couleur);
-		}
-	      }
-	    }
-	    // Label a few degrees from the start angle, 
-	    // FIXME should use labelpos
-	    double anglel=angled+a1d+0.3;
-	    if (v.size()>=4 && v[3]==2)
-	      anglel=angled+(0.45*a1d+0.55*a2d);
-	    i0=i0+i1*std::cos(anglel); 
-	    j0=j0-j1*std::sin(anglel);
-	    if (!hidden_name)
-	      draw_legende(f,round(i0),round(j0),labelpos,&Mon_image,clip_x,clip_y,clip_w,clip_h,0,0,couleur,contextptr);
-	    return;
-	  }
-	} // end circle
-#if 0
-	if (point._SYMBptr->sommet==at_legende){
-	  gen & f=point._SYMBptr->feuille;
-	  if (f.type==_VECT && f._VECTptr->size()==3){
-	    vecteur & fv=*f._VECTptr;
-	    if (fv[0].type==_VECT && fv[0]._VECTptr->size()>=2 && fv[1].type==_STRNG && fv[2].type==_INT_){
-	      vecteur & fvv=*fv[0]._VECTptr;
-	      if (fvv[0].type==_INT_ && fvv[1].type==_INT_){
-		int dx=0,dy=0;
-		string legendes(*fv[1]._STRNGptr);
-		find_dxdy(legendes,labelpos,fontsize,dx,dy);
-		text_print(fontsize,legendes.c_str(),deltax+fvv[0].val+dx,deltay+fvv[1].val+dy,fv[2].val);
-	      }
-	    }
-	  }
-	}
-#endif
-      } // end point.type==_SYMB
-      if (point.type!=_VECT || (point.type==_VECT && (point.subtype==_GROUP__VECT || point.subtype==_VECTOR__VECT) && point._VECTptr->size()==2 && is_zero(point._VECTptr->back()-point._VECTptr->front())) ){ // single point
-	if (!Mon_image.findij((point.type==_VECT?point._VECTptr->front():point),x_scale,y_scale,i0,j0,contextptr))
-	  return;
-	if (i0>0 && i0<mxw && j0>0 && j0<myw)
-	  fltk_point(deltax,deltay,round(i0),round(j0),epaisseur_point,type_point,couleur);
-	if (!hidden_name)
-	  draw_legende(f,round(i0),round(j0),labelpos,&Mon_image,clip_x,clip_y,clip_w,clip_h,0,0,couleur,contextptr);
-	return;
-      }
-      // path
-      const_iterateur jt=point._VECTptr->begin(),jtend=point._VECTptr->end();
-      if (jt==jtend)
-	return;
-      bool logx=Mon_image.display_mode & 0x400,logy=Mon_image.display_mode & 0x800;
-      if (jt->type==_VECT)
-	return;
-      if ( (type_point || epaisseur_point>2) && type_line==0 && width==0){
-	for (;jt!=jtend;++jt){
-	  if (!Mon_image.findij(*jt,x_scale,y_scale,i0,j0,contextptr))
-	    return;
-	  if (i0>0 && i0<mxw && j0>0 && j0<myw)
-	    fltk_point(deltax,deltay,round(i0),round(j0),epaisseur_point,type_point,couleur);
-	}
-	if (!hidden_name)
-	  draw_legende(f,round(i0),round(j0),labelpos,&Mon_image,clip_x,clip_y,clip_w,clip_h,0,0,couleur,contextptr);
-	return;
-      }
-      // initial point
-      if (!Mon_image.findij(*jt,x_scale,y_scale,i0,j0,contextptr))
-	return;
-      i0save=i0;
-      j0save=j0;
-      if (fill_polygon){
-	if (jtend-jt==5 && *(jt+4)==*jt){
-	  // check rectangle parallel to axes -> draw_rectangle (filled)
-	  int cote1=horiz_or_vert(jt,contextptr);
-	  if (cote1 && horiz_or_vert(jt+1,contextptr)==3-cote1 && horiz_or_vert(jt+2,contextptr)==cote1 && horiz_or_vert(jt+3,contextptr)==3-cote1){
-	    if (!Mon_image.findij(*(jt+2),x_scale,y_scale,i0,j0,contextptr))
-	      return;
-	    int x,y,w,h;
-	    if (i0<i0save){
-	      x=i0;
-	      w=i0save-i0;
-	    }
-	    else {
-	      x=i0save;
-	      w=i0-i0save;
-	    }
-	    if (j0<j0save){
-	      y=j0;
-	      h=j0save-j0;
-	    }
-	    else {
-	      y=j0save;
-	      h=j0-j0save;
-	    }
-	    draw_rectangle(deltax+x,deltay+y,w+1,h+1,couleur);
-	    if (!hidden_name)
-	      draw_legende(f,deltax+x,deltay+y,labelpos,&Mon_image,clip_x,clip_y,clip_w,clip_h,0,0,couleur,contextptr);
-	    return;
-	  }
-	} // end rectangle check
-	bool closed=*jt==*(jtend-1);
-	vector< vector<int> > vi(jtend-jt+(closed?0:1),vector<int>(2));
-	for (int pos=0;jt!=jtend;++pos,++jt){
-	  if (!Mon_image.findij(*jt,x_scale,y_scale,i0,j0,contextptr))
-	    return;
-	  vi[pos][0]=i0+deltax;
-	  vi[pos][1]=j0+deltay;
-	}
-	if (!closed)
-	  vi.back()=vi.front();
-	draw_filled_polygon(vi,0,LCD_WIDTH_PX,0,LCD_HEIGHT_PX,couleur);
-	if (!hidden_name)
-	  draw_legende(f,round(i0),round(j0),labelpos,&Mon_image,clip_x,clip_y,clip_w,clip_h,0,0,couleur,contextptr);
-	return;
-      }
-      ++jt;
-      if (jt==jtend){
-	if (i0>0 && i0<mxw && j0>0 && j0<myw)
-	  check_fl_point(deltax+round(i0),deltay+round(j0),clip_x,clip_y,clip_w,clip_h,0,0,couleur);
-	if (!hidden_name)
-	  draw_legende(f,round(i0),round(j0),labelpos,&Mon_image,clip_x,clip_y,clip_w,clip_h,0,0,couleur,contextptr);
-	return;
-      }
-      bool seghalfline=( point.subtype==_LINE__VECT || point.subtype==_HALFLINE__VECT ) && (point._VECTptr->size()==2);
-      // rest of the path
-      for (;;){
-	if (!Mon_image.findij(*jt,x_scale,y_scale,i1,j1,contextptr))
-	  return;
-	if (!seghalfline){
-	  checklog_fl_line(i0,j0,i1,j1,deltax,deltay,logx,logy,Mon_image.window_xmin,x_scale,Mon_image.window_ymax,y_scale,couleur);
-	  if (point.subtype==_VECTOR__VECT){
-	    double dx=i0-i1,dy=j0-j1;
-	    petite_fleche(i1,j1,dx,dy,deltax,deltay,width,couleur);
-	  }
-	}
-	++jt;
-	if (jt==jtend){ // label of line at midpoint
-	  if (point.subtype==_LINE__VECT){
-	    i0=(6*i1-i0)/5-8;
-	    j0=(6*j1-j0)/5-8;
-	  }
-	  else {
-	    i0=(i0+i1)/2-8;
-	    j0=(j0+j1)/2;
-	  }
-	  break;
-	}
-	i0=i1;
-	j0=j1;
-      }
-      // check for a segment/halfline/line
-      if ( seghalfline){
-	double deltai=i1-i0save,adeltai=absdouble(deltai);
-	double deltaj=j1-j0save,adeltaj=absdouble(deltaj);
-	if (point.subtype==_LINE__VECT){
-	  if (deltai==0)
-	    checklog_fl_line(i1,0,i1,clip_h,deltax,deltay,logx,logy,Mon_image.window_xmin,x_scale,Mon_image.window_ymax,y_scale,couleur);
-	  else {
-	    if (deltaj==0)
-	      checklog_fl_line(0,j1,clip_w,j1,deltax,deltay,Mon_image.display_mode & 0x400,Mon_image.display_mode & 0x800,Mon_image.window_xmin,x_scale,Mon_image.window_ymax,y_scale,couleur);
-	    else {
-	      // Find the intersections with the 4 rectangle segments
-	      // Horizontal x=0 or w =i1+t*deltai: y=j1+t*deltaj
-	      vector< complex<double> > pts;
-	      double y0=j1-i1/deltai*deltaj,tol=clip_h*1e-6;
-	      if (y0>=-tol && y0<=clip_h+tol)
-		pts.push_back(complex<double>(0.0,y0));
-	      double yw=j1+(clip_w-i1)/deltai*deltaj;
-	      if (yw>=-tol && yw<=clip_h+tol)
-		pts.push_back(complex<double>(clip_w,yw));
-	      // Vertical y=0 or h=j1+t*deltaj, x=i1+t*deltai
-	      double x0=i1-j1/deltaj*deltai;
-	      tol=clip_w*1e-6;
-	      if (x0>=-tol && x0<=clip_w+tol)
-		pts.push_back(complex<double>(x0,0.0));
-	      double xh=i1+(clip_h-j1)/deltaj*deltai;
-	      if (xh>=-tol && xh<=clip_w+tol)
-		pts.push_back(complex<double>(xh,clip_h));
-	      if (pts.size()>=2)
-		checklog_fl_line(pts[0].real(),pts[0].imag(),pts[1].real(),pts[1].imag(),deltax,deltay,Mon_image.display_mode & 0x400,Mon_image.display_mode & 0x800,Mon_image.window_xmin,x_scale,Mon_image.window_ymax,y_scale,couleur);
-	    } // end else adeltai==0 , adeltaj==0
-	  } // end else adeltai==0
-	} // end LINE_VECT
-	else {
-	  double N=1;
-	  if (adeltai){
-	    N=clip_w/adeltai+1;
-	    if (adeltaj)
-	      N=max(N,clip_h/adeltaj+1);
-	  }
-	  else {
-	    if (adeltaj)
-	      N=clip_h/adeltaj+1;
-	  }
-	  N *= 2; // increase N since rounding might introduce too small clipping
-	  while (fabs(N*deltai)>10000)
-	    N /= 2;
-	  while (fabs(N*deltaj)>10000)
-	    N /= 2;
-	  checklog_fl_line(i0save,j0save,i1+N*deltai,j1+N*deltaj,deltax,deltay,Mon_image.display_mode & 0x400,Mon_image.display_mode & 0x800,Mon_image.window_xmin,x_scale,Mon_image.window_ymax,y_scale,couleur);
-	}
-      } // end seghalfline
-      if ( (point.subtype==_GROUP__VECT) && (point._VECTptr->size()==2))
-	; // no legend for segment
-      else {
-	if (!hidden_name)
-	  draw_legende(f,round(i0),round(j0),labelpos,&Mon_image,clip_x,clip_y,clip_w,clip_h,0,0,couleur,contextptr);
-      }
-    } // end pnt subcase
-  }
-#endif
-
-  // return a vector of values with simple decimal representation
-  // between xmin/xmax or including xmin/xmax (if bounds is true)
-  vecteur ticks(double xmin,double xmax,bool bounds){
-    if (xmax<xmin)
-      swapdouble(xmin,xmax);
-    double dx=xmax-xmin;
-    vecteur res;
-    if (dx==0)
-      return res;
-    double d=std::pow(10.0,std::floor(std::log10(dx)));
-    if (dx<2*d)
-      d=d/5;
-    else {
-      if (dx<5*d)
-	d=d/2;
-    }
-    double x1=std::floor(xmin/d)*d;
-    double x2=(bounds?std::ceil(xmax/d):std::floor(xmax/d))*d;
-    for (double x=x1+(bounds?0:d);x<=x2;x+=d){
-      if (absdouble(x-int(x+.5))<1e-6*d)
-	res.push_back(int(x+.5));
-      else
-	res.push_back(x);
-    }
-    return res;
-  }
-
-  void normalize(double & x, double & y){
-    double fx=fabs(x),fy=fabs(y);
-    if (fx>fy){
-      y/=fx;
-      x/=fx;
-    }
-    else {
-      x/=fy;
-      y/=fy;
-    }
-    double n=std::sqrt(x*x+y*y);
-    x/=n; y/=n;
-  }
-
-  void Graph2d::addpolyg(vector<int2> & polyg,double x,double y,double z,int2 & IJmin) const {
-    int I,J;
-    xyz2ij(double3(x,y,z),I,J);
-    int2 IJ(I,J);
-    polyg.push_back(IJ);
-    if (IJ<IJmin)
-      IJmin=IJ;
-  }
-
-  void Graph2d::draw(){
-    if (is3d){
-      if (lang==1)
-	statuslinemsg("Toolbox: aide");
-      else
-	statuslinemsg("Toolbox: help");
-      double3 A(window_xmin,window_ymin,window_zmin),
-	B(window_xmin,window_ymin,window_zmax),
-	C(window_xmax,window_ymin,window_zmin),
-	D(window_xmax,window_ymin,window_zmax),
-	E(window_xmin,window_ymax,window_zmin),
-	F(window_xmin,window_ymax,window_zmax),
-	G(window_xmax,window_ymax,window_zmin),
-	H(window_xmax,window_ymax,window_zmax);
-      xyz2ij(A,Ai,Aj);
-      xyz2ij(B,Bi,Bj);
-      xyz2ij(C,Ci,Cj);
-      xyz2ij(D,Di,Dj);
-      xyz2ij(E,Ei,Ej);
-      xyz2ij(F,Fi,Fj);
-      xyz2ij(G,Gi,Gj);
-      xyz2ij(H,Hi,Hj);
-      set_abort();
-      glsurface(precision,precision,lcdz,contextptr,default_upcolor,default_downcolor,default_downupcolor,default_downdowncolor);
-      clear_abort();
-      if (show_edges){
-	// polyhedrons
-	for (int k=0;k<int(polyedrev.size());++k){
-	  const vector<double3> & cur=polyedrev[k]; // current face
-	  const int4 & col=polyedre_color[k];
-	  for (int l=1;l<int(cur.size());++l){
-	    const double3 & p=cur[l?l-1:cur.size()-1];
-	    const double3 & c=cur[l];
-	    // is edge visible?
-	    double3 m(p.x/2+c.x/2,p.y/2+c.y/2,p.z/2+c.z/2);
-	    double xy=m.x+m.y;
-	    int mi,mj;
-	    XYZ2ij(m,mi,mj);
-	    int kk,jmin=RAND_MAX,jmax=-RAND_MAX;
-	    for (kk=0;kk<int(polyedrev.size());++kk){
-	      if (k==kk)
-		continue;
-	      const vector<double3> & Cur=polyedrev[kk];
-	      int ll;
-	      // first check if point is in face
-	      for (ll=1;ll<int(Cur.size());++ll){
-		const double3 & P=Cur[ll?ll-1:Cur.size()-1];
-		const double3 & C=Cur[ll];
-		double3 M(P.x/2+C.x/2,P.y/2+C.y/2,P.z/2+C.z/2);
-		if (M.x==m.x && M.y==m.y && M.z==m.z){
-		  break; // edge PC has same midpoint, will ignore face
-		}
-	      }
-	      if (ll<int(Cur.size())) // point is in face, ignore face
-		continue;
-	      double3 M0; bool found1st=false;
-	      for (ll=1;ll<int(Cur.size());++ll){
-		const double3 & P=Cur[ll?ll-1:Cur.size()-1];
-		const double3 & C=Cur[ll];
-		// intersect plane y-x=m.y-m.x with PC edge P+t*PC
-		double PCx=C.x-P.x,PCy=C.y-P.y,dPC=PCy-PCx;
-		// P.y-P.x + t*dPC=m.y-m.x
-		if (dPC==0) // edge is parallel
-		  continue;
-		double t=((m.y-m.x)+(P.x-P.y))/dPC;
-		if (t<0 || t>1)
-		  continue;
-		double x=P.x+t*PCx;
-		double y=P.y+t*PCy;
-		double z=P.z+t*(C.z-P.z);
-		if (!found1st){
-		  M0=double3(x,y,z);
-		  found1st=true;
-		  continue;
-		}
-		if (x==M0.x && y==M0.y && z==M0.z)
-		  continue;
-		// segment([x,y,z],M0) has same y-x as m,
-		// find segment position for same y+x as m [x,y,z]+t*(M0-[x,y,z])
-		// yx=x+y+t*(M0.x-x+M0.y-y)
-		double M0xy=M0.x-x+M0.y-y;
-		int i1,j1,i2,j2; // N.B. i1,i2 should be the same as mi
-		if (std::abs(M0xy)<1e-14)
-		  t=-1;
-		else
-		  t=(xy-x-y)/M0xy;
-		if (t<=0 || t>=1){
-		  if (x+y<=xy) // segment is behind midpoint m
-		    continue;
-		  XYZ2ij(M0,i1,j1); 
-		  XYZ2ij(double3(x,y,z),i2,j2);
-		  if (j1>j2) swapint(j1,j2);
-		  if (jmin>j1) jmin=j1;
-		  if (jmax<j2) jmax=j2;
-		  if (jmin<mj && mj<jmax){
-		    break;
-		  }
-		  continue;
-		}
-		// find segment part that might mask midpoint m
-		double X = x+t*(M0.x-x);
-		double Y = y+t*(M0.y-y);
-		double Z = z+t*(M0.z-z);
-		XYZ2ij(double3(X,Y,Z),i1,j1);
-		if (x+y<=xy)
-		  XYZ2ij(M0,i2,j2);
-		else
-		  XYZ2ij(double3(x,y,z),i2,j2);
-		if (j1>j2) swapint(j1,j2);
-		if (jmin>j1) jmin=j1;
-		if (jmax<j2) jmax=j2;
-		if (jmin<mj && mj<jmax){
-		  break;
-		}
-	      } // end for
-	      if (ll<int(Cur.size())){
-		// means edge is not visible
-		break;
-	      }
-	    }
-	    // polyedre attribute: filled/not filled
-	    bool filled=polyedre_filled[k];
-	    bool hidden=kk<int(polyedrev.size());
-	    if (filled && hidden)
-	      continue;
-	    int i1,j1,i2,j2;
-	    XYZ2ij(p,i1,j1);
-	    XYZ2ij(c,i2,j2);
-	    if (i1>i2 || (i1==i2 && j1>j2)){
-	      swapint(i1,i2); swapint(j1,j2);
-	    }
-	    drawLine(i1,j1,i2,j2,
-		     // col.d | 0x400000
-		     col.u | ((hidden || filled)?0x400000:0)
-		     );
-	  }
-	}
-      }
-      if (show_axes){
-	// cube A,B,C,D,E,F,G,H
-	// X
-	drawLine(Ai,Aj,Ci,Cj,COLOR_RED | 0x800000);
-	drawLine(Bi,Bj,Di,Dj,COLOR_RED | 0x800000);
-	drawLine(Ei,Ej,Gi,Gj,COLOR_RED | 0x800000);
-	drawLine(Fi,Fj,Hi,Hj,COLOR_RED | 0x800000);
-	// Y
-	drawLine(Ai,Aj,Ei,Ej,COLOR_GREEN | 0x800000);
-	drawLine(Bi,Bj,Fi,Fj,COLOR_GREEN | 0x800000);
-	drawLine(Ci,Cj,Gi,Gj,COLOR_GREEN | 0x800000);
-	drawLine(Di,Dj,Hi,Hj,COLOR_GREEN | 0x800000);
-	// Z
-	drawLine(Ai,Aj,Bi,Bj,12345 | 0x800000);
-	drawLine(Ci,Cj,Di,Dj,12345 | 0x800000);
-	drawLine(Ei,Ej,Fi,Fj,12345 | 0x800000);
-	drawLine(Gi,Gj,Hi,Hj,12345 | 0x800000);
-	// planes
-	vecteur attrv(gen2vecteur(g));
-	for (int i=0;i<attrv.size();++i){
-	  gen attr=attrv[i];
-	  gen cur=remove_at_pnt(attr);
-	  int upcolor=44444;
-	  const char * nameptr=0;
-	  if (attr.is_symb_of_sommet(at_pnt)){
-	    if (show_names && attr._SYMBptr->feuille.type==_VECT && attr._SYMBptr->feuille._VECTptr->size()==3){
-	      gen name=attr._SYMBptr->feuille._VECTptr->back();
-	      if (name.type==_IDNT)
-		nameptr=name._IDNTptr->id_name;
-	      if (name.type==_STRNG)
-		nameptr=name._STRNGptr->c_str();
-	    }
-	    attr=attr._SYMBptr->feuille[1];
-	    if (attr.type==_INT_ && (attr.val & 0xffff)!=0){
-	      upcolor=attr.val &0xffff;
-	    }
-	  }
-	  if (cur.is_symb_of_sommet(at_hyperplan)){
-	    vecteur & w=*cur._SYMBptr->feuille._VECTptr;
-	    gen m=evalf_double(w[1],1,contextptr),n=evalf_double(w[0],1,contextptr);
-	    double a=n[0]._DOUBLE_val,b=n[1]._DOUBLE_val,c=n[2]._DOUBLE_val;
-	    double x0=m[0]._DOUBLE_val,y0=m[1]._DOUBLE_val,z0=m[2]._DOUBLE_val;
-	    // a*(x-x0)+b*(y-y0)+c*(z-z0)=0
-	    // replace 2 coordinates of M with window_xyzminmax and find last coord
-	    vector<int2> polyg; int2 IJmin={RAND_MAX,RAND_MAX};
-	    // x
-	    if (a!=0){
-	      double x=x0-1/a*(b*(window_ymin-y0)+c*(window_zmin-z0));
-	      if (x>=window_xmin && x<=window_xmax)
-		addpolyg(polyg,x,window_ymin,window_zmin,IJmin);
-	      x=x0-1/a*(b*(window_ymin-y0)+c*(window_zmax-z0));
-	      if (x>=window_xmin && x<=window_xmax)
-		addpolyg(polyg,x,window_ymin,window_zmax,IJmin);
-	      x=x0-1/a*(b*(window_ymax-y0)+c*(window_zmin-z0));
-	      if (x>=window_xmin && x<=window_xmax)
-		addpolyg(polyg,x,window_ymax,window_zmin,IJmin);
-	      x=x0-1/a*(b*(window_ymax-y0)+c*(window_zmax-z0));
-	      if (x>=window_xmin && x<=window_xmax)
-		addpolyg(polyg,x,window_ymax,window_zmax,IJmin);
-	    }
-	    // y
-	    if (b!=0){
-	      double y=y0-1/b*(a*(window_xmin-x0)+c*(window_zmin-z0));
-	      if (y>=window_ymin && y<=window_ymax)
-		addpolyg(polyg,window_xmin,y,window_zmin,IJmin);
-	      y=y0-1/b*(a*(window_xmin-x0)+c*(window_zmax-z0));
-	      if (y>=window_ymin && y<=window_ymax)
-		addpolyg(polyg,window_xmin,y,window_zmax,IJmin);
-	      y=y0-1/b*(a*(window_xmax-x0)+c*(window_zmin-z0));
-	      if (y>=window_ymin && y<=window_ymax)
-		addpolyg(polyg,window_xmax,y,window_zmin,IJmin);
-	      y=y0-1/b*(a*(window_xmax-x0)+c*(window_zmax-z0));
-	      if (y>=window_ymin && y<=window_ymax)
-		addpolyg(polyg,window_xmax,y,window_zmax,IJmin);
-	    }
-	    // z
-	    if (c!=0){
-	      double z=z0-1/c*(a*(window_xmin-x0)+b*(window_ymin-y0));
-	      if (z>=window_zmin && z<=window_zmax)
-		addpolyg(polyg,window_xmin,window_ymin,z,IJmin);
-	      z=z0-1/c*(a*(window_xmin-x0)+b*(window_ymax-y0));
-	      if (z>=window_zmin && z<=window_zmax)
-		addpolyg(polyg,window_xmin,window_ymax,z,IJmin);
-	      z=z0-1/c*(a*(window_xmax-x0)+b*(window_ymin-y0));
-	      if (z>=window_zmin && z<=window_zmax)
-		addpolyg(polyg,window_xmax,window_ymin,z,IJmin);
-	      z=z0-1/c*(a*(window_xmax-x0)+b*(window_ymax-y0));
-	      if (z>=window_zmin && z<=window_zmax)
-		addpolyg(polyg,window_xmax,window_ymax,z,IJmin);
-	    }
-	    // sort list of arguments
-	    vector<int2_double2> p;
-	    for (int k=0;k<polyg.size();++k){
-	      int2 & cur=polyg[k];
-	      if (cur==IJmin){
-		int2_double2 id={cur.i,cur.j,0,0};
-		p.push_back(id);
-	      } else {
-		double di=cur.i-IJmin.i,dj=cur.j-IJmin.j;
-		int2_double2 id={cur.i,cur.j,atan2(di,dj),di*di+dj*dj};
-		p.push_back(id);
-	      }
-	    }
-	    sort(p.begin(),p.end());
-	    // draw polygon
-	    vector< vector<int> > P;
-	    for (int k=0;k<p.size();++k){
-	      vector<int> vi(2);
-	      vi[0]=p[k].i;
-	      vi[1]=p[k].j;
-	      P.push_back(vi);
-	    }
-	    draw_polygon(P,upcolor 
-			 // | 0x400000
-			 ,contextptr);
-	    if (nameptr){
-	      int x=os_draw_string_small(0,0,0,upcolor,nameptr,true);
-	      os_draw_string_small(P[0][0]-x,P[0][1],upcolor,0,nameptr);
-	    }
-	  }
-	}
-	// frame
-	double xi=Ci-Ai,xj=Cj-Aj;
-	normalize(xi,xj);
-	drawLine(20,20,20+20*xi,20+20*xj,COLOR_RED);
-	os_draw_string_small(20+20*xi,20+20*xj,COLOR_RED,COLOR_BLACK,"x");
-	double yi=Ei-Ai,yj=Ej-Aj;
-	normalize(yi,yj);
-	drawLine(20,20,20+20*yi,20+20*yj,COLOR_GREEN);
-	os_draw_string_small(20+20*yi,20+20*yj,COLOR_GREEN,COLOR_BLACK,"y");
-	double zi=Bi-Ai,zj=Bj-Aj;
-	normalize(zi,zj);
-	drawLine(20,20,20+20*zi,20+20*zj,12345);
-	os_draw_string_small(20+20*zi,20+20*zj,12345,COLOR_BLACK,"z");
-      } // end show_axes
-      // now handle legend([x,y],string)
-      vecteur V(gen2vecteur(g));
-      for (int i=0;i<V.size();++i){
-	gen attr=V[i];
-	if (attr.is_symb_of_sommet(at_pnt)){
-	  attr=attr._SYMBptr->feuille;
-	  if (attr.type==_VECT && attr._VECTptr->size()>1){
-	    int color=65535;
-	    gen attr0=attr._VECTptr->front();
-	    attr=attr[1];
-	    if (attr.type==_INT_ && (attr.val & 0xffff)!=0){
-	      color=attr.val &0xffff;
-	    }
-	    if (attr0.is_symb_of_sommet(at_legende)){
-	      gen leg=attr0._SYMBptr->feuille;
-	      if (leg.type==_VECT && leg._VECTptr->size()>=2){
-		gen pos=leg._VECTptr->front();
-		leg=leg[1];
-		if (pos.type==_VECT && pos._VECTptr->size()==2 && leg.type==_STRNG){
-		  gen x=pos._VECTptr->front(),y=pos._VECTptr->back();
-		  if (x.type==_INT_ && y.type==_INT_)
-		    os_draw_string(x.val,y.val,color,0,leg._STRNGptr->c_str());
-		}
-	      }
-	    }
-	  }
-	}
-      }      
-#ifdef NSPIRE_NEWLIB
-      DefineStatusMessage((char*)"+-: zoom, pad: move, esc: quit", 1, 0, 0);
-#else
-      DefineStatusMessage((char*)"+-: zoom, pad: move, EXIT: quit", 1, 0, 0);
-#endif
-      DisplayStatusArea();
-      return;
-    }
-    int save_clip_ymin=clip_ymin;
-    clip_ymin=STATUS_AREA_PX;
-    int horizontal_pixels=LCD_WIDTH_PX,vertical_pixels=LCD_HEIGHT_PX-STATUS_AREA_PX,deltax=0,deltay=STATUS_AREA_PX,clip_x=0,clip_y=0,clip_w=horizontal_pixels,clip_h=vertical_pixels;
-    drawRectangle(0, STATUS_AREA_PX, horizontal_pixels, vertical_pixels,COLOR_WHITE);
-    // Draw axis
-    double I0,J0;
-    findij(zero,x_scale,y_scale,I0,J0,contextptr); // origin
-    int i_0=round(I0),j_0=round(J0);
-    if (show_axes &&  (window_ymax>=0) && (window_ymin<=0)){ // X-axis
-      vecteur aff; int affs;
-      char ch[256];
-      check_fl_line(deltax,deltay+j_0,deltax+horizontal_pixels,deltay+j_0,clip_x,clip_y,clip_w,clip_h,0,0,_GREEN); 
-      check_fl_line(deltax+i_0,deltay+j_0,deltax+i_0+int(x_scale),deltay+j_0,clip_x,clip_y,clip_w,clip_h,0,0,_CYAN);
-      aff=ticks(window_xmin,window_xmax,true);
-      affs=aff.size();
-      for (int i=0;i<affs;++i){
-	double d=evalf_double(aff[i],1,contextptr)._DOUBLE_val;
-	if (fabs(d)<1e-6) strcpy(ch,"0"); else sprint_double(ch,d);
-	int delta=int(horizontal_pixels*(d-window_xmin)/(window_xmax-window_xmin));
-	int taille=strlen(ch)*9;
-	fl_line(delta,deltay+j_0,delta,deltay+j_0-4,_GREEN);
-      }
-      check_fl_draw(labelsize,"x",deltax+horizontal_pixels-40,deltay+j_0-4,clip_x,clip_y,clip_w,clip_h,0,0,_GREEN);
-    }
-    if ( show_axes && (window_xmax>=0) && (window_xmin<=0) ) {// Y-axis
-      vecteur aff; int affs;
-      char ch[256];
-      check_fl_line(deltax+i_0,deltay,deltax+i_0,deltay+vertical_pixels,clip_x,clip_y,clip_w,clip_h,0,0,_RED);
-      check_fl_line(deltax+i_0,deltay+j_0,deltax+i_0,deltay+j_0-int(y_scale),clip_x,clip_y,clip_w,clip_h,0,0,_CYAN);
-      aff=ticks(window_ymin,window_ymax,true);
-      affs=aff.size();
-      int taille=5;
-      for (int j=0;j<affs;++j){
-	double d=evalf_double(aff[j],1,contextptr)._DOUBLE_val;
-	if (fabs(d)<1e-6) strcpy(ch,"0"); else sprint_double(ch,d);
-	int delta=int(vertical_pixels*(window_ymax-d)/(window_ymax-window_ymin));
-	if (delta>=taille && delta<=vertical_pixels-taille){
-	  fl_line(deltax+i_0,STATUS_AREA_PX+delta,deltax+i_0+4,STATUS_AREA_PX+delta,_RED);
-	}
-      }
-      check_fl_draw(labelsize,"y",deltax+i_0+2,deltay+labelsize,clip_x,clip_y,clip_w,clip_h,0,0,_RED);
-    }
-#if 0 // if ticks are enabled, don't forget to set freeze to false
-    // Ticks
-    if (show_axes && (horizontal_pixels)/(x_scale*x_tick) < 40 && vertical_pixels/(y_tick*y_scale) <40  ){
-      if (x_tick>0 && y_tick>0 ){
-	double nticks=(horizontal_pixels-I0)/(x_scale*x_tick);
-	double mticks=(vertical_pixels-J0)/(y_tick*y_scale);
-	int count=0;
-	for (int ii=int(-I0/(x_tick*x_scale));ii<=nticks;++ii){
-	  int iii=int(I0+ii*x_scale*x_tick+.5);
-	  for (int jj=int(-J0/(y_tick*y_scale));jj<=mticks && count<1600;++jj,++count){
-	    int jjj=int(J0+jj*y_scale*y_tick+.5);
-	    check_fl_point(deltax+iii,deltay+jjj,clip_x,clip_y,clip_w,clip_h,0,0,COLOR_BLACK);
-	  }
-	}
-      }
-    }
-#endif
-    if (show_axes){ 
-      int taille,affs,delta;
-      vecteur aff;
-      char ch[256];
-      // X
-      aff=ticks(window_xmin,window_xmax,true);
-      affs=aff.size();
-      for (int i=0;i<affs;++i){
-	double d=evalf_double(aff[i],1,contextptr)._DOUBLE_val;
-	sprint_double(ch,d);
-	delta=int(horizontal_pixels*(d-window_xmin)/(window_xmax-window_xmin));
-	taille=strlen(ch)*9;
-	fl_line(delta,vertical_pixels+STATUS_AREA_PX-6,delta,vertical_pixels+STATUS_AREA_PX-1,_GREEN);
-	if (delta>=taille/2 && delta<=horizontal_pixels){
-	  text_print(10,ch,delta-taille/2,vertical_pixels+STATUS_AREA_PX-7,_GREEN);
-	}
-      }
-      // Y
-      aff=ticks(window_ymin,window_ymax,true);
-      affs=aff.size();
-      taille=5;
-      for (int j=0;j<affs;++j){
-	double d=evalf_double(aff[j],1,contextptr)._DOUBLE_val;
-	sprint_double(ch,d);
-	delta=int(vertical_pixels*(window_ymax-d)/(window_ymax-window_ymin));
-	if (delta>=taille && delta<=vertical_pixels-taille){
-	  fl_line(horizontal_pixels-5,STATUS_AREA_PX+delta,horizontal_pixels-1,STATUS_AREA_PX+delta,_RED);
-	  text_print(10,ch,horizontal_pixels-strlen(ch)*9,STATUS_AREA_PX+delta+taille,_RED);
-	}
-      }
-    }
-    
-    // draw
-    fltk_draw(*this,g,x_scale,y_scale,clip_x,clip_y,clip_w,clip_h,contextptr);
-    clip_ymin=save_clip_ymin;
-  }
-  
-  void Graph2d::left(double d){ 
-    window_xmin -= d;
-    window_xmax -= d;
-  }
-
-  void Graph2d::right(double d){ 
-    window_xmin += d;
-    window_xmax += d;
-  }
-
-  void Graph2d::up(double d){ 
-    window_ymin += d;
-    window_ymax += d;
-  }
-
-  void Graph2d::down(double d){ 
-    window_ymin -= d;
-    window_ymax -= d;
-  }
-
-  void Graph2d::z_up(double d){ 
-    window_zmin += d;
-    window_zmax += d;
-  }
-
-  void Graph2d::z_down(double d){ 
-    window_zmin -= d;
-    window_zmax -= d;
-  }
-
-  void Turtle::draw(){
-    const int deltax=0,deltay=0;
-    int horizontal_pixels=LCD_WIDTH_PX-2*giac::COORD_SIZE;
-    // Check for fast redraw
-    // Then redraw the background
-    drawRectangle(deltax, deltay, LCD_WIDTH_PX, LCD_HEIGHT_PX,COLOR_WHITE);
-#ifdef TURTLETAB
-    if (turtleptr && turtle_stack_size==0){
-      turtleptr[0]=logo_turtle();
-      ++turtle_stack_size;
-    }
-#endif
-    if (turtleptr &&
-#ifdef TURTLETAB
-	turtle_stack_size
-#else
-	!turtleptr->empty()
-#endif
-	){
-      if (turtlezoom>8)
-	turtlezoom=8;
-      if (turtlezoom<0.125)
-	turtlezoom=0.125;
-      // check that position is not out of screen
-#ifdef TURTLETAB
-      logo_turtle t=turtleptr[turtle_stack_size-1];
-#else
-      logo_turtle t=turtleptr->back();
-#endif
-      double x=turtlezoom*(t.x-turtlex);
-      double y=turtlezoom*(t.y-turtley);
-#if 0
-      if (x<0)
-	turtlex += int(x/turtlezoom);
-      if (x>=LCD_WIDTH_PX-10)
-	turtlex += int((x-LCD_WIDTH_PX+10)/turtlezoom);
-      if (y<0)
-	turtley += int(y/turtlezoom);
-      if (y>LCD_HEIGHT_PX-10)
-	turtley += int((y-LCD_HEIGHT_PX+10)/turtlezoom);
-#endif
-    }
-#if 0
-    if (maillage & 0x3){
-      fl_color(FL_BLACK);
-      double xdecal=std::floor(turtlex/10.0)*10;
-      double ydecal=std::floor(turtley/10.0)*10;
-      if ( (maillage & 0x3)==1){
-	for (double i=xdecal;i<LCD_WIDTH_PX+xdecal;i+=10){
-	  for (double j=ydecal;j<LCD_HEIGHT_PX+ydecal;j+=10){
-	    fl_point(deltax+int((i-turtlex)*turtlezoom+.5),deltay+LCD_HEIGHT_PX-int((j-turtley)*turtlezoom+.5));
-	  }
-	}
-      }
-      else {
-	double dj=std::sqrt(3.0)*10,i0=xdecal;
-	for (double j=ydecal;j<LCD_HEIGHT_PX+ydecal;j+=dj){
-	  int J=deltay+int(LCD_HEIGHT_PX-(j-turtley)*turtlezoom);
-	  for (double i=i0;i<LCD_WIDTH_PX+xdecal;i+=10){
-	    fl_point(deltax+int((i-turtlex)*turtlezoom+.5),J);
-	  }
-	  i0 += dj;
-	  while (i0>=10)
-	    i0 -= 10;
-	}
-      }
-    }
-#endif
-    // Show turtle position/cap
-    if (turtleptr &&
-#ifdef TURTLETAB
-	turtle_stack_size &&
-#else
-	!turtleptr->empty() &&
-#endif
-	!(maillage & 0x4)){
-#ifdef TURTLETAB
-      logo_turtle turtle=turtleptr[turtle_stack_size-1];
-#else
-      logo_turtle turtle=turtleptr->back();
-#endif
-      drawRectangle(deltax+horizontal_pixels,deltay,LCD_WIDTH_PX-horizontal_pixels,2*COORD_SIZE,_YELLOW);
-      // drawRectangle(deltax, deltay, LCD_WIDTH_PX, LCD_HEIGHT_PX,COLOR_BLACK);
-      char buf[32];
-      sprintf(buf,"x %i   ",int(turtle.x+.5));
-      text_print(18,buf,deltax+horizontal_pixels,deltay+(2*COORD_SIZE)/3-2,COLOR_BLACK,_YELLOW);
-      sprintf(buf,"y %i   ",int(turtle.y+.5));
-      text_print(18,buf,deltax+horizontal_pixels,deltay+(4*COORD_SIZE)/3-3,COLOR_BLACK,_YELLOW);
-      sprintf(buf,"t %i   ",int(turtle.theta+.5));
-      text_print(18,buf,deltax+horizontal_pixels,deltay+2*COORD_SIZE-4,COLOR_BLACK,_YELLOW);
-    }
-    // draw turtle Logo
-    if (turtleptr){
-      int save_width=fl_line_width;
-#ifdef TURTLETAB
-      int l=turtle_stack_size;
-#else
-      int l=turtleptr->size();
-#endif
-      if (l>0){
-#ifdef TURTLETAB
-	logo_turtle prec =turtleptr[0];
-#else
-	logo_turtle prec =(*turtleptr)[0];
-#endif
-	int sp=speed;
-	for (int k=1;k<l;++k){
-	  if (k>=2 && sp){
-	    sync_screen();
-	    for (int i=0;i<speed;++i){
-	      for (int j=0;j<1000;++j){
-		if (iskeydown(5) || iskeydown(4) || iskeydown(22)){
-		  sp=0;
-		  break;
-		}
-	      }
-	    }
-	  }
-#ifdef TURTLETAB
-	  logo_turtle current =(turtleptr)[k];
-#else
-	  logo_turtle current =(*turtleptr)[k];
-#endif
-#if 1
-	  if (current.s>=0){ // Write a string
-	    //cout << current.radius << " " << current.s << endl;
-	    if (current.s<ecristab().size())
-	      text_print(current.radius,ecristab()[current.s].c_str(),int(deltax+turtlezoom*(current.x-turtlex)),int(deltay+LCD_HEIGHT_PX-turtlezoom*(current.y-turtley)),current.color);
-	  }
-	  else
-#endif
-	    {
-	      int width=current.turtle_width & 0x1f;
-	      fl_line_width=width;
-	      if (current.radius>0){
-		int r=current.radius & 0x1ff; // bit 0-8
-		double theta1,theta2;
-		if (current.direct){
-		  theta1=prec.theta+double((current.radius >> 9) & 0x1ff); // bit 9-17
-		  theta2=prec.theta+double((current.radius >> 18) & 0x1ff); // bit 18-26
-		}
-		else {
-		  theta1=prec.theta-double((current.radius >> 9) & 0x1ff); // bit 9-17
-		  theta2=prec.theta-double((current.radius >> 18) & 0x1ff); // bit 18-26
-		}
-		bool rempli=(current.radius >> 27) & 0x1;
-		bool seg=(current.radius >> 28) & 0x1;
-		double angle;
-		int x,y,R;
-		R=int(2*turtlezoom*r+.5);
-		angle = M_PI/180*(theta2-90);
-		if (current.direct){
-		  x=int(turtlezoom*(current.x-turtlex-r*std::cos(angle) - r)+.5);
-		  y=int(turtlezoom*(current.y-turtley-r*std::sin(angle) + r)+.5);
-		}
-		else {
-		  x=int(turtlezoom*(current.x-turtlex+r*std::cos(angle) -r)+.5);
-		  y=int(turtlezoom*(current.y-turtley+r*std::sin(angle) +r)+.5);
-		}
-		if (current.direct){
-		  if (rempli)
-		    fl_pie(deltax+x,deltay+LCD_HEIGHT_PX-y,R,R,theta1-90,theta2-90,current.color,seg);
-		  else {
-		    for (int d=giacmax(1-r,-(width-1)/2);d<=width/2;++d){
-		      x=int(turtlezoom*(current.x-turtlex-r*std::cos(angle) - (r+d))+.5);
-		      y=int(turtlezoom*(current.y-turtley-r*std::sin(angle) + (r+d))+.5);
-		      R=int(2*turtlezoom*(r+d)+.5);
-		      fl_arc(deltax+x,deltay+LCD_HEIGHT_PX-y,R,R,theta1-90,theta2-90,current.color);
-		    }
-		  }
-		}
-		else {
-		  if (rempli)
-		    fl_pie(deltax+x,deltay+LCD_HEIGHT_PX-y,R,R,90+theta2,90+theta1,current.color,seg);
-		  else {
-		    for (int d=giacmax(1-r,-(width-1)/2);d<=width/2;++d){
-		      x=int(turtlezoom*(current.x-turtlex+r*std::cos(angle) -(r+d))+.5);
-		      y=int(turtlezoom*(current.y-turtley+r*std::sin(angle) +(r+d))+.5);
-		      R=int(2*turtlezoom*(r+d)+.5);
-		      fl_arc(deltax+x,deltay+LCD_HEIGHT_PX-y,R,R,90+theta2,90+theta1,current.color);
-		    }
-		  }
-		}
-	      } // end radius>0
-	      else {
-		if (prec.mark){
-		  fl_line(deltax+int(turtlezoom*(prec.x-turtlex)+.5),deltay+int(LCD_HEIGHT_PX+turtlezoom*(turtley-prec.y)+.5),deltax+int(turtlezoom*(current.x-turtlex)+.5),deltay+int(LCD_HEIGHT_PX+turtlezoom*(turtley-current.y)+.5),prec.color);
-		}
-	      }
-	      if (current.radius<-1 && k+current.radius>=0){
-		// poly-line from (*turtleptr)[k+current.radius] to (*turtleptr)[k]
-		vector< vector<int> > vi(1-current.radius,vector<int>(2));
-		for (int i=0;i>=current.radius;--i){
-#ifdef TURTLETAB
-		  logo_turtle & t=(turtleptr)[k+i];
-#else
-		  logo_turtle & t=(*turtleptr)[k+i];
-#endif
-		  if (t.radius>0){
-		    int r=t.radius & 0x1ff; // bit 0-8
-		    int x,y,R;
-		    R=int(2*turtlezoom*r+.5);
-		    double angle = M_PI/180*(current.theta-90);
-		    if (t.direct){
-		      x=int(turtlezoom*(t.x-turtlex-r*std::cos(angle) - r)+.5);
-		      y=int(turtlezoom*(t.y-turtley-r*std::sin(angle) + r)+.5);
-		    }
-		    else {
-		      x=int(turtlezoom*(t.x-turtlex+r*std::cos(angle) -r)+.5);
-		      y=int(turtlezoom*(t.y-turtley+r*std::sin(angle) +r)+.5);
-		    }
-		    fl_pie(deltax+x,deltay+LCD_HEIGHT_PX-y,R,R,0,360,current.color,false);
-		  }
-		  vi[-i][0]=deltax+turtlezoom*(t.x-turtlex);
-		  vi[-i][1]=deltay+LCD_HEIGHT_PX+turtlezoom*(turtley-t.y);
-		  //*logptr(contextptr) << i << " " << vi[-i][0] << " " << vi[-i][1] << endl;
-		}
-		//vi.back()=vi.front();
-		draw_filled_polygon(vi,0,LCD_WIDTH_PX,24,LCD_HEIGHT_PX,current.color);
-	      }
-	    } // end else (non-string turtle record)
-	  prec=current;
-	} // end for (all turtle records)
-#ifdef TURTLETAB
-	logo_turtle & t = (turtleptr)[l-1];
-#else
-	logo_turtle & t = (*turtleptr)[l-1];
-#endif
-	int x=int(turtlezoom*(t.x-turtlex)+.5);
-	int y=int(turtlezoom*(t.y-turtley)+.5);
-	double cost=std::cos(t.theta*deg2rad_d);
-	double sint=std::sin(t.theta*deg2rad_d);
-	int Dx=int(turtlezoom*turtle_length*cost/2+.5);
-	int Dy=int(turtlezoom*turtle_length*sint/2+.5);
-	if (t.visible){
-	  fl_line(deltax+x+Dy,deltay+LCD_HEIGHT_PX-(y-Dx),deltax+x-Dy,deltay+LCD_HEIGHT_PX-(y+Dx),t.color);
-	  int c=t.color;
-	  if (!t.mark)
-	    c=t.color ^ 0x7777;
-	  fl_line(deltax+x+Dy,deltay+LCD_HEIGHT_PX-(y-Dx),deltax+x+3*Dx,deltay+LCD_HEIGHT_PX-(y+3*Dy),c);
-	  fl_line(deltax+x-Dy,deltay+LCD_HEIGHT_PX-(y+Dx),deltax+x+3*Dx,deltay+LCD_HEIGHT_PX-(y+3*Dy),c);
-	}
-      }
-      fl_line_width=save_width;
-      return;
-    } // End logo mode
-  }  
-  
-
-  int displaygraph(const giac::gen & ge,GIAC_CONTEXT){
-    // graph display
-    //if (aborttimer > 0) { Timer_Stop(aborttimer); Timer_Deinstall(aborttimer);}
-    xcas::Graph2d gr(ge,contextptr);
-    gr.show_axes=global_show_axes;
-    // initial setting for x and y
-    if (ge.type==_VECT){
-      const_iterateur it=ge._VECTptr->begin(),itend=ge._VECTptr->end();
-      for (;it!=itend;++it){
-	if (it->is_symb_of_sommet(at_equal)){
-	  const gen & f=it->_SYMBptr->feuille;
-	  gen & optname = f._VECTptr->front();
-	  gen & optvalue= f._VECTptr->back();
-	  if (optname.val==_AXES && optvalue.type==_INT_)
-	    gr.show_axes=optvalue.val;
-	  if (optname.type==_INT_ && optname.subtype == _INT_PLOT && optname.val>=_GL_X && optname.val<=_GL_Z && optvalue.is_symb_of_sommet(at_interval)){
-	    //*logptr(contextptr) << optname << " " << optvalue << endl;
-	    gen optvf=evalf_double(optvalue._SYMBptr->feuille,1,contextptr);
-	    if (optvf.type==_VECT && optvf._VECTptr->size()==2){
-	      gen a=optvf._VECTptr->front();
-	      gen b=optvf._VECTptr->back();
-	      if (a.type==_DOUBLE_ && b.type==_DOUBLE_){
-		switch (optname.val){
-		case _GL_X:
-		  gr.window_xmin=a._DOUBLE_val;
-		  gr.window_xmax=b._DOUBLE_val;
-		  gr.update();
-		  break;
-		case _GL_Y:
-		  gr.window_ymin=a._DOUBLE_val;
-		  gr.window_ymax=b._DOUBLE_val;
-		  gr.update();
-		  break;
-		case _GL_Z:
-		  gr.window_zmin=a._DOUBLE_val;
-		  gr.window_zmax=b._DOUBLE_val;
-		  gr.update();
-		  break;
-		}
-	      }
-	    }
-	  }
-	}
-      }
-    }
-    // UI
-#ifdef NSPIRE_NEWLIB
-    DefineStatusMessage((char*)"+-: zoom, pad: move, esc: quit", 1, 0, 0);
-#else
-    DefineStatusMessage((char*)"+-: zoom, pad: move, EXIT: quit", 1, 0, 0);
-#endif
-    DisplayStatusArea();
-    int saveprecision=gr.precision;
-    gr.precision += 2; // fast draw first
-    gr.draw();
-    gr.precision=saveprecision;    
-    bool redraw=true;
-    for (;;){
-      int saveprec=gr.precision;
-      if (gr.doprecise){
-	gr.doprecise=false;
-	gr.precision=1;//gr.precision-=2;
-      }
-      if (redraw)
-	gr.draw();
-      redraw=true;
-      gr.precision=saveprec;
-      DisplayStatusArea();
-#ifdef NUMWORKS
-      os_draw_string(0,LCD_HEIGHT_PX-STATUS_AREA_PX-17,COLOR_BLACK,COLOR_WHITE,"toolbox: cfg");
-#else
-      os_draw_string(0,LCD_HEIGHT_PX-STATUS_AREA_PX-17,COLOR_BLACK,COLOR_WHITE,"menu: cfg");
-#endif
-      int key=-1;
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;
-#if 1
-      if (key==KEY_CTRL_CATALOG || key==KEY_BOOK ){
-	char menu_xmin[32],menu_xmax[32],menu_ymin[32],menu_ymax[32],menu_zmin[32],menu_zmax[32];
-	for (;;){
-	  string s;
-	  s="xmin "+print_DOUBLE_(gr.window_xmin,contextptr);
-	  strcpy(menu_xmin,s.c_str());
-	  s="xmax "+print_DOUBLE_(gr.window_xmax,contextptr);
-	  strcpy(menu_xmax,s.c_str());
-	  s="ymin "+print_DOUBLE_(gr.window_ymin,contextptr);
-	  strcpy(menu_ymin,s.c_str());
-	  s="ymax "+print_DOUBLE_(gr.window_ymax,contextptr);
-	  strcpy(menu_ymax,s.c_str());
-	  s="zmin "+print_DOUBLE_(gr.window_zmin,contextptr);
-	  strcpy(menu_zmin,s.c_str());
-	  s="zmax "+print_DOUBLE_(gr.window_zmax,contextptr);
-	  strcpy(menu_zmax,s.c_str());
-	  Menu smallmenu;
-	  smallmenu.numitems=15;
-	  MenuItem smallmenuitems[smallmenu.numitems];
-	  smallmenu.items=smallmenuitems;
-	  smallmenu.height=12;
-	  //smallmenu.title = "KhiCAS";
-	  smallmenuitems[0].text = (char *) menu_xmin;
-	  smallmenuitems[1].text = (char *) menu_xmax;
-	  smallmenuitems[2].text = (char *) menu_ymin;
-	  smallmenuitems[3].text = (char *) menu_ymax;
-	  smallmenuitems[4].text = (char *) menu_zmin;
-	  smallmenuitems[5].text = (char *) menu_zmax;
-	  smallmenuitems[6].text = (char*) "Orthonormalize /";
-	  smallmenuitems[7].text = (char*) "Autoscale *";
-	  smallmenuitems[8].text = (char *) ("Zoom in +");
-	  smallmenuitems[9].text = (char *) ("Zoom out -");
-	  smallmenuitems[10].text = (char *) ("Y-Zoom out (-)");
-	  smallmenuitems[11].text = (char *) ((lang==1)?"raccourcis clavier":"3d shortcuts");
-	  smallmenuitems[12].text = (char*) ((lang==1)?"Voir axes":"Show axes");
-	  smallmenuitems[13].text = (char*) ((lang==1)?"Cacher axes":"Hide axes");
-	  smallmenuitems[14].text = (char*)((lang==1)?"Quitter":"Quit");
-	  drawRectangle(0,180,LCD_WIDTH_PX,60,_BLACK);
-	  int sres = doMenu(&smallmenu);
-	  if (sres == MENU_RETURN_EXIT)
-	    break;
-	  if (sres == MENU_RETURN_SELECTION || sres==KEY_CTRL_EXE) {
-	    const char * ptr=0;
-	    string s1; double d;
-	    if (smallmenu.selection==1){
-	      d=gr.window_xmin;
-	      if (inputdouble(menu_xmin,d,200,contextptr)){
-		gr.window_xmin=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==2){
-	      d=gr.window_xmax;
-	      if (inputdouble(menu_xmax,d,200,contextptr)){
-		gr.window_xmax=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==3){
-	      d=gr.window_ymin;
-	      if (inputdouble(menu_ymin,d,200,contextptr)){
-		gr.window_ymin=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==4){
-	      d=gr.window_ymax;
-	      if (inputdouble(menu_ymax,d,200,contextptr)){
-		gr.window_ymax=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==5){
-	      d=gr.window_zmin;
-	      if (inputdouble(menu_zmin,d,200,contextptr)){
-		gr.window_zmin=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==6){
-	      d=gr.window_zmax;
-	      if (inputdouble(menu_zmax,d,200,contextptr)){
-		gr.window_zmax=d;
-		gr.update();
-	      }
-	    }
-	    if (smallmenu.selection==7)
-	      gr.orthonormalize();
-	    if (smallmenu.selection==8)
-	      gr.autoscale();	
-	    if (smallmenu.selection==9)
-	      gr.zoom(0.7);	
-	    if (smallmenu.selection==10)
-	      gr.zoom(1/0.7);	
-	    if (smallmenu.selection==11)
-	      gr.zoomy(1/0.7);
-	    if (smallmenu.selection==12){
-	      xcas::textArea text;
-	      text.editable=false;
-	      text.clipline=-1;
-	      text.title = (char*)((lang==1)?"Raccourcis clavier 3d":"3d Keyboard shortcuts");
-	      text.allowF1=false;
-	      text.python=false;
-	      add(&text,lang==1?"haut/bas/droit/gauche: change point de vue\ny^x ou e^x: trace precis\nON/Back: interrompt le trace en cours\n( et ): modifie le rendu des surfaces raides\n0: surfaces cachees ON/OFF\n.: remplissage surface raide ON/OFF\n5 reset view\n7,8,9,1,2,3: deplacement":"up/down/right/left: modify viewpoint\nON/Back: interrupt\ny^x or e^x: precise\n( and ): modify stiff surfaces rendering\n0: hidden surfaces ON/OFF\n.: fill stiff surfacesON/OFF\n5 reset view\n7,8,9,1,2,3: move view");
-	      int exec=doTextArea(&text,contextptr);
-	      // gr.q=quaternion_double(0,0,0); gr.update();
-	    }
-	    if (smallmenu.selection==13)
-	      gr.show_axes=true;	
-	    if (smallmenu.selection==14)
-	      gr.show_axes=false;	
-	    if (smallmenu.selection==15)
-	      break;
-	  }
-	}
-      }
-#endif
-      if (key==KEY_CTRL_EXIT || key==KEY_CTRL_OK){
-	os_hide_graph();
-	break;
-      }
-      if (key==KEY_CHAR_NORMAL || key=='>'){ // shift-+
-	if (gr.is3d && gr.precision<9)
-	  gr.precision++;
-      }
-      if (key=='\\' || key=='<'){ // shift--
-	if (gr.is3d && gr.precision>1)
-	 gr.precision--;
-      }
-      if (key==KEY_CTRL_UP){
-	if (gr.is3d){
-	  int curprec=gr.precision;
-	  gr.precision += 2;
-	  if (gr.precision>9) gr.precision=9;
-	  while (1){
-	    //double X,Y,Z;
-	    //do_transform(gr.invtransform,0.707,0.707,0,X,Y,Z);
-	    //normalize(X,Y,Z);
-	    //gr.q=rotation_2_quaternion_double(X,Y,Z,15)*gr.q;
-	    //gr.q=quaternion_double(15,0,15)*gr.q;
-	    gr.q=rotation_2_quaternion_double(0.707,0.707,0,15)*gr.q;// quaternion_double(15,0,0)*gr.q;
-	    gr.update_rotation();
-	    gr.draw();
-	    redraw=gr.solid3d;
-#ifndef SIMU
-	    if (!iskeydown(KEY_CTRL_UP))
-	      break;
-#else
-	    getkey(key); break;
-#endif
-	  }
-	  gr.precision=curprec;
-	  continue;
-	}
-	gr.up((gr.window_ymax-gr.window_ymin)/5);
-      }
-      if (key==KEY_CTRL_PAGEUP) {
-	gr.up((gr.window_ymax-gr.window_ymin)/2);
-      }
-      if (key==KEY_CTRL_DOWN) {
-	if (gr.is3d){
-	  int curprec=gr.precision;
-	  gr.precision += 2;
-	  if (gr.precision>9) gr.precision=9;
-	  while (1){
-	    //double X,Y,Z;
-	    //do_transform(gr.invtransform,0.707,0.707,0,X,Y,Z);
-	    //normalize(X,Y,Z);
-	    //gr.q=rotation_2_quaternion_double(X,Y,Z,-15)*gr.q;
-	    // gr.q=quaternion_double(-15,0,-15)*gr.q;
-	    gr.q=rotation_2_quaternion_double(0.707,0.707,0,-15)*gr.q; // quaternion_double(-15,0,0)*gr.q;
-	    gr.update_rotation();
-	    gr.draw();
-	    redraw=gr.solid3d;
-#ifndef SIMU
-	    if (!iskeydown(KEY_CTRL_DOWN))
-	      break;
-#else
-	    getkey(key); break;
-#endif
-	  }
-	  gr.precision=curprec;
-	  continue;
-	}
-	gr.down((gr.window_ymax-gr.window_ymin)/5);
-      }
-      if (key==KEY_CTRL_PAGEDOWN) {
-	gr.down((gr.window_ymax-gr.window_ymin)/2);
-      }
-      if (key==KEY_CTRL_LEFT) {
-	if (gr.is3d){
-	  int curprec=gr.precision;
-	  gr.precision += 2;
-	  if (gr.precision>9) gr.precision=9;
-	  while (1){
-	    gr.q=quaternion_double(0,15,0)*gr.q;
-	    gr.update_rotation();
-	    gr.draw();
-	    redraw=gr.solid3d;
-#ifndef SIMU
-	    if (!iskeydown(KEY_CTRL_LEFT))
-	      break;
-#else
-	    getkey(key); break;
-#endif
-	  }
-	  gr.precision=curprec;
-	  continue;
-	}
-	gr.left((gr.window_xmax-gr.window_xmin)/5);
-      }
-      if (key==KEY_SHIFT_LEFT) { gr.left((gr.window_xmax-gr.window_xmin)/2); }
-      if (key==KEY_CTRL_RIGHT) {
-	if (gr.is3d){
-	  int curprec=gr.precision;
-	  gr.precision += 2;
-	  if (gr.precision>9) gr.precision=9;
-	  while (1){
-	    gr.q=quaternion_double(0,-15,0)*gr.q;
-	    gr.update_rotation();
-	    gr.draw();
-	    redraw=gr.solid3d;
-#ifndef SIMU
-	    if (!iskeydown(KEY_CTRL_RIGHT))
-	      break;
-#else
-	    getkey(key); break;
-#endif
-	  }
-	  gr.precision=curprec;
-	  continue;
-	}
-	gr.right((gr.window_xmax-gr.window_xmin)/5);
-      }
-      if (key==KEY_SHIFT_RIGHT) { gr.right((gr.window_xmax-gr.window_xmin)/5); }
-      if (key==KEY_CHAR_PLUS) {
-	gr.zoom(0.7);
-      }
-      if (key==KEY_CHAR_MINUS){
-	gr.zoom(1/0.7);
-      }
-      if (key==KEY_CHAR_PMINUS){
-	gr.zoomy(1/0.7);
-      }
-      if (key==KEY_CHAR_MULT){
-	gr.autoscale();
-      }
-      if (key==KEY_CHAR_DIV) {
-	gr.orthonormalize();
-      }
-      if (gr.is3d){
-	if (key==KEY_CHAR_0){
-	  gr.hide2nd=!gr.hide2nd;
-	}
-	if (key==KEY_CHAR_DP){
-	  gr.interval=!gr.interval;
-	}
-	if (key==KEY_CHAR_ANS){
-	  gr.show_edges=!gr.show_edges;
-	}
-	if (key==KEY_CHAR_5){
-	  gr.q=quaternion_double(0,0,0);
-	  gr.update();
-	}	  
-	if (key==KEY_CHAR_8){
-	  gr.z_up((gr.window_zmax-gr.window_zmin)/5);
-	  gr.update_rotation();
-	}
-	if (key==KEY_CHAR_2){
-	  gr.z_down((gr.window_zmax-gr.window_zmin)/5);
-	  gr.update_rotation();
-	}
-	if (key==KEY_CHAR_1){
-	  gr.right((gr.window_xmax-gr.window_xmin)/5);
-	  gr.update_rotation();
-	}
-	if (key==KEY_CHAR_9){
-	  gr.left((gr.window_xmax-gr.window_xmin)/5);
-	  gr.update_rotation();
-	}
-	if (key==KEY_CHAR_3){
-	  gr.up((gr.window_ymax-gr.window_ymin)/5);
-	  gr.update_rotation();
-	}
-	if (key==KEY_CHAR_7){
-	  gr.down((gr.window_ymax-gr.window_ymin)/5);
-	  gr.update_rotation();
-	}
-	if (key==KEY_CHAR_POW || key==KEY_CHAR_EXPN)
-	  gr.doprecise=true;
-	if (key==KEY_CHAR_LPAR && gr.diffusionz<64)
-	  gr.diffusionz++;
-	if (key==KEY_CHAR_RPAR && gr.diffusionz>2)
-	  gr.diffusionz--;
-      }
-      if (key==KEY_CTRL_VARS) {
-	gr.show_axes=!gr.show_axes;
-      }
-    }
-    // aborttimer = Timer_Install(0, check_execution_abort, 100); if (aborttimer > 0) { Timer_Start(aborttimer); }
-    return 0;
-  }
-
-  int displaylogo(){
-#ifdef TURTLETAB
-    xcas::Turtle t={tablogo,0,0,1,1,(short) turtle_speed};
-#else
-    xcas::Turtle t={&turtle_stack(),0,0,1,1,(short) turtle_speed};
-#endif
-#ifdef NSPIRE_NEWLIB
-    DefineStatusMessage((char*)"+-: zoom, pad: move, esc: quit", 1, 0, 0);
-#else
-    DefineStatusMessage((char*)"+-: zoom, pad: move, EXIT: quit", 1, 0, 0);
-#endif
-    DisplayStatusArea();
-    bool redraw=true;
-    while (1){
-      int save_ymin=clip_ymin;
-      clip_ymin=24;
-      if (redraw)
-	t.draw();
-      redraw=false;
-      clip_ymin=save_ymin;
-      int key;
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;
-      if (key==KEY_CTRL_EXIT || key==KEY_CTRL_OK || key==KEY_PRGM_ACON || key==KEY_CTRL_MENU || key==KEY_CTRL_EXE || key==KEY_CTRL_VARS || key==KEY_CHAR_ANS)
-	break;
-      if (key==KEY_CTRL_UP){ t.turtley += 10; redraw=true; }
-      if (key==KEY_CTRL_PAGEUP) { t.turtley += 100; redraw=true;}
-      if (key==KEY_CTRL_DOWN) { t.turtley -= 10; redraw=true;}
-      if (key==KEY_CTRL_PAGEDOWN) { t.turtley -= 100;redraw=true;}
-      if (key==KEY_CTRL_LEFT) { t.turtlex -= 10; redraw=true;}
-      if (key==KEY_SHIFT_LEFT) { t.turtlex -= 100; redraw=true;}
-      if (key==KEY_CTRL_RIGHT) { t.turtlex += 10; redraw=true;}
-      if (key==KEY_SHIFT_RIGHT) { t.turtlex += 100;redraw=true;}
-      if (key==KEY_CHAR_PLUS) { t.turtlezoom *= 2;redraw=true;}
-      if (key==KEY_CHAR_MINUS){ t.turtlezoom /= 2; redraw=true; }
-      if (key==KEY_CHAR_MULT){ if (t.speed) t.speed *=2; else t.speed=10; redraw=true; }
-      if (key==KEY_CHAR_DIV){ t.speed /=2; redraw=true; }
-      if (key=='='){ redraw=true; }
-    }
-    os_hide_graph();
-    return 0;
-  }
-
-  bool ispnt(const gen & g){
-    if (g.is_symb_of_sommet(giac::at_pnt))
-      return true;
-    if (g.type!=_VECT || g._VECTptr->empty())
-      return false;
-    return ispnt(g._VECTptr->back());
-  }
-
-  void translate_fkey(int & input_key){
-    if (input_key==KEY_CTRL_MIXEDFRAC) input_key=KEY_CTRL_F10;
-    if (input_key==KEY_CTRL_FRACCNVRT) input_key=KEY_CTRL_F7;
-    if (input_key==KEY_CHAR_LIST) input_key=KEY_CTRL_F9;
-    if (input_key==KEY_CHAR_MAT) input_key=KEY_CTRL_F8;
-    if (input_key==KEY_CTRL_PRGM) input_key=KEY_CTRL_F12;
-    if (input_key==KEY_CTRL_FD) input_key=KEY_CTRL_F11;
-    if (input_key==KEY_CHAR_ANGLE) input_key=KEY_CTRL_F13;
-    if (input_key==KEY_CHAR_FRAC) input_key=KEY_CTRL_F14;
-  }
-
-  giac::gen eqw(const giac::gen & ge,bool editable,GIAC_CONTEXT){
-    if (ge.is_symb_of_sommet(at_equal) && ge._SYMBptr->feuille.type==_VECT && ge._SYMBptr->feuille._VECTptr->size()==2 && ge._SYMBptr->feuille._VECTptr->front().type==_INT_ && ge._SYMBptr->feuille._VECTptr->back().type==_INT_){
-      global_show_axes=ge._SYMBptr->feuille._VECTptr->back().val;
-      return ge;
-    }
-    if (ge.is_symb_of_sommet(at_erase)){
-      global_show_axes=1;
-      return ge;
-    }
-    bool edited=false;
-    const int margin=16;
-#ifdef CURSOR
-    Cursor_SetFlashOff();
-#endif
-    giac::gen geq(_copy(ge,contextptr));
-    // if (ge.type!=giac::_DOUBLE_ && giac::has_evalf(ge,geq,1,contextptr)) geq=giac::symb_equal(ge,geq);
-    int line=-1,col=-1,nlines=0,ncols=0,listormat=0;
-    xcas::Equation eq(0,0,geq,contextptr);
-    giac::eqwdata eqdata=xcas::Equation_total_size(eq.data);
-    if (eqdata.dx>1.5*LCD_WIDTH_PX || eqdata.dy>1.5*LCD_HEIGHT_PX){
-      if (eqdata.dx>2.25*LCD_WIDTH_PX || eqdata.dy>2.25*LCD_HEIGHT_PX)
-	eq.attr=giac::attributs(14,COLOR_WHITE,COLOR_BLACK);
-      else
-	eq.attr=giac::attributs(16,COLOR_WHITE,COLOR_BLACK);
-      eq.data=0; // clear memory
-      eq.data=xcas::Equation_compute_size(geq,eq.attr,LCD_WIDTH_PX,contextptr);
-      eqdata=xcas::Equation_total_size(eq.data);
-    }
-    int dx=(eqdata.dx-LCD_WIDTH_PX)/2,dy=LCD_HEIGHT_PX-2*margin+eqdata.y;
-    if (geq.type==_VECT){
-      nlines=geq._VECTptr->size();
-      if (eqdata.dx>=LCD_WIDTH_PX)
-	dx=-20; // line=nlines/2;
-      //else
-      if (geq.subtype!=_SEQ__VECT){
-	line=0;
-	listormat=1;
-	if (ckmatrix(geq)){
-	  ncols=geq._VECTptr->front()._VECTptr->size();
-	  if (eqdata.dy>=LCD_HEIGHT_PX-margin)
-	    dy=eqdata.y+eqdata.dy+32;// col=ncols/2;
-	  // else
-	  col=0;
-	  listormat=2;
-	}
-      }
-    }
-    if (!listormat){
-      xcas::Equation_select(eq.data,true);
-      xcas::eqw_select_down(eq.data);
-    }
-    //cout << eq.data << endl;
-    int firstrun=2;
-    for (;;){
-#if 1
-      if (firstrun==2){
-#ifdef NSPIRE_NEWLIB
-	DefineStatusMessage((char*)((lang==1)?"ctrl enter: eval, esc: quitte, ":"ctrl enter: eval, esc: exit"), 1, 0, 0);
-#else
-	DefineStatusMessage((char*)((lang==1)?"EXE: quitte, resultat dans last":"EXE: quit, result stored in last"), 1, 0, 0);
-#endif
-	DisplayStatusArea();
-	firstrun=1;
-      }
-      else
-	set_xcas_status();
-#else
-      DefineStatusMessage((char*)"+-: zoom, pad: move, EXIT: quit", 1, 0, 0);
-      DisplayStatusArea();
-#endif
-      gen value;
-      if (listormat) // select line l, col c
-	xcas::eqw_select(eq.data,line,col,true,value);
-      if (eqdata.dx>LCD_WIDTH_PX){
-	if (dx<-20)
-	  dx=-20;
-	if (dx>eqdata.dx-LCD_WIDTH_PX+20)
-	  dx=eqdata.dx-LCD_WIDTH_PX+20;
-      }
-#define EQW_TAILLE 18
-      if (eqdata.dy>LCD_HEIGHT_PX-2*EQW_TAILLE){
-	if (dy-eqdata.y<LCD_HEIGHT_PX-2*EQW_TAILLE)
-	  dy=eqdata.y+LCD_HEIGHT_PX-2*EQW_TAILLE;
-	if (dy-eqdata.y>eqdata.dy+32)
-	  dy=eqdata.y+eqdata.dy+32;
-      }
-      waitforvblank();
-      drawRectangle(0, 0, LCD_WIDTH_PX, 205,COLOR_WHITE);
-      // Bdisp_AllClr_VRAM();
-      int save_clip_ymin=clip_ymin;
-      clip_ymin=STATUS_AREA_PX;
-      xcas::display(eq,dx,dy,contextptr);
-#if 1
-      string menu("shift-1 ");
-      menu += string(menu_f1);
-      menu += "|2 ";
-      menu += string(menu_f2);
-      menu += "|3 undo|4 edt|5 +-|6 approx";
-      drawRectangle(0,205,LCD_WIDTH_PX,17,22222);
-      PrintMiniMini(0,205,menu.c_str(),0,giac::_BLACK,22222);
-#endif
-      //draw_menu(2);
-      clip_ymin=save_clip_ymin;
-      int keyflag = GetSetupSetting( (unsigned int)0x14);
-      if (firstrun){ // workaround for e.g. 1+x/2 partly not displayed
-	firstrun=0;
-	continue;
-      }
-      int key;
-      //cout << eq.data << endl;
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return undef;
-      bool alph=alphawasactive(&key);
-      if (key==KEY_CTRL_OK || key==KEY_CTRL_MENU){
-	os_hide_graph();
-	if (edited && xcas::do_select(eq.data,true,value) && value.type==_EQW){
-	  //cout << "ok " << value._EQWptr->g << endl;
-	  DefineStatusMessage(((lang==1)?"resultat stocke dans last":"result stored in last"), 1, 0, 0);
-	  //DisplayStatusArea();
-	  giac::sto(value._EQWptr->g,giac::gen("last",contextptr),contextptr);
-	  return value._EQWptr->g;
-	}
-	//cout << "no " << eq.data << endl; if (value.type==_EQW) cout << value._EQWptr->g << endl ;
-	return geq;
-      }
-      if (key==KEY_CTRL_EXIT || key==KEY_CTRL_AC ){
-	if (!edited){
-	  os_hide_graph();
-	  return geq;
-	}
-	if (confirm(
-#ifdef NSPIRE_NEWLIB
-		    (lang==1)?"Vraiment abandonner?":"Really leave",(lang==1)?"esc: editeur,  enter: confirmer":"esc: editor,  enter: confirm"
-#else
-		    (lang==1)?"Vraiment abandonner?":"Really leave",(lang==1)?"Back: editeur,  OK: confirmer":"Back: editor,  OK: confirm"
-#endif
-		    )==KEY_CTRL_F1){
-	  os_hide_graph();
-	  return geq;
-	}
-      }
-      if (key==KEY_CTRL_F3)
-	key=KEY_CTRL_UNDO;
-      if (key==KEY_CTRL_UNDO){
-	giac::swapgen(eq.undodata,eq.data);
-	if (listormat){
-	  xcas::do_select(eq.data,true,value);
-	  if (value.type==_EQW){
-	    gen g=eval(value._EQWptr->g,1,contextptr);
-	    if (g.type==_VECT){
-	      const vecteur & v=*g._VECTptr;
-	      nlines=v.size();
-	      if (line >= nlines)
-		line=nlines-1;
-	      if (col!=-1 &&v.front().type==_VECT){
-		ncols=v.front()._VECTptr->size();
-		if (col>=ncols)
-		  col=ncols-1;
-	      }
-	      xcas::do_select(eq.data,false,value);
-	      xcas::eqw_select(eq.data,line,col,true,value);
-	    }
-	  }
-	}
-	continue;
-      }
-      int redo=0; 
-      if (listormat){
-	if (key==KEY_CHAR_COMMA || key==KEY_CTRL_DEL ){
-	  xcas::do_select(eq.data,true,value);
-	  if (value.type==_EQW){
-	    gen g=eval(value._EQWptr->g,1,contextptr);
-	    if (g.type==_VECT){
-	      edited=true; eq.undodata=Equation_copy(eq.data);
-	      vecteur v=*g._VECTptr;
-	      if (key==KEY_CHAR_COMMA){
-		if (col==-1 || (line>0 && line==nlines-1)){
-		  v.insert(v.begin()+line+1,0*v.front());
-		  ++line; ++nlines;
-		}
-		else {
-		  v=mtran(v);
-		  v.insert(v.begin()+col+1,0*v.front());
-		  v=mtran(v);
-		  ++col; ++ncols;
-		}
-	      }
-	      else {
-		if (col==-1 || (nlines>=3 && line==nlines-1)){
-		  if (nlines>=(col==-1?2:3)){
-		    v.erase(v.begin()+line,v.begin()+line+1);
-		    if (line) --line;
-		    --nlines;
-		  }
-		}
-		else {
-		  if (ncols>=2){
-		    v=mtran(v);
-		    v.erase(v.begin()+col,v.begin()+col+1);
-		    v=mtran(v);
-		    if (col) --col; --ncols;
-		  }
-		}
-	      }
-	      geq=gen(v,g.subtype);
-	      key=0; redo=1;
-	      // continue;
-	    }
-	  }
-	}
-      }
-      bool ins=key==KEY_CHAR_STORE  || key==KEY_CHAR_RPAR || key==KEY_CHAR_LPAR || key==KEY_CHAR_COMMA || key==KEY_CTRL_PASTE || key==KEY_CTRL_F4;
-      int xleft,ytop,xright,ybottom,gselpos; gen * gsel=0,*gselparent=0;
-      if (key==KEY_CTRL_CLIP){
-	xcas::Equation_adjust_xy(eq.data,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,0);
-	if (gsel==0)
-	  gsel==&eq.data;
-	// cout << "var " << g << " " << eq.data << endl;
-	if (xcas::do_select(*gsel,true,value) && value.type==_EQW){
-	  //cout << g << ":=" << value._EQWptr->g << endl;
-	  copy_clipboard(value._EQWptr->g.print(contextptr),true);
-	  continue;
-	}
-      }
-      if (key==KEY_CHAR_STORE){
-	int keyflag = GetSetupSetting( (unsigned int)0x14);
-	if (keyflag==0)
-	  handle_f5();
-	std::string varname;
-	if (inputline(((lang==1)?"Stocker la selection dans":"Save selection in",(lang==1)?"Nom de variable: ":"Variable name: "),0,varname,false,65,contextptr) && !varname.empty() && isalpha(varname[0])){
-	  giac::gen g(varname,contextptr);
-	  giac::gen ge(protecteval(g,1,contextptr));
-	  if (g.type!=_IDNT){
-	    invalid_varname();
-	    continue;
-	  }
-	  if (ge==g || confirm_overwrite()){
-	    vector<int> goto_sel;
-	    xcas::Equation_adjust_xy(eq.data,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,&goto_sel);
-	    if (gsel==0)
-	      gsel==&eq.data;
-	    // cout << "var " << g << " " << eq.data << endl;
-	    if (xcas::do_select(*gsel,true,value) && value.type==_EQW){
-	      //cout << g << ":=" << value._EQWptr->g << endl;
-	      giac::gen gg(value._EQWptr->g);
-	      if (gg.is_symb_of_sommet(at_makevector))
-		gg=giac::eval(gg,1,contextptr);
-	      giac::sto(gg,g,contextptr);
-	    }
-	  }
-	}
-	continue;
-      }
-      if (key==KEY_CTRL_DEL){
-	vector<int> goto_sel;
-	if (xcas::Equation_adjust_xy(eq.data,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,&goto_sel) && gsel && xcas::do_select(*gsel,true,value) && value.type==_EQW){
-	  value=value._EQWptr->g;
-	  if (value.type==_SYMB){
-	    gen tmp=value._SYMBptr->feuille;
-	    if (tmp.type!=_VECT || tmp.subtype!=_SEQ__VECT){
-	      xcas::replace_selection(eq,tmp,gsel,&goto_sel,contextptr);
-	      continue;
-	    }
-	  }
-	  if (!goto_sel.empty() && gselparent && gselparent->type==_VECT && !gselparent->_VECTptr->empty()){
-	    vecteur & v=*gselparent->_VECTptr;
-	    if (v.back().type==_EQW){
-	      gen opg=v.back()._EQWptr->g;
-	      if (opg.type==_FUNC){
-		int i=0;
-		for (;i<v.size()-1;++i){
-		  if (&v[i]==gsel)
-		    break;
-		}
-		if (i<v.size()-1){
-		  if (v.size()==5 && (opg==at_integrate || opg==at_sum) && i>=2)
-		    v.erase(v.begin()+2,v.begin()+4);
-		  else
-		    v.erase(v.begin()+i);
-		  xcas::do_select(*gselparent,true,value);
-		  if (value.type==_EQW){
-		    value=value._EQWptr->g;
-		    // cout << goto_sel << " " << value << endl; continue;
-		    if (v.size()==2 && (opg==at_plus || opg==at_prod || opg==at_pow))
-		      value=protecteval(value,1,contextptr);
-		    goto_sel.erase(goto_sel.begin());
-		    xcas::replace_selection(eq,value,gselparent,&goto_sel,contextptr);
-		    continue;
-		  }
-		}
-	      }
-	    }
-	  }
-	}
-      }
-      if (key=='\\' || key==KEY_CTRL_F5){
-	xcas::do_select(eq.data,true,value);
-	if (value.type==_EQW)
-	  geq=value._EQWptr->g;
-	if (eq.attr.fontsize<=14)
-	  eq.attr.fontsize=18;
-	else
-	  eq.attr.fontsize=14;
-	redo=1;
-      }
-      if (key==KEY_CHAR_IMGNRY)
-	key='i';
-      const char keybuf[2]={(key==KEY_CHAR_PMINUS?'-':char(key)),0};
-      const char * adds=(key==KEY_CTRL_F4 || key==KEY_CHAR_PMINUS ||
-			 (key==char(key) && (isalphanum(key)|| key=='.' ))
-			 )?keybuf:keytostring(key,keyflag,contextptr);
-      if (adds && !strcmp(adds,"VARS()"))
-	continue;
-      translate_fkey(key);
-      if ( key==KEY_CTRL_F1 || key==KEY_CTRL_F2 ||
-	   (key>=KEY_CTRL_F7 && key<=KEY_CTRL_F14)){
-	adds=console_menu(key,fmenu_cfg,1);//alph?"simplify":(keyflag==1?"factor":"partfrac");
-	// workaround for infinitiy
-	if (!adds) continue;
-	if (strlen(adds)>=2 && adds[0]=='o' && adds[1]=='o')
-	  key=KEY_CTRL_F3;      
-      }
-      if (key==KEY_CTRL_F6 || key==KEY_CTRL_EXE){
-	adds= (key==KEY_CTRL_F6?"evalf":"eval");
-      }
-      if (key==KEY_CHAR_MINUS)
-	adds="-";
-      if (key==KEY_CHAR_EQUAL)
-	adds="=";
-      if (key==KEY_CHAR_RECIP)
-	adds="inv";
-      if (key==KEY_CHAR_SQUARE)
-	adds="sq";
-      if (key==KEY_CHAR_POWROOT)
-	adds="surd";
-      if (key==KEY_CHAR_CUBEROOT)
-	adds="surd";
-      if (key==KEY_CHAR_FACTOR)
-	adds="factor";
-      if (key==KEY_CHAR_NORMAL)
-	adds="normal";
-      int addssize=adds?strlen(adds):0;
-      // cout << addssize << " " << adds << endl;
-      if (0 && key==KEY_CTRL_EXE){
-	if (xcas::do_select(eq.data,true,value) && value.type==_EQW){
-	  //cout << "ok " << value._EQWptr->g << endl;
-	  DefineStatusMessage(((lang==1)?"resultat stocke dans last":"result stored in last"), 1, 0, 0);
-	  //DisplayStatusArea();
-	  giac::sto(value._EQWptr->g,giac::gen("last",contextptr),contextptr);
-	  return value._EQWptr->g;
-	}
-	//cout << "no " << eq.data << endl; if (value.type==_EQW) cout << value._EQWptr->g << endl ;
-	return geq;
-      }
-      if ( key!=KEY_CHAR_MINUS && key!=KEY_CHAR_EQUAL && key!=0 &&
-	   (ins || key==KEY_CHAR_PI || key==KEY_CTRL_VARS || key==KEY_CTRL_F3 || (addssize==1 && (isalphanum(adds[0])|| adds[0]=='.' || adds[0]=='-') ) )
-	   ){
-	edited=true;
-	if (line>=0 && xcas::eqw_select(eq.data,line,col,true,value)){
-	  string s;
-	  if (ins){
-	    if (key==KEY_CTRL_PASTE)
-	      s=paste_clipboard();
-	    else {
-	      if (value.type==_EQW){
-		s=value._EQWptr->g.print(contextptr);
-	      }
-	      else
-		s=value.print(contextptr);
-	    }
-	  }
-	  else
-	    s = adds;
-	  string msg("Line ");
-	  msg += print_INT_(line+1);
-	  msg += " Col ";
-	  msg += print_INT_(col+1);
-	  if (inputline(msg.c_str(),0,s,false,65,contextptr)==KEY_CTRL_EXE){
-	    value=gen(s,contextptr);
-	    if (col<0)
-	      (*geq._VECTptr)[line]=value;
-	    else
-	      (*((*geq._VECTptr)[line]._VECTptr))[col]=value;
-	    redo=2;
-	    key=KEY_SHIFT_RIGHT;
-	  }
-	  else
-	    continue;
-	}
-	else {
-	  vector<int> goto_sel;
-	  if (xcas::Equation_adjust_xy(eq.data,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,&goto_sel) && gsel && xcas::do_select(*gsel,true,value) && value.type==_EQW){
-	    string s;
-	    if (ins){
-	      if (key==KEY_CTRL_PASTE)
-		s=paste_clipboard();
-	      else {
-		s = value._EQWptr->g.print(contextptr);
-		if (key==KEY_CHAR_COMMA)
-		  s += ',';
-	      }
-	    }
-	    else
-	      s = adds;
-	    if (inputline(value._EQWptr->g.print(contextptr).c_str(),0,s,false)==KEY_CTRL_EXE){
-	      value=gen(s,contextptr);
-	      //cout << value << " goto " << goto_sel << endl;
-	      xcas::replace_selection(eq,value,gsel,&goto_sel,contextptr);
-	      firstrun=-1; // workaround, force 2 times display
-	    }
-	    continue;
-	  }
-	}
-      }
-      if (redo){
-	eq.data=0; // clear memory
-	eq.data=xcas::Equation_compute_size(geq,eq.attr,LCD_WIDTH_PX,contextptr);
-	eqdata=xcas::Equation_total_size(eq.data);
-	if (redo==1){
-	  dx=(eqdata.dx-LCD_WIDTH_PX)/2;
-	  dy=LCD_HEIGHT_PX-2*margin+eqdata.y;
-	  if (listormat) // select line l, col c
-	    xcas::eqw_select(eq.data,line,col,true,value);
-	  else {
-	    xcas::Equation_select(eq.data,true);
-	    xcas::eqw_select_down(eq.data);
-	  }
-	  continue;
-	}
-      }
-      bool doit=eqdata.dx>=LCD_WIDTH_PX;
-      int delta=0;
-      if (listormat){
-	if (key==KEY_CTRL_LEFT  || (!doit && key==KEY_SHIFT_LEFT)){
-	  if (line>=0 && xcas::eqw_select(eq.data,line,col,false,value)){
-	    if (col>=0){
-	      --col;
-	      if (col<0){
-		col=ncols-1;
-		if (line>0){
-		  --line;
-		  dy += value._EQWptr->dy+eq.attr.fontsize/2;
-		}
-	      }
-	    }
-	    else {
-	      if (line>0)
-		--line;
-	    }
-	    xcas::eqw_select(eq.data,line,col,true,value);
-	    if (doit) dx -= value._EQWptr->dx;
-	  }
-	  continue;
-	}
-	if (doit && key==KEY_SHIFT_LEFT){
-	  dx -= 20;
-	  continue;
-	}
-	if (key==KEY_CTRL_RIGHT  || (!doit && key==KEY_SHIFT_RIGHT)) {
-	  if (line>=0 && xcas::eqw_select(eq.data,line,col,false,value)){
-	    if (doit)
-	      dx += value._EQWptr->dx;
-	    if (col>=0){
-	      ++col;
-	      if (col==ncols){
-		col=0;
-		if (line<nlines-1){
-		  ++line;
-		  dy -= value._EQWptr->dy+eq.attr.fontsize/2;
-		}		  
-	      }
-	    } else {
-	      if (line<nlines-1)
-		++line;
-	    }
-	    xcas::eqw_select(eq.data,line,col,true,value);
-	  }
-	  continue;
-	}
-	if (key==KEY_SHIFT_RIGHT && doit){
-	  dx += 20;
-	  continue;
-	}
-	doit=eqdata.dy>=LCD_HEIGHT_PX-2*margin;
-	if (key==KEY_CTRL_UP || (!doit && key==KEY_CTRL_PAGEUP)){
-	  if (line>0 && col>=0 && xcas::eqw_select(eq.data,line,col,false,value)){
-	    --line;
-	    xcas::eqw_select(eq.data,line,col,true,value);
-	    if (doit)
-	      dy += value._EQWptr->dy+eq.attr.fontsize/2;
-	  }
-	  continue;
-	}
-	if (key==KEY_CTRL_PAGEUP && doit){
-	  dy += 10;
-	  continue;
-	}
-	if (key==KEY_CTRL_DOWN  || (!doit && key==KEY_CTRL_PAGEDOWN)){
-	  if (line<nlines-1 && col>=0 && xcas::eqw_select(eq.data,line,col,false,value)){
-	    if (doit)
-	      dy -= value._EQWptr->dy+eq.attr.fontsize/2;
-	    ++line;
-	    xcas::eqw_select(eq.data,line,col,true,value);
-	  }
-	  continue;
-	}
-	if ( key==KEY_CTRL_PAGEDOWN && doit){
-	  dy -= 10;
-	  continue;
-	}
-      }
-      else { // else listormat
-	if (key==KEY_CTRL_LEFT){
-	  delta=xcas::eqw_select_leftright(eq,true,alph?2:0,contextptr);
-	  // cout << "left " << delta << endl;
-	  if (doit) dx += (delta?delta:-20);
-	  continue;
-	}
-	if (key==KEY_SHIFT_LEFT){
-	  delta=xcas::eqw_select_leftright(eq,true,1,contextptr);
-	  vector<int> goto_sel;
-	  if (doit) dx += (delta?delta:-20);
-	  continue;
-	}
-	if (key==KEY_CTRL_RIGHT){
-	  delta=xcas::eqw_select_leftright(eq,false,alph?2:0,contextptr);
-	  // cout << "right " << delta << endl;
-	  if (doit)
-	    dx += (delta?delta:20);
-	  continue;
-	}
-	if (key==KEY_SHIFT_RIGHT){
-	  delta=xcas::eqw_select_leftright(eq,false,1,contextptr);
-	  // cout << "right " << delta << endl;
-	  if (doit)
-	    dx += (delta?delta:20);
-	  // dx=eqdata.dx-LCD_WIDTH_PX+20;
-	  continue;
-	}
-	doit=eqdata.dy>=LCD_HEIGHT_PX-2*margin;
-	if (key==KEY_CTRL_UP){
-	  delta=xcas::eqw_select_up(eq.data);
-	  // cout << "up " << delta << endl;
-	  continue;
-	}
-	//cout << "up " << eq.data << endl;
-	if (key==KEY_CTRL_PAGEUP && doit){
-	  dy=eqdata.y+eqdata.dy+20;
-	  continue;
-	}
-	if (key==KEY_CTRL_DOWN){
-	  delta=xcas::eqw_select_down(eq.data);
-	  // cout << "down " << delta << endl;
-	  continue;
-	}
-	//cout << "down " << eq.data << endl;
-	if ( key==KEY_CTRL_PAGEDOWN && doit){
-	  dy=eqdata.y+LCD_HEIGHT_PX-margin;
-	  continue;
-	}
-      }
-      if (adds){
-	edited=true;
-	if (strcmp(adds,"'")==0)
-	  adds="diff";
-	if (strcmp(adds,"^2")==0)
-	  adds="sq";
-	if (strcmp(adds,">")==0)
-	  adds="simplify";
-	if (strcmp(adds,"<")==0)
-	  adds="factor";
-	if (strcmp(adds,"#")==0)
-	  adds="partfrac";
-	string cmd(adds);
-	if (cmd.size() && cmd[cmd.size()-1]=='(')
-	  cmd ='\''+cmd.substr(0,cmd.size()-1)+'\'';
-	vector<int> goto_sel;
-	if (xcas::Equation_adjust_xy(eq.data,xleft,ytop,xright,ybottom,gsel,gselparent,gselpos,&goto_sel) && gsel){
-	  gen op;
-	  int addarg=0;
-	  if (addssize==1){
-	    switch (adds[0]){
-	    case '+':
-	      addarg=1;
-	      op=at_plus;
-	      break;
-	    case '^':
-	      addarg=1;
-	      op=at_pow;
-	      break;
-	    case '=':
-	      addarg=1;
-	      op=at_equal;
-	      break;
-	    case '-':
-	      addarg=1;
-	      op=at_binary_minus;
-	      break;
-	    case '*':
-	      addarg=1;
-	      op=at_prod;
-	      break;
-	    case '/':
-	      addarg=1;
-	      op=at_division;
-	      break;
-	    case '\'':
-	      addarg=1;
-	      op=at_derive;
-	      break;
-	    }
-	  }
-	  if (op==0)
-	    op=gen(cmd,contextptr);
-	  if (op.type==_SYMB)
-	    op=op._SYMBptr->sommet;
-	  // cout << "keyed " << adds << " " << op << " " << op.type << endl;
-	  if (op.type==_FUNC){
-	    edited=true;
-	    // execute command on selection
-	    gen tmp,value;
-	    if (xcas::do_select(*gsel,true,value) && value.type==_EQW){
-	      if (op==at_integrate || op==at_sum)
-		addarg=3;
-	      if (op==at_limit)
-		addarg=2;
-	      gen args=protecteval(value._EQWptr->g,1,contextptr);
-	      gen vx=xthetat?t__IDNT_e:x__IDNT_e;
-	      if (addarg==1)
-		args=makesequence(args,0);
-	      if (addarg==2)
-		args=makesequence(args,vx_var,0);
-	      if (addarg==3)
-		args=makesequence(args,vx_var,0,1);
-	      if (op==at_surd)
-		args=makesequence(args,key==KEY_CHAR_CUBEROOT?3:4);
-	      if (op==at_subst)
-		args=makesequence(args,giac::symb_equal(vx_var,0));
-	      unary_function_ptr immediate_op[]={*at_eval,*at_evalf,*at_evalc,*at_regrouper,*at_simplify,*at_normal,*at_ratnormal,*at_factor,*at_cfactor,*at_partfrac,*at_cpartfrac,*at_expand,*at_canonical_form,*at_exp2trig,*at_trig2exp,*at_sincos,*at_lin,*at_tlin,*at_tcollect,*at_texpand,*at_trigexpand,*at_trigcos,*at_trigsin,*at_trigtan,*at_halftan};
-	      if (equalposcomp(immediate_op,*op._FUNCptr)){
-		set_abort();
-		tmp=(*op._FUNCptr)(args,contextptr);
-		clear_abort();
-		esc_flag=0;
-		giac::ctrl_c=false;
-		kbd_interrupted=giac::interrupted=false;
-	      }
-	      else
-		tmp=symbolic(*op._FUNCptr,args);
-	      //cout << "sel " << value._EQWptr->g << " " << tmp << " " << goto_sel << endl;
-	      esc_flag=0;
-	      giac::ctrl_c=false;
-	      kbd_interrupted=giac::interrupted=false;
-	      if (!is_undef(tmp)){
-		xcas::replace_selection(eq,tmp,gsel,&goto_sel,contextptr);
-		if (addarg){
-		  xcas::eqw_select_down(eq.data);
-		  xcas::eqw_select_leftright(eq,false,0,contextptr);
-		}
-		eqdata=xcas::Equation_total_size(eq.data);
-		dx=(eqdata.dx-LCD_WIDTH_PX)/2;
-		dy=LCD_HEIGHT_PX-2*margin+eqdata.y;
-		firstrun=-1; // workaround, force 2 times display
-	      }
-	    }
-	  } // if (op.type==_FUNC)
-	  
-	} // if adjust_xy
-      } // if (adds)
-    }
-    //*logptr(contextptr) << eq.data << endl;
-  }
-  
-  void clear_turtle_history(GIAC_CONTEXT){
-    history_in(contextptr).clear();
-    history_out(contextptr).clear();
-    turtle_stack()=vector<logo_turtle>(1,logo_turtle());
-  }    
-  
-  void do_restart(GIAC_CONTEXT){
-    if (contextptr){
-      if (contextptr->globalcontextptr && contextptr->globalcontextptr->tabptr)
-	contextptr->globalcontextptr->tabptr->clear();
-    }
-    else
-      _restart(0,contextptr);
-  }
-
-  void switch_to_micropy(GIAC_CONTEXT){
-    xcas_python_eval=1;
-    int p=python_compat(contextptr);
-    if (p<0) p=0;
-    python_compat(4|p,contextptr);
-    if (edptr)
-      edptr->python=1;
-    if (do_confirm((lang==1)?"Effacer les variables Xcas?":"Clear Xcas variables?"))
-      do_restart(contextptr);
-    *logptr(contextptr) << "Micropython interpreter\n";
-    Console_FMenu_Init(contextptr);
-  }
-
-  void switch_to_js(GIAC_CONTEXT){
-    //js_ck_eval("1",&global_js_context);
-    xcas_python_eval=-1;
-    python_compat(-1,contextptr);
-    if (edptr)
-      edptr->python=-1;
-    if (0 && do_confirm((lang==1)?"Effacer les variables Xcas?":"Clear Xcas variables?"))
-      do_restart(contextptr);
-    *logptr(contextptr) << "QuickJS interpreter\n";
-    Console_FMenu_Init(contextptr);
-  }
-
-  void do_run(const char * s,gen & g,gen & ge,const context * & contextptr){
-    warn_nr=os_shell=true;
-    if (!contextptr)
-      contextptr=new giac::context;
-    if (!strcmp(s,"restart")){
-      clear_turtle_history(contextptr);
-      do_restart(contextptr);
-      return;
-    }
-    int S=strlen(s);
-    char buf[S+1];
-    buf[S]=0;
-    for (int i=0;i<S;++i){
-      char c=s[i];
-      if (c==0x1e || c==char(0x9c))
-	buf[i]='\n';
-      else {
-	if (c==0x0d)
-	  buf[i]=' ';
-	else
-	  buf[i]=c;
-      }
-    }
-    g=gen(buf,contextptr);
-    //Console_Output(g.print(contextptr).c_str()); return ;
-    giac::freeze=false;
-    // execution_in_progress = 1;
-    set_abort();
-    ge=protecteval(equaltosto(g,contextptr),1,contextptr);
-    clear_abort();
-    // execution_in_progress = 0;
-    if (esc_flag || ctrl_c){
-      esc_flag=ctrl_c=interrupted=false;
-      while (confirm("Interrupted","OK",true)==-1)
-	; // insure ON has been removed from keyboard buffer
-      ge=string2gen("Interrupted",false);
-      // memory full?
-      if (!kbd_interrupted){
-	// clear turtle, display msg
-	clear_turtle_history(contextptr);
-	int res=confirm((lang==1)?"Memoire remplie! Purger":"Memory full. Purge",
-#ifdef NSPIRE_NEWLIB
-			(lang==1)?"enter: variable, esc: tout.":"enter: variables, esc: all",
-#else
-			(lang==1)?"EXE variable, Back: tout.":"EXE variables, Back: all",
-#endif
-			false);
-	if (res==KEY_CTRL_F1 && select_var(contextptr).type==_IDNT){
-	  size_t savestackptr = stackptr;
-#ifdef x86_64
-	  stackptr=0xffffffffffffffff;
-#else
-	  stackptr=0xffffffff;
-#endif
-	  _purge(g,contextptr);
-	  stackptr=savestackptr;
-	}
-	else
-	  do_restart(contextptr);
-      }
-    }
-    //Console_Output("Done"); return ;
-    esc_flag=0;
-    giac::ctrl_c=false;
-    giac::kbd_interrupted=giac::interrupted=false;
-  }
-
-#ifdef NSPIRE_NEWLIB
-  const unsigned char rsa_n_tab[]=
-  {
-   0xf2,0x0e,0xd4,0x9d,0x44,0x04,0xc4,0xc8,0x6a,0x5b,0xc6,0x9a,0xd6,0xdf,
-   0x9c,0xf5,0x56,0xf2,0x0d,0xad,0x6c,0x34,0xb4,0x48,0xf7,0xa7,0xa8,0x27,0xa0,
-   0xc8,0xbe,0x36,0xb1,0xc0,0x95,0xf8,0xc2,0x72,0xfb,0x78,0x0f,0x3f,0x15,0x22,
-   0xaf,0x51,0x96,0xe3,0xdc,0x39,0xb4,0xc6,0x40,0x6d,0x58,0x56,0x1f,0xad,0x55,
-   0x55,0x08,0xf1,0xde,0x5a,0xbc,0xd3,0xcc,0x16,0x3d,0x33,0xee,0x83,0x3f,0x32,
-   0xa7,0xa7,0xb8,0x95,0x2f,0x35,0xeb,0xf6,0x32,0x4d,0x22,0xd9,0x60,0xb7,0x5e,
-   0xbd,0xea,0xa5,0xcb,0x9c,0x69,0xeb,0xfd,0x9f,0x2b,0x5f,0x3d,0x38,0x5a,0xe1,
-   0x2b,0x63,0xf8,0x92,0x35,0x91,0xea,0x77,0x07,0xcc,0x4b,0x7a,0xbc,0xe0,0xa0,
-   0x8b,0x82,0x98,0xa2,0x87,0x10,0x2c,0xe2,0x23,0x53,0x2f,0x70,0x03,0xec,0x2d,
-   0x22,0x34,0x72,0x57,0x4d,0x24,0x2e,0x97,0xc9,0xfb,0x23,0xb0,0x05,0xff,0x87,
-   0x6e,0xbf,0x94,0x2d,0xf0,0x36,0xed,0xd7,0x9a,0xac,0x0c,0x21,0x94,0xa2,0x75,
-   0xfc,0x39,0x9b,0xba,0xf2,0xc6,0xc9,0x34,0xa0,0xb2,0x66,0x5a,0xcc,0xc9,0x5c,
-   0xc7,0xdb,0xce,0xfb,0x3a,0x10,0xee,0xc1,0x82,0x9a,0x43,0xef,0xed,0x87,0xbd,
-   0x6c,0xe4,0xc1,0x36,0xd0,0x0a,0x85,0x6e,0xca,0xcd,0x13,0x29,0x65,0xb5,0xd4,
-   0x13,0x4a,0x14,0xaa,0x65,0xac,0x0e,0x6f,0x19,0xb0,0x62,0x47,0x65,0x0e,0x40,
-   0x82,0x37,0xd6,0xf0,0x17,0x48,0xaa,0x8c,0x7b,0xc4,0x5e,0x4a,0x72,0x26,0xa6,
-   0x08,0x2e,0xff,0x2d,0x9d,0x0e,0x2e,0x19,0xe9,0x6a,0x4c,0x7c,0x3e,0xe9,0xbc,
-   0x78,0x95
-  };
-
-  gen tabunsignedchar2gen(const unsigned char tab[],int len){
-    gen res=0;
-    for (int i=0;i<len;++i){
-      res=256*res;
-      res+=tab[i];
-    }
-    return res;
-  }
-  // rsa_check will return a number of keys if the file is made of encrypted sha256
-  // fingerprints, and will set the list of keys accordingly
-  // decrypted sha256 keys must be written in basis 256
-  // as decimal strings of 3 digits
-  // a key has 32 bytes -> 96 digits -> crypted as a 96 hexadecimal BCD number
-  // 96 bytes = 768 bits + 1280 leadings bits ignored
-  // if after decryption one byte is not in '0'..'9' then the key file is wrong
-  int rsa_check(const char * filename,int maxkeys,BYTE hash[][SHA256_BLOCK_SIZE]){
-    // 2048 bits key
-    //gen rsa_n("30556983006074777238153119417050033796377803388439527860005340326999902386793820226251074714511561407075812479599501874865302578278319769475202313110451510448783794266461205935851713896070734772609406958034158877973097041361961511770051269836310307170258399115935233789006376756279696914861909994161265089406023979340582770078210602481999222884431385627202086122099546391904669923221616360112943964540439315592530076604901633280666259500385969154248745363924897530806256116825070881718288938659701112718863366914419207811508217802754887145264781681001930842410022363032920896943814827354941650810105635438172850387093",context0);
-    gen rsa_n(tabunsignedchar2gen(rsa_n_tab,sizeof(rsa_n_tab)));
-    gen N=pow(gen(2),768),q;
-    // read by blocks of 2048 bits=256 bytes
-    FILE * f=fopen(filename,"r");
-    if (!f)
-      return -1;
-    for (int i=0;;++i){
-      gen key=0;
-      // skip 0x prefix
-      for (;;){
-	unsigned char c=fgetc(f);
-	if (feof(f))
-	  break;
-	if (c=='\n' || c==' ' || c=='0')
-	  continue;
-	if (c=='x')
-	  break;
-	// invalid char
-	unlink(filename);
-	return -2;
-      }
-      if (feof(f)){
-	fclose(f);
-	return i;
-      }
-      for (int j=0;j<256;++j){
-	key = 256*key;
-	unsigned char c=fgetc(f);
-	if (feof(f)){
-	  fclose(f);
-	  if (j!=0){ unlink(filename); return 0; }
-	  return i;
-	}
-	if (c==' ' || c=='\n')
-	  break;
-	if (c>='0' && c<='9')
-	  c=c-'0';
-	else {
-	  if (c>='a' && c<='f')
-	    c=10+c-'a';
-	  else {
-	    fclose(f);
-	    unlink(filename);
-	    return -3;
-	  }
-	}
-	unsigned char d=fgetc(f);
-	if (feof(f)){
-	  fclose(f);
-	  unlink(filename);
-	  return -4;
-	}
-	if (d==' ' || d=='\n'){
-	  key = key/16+int(c);
-	  break;
-	}
-	if (d>='0' && d<='9')
-	  d=d-'0';
-	else {
-	  if (d>='a' && d<='f')
-	    d=10+d-'a';
-	  else {
-	    fclose(f);
-	    unlink(filename);
-	    return -5;
-	  }
-	}
-	key = key+int(c)*16+int(d);
-      }
-      // public key decrypt and keep only 768 low bits
-      //std::cout << key << '\n' ;
-      key=powmod(key,65537,rsa_n);
-      key=irem(key,N,q); // q should be irem(rsa_n,12345)
-      if (q!=12345){
-	fclose(f);
-	//unlink(filename);
-	return -6;
-      }
-      // check that key is valid and write in hash[i]
-      for (int j=0;j<32;++j){
-	// divide 3 times by 256, remainder must be in '0'..'9'
-	int o=0;
-	int tab[]={1,10,100};
-	for (int k=0;k<3;++k){
-	  gen r=irem(key,256,q);
-	  key=q;
-	  if (r.type!=_INT_ || r.val>'9' || r.val<'0'){
-	    fclose(f);
-	    unlink(filename);
-	    return -7;
-	  }
-	  o+=(r.val-'0')*tab[k];
-	}
-	if (o<0 || o>255){
-	  fclose(f);
-	  unlink(filename);
-	  return -8;
-	}
-	if (i<maxkeys)
-	  hash[i][31-j]=o;
-      }
-    }
-    fclose(f);
-    return maxkeys;
-  }
-
-  bool sha_check(const char * filename,int nkeys,BYTE hash[][SHA256_BLOCK_SIZE]){
-    // must contain sha256 hash for ndless and khicas files (max 32 hash keys)
-    // if more keys are needed modify maxkeys here and in buildsha.cc
-    // Keys are generated with buildsha.cc (private program)
-    // ./a.out ndless/* khicas*tns luagiac.luax.tns 
-    BYTE buf[SHA256_BLOCK_SIZE];
-    SHA256_CTX ctx;
-    string text;
-    FILE * f=fopen(filename,"r");
-    if (!f)
-      return false;
-    for (;;){
-      unsigned char c=fgetc(f);
-      if (feof(f))
-	break;
-      text += c;
-    }
-    fclose(f);
-    unsigned char * ptr=(unsigned char *)text.c_str();
-    sha256_init(&ctx);
-    sha256_update(&ctx, ptr, text.size());
-    sha256_final(&ctx, buf);
-    for (int i=0;i<nkeys;++i){
-      if (!memcmp(hash[i], buf, SHA256_BLOCK_SIZE))
-	return true;
-    }
-    return false;
-  }
-
-  void nspire_copy_data(int nkeys,BYTE hash[][SHA256_BLOCK_SIZE],GIAC_CONTEXT){
-    const char * dirname="/documents/ndless";
-    const char * targetdirname="/exammode/usr/ndless";
-    DIR *dp;
-    dp = opendir(targetdirname);
-    if (!dp)
-      mkdir(targetdirname,0755);
-    else
-      closedir(dp);
-    struct dirent *ep;
-    dp = opendir (dirname);
-    if (!dp)
-      return ;
-    while ( (ep = readdir (dp)) ){
-      string s=ep->d_name;
-      int t=s.size();
-      if (t<4 || s.substr(t-4,4)!=".tns")
-	continue;
-      if ( (s=="khicas.tns" || s=="luagiac.luax.tns" || s=="khicaslua.tns" || s=="ptt.tns" || s.substr(0,17)=="ndless_installer_" || s=="ndless_resources.tns" || s=="ndless.cfg.tns")){ // shakeys.tns is not copied, it is retrieved from non-exam mode
-	string ss=dirname+("/"+s);
-	*logptr(contextptr) << "processing " << s << "\n" ; //" " << ss << " " << (targetdirname+("/"+s)) << '\n';
-	if (1 || sha_check(ss.c_str(),nkeys,hash)){ // check done when setting exam mode
-	  cp(ss.c_str(),(targetdirname+("/"+s)).c_str());
-	}
-      }
-    }     
-  }
-  
-  DIR * nspire_clear_data(const char * dirname,int nkeys,BYTE hash[][SHA256_BLOCK_SIZE],GIAC_CONTEXT){
-    bool toplevel=strcmp(dirname,"/exammode/usr")==0;
-    bool ndless=strcmp(dirname,"/exammode/usr/ndless")==0;
-    DIR *dp;
-    struct dirent *ep;
-    dp = opendir (dirname);
-    if (!dp)
-      return dp;
-    string s;
-    int t;
-    while ( (ep = readdir (dp)) ){
-      s=ep->d_name;
-      t=s.size();
-      if (s=="." || s==".." || s=="NspireLogs.zip" || s=="themes.csv")
-	continue;
-      int res=0;
-      if (t<4 || s.substr(t-4,4)!=".tns"){ // dev, tmp, phoenix, documents, logs, widgets, ptt, metric, wlan, temp_ccp, images
-	s=dirname+("/"+s);
-	DIR * ptr=nspire_clear_data(s.c_str(),nkeys,hash,contextptr);
-	if (ptr && s!="/exammode/usr/ndless" && s!="/exammode/usr/Press-to-Test")
-	  res=rmdir(s.c_str());
-	// else *logptr(contextptr) << s << '\n'; //
-      }
-      else {
-	if (toplevel || ndless){
-	  if (ndless && s=="shakeys.tns")
-	    continue;
-	  if ( (s=="khicas.tns" || s=="luagiac.luax.tns" || s=="khicaslua.tns" || s=="ptt.tns")){
-	    string ss=dirname+("/"+s);
-	    if (sha_check(ss.c_str(),nkeys,hash))
-	      continue;
-	  }
-	}
-	if (ndless){
-	  if ((s.substr(0,17)=="ndless_installer_" || s=="ndless_resources.tns" || s=="ndless.cfg.tns") ){
-	    string ss=dirname+("/"+s);
-	    if (sha_check(ss.c_str(),nkeys,hash))
-	      continue;
-	  }
-	}
-	s=dirname+("/"+s);
-	res=unlink(s.c_str());//*logptr(contextptr) << s << '\n'; //
-      }
-    }
-    closedir (dp);
-    return dp;
-  }
-  
-  void nspire_clear_data(GIAC_CONTEXT,bool copy){
-    int maxkeys=32;
-    BYTE hash[maxkeys][SHA256_BLOCK_SIZE]={
-    };
-    int nkeys=rsa_check("/exammode/usr/ndless/shakeys.tns",maxkeys,hash);
-    if (nkeys<=0)
-      nkeys=rsa_check("/documents/ndless/shakeys.tns",maxkeys,hash);
-    if (lang==1)
-      *logptr(contextptr) << "Il y a " << nkeys << " empreintes cryptees de fichiers autorises\n";
-    else
-      *logptr(contextptr) << "Found " << nkeys << " valid crypted keys of secure files\n";
-#if 0
-    for (int i=0;i<nkeys;++i){
-      *logptr(contextptr) << "{";
-      for (int j=0;j<SHA256_BLOCK_SIZE;j++){
-	*logptr(contextptr) << hash[i][j] <<",";
-      }
-      *logptr(contextptr) << "}\n";
-    }
-#endif
-    *logptr(contextptr) << (lang==1?"Teste et efface les fichiers non autorises\n":"Checking and clearing non secure files\n");
-    nspire_clear_data("/exammode/usr",nkeys,hash,contextptr);
-    *logptr(contextptr) << (lang==1?"Fichiers non autorises effaces\n":"Filesystem checked.\n");
-    if (copy)
-      nspire_copy_data(nkeys,hash,contextptr);
-    else
-      *logptr(contextptr) << (lang==1?"Tapez doc doc pour relancer le mode examen\n":"Press doc doc to restart exam mode\n");
-  }
-#endif
-
-  // maybe we should use int nl_exec(const char *prgm_path, int argsn, char *args[])
-#ifdef NSPIRE_LED
-#include "kled.cc"
-#else
-#ifdef NSPIRE_NEWLIB
-  // #include "ptt"
-  void set_exam_mode(int i,GIAC_CONTEXT){
-    unsigned NSPIRE_RTC_ADDR=0x90090000;
-    unsigned t1= * (volatile unsigned *) NSPIRE_RTC_ADDR;
-    gen n=tabunsignedchar2gen(rsa_n_tab,sizeof(rsa_n_tab));
-    gen key=powmod(longlong(t1),65537,n);
-    key.uncoerce();
-    const char * exec=0;
-    if (i==-1)
-      exec="/documents/ndless/ptt.tns";
-    else
-      exec="/exammode/usr/ndless/ptt.tns";
-    char clef[]="/documents/rtc.tns";
-    char mode[3]="0";
-    mode[0] += i;
-    if (i==-1){
-      mode[0]='-';
-      mode[1]='1';
-      mode[2]=0;
-    }
-    char * args[]={clef,mode,0};
-    FILE * f=fopen(clef,"w");
-    mpz_out_str(f,10,*key._ZINTptr);
-    fclose(f);
-    // main_ptt(1,0);
-#ifdef MICROPY_LIB
-    python_free();
-#endif   
-#ifdef QUICKJS
-    js_end(global_js_context);
-#endif
-    int res=nl_exec(exec,2,args);
-    //*logptr(contextptr) << "exam mode " << res << '\n';
-    //int res=nl_exec(exec,1,0);
-    // int res=nl_exec("/documents/ndless/ptt.tns",1,filenames);
-    unlink(clef);
-    if (i!=-1)
-      exam_mode=i;
-  }
-#else
-  void set_exam_mode(int i,GIAC_CONTEXT){
-    exam_mode=i;
-  }
-#endif
-#endif
-
-#if defined NUMWORKS && defined DEVICE
-  BYTE bootloader_hash[]={116,198,71,80,107,25,110,250,180,171,154,127,1,174,88,153,108,172,2,218,82,101,93,157,148,76,37,33,102,53,12,136,};
-  const int bootloader_size=65480;
-  // check bootloade code, skipping exam mode buffer sector
-  bool bootloader_sha256_check(size_t addr){
-    BYTE buf[SHA256_BLOCK_SIZE];
-    SHA256_CTX ctx;
-    unsigned char * ptr=(unsigned char *)addr;
-    giac_sha256_init(&ctx);
-    giac_sha256_update(&ctx, ptr, 16*1024);
-    giac_sha256_update(&ctx, ptr+32*1024, bootloader_size-32*1024);
-    giac_sha256_final(&ctx, buf);
-    if (0) confirm(("@"+hexa_print_INT_(addr)).c_str(),("hash "+print_INT_(buf[0])+","+print_INT_(buf[1])).c_str());
-    if (!memcmp(bootloader_hash, buf, SHA256_BLOCK_SIZE))
-      return true;
-    return false;
-  }
-#endif
-  
-  string print_duration(double & duration){
-    if (duration<=0)
-      return "";
-    int s=std::floor(duration+.5);
-    int h=s/3600;
-    int m=((s+30)%3600)/60;
-    char ch[6]="00h00";
-    ch[0] += h/10;
-    ch[1] += h%10;
-    ch[3] += m/10;
-    ch[4] += m%10;
-    duration=h+m/100.0;
-    return ch;
-  }
-  const char conf_standard[] = "F1 algb\nsimplify(\nfactor(\npartfrac(\ntcollect(\ntexpand(\nsum(\noo\nproduct(\nF2 calc\n'\ndiff(\nintegrate(\nlimit(\nseries(\nsolve(\ndesolve(\nrsolve(\nF5  2d \nreserved\nF4 menu\nreserved\nF6 reg\nlinear_regression_plot(\nlogarithmic_regression_plot(\nexponential_regression_plot(\npower_regression_plot(\npolynomial_regression_plot(\nsin_regression_plot(\nscatterplot(\nmatrix(\nF< poly\nproot(\npcoeff(\nquo(\nrem(\ngcd(\negcd(\nresultant(\nGF(\nF9 arit\n mod \nirem(\nifactor(\ngcd(\nisprime(\nnextprime(\npowmod(\niegcd(\nF7 lin\nmatrix(\ndet(\nmatpow(\nranm(\nrref(\ntran(\negvl(\negv(\nF= list\nmakelist(\nrange(\nseq(\nlen(\nappend(\nranv(\nsort(\napply(\nF3 plot\nplot(\nplotseq(\nplotlist(\nplotparam(\nplotpolar(\nplotfield(\nhistogram(\nbarplot(\nF; real\nexact(\napprox(\nfloor(\nceil(\nround(\nsign(\nmax(\nmin(\nF> prog\n:\n&\n#\nhexprint(\nbinprint(\nf(x):=\ndebug(\npython(\nF8 cplx\nabs(\narg(\nre(\nim(\nconj(\ncsolve(\ncfactor(\ncpartfrac(\nF: misc\n!\nrand(\nbinomial(\nnormald(\nexponentiald(\n and \n or \nperiodic_table\nF? geo\npoint(\nline(\ncircle(\nplane(\nF@ color\ncolor=\nred\ncyan\ngreen\nblue\nmagenta\nyellow\n";
-
-  const char python_conf_standard[] = "F1 misc\nprint(\ninput(\n;\n:\n[]\ndef f(x): return \ntime()\nfrom time import *\nF2 math\nfloor(\nceil(\nround(\nmin(\nmax(\nabs(\nsqrt(\nfrom math import *\nF3 c&rand\nrandint(\nrandom()\nchoice(\nfrom random import *\n.real\n.imag\nphase(\nfrom cmath import *;i=1j\nF4 menu\nreserved\nF5  2d\nreserved\nF6 tortue\nforward(\nbackward(\nleft(\nright(\npencolor(\ncircle(\nreset()\nfrom turtle import *\nF7 linalg\nmatrix(\nadd(\nsub(\nmul(\ninv(\nrref(\ntranspose(\nfrom linalg import *;i=1j\nF8 numpy\narray(\nreshape(\narange(\nlinspace(\nsolve(\neig(\ninv(\nfrom numpy import *;i=1j\nF9 arit\npow(\nisprime(\nnextprime(\nifactor(\ngcd(\nlcm(\niegcd(\nfrom arit import *\nF< color\nred\nblue\ngreen\ncyan\nyellow\nmagenta\nblack\nwhite\nF; draw\nclear_screen();\nshow_screen();\nset_pixel(\ndraw_line(\ndraw_rectangle(\n\ndraw_circle(\ndraw_string(\nfrom graphic import *\nF: plot\nclf()\nplot(\ntext(\narrow(\nscatter(\nbar(\nshow()\nfrom matplotl import *\nF= list\nlist(\nrange(\nlen(\nappend(\nzip(\nsorted(\nmap(\nreversed(\nF> prog\n|\n&\n#\nhex(\nbin(\ndebug(\nfrom cas import *\ncaseval(\"\")\n";
-  
-  int eqws(char * s,bool eval,GIAC_CONTEXT){ // s buffer must be at least 512 char
-    gen g,ge;
-    int dconsole_save=dconsole_mode;
-    int ss=strlen(s);
-    for (int i=0;i<ss;++i){
-      if (s[i]==char(0x9c))
-	s[i]='\n';
-    }
-    if (ss>=2 && (s[0]=='#' || s[0]=='"' ||
-		  (s[0]=='/' && (s[1]=='/' || s[1]=='*'))
-		  ))
-      return textedit(s,giacmax(512,ss),contextptr);
-    dconsole_mode=0;
-    if (eval)
-      do_run(s,g,ge,contextptr);
-    else {
-      if (s[0]==0)
-	ge=0;
-      else
-	ge=gen(s,contextptr);
-    }
-    dconsole_mode=dconsole_save;
-    if (is_undef(ge))
-      return textedit(s,giacmax(512,ss),contextptr);
-    if (ge.type==giac::_SYMB || (ge.type==giac::_VECT && !ge._VECTptr->empty() && !is_numericv(*ge._VECTptr)) ){
-      if (islogo(ge)){
-	if (displaylogo()==KEY_SHUTDOWN)
-	  return KEY_SHUTDOWN;
-	return 0;
-      }
-      if (ispnt(ge)){
-	if (displaygraph(ge,contextptr)==KEY_SHUTDOWN)
-	  return KEY_SHUTDOWN;
-	// aborttimer = Timer_Install(0, check_execution_abort, 100); if (aborttimer > 0) { Timer_Start(aborttimer); }
-	return 0;
-      }
-      if (ge.is_symb_of_sommet(at_program))
-	return textedit(s,giacmax(ss,512),contextptr);
-      if (taille(ge,256)>=256)
-	return 0;
-    }
-    int xp=xcas_python_eval;
-    xcas_python_eval=0;
-    Console_FMenu_Init(contextptr);
-    gen tmp=eqw(ge,true,contextptr);
-    xcas_python_eval=xp;
-    Console_FMenu_Init(contextptr);
-    if (is_undef(tmp) || tmp==ge || taille(ge,64)>=64)
-      return 0;
-    string S(tmp.print(contextptr));
-    if (S.size()>=512)
-      return 0;
-    strcpy(s,S.c_str());
-    return 1;
-  }
-
-  
-#define GIAC_TEXTAREA 1
-#if GIAC_TEXTAREA
-  textArea * edptr=0;
-#ifdef SCROLLBAR
-  typedef scrollbar TScrollbar;
-#endif
-
-  int get_line_number(const char * msg1,const char * msg2){
-    string s;
-    int res=inputline(msg1,msg2,s,false);
-    if (res==KEY_CTRL_EXIT)
-      return 0;
-    res=strtol(s.c_str(),0,10);
-    return res;
-  }
-
-  void warn_python(int mode,bool autochange){
-    if (mode==-1){
-      confirm((lang==1)?"Interpreteur Javascript":"Javascript interpreter",
-#ifdef NSPIRE_NEWLIB
-	      (lang==1)?"enter: ok":"enter: ok"
-#else
-	      (lang==1)?"OK: ok":"OK: ok"
-#endif	      
-	      );
-      return;
-    }
-    if (mode==0)
-      confirm(autochange?((lang==1)?"Source en syntaxe Xcas detecte.":"Xcas syntax source code detected."):((lang==1)?"Syntaxe Xcas.":"Xcas syntax."),
-#ifdef NSPIRE_NEWLIB
-	      "enter: ok"
-#else
-	      "OK: ok"
-#endif
-	      );
-    if (mode==1)
-      if (autochange)
-	confirm((lang==1)?"Source en syntaxe Python. Passage":"Python syntax source detected. Setting",
-#ifdef NSPIRE_NEWLIB
-		(lang==1)?"en Python avec ^=**, enter: ok":"Python mode with ^=**, enter:ok"
-#else
-		(lang==1)?"en Python avec ^=**, OK: ok":"Python mode with ^=**, OK:ok"
-#endif
-		);
-      else
-	confirm((lang==1)?"Syntaxe Python avec ^==**, tapez":"Python syntax with ^==**, type",
-#ifdef NSPIRE_NEWLIB
-		(lang==1)?"python_compat(2) pour xor. enter: ok":"python_compat(2) for xor. enter: ok"
-#else
-		(lang==1)?"python_compat(2) pour xor. OK: ok":"python_compat(2) for xor. OK: ok"
-#endif
-		);
-    if (mode==2){
-      confirm((lang==1)?"Syntaxe Python avec ^==xor":"Python syntax with ^==xor",
-#ifdef NSPIRE_NEWLIB
-	      (lang==1)?"python_compat(1) pour **. enter: ok":"python_compat(1) for **. enter: ok"
-#else
-	      (lang==1)?"python_compat(1) pour **. OK: ok":"python_compat(1) for **. OK: ok"
-#endif	      
-	      );
-    }
-    if (mode & 4){
-      confirm((lang==1)?"Interpreteur MicroPython":"MicroPython interpreter",
-#ifdef NSPIRE_NEWLIB
-	      (lang==1)?"enter: ok":"enter: ok"
-#else
-	      (lang==1)?"OK: ok":"OK: ok"
-#endif	      
-	      );
-    }
-  }
-
-  int check_do_graph(giac::gen & ge,int do_logo_graph_eqw,GIAC_CONTEXT) {
-    if (ge.type==giac::_SYMB || (ge.type==giac::_VECT && !ge._VECTptr->empty() && !is_numericv(*ge._VECTptr)) ){
-      if (islogo(ge)){
-	if (do_logo_graph_eqw & 4){
-	  if (displaylogo()==KEY_SHUTDOWN)
-	    return KEY_SHUTDOWN;
-	}
-	return 0;
-      }
-      if (ispnt(ge)){
-	if (do_logo_graph_eqw & 2){
-	  if (displaygraph(ge,contextptr)==KEY_SHUTDOWN)
-	    return KEY_SHUTDOWN;
-	}
-	// aborttimer = Timer_Install(0, check_execution_abort, 100); if (aborttimer > 0) { Timer_Start(aborttimer); }
-	return 0;
-      }
-      if ( do_logo_graph_eqw % 2 ==0)
-	return 0;
-      if (taille(ge,256)>=256 || ge.is_symb_of_sommet(at_program))
-	return 0; // sizeof(eqwdata)=44
-      gen tmp=eqw(ge,false,contextptr);
-      if (!is_undef(tmp) && tmp!=ge){
-	//dConsolePutChar(147);
-	*giac::logptr(contextptr) << ge.print(contextptr) << '\n';
-	ge=tmp;
-      }
-    }
-    return 0;
-  }
-
-  // called from editor, return 
-  int check_parse(textArea * text,const std::vector<textElement> & v,int python,GIAC_CONTEXT){
-    if (v.empty())
-      return 0;
-    char status[256];
-    for (int i=0;i<sizeof(status);++i)
-      status[i]=0;
-    int shift=0;
-#ifdef QUICKJS
-    if (xcas_python_eval==-1){
-      string s=merge_area(vector<textElement>(v.begin(),v.end()));
-      if (s.size() && s[0]=='@')
-	s=s.substr(1,s.size()-1);
-      else
-	s="\"use math\";"+s;
-      char * js=js_ck_eval(s.c_str(),&global_js_context);
-      if (js){
-	s=js;
-	free(js);
-	process_freeze();
-	update_js_vars();
-      }
-      else
-	s="Error";
-      if (s.size()>=sizeof(status))
-	s=s.substr(0,sizeof(status)-5)+"...";
-      sprintf(status,"%s",s.c_str());
-      DefineStatusMessage(status,1,0,0);
-      return 0;
-    }
-#endif
-#ifdef MICROPY_LIB
-    if (xcas_python_eval==1){
-#if 0
-      if (text->changed){
-	std::string tmp=text->filename;
-	tmp += (lang==1)?" a ete modifie!":" was modified!";
-	if (confirm(tmp.c_str(),
-#ifdef NSPIRE_NEWLIB
-		    (lang==1)?"enter: sauvegarder, esc: tant pis":"enter: save, esc: discard changes"
-#else
-		    (lang==1)?"OK: sauvegarder, Back: tant pis":"OK: save, Back: discard changes"
-#endif
-		    )==KEY_CTRL_F1){
-	  save_script(text->filename.c_str(),merge_area(text->elements));
-	  text->changed=false;
-	}
-      }
-      string tmp="from "+remove_extension(text->filename)+" import *"; // os error 2 ??
-      micropy_ck_eval(tmp.c_str());
-#else
-      freezeturtle=false;
-#if 1
-      string s=merge_area(vector<textElement>(v.begin(),v.end()));
-      micropy_ck_eval(s.c_str());
-#else
-      // newlines do not work correctly unless we cut the input
-      for (int i=0;i<=v.size();++i){
-	if (i==v.size() || (v[i].s.size() && v[i].s[0]!=' ')){
-	  string s=merge_area(vector<textElement>(v.begin()+shift,v.begin()+i));
-	  micropy_ck_eval(s.c_str());
-	  if (parser_errorline>0){
-	    parser_errorline += shift;
-	    break;
-	  }
-	  shift=i;
-	}
-      }
-#endif
-#endif
-      // should detect syntax errors here and return line number
-      if (parser_errorline>0){
-	//--parser_errorline; // ?? something strange 
-	sprintf(status,(lang==1)?"Erreur ligne %i":"Error line %i",parser_errorline);	
-      }
-      else {
-	process_freeze();
-	sprintf(status,"%s",(lang==1)?"Syntaxe correcte":"Parse OK");
-      }
-      DefineStatusMessage(status,1,0,0);
-      return parser_errorline;
-    }
-#endif
-    std::string s=merge_area(v); 
-    giac::python_compat(python,contextptr);
-    if (python>0) s="@@"+s; // force Python translation
-    freeze=true;
-    giac::gen g(s,contextptr);
-    freeze=false;
-    int lineerr=giac::first_error_line(contextptr);
-    if (lineerr){
-      std::string tok=giac::error_token_name(contextptr);
-      int pos=-1;
-      if (lineerr>=1 && lineerr<=v.size()){
-	pos=v[lineerr-1].s.find(tok);
-	const std::string & err=v[lineerr-1].s;
-	if (pos>=err.size())
-	  pos=-1;
-	if (python>0){
-	  // find 1st token, check if it's def/if/elseif/for/while
-	  size_t i=0,j=0;
-	  for (;i<err.size();++i){
-	    if (err[i]!=' ')
-	      break;
-	  }
-	  std::string firsterr;
-	  for (j=i;j<err.size();++j){
-	    if (!isalpha(err[j]))
-	      break;
-	    firsterr += err[j];
-	  }
-	  // if there is no : at end set pos=-2
-	  if (firsterr=="for" || firsterr=="def" || firsterr=="if" || firsterr=="elseif" || firsterr=="while"){
-	    for (i=err.size()-1;i>0;--i){
-	      if (err[i]!=' ')
-		break;
-	    }
-	    if (err[i]!=':')
-	      pos=-2;
-	  }
-	}
-      }
-      else {
-	lineerr=v.size();
-	tok=(lang==1)?"la fin":"end";
-	pos=0;
-      }
-      if (pos>=0)
-	sprintf(status,(lang==1)?"Erreur ligne %i a %s":"Error line %i at %s",lineerr,tok.c_str());
-      else
-	sprintf(status,(lang==1)?"Erreur ligne %i %s":"Error line %i %s",lineerr,(pos==-2?((lang==1)?", : manquant ?":", missing :?"):""));
-      DefineStatusMessage(status,1,0,0);
-    }
-    else {
-      set_abort();
-      g=protecteval(g,1,contextptr);
-      clear_abort();
-      giac::ctrl_c=false;
-      kbd_interrupted=giac::interrupted=false;
-      // define the function
-      if (check_do_graph(g,7,contextptr)==KEY_SHUTDOWN)
-	return KEY_SHUTDOWN;
-      DefineStatusMessage((char *)((lang==1)?"Syntaxe correcte":"Parse OK"),1,0,0);
-    }
-    DisplayStatusArea();    
-    return lineerr;
-  }
-
-  void fix_newlines(textArea * edptr){
-    edptr->elements[0].newLine=0;
-    for (size_t i=1;i<edptr->elements.size();++i){
-      edptr->elements[i].newLine=1;
-    }
-  }
-
-  void fix_mini(textArea * edptr){
-    bool minimini=edptr->elements[0].minimini;
-    for (size_t i=1;i<edptr->elements.size();++i){
-      edptr->elements[i].minimini=minimini;
-    }
-  }
-
-  int end_do_then(const std::string & s){
-    // skip spaces from end
-    int l=s.size(),i,i0;
-    const char * ptr=s.c_str();
-    for (i=l-1;i>0;--i){
-      if (ptr[i]!=' '){
-	if (ptr[i]==':' || ptr[i]=='{')
-	  return 1;
-	if (ptr[i]=='}')
-	  return -1;
-	if (i && ptr[i]==';' && ptr[i-1]=='}')
-	  return -1;
-	if (i>=2 && ptr[i]==';' && ptr[i-1]==':' && ptr[i-2]=='}')
-	  return -1;
-	break;
-      }
-    }
-    if (i>0){
-      for (i0=i;i0>=0;--i0){
-	if (!isalphanum(ptr[i0]) && ptr[i0]!=';' && ptr[i0]!=':')
-	  break;
-      }
-      if (i>i0+2){
-	if (ptr[i]==';')
-	  --i;
-	if (ptr[i]==':')
-	  --i;
-      }
-      std::string keyw(ptr+i0+1,ptr+i+1);
-      const char * ptr=keyw.c_str();
-      if (strcmp(ptr,"faire")==0 || strcmp(ptr,"do")==0 || strcmp(ptr,"alors")==0 || strcmp(ptr,"then")==0)
-	return 1;
-      if (strcmp(ptr,"fsi")==0 || strcmp(ptr,"end")==0 || strcmp(ptr,"fi")==0 || strcmp(ptr,"od")==0 || strcmp(ptr,"ftantque")==0 || strcmp(ptr,"fpour")==0 || strcmp(ptr,"ffonction")==0 || strcmp(ptr,"ffunction")==0)
-	return -1;
-    }
-    return 0;
-  }
-
-  void add(textArea *edptr,const std::string & s){
-    int r=1;
-    for (size_t i=0;i<s.size();++i){
-      if (s[i]=='\n' || s[i]==char(0x9c))
-	++r;
-    }
-    edptr->elements.reserve(edptr->elements.size()+r);
-    textElement cur;
-    cur.lineSpacing=2;
-    for (size_t i=0;i<s.size();++i){
-      char c=s[i];
-      if (c!='\n' && c!=char(0x9c)){
-	if (c!=char(0x0d))
-	  cur.s += c;
-	continue;
-      }
-      string tmp=string(cur.s.begin(),cur.s.end());
-      cur.s.swap(tmp);
-      edptr->elements.push_back(cur);
-      ++edptr->line;
-      cur.s="";
-    }
-    if (cur.s.size()){
-      edptr->elements.push_back(cur);
-      ++edptr->line;
-    }
-    fix_newlines(edptr);
-  }
-
-  int find_indentation(const std::string & s){
-    size_t indent=0;
-    for (;indent<s.size();++indent){
-      if (s[indent]!=' ')
-	break;
-    }
-    return indent;
-  }
-
-  void add_indented_line(std::vector<textElement> & v,int & textline,int & textpos){
-    // add line
-    v.insert(v.begin()+textline+1,v[textline]);
-    std::string & s=v[textline].s;
-    int indent=find_indentation(s);
-    if (!s.empty())
-      indent += 2*end_do_then(s);
-    //cout << indent << s << ":" << endl;
-    if (indent<0)
-      indent=0;
-    v[textline+1].s=std::string(indent,' ')+s.substr(textpos,s.size()-textpos);
-    v[textline+1].newLine=1;
-    v[textline].s=s.substr(0,textpos);
-    ++textline;
-    v[textline].nlines=1; // will be recomputed by cursor moves
-    textpos=indent;
-  }
-
-  void undo(textArea * text){
-    if (text->undoelements.empty())
-      return;
-    giac::swapint(text->line,text->undoline);
-    giac::swapint(text->pos,text->undopos);
-    giac::swapint(text->clipline,text->undoclipline);
-    giac::swapint(text->clippos,text->undoclippos);
-    swap(text->elements,text->undoelements);
-  }
-
-  void set_undo(textArea * text){
-    text->changed=true;
-    text->undoelements=text->elements;
-    text->undopos=text->pos;
-    text->undoline=text->line;
-    text->undoclippos=text->clippos;
-    text->undoclipline=text->clipline;
-  }
-
-  void add_nl(textArea * text,const std::string & ins){
-    std::vector<textElement> & v=text->elements;
-    std::vector<textElement> w(v.begin()+text->line+1,v.end());
-    v.erase(v.begin()+text->line+1,v.end());
-    add(text,ins);
-    for (size_t i=0;i<w.size();++i)
-      v.push_back(w[i]);
-    fix_newlines(text);
-    text->changed=true;
-  }
-
-  void insert(textArea * text,const char * adds,bool indent){
-    size_t n=strlen(adds),i=0;
-    if (!n)
-      return;
-    set_undo(text);
-    int l=text->line;
-    if (l<0 || l>=text->elements.size())
-      return; // invalid line number
-    std::string & s=text->elements[l].s;
-    int ss=int(s.size());
-    int & pos=text->pos;
-    if (pos>ss)
-      pos=ss;
-    std::string ins=s.substr(0,pos);
-    for (;i<n;++i){
-      if (adds[i]=='\n' || adds[i]==0x1e) {
-	break;
-      }
-      else {
-	if (adds[i]!=char(0x0d))
-	  ins += adds[i];
-      }
-    }
-    if (i==n){ // no newline in inserted string
-      s=ins+s.substr(pos,ss-pos);
-      pos += n;
-      return;
-    }
-    std::string S(adds+i+1);
-    int decal=ss-pos;
-    S += s.substr(pos,decal);
-    // cout << S << " " << ins << endl;
-    s=ins;
-    if (indent){
-      pos=s.size();
-      int debut=0;
-      for (i=0;i<S.size();++i){
-	if (S[i]=='\n' || S[i]==0x1e){
-	  add_indented_line(text->elements,text->line,pos);
-	  // cout << S.substr(debut,i-debut) << endl;
-	  text->elements[text->line].s += S.substr(debut,i-debut);
-	  pos = text->elements[text->line].s.size();
-	  debut=i+1;
-	}
-      }
-      //cout << S << " " << debut << " " << i << S.c_str()+debut << endl;
-      add_indented_line(text->elements,text->line,pos);
-      text->elements[text->line].s += (S.c_str()+debut);
-      fix_newlines(text);
-    }
-    else 
-      add_nl(text,S);
-    pos = text->elements[text->line].s.size()-decal;
-    fix_mini(text);
-  }
-
-  std::string merge_area(const std::vector<textElement> & v){
-    std::string s;
-    size_t l=0;
-    for (size_t i=0;i<v.size();++i)
-      l += v[i].s.size()+1;
-    s.reserve(l);
-    for (size_t i=0;i<v.size();++i){
-      s += v[i].s;
-      s += '\n';
-    }
-    return s;
-  }
-
-  bool isalphanum(char c){
-    return isalpha(c) || (c>='0' && c<='9');
-  }
-
-  void search_msg(){
-#ifdef NSPIRE_NEWLIB
-    DefineStatusMessage((char *)((lang==1)?"enter: suivant, DEL: annuler":"enter: next, DEL: cancel"),1,0,0);
-#else
-    DefineStatusMessage((char *)((lang==1)?"enter: suivant, DEL: annuler":"enter: next, DEL: cancel"),1,0,0);
-#endif
-    DisplayStatusArea();    	    
-  }  
-
-
-  void show_status(textArea * text,const std::string & search,const std::string & replace){
-    if (text->editable && text->clipline>=0)
-      DefineStatusMessage((char *)"PAD: select, COPY: copy, DEL: cut",1,0,0);
-    else {
-      std::string status("edit ");
-#ifdef GIAC_SHOWTIME
-      int d=(int(millis()/60000) +time_shift) % (24*60); // minutes
-      int heure=d/60;
-      int minute=d%60;
-      status += char('0'+heure/10);
-      status += char('0'+(heure%10));
-      status += ':';
-      status += char('0'+(minute/10));
-      status += char('0'+(minute%10));
-#endif
-      if (text->editable){
-#ifndef NSPIRE_NEWLIB
-	status += (xthetat?" t":" x");
-#endif
-	if (text->python<0){
-	  status += " QuickJS ";
-	}
-	else {
-	  if (text->python & 4)
-	    status += " MicroPython ";
-	  else
-	    status += text->python?(text->python==2?" Py ^xor ":" Py ^=** "):" Xcas ";
-	}
-	status += giac::remove_extension(text->filename.c_str());
-	status += text->changed?" * ":" - ";
-	status += giac::printint(text->line+1);
-	status += '/';
-	status += giac::printint(text->elements.size());
-      }
-      if (search.size()){
-#ifdef NSPIRE_NEWLIB
-	status += " enter: " + search;
-#else
-	status += " EXE: " + search;
-#endif
-	if (replace.size())
-	  status += "->"+replace;
-      }
-      DefineStatusMessage((char *)status.c_str(), 1, 0, 0);
-    }
-    DisplayStatusArea();    
-  }
-
-  bool chk_replace(textArea * text,const std::string & search,const std::string & replace){
-    if (replace.size()){
-#ifdef NSPIRE_NEWLIB      
-      DefineStatusMessage((char *)((lang==1)?"Remplacer? enter: Oui, 8 ou N: Non":"Replace? enter: Yes, 8 or N: No"),1,0,0);
-#else
-      DefineStatusMessage((char *)((lang==1)?"Remplacer? EXE: Oui, 8 ou N: Non":"Replace? EXE: Yes, 8 or N: No"),1,0,0);
-#endif
-    }
-    else
-      search_msg();
-    DisplayStatusArea();
-    for (;;){
-      int key;
-      GetKey(&key);
-      if (key==KEY_CHAR_MINUS || key==KEY_CHAR_Y || key==KEY_CHAR_9 || key==KEY_CHAR_O || key==KEY_CTRL_EXE || key==KEY_CTRL_OK){
-	if (replace.size()){
-	  set_undo(text);
-	  std::string & s = text->elements[text->line].s;
-	  s=s.substr(0,text->pos-search.size())+replace+s.substr(text->pos,s.size()-text->pos);
-	  search_msg();
-	}
-	return true;
-      }
-      if (key==KEY_CTRL_DEL || (replace.empty() && key==KEY_CTRL_EXIT) || key==KEY_CTRL_LEFT || key==KEY_CTRL_RIGHT || key==KEY_CTRL_UP || key==KEY_CTRL_DOWN){
-	show_status(text,search,replace);
-	return false;
-      }
-      if (key==KEY_CHAR_8 || key==KEY_CHAR_N || key==KEY_CTRL_EXIT){
-	search_msg();
-	return true;
-      }
-    }
-  }
-
-  int check_leave(textArea * text){
-    if (nspire_exam_mode==2)
-      return 0;
-    if (text->editable && text->filename.size()){
-      if (text->changed){
-	// save or cancel?
-	std::string tmp=text->filename;
-	if (strcmp(tmp.c_str(),"temp.py")==0){
-	  if (confirm((lang==1)?"Les modifications seront perdues":"Changes will be lost",
-#ifdef NSPIRE_NEWLIB
-		      (lang==1)?"enter: annuler, esc: tant pis":"enter: cancel, esc: confirm"
-#else
-		      (lang==1)?"OK: annuler, Back: tant pis":"OK: cancel, Back: confirm"
-#endif
-		      )==KEY_CTRL_F1)
-	    return 2;
-	  else {
-	    return 0;
-	  }
-	}
-	tmp += (lang==1)?" a ete modifie!":" was modified!";
-	if (confirm(tmp.c_str(),
-#ifdef NSPIRE_NEWLIB
-		    (lang==1)?"enter: sauvegarder, esc: tant pis":"enter: save, esc: discard changes"
-#else
-		    (lang==1)?"OK: sauvegarder, Back: tant pis":"OK: save, Back: discard changes"
-#endif
-		    )==KEY_CTRL_F1){
-	  save_script(text->filename.c_str(),merge_area(text->elements));
-	  text->changed=false;
-	  return 1;
-	}
-	return 0;
-      }
-      return 1;
-    }
-    return 0;
-  }
-
-  void print(int &X,int&Y,const char * buf_,int color,bool revert,bool fake,bool minimini){
-    int s=strlen(buf_);
-    char buf[s+1];
-    strcpy(buf,buf_);
-    for (int i=0;i<s;++i){
-      char & ch=buf[i];
-      if (ch=='\n')
-	ch='\\';
-    }
-    if(minimini) 
-      X=PrintMiniMini(X, Y, buf, revert?4:0, color, COLOR_WHITE,fake);
-    else
-      X=PrintMini(X, Y, buf, revert?4:0, color, COLOR_WHITE, fake);
-  }
-
-  void match_print(char * singleword,int delta,int X,int Y,bool match,bool minimini){
-    // char buflog[128];sprintf(buflog,"%i %i %s               ",delta,(int)match,singleword);puts(buflog);
-    char ch=singleword[delta];
-    singleword[delta]=0;
-    print(X,Y,singleword,0,false,/* fake*/true,minimini);
-    singleword[delta]=ch;
-    char buf[4];
-    buf[0]=ch;
-    buf[1]=0;
-    // inverted print: colors are reverted too!
-    int color;
-    if (minimini)
-      color=match?TEXT_COLOR_GREEN:TEXT_COLOR_RED;
-    else
-      color=match?COLOR_GREEN:COLOR_RED;
-    print(X,Y,buf,color,true,/*fake*/false,minimini);
-  }
-
-  bool match(textArea * text,int pos,int & line1,int & pos1,int & line2,int & pos2){
-    line2=-1;line1=-1;
-    int linepos=text->line;
-    const std::vector<textElement> & v=text->elements;
-    if (linepos<0 || linepos>=v.size()) return false;
-    const std::string * s=&v[linepos].s;
-    int ss=s->size();
-    if (pos<0 || pos>=ss) return false;
-    char ch=(*s)[pos];
-    int open1=0,open2=0,open3=0,inc=0;
-    if (ch=='(' || ch=='['
-	|| ch=='{'
-	){
-      line1=linepos;
-      pos1=pos;
-      inc=1;
-    }
-    if (
-	ch=='}' ||
-	ch==']' || ch==')'
-	){
-      line2=linepos;
-      pos2=pos;
-      inc=-1;
-    }
-    if (!inc) return false;
-    bool instring=false;
-    for (;;){
-      for (;pos>=0 && pos<ss;pos+=inc){
-	if ((*s)[pos]=='"' && (pos==0 || (*s)[pos-1]!='\\'))
-	  instring=!instring;
-	if (instring)
-	  continue;
-	switch ((*s)[pos]){
-	case '(':
-	  open1++;
-	  break;
-	case '[':
-	  open2++;
-	  break;
-	case '{':
-	  open3++;
-	  break;
-	case ')':
-	  open1--;
-	  break;
-	case ']':
-	  open2--;
-	  break;
-	case '}':
-	  open3--;
-	  break;
-	}
-	if (open1==0 && open2==0 && open3==0){
-	  //char buf[128];sprintf(buf,"%i %i",pos_orig,pos);puts(buf);
-	  if (inc>0){
-	    line2=linepos; pos2=pos;
-	  }
-	  else {
-	    line1=linepos; pos1=pos;
-	  }
-	  return true;
-	} // end if
-      } // end for pos
-      linepos+=inc;
-      if (linepos<0 || linepos>=v.size())
-	return false;
-      s=&v[linepos].s;
-      ss=s->size();
-      pos=inc>0?0:ss-1;
-    } // end for linepos
-    return false;
-  }
-
-  std::string get_selection(textArea * text,bool erase){
-    int sel_line1,sel_line2,sel_pos1,sel_pos2;
-    int clipline=text->clipline,clippos=text->clippos,textline=text->line,textpos=text->pos;
-    if (clipline>=0){
-      if (clipline<textline || (clipline==textline && clippos<textpos)){
-	sel_line1=clipline;
-	sel_line2=textline;
-	sel_pos1=clippos;
-	sel_pos2=textpos;
-      }
-      else {
-	sel_line1=textline;
-	sel_line2=clipline;
-	sel_pos1=textpos;
-	sel_pos2=clippos;
-      }
-    }
-    std::string s(text->elements[sel_line1].s);
-    if (erase){
-      set_undo(text);
-      text->line=sel_line1;
-      text->pos=sel_pos1;
-      text->elements[sel_line1].s=s.substr(0,sel_pos1)+text->elements[sel_line2].s.substr(sel_pos2,text->elements[sel_line2].s.size()-sel_pos2);
-    }
-    if (sel_line1==sel_line2){
-      return s.substr(sel_pos1,sel_pos2-sel_pos1);
-    }
-    s=s.substr(sel_pos1,s.size()-sel_pos1)+'\n';
-    int sel_line1_=sel_line1;
-    for (sel_line1++;sel_line1<sel_line2;sel_line1++){
-      s += text->elements[sel_line1].s;
-      s += '\n';
-    }
-    s += text->elements[sel_line2].s.substr(0,sel_pos2);
-    if (erase)
-      text->elements.erase(text->elements.begin()+sel_line1_+1,text->elements.begin()+sel_line2+1);
-    return s;
-  }
-
-  void change_mode(textArea * text,int flag,GIAC_CONTEXT){
-    if (text->python==-1 || text->python==4)
-      return;
-    if (text->python!=flag){
-      text->python=flag;
-      python_compat(text->python,contextptr);
-      if (text->python<0)
-	xcas_python_eval=-1;
-      else if (text->python & 4)
-	xcas_python_eval=1;
-      show_status(text,"","");
-      warn_python(flag,true);
-    }
-  }  
-
-  void clearLine(int x, int y, color_t color=_WHITE) {
-    // clear text line. x and y are text cursor coordinates
-    // this is meant to achieve the same effect as using PrintXY with a line full of spaces (except it doesn't waste strings).
-    int width=LCD_WIDTH_PX;
-    if(x>1) width = 24*(21-x);
-    drawRectangle((x-1)*18, y*24, width, 24, color);
-  }
-
-  void mPrintXY(int x, int y, char*msg, int mode, int color) {
-    char nmsg[50];
-    nmsg[0] = 0x20;
-    nmsg[1] = 0x20;
-    nmsg[2] = '\0';
-    strncat(nmsg, msg, 48);
-    PrintXY(x, y, nmsg, mode ,color);
-  }
-
-  void drawScreenTitle(char* title, char* subtitle=0) {
-    if(title != NULL) mPrintXY(1, 1, title, TEXT_MODE_NORMAL, TEXT_COLOR_BLUE);
-    if(subtitle != NULL) mPrintXY(1, 2, subtitle, TEXT_MODE_NORMAL, TEXT_COLOR_BLACK);
-  }
-
-  int find_color(const char * s,GIAC_CONTEXT){
-    if (s[0]=='"')
-      return 4;
-    if (!isalpha(s[0]))
-      return 0;
-    char buf[256];
-    const char * ptr=s;
-    for (int i=0;i<255 && (isalphanum(*ptr) || *ptr=='_'); ++i){
-      ++ptr;
-    }
-    strncpy(buf,s,ptr-s);
-    buf[ptr-s]=0;
-    if (xcas_python_eval>=0 && (strcmp(buf,"def")==0 || strcmp(buf,"import")==0))
-      return 1;
-#ifdef MICROPY_LIB
-    if (is_python_builtin(buf))
-      return 3;
-#endif
-    //int pos=dichotomic_search(keywords,sizeof(keywords),buf);
-    //if (pos>=0) return 1;
-    gen g;
-    int token=find_or_make_symbol(buf,g,0,false,contextptr);
-    //*logptr(contextptr) << s << " " << buf << " " << token << " " << g << endl;
-#ifdef QUICKJS
-    if (xcas_python_eval==-1){
-      if (is_js_keyword(buf))
-	return 1;
-      return js_token(js_vars.c_str(),buf);
-    }
-#endif
-#ifdef MICROPY_LIB
-    if (xcas_python_eval==1){
-      micropy_ck_eval("");
-      int tok=mp_token(buf);
-      if (tok) return tok;
-      if (token==T_NUMBER)
-	return 2;
-      if (token==T_UNARY_OP || token==T_UNARY_OP_38 || token==T_LOGO)
-	return 0;
-      if (token!=T_SYMBOL)
-	return 1;
-      return 0;
-    }
-#endif
-   if (token==T_UNARY_OP || token==T_UNARY_OP_38 || token==T_LOGO){
-      return 3;
-    }
-    if (token==T_NUMBER)
-      return 2;
-    if (token!=T_SYMBOL)
-      return 1;
-    return 0;
-  }
-
-  int strncasecmp_duplicate(const char *s1, const char *s2, size_t n)
-  {
-    if (n != 0) {
-      const unsigned char *us1 = (const unsigned char *)s1;
-      const unsigned char *us2 = (const unsigned char *)s2;
-
-      do {
-	if (tolower(*us1) != tolower(*us2++))
-	  return (tolower(*us1) - tolower(*--us2));
-	if (*us1++ == '\0')
-	  break;
-      } while (--n != 0);
-    }
-    return (0);
-  }
-  char *strcasestr_duplicate(const char *s, const char *find)
-  {
-    char c;
-
-    if ((c = *find++) != 0) {
-      c = tolower((unsigned char)c);
-      size_t len = strlen(find);
-      do {
-	char sc;
-	do {
-	  if ((sc = *s++) == 0)
-	    return (NULL);
-	} while ((char)tolower((unsigned char)sc) != c);
-      } while (strncasecmp(s, find, len) != 0);
-      s--;
-    }
-    return ((char *)s);
-  }
-
-
-  /* copy over the next token from an input string, WITHOUT
-     skipping leading blanks. The token is terminated by the
-     first appearance of tokchar, or by the end of the source
-     string.
-
-     The caller must supply sufficient space in token to
-     receive any token, Otherwise tokens will be truncated.
-
-     Returns: a pointer past the terminating tokchar.
-
-     This will happily return an infinity of empty tokens if
-     called with src pointing to the end of a string. Tokens
-     will never include a copy of tokchar.
-
-     A better name would be "strtkn", except that is reserved
-     for the system namespace. Change to that at your risk.
-
-     released to Public Domain, by C.B. Falconer.
-     Published 2006-02-20. Attribution appreciated.
-     Modified by gbl08ma not to skip blanks at the beginning.
-  */
-
-  const unsigned char *toksplit(const unsigned char *src, /* Source of tokens */
-				char tokchar, /* token delimiting char */
-				unsigned char *token, /* receiver of parsed token */
-				int lgh) /* length token can receive */
-  /* not including final '\0' */
-  {
-    if (src) {
-      while (*src && (tokchar != *src)) {
-	if (lgh) {
-	  *token++ = *src;
-	  --lgh;
-	}
-	src++;
-      }
-      if (*src && (tokchar == *src)) src++;
-    }
-    *token = '\0';
-    return src;
-  } /* toksplit */
-
-
-  void display(textArea * text,int & isFirstDraw,int & totalTextY,int & scroll,int & textY,GIAC_CONTEXT){
-#ifdef CURSOR  
-    Cursor_SetFlashOff();
-#endif
-    // waitforvblank(); drawRectangle(text->x, text->y, LCD_WIDTH_PX, LCD_HEIGHT_PX-text->y, COLOR_WHITE);
-    bool editable=text->editable;
-    int showtitle = !editable && (text->title != NULL);
-    std::vector<textElement> & v=text->elements;
-    //drawRectangle(text->x, text->y+24, text->width, LCD_HEIGHT_PX-24, COLOR_WHITE);
-    // insure cursor is visible
-    if (editable && !isFirstDraw){
-      int linesbefore=0,cur;
-      for (cur=0;cur<text->line;++cur){
-	linesbefore += (v[cur].newLine+(v[cur].nlines-1))*(text->lineHeight+v[cur].lineSpacing); //*logptr(contextptr) << cur << "," << v[cur].nlines << " ";
-      }
-      // line begin Y is at scroll+linesbefore*17, must be positive
-      if (linesbefore+scroll<0)
-	scroll = -linesbefore;
-      linesbefore += (v[cur].newLine+(v[cur].nlines-1))*(text->lineHeight+v[cur].lineSpacing); //*logptr(contextptr) << '\n';
-      // after line Y is at scroll+linesbefore*17
-      if (linesbefore+scroll>148)
-	scroll = 148-linesbefore;
-    }
-    textY = scroll+(showtitle ? 24 : 0)+text->y; // 24 pixels for title (or not)
-    int deltax=0;
-    if (editable){
-      if (v.size()<10){
-	deltax=9;
-      }
-      else {
-	if (v.size()<100)
-	  deltax=18;
-	else
-	  deltax=27;
-      }
-    }
-    int & clipline=text->clipline;
-    int & clippos=text->clippos;
-    int & textline=text->line;
-    int & textpos=text->pos;
-    if (textline<0) textline=0;
-    if (textline>=text->elements.size())
-      textline=text->elements.size()-1;
-    if (textpos<0) textpos=0;
-    if (textpos>text->elements[textline].s.size())
-      textpos=text->elements[textline].s.size();
-    //char bufpos[512];  sprintf(bufpos,"%i,%i:%i,%i       ",textpos,textline,text->elements[textline].s.size(),text->elements.size());  puts(bufpos);
-    if (clipline>=0){
-      if (clipline>=v.size())
-	clipline=-1;
-      else {
-	if (clippos<0)
-	  clippos=0;
-	if (clippos>=v[clipline].s.size())
-	  clippos=v[clipline].s.size()-1;
-      }
-    }
-    int line1,line2,pos1=0,pos2=0;
-    if (!match(text,text->pos,line1,pos1,line2,pos2) && line1==-1 && line2==-1)
-      match(text,text->pos-1,line1,pos1,line2,pos2);
-    //char bufpos[512];  sprintf(bufpos,"%i,%i:%i,%i       ",line1,pos1,line2,pos2);  puts(bufpos);
-    bool firstrect=true;
-    for (int cur=0;cur < v.size();++cur) {
-      const char* src = v[cur].s.c_str();
-      if (cur==0){
-	int l=v[cur].s.size();
-	if (l>=1 && src[0]=='#')
-	  change_mode(text,1,contextptr); // text->python=true;
-	if (l>=2 && src[0]=='/' && src[1]=='/')
-	  change_mode(text,0,contextptr); // text->python=false;
-	if (l>=8 && src[0]=='f' && (src[1]=='o' || src[1]=='u') && src[2]=='n' && src[3]=='c' && src[4]=='t' && src[5]=='i' && src[6]=='o' && src[7]=='n')
-	  change_mode(text,0,contextptr); // text->python=false;
-	if (l>=4 && src[0]=='d' && src[1]=='e' && src[2]=='f' && src[3]==' ')
-	  change_mode(text,1,contextptr); // text->python=true;
-	//drawRectangle(text->x, text->y, text->width, LCD_HEIGHT_PX-(editable?17:0), COLOR_WHITE);
-      }
-      if (cur%3==0 && textY>=(showtitle?24:0) && textY<LCD_HEIGHT_PX)
-	waitforvblank();
-      int textX=text->x,saveY=textY;
-      if(v[cur].newLine) {
-	textY=textY+text->lineHeight+v[cur].lineSpacing;
-      }
-      if (!isFirstDraw && clipline==-1){
-	// check if we can skip directly to the next line
-	int y=textY+(v[cur].nlines-1)*(text->lineHeight+v[cur].lineSpacing);
-	if (y<-text->lineHeight){
-	  textY=y;
-	  continue;
-	}
-      }
-      int dh=18+v[cur].lineSpacing;
-      if (textY+dh+(editable?17:0)>LCD_HEIGHT_PX){
-	if (isFirstDraw)
-	  dh -= textY+dh+(editable?17:0)-LCD_HEIGHT_PX;
-	else {
-	  textY = saveY;
-	  break;
-	}
-      }
-      if (dh>0 && textY>=(showtitle?24:0)){
-	if (firstrect){
-	  drawRectangle(textX,text->y,LCD_WIDTH_PX,textY-text->y,COLOR_WHITE);
-	  firstrect=false;
-	}
-	drawRectangle(textX, textY, LCD_WIDTH_PX, dh, COLOR_WHITE);
-      }
-      if (editable && textY>=(showtitle?24:0)){
-	char line_s[16];
-	sprint_int(line_s,cur+1);
-	os_draw_string_small(textX,textY,COLOR_MAGENTA,_WHITE,line_s);
-      }
-      textX=text->x+deltax;
-      int tlen = v[cur].s.size();
-      char singleword[tlen+32];
-      // char* singleword = (char*)malloc(tlen+1); // because of this, a single text element can't have more bytes than malloc can provide
-      if (cur==textline){
-	if (textpos<0 || textpos>tlen)
-	  textpos=tlen;
-	if (tlen==0 && text->editable){ // cursor on empty line
-	  drawRectangle(textX,textY,3,16,COLOR_BLACK);
-	  text->cursorx=textX; text->cursory=textY;
-	}
-      }
-      bool chksel=false;
-      int sel_line1,sel_line2,sel_pos1,sel_pos2;
-      if (clipline>=0){
-	if (clipline<textline || (clipline==textline && clippos<textpos)){
-	  sel_line1=clipline;
-	  sel_line2=textline;
-	  sel_pos1=clippos;
-	  sel_pos2=textpos;
-	}
-	else {
-	  sel_line1=textline;
-	  sel_line2=clipline;
-	  sel_pos1=textpos;
-	  sel_pos2=clippos;
-	}
-	chksel=(sel_line1<=cur && cur<=sel_line2);
-      }
-      const char * match1=0; // matching parenthesis (or brackets?)
-      const char * match2=0;
-      if (cur==line1)
-	match1=v[cur].s.c_str()+pos1;
-      else
-	match1=0;
-      if (cur==line2)
-	match2=v[cur].s.c_str()+pos2;
-      else
-	match2=0;
-      // if (cur==textline && !match(v[cur].s.c_str(),textpos,match1,match2) && !match1 && !match2) match(v[cur].s.c_str(),textpos-1,match1,match2);
-      // char buf[128];sprintf(buf,"%i %i %i        ",cur,(int)match1,(int)match2);puts(buf);
-      const char * srcpos=src+textpos;
-      bool minimini=v[cur].minimini;
-      int couleur=v[cur].color;
-      int nlines=1;
-      bool linecomment=false;
-      while (*src){
-	const char * oldsrc=src;
-	if ( (text->python>0 && *src=='#') ||
-	     (text->python<=0 && *src=='/' && *(src+1)=='/')){
-	  linecomment=true;
-	  couleur=4;
-	}
-	if (linecomment || !text->editable)
-	  src = (char*)toksplit((unsigned char*)src, ' ', (unsigned char*)singleword, minimini?50:35); //break into words; next word
-	else { // skip string (only with delimiters " ")
-	  if (*src=='"'){
-	    for (++src;*src;++src){
-	      if (*src=='"' && *(src-1)!='\\')
-		break;
-	    }
-	    if (*src=='"')
-	      ++src;
-	    int i=src-oldsrc;
-	    strncpy(singleword,oldsrc,i);
-	    singleword[i]=0;
-	  }
-	  else {
-	    size_t i=0;
-	    for (;*src==' ';++src){ // skip initial whitespaces
-	      ++i;
-	    }
-	    if (i==0){
-	      if (isalpha(*src)){ // skip keyword
-		for (;isalphanum(*src) || *src=='_';++src){
-		  ++i;
-		}
-	      }
-	      // go to next space or alphabetic char
-	      for (;*src;++i,++src){
-		if (*src==' ' || (i && *src>=' ' && *src<='/') || (text->python>0 && *src=='#') || (text->python<=0 && *src=='/' && *(src+1)=='/')|| *src=='"' || isalpha(*src))
-		  break;
-	      }
-	    }
-	    strncpy(singleword,oldsrc,i);
-	    singleword[i]=0;
-	    if (i==0){
-	      puts(src); // free(singleword);
-	      return ; // FIXME KEY_CTRL_F2;
-	    }
-	  } // end normal case
-	} // end else linecomment case
-	// take care of selection
-	bool invert=false;
-	if (chksel){
-	  if (cur<sel_line1 || cur>sel_line2)
-	    invert=false;
-	  else {
-	    int printpos1=oldsrc-v[cur].s.c_str();
-	    int printpos2=src-v[cur].s.c_str();
-	    if (cur==sel_line1 && printpos1<sel_pos1 && printpos2>sel_pos1){
-	      // cut word in 2 parts: first part not selected
-	      src=oldsrc+sel_pos1-printpos1;
-	      singleword[sel_pos1-printpos1]=0;
-	      printpos2=sel_pos1;
-	    }
-	    if (cur==sel_line2 && printpos1<sel_pos2 && printpos2>sel_pos2){
-	      src=oldsrc+sel_pos2-printpos1;
-	      singleword[sel_pos2-printpos1]=0;
-	      printpos2=sel_pos2;
-	    }
-	    // now singleword is totally unselected or totally selected
-	    // which one?
-	    if (cur==sel_line1){
-	      if (cur==sel_line2)
-		invert=printpos1>=sel_pos1 && printpos2<=sel_pos2;
-	      else
-		invert=printpos1>=sel_pos1;
-	    }
-	    else {
-	      if (cur==sel_line2)
-		invert=printpos2<=sel_pos2;
-	      else
-		invert=true;
-	    }
-	  }
-	}
-	//check if printing this word would go off the screen, with fake PrintMini drawing:
-	int temptextX = 0,temptextY=0;
-	print(temptextX,temptextY,singleword,couleur,false,/*fake*/true,minimini);
-	if(temptextX<text->width && temptextX + textX > text->width-6) {
-	  if (editable)
-	    textX=PrintMini(textX, textY, ">", 4, COLOR_MAGENTA, COLOR_WHITE);	  
-	  //time for a new line
-	  textX=text->x+deltax;
-	  textY=textY+text->lineHeight+v[cur].lineSpacing;
-	  if (textY>=(showtitle?24:0)){
-	    if (firstrect){
-	      drawRectangle(textX,text->y,LCD_WIDTH_PX,textY-text->y,COLOR_WHITE);
-	      firstrect=false;
-	    }
-	    drawRectangle(text->x, textY, LCD_WIDTH_PX, 18+v[cur].lineSpacing, COLOR_WHITE);
-	  }
-	  ++nlines;
-	} //else still fits, print new word normally (or just increment textX, if we are not "on stage" yet)
-	if(textY >= (showtitle?24:0) && textY < LCD_HEIGHT_PX) {
-	  temptextX=textX;
-	  if (editable){
-	    couleur=linecomment?5:find_color(singleword,contextptr);
-	    if (couleur==1) couleur=COLOR_BLUE;
-	    if (couleur==2) couleur=49432; //was COLOR_YELLOWDARK;
-	    if (couleur==3) couleur=51712;//33024;
-	    if (couleur==4) couleur=COLOR_MAGENTA;
-	    if (couleur==5) couleur=COLOR_GREEN;
-	    //char ch[32];
-	    //sprint_int(ch,couleur);
-	    //puts(singleword); puts(ch);
-	  }
-	  if (linecomment || !text->editable || singleword[0]=='"')
-	    print(textX,textY,singleword,couleur,invert,/*fake*/false,minimini);
-	  else { // print two parts, commandname in color and remain in black
-	    char * ptr=singleword;
-	    if (isalpha(*ptr)){
-	      while (isalphanum(*ptr) || *ptr=='_')
-		++ptr;
-	    }
-	    char ch=*ptr;
-	    *ptr=0;
-	    print(textX,textY,singleword,couleur,invert,/*fake*/false,minimini);
-	    *ptr=ch;
-	    print(textX,textY,ptr,COLOR_BLACK,invert,/*fake*/false,minimini);
-	  }
-	  // ?add a space removed from token
-	  if( ((linecomment || !text->editable)?*src:*src==' ') || v[cur].spaceAtEnd){
-	    if (*src==' ')
-	      ++src;
-	    print(textX,textY," ",COLOR_BLACK,invert,false,minimini);
-	  }
-	  // ?print cursor, and par. matching
-	  if (editable){
-	    if (match1 && oldsrc<=match1 && match1<src)
-	      match_print(singleword,match1-oldsrc,temptextX,textY,
-			  line2!=-1,
-			  // match2,
-			  minimini);
-	    if (match2 && oldsrc<=match2 && match2<src)
-	      match_print(singleword,match2-oldsrc,temptextX,textY,
-			  line1!=-1,
-			  //match1,
-			  minimini);
-	  }
-	  if (editable && cur==textline){
-	    if (oldsrc<=srcpos && (srcpos<src || (srcpos==src && textpos==tlen))){
-	      if (textpos>=2 && v[cur].s[textpos-1]==' ' && v[cur].s[textpos-2]!=' ' && srcpos-oldsrc==strlen(singleword)+1){ // fix cursor position after space
-		//char ch[512];
-		//sprintf(ch,"%s %i %i %i %i",singleword,strlen(singleword),srcpos-oldsrc,textpos,v[cur].s[textpos-2]);
-		//puts(ch);
-		singleword[srcpos-oldsrc-1]=' ';
-	      }
-	      singleword[srcpos-oldsrc]=0;
-	      print(temptextX,temptextY,singleword,couleur,false,/*fake*/true,minimini);
-	      //drawLine(temptextX, textY+14, temptextX, textY-14, COLOR_BLACK);
-	      //drawLine(temptextX+1, textY+14, temptextX+1, textY-14, COLOR_BLACK);
-	      drawRectangle(temptextX-1,textY,3,16,COLOR_BLACK);
-	      text->cursorx=temptextX-1; text->cursory=textY;
-	    }
-	  }
-	} // end if testY visible
-	else {
-	  textX += temptextX;
-	  if(*src || v[cur].spaceAtEnd) textX += 7; // size of a PrintMini space
-	}
-      } // end while (*src)
-      // free(singleword);
-      v[cur].nlines=nlines; //if (cur<6) *logptr(contextptr) << cur << ":" << src << nlines << '\n';
-      if (isFirstDraw) 
-	totalTextY = textY+(showtitle ? 0 : 24);
-    } // end main draw loop (for cur<v.size())
-    int dh=LCD_HEIGHT_PX-textY-text->lineHeight-(editable?17:0);
-    if (dh>0)
-      drawRectangle(0, textY+text->lineHeight, LCD_WIDTH_PX, dh, COLOR_WHITE);
-    isFirstDraw=0;
-    if(showtitle) {
-      waitforvblank();
-      drawRectangle(0, 0, LCD_WIDTH_PX, 24, _WHITE);
-      drawScreenTitle((char*)text->title);
-    }
-    //if (editable)
-    if (editable){
-      waitforvblank();
-      drawRectangle(0,205,LCD_WIDTH_PX,17,44444);
-      PrintMiniMini(0,205,text->python>0?"shift-1 test|2 loop|3 undo|4 misc|5 +-|6 logo|7 lin|8 list|9arit":"shift-1 test|2 loop|3 undo|4 misc|5 +-|6 logo|7 matr|8 cplx",4,44444,giac::_BLACK);
-      //draw_menu(1);
-    }
-#ifdef SCROLLBAR
-    int scrollableHeight = LCD_HEIGHT_PX-24*(showtitle ? 2 : 1)-text->y;
-    //draw a scrollbar:
-    if(text->scrollbar) {
-      TScrollbar sb;
-      sb.I1 = 0;
-      sb.I5 = 0;
-      sb.indicatormaximum = totalTextY;
-      sb.indicatorheight = scrollableHeight;
-      sb.indicatorpos = -scroll;
-      sb.barheight = scrollableHeight;
-      sb.bartop = (showtitle ? 24 : 0)+text->y;
-      sb.barleft = text->width - 6;
-      sb.barwidth = 6;
-    
-      Scrollbar(&sb);
-    }
-#endif
-  }  
-
-  bool move_to_word(textArea * text,const std::string & s,const std::string & replace,int & isFirstDraw,int & totalTextY,int & scroll,int & textY,GIAC_CONTEXT){
-    if (!s.size())
-      return false;
-    int line=text->line,pos=text->pos;
-    if (line>=text->elements.size())
-      line=0;
-    if (pos>=text->elements[line].s.size())
-      pos=0;
-    for (;line<text->elements.size();++line){
-      int p=text->elements[line].s.find(s,pos);
-      if (p>=0 && p<text->elements[line].s.size()){
-	text->line=line;
-	text->clipline=line;
-	text->clippos=p;
-	text->pos=p+s.size();
-	display(text,isFirstDraw,totalTextY,scroll,textY,contextptr); // this modifies text->elements[].nlines (no idea why), 2 calls insure scrolling is adequate
-	display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-	text->clipline=-1;
-	return chk_replace(text,s,replace);
-      }
-      pos=0;
-    }
-    for (line=0;line<text->line;++line){
-      int p=text->elements[line].s.find(s,0);
-      if (p>=0 && p<text->elements[line].s.size()){
-	text->line=line;
-	text->clipline=line;
-	text->clippos=p;
-	text->pos=p+s.size();
-	display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-	display(text,isFirstDraw,totalTextY,scroll,textY,contextptr); // 2 callslike above
-	text->clipline=-1;
-	return chk_replace(text,s,replace);
-      }
-    }
-    return false;
-  }
-
-  int load_script(const char * filename,std::string & s){
-    const char * ch =read_file(filename);
-    s=ch?ch:"";
-    return 1;
-  }
-
-  void save_script(const char * filename,const string & s){
-    if (nspire_exam_mode==2)
-      return;
-#ifdef NUMWORKS
-    char buf[s.size()+2];
-    buf[0]=1;
-    strcpy(buf+1,s.c_str());
-#else
-    char buf[s.size()+1];
-    strcpy(buf,s.c_str());    
-#endif
-#ifdef NSPIRE_NEWLIB
-    char filenametns[strlen(filename)+5];
-    strcpy(filenametns,filename);
-    int l=strlen(filenametns);
-    if (l<4 || strncmp(filename+l-4,".tns",4))
-      strcpy(filenametns+strlen(filename),".tns");
-    write_file(filenametns,buf);
-#else
-    write_file(filename,buf);
-#endif
-  }
-
-  bool textedit(char * s,int bufsize,bool OKparse,const giac::context * contextptr,const char * filename){
-    if (!s)
-      return false;
-    int ss=strlen(s);
-    if (ss==0){
-      *s=' ';
-      s[1]=0;
-      ss=1;
-    }
-    textArea ta;
-    ta.elements.clear();
-    ta.editable=true;
-    ta.clipline=-1;
-    ta.changed=false;
-    ta.filename=filename?filename:"temp.py";
-    ta.y=0;
-    ta.python=python_compat(contextptr);
-    ta.allowEXE=false;//true; // set back to true later
-    ta.OKparse=OKparse;
-    bool str=s[0]=='"' && s[ss-1]=='"';
-    if (str){
-      s[ss-1]=0;
-      add(&ta,s+1);
-    }
-    else
-      add(&ta,s);
-    ta.line=0;
-    ta.pos=ta.elements[ta.line].s.size();
-    int res=doTextArea(&ta,contextptr);
-    drawRectangle(0,0,LCD_WIDTH_PX,LCD_HEIGHT_PX,_WHITE);
-    os_hide_graph();
-    if (res==TEXTAREA_RETURN_EXIT)
-      return false;
-    string S(merge_area(ta.elements));
-    if (str)
-      S='"'+S+'"';
-    int Ssize=S.size();
-    if (Ssize<bufsize){
-      strcpy(s,S.c_str());
-      for (--Ssize;Ssize>=0;--Ssize){
-	if ((unsigned char)s[Ssize]==0x9c || s[Ssize]=='\n')
-	  s[Ssize]=0;
-	if (s[Ssize]!=' ')
-	  break;
-      }
-      return true;
-    }
-    return false;
-  }
-
-  bool textedit(char * s,int bufsize,const giac::context * contextptr){
-    return textedit(s,bufsize,false,contextptr);
-  }
-
-#if 0
-  int get_filename(char * filename,const char * extension){
-    return 0;
-  }
-#else
-  int get_filename(char * filename,const char * extension){
-    handle_f5();
-    string str;
-#ifdef NSPIRE_NEWLIB
-    int res=inputline((lang==1)?"esc ou chaine vide: annulation":"esc or empty string: cancel",(lang==1)?"Nom de fichier:":"Filename:",str,false);
-#else
-    int res=inputline((lang==1)?"EXIT ou chaine vide: annulation":"EXIT or empty string: cancel",(lang==1)?"Nom de fichier:":"Filename:",str,false);
-#endif
-    if (res==KEY_CTRL_EXIT || str.empty())
-      return 0;
-    strcpy(filename,str.c_str());
-    int s=strlen(filename);
-    if (strcmp(filename+s-3,extension))
-      strcpy(filename+s,extension);
-    // if file already exists, warn, otherwise create
-    if (!file_exists(filename))
-      return 1;
-    if (confirm((lang==1)?"  Le fichier existe!":"  File exists!",
-#ifdef NSPIRE_NEWLIB
-		(lang==1)?"enter: ecraser, esc: annuler":"enter:overwrite, esc: cancel"
-#else
-		(lang==1)?"OK: ecraser,Back: annuler":"OK:overwrite, Back: cancel"
-#endif
-		)==KEY_CTRL_F1)
-      return 1;
-    return 0;
-  }
-#endif
-
-  const char * input_matrix(const gen &g,gen & ge,GIAC_CONTEXT){
-#if defined MICROPY_LIB || defined QUICKJS
-    if (xcas_python_eval){
-      if (ge.type==_VECT)
-	ge.subtype=0;
-      static string input_matrix_s=g.print(contextptr)+'='+ge.print(contextptr);
-      return input_matrix_s.c_str();
-    }
-#endif
-    if (ge.type==giac::_VECT)
-      sto(ge,g,contextptr);
-    return "";
-  }    
-  
-  const char * input_matrix(bool list,GIAC_CONTEXT){
-    static std::string * sptr=0;
-    if (!sptr)
-      sptr=new std::string;
-    *sptr="";
-    giac::gen v(giac::_VARS(0,contextptr));
-    giac::vecteur w;
-    if (v.type==giac::_VECT){
-      for (size_t i=0;i<v._VECTptr->size();++i){
-	giac::gen & tmp = (*v._VECTptr)[i];
-	if (tmp.type==giac::_IDNT){
-	  giac::gen tmpe(protecteval(tmp,1,contextptr));
-	  if (list){
-	    if (tmpe.type==giac::_VECT && !ckmatrix(tmpe))
-	      w.push_back(tmp);
-	  }
-	  else {
-	    if (ckmatrix(tmpe))
-	      w.push_back(tmp);
-	  }
-	}
-      }
-    }
-    std::string msg;
-    if (w.empty())
-      msg=(lang==1)?(list?"Creer nouvelle liste":"Creer nouvelle matrice"):(list?"Create new list":"Create new matrix");
-    else
-      msg=(((lang==1)?"Creer nouveau ou editer ":"Create new or edit ")+(w.size()==1?w.front():giac::gen(w,giac::_SEQ__VECT)).print(contextptr));
-    handle_f5();
-    if (inputline(msg.c_str(),((lang==1)?"Nom de variable:":"Variable name:"),*sptr,false) && !sptr->empty() && isalpha((*sptr)[0])){
-      giac::gen g(*sptr,contextptr);
-      giac::gen ge(protecteval(g,1,contextptr));
-      if (g.type==giac::_IDNT){
-	if (ge.type==giac::_VECT){
-	  ge=eqw(ge,true,contextptr);
-	  ge=protecteval(ge,1,contextptr);
-	  return input_matrix(g,ge,contextptr);
-	  if (ge.type==giac::_VECT)
-	    sto(ge,g,contextptr);
-	  else
-	    cout << "edited " << ge << endl;
-	  return ""; // return sptr->c_str();
-	}
-	if (ge==g || confirm_overwrite()){
-	  *sptr="";
-	  if (inputline(((lang==1)?(list?"Nombre d'elements":"Nombre de lignes"):(list?"Elements number":"Line number")),"",*sptr,true)){
-	    int l=strtol(sptr->c_str(),0,10);
-	    if (l>0 && l<256){
-	      int c;
-	      if (list)
-		c=0;
-	      else {
-		std::string tmp(*sptr+((lang==1)?" lignes.":" lines."));
-		*sptr="";
-		inputline(tmp.c_str(),(lang==1)?"Colonnes:":"Columns:",*sptr,true);
-		c=strtol(sptr->c_str(),0,10);
-	      }
-	      if (c==0){
-		ge=giac::vecteur(l);
-	      }
-	      else {
-		if (c>0 && l*c<256)
-		  ge=giac::_matrix(giac::makesequence(l,c),contextptr);
-	      }
-	      ge=eqw(ge,true,contextptr);
-	      ge=protecteval(ge,1,contextptr);
-	      return input_matrix(g,ge,contextptr);
-	    } // l<256
-	  }
-	} // ge==g || overwrite confirmed
-      } // g.type==_IDNT
-      else {
-	invalid_varname();
-      }	
-    } // isalpha
-    return 0;
-  }
-
-  std::string get_searchitem(std::string & replace){
-    replace="";
-    std::string search;
-    handle_f5();
-#ifdef NSPIRE_NEWLIB
-    int res=inputline((lang==1)?"esc ou chaine vide: annulation":"esc or empty string: cancel",(lang==1)?"Chercher:":"Search:",search,false);
-    if (search.empty() || res==KEY_CTRL_EXIT)
-      return "";
-    replace="";
-    std::string tmp=((lang==1)?"esc: recherche seule de ":"esc: search only ")+search;
-#else
-    int res=inputline((lang==1)?"EXIT ou chaine vide: annulation":"EXIT or empty string: cancel",(lang==1)?"Chercher:":"Search:",search,false);
-    if (search.empty() || res==KEY_CTRL_EXIT)
-      return "";
-    replace="";
-    std::string tmp=((lang==1)?"EXIT: recherche seule de ":"EXIT: search only ")+search;
-#endif
-    handle_f5();
-    res=inputline(tmp.c_str(),(lang==1)?"Remplacer par:":"Replace by:",replace,false);
-    if (res==KEY_CTRL_EXIT)
-      replace="";
-    return search;
-  }
-
-  bool tooltip(int x,int y,int pos,const char * editline,GIAC_CONTEXT){
-    char cmdline[strlen(editline)+1];
-    strcpy(cmdline,editline);
-    cmdline[pos]=0;
-    int l=strlen(cmdline);
-    char buf[l+1];
-    strcpy(buf,cmdline);
-    bool openpar=l && buf[l-1]=='(';
-    if (openpar){
-      buf[l-1]=0;
-      --l;
-    }
-    for (;l>0;--l){
-      if (!isalphanum(buf[l-1]) && buf[l-1]!='_')
-	break;
-    }
-    // cmdname in buf+l
-    const char * cmdname=buf+l,*cmdnameorig=cmdname;
-    int l1=strlen(cmdname);
-    if (l1<2)
-      return false;
-    const char * howto=0,*syntax=0,*related=0,*examples=0;
-    if (l1>0 && has_static_help(cmdname,lang | 0x100,howto,syntax,related,examples) && examples){
-      // display tooltip
-      if (x<0)
-	x=os_draw_string(0,y,_BLACK,1234,editline,true); // fake print -> x position // replaced cmdline by editline so that tooltip is at end
-      x+=2;
-      y+=4;
-      drawRectangle(x,y,6,10,65529);
-      draw_line(x,y,x+6,y,_BLACK);
-      draw_line(x,y,x+3,y+3,_BLACK);
-      draw_line(x+6,y,x+3,y+3,_BLACK);
-      y-=4;
-      x+=7;
-      int bg=65529; // background
-      x=os_draw_string_small(x,y,_BLACK,bg,": ",false);
-      if (howto && strlen(howto)){
-#ifdef NSPIRE_NEWLIB
-	y-=2;
-#endif
-	os_draw_string_small(x,y,_BLACK,bg,
-#ifdef NUMWORKS
-			     remove_accents(howto).c_str(),
-#else
-			     howto,
-#endif
-			     false);
-#ifdef NSPIRE_NEWLIB
-	y+=12;
-#else
-	y+=11;
-#endif
-      }
-      string toolt;
-      if (related && strlen(related)){
-	toolt += cmdname;
-	toolt += '(';
-	if (syntax && strlen(syntax))
-	  toolt += syntax;
-	else
-	  toolt += "arg";
-	toolt += ')';
-	toolt += ' ';
-	if (related)
-	  toolt += related;
-      }
-      else
-	toolt+=examples;
-      os_draw_string_small(x,y,_BLACK,bg,toolt.c_str(),false);
-      return true;
-    }
-    return false;
-  }
-
-  void textarea_help_insert(textArea * text,int exec,GIAC_CONTEXT){
-    string curs=text->elements[text->line].s.substr(0,text->pos);
-    if (!curs.empty()){
-      int b;
-      string adds=help_insert(curs.c_str(),b,exec,contextptr);
-      if (!adds.empty()){
-	if (b>0){
-	  std::string & s=text->elements[text->line].s;
-	  if (b>text->pos)
-	    b=text->pos;
-	  if (b>s.size())
-	    b=s.size();
-	  s=s.substr(0,text->pos-b)+s.substr(text->pos,s.size()-text->pos);//+s.substr(b,s.size()-b);
-	}
-	insert(text,adds.c_str(),false);
-      }
-    }
-  }
-  
-  int doTextArea(textArea* text,GIAC_CONTEXT) {
-#ifdef QUICKJS
-    update_js_vars();
-#endif
-    int scroll = 0;
-    int isFirstDraw = 1;
-    int totalTextY = 0,textY=0;
-    bool editable=text->editable;
-    int showtitle = !editable && (text->title != NULL);
-    int scrollableHeight = LCD_HEIGHT_PX-24*(showtitle ? 2 : 1)-text->y;
-    std::vector<textElement> & v=text->elements;
-    std::string search,replace;
-    show_status(text,search,replace);
-    if (text->line>=v.size())
-      text->line=0;
-    display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-    bool keytooltip=false;
-    while(1) {
-      if (text->line>=v.size())
-	text->line=0;
-      if (!keytooltip)
-	display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-      if(text->type == TEXTAREATYPE_INSTANT_RETURN) return 0;
-      int keyflag = GetSetupSetting( (unsigned int)0x14);
-      int key;
-      GetKey(&key);
-      if (keytooltip){
-	keytooltip=false;
-	if (key==KEY_CTRL_RIGHT && text->pos==text->elements[text->line].s.size())
-	  key=KEY_CTRL_OK;
-	if (key==KEY_CTRL_EXIT)
-	  continue;
-	if (key==KEY_CTRL_DOWN || key==KEY_CTRL_VARS)
-	  key=KEY_BOOK;
-	if (key==KEY_CTRL_OK ){
-	  textarea_help_insert(text,key,contextptr);
-	  continue;
-	}
-      }
-      if (key==KEY_SHUTDOWN)
-	return key;
-      if (key==KEY_CTRL_F3) // Numworks has no UNDO key
-	key=KEY_CTRL_UNDO;
-#if 1
-      if (key == KEY_CTRL_SETUP) {
-	menu_setup(contextptr);
-	continue;
-      }
-#endif
-      if (key!=KEY_CTRL_PRGM && key!=KEY_CHAR_FRAC)
-	translate_fkey(key);
-      if (key==KEY_CHAR_NORMAL)
-	key=KEY_CTRL_F15;
-      if (key==KEY_CHAR_FACTOR)
-	key=KEY_CTRL_F16;
-      //char keylog[32];sprint_int(keylog,key); puts(keylog);
-      show_status(text,search,replace);
-      int & clipline=text->clipline;
-      int & clippos=text->clippos;
-      int & textline=text->line;
-      int & textpos=text->pos;
-      if (key==KEY_CTRL_CUT && clipline<0) // if no selection, CUT -> pixel menu
-	key=KEY_CTRL_F3;
-      if (!editable && (key==KEY_CHAR_ANS || key==KEY_BOOK || key=='\t' || key==KEY_CTRL_EXE))
-	return key;
-      if (editable){
-	if (key=='\t'){
-	  int indent=0; // indent deduced from prev line
-	  if (textline!=0){
-	    std::string & s=v[textline-1].s;
-	    indent=find_indentation(s);
-	    if (!s.empty())
-	      indent+=2*end_do_then(s);
-	  }
-	  std::string & s=v[textline].s;
-	  int curindent=find_indentation(s);
-	  int diff=curindent-indent;
-	  if (diff>0){
-	    s=s.substr(diff,s.size()-diff);
-	    if (textpos>diff)
-	      textpos -= diff;
-	    else
-	      textpos = 0;
-	    continue;
-	  }
-	  if (diff<0){
-	    s=string(-diff,' ')+s;
-	    textpos += -diff;
-	    continue;
-	  }
-	  key=KEY_BOOK;
-	}
-	if (key==KEY_BOOK){
-	  textarea_help_insert(text,0,contextptr);
-	  continue;
-	}
-	if (key==KEY_CHAR_FRAC && clipline<0){
-	  if (textline==0) continue;
-	  std::string & s=v[textline].s;
-	  std::string & prev_s=v[textline-1].s;
-	  int indent=find_indentation(s),prev_indent=find_indentation(prev_s);
-	  if (!prev_s.empty())
-	    prev_indent += 2*end_do_then(prev_s);
-	  int diff=indent-prev_indent; 
-	  if (diff>0 && diff<=s.size())
-	    s=s.substr(diff,s.size()-diff);
-	  if (diff<0)
-	    s=string(-diff,' ')+s;
-	  textpos -= diff;
-	  continue;
-	}
-	if (key==KEY_CHAR_ANS){
-	  displaylogo();
-	  continue;
-	}
-	if (key>=KEY_SELECT_LEFT && key<=KEY_SELECT_RIGHT){
-	  if (clipline<0){
-	    clipline=textline;
-	    clippos=textpos;
-	    show_status(text,search,replace);
-	  }
-	  if (key==KEY_SELECT_LEFT){
-	    if (textpos)
-	      --textpos;
-	    else {
-	      if (textline){
-		--textline;
-		textpos=v[textline].s.size();
-	      }
-	    }
-	  }
-	  if (key==KEY_SELECT_RIGHT){
-	    if (textpos<v[textline].s.size())
-	      ++textpos;
-	    else {
-	      if (textline<v.size()){
-		++textline;
-		textpos=0;
-	      }
-	    }
-	  }
-	  if (key==KEY_SELECT_UP){
-	    if (textline){
-	      --textline;
-	      textpos=giacmin(textpos,v[textline].s.size());
-	    }
-	  }
-	  if (key==KEY_SELECT_DOWN){
-	    if (textline<v.size()){
-	      ++textline;
-	      textpos=giacmin(textpos,v[textline].s.size());
-	    }
-	  }
-	}
-	if (key==KEY_CTRL_CLIP) {
-#if 1
-	  if (clipline>=0){
-	    copy_clipboard(get_selection(text,false),true);
-	    clipline=-1;
-	  }
-	  else {
-	    clipline=textline;
-	    clippos=textpos;
-	    show_status(text,search,replace);
-	  }
-#else
-	  copy_clipboard(v[textline].s,false);
-	  DefineStatusMessage((char*)"Line copied to clipboard", 1, 0, 0);
-	  DisplayStatusArea();
-#endif
-	  continue;
-	}
-	if (key==KEY_CTRL_F5){
-	  bool minimini=!v[0].minimini;
-	  for (int i=0;i<v.size();++i)
-	    v[i].minimini=minimini;
-	  text->lineHeight=minimini?13:17;
-	  isFirstDraw=1;
-	  display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-	  continue;
-	}
-	if (clipline<0){
-	  const char * adds;
-#if 1
-	  if ( (key>=KEY_CTRL_F1 && key<=KEY_CTRL_F4) ||
-	       (key >= KEY_CTRL_F6 && key <= KEY_CTRL_F16)
-	       ){
-	    string le_menu;
-	    if (xcas_python_eval==1)//text->python?
-	      le_menu="F1 test\nif \nelse \n<\n>\n==\n!=\n&&\n||\nF2 loop\nfor \nfor in\nrange(\nwhile \nbreak\ndef\nreturn \n#\nF4 misc\n:\n;\n_\n!\n%\nfrom  import *\nprint(\ninput(\nF6 tortue\nforward(\nbackward(\nleft(\nright(\npencolor(\ncircle(\nreset()\nfrom turtle import *\nF: plot\nplot(\ntext(\narrow(\nlinear_regression_plot(\nscatter(\naxis(\nbar(\nfrom matplotl import *\nF7 linalg\nadd(\nsub(\nmul(\ninv(\ndet(\nrref(\ntranspose(\nfrom linalg import *\nF< color\nred\nblue\ngreen\ncyan\nyellow\nmagenta\nblack\nwhite\nF; draw\nset_pixel(\ndraw_line(\ndraw_rectangle(\nfill_rect(\ndraw_polygon(\ndraw_circle(\ndraw_string(\nfrom graphic import *\nF8 numpy\narray(\nreshape(\narange(\nlinspace(\nsolve(\neig(\ninv(\nfrom numpy import *\nF9 arit\npow(\nisprime(\nnextprime(\nifactor(\ngcd(\nlcm(\niegcd(\nfrom arit import *\n";
-	    if (xcas_python_eval<=0)
-	      le_menu="F1 test\nif \nelse \n<\n>\n==\n!=\nand\nor\nF2 loop\nfor \nfor in\nrange(\nwhile \nbreak\nf(x):=\nreturn \nvar\nF4 misc\n;\n:\n_\n!\n%\n&\nprint(\ninput(\nF6 tortue\navance\nrecule\ntourne_gauche\ntourne_droite\nrond\ndisque\nrepete\nefface\nF7 lin\nmatrix(\ndet(\nmatpow(\nranm(\nrref(\ntran(\negvl(\negv(\nF9 arit\n mod \nirem(\nifactor(\ngcd(\nisprime(\nnextprime(\npowmod(\niegcd(\nF< plot\nplot(\nplotseq(\nplotlist(\nplotparam(\nplotpolar(\nplotfield(\nhistogram(\nbarplot(\nF: misc\n<\n>\n_\n!\n % \nrand(\nbinomial(\nnormald(\nF8 cplx\nabs(\narg(\nre(\nim(\nconj(\ncsolve(\ncfactor(\ncpartfrac(\n";
-	    if (xcas_python_eval>=0)
-	      le_menu += "F= list\nmakelist(\nrange(\nseq(\nlen(\nappend(\nranv(\nsort(\napply(\nF; real\nexact(\napprox(\nfloor(\nceil(\nround(\nsign(\nmax(\nmin(\nF> prog\n;\n:\n\\\n&\n?\n!\ndebug(\npython(\nF? geo\npoint(\nline(\nsegment(\ncircle(\ntriangle(\nplane(\nsphere(\nsingle_inter(\nF@ color\ncolor=\nred\ncyan\ngreen\nblue\nmagenta\nyellow\nlegend(";
-	    const char * ptr=console_menu(key,(char*)(le_menu.c_str()),2);
-	    if (!ptr){
-	      show_status(text,search,replace);
-	      continue;
-	    }
-	    adds=ptr;
-	  }
-	  else
-#endif
-	    adds=keytostring(key,keyflag,text->python,contextptr);
-	  if (key!=KEY_CHAR_ANS && adds){
-	    bool isex=adds[0]=='\n';
-	    if (isex)
-	      ++adds;
-	    bool isif=strcmp(adds,"if ")==0,
-	      iselse=strcmp(adds,"else ")==0,
-	      isfor=strcmp(adds,"for ")==0,
-	      isforin=strcmp(adds,"for in")==0,
-	      isdef=strcmp(adds,"f(x):=")==0 || strcmp(adds,"def")==0,
-	      iswhile=strcmp(adds,"while ")==0,
-	      islist=strcmp(adds,"list ")==0,
-	      ismat=strcmp(adds,"matrix ")==0;
-	    if (islist){
-	      input_matrix(true,contextptr);
-	      continue;
-	    }
-	    if (ismat){
-	      input_matrix(false,contextptr);
-	      continue;
-	    }
-	    if (text->python>0){
-	      if (isif)
-		adds=isex?"if x<0:\nx=-x":"if :\n";
-	      if (iselse)
-		adds="else:\n";
-	      if (isfor)
-		adds=isex?"for j in range(10):\nprint(j*j)":"for  in range():\n";
-	      if (isforin)
-		adds=isex?"for j in [1,4,9,16]:\nprint(j)":"for  in :\n";
-	      if (iswhile && isex)
-		adds="a,b=25,15\nwhile b!=0:\na,b=b,a%b";
-	      if (isdef)
-		adds=isex?"def f(x):\nreturn x*x*x\n":"def f(x):\n\nreturn\n";
-	    } else {
-	      if (isif)
-		adds=(lang==1 && text->python==0)?(isex?"si x<0 alors x:=-x; fsi;":"si  alors\n\nsinon\n\nfsi;"):(isex?"if (x<0) { x:=-x;}":"if (){\n\n} else {\n\n}");
-	      if (lang==1 && text->python==0 && iselse)
-		adds="sinon ";
-	      if (isfor)
-		adds=(lang==1 && text->python==0)?(isex?"pour j de 1 jusque 10 faire\nprint(j*j);\nfpour;":"pour  de  jusque  faire\n\nfpour;"):(isex?"for (j=1;j<=10;j++){ \nprint(j*j);\n}":"for(;;){\n\n};");
-	      if (isforin)
-		adds=(lang==1 && text->python==0)?(isex?"pour j in [1,4,9,16] faire\nprint(j)\nfpour;":"pour  in  faire\n\nfpour;"):(isex?"for j in [1,4,9,16] do\nprint(j);od;":"for  in  do\n\nod;");
-	      if (iswhile)
-		adds=(lang==1 && text->python==0)?(isex?"a,b:=25,15;\ntantque b!=0 faire\na,b:=b,irem(a,b);\nftantque;a;":"tantque  faire\n\nftantque;"):(isex?"a,b:=25,15;\nwhile (b!=0) {\na,b=b,irem(a,b);\n}\na;":"while () {\n\n}");
-	      if (isdef)
-		adds=(lang==1 && text->python==0)?(isex?"fonction f(x)\nlocal j;\nj:=x*x;\nreturn j;\nffonction:;\n":"fonction f(x)\nlocal j;\n\nreturn ;\nffonction:;"):(isex?"function f(x){\nvar j;\nj=x*x;\nreturn j;\n}\n":"function f(x){\n  var j;\n\n return ;\n};");
-	    }
-	    insert(text,adds,key!=KEY_CTRL_PASTE); // was true, but we should not indent when pasting
-	    display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-	    const string & s=v[textline].s;
-	    int cx=text->cursorx,cy=text->cursory,cp=text->pos;
-	    if (tooltip(cx,cy,cp,s.substr(0,cp).c_str(),contextptr)){
-	      keytooltip=true;
-	    }
-	    if (text->pos>0 && (key==KEY_CHAR_ACCOLADES || key==KEY_CHAR_CROCHETS))
-	      --text->pos;
-	    show_status(text,search,replace);
-	    continue;
-	  }
-	}
-      }
-      textElement * ptr=& v[textline];
-      const int interligne=16;
-      switch(key){
-      case KEY_CTRL_DEL:
-	if (clipline>=0){
-	  copy_clipboard(get_selection(text,true),true);
-	  // erase selection
-	  clipline=-1;
-	}
-	else {
-	  if (editable){
-	    if (textpos){
-	      set_undo(text);
-	      std::string & s=v[textline].s;
-	      int nextpos=textpos-1;
-	      if (textpos==find_indentation(s)){
-		for (int line=textline-1;line>=0;--line){
-		  int ind=find_indentation(v[line].s);
-		  if (textpos>ind){
-		    nextpos=ind;
-		    break;
-		  }
-		}
-	      }
-	      s.erase(s.begin()+nextpos,s.begin()+textpos);
-	      textpos=nextpos;
-	    }
-	    else {
-	      if (textline){
-		set_undo(text);
-		--textline;
-		textpos=v[textline].s.size();
-		v[textline].s += v[textline+1].s;
-		v[textline].nlines += v[textline+1].nlines;
-		v.erase(v.begin()+textline+1);
-	      }
-	    }
-	  }
-	  show_status(text,search,replace);
-	}
-	break;
-      case KEY_CTRL_S:
-	display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-	search=get_searchitem(replace);
-	if (!search.empty()){
-	  for (;;){
-	    if (!move_to_word(text,search,replace,isFirstDraw,totalTextY,scroll,textY,contextptr)){
-	      break;
-	    }
-	  }
-	  show_status(text,search,replace);
-	}
-	continue;
-      case KEY_CTRL_OK:
-	if (text->allowEXE || !text->editable) return TEXTAREA_RETURN_EXE;
-	if (search.size()){
-	  for (;;){
-	    if (!move_to_word(text,search,replace,isFirstDraw,totalTextY,scroll,textY,contextptr))
-	      break;
-	  }
-	  show_status(text,search,replace);
-	  continue;
-	}
-	else {
-          if (!text->OKparse) return TEXTAREA_RETURN_EXE;
-	  int err=check_parse(text,v,text->python,contextptr);
-	  if (err==KEY_SHUTDOWN)
-	    return err;
-	  if (err) // move cursor to the error line
-	    textline=err-1;
-	  continue;
-	}
-	break;
-      case KEY_CTRL_EXE: 
-	if (search.size()){
-	  for (;;){
-	    if (!move_to_word(text,search,replace,isFirstDraw,totalTextY,scroll,textY,contextptr))
-	      break;
-	  }
-	  show_status(text,search,replace);
-	  continue;
-	}
-	if (clipline<0 && editable){
-	  set_undo(text);
-	  add_indented_line(v,textline,textpos);
-	  show_status(text,search,replace);
-	}
-	break;
-      case KEY_CTRL_UNDO:
-	undo(text);
-	break;
-      case KEY_SHIFT_LEFT:
-	textpos=0;
-	break;
-      case KEY_SHIFT_RIGHT:
-	textpos=v[textline].s.size();
-	break;
-      case KEY_CTRL_LEFT:
-	if (editable){
-	  --textpos;
-	  if (textpos<0){
-	    if (textline==0)
-	      textpos=0;
-	    else {
-	      --textline;
-	      show_status(text,search,replace);
-	      textpos=v[textline].s.size();
-	    }
-	  }
-	  if (textpos>=0)
-	    break;
-	}
-      case KEY_CTRL_UP:
-	if (editable){
-	  if (textline>0){
-	    --textline;
-	    show_status(text,search,replace);
-	  }
-	  else {
-	    textline=0;
-	    textpos=0;
-	  }
-	} else {
-	  if (scroll < 0) {
-	    scroll = scroll + interligne;
-	    if(scroll > 0) scroll = 0;
-	  }
-	}
-	break;
-      case KEY_CTRL_RIGHT:
-	++textpos;
-	if (textpos<=ptr->s.size())
-	  break;
-	if (textline==v.size()-1){
-	  textpos=ptr->s.size();
-	  break;
-	}
-	textpos=0;
-      case KEY_CTRL_DOWN:
-	if (editable){
-	  if (textline<v.size()-1)
-	    ++textline;
-	  else {
-	    textline=v.size()-1;
-	    textpos=v[textline].s.size();
-	  }
-	  show_status(text,search,replace);
-	}
-	else {
-	  if (textY > scrollableHeight-(showtitle ? 0 : interligne)) {
-	    scroll = scroll - interligne;
-	    if(scroll < -totalTextY+scrollableHeight-(showtitle ? 0 : interligne)) scroll = -totalTextY+scrollableHeight-(showtitle ? 0 : interligne);
-	  }
-	}
-	break;
-      case KEY_CTRL_PAGEDOWN:
-	if (editable){
-	  textline=v.size()-1;
-	  textpos=v[textline].s.size();
-	}
-	else {
-	  if (textY > scrollableHeight-(showtitle ? 0 : interligne)) {
-	    scroll = scroll - scrollableHeight;
-	    if(scroll < -totalTextY+scrollableHeight-(showtitle ? 0 : interligne)) scroll = -totalTextY+scrollableHeight-(showtitle ? 0 : interligne);
-	  }
-	}
-	break;
-      case KEY_CTRL_PAGEUP:
-	if (editable)
-	  textline=0;
-	else {
-	  if (scroll < 0) {
-	    scroll = scroll + scrollableHeight;
-	    if(scroll > 0) scroll = 0;
-	  }
-	}
-	break;
-      case KEY_SAVE:
-	if (nspire_exam_mode==2)
-	  continue;
-	save_script(text->filename.c_str(),merge_area(v));
-	text->changed=false;
-	char status[256];
-	sprintf(status,(lang==1)?"%s sauvegarde":"%s saved",text->filename.c_str());
-	DefineStatusMessage(status, 1, 0, 0);
-	DisplayStatusArea();    	    
-	continue;      
-      case KEY_CTRL_F1:
-	if(text->allowF1) return KEY_CTRL_F1;
-	break;
-      case KEY_CTRL_MENU: case KEY_CTRL_F6:
-	// case KEY_CHAR_ANS:
-	if (!text->editable) 	return TEXTAREA_RETURN_EXIT;
-	if (clipline<0 && text->editable && text->filename.size()){
-	  Menu smallmenu;
-	  smallmenu.numitems=12;
-	  MenuItem smallmenuitems[smallmenu.numitems];
-	  smallmenu.items=smallmenuitems;
-	  smallmenu.height=12;
-	  smallmenu.scrollbar=0;
-	  //smallmenu.title = "KhiCAS";
-	  smallmenuitems[0].text = (char*)((lang==1)?"Tester syntaxe":"Check syntax");
-	  smallmenuitems[1].text = (char*)((lang==1)?"Sauvegarder":"Save");
-	  smallmenuitems[2].text = (char*)((lang==1)?"Sauvegarder comme":"Save as");
-	  if (nspire_exam_mode==2) smallmenuitems[1].text = (char*)(lang==1?"Sauvegarde desactivee":"Saving disabled");
-	  if (exam_mode || nspire_exam_mode==2) smallmenuitems[2].text = (char*)"";
-	  smallmenuitems[3].text = (char*)((lang==1)?"Inserer":"Insert");
-	  smallmenuitems[4].text = (char*)((lang==1)?"Effacer":"Clear");
-	  smallmenuitems[5].text = (char*)((lang==1)?"Chercher,remplacer":"Search, replace");
-	  smallmenuitems[6].text = (char*)((lang==1)?"Aller a la ligne":"Goto line");
-	  int p=python_compat(contextptr);
-	  if (p<0){
-	      smallmenuitems[7].text = (char*)"Syntax [QuickJS]";
-	  } else  {
-	    if (p&4)
-	      smallmenuitems[7].text = (char*)"Syntax [MicroPython]";
-	    else {
-	      if (p==0)
-		smallmenuitems[7].text = (char*)"Syntax [Xcas francais]";
-	      if (p==1)
-		smallmenuitems[7].text = (char*)"Syntax [Xcas comp Python ^=**]";
-	      if (p==2)
-		smallmenuitems[7].text = (char*)"Syntax [Xcas comp Python ^=xor]";
-	    }
-	  }
-	  smallmenuitems[8].text = (char *)((lang==1)?"Changer taille caracteres":"Change fontsize");
-	  smallmenuitems[9].text = (char *)aide_khicas_string;
-	  smallmenuitems[10].text = (char *)((lang==1)?"A propos":"About");
-	  smallmenuitems[11].text = (char*)((lang==1)?"Quitter":"Quit");
-	  int sres = doMenu(&smallmenu);
-	  if(sres == MENU_RETURN_SELECTION || sres==KEY_CTRL_EXE) {
-	    sres=smallmenu.selection;
-	    if (sres==12){
-	      int res=check_leave(text);
-	      if (res==2)
-		continue;
-	      return TEXTAREA_RETURN_EXIT;
-	    }
-	    if(sres >= 10) {
-	      textArea text;
-	      text.editable=false;
-	      text.clipline=-1;
-	      text.title = smallmenuitems[sres-1].text;
-	      add(&text,smallmenu.selection==10?((lang==1)?shortcuts_fr_string:shortcuts_en_string):((lang==1)?apropos_fr_string:apropos_en_string));
-	      if (doTextArea(&text,contextptr)==KEY_SHUTDOWN)
-		return KEY_SHUTDOWN;
-	      continue;
-	    }
-	    if (sres==9 && editable){
-	      bool minimini=!v[0].minimini;
-	      for (int i=0;i<v.size();++i)
-		v[i].minimini=minimini;
-	      text->lineHeight=minimini?13:17;
-	      continue;
-	    }
-	    if (sres==1){
-	      int err=check_parse(text,v,text->python,contextptr);
-	      if (err==KEY_SHUTDOWN)
-		return err;
-	      if (err) // move cursor to the error line
-		textline=err-1;
-	    } 
-	    if (sres==3 && exam_mode==0 && nspire_exam_mode!=2){
-	      char filename[MAX_FILENAME_SIZE+1];
-	      if (get_filename(filename,".py")){
-		text->filename=filename;
-		sres=2;
-	      }
-	    }
-	    if(sres == 2 && nspire_exam_mode!=2) {
-	      save_script(text->filename.c_str(),merge_area(v));
-	      text->changed=false;
-	      char status[256];
-	      sprintf(status,(lang==1)?"%s sauvegarde":"%s saved",text->filename.c_str());
-	      DefineStatusMessage(status, 1, 0, 0);
-	      DisplayStatusArea();    	    
-	    }
-	    if (sres==4){
-	      char filename[MAX_FILENAME_SIZE+1];
-	      std::string ins;
-	      if (giac_filebrowser(filename, "py", "Scripts",2) && load_script(filename,ins))
-		insert(text,ins.c_str(),false);//add_nl(text,ins);
-	    }
-	    if (sres==5){
-	      std::string s(merge_area(v));
-#if 0
-	      for (size_t i=0;i<s.size();++i){
-		if (s[i]=='\n')
-		  s[i]=0x1e;
-	      }
-	      CLIP_Store(s.c_str(),s.size()+1);
-#endif
-	      copy_clipboard(s,false);
-	      set_undo(text);
-	      v.resize(1);
-	      v[0].s="";
-	      textline=0;
-	    }
-	    if (sres==6){
-	      display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-	      search=get_searchitem(replace);
-	      if (!search.empty()){
-		for (;;){
-		  if (!move_to_word(text,search,replace,isFirstDraw,totalTextY,scroll,textY,contextptr)){
-		    break;
-		  }
-		}
-		show_status(text,search,replace);
-	      }
-	    }
-	    if (sres==7){
-	      display(text,isFirstDraw,totalTextY,scroll,textY,contextptr);
-	      int l=get_line_number((lang==1)?"Negatif: en partant de la fin":"Negative: counted from the end",(lang==1)?"Numero de ligne:":"Line number:");
-	      if (l>0)
-		text->line=l-1;
-	      if (l<0)
-		text->line=v.size()+l;
-	    }
-	    if (sres==8){
-	      int c=select_interpreter();
-	      if (c>=0){
-		int p=text->python;
-		if (c==4)
-		  p=-1;
-		else {
-		  if (c==3)
-		    p |= 0x4;
-		  else 
-		    p=c;
-		}
-		giac::python_compat(p,contextptr);
-		text->python=p;
-		xcas_python_eval=(c==3?1:(c==4?-1:0));
-		show_status(text,search,replace);
-		warn_python(text->python,false);
-		drawRectangle(0,205,LCD_WIDTH_PX,17,44444);
-		PrintMiniMini(0,205,"shift-1 test|2 loop|3 undo|4 misc|5 +- |      ",4,44444,giac::_BLACK);
-	      }
-	    }
-	  }
-	}
-	break;
-      case KEY_CTRL_SETUP: // inactive
-	text->python=text->python?0:1; // FIXME QUICKJS
-	show_status(text,search,replace);
-	python_compat(text->python,contextptr);
-	warn_python(text->python,false);
-	drawRectangle(0,205,LCD_WIDTH_PX,17,44444);
-	PrintMiniMini(0,205,"shift-1 test|2 loop|3 undo|4 misc|5 +- |      ",4,44444,giac::_BLACK);
-	continue;
-      case KEY_CTRL_F2:
-	if (clipline<0)
-	  return KEY_CTRL_F2;
-      case KEY_CTRL_EXIT:
-	if (clipline>=0){
-	  clipline=-1;
-	  show_status(text,search,replace);
-	  continue;
-	}
-	if (!search.empty()){
-	  search="";
-	  show_status(text,search,replace);
-	  continue;
-	}
-	if (check_leave(text)==2)
-	  continue;
-	return TEXTAREA_RETURN_EXIT;
-      case KEY_CTRL_INS:
-	break;
-      default:
-	if (clipline<0 && key>=32 && key<128 && editable){
-	  char buf[2]={char(key),0};
-	  insert(text,buf,false);
-	  show_status(text,search,replace);
-	}
-	if (key==KEY_CTRL_AC){
-	  if (clipline>=0){
-	    clipline=-1;
-	    show_status(text,search,replace);
-	  }
-	  else {
-	    if (search.size()){
-	      search="";
-	      show_status(text,search,replace);
-	    }
-	    else {
-	      copy_clipboard(v[textline].s+'\n',true);
-	      if (v.size()==1)
-		v[0].s="";
-	      else {
-		v.erase(v.begin()+textline);
-		if (textline>=v.size())
-		  --textline;
-	      }
-	      DefineStatusMessage((char*)"Line cut and copied to clipboard", 1, 0, 0);
-	      DisplayStatusArea();
-	    }
-	  }
-	}
-      }
-    }
-  }
-
-  void reload_edptr(const char * filename,textArea *edptr,GIAC_CONTEXT){
-    if (edptr){
-      std::string s(merge_area(edptr->elements));
-      copy_clipboard(s,true);
-      s="\n";
-      edptr->elements.clear();
-      edptr->clipline=-1;
-      edptr->filename=remove_path(giac::remove_extension(filename))+".py";
-      load_script((char *)edptr->filename.c_str(),s);
-      if (s.empty())
-	s="\n";
-      // cout << "script " << edptr->filename << endl;
-      edptr->editable=true;
-      edptr->changed=false;
-      edptr->python=python_compat(contextptr);
-      edptr->elements.clear();
-      edptr->y=7;
-      add(edptr,s);
-      edptr->line=0;
-      edptr->pos=0;
-    }
-  }  
-
-  console_line * Line=0;//[_LINE_MAX];//={data_line};
-  char menu_f1[8]={0},menu_f2[8]={0},menu_f3[8]={0},menu_f4[8]={0},menu_f5[8]={0},menu_f6[8];
-  char session_filename[MAX_FILENAME_SIZE+1]="session";
-  char * FMenu_entries_name[6]={menu_f1,menu_f2,menu_f3,menu_f4,menu_f5,menu_f6};
-  location Cursor;
-  char *Edit_Line=0;
-  int Start_Line, Last_Line,editline_cursor;
-  int Case;
-  int console_changed=0; // 1 if something new in history
-  int dconsole_mode=1; // 0 disables dConsole commands
-
-#define Current_Line (Start_Line + Cursor.y)
-#define Current_Col (Line[Cursor.y + Start_Line].start_col + Cursor.x)
-
-  void console_disp_status(GIAC_CONTEXT){
-    int i=python_compat(contextptr);
-    string msg("shell ");
-    if (i<0)
-      msg += "QuickJS";
-    else {
-      if (i&4)
-	msg+="MicroPython";
-      else {
-	if (i==0)
-	  msg+="Xcas";
-	else {
-	  if (i==1)
-	    msg+="Py ^=**";
-	  else
-	    msg+="Py ^=xor";
-	}
-      }
-    }
-    if (angle_radian(contextptr))
-      msg += " RAD ";
-    else
-      msg += " DEG ";
-    msg += session_filename;
-    if (console_changed)
-      msg += " *";
-    statuslinemsg(msg.c_str());
-    set_xcas_status();
-    Bdisp_PutDisp_DD();
-  }
-
-  void leave_exam_mode(GIAC_CONTEXT){
-#ifdef NSPIRE_NEWLIB
-    // FIXME test USB connection instead
-    unsigned NSPIRE_RTC_ADDR=0x90090000;
-    unsigned t1= * (volatile unsigned *) NSPIRE_RTC_ADDR;
-    int chk=0;
-    if (exam_duration<=0 || (t1-exam_start<exam_duration)){
-      chk=-1;
-#if 1 // checkin the  power management addresses range
-      unsigned poweraddr=0x900b0028;
-      unsigned u=*(unsigned *)poweraddr;
-      //*logptr(contextptr) << "power " << u << '\n';
-      if ( is_cx2 || (u&0xff0000)==0x070000) // connected 0x11070114, disconnected 0x11110114
-	chk=0;
-#endif
-#if 0 /// check connection, works only if graph link connection before
-      unsigned powermanagement_lockaddr=0x900b0018;
-      // Bit 5: #B0000000 - USB OTG controller
-      // Bit 6: #B4000000 - USB HOST controller
-      *(unsigned *)powermanagement_lockaddr=0x8400a5d;
-      unsigned HW_USBCTRL_PORTSC1=0xb0000184;
-      unsigned u=*(unsigned *) HW_USBCTRL_PORTSC1;
-      if ( (u&0xff000000)==0x11000000) // 0x11000805 vs 0x1d000004
-	chk=0;
-      // B00001A4 might be used as well: HW_USBCTRL_OTGSC 1f202d20 vs 1f3c1120
-#endif
-#if 0 // check USB does not work
-      nn_ch_t ch = NULL;
-      nn_oh_t oh = NULL;
-      nn_nh_t nh = NULL;
-      oh = TI_NN_CreateOperationHandle();
-      int ans=TI_NN_NodeEnumInit((nn_ch_t) oh);//(ch);
-      *logptr(contextptr) << "enuminit" << ans << '\n';
-      if (ans>=0){
-	ans=TI_NN_NodeEnumNext(oh, &nh);
-	*logptr(contextptr) << "enumnext" << ans << '\n';
-	if (ans>=0){
-	  ans=TI_NN_Connect(nh, 0x4060, &ch);
-	  *logptr(contextptr) << "connect" << ans << '\n';
-	  if (ans>=0){
-	    if(ch){
-	      TI_NN_Disconnect(ch);
-	      chk=0;
-	    }
-	  }
-	}
-	TI_NN_NodeEnumDone(oh);
-	TI_NN_DestroyOperationHandle(oh);
-      }
-#endif
-    }
-#else
-    int chk=0;
-#endif
-    if (chk>=0){
-      set_exam_mode(0,contextptr);
-    }
-    if (exam_mode)
-      confirm((lang==1)?"Pour arreter le mode examen":"To stop exam mode",(lang==1)?"branchez la calculatrice puis doc doc":"plug in the calculator then doc doc");
-    else
-      confirm((lang==1)?"Fin du mode examen":"End exam mode","enter: OK");
-  }    
-
-#ifdef NUMWORKS
-/* begin section (c) B. Parisse, write exam mode in *all* firmwares 
-   code is dual-licensed for use in Epsilon and here
- */
-// write exam mode mode to flash at offset pos/8
-  void write_exammode(unsigned char * ptr,int pos,int mode,int modulo){
-    int curmode=pos%modulo;
-    if (curmode == mode)
-      return;
-    int delta=(mode+modulo-curmode)%modulo; // 0<delta<modulo, number of bits that we will set to 0
-    unsigned char * target = ptr + pos/8;
-    int pos8=pos % 8; // number of bits already set to 0 at target
-    pos8 += delta; // 0<pos8<modulo+7
-    unsigned char postab[]={0b11111111,0b1111111,0b111111,0b11111,0b1111,0b111,0b11,0b1,0}; // postab[i] is a byte with i bits set to 0 
-    unsigned char tab[2];
-    bool writenext=pos8>8;
-    tab[0]=postab[writenext?8:pos8];
-    tab[1]=postab[writenext?pos8-8:0];
-#if 1 // KHICAS
-    WriteMemory((char *)target, (const char *)tab, writenext?2:1);
-#else
-    target[0]=tab[0];
-    if (writenext) target[1]=tab[1];
-#endif
-  }
-
-  // check that region is split in two parts: bits set to 0 followed by bits set to 1, returns position of the first 1 bit or -1
-  int pos_01(unsigned * start,int l){
-    unsigned *ptr=start,* end=start+l/sizeof(unsigned);
-    for (;ptr<end;++ptr){
-      if (*ptr)
-	break;
-    }
-    if (ptr==end)
-      return -1;
-    int pos=(ptr-start)*32;
-    unsigned char * ptr8=(unsigned char *) ptr;
-    if (*ptr8==0){
-      pos+=8; ++ptr8;
-    }
-    if (*ptr8==0){
-      pos+=8; ++ptr8;
-    }
-    if (*ptr8==0){
-      pos+=8; ++ptr8;
-    }
-    switch (*ptr8){
-    case 0b1: pos+=7; break; // 7 bits are already set to 0
-    case 0b11: pos+=6; break;
-    case 0b111: pos+=5; break;
-    case 0b1111: pos+=4; break;
-    case 0b11111: pos+=3; break;
-    case 0b111111: pos+=2; break;
-    case 0b1111111: pos+=1; break;
-    case 0b11111111: break;
-    default: return -1;
-    }
-    ++ptr;
-    for (;ptr<end;++ptr){
-      if (*ptr!=0xffffffff)
-	return -1;
-    }
-    return pos;
-  }
-
-  char print_hex(int val){
-    val &= 0xf;
-    if (val>=0 && val<=9)
-      return '0'+val;
-    return 'A'+(val-10);
-  }
-
-  void print_hex(unsigned val,char * ptr){
-    for (int i=0;i<8;++i){
-      ptr[i]=print_hex(val>>(28-4*i));
-    }
-  }
-
-  void set_exammode(int mode,int modulo){
-    if (mode<0 || mode>=modulo)
-      return;
-    // scan external flash every dflash bytes
-    unsigned * flashptr=(unsigned *) 0x90000000;
-    unsigned dflash=0x10000,ntests=8*1024*1024/dflash/sizeof(unsigned);
-    for (unsigned i=0;i<ntests;++i){
-      unsigned * ptr=flashptr+i*dflash;
-      // kernel header?
-      if (*ptr!=0xffffffff || *(ptr+1)!=0xffffffff || *(ptr+2)!= 0xdec00df0 /* f0 0d c0 de*/)
-	continue;
-      ptr += 0x1000/sizeof(unsigned); // exam mode buffer?
-      int pos=pos_01(ptr,0x1000);
-      if (pos==-1)
-	continue;
-      if (pos>=0x1000-8){
-	erase_sector((const char *)ptr);
-	pos=0;
-      }
-      write_exammode((unsigned char *)ptr,pos,mode,modulo);
-    }
-  }
-
-  const size_t baseaddr[]={0x90000000,0x90180000,0x90400000};
-  void boot_firmware(int slot){
-    const int taille=int(sizeof(baseaddr)/sizeof(size_t));
-    if (slot<0 || slot>taille)
-      slot=taille;
-    unsigned * ptr=(unsigned *) 0x08004000;
-    int pos=pos_01(ptr,0x1000);
-    if (pos==-1)
-      return;
-    if (pos>=0x8000-8){
-      erase_sector((const char *)ptr);
-      pos=0;
-    }
-    write_exammode((unsigned char *)ptr,pos,slot,4);
-    wait_1ms(10); // Ion::Timing::msleep(10);
-    erase_sector(0); // Ion::Device::Reset::core();
-  }
-
-  const size_t kernelheader=0xdec00df0;
-  const size_t userheader=0xDEC0EDFE;
-  const size_t omegaheader=0xEFBEADDE;
-  const size_t upsilonheader=0x55707369;
-
-  // return 0 if invalid, 1 for Khi, 2 for Omega, 3 for Upsilon, 4 for Epsilon<=18.2.3
-  int is_valid(int slot){ 
-    if (slot<0 || slot>=int(sizeof(baseaddr)/sizeof(size_t)))
-      return 0;
-    // kernel header
-    size_t * addr=(size_t *) baseaddr[slot];
-    if (addr[0]!=0xffffffff || addr[1]!=0xffffffff || addr[2]!=kernelheader || addr[7]!=kernelheader)
-      return 0;
-    // userland header
-    addr=(size_t *) (baseaddr[slot]+0x10000);
-    if (addr[0]!=userheader || addr[9]!=userheader)
-      return 0;
-    if (addr[10]==omegaheader){
-      char * version=(char *)&addr[11];
-      if (version[1]=='.')
-	return 2; // Omega
-      return 1; // Khi
-    }
-    if (addr[10]==upsilonheader)
-      return 3;
-    // epsilon version
-    char * version=(char *)&addr[1];
-    if (strcmp(version,"18.2.3")>0)
-      return 0;
-    return 4;
-  }
-
-  size_t find_storage(){
-    // find storage
-    int slot=0;
-    size_t addr[]={0x90000000,0x90180000,0x90400000};
-    for (;slot<sizeof(addr)/sizeof(size_t);++slot){
-      unsigned char * r=(unsigned char *) addr[slot];
-      bool externalinfo=r[8]==0xf0 && r[9]==0x0d && r[10]==0xc0 && r[11]==0xde;
-      if (!externalinfo)
-	continue;
-      r += 0x10000;
-      if (r[15]!=0x20) // ram is at 0x20000000 (+256K)
-	continue;
-      size_t start=((r[15]*256U+r[14])*256+r[13])*256+r[12];
-      r=(unsigned char *)start;
-      if (r[0]==0xba && r[1]==0xdd && r[2]==0x0b && r[3]==0xee){ // ba dd 0b ee begin of scriptstore
-	return start;
-      }
-    }
-    return 0;
-  }    
-
-  bool save_backup(int no){
-    if (no!=1 && no!=0)
-      return false;
-    int L=32*1024;
-    size_t backupaddr=0x90800000-2*L;
-    size_t storageaddr=find_storage();
-    //confirm("Storage @",hexa_print_INT_(storageaddr).c_str());
-    if (storageaddr){
-      char * sptr=(char *)storageaddr;
-      int L=32*1024;
-      if (no==0){
-	// check if sector is already formatted
-	unsigned * ptr=(unsigned *) (backupaddr);
-	for (int i=0;i<L/2;++i){
-	  if (ptr[i]!=0xffffffff){ // it's not, format
-	    erase_sector((const char *)backupaddr);
-	    break;
-	  }
-	}
-	if (sptr[4]==0 && sptr[5]==0){
-	  return false; // nothing to save 
-	}
-	WriteMemory((char *)backupaddr,(const char *)storageaddr,L);
-	return true;
-      }
-      if (no==1){
-	if (sptr[4]==0 && sptr[5]==0){
-	  return false; // nothing to save 
-	}
-	// check if sector is already formatted
-	unsigned * ptr=(unsigned *) (backupaddr+L);
-	for (int i=0;i<L/4;++i){
-	  if (ptr[i]!=0xffffffff){ // it's not, format
-	    char * buf=(char *)malloc(L);
-	    memcpy(buf,(char *)backupaddr,L);
-	    erase_sector((const char *)backupaddr);
-	    WriteMemory((char *)backupaddr,buf,L);
-	    free(buf);
-	    break;
-	  }
-	}
-	WriteMemory((char *)(backupaddr+L),(const char *)storageaddr,L);
-	return true;
-      } 
-      return true; // never reached
-    }
-    return false;
-  }
-
-  // 0 or 1 restore, 2 or 3 check if there is something to restore
-  bool restore_backup(int no){
-    if (no<0)
-      return false;
-    int L=32*1024;
-    size_t backupaddr=0x90800000-2*L;
-    size_t storageaddr=find_storage();
-    //confirm("Storage @",hexa_print_INT_(storageaddr).c_str());
-    if (!storageaddr)
-      return false;
-    char * sptr=(char *)(backupaddr+(no & 1)*L);
-    // ba dd 0b ee
-    if (sptr[0]!=0xba || sptr[1]!=0xdd || sptr[2]!=0x0b || sptr[3]!=0xee )
-      return false;
-    if (sptr[4]==0 && sptr[5]==0)
-      return false; // nothing to restore
-    if (no>=2)
-      return true;
-    memcpy((char *)storageaddr,sptr,L);
-    return true;
-  }
-  /* end section (c) B. Parisse, */
-#endif
-  
-  void menu_setup(GIAC_CONTEXT){
-    Menu smallmenu;
-    smallmenu.numitems=15;
-    MenuItem smallmenuitems[smallmenu.numitems];
-    smallmenu.items=smallmenuitems;
-    smallmenu.height=12;
-    smallmenu.scrollbar=1;
-    smallmenu.scrollout=1;
-    smallmenu.title = (char *)"Config";
-  
-#ifdef NUMWORKS
-#ifdef DEVICE
-    string titles="Config (Memory "+print_INT_(_heap_size)+")";
-    smallmenu.title = (char*) titles.c_str();
-#endif
-    smallmenuitems[0].type = MENUITEM_CHECKBOX;
-    smallmenuitems[0].text = (char*)"x,n,t -> t";
-#endif
-    smallmenuitems[1].text = (char*)"Syntaxe (Xcas/Py/JS)";
-    smallmenuitems[2].type = MENUITEM_CHECKBOX;
-    smallmenuitems[2].text = (char*)"Radians (in Xcas)";
-    smallmenuitems[3].type = MENUITEM_CHECKBOX;
-    smallmenuitems[3].text = (char*)"Sqrt (in Xcas)";
-    smallmenuitems[4].text = (char*)"Francais";
-    smallmenuitems[5].text = (char*)"English";
-    smallmenuitems[6].text = (char*)"Spanish&English";
-    smallmenuitems[7].text = (char*)"Greek&English";
-    smallmenuitems[8].text = (char*)"Deutsch&English";
-    smallmenuitems[9].text = (char *) ((lang==1)?"Raccourcis clavier (0)":"Shortcuts (0)");
-#ifdef NUMWORKS
-    smallmenuitems[10].text = (char*) ((lang==1)?"Backup, mode examen (e^x)":"Backup, exam mode (e^x)");
-#else
-    smallmenuitems[10].text = (char*) ((lang==1)?"Mode examen (e^x)":"Exam mode (e^x)");
-#endif
-    smallmenuitems[11].text = (char*) ((lang==1)?"A propos":"About");
-    smallmenuitems[14].text = (char*) "Quit";
-    if (exam_mode)
-      smallmenuitems[14].text = (char*)((lang==1)?"Quitter le mode examen":"Quit exam mode");
-    
-    // smallmenuitems[2].text = (char*)(isRecording ? "Stop Recording" : "Record Script");
-    while(1) {
-#ifdef NUMWORKS
-      smallmenuitems[0].value = xthetat;
-#else
-      string dig("Digits (in Xcas): ");
-      dig += print_INT_(decimal_digits(contextptr));
-      smallmenuitems[0].text = (char*)dig.c_str();
-#endif
-      string heaps("Micropy/JS heap "+print_INT_(pythonjs_heap_size/1024)+"K");
-      smallmenuitems[12].text = (char *) heaps.c_str();
-      string stacks("-------------");
-      // string stacks("Micropython stack "+print_INT_(pythonjs_stack_size/1024)+"K"); // enable in micropython mpconfig.h + call to pystack_init + remove continue below
-      smallmenuitems[13].text = (char *) stacks.c_str();
-      int p=python_compat(contextptr);
-      if (p<0){
-	smallmenuitems[1].text = (char*)"Change syntax (QuickJS)";
-      } else {
-	if (p&4)
-	  smallmenuitems[1].text = (char*)"Change syntax (MicroPython)";
-	else {
-	  if (p==0)
-	    smallmenuitems[1].text = (char*)"Change syntax (Xcas)";
-	  if (p==1)
-	    smallmenuitems[1].text = (char*)"Change syntax (Xcas comp Python ^=**)";
-	  if (p==2)
-	    smallmenuitems[1].text = (char*)"Change syntax (Xcas comp Python ^=xor)";
-	}
-      }
-      smallmenuitems[2].value = giac::angle_radian(contextptr);
-      smallmenuitems[3].value = giac::withsqrt(contextptr);
-      int sres = doMenu(&smallmenu);
-      if (sres==MENU_RETURN_EXIT)
-	break;
-      if (sres == MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE) {
-	if (smallmenu.selection == 1){
-#ifdef NUMWORKS	 
-	  xthetat=1-xthetat;
-#else
-	  double d=decimal_digits(contextptr);
-	  if (inputdouble("Nombre de digits?",d,contextptr) && d==int(d) && d>0){
-	    decimal_digits(d,contextptr);
-	  }
-#endif
-	  continue;
-	}
-#if defined MICROPY_LIB || defined QUICKJS
-	if (smallmenu.selection == 2){
-	  int c=select_interpreter();
-	  if (c>=0){
-	    int p=giac::python_compat(contextptr);
-	    if (c==4){
-	      p=-1;
-	    } else {
-	      if (c==3)
-		p |= 0x4;
-	      else
-		p=c;
-	    }
-	    int old_xcas_python_eval=xcas_python_eval;
-	    xcas_python_eval=c<0?c:(c==3?1:0);
-	    giac::python_compat(p<0?0:p,contextptr);
-	    if (edptr)
-	      edptr->python=p;
-	    if (xcas_python_eval!=old_xcas_python_eval){
-	      if (old_xcas_python_eval==0 && xcas_python_eval>0 &&
-		  do_confirm((lang==1)?"Effacer les variables Xcas?":"Clear Xcas variables?"))
-		do_restart(contextptr);
-	    }
-#ifdef MICROPY_LIB
-	    if (old_xcas_python_eval==1 && do_confirm((lang==1)?"Effacer le tas MicroPython?":"Clear MicroPython heap?"))
-	      python_free();
-#endif
-#ifdef QUICKKS
-	    if (0 && old_xcas_python_eval==-1 && do_confirm((lang==1)?"Effacer le tas QuickJS?":"Clear QuickJS heap?"))
-	      js_end(global_js_context);
-#endif
-	    warn_python(p,false);
-	    Console_FMenu_Init(contextptr);
-	    console_disp_status(contextptr);
-	    break;
-	  }
-	}
-#endif
-	if (smallmenu.selection == 3){
-	  giac::angle_radian(!giac::angle_radian(contextptr),contextptr);
-	  os_set_angle_unit(giac::angle_radian(contextptr)?0:1);
-	  statusline(2*xcas_python_eval);
-	  continue;
-	}
-	if (smallmenu.selection == 4){
-	  giac::withsqrt(!giac::withsqrt(contextptr),contextptr);
-	  continue;
-	}
-	if (smallmenu.selection>=5 && smallmenu.selection<=9){
-	  lang=smallmenu.selection-4;
-	  giac::language(lang,contextptr);
-	  break;
-	}
-	if (smallmenu.selection == 11){
-#ifdef NSPIRE_NEWLIB
-	  if (nspire_exam_mode==1
-	      && !is_cx2
-	      ){
-	    if (confirm((lang==1?"Quitter Xcas pour relancer le mode examen":"Leave Xcas to re-enter exam mode"),(lang==1?"!enter OK, esc annul":"enter OK, esc cancel."))!=KEY_CTRL_F1)
-	      break;
-	    do_restart(contextptr);
-	    clear_turtle_history(contextptr);
-	    Console_Init(contextptr);
-	    Console_Clear_EditLine();
-	    console_changed=0;
-	    *logptr(contextptr) << (lang==1?"Nettoyage du repertoire du mode examen\n":"Cleaning exam mode directory.\n");
-	    *logptr(contextptr) << (lang==1?"Patientez environ 30 secondes\n":"Please wait about 30 secondes\n");
-	    // nspire_clear_data(contextptr,false); // done by set_exam_mode
-	    nspire_exam_mode=2;
-	    set_exam_mode(0,contextptr);
-	    *logptr(contextptr) << (lang==1?"Leds eteintes. Mode restreint (pas d'acces aux fichiers).\n":"Leds off. Restricted mode (no file access).\n");
-	    *logptr(contextptr) << (lang==1?"Quittez KhiCAS (doc doc) pour rebooter le mode examen\n":"Leave KhiCAS (doc doc) to reboot in exam mode.\n");
-	    break;
-	  }
-	  else {
-	    if (//1 ||
-		!is_cx2){
-	      if (do_confirm((lang==1)?"Lancer le mode examen avec CAS ?":"Run exam mode with CAS?")){
-		*logptr(contextptr) << (lang==1?"Patientez environ 2 minutes\n":"Please wait about 2 minutes\n");
-		*logptr(contextptr) << (lang==1?"Verifie et recopie les ressources necessaires\n":"Check and copy required ressources\n");
-		rm("/exammode/usr/ndless");
-		nspire_clear_data(contextptr,true);
-		*logptr(contextptr) << (lang==1?"Verification finale puis reboot en mode examen\n":"Final check then reboot in exam mode\n");
-		*logptr(contextptr) << (lang==1?"Patientez 30 secondes environ\n":"Please wait about 30 secondes\n");
-		set_exam_mode(-1,contextptr); // end up with reset()
-	      }
-	      break;
-	    }
-	    else {
-	      confirm((lang==1)?"Desole. Le mode examen de KhiCAS":"Sorry, KhiCAS exam mode",(lang==1)?"ne fonctionne pas sur Nspire CX II":"is not supported on Nspire CX II");
-	      break;
-	    }
-	    if (1
-		|| is_cx2
-		){
-	      textArea text;
-	      text.editable=false;
-	      text.clipline=-1;
-	      text.title = lang==1?"KhiCAS et mode examen":"KhiCAS and exam mode";
-	      add(&text,(lang==1)?
-		  "Attention, verifiez que le calcul formel est autorise avant d'utiliser KhiCAS en mode examen. En France, c'est en principe autorise lorsque la calculatrice graphique l'est (par exemple au bac)":
-		  "Warning! Check that CAS is allowed before running KhiCAS in exam mode.");
-	      const char exam_mode_fr_string[]="Pour utiliser KhiCAS en mode examen, il faut effectuer une preparation chez soi quelques heures avant avec une connection PC ou quelques minutes avant l'examen avec un autre etudiant ayant une Nspire CX ou CX II.\nLancer le mode examen sur la calculatrice cible (esc-on), recopier ndless et khicas.tns (ou luagiac.luax.tns et khicaslua.tns) sur la calculatrice cible en mode examen. Avec 2 calculatrices, recommencez sur l'autre calculatrice (mettre l'autre calculatrice en mode examen et copiez dessus ndless et khicas).\nActiver ndless (cable debranche) puis lancez KhiCAS puis touche calculatrice (en-dessous de esc) puis selectionner l'item 11. mode examen, valider : ceci va effacer les donnees et desactiver le clignotement des leds.\n\nAu debut de l'examen, lorsque le surveillant demande d'activer le mode examen, quittez KhiCAS en tapant doc doc (ou appuyez sur reset), le mode examen sera a nouveau actif et les leds clignoteront. Vous pouvez activer ndless et lancez KhiCAS.\nPour les institutions n'acceptant pas KhiCAS en mode examen: demandez a vos etudiants de redemarrer la calculatrice, puis faire esc-on et reinitialiser le mode examen.";
-	      const char exam_mode_en_string[]="Running KhiCAS in exam mode requires preparation at home with a PC or a few minutes with another student having a Nspire CX/CXII.\nActivate exam mode on the target calculator (esc-on), connect the PC or the other calculator, copy ndless and khicas.tns (or luagiac.luax.tns and khicaslua.tns) to the target calc (kept in exam mode). With 2 calculators, repeat on the other calculator.\n Activate ndless (disconnect the link) and run KhiCAS. Type the calculator key below esc then select 11. Exam mode. This will desactivate leds blinking and clear data. When exam begins, quit KhiCAS (doc doc) or press reset, exam mode will be active again and leds will blink. Activate ndless and run KhiCAS.\n\nFor institutions who do not want to allow KhiCAS, ask your students to reset their calculator, press esc-on and restart exam mode, this will clear ndless and KhiCAS.";
-	      add(&text,(lang==1)?exam_mode_fr_string:exam_mode_en_string);
-	      if (doTextArea(&text,contextptr)==KEY_SHUTDOWN)
-		return ;
-	      break;
-	    }
-	  }
-#endif // NSPIRE_NEWLIB
-#ifdef NUMWORKS
-#ifdef DEVICE
-	  const char * tab[]={lang==1?"Sauvegarde multi-firmwares":"Backup for multi-firmware",lang==1?"Restauration multifirmwares":"Restore multi-firmware backup",lang==1?"Lancer le mode examen":"Run exam mode",lang==1?"Backup du mode examen":"Restore exam mode backup",0};
-	  int choix=select_item(tab,"Mode examen",true);
-	  if (choix<0 || choix>4)
-	    break;
-	  if (choix==0){
-	    if (!save_backup(1))
-	      confirm(lang==1?"Rien a sauvegarder":"Nothing to save","OK?");
-	    break;
-	  }
-	  if (choix==1){
-	    if (restore_backup(3)){
-	      if (confirm(lang==1?"Les donnees actuelles vont etre effacees":"Current data will be erased!","OK/Back?")==KEY_CTRL_F1){
-		confirm(restore_backup(1)?"Success!":"Failure!","OK?");
-	      }
-	    }
-	    else
-	      confirm(lang==1?"Pas de donnees":"No data.","OK/Back?");	      
-	    break;
-	  }
-	  if (choix==2){
-	    if (confirm(lang==1?"Sauvegarde, effacement puis mode examen":"Backup, clear then exam mode","OK/Back?")==KEY_CTRL_F1){
-	      if (!save_backup(0))
-		confirm(lang==1?"Rien a sauvegarder":"Nothing to save","OK?");
-	      // save to exam mode backup sector and format reset backup sector
-	      set_exammode(1,4);
-	      erase_sector(0); // means reset
-	    }
-	  }
-	  if (choix==3){
-	    if (inexammode()){ 
-	      confirm(lang==1?"Sortez d'abord du mode examen!":"Leave exam mode first!",lang==1?"(Connectez la calculatrice)":"(Connect calculator)");
-	      break;
-	    }
-	    confirm(restore_backup(0)?"Success!":"Failure!","OK?");
-	    break;
-	  }
-#endif
-	  // if (do_confirm(lang==1?"Le mode examen se lance depuis Parametres":"Enter Exam mode from Settings")) shutdown_state=1;
-	  break;
-#else
-	  if (!exam_mode && confirm((lang==1?"Verifiez que le calcul formel est autorise.":"Please check that the CAS is allowed."),(lang==1?"France: autorise au bac. Enter: ok, esc: annul":"enter: yes, esc: no"))!=KEY_CTRL_F1)
-	    break;
-#endif
-	  // confirmation, duree (>=0 French indicative, else not indicative)
-	  double duration=exam_mode?absint(exam_duration):0;
-	  string msg=(lang==1)?"Compte a rebours en h.min ou 0 pour horloge":"Exam duration in h.min (0: end by pluging)";
-	  msg += print_duration(duration);
-	  if (inputdouble(msg.c_str(),duration,contextptr)){
-	    bool indicative=lang==1?duration>=0:duration<=0;
-	    if (exam_mode)
-	      indicative=exam_duration<=0;
-	    else {
-	      if (lang==1 && !indicative && confirm("Attention, mode non conforme au bac en France","enter: corriger, esc: tant pis")!=KEY_CTRL_F6)
-		indicative=true;
-	    }
-	    if (duration<0)
-	      duration=-duration;
-	    if (duration>10)
-	      duration=duration/60;
-	    else
-	      duration=std::floor(duration)+100.0/60*(duration-std::floor(duration));
-	    if (duration){
-	      msg=lang==1?"Duree compte a rebours ":"Exam duration ";
-	      double d=giacmax(duration*3600,absint(exam_duration));
-	      msg += print_duration(d);
-	    }
-	    else
-	      msg="Mode examen.";
-	    if (indicative)
-	      msg += lang==1?" Fin par branchement":" Exit by pluging";
-	    if (confirm(msg.c_str(),(lang==1?"!Blocage dans Xcas en mode exam! enter OK, esc annul":"!Trapped in Xcas in exam mode! enter OK, esc cancel."))==KEY_CTRL_F1){
-#ifdef NSPIRE_NEWLIB
-	      if (exam_mode) 
-		exam_duration=duration?giacmax(absint(exam_duration),duration*3600+30):0;
-	      else {
-		unsigned NSPIRE_RTC_ADDR=0x90090000;
-		exam_start= * (volatile unsigned *) NSPIRE_RTC_ADDR;
-		exam_duration = duration?duration*3600+30:0;
-	      }
-	      if (indicative)
-		exam_duration=-absint(exam_duration);
-#else
-	      exam_start=0;
-	      exam_duration=1;
-#endif
-	      do_restart(contextptr);
-	      clear_turtle_history(contextptr);
-	      Console_Init(contextptr);
-	      Console_Clear_EditLine();
-	      set_exam_mode(1,contextptr);
-	      strcpy(session_filename,"session.xw");
-	      console_changed=0;
-	      save_session(contextptr);
-	      if (edptr){
-		edptr->elements.resize(1);
-		edptr->elements[0].s="";
-		edptr->undoelements=edptr->elements;
-		edptr->line=0;
-		edptr->pos=0;
-	      }
-	      save_script("session.py","");
-	    }
-	  }
-	  break;
-	}
-#if (defined MICROPY_LIB || defined QUICKJS) 
-	if (smallmenu.selection==13){
-	  double d=pythonjs_heap_size/1024;
-	  if (
-#ifdef NSPIRE_NEWLIB
-	      0 &&
-#endif
-	      inputdouble(
-#if defined NUMWORKS && defined DEVICE
-			  string("Tas MicroPy/JS en K (16-"+print_INT_(_heap_size/1024-52)+")?").c_str()
-#else
-			  "Tas MicroPy/JS en K (64-1728)?"
-#endif
-			  ,d,contextptr) && d==int(d) &&
-#if defined NUMWORKS && defined DEVICE
-	      d>=16 && d<=_heap_size/1024-52
-#else
-	      d>=64 && d<=1728
-#endif
-	      ){
-	    pythonjs_heap_size=d*1024;
-#ifdef MICROPY_LIB
-	    python_free();
-#endif
-#ifdef QUICKJS
-	    js_end(global_js_context);
-#endif
-	  }
-	  continue;
-	}
-	if (smallmenu.selection==14){
-	  continue;
-	  double d=pythonjs_stack_size/1024;
-	  if (inputdouble(
-#if defined NUMWORKS && defined DEVICE
-			  "Pile MicroPy/JS en K (8-20)?"
-#else
-			  "Pile MicroPy/JS en K (32-512)?"
-#endif
-			  ,d,contextptr) && d==int(d) &&
-#if defined NUMWORKS && defined DEVICE
-	      d>=8 && d<=20
-#else
-	      d>=32 && d<=512
-#endif
-	      ){
-	    pythonjs_stack_size=d*1024;
-#ifdef MICROPY_LIB
-	    python_free();
-#endif
-#ifdef QUICKJS
-	    js_end(global_js_context);
-#endif
-	  }
-	  continue;
-	}
-#endif // MICROPY_LIB
-	if (smallmenu.selection == 15){
-	  if (exam_mode)
-	    leave_exam_mode(contextptr);
-	  break;
-	}
-	if (smallmenu.selection >= 10) {
-	  textArea text;
-	  text.editable=false;
-	  text.clipline=-1;
-	  text.title = smallmenuitems[smallmenu.selection-1].text;
-	  add(&text,smallmenu.selection==10?((lang==1)?shortcuts_fr_string:shortcuts_en_string):((lang==1)?apropos_fr_string:apropos_en_string));
-	  if (doTextArea(&text,contextptr)==KEY_SHUTDOWN)
-	    return ;
-	  continue;
-	} 
-      }	
-    }      
-  }
-
-  void * console_malloc(unsigned s){
-    return new char [s];
-    // return malloc(s);
-  }
-
-  void console_free(void * ptr){
-    delete [] (char *) ptr;
-    // free(ptr);
-  }
-
-  void cleanup(std::string & s){
-    for (size_t i=0;i<s.size();++i){
-      if (s[i]=='\n')
-	s[i]=' ';
-    }
-  }
-
-  const int max_lines_saved=50;
-
-  int run(const char * s,int do_logo_graph_eqw,GIAC_CONTEXT){
-    if (strlen(s)>=2 && (s[0]=='#' ||
-			 (s[0]=='/' && (s[1]=='/' || s[1]=='*'))
-			 ))
-      return 0;
-    if (strcmp(s,"caseval(\"\")")==0 || strcmp(s,"eval_expr(\"\")")==0 || (strlen(s)>=4 && strlen(s)<6 && strncmp(s,"xcas",4)==0)){
-      xcas_python_eval=0;
-      int p=python_compat(contextptr);
-      python_compat(p>0?p&3:0,contextptr);
-      if (edptr)
-	edptr->python=p>0?p&3:0;
-#ifdef MICROPY_LIB
-      if (p==4 && do_confirm((lang==1)?"Effacer le tas MicroPython?":"Clear MicroPython heap?"))
-	python_free();
-#endif
-#ifdef QUICKJS
-      if (0 && p==-1 && do_confirm((lang==1)?"Effacer le tas QuickJS?":"Clear QuickJS heap?"))
-	js_end(global_js_context);
-#endif
-      *logptr(contextptr) << "Xcas interpreter\n";
-      Console_FMenu_Init(contextptr);
-      return 0;
-    }
-    gen g,ge;
-#ifdef QUICKJS
-    if (strlen(s)>=2 && strlen(s)<4 && strncmp(s,"js",2)==0){
-      switch_to_js(contextptr);
-      return 0;
-    }
-    if (xcas_python_eval==-1){
-      string S(s); 
-      if (S.size() && S[0]=='@')
-	S=S.substr(1,S.size()-1);
-      else
-	S="\"use math\";"+S;
-      S+='\n';
-      char * js=js_ck_eval(S.c_str(),&global_js_context);
-      if (js){
-	S=js;
-	free(js);
-	process_freeze();
-	update_js_vars();
-      }
-      else S="Error";
-      Console_Output(S.c_str());
-      return 0;
-    }
-#endif
-#ifdef MICROPY_LIB
-    if (strlen(s)>=6 && strlen(s)<8 && strncmp(s,"python",6)==0){
-      switch_to_micropy(contextptr);
-      return 0;
-    }
-    if (xcas_python_eval==1){
-      freezeturtle=false;
-      micropy_ck_eval(s);
-    }
-    else 
-      do_run(s,g,ge,contextptr);
-#else
-    do_run(s,g,ge,contextptr);
-#endif
-    process_freeze();
-#ifdef MICROPY_LIB
-    if (xcas_python_eval==1)
-      return 0;
-#endif
-#ifdef QUICKJS
-    if (xcas_python_eval==-1)
-      return 0;
-#endif
-    int t=giac::taille(g,GIAC_HISTORY_MAX_TAILLE);  
-    int te=giac::taille(ge,GIAC_HISTORY_MAX_TAILLE);
-    bool do_tex=false;
-    if (t<GIAC_HISTORY_MAX_TAILLE && te<GIAC_HISTORY_MAX_TAILLE){
-      giac::vecteur &vin=history_in(contextptr);
-      giac::vecteur &vout=history_out(contextptr);
-      if (vin.size()>GIAC_HISTORY_SIZE)
-	vin.erase(vin.begin());
-      vin.push_back(g);
-      if (vout.size()>GIAC_HISTORY_SIZE)
-	vout.erase(vout.begin());
-      vout.push_back(ge);
-    }
-    if (check_do_graph(ge,do_logo_graph_eqw,contextptr)==KEY_SHUTDOWN)
-      return KEY_SHUTDOWN;
-    string s_;
-    if (ge.type==giac::_STRNG)
-      s_='"'+*ge._STRNGptr+'"';
-    else {
-      if (te>256)
-	s_="Object too large";
-      else {
-	if (ge.is_symb_of_sommet(giac::at_pnt) || (ge.type==giac::_VECT && !ge._VECTptr->empty() && ge._VECTptr->back().is_symb_of_sommet(giac::at_pnt)))
-	  s_="Graphic object";
-	else {
-	  //do_tex=ge.type==giac::_SYMB && has_op(ge,*giac::at_inv);
-	  // tex support has been disabled!
-	  s_=ge.print(contextptr);
-	  // translate to tex? set do_tex to true
-	}
-      }
-    }
-#ifdef NUMWORKS
-    if (s_.size()>512)
-      s_=s_.substr(0,509)+"...";
-#else
-    if (s_.size()>8192)
-      s_=s_.substr(0,8189)+"...";
-#endif
-    char* edit_line = (char*)Console_GetEditLine();
-    Console_Output((const char*)s_.c_str());
-    return 0; 
-  }
-
-  int run_session(int start,GIAC_CONTEXT){
-    std::vector<std::string> v;
-    for (int i=start;i<Last_Line;++i){
-      if (Line[i].type==LINE_TYPE_INPUT)
-	v.push_back((const char *)Line[i].str);
-      console_free(Line[i].str);
-      Line[i].str=0;
-      Line[i].readonly = 0;
-      Line[i].type = LINE_TYPE_INPUT;
-      Line[i].start_col = 0;
-      Line[i].disp_len = 0;
-    }
-    Line[Last_Line].str=0;
-    Last_Line=start;
-    int savestartline=Start_Line;
-    Start_Line=Last_Line>LINE_DISP_MAX?Last_Line-LINE_DISP_MAX:0;
-    Cursor.x=0;
-    Cursor.y=start-Start_Line;
-    Line[start].str=Edit_Line;
-    Edit_Line[0]=0;
-    if (v.empty()) return 0;
-    //Console_Init(contextptr);
-    for (int i=0;i<v.size();++i){
-      Console_Output((const char *)v[i].c_str());
-      //int j=Last_Line;
-      Console_NewLine(LINE_TYPE_INPUT, 1);
-      // Line[j].type=LINE_TYPE_INPUT;
-      run(v[i].c_str(),6,contextptr); /* show logo and graph but not eqw */
-      // j=Last_Line;
-      Console_NewLine(LINE_TYPE_OUTPUT, 1);    
-      // Line[j].type=LINE_TYPE_OUTPUT;
-      Console_Disp(1,contextptr);
-      Bdisp_PutDisp_DD();
-    }
-    Cursor.y += (Start_Line-savestartline);
-    Start_Line=savestartline;
-    return 0;
-  }
-
-
-  string khicas_state(GIAC_CONTEXT){
-    giac::gen g(giac::_VARS(-1,contextptr)); 
-    int b=python_compat(contextptr);
-    python_compat(0,contextptr);
-#if 1
-#ifdef NSPIRE_NEWLIB
-    char *buf=nspire_filebuf;
-    buf[0]=0;
-    int bufsize=NSPIRE_FILEBUFFER;
-#else
-    char buf[6144]="";
-    int bufsize=sizeof(buf);
-#endif
-    if (g.type==giac::_VECT){
-      bool ok=true;
-      for (int i=0;i<g._VECTptr->size();++i){
-	string s((*g._VECTptr)[i].print(contextptr));
-	if (strlen(buf)+s.size()+128<bufsize){
-	  strcat(buf,s.c_str());
-	  strcat(buf,":;");
-	}
-	else
-	  ok=false;
-      }
-      if (!ok){
-	confirm((lang==1)?"Contexte trop lourd, non sauvegarde":"Context too havy, not saved.",(lang==1)?"Re-executez scripts au chargement (esc enter)":"Re-run scripts at load time (esc enter)",true,64);
-	buf[0]=0;
-      }
-    }
-    python_compat(b,contextptr);
-    if (strlen(buf)+184<bufsize){
-      strcat(buf,"python_compat(");
-      strcat(buf,giac::print_INT_(b).c_str());
-      strcat(buf,",");
-      strcat(buf,giac::print_INT_(pythonjs_heap_size).c_str());
-      strcat(buf,",");
-      strcat(buf,giac::print_INT_(pythonjs_stack_size).c_str());
-      strcat(buf,");angle_radian(");
-      strcat(buf,angle_radian(contextptr)?"1":"0");
-      strcat(buf,");with_sqrt(");
-      strcat(buf,withsqrt(contextptr)?"1":"0");
-      strcat(buf,");integer_format(");
-      strcat(buf,integer_format(contextptr)==16?"16":"10");
-      strcat(buf,");set_language(");
-      char l[]="0";
-      l[0]+=lang;
-      strcat(buf,l);
-      strcat(buf,");");
-    }
-    if (sheetptr){
-      string s(current_sheet(vecteur(0),contextptr).print(contextptr));
-      if (strlen(buf)+s.size()+20<bufsize){
-	strcat(buf,"current_sheet(");
-	strcat(buf,s.c_str());
-	strcat(buf,");");
-      }
-    }
-    return buf;
-#else
-    string s(g.print(contextptr));
-    python_compat(b,contextptr);
-    s += "; python_compat(";
-    s +=  giac::print_INT_(b);
-    s += ");angle_radian(";
-    s += angle_radian(contextptr)?'1':'0';
-    s += ");with_sqrt(";
-    s += withsqrt(contextptr)?'1':'0';
-    s += ");";
-    return s;
-#endif
-  }
-  void Bfile_WriteFile_OS(char * & buf,const void * ptr,size_t len){
-    memcpy(buf,ptr,len);
-    buf += len;
-  }
-  void Bfile_WriteFile_OS4(char * & buf,size_t n){
-    buf[0]= n>>24;
-    buf[1]= (n>>16) & 0xff;
-    buf[2]= (n & 0xffff)>>8;
-    buf[3]= n & 0xff;
-    buf += 4;
-  }
-  void Bfile_WriteFile_OS2(char * & buf,unsigned short n){
-    buf[0]= n>>8;
-    buf[1]= n & 0xff;
-    buf += 2;
-  }
-  void save_console_state_smem(const char * filename,bool xwaspy,GIAC_CONTEXT){
-    console_changed=0;
-    string state(khicas_state(contextptr));
-    int statesize=state.size();
-    string script;
-    if (edptr)
-      script=merge_area(edptr->elements);
-    int scriptsize=script.size();
-    // save format: line_size (2), start_col(2), line_type (1), readonly (1), line
-    int size=2*sizeof(int)+statesize+scriptsize;
-    int start_row=Last_Line-max_lines_saved; 
-    if (start_row<0) start_row=0;
-    for (int i=start_row;i<=Last_Line;++i){
-      size += 2*sizeof(short)+2*sizeof(char)+strlen((const char *)Line[i].str);
-    }
-    char savebuf[size+4];
-#ifdef NUMWORKS
-    char * hFile=savebuf+1;
-#else
-    char * hFile=savebuf;
-#endif
-    // save variables and modes
-    Bfile_WriteFile_OS4(hFile, statesize);
-    Bfile_WriteFile_OS(hFile, state.c_str(), statesize);
-    // save script
-    Bfile_WriteFile_OS4(hFile, scriptsize);
-    Bfile_WriteFile_OS(hFile, script.c_str(), scriptsize);
-    // save console state
-    // save console state
-    for (int i=start_row;i<=Last_Line;++i){
-      console_line & cur=Line[i];
-      unsigned short l=strlen((const char *)cur.str);
-      Bfile_WriteFile_OS2(hFile, l);
-      unsigned short s=cur.start_col;
-      Bfile_WriteFile_OS2(hFile, s);
-      unsigned char c=cur.type;
-      Bfile_WriteFile_OS(hFile, &c, sizeof(c));
-      c=1;//cur.readonly;
-      Bfile_WriteFile_OS(hFile, &c, sizeof(c));
-      unsigned char buf[l+1];
-      buf[l]=0;
-      strcpy((char *)buf,(const char*)cur.str); 
-      unsigned char *ptr=buf,*strend=ptr+l;
-      for (;ptr<strend;++ptr){
-	if (*ptr==0x9c)
-	  *ptr='\n';
-      }
-      Bfile_WriteFile_OS(hFile, buf, l);
-    }
-    char BUF[2]={0,0};
-    Bfile_WriteFile_OS(hFile, BUF, sizeof(BUF));
-#ifdef NUMWORKS
-    savebuf[0]=1;
-#endif
-    int len=hFile-savebuf;
-    if (
-#ifdef XWASPY
-	xwaspy && len<8192
-#else
-	0
-#endif
-	){
-      // save as an ascii file beginning with #xwaspy
-#ifdef NUMWORKS 
-      --len;
-      char * buf=savebuf+1;
-      int newlen=4*(len+2)/3+11; // 4/3 oldlen + 8(#swaspy\n) +1 + 2 for ending  zeros
-      char newbuf[newlen];
-      strcpy(newbuf,"##xwaspy\n");
-      newbuf[0]=1;
-      hFile=newbuf+9;
-#else
-      char * buf=savebuf;
-      int newlen=4*(len+2)/3+10;
-      char newbuf[newlen];
-      strcpy(newbuf,"#xwaspy\n");
-      hFile=newbuf+8;
-#endif
-      for (int i=0;i<len;i+=3,hFile+=4){
-	// keep space \n and a..z chars
-	char c;
-	while (i<len && ((c=buf[i])==' ' || c=='\n' || c=='{' || c==')' || c==';' || c==':' || c=='\n' || (c>='a' && c<='z')) ){
-	  if (c==')')
-	    c='}';
-	  if (c==':')
-	    c='~';
-	  if (c==';')
-	    c='|';
-	  *hFile=c;
-	  ++hFile;
-	  ++i;
-	}
-	unsigned char a=buf[i],b=i+1<len?buf[i+1]:0,C=i+2<len?buf[i+2]:0;
-	hFile[0]=xwaspy_shift+(a>>2);
-	hFile[1]=xwaspy_shift+(((a&3)<<4)|(b>>4));
-	hFile[2]=xwaspy_shift+(((b&0xf)<<2)|(C>>6));
-	hFile[3]=xwaspy_shift+(C&0x3f);
-      }
-      //*hFile=0; ++hFile; 
-      //*hFile=0; ++hFile; 
-      write_file(filename,newbuf,hFile-newbuf);
-    }
-    else {
-      write_file(filename,savebuf,len);
-    }
-  }
-
-  size_t Bfile_ReadFile_OS4(const char * & hf_){
-    const unsigned char * hf=(const unsigned char *)hf_;
-    size_t n=(((((hf[0]<<8)+hf[1])<<8)+hf[2])<<8)+hf[3];
-    hf_ += 4;
-    return n;
-  }
-
-  size_t Bfile_ReadFile_OS2(const char * & hf_){
-    const unsigned char * hf=(const unsigned char *)hf_;
-    size_t n=(hf[0]<<8)+hf[1];
-    hf_ += 2;
-    return n;
-  }
-
-  void Bfile_ReadFile_OS(const char * &hf,char * dest,size_t len){
-    memcpy(dest,hf,len);
-    hf += len;
-  }
-
-  bool load_console_state_smem(const char * filename,GIAC_CONTEXT){
-    const char * hf=read_file(filename);
-    //if (!hf){ console_output(filename,strlen(filename)); console_output(" not found\n",11); return true; }
-    // if (strcmp(filename,"session.xw")){ console_output(hf,8); return true; }
-    if (!hf) return false;
-    string str;
-    if (strncmp(hf,"#xwaspy\n",8)==0){
-      hf+=8;
-      const char * source=hf;
-      for (;*source;source+=4){
-	while (*source=='\n' || *source==' ' || (*source>='a' && *source<='~')){
-	  char c=*source;
-	  if (c=='}')
-	    c=')';
-	  if (c=='|')
-	    c=';';
-	  if (c=='~')
-	    c=':';
-	  str += c;
-	  ++source;
-	}
-	if (!*source)
-	  break;
-	unsigned char a=source[0]-xwaspy_shift,b=source[1]-xwaspy_shift,c=source[2]-xwaspy_shift,d=source[3]-xwaspy_shift;
-	str += (a<<2)|(b>>4);
-	str += (b<<4)|(c>>2);
-	str += (c<<6)|d;
-      }
-      hf=str.c_str();
-    }
-    size_t L=Bfile_ReadFile_OS4(hf);
-    char BUF[L+4];
-    BUF[1]=BUF[0]='/'; // avoid trying python compat.
-    BUF[2]='\n';
-    Bfile_ReadFile_OS(hf,BUF+3,L);
-    BUF[L+3]=0;
-    giac::gen g,ge;
-    dconsole_mode=0; python_compat(contextptr)=0; xcas_mode(contextptr)=0;
-    bool bi=try_parse_i(contextptr);
-    try_parse_i(false,contextptr);
-    do_run((char*)BUF,g,ge,contextptr);
-    try_parse_i(bi,contextptr);
-    dconsole_mode=1;
-    // read script
-    L=Bfile_ReadFile_OS4(hf);
-    if (L>0){
-      char bufscript[L+1];
-      Bfile_ReadFile_OS(hf,bufscript,L);
-      bufscript[L]=0;
-      if (edptr==0)
-	edptr=new textArea;
-      if (edptr){
-	edptr->elements.clear();
-	edptr->clipline=-1;
-	edptr->filename=remove_path(giac::remove_extension(filename))+".py";
-	//cout << "script " << edptr->filename << endl;
-	edptr->editable=true;
-	edptr->changed=false;
-	edptr->python=python_compat(contextptr);
-	edptr->elements.clear();
-	edptr->y=0;
-	add(edptr,bufscript);
-	edptr->line=0;
-	//edptr->line=edptr->elements.size()-1;
-	edptr->pos=0;
-      }    
-    }
-    // read console state
-    // insure parse messages are cleared
-    Console_Init(contextptr);
-    Console_Clear_EditLine();
-    for (int pos=0;;++pos){
-      unsigned short int l,curs;
-      unsigned char type,readonly;
-      if ( (l=Bfile_ReadFile_OS2(hf))==0) break;
-      curs=Bfile_ReadFile_OS2(hf);
-      type = *hf; ++hf;
-      readonly=*hf; ++hf;
-      char buf[l+1];
-      Bfile_ReadFile_OS(hf,buf,l);
-      buf[l]=0;
-      // ok line ready in buf
-      while (Line[Current_Line].readonly)
-	Console_MoveCursor(CURSOR_DOWN);
-      Console_Input(buf);
-      Console_NewLine(LINE_TYPE_INPUT, 1);
-#if 1
-      if (Current_Line>0){
-	console_line & cur=Line[Current_Line-1];
-	cur.type=type;
-	cur.readonly=readonly;
-	cur.start_col+=curs;
-      }
-#endif
-    }
-    console_changed=0;
-    int p=python_compat(contextptr);
-    if (p>=0 && p&4){
-      xcas_python_eval=1;
-      if (edptr){
-	check_parse(edptr,edptr->elements,python_compat(contextptr),contextptr);
-      }
-    }
-    else
-      xcas_python_eval=p<0?-1:0;
-    if (p==-1){
-      //js_ck_eval("1",&global_js_context);
-      if (edptr)
-	check_parse(edptr,edptr->elements,-1,contextptr);
-    }
-    Console_FMenu_Init(contextptr); // insure the menus are sync-ed
-    return true;
-  }
-
-  /*
-
-    The following functions will be used to specify the location before deleting a string of n characters altogether. Among them, a wide character (2 bytes) will be counted as a character.
-	
-    For example, we have the following string str:
-	
-    Location  |  0  |  1  |  2  |  3  |  4  |  5  | 6 |
-    Character | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 0 |
-
-    After the call Console_DelStr (str, 3, 2), position 1 and 2 characters will be deleted, then the characters will be in advance.
-	
-    Results are as follows:
-
-    Location  |  0  |  1  |  2  |  3  | 4 |  5  | 6 |
-    Character | 'a' | 'd' | 'e' | 'f' | 0 | 'f' | 0 |
-
-    (Note: the extra positions will not be filled with '\ 0', but '\ 0' will be a copy of the original end of the string.)
-
-  */
-
-  int Console_DelStr(char *str, int end_pos, int n)
-  {
-    int str_len, actual_end_pos, start_pos, actual_start_pos, del_len, i;
-
-    str_len = strlen((const char *)str);
-    if ((start_pos = end_pos - n) < 0) return CONSOLE_ARG_ERR;
-
-    if ((actual_end_pos = Console_GetActualPos(str, end_pos)) == CONSOLE_ARG_ERR) return CONSOLE_ARG_ERR;
-    if ((actual_start_pos = Console_GetActualPos(str, start_pos)) == CONSOLE_ARG_ERR) return CONSOLE_ARG_ERR;
-
-    del_len = actual_end_pos - actual_start_pos;
-
-    for (i = actual_start_pos; i < str_len; i++)
-      {
-	str[i] = str[i + del_len];
-      }
-
-    return CONSOLE_SUCCEEDED;
-  }
-
-  /*
-
-    The following functions are used to specify the location of the insertion in the specified string.
-    (Note: This refers to the position of the printing position when, rather than the actual position.)
-  */
-
-  int Console_InsStr(char *dest, const char *src, int disp_pos)
-  {
-    int i, ins_len, str_len, actual_pos;
-
-    ins_len = strlen((const char *)src);
-    str_len = strlen((const char *)dest);
-
-    actual_pos = Console_GetActualPos(dest, disp_pos);
-
-    if (ins_len + str_len >= EDIT_LINE_MAX) return CONSOLE_MEM_ERR;
-    if (actual_pos > str_len) return CONSOLE_ARG_ERR;
-
-    for (i = str_len; i >= actual_pos; i--)
-      {
-	dest[i + ins_len] = dest[i];
-      }
-
-    for (i = 0; i < ins_len; i++)
-      {
-	char c=src[i];
-	if (c=='\n') c=0x9c;
-	dest[actual_pos + i] = (c==0x0a?' ':c);
-      }
-
-    return CONSOLE_SUCCEEDED;
-  }
-
-  /*
-
-    The following function is used to determine the true position of the string corresponding to the printing position.
-    For example, in the following this string str contains wide characters, the location of the print is as follows:
-
-    Location  | 00  |  01 |   02  |  03  | 04   | 05  | 06  |
-    Character | one | two | three | four | five | six | \ 0 |
-
-    The actual storage location is as follows:
-
-    Location | 	00  | 01   |  02  |  03  |  04  |  05  |  06  |  07  |  08  |  09  |  10  |  11  |
-    Value 	 | 0xD2 | 0xBB | 0xB6 | 0xFE | 0xC8 | 0xFD | 0xCB | 0xC4 | 0xCE | 0xE5 | 0xC1 | 0xF9 |
-
-    You can find the first four characters 'five' is actually stored in the eighth position.
-    So, when you call Console_GetActualPos (str, 4), it will return 8.
-  */
-
-  int Console_GetActualPos(const char *str, int disp_pos)
-  {
-    int actual_pos, count;
-
-    for (actual_pos = count = 0; count < disp_pos; count++)
-      {
-	if (str[actual_pos] == '\0') return CONSOLE_ARG_ERR;
-
-	if (is_wchar(str[actual_pos]))
-	  {
-	    actual_pos += 2;
-	  }
-	else
-	  {
-	    actual_pos++;
-	  }
-      }
-
-    return actual_pos;
-  }
-
-  /*
-    The following functions are used to obtain a string of print length, ie, a wide character (2 bytes) recorded as a character.
-  */
-
-  int Console_GetDispLen(const char *str)
-  {
-    int i, len;
-
-    for (i = len = 0; str[i]!='\0'; len++)
-      {
-	if (is_wchar(str[i]))
-	  {
-	    i += 2;
-	  }
-	else
-	  {
-	    i++;
-	  }
-      }
-
-    return len;
-  }
-
-  /*
-    The following functions are used to move the cursor.
-  */
-
-  int Console_MoveCursor(int direction)
-  {
-    switch (direction)
-      {
-      case CURSOR_UP:
-	if (Current_Line==Last_Line)
-	  editline_cursor=Cursor.x;
-	//If you need to operate.
-	if ((Cursor.y > 0) || (Start_Line > 0)){
-	  //If the current line is not read-only, then Edit_Line copy to the current line.
-	  if (!Line[Current_Line].readonly){
-	    if ((Line[Current_Line].str = (char *)console_malloc(strlen((const char *)Edit_Line) + 1)) == NULL) return CONSOLE_MEM_ERR;
-	    strcpy((char *)Line[Current_Line].str, (const char *)Edit_Line);
-	    Line[Current_Line].disp_len = Console_GetDispLen(Line[Current_Line].str);
-	    Line[Current_Line].type = LINE_TYPE_INPUT;
-	  }
-	  //If the cursor does not move to the top of, directly move the cursor upward.
-	  if (Cursor.y > 0)
-	    Cursor.y--;
-	  //Otherwise, the number of rows, if the screen's first line is not the first line, then began to show minus one.
-	  else {
-	    if (Start_Line > 0)
-	      Start_Line--;
-	  }
-	  //End if the horizontal position after moving the cursor over the line, then move the cursor to the end of the line.
-	  if (Cursor.x > Line[Current_Line].disp_len){
-	    Cursor.x = Line[Current_Line].disp_len;
-	  }
-	  else {
-	    if (Line[Current_Line].disp_len - Line[Current_Line].start_col > COL_DISP_MAX){
-	      if (Cursor.x == COL_DISP_MAX)
-		Cursor.x = COL_DISP_MAX - 1;
-	    }
-	  }
-	  //If you move the cursor to the line after the first, and the front of the line there is a character does not appear, then move the cursor to position 1.
-	  if (Cursor.x == 0 && Line[Current_Line].start_col > 0)
-	    Cursor.x = 1;
-	  //If the current cursor line is not read-only, then it is a string copy to Edit_Line for editing.
-	  if (!Line[Current_Line].readonly && Line[Current_Line].str){
-	    strcpy((char *)Edit_Line, (const char *)Line[Current_Line].str);
-	    console_free(Line[Current_Line].str);
-	    Line[Current_Line].str = Edit_Line;
-	  }
-	}
-	break;
-      case CURSOR_ALPHA_UP:{
-	int pos1=Start_Line+Cursor.y;
-	Console_MoveCursor(CURSOR_UP);
-	int pos2=Start_Line+Cursor.y;
-	if (pos1<Last_Line && pos2<Last_Line && pos1!=pos2){
-	  console_line curline=Line[pos1];
-	  Line[pos1]=Line[pos2];
-	  Line[pos2]=curline;
-	}
-	break;
-      }
-      case CURSOR_ALPHA_DOWN: {
-	int pos1=Start_Line+Cursor.y;
-	Console_MoveCursor(CURSOR_DOWN);
-	int pos2=Start_Line+Cursor.y;
-	if (pos1<Last_Line && pos2<Last_Line && pos1!=pos2){
-	  console_line curline=Line[pos1];
-	  Line[pos1]=Line[pos2];
-	  Line[pos2]=curline;
-	}
-	break;
-      }
-      case CURSOR_DOWN:
-	if (Current_Line==Last_Line)
-	  editline_cursor=Cursor.x;
-	//If you need to operate.
-	if ((Cursor.y < LINE_DISP_MAX - 1) && (Current_Line < Last_Line) || (Start_Line + LINE_DISP_MAX - 1 < Last_Line))
-	  {
-	    //If the current line is not read-only, then Edit_Line copy to the current line.
-	    if (!Line[Current_Line].readonly)
-	      {
-		if ((Line[Current_Line].str = (char *)console_malloc(strlen((const char *)Edit_Line) + 1)) == NULL) return CONSOLE_MEM_ERR;
-		strcpy((char *)Line[Current_Line].str, (const char *)Edit_Line);
-		Line[Current_Line].disp_len = Console_GetDispLen(Line[Current_Line].str);
-		Line[Current_Line].type = LINE_TYPE_INPUT;
-	      }
-
-	    //If the cursor does not move to the bottom, the cursor moves down directly.
-	    if (Cursor.y < LINE_DISP_MAX - 1 && Current_Line < Last_Line)
-	      {
-		Cursor.y++;
-	      }
-	    //The number of rows Otherwise, if the last line is not the last line on the screen, it will begin to show a plus.
-	    else if (Start_Line + LINE_DISP_MAX - 1 < Last_Line)
-	      {
-		Start_Line++;
-	      }
-
-	    //If you move the cursor after the end of the horizontal position over the line, then move the cursor to the end of the line.
-	    if (Cursor.x > Line[Current_Line].disp_len)
-	      {
-		Cursor.x = Line[Current_Line].disp_len;
-	      }
-	    else if (Line[Current_Line].disp_len - Line[Current_Line].start_col >= COL_DISP_MAX)
-	      {
-		if (Cursor.x == COL_DISP_MAX) Cursor.x = COL_DISP_MAX - 1;
-	      }
-
-	    //If you move the cursor to the line after the first, and the front of the line there is a character does not appear, then move the cursor to position 1.
-	    if (Cursor.x == 0 && Line[Current_Line].start_col > 0) Cursor.x = 1;
-
-	    //If the current cursor line is not read-only, then it is a string copy to Edit_Line for editing.
-	    if (!Line[Current_Line].readonly && Line[Current_Line].str)
-	      {
-		strcpy((char *)Edit_Line, (const char *)Line[Current_Line].str);
-		console_free(Line[Current_Line].str);
-		Line[Current_Line].str = Edit_Line;
-	      }
-	  }
-	break;
-      case CURSOR_LEFT:
-	if (Line[Current_Line].readonly){
-	  if (Line[Current_Line].start_col > 0){
-	    Line[Current_Line].start_col--;
-	  }
-	  break;
-	}
-	else {
-	  if (Line[Current_Line].start_col > 0){
-	    if (Cursor.x > 1)
-	      Cursor.x--;
-	    else {
-	      int dx=COL_DISP_MAX/3;
-	      if (Line[Current_Line].start_col>=dx){
-		Line[Current_Line].start_col-=dx;
-		Cursor.x += dx-1;
-	      } else
-		Line[Current_Line].start_col--;
-	    }
-	    break;
-	  }
-	  if (Cursor.x > 0){
-	    Cursor.x--;
-	    break;
-	  }
-	}
-      case CURSOR_SHIFT_RIGHT:
-	if (!Line[Current_Line].readonly)
-	  Cursor.x=giacmin(Line[Current_Line].disp_len,COL_DISP_MAX);
-	if (Line[Current_Line].disp_len > COL_DISP_MAX)
-	  Line[Current_Line].start_col = Line[Current_Line].disp_len - COL_DISP_MAX;
-	break;
-      case CURSOR_RIGHT:
-	if (Line[Current_Line].readonly){
-	  if (Line[Current_Line].disp_len - Line[Current_Line].start_col > COL_DISP_MAX){
-	    Line[Current_Line].start_col++;
-	  }
-	  break;
-	}
-	else {
-	  if (Line[Current_Line].disp_len - Line[Current_Line].start_col > COL_DISP_MAX){
-	    if (Cursor.x < COL_DISP_MAX - 1)
-	      Cursor.x++;
-	    else {
-	      int dx=COL_DISP_MAX/3;
-	      if (dx>Cursor.x)
-		dx=Cursor.x;
-	      Line[Current_Line].start_col+=dx;
-	      Cursor.x -= (dx-1);
-	    }
-	    break;	  
-	  }
-	  if (Cursor.x < Line[Current_Line].disp_len - Line[Current_Line].start_col){
-	    Cursor.x++;
-	    break;
-	  }
-	}
-      case CURSOR_SHIFT_LEFT:
-	if (!Line[Current_Line].readonly)
-	  Cursor.x=0;
-	Line[Current_Line].start_col=0;
-	break;
-      default:
-	return CONSOLE_ARG_ERR;
-	break;
-      }
-    return CONSOLE_SUCCEEDED;
-  }
-
-  /*
-    The following function is used for input.
-    String input to the cursor, the cursor will automatically move.
-  */
-
-  int Console_Input(const char *str)
-  {
-    console_changed=1;
-    int old_len,i,return_val;
-
-    if (!Line[Current_Line].readonly)
-      {
-	old_len = Line[Current_Line].disp_len;
-	return_val = Console_InsStr(Edit_Line, str, Current_Col);
-	if (return_val != CONSOLE_SUCCEEDED) return return_val;
-	if ((Line[Current_Line].disp_len = Console_GetDispLen(Edit_Line)) == CONSOLE_ARG_ERR) return CONSOLE_ARG_ERR;
-	for (i = 0; i < Line[Current_Line].disp_len - old_len; i++)
-	  {
-	    Console_MoveCursor(CURSOR_RIGHT);
-	  }
-	return CONSOLE_SUCCEEDED;
-      }
-    else
-      {
-	return CONSOLE_ARG_ERR;
-      }
-  }
-
-  /*
-    The following functions are used to output the string to the current line.
-  */
-
-  int Console_Output(const char *str)  {
-    if (!Line) return 0;
-    console_changed=1;
-    int return_val, old_len, i;
-
-    if (!Line[Current_Line].readonly)
-      {
-	old_len = Line[Current_Line].disp_len;
-
-	return_val = Console_InsStr(Edit_Line, str, Current_Col);
-	if (return_val != CONSOLE_SUCCEEDED) return return_val;
-	if ((Line[Current_Line].disp_len = Console_GetDispLen(Edit_Line)) == CONSOLE_ARG_ERR) return CONSOLE_ARG_ERR;
-	Line[Current_Line].type = LINE_TYPE_OUTPUT;
-
-	for (i = 0; i < Line[Current_Line].disp_len - old_len; i++)
-	  {
-	    Console_MoveCursor(CURSOR_RIGHT);
-	  }
-	return CONSOLE_SUCCEEDED;
-      }
-    else
-      {
-	return CONSOLE_ARG_ERR;
-      }
-  }
-
-  void dConsolePut(const char * S){
-    if (!dconsole_mode)
-      return;
-    int l=strlen(S);
-    char s[l+1];
-    strcpy(s,S);
-    for (int i=0;i<l;++i){
-      if (s[i]=='\n' ||
-	  s[i]==10)
-	s[i]=' ';
-    }
-    Console_Output((const char *)s);
-    if (l && S[l-1]=='\n'){
-      Console_NewLine(LINE_TYPE_OUTPUT, 1);
-      if (!freeze)
-	Console_Disp(1,0);
-    }
-  }
-
-  void dPuts(const char * s){
-    dConsolePut(s);
-  }
-
-#define PUTCHAR_LEN 35
-  static char putchar_buf[PUTCHAR_LEN+2];
-  static int putchar_pos=0;
-  void dConsolePutChar(const char ch){
-    if (!dconsole_mode)
-      return;
-    if (putchar_pos==PUTCHAR_LEN)
-      dConsolePutChar('\n');
-    if (ch=='\n'){
-      putchar_buf[putchar_pos]='\n';
-      putchar_buf[putchar_pos+1]=0;
-      putchar_pos=0;
-      dConsolePut(putchar_buf);
-    }
-    else {
-      putchar_buf[putchar_pos]=ch;
-      ++putchar_pos;
-    }
-  }
-
-  /*
-    Clear the current output line
-  */
-
-  void Console_Clear_EditLine()
-  {
-    if(!Line[Current_Line].readonly) {
-      Edit_Line[0] = '\0';
-      Line[Current_Line].start_col = 0;
-      Line[Current_Line].disp_len = 0;
-      Cursor.x = 0;
-    }
-  }
-
-  /*
-
-    The following functions are used to create a new line.
-    Pre_line_type type parameter is used to specify the line, pre_line_readonly parameter is used to specify the line is read-only.
-    New_line_type parameter is used to specify the type of the next line, new_line_readonly parameter is used to specify the next line is read-only.
-  */
-
-  int Console_NewLine(int pre_line_type, int pre_line_readonly)
-  {
-    if (!Line) return 0;
-    console_changed=1;
-    int i;
-
-    if (strlen((const char *)Edit_Line)||Line[Current_Line].type==LINE_TYPE_OUTPUT)
-      {
-	//Èç¹ûÒѾ­ÊÇËùÄÜ´æ´¢µÄ×îºóÒ»��£¬Ôòɾ³ýµÚÒ»��¡£
-	//If this is the last line we can store, delete the first line.
-	if (Last_Line == _LINE_MAX - 1)
-	  {
-	    for (i = 0; i < Last_Line; i++)
-	      {
-		Line[i].disp_len = Line[i + 1].disp_len;
-		Line[i].readonly = Line[i + 1].readonly;
-		Line[i].start_col = Line[i + 1].start_col;
-		Line[i].str = Line[i + 1].str;
-		Line[i].type = Line[i + 1].type;
-	      }
-	    Last_Line--;
-
-	    if (Start_Line > 0) Start_Line--;
-	  }
-
-	if (Line[Last_Line].type == LINE_TYPE_OUTPUT && strlen((const char *)Edit_Line) == 0) Console_Output((const char *)"Done");
-
-	//Edit_Line copy the contents to the last line.
-
-	if ((Line[Last_Line].str = (char *)console_malloc(strlen((const char *)Edit_Line) + 1)) == NULL) return CONSOLE_MEM_ERR;
-	strcpy((char *)Line[Last_Line].str, (const char *)Edit_Line);
-
-	if ((Line[Last_Line].disp_len = Console_GetDispLen(Line[Last_Line].str)) == CONSOLE_ARG_ERR) return CONSOLE_ARG_ERR;
-	Line[Last_Line].type = pre_line_type;
-	Line[Last_Line].readonly = pre_line_readonly;
-	Line[Last_Line].start_col = 0;
-
-	Edit_Line[0] = '\0';
-
-	Last_Line++;
-
-	Cursor.x = 0;
-
-	if ((Last_Line - Start_Line) == LINE_DISP_MAX)
-	  {
-	    Start_Line++;
-	  }
-	else
-	  {
-	    Cursor.y++;
-	  }
-
-	Line[Last_Line].str = Edit_Line;
-	Line[Last_Line].readonly = 0;
-	Line[Last_Line].type = LINE_TYPE_INPUT;
-	Line[Last_Line].start_col = 0;
-	Line[Last_Line].disp_len = 0;
-
-	return CONSOLE_NEW_LINE_SET;
-      }
-    else
-      {
-	return CONSOLE_NO_EVENT;
-      }
-  }
-
-  void Console_Insert_Line(){
-    if (Last_Line>=_LINE_MAX-1)
-      return;
-    for (int i=Last_Line;i>=Current_Line;--i){
-      Line[i+1]=Line[i];
-    }
-    ++Last_Line;
-    int i=Current_Line;
-    console_line & l=Line[i];
-    l.str=(char *)console_malloc(2);
-    strcpy((char *)l.str,"0");
-    l.type=Line[i+1].type==LINE_TYPE_INPUT?LINE_TYPE_OUTPUT:LINE_TYPE_INPUT;
-    l.start_col=0;
-    l.readonly=1;
-    l.disp_len=Console_GetDispLen(l.str);
-  }
-
-  /*
-    The following function is used to delete a character before the cursor.
-  */
-
-  int Console_Backspace(GIAC_CONTEXT){
-    console_changed=1;
-    if (Last_Line>0 && Current_Line<Last_Line){
-      int i=Current_Line;
-      if (Edit_Line==Line[i].str)
-	Edit_Line=Line[i+1].str;
-      if (Line[i].str){
-	copy_clipboard((const char *)Line[i].str,true);
-	console_free(Line[i].str);
-      }
-      for (;i<Last_Line;++i){
-	Line[i]=Line[i+1];
-      }
-      Line[i].readonly = 0;
-      Line[i].type = LINE_TYPE_INPUT;
-      Line[i].start_col = 0;
-      Line[i].disp_len = 0;
-      Line[i].str=0;
-      --Last_Line;
-      if (Start_Line>0)
-	--Start_Line;
-      else {
-	if (Cursor.y>0)
-	  --Cursor.y;
-      }
-#if 1
-      if (Last_Line==0 && Current_Line==0){ // workaround
-	char buf[strlen((const char*)Edit_Line)+1];
-	strcpy(buf,(const char*)Edit_Line);
-	Console_Init(contextptr);
-	Console_Clear_EditLine();
-	if (buf[0])
-	  Console_Input((const char *)buf);
-	//std::string status(giac::print_INT_(Last_Line)+" "+(giac::print_INT_(Current_Line)+" ")+giac::print_INT_(Line[Current_Line].str)+" "+(const char*)Line[Current_Line].str);
-	//DefineStatusMessage(status.c_str(),1,0,0);
-	//DisplayStatusArea();
-      }
-#endif
-      Console_Disp(1,0);
-      return CONSOLE_SUCCEEDED;
-    }
-    int return_val;
-    return_val = Console_DelStr(Edit_Line, Current_Col, 1);
-    if (return_val != CONSOLE_SUCCEEDED) return return_val;
-    Line[Current_Line].disp_len = Console_GetDispLen(Edit_Line);
-    return Console_MoveCursor(CURSOR_LEFT);
-  }
-
-  /*
-    The following functions are used to deal with the key.
-  */
-
-  void chk_clearscreen(GIAC_CONTEXT){
-    drawRectangle(0, 24, LCD_WIDTH_PX, LCD_HEIGHT_PX-24, COLOR_WHITE);
-    if (confirm((lang==1)?"Effacer l'historique?":"Clear history?",
-#ifdef NSPIRE_NEWLIB
-		(lang==1)?"enter: oui, esc: conserver":"enter: yes, esc: keep",
-#else
-		(lang==1)?"OK: oui, Back: conserver":"OK: yes, Back: keep",
-#endif
-		false)==KEY_CTRL_F1){
-      Console_Init(contextptr);
-      Console_Clear_EditLine();
-    }    
-    Console_Disp(1,0);
-  }
-
-
-  /*
-    int handle_f5(){
-    int keyflag = GetSetupSetting( (unsigned int)0x14);
-    if (keyflag == 0x04 || keyflag == 0x08 || keyflag == 0x84 || keyflag == 0x88) {
-    // ^only applies if some sort of alpha (not locked) is already on
-    if (keyflag == 0x08 || keyflag == 0x88) { //if lowercase
-    SetSetupSetting( (unsigned int)0x14, keyflag-0x04);
-    DisplayStatusArea();
-    return 1; //do not process the key, because otherwise we will leave alpha status
-    } else {
-    SetSetupSetting( (unsigned int)0x14, keyflag+0x04);
-    DisplayStatusArea();
-    return 1; //do not process the key, because otherwise we will leave alpha status
-    }
-    }
-    if (keyflag==0) {
-    SetSetupSetting( (unsigned int)0x14, 0x88);	
-    DisplayStatusArea();
-    }
-    return 0;
-    }
-  */
-
-  int Console_Eval(const char * buf,GIAC_CONTEXT){
-    int start=Current_Line;
-    console_free(Line[start].str);
-    Line[start].str=(char *)console_malloc(strlen(buf)+1);
-    strcpy((char *)Line[start].str,buf);
-    run_session(start,contextptr);
-    int move_line = Last_Line - start;
-    for (int i = 0; i < move_line; i++)
-      Console_MoveCursor(CURSOR_UP);
-    return CONSOLE_SUCCEEDED;
-  }
-
-
-  void save(const char * fname,GIAC_CONTEXT){
-    if (nspire_exam_mode==2)
-      return;
-    clear_abort();
-#if 0
-    return;
-#else
-    string filename(remove_path(remove_extension(fname)));
-#if defined NUMWORKS && defined XWASPY
-    bool xwaspy=filename!="session"; // xw will be saved as a fake .py file
-#else
-    bool xwaspy=false;
-#endif
-    if (xwaspy){
-      if (filename.size()>3 && filename.substr(filename.size()-3,3)=="_xw")
-	filename += ".py";
-      else
-	filename += "_xw.py";
-    }
-    else
-      filename+=".xw";
-#ifdef NSPIRE_NEWLIB
-    filename+=".tns";
-#endif
-    save_console_state_smem(filename.c_str(),xwaspy,contextptr); // call before save_khicas_symbols_smem(), because this calls create_data_folder if necessary!
-    // save_khicas_symbols_smem(("\\\\fls0\\"+filename+".xw").c_str());
-    if (edptr)
-      check_leave(edptr);
-#endif
-  }
-
-  int restore_script(string &filename,bool msg,GIAC_CONTEXT){
-    // it's not a session, but a script, restore last session settings and load script
-#ifdef NSPIRE_NEWLIB
-    const char sessionname[]="session.xw.tns";
-#else
-    const char sessionname[]="session.xw";
-#endif 
-    if (file_exists(sessionname)){
-      load_console_state_smem(sessionname,contextptr);
-      Console_Init(contextptr);
-      Console_Clear_EditLine();
-    }
-    else python_compat(1,contextptr);
-    //return 1;
-    string s;
-    filename=remove_path(remove_extension(filename));
-    if (msg && filename!="session"){
-      *logptr(contextptr) << (lang==1?"shift ) 8 ou python/xcas pour changer d'interpreteur\n":"shift ) 8 or python/xcas to change interpreter\n");
-      *logptr(contextptr) << (lang==1?"Taper esc pour editeur ou avec Micropython executez\n":"Press esc for editor or in MicroPython exec\n");
-      *logptr(contextptr) << "from "+filename+" import *\n";
-    }
-#ifdef NSPIRE_NEWLIB
-    filename += ".py.tns";
-#else
-    filename += ".py";
-#endif
-    load_script(filename.c_str(),s);
-    if (s.empty())
-      s="\n";
-    if (edptr==0)
-      edptr=new textArea;
-    edptr->filename=filename;
-    edptr->editable=true;
-    edptr->changed=false;
-    edptr->python=python_compat(contextptr);
-    edptr->elements.clear();
-    edptr->y=7;
-    add(edptr,s);
-    edptr->line=0;
-    edptr->pos=0;
-    return 2;
-  }
-#if defined NUMWORKS && defined DEVICE
-  void numworks_certify_internal(){
-    // check internal flash sha256 signature
-    size_t internal_flash_start=0x08000000;
-    if (bootloader_sha256_check(internal_flash_start)){
-      confirm(lang==1?"Amorcage calculatrice certifie!":"Boot sector certified!",lang==1?"Acces amorcage par Power ln":"Access boot with Power ln");
-      Bdisp_AllClr_VRAM();
-      return;
-    }
-    PrintMini(0,0,lang==1?"Amorcage non certifie.":"Boot sector not certified.",TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-    std::vector<fileinfo_t> v=tar_fileinfo(flash_buf,0);
-    int i=0;
-    for (;i<v.size();++i){
-      fileinfo_t & f=v[i];
-      if (f.filename=="bootloader.bin" && f.size==bootloader_size)
-	break;
-    }
-    // check file content signature
-    unsigned romaddr=((unsigned) flash_buf) +v[i].header_offset+0x200;
-    if (i<v.size() && !bootloader_sha256_check(romaddr))
-      i=v.size();
-    if (i==v.size()){
-      PrintMini(0,18,lang==1?"Pour mettre a jour:":"Please upgrade from:",TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-      PrintMini(0,36,"www-fourier.univ-grenoble-alpes.fr",TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-      PrintMini(0,54,"/~parisse/nw",TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-      int key; GetKey(&key);
-    }
-    else {
-      if (confirm(lang==1?"Mise a jour de l'amorcage ?":"Update bootsector?","OK/Annul.")==KEY_CTRL_F1){
-	// sector size=16K -> erase 4 sector for 64K
-	erase_sector((const char *) internal_flash_start);
-	erase_sector((const char *) (internal_flash_start+16*1024));
-	erase_sector((const char *) (internal_flash_start+32*1024));
-	erase_sector((const char *) (internal_flash_start+48*1024));
-	WriteMemory((char *)internal_flash_start,(const char *) romaddr,bootloader_size);
-	confirm(lang==1?"Mise a jour faite":"Update done",lang==1?"Acces amorcage par Power ln":"Access boot with Power ln");
-      }
-    }
-    Bdisp_AllClr_VRAM();
-  }
-  				   
-  int restore_session(const char * fname,GIAC_CONTEXT){
-    // cout << "0" << fname << endl; Console_Disp(1); GetKey(&key);
-    string filename(remove_path(remove_extension(fname)));
-#ifdef NSPIRE_NEWLIB
-    if (file_exists((filename+".xw.tns").c_str()))
-      filename += ".xw.tns";
-    else
-      filename += ".py.tns";
-#else
-    if (file_exists((filename+".xw").c_str()))
-      filename += ".xw";
-    else
-      filename += ".py";
-#endif
-    if (!load_console_state_smem(filename.c_str(),contextptr)){
-      if (confirm("OK: Francais, Back: English","set_language(1|0)")==KEY_CTRL_F6)
-	lang=0;
-      numworks_certify_internal();
-      Bdisp_AllClr_VRAM();
-      int x=0,y=0;
-      PrintMini(x,y,"KhiCAS 1.7 (c) 2022 B. Parisse",TEXT_MODE_NORMAL, COLOR_BLACK, COLOR_WHITE);
-      y +=18;
-      PrintMini(x,y,"et al, License GPL 2",TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-      y += 18;
-#ifdef NSPIRE_NEWLIB
-      PrintMini(x,y,((lang==1)?"Taper menu plusieurs fois":"Type menu several times"),TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-#else
-      PrintMini(x,y,((lang==1)?"Taper HOME plusieurs fois":"Type HOME several times"),TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-#endif
-      y += 18;
-      PrintMini(x,y,((lang==1)?"pour quitter KhiCAS.":"to leave KhiCAS."),TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-      y += 18;
-      PrintMini(x,y,(lang==1)?"Si le calcul formel est interdit":"If CAS is forbidden!",TEXT_MODE_NORMAL, COLOR_RED, COLOR_WHITE);
-      y += 18;
-#ifdef NSPIRE_NEWLIB
-      PrintMini(x,y,(lang==1)?"quittez Khicas (menu menu menu)":"Leave Khicas (menu menu menu)",TEXT_MODE_NORMAL, COLOR_RED, COLOR_WHITE);
-      if (confirm("Interpreter? enter: Xcas, esc: MicroPython",(lang==1?"Peut se modifier depuis menu configuration":"May be changed later from menu configuration"),false,130)==KEY_CTRL_F6){
-	python_compat(4,contextptr);
-	xcas_python_eval=1;
-	*logptr(contextptr) << "Micropython interpreter\n";
-	Console_FMenu_Init(contextptr);
-      }
-      else {
-	python_compat(1,contextptr);
-	*logptr(contextptr) << "Xcas interpreter, Python compatible mode\n";
-      }
-#else
-      PrintMini(x,y,(lang==1)?"quittez Khicas (HOME HOME HOME)":"Leave Khicas (HOME HOME HOME)",TEXT_MODE_NORMAL, COLOR_RED, COLOR_WHITE);
-      if (confirm("Interpreter? OK: Xcas, Back: MicroPython",(lang==1?"Peut se modifier depuis menu configuration":"May be changed later from menu configuration"),false,130)==KEY_CTRL_F6){
-	python_compat(4,contextptr);
-	xcas_python_eval=1;
-	*logptr(contextptr) << "Micropython interpreter\n";
-	Console_FMenu_Init(contextptr);
-      }
-      else {
-	python_compat(1,contextptr);
-	// fake lexer required to initialize color syntax
-	gen g("abs",contextptr);
-	*logptr(contextptr) << "Xcas interpreter, Python compatible mode\n";
-      }
-#endif
-#ifdef NUMWORKS
-      if (lang==1){
-	*logptr(contextptr) << "!!! ATTENTION !!!\n";
-	*logptr(contextptr) << "Ne faites pas de mises a jour\n";
-	*logptr(contextptr) << "depuis le site de Numworks.\n";
-	*logptr(contextptr) << "Cela verrouille la Numworks\n";
-	*logptr(contextptr) << "et empeche d'utiliser KhiCAS\n";
-      } else {
-	*logptr(contextptr) << "!!! BEWARE !!!\n";
-	*logptr(contextptr) << "Don't make upgrades\n";
-	*logptr(contextptr) << "from Numworks website\n";
-	*logptr(contextptr) << "They lock your calculator\n";
-	*logptr(contextptr) << "it's incompatible with KhiCAS\n";
-      }
-#endif
-      Bdisp_AllClr_VRAM();
-#ifdef GIAC_SHOWTIME
-      Console_Output("Reglage de l'heure, exemple");
-      Console_NewLine(LINE_TYPE_OUTPUT, 1);          
-      Console_Output("12,37=>,");
-      Console_NewLine(LINE_TYPE_OUTPUT, 1);
-#endif
-      //menu_about();
-      return 0;
-    }
-    return 1;
-  }
-
-#else
-
-  int restore_session(const char * fname,GIAC_CONTEXT){
-    // cout << "0" << fname << endl; Console_Disp(1); GetKey(&key);
-    string filename(fname); //filename="mandel.py.tns";
-    if (filename.size()>4 && filename.substr(filename.size()-4,4)==".tns")
-      filename=filename.substr(0,filename.size()-4);
-    if (filename.size()>3 && filename.substr(filename.size()-3,3)==".py"){
-      if (filename.size()<5 || filename.substr(filename.size()-5,5)!="xw.py")
-	return restore_script(filename,true,contextptr);
-    }
-    filename=remove_path(remove_extension(fname));
-#ifdef NSPIRE_NEWLIB
-    if (file_exists((filename+".xw.tns").c_str())){
-      strcpy(session_filename,filename.c_str());
-      filename += ".xw.tns";
-    }
-    else {
-      if (file_exists((filename+".py.tns").c_str()))
-	return restore_script(filename,true,contextptr);
-    }
-#else
-    if (file_exists((filename+".xw").c_str())){
-      strcpy(session_filename,filename.c_str());
-      filename += ".xw";
-    }
-    else {
-      if ((filename.size()<2 || filename.substr(filename.size()-2,2)!="xw") && file_exists((filename+".py").c_str()))
-	return restore_script(filename,true,contextptr);
-    }
-#endif
-    if (!load_console_state_smem(filename.c_str(),contextptr)){
-#ifdef NUMWORKS
-      if (confirm("OK: Francais, Back: English","set_language(1|0)")==KEY_CTRL_F6)
-	lang=0;
-      Bdisp_AllClr_VRAM();
-#endif
-      int x=0,y=0;
-      PrintMini(x,y,"KhiCAS 1.6 (c) 2020 B. Parisse",TEXT_MODE_NORMAL, COLOR_BLACK, COLOR_WHITE);
-      y +=18;
-      PrintMini(x,y,"et al, License GPL 2",TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-      y += 18;
-#ifdef NSPIRE_NEWLIB
-      PrintMini(x,y,((lang==1)?"Taper menu plusieurs fois":"Type menu several times"),TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-#else
-      PrintMini(x,y,((lang==1)?"Taper HOME plusieurs fois":"Type HOME several times"),TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-#endif
-      y += 18;
-      PrintMini(x,y,((lang==1)?"pour quitter KhiCAS.":"to leave KhiCAS."),TEXT_MODE_NORMAL,COLOR_BLACK, COLOR_WHITE);
-      y += 18;
-      PrintMini(x,y,(lang==1)?"Si le calcul formel est interdit":"If CAS is forbidden!",TEXT_MODE_NORMAL, COLOR_RED, COLOR_WHITE);
-      y += 18;
-#ifdef NSPIRE_NEWLIB
-      PrintMini(x,y,(lang==1)?"quittez Khicas (doc doc doc)":"Leave Khicas (doc doc doc)",TEXT_MODE_NORMAL, COLOR_RED, COLOR_WHITE);
-      if (confirm("Interpreter? enter: Xcas, esc: MicroPython",(lang==1?"Peut se modifier depuis menu configuration":"May be changed later from menu configuration"),false,130)==KEY_CTRL_F6){
-	python_compat(4,contextptr);
-	xcas_python_eval=1;
-	*logptr(contextptr) << "Micropython interpreter\n";
-	Console_FMenu_Init(contextptr);
-      }
-      else {
-	python_compat(1,contextptr);
-	*logptr(contextptr) << "Xcas interpreter, Python compatible mode\n";
-      }
-#else
-      PrintMini(x,y,(lang==1)?"quittez Khicas (HOME HOME HOME)":"Leave Khicas (HOME HOME HOME)",TEXT_MODE_NORMAL, COLOR_RED, COLOR_WHITE);
-      if (confirm("Interpreter? OK: Xcas, Back: MicroPython",(lang==1?"Peut se modifier depuis menu configuration":"May be changed later from menu configuration"),false,130)==KEY_CTRL_F6){
-	python_compat(4,contextptr);
-	xcas_python_eval=1;
-	*logptr(contextptr) << "Micropython interpreter\n";
-	Console_FMenu_Init(contextptr);
-      }
-      else {
-	python_compat(1,contextptr);
-	// fake lexer required to initialize color syntax
-	gen g("abs",contextptr);
-	*logptr(contextptr) << "Xcas interpreter, Python compatible mode\n";
-      }
-#endif
-      Bdisp_AllClr_VRAM();
-#if defined GIAC_SHOWTIME || defined NSPIRE_NEWLIB
-      Console_Output("Reglage de l'heure, exemple");
-      Console_NewLine(LINE_TYPE_OUTPUT, 1);          
-      Console_Output("12,37=>,");
-      Console_NewLine(LINE_TYPE_OUTPUT, 1);
-#endif
-      //menu_about();
-      return 0;
-    }
-    return 1;
-  }
-#endif
-
-  string extract_name(const char * s){
-    int l=strlen(s),i,j;
-    for (i=l-1;i>=0;--i){
-      if (s[i]=='.')
-	break;
-    }
-    if (i<=0)
-      return "f";
-    for (j=i-1;j>=0;--j){
-      if (s[j]=='\\')
-	break;
-    }
-    if (j<0)
-      return "f";
-    return string(s+j+1).substr(0,i-j-1);
-  }
-
-  // storage==0 (default) ram on numworks, ==1 flash on numworks, ==2 both on numworks, ignored on other calcs
-  int giac_filebrowser(char * filename,const char * extension,const char * title,int storage){
-    //storage=2; // debug
-    // char dbg[]="0\n"; dbg[0] += storage;   console_output(dbg,2);
-    const char * filenames[MAX_NUMBER_OF_FILENAMES+1];
-#if 1 // def XWASPY
-    int n,choix;
-    bool isxw=strcmp(extension,"xw")==0,ispy=strcmp(extension,"py")==0;
-    if (isxw || ispy){
-      n=os_file_browser(filenames,MAX_NUMBER_OF_FILENAMES,"py",storage);
-      if (n==0 && ispy) return 0;
-      int N=0;
-      // isxw: keep only filenames ending with _xw
-      // ispy: remove filenames ending with _xw
-      const char * fnames[MAX_NUMBER_OF_FILENAMES+1];
-      for (int i=0;i<n;++i){
-	const char * f=filenames[i];
-	//console_output(f,strlen(f));
-	f+=strlen(f)-6;
-	bool isfxw=strcmp(f,"_xw.py")==0;
-	if (isxw?isfxw:!isfxw){
-	  fnames[N]=filenames[i];
-	  ++N;
-	}
-      }
-      if (isxw){ // add regular .xw extensions
-	n=os_file_browser(filenames,MAX_NUMBER_OF_FILENAMES,"xw",storage);
-	if (n+N>MAX_NUMBER_OF_FILENAMES)
-	  n=MAX_NUMBER_OF_FILENAMES-N;
-	for (int i=0;i<n;++i,++N){
-	  fnames[N]=filenames[i];
-	}
-      }
-      fnames[N]=0;
-      choix=select_item(fnames,title?title:"Scripts");
-      if (choix<0 || choix>=N) return 0;
-      strcpy(filename,fnames[choix]);
-      return choix+1;
-    }
-    else  {
-      int n=os_file_browser(filenames,MAX_NUMBER_OF_FILENAMES,extension,storage);
-      if (n==0) return 0;
-      int choix=select_item(filenames,title?title:"Scripts");
-    }
-#else
-    int n=os_file_browser(filenames,MAX_NUMBER_OF_FILENAMES,extension,storage);
-    if (n==0) return 0;
-    int choix=select_item(filenames,title?title:"Scripts");
-#endif
-    if (choix<0 || choix>=n) return 0;
-    strcpy(filename,filenames[choix]);
-    return choix+1;
-  }
-  
-  void erase_script(){
-    char filename[MAX_FILENAME_SIZE+1];
-    int res=giac_filebrowser(filename, "py", "Scripts");
-    if (res && do_confirm((lang==1)?"Vraiment effacer":"Really erase?")){
-      erase_file(filename);
-    }
-  }
-
-  int run_script(const char* filename,GIAC_CONTEXT) {
-#if 0
-    return 1;
-#else
-    string s;
-    load_script(filename,s);
-    // execution_in_progress = 1;
-    run(s.c_str(),7,contextptr);
-    // execution_in_progress = 0;
-    if (s.size()>=4){
-      if (s[0]=='#' || (s[0]=='d' && s[1]=='e' && s[2]=='f' && s[3]==' '))
-	return 2;
-      if ( (s[0]=='/' && s[1]=='/') ||
-	   (s.size()>8 && s[0]=='f' && (s[1]=='o' || s[1]=='u') && s[2]=='n' && s[3]=='c' && s[4]=='t' && s[5]=='i' && s[6]=='o' && s[7]=='n' && s[8]==' ')
-	   )
-	return 3;
-    }
-    return 1;
-#endif
-  }
-
-  int edit_script(char * fname,GIAC_CONTEXT){
-    char fname_[MAX_FILENAME_SIZE+1];
-    char * filename=0;
-    int res=1;
-    if (fname)
-      filename=fname;
-    else {
-      res=giac_filebrowser(fname_, "py", "Scripts",2);
-      filename=fname_;
-    }
-    if(res) {
-      string s;
-      load_script(filename,s);
-      if (s.empty()){
-	s=python_compat(contextptr)?((lang==1)?"Prog. Python, sinon taper":"Python prog., for Xcas"):((lang==1)?"Prog. Xcas, sinon taper":"Xcas prog., for Python");
-	s += " AC F6 12";
-	int k=confirm(s.c_str(),
-#ifdef NSPIRE_NEWLIB
-		      "enter: Prog, esc: Tortue"
-#else
-		      "OK: Prog, Back: Tortue"
-#endif
-		      );
-	if (k==-1)
-	  return 0;
-	if (k==KEY_CTRL_F6)
-	  s=python_compat(contextptr)?"from turtle import *\nreset()\n":"\nefface;\n ";
-	else
-	  s=python_compat(contextptr)?"def "+extract_name(filename)+"(x):\n  \n  return x":"function "+extract_name(filename)+"(x)\nvar j;\n  \n  return x;\nffunction";
-      }
-      // split s at newlines
-      if (edptr==0)
-	edptr=new textArea;
-      if (!edptr) return -1;
-      edptr->elements.clear();
-      edptr->clipline=-1;
-      edptr->filename=filename;
-      edptr->editable=true;
-      edptr->changed=false;
-      edptr->python=python_compat(contextptr);
-      edptr->elements.clear();
-      add(edptr,s);
-      s.clear();
-      edptr->line=0;
-      //edptr->line=edptr->elements.size()-1;
-      edptr->pos=0;
-      int res=doTextArea(edptr,contextptr);
-      if (res==KEY_SHUTDOWN)
-	return res;
-      if (res==-1)
-	python_compat(edptr->python,contextptr);
-      dConsolePutChar('\x1e');
-    }
-    return 0;
-  }
-
-  void chk_restart(GIAC_CONTEXT){
-    drawRectangle(0, 24, LCD_WIDTH_PX, LCD_HEIGHT_PX-24, COLOR_WHITE);
-    if (confirm((lang==1)?"Conserver les variables?":"Keep variables?",
-#ifdef NSPIRE_NEWLIB
-		(lang==1)?"enter: conserver, esc: effacer":"enter: keep, esc: erase"
-#else
-		(lang==1)?"OK: conserver, Back: effacer":"OK: keep, Back: erase"
-#endif
-		)==KEY_CTRL_F6)
-      do_restart(contextptr);
-  }
-
-  void load(GIAC_CONTEXT){
-    char filename[MAX_FILENAME_SIZE+1];
-    if (giac_filebrowser(filename, "xw", "Sessions",2)){
-      if (console_changed==0 ||
-	  strcmp(session_filename,"session")==0 ||
-	  confirm((lang==1)?"Session courante perdue?":"Current session will be lost",
-#ifdef NSPIRE_NEWLIB
-		  (lang==1)?"enter: ok, esc: annul":"enter: ok, esc: cancel"
-#else
-		  (lang==1)?"OK: ok, Back: annul":"OK: ok, Back: cancel"
-#endif
-		  )==KEY_CTRL_F1){
-#ifndef NUMWORKS
-	giac::_restart(giac::gen(giac::vecteur(0),giac::_SEQ__VECT),contextptr);
-#endif
-	restore_session(filename,contextptr);
-	clip_pasted=true;
-	strcpy(session_filename,remove_path(giac::remove_extension(filename)).c_str());
-	static bool ctrl_r=true;
-	if (ctrl_r){
-#ifdef NSPIRE_NEWLIB
-	  confirm((lang==1)?"Taper ctrl puis r pour executer session ":"Type ctrl then r to run session","Enter: OK");
-#endif
-#ifdef NUMWORKS
-	  confirm((lang==1)?"Taper shift EXE pour executer session ":"Type shift then EXE to run session","Enter: OK");
-#endif
-	  ctrl_r=false;
-	}
-	Console_Disp(0,contextptr);
-	// reload_edptr(session_filename,edptr);
-      }     
-    }
-  }
-
-  bool Console_tooltip(GIAC_CONTEXT){
-    if (Current_Line==Last_Line && !Line[Current_Line].readonly && Current_Col>0){
-      int y=(Current_Line>10?180:Current_Line*18);
-      return tooltip(-1 /* means compute size before cursor*/,y,Cursor.x,Edit_Line,contextptr);
-    }
-    return false;
-  }
-
-  bool console_help_insert(int exec,GIAC_CONTEXT,bool warn=true){
-    if (!Edit_Line)
-      return false;
-    char buf[strlen(Edit_Line)+1];
-    strcpy(buf,Edit_Line);
-    buf[Line[Current_Line].start_col+Cursor.x]=0;
-    int back;
-    string s=help_insert(buf,back,exec,contextptr,warn);
-    if (s.empty())
-      return false;
-    for (int i=0;i<back;++i)
-      Console_Backspace(contextptr);
-    Console_Input(s.c_str());
-    Console_Disp(1,contextptr);
-    return true;
-  }
-
-#ifdef NSPIRE_NEWLIB
-  void check_nspire_exam_mode(GIAC_CONTEXT){
-    refresh_osscr();
-    if (nspire_exam_mode==2){
-      // reset
-      if (is_cx2)
-	*(unsigned *) 0x90140020=8*16;
-      else
-	*(unsigned *) 0x900a0008=2;
-    }
-    if (nspire_exam_mode==1){
-      // disabled: restore LED state
-      // set_exam_mode(3,contextptr);
-      exam_mode=0;
-    }
-  }
-#else
-  void check_nspire_exam_mode(GIAC_CONTEXT){}
-#endif
-
-  int Console_GetKey(GIAC_CONTEXT){
-    int key;
-    bool keytooltip=false;
-    unsigned int i, move_line, move_col;
-    char tmp_str[2];
-    char *tmp;
-    for (;;){
-      if (shutdown_state)
-	return KEY_SHUTDOWN;
-      int keyflag = GetSetupSetting(0x14);
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;
-      if (keytooltip){
-	keytooltip=false;
-	if (key==KEY_CTRL_EXIT){
-	  Console_Disp(1,contextptr);
-	  continue;
-	}
-	if (Current_Line==Last_Line && Line[Current_Line].start_col+Cursor.x==strlen(Edit_Line) && (key==KEY_CTRL_OK || key==KEY_CHAR_ANS || key==KEY_CTRL_RIGHT)){
-	  if (console_help_insert(key==KEY_CTRL_RIGHT?KEY_CTRL_OK:key,contextptr,false)){
-	    Console_Disp(1,contextptr);
-	    keytooltip=Console_tooltip(contextptr);
-	    continue;
-	  }
-	}
-	if (key==KEY_CTRL_VARS)
-	  key=KEY_BOOK;	
-      }
-      bool alph=alphawasactive(&key);
-      if (key==KEY_PRGM_ACON)
-	Console_Disp(1,contextptr);
-      translate_fkey(key);
-      if (key==KEY_CTRL_PASTE)
-	return Console_Input((const char*) paste_clipboard());
-      if ( (key==KEY_CHAR_PLUS || key==KEY_CHAR_MINUS || key==KEY_CHAR_MULT || key==KEY_CHAR_DIV) && Current_Line<Last_Line-1){
-	console_line * nxt=&Line[Current_Line];
-	if (strncmp((const char *)nxt->str,"parameter([",11)==0)
-	  Console_MoveCursor(CURSOR_UP);
-	nxt=&Line[Current_Line+1];
-	if (strncmp((const char *)nxt->str,"parameter([",11)==0){
-	  giac::gen g((const char *)nxt->str,contextptr);
-	  if (g.is_symb_of_sommet(giac::at_parameter)){
-	    g=g._SYMBptr->feuille;
-	    if (g.type==giac::_VECT && g._VECTptr->size()>=5){
-	      giac::vecteur & v=*g._VECTptr;
-	      for (int i=1;i<v.size();++i)
-		v[i]=evalf_double(v[i],1,contextptr);
-	      if (v[0].type==giac::_IDNT && v[1].type==giac::_DOUBLE_ && v[2].type==giac::_DOUBLE_ && v[3].type==giac::_DOUBLE_ && v[4].type==giac::_DOUBLE_){
-		std::string s("assume(");
-		s += v[0]._IDNTptr->id_name;
-		s += "=[";
-		int val=1;
-		if (key==KEY_CHAR_MINUS) val=-1;
-		if (key==KEY_CHAR_MULT) val=5;
-		if (key==KEY_CHAR_DIV) val=-5;
-		s += giac::print_DOUBLE_(v[3]._DOUBLE_val + val*v[4]._DOUBLE_val,contextptr);
-		s += ',';
-		s += giac::print_DOUBLE_(v[1]._DOUBLE_val,contextptr);
-		s += ',';
-		s += giac::print_DOUBLE_(v[2]._DOUBLE_val,contextptr);
-		s += ',';
-		s += giac::print_DOUBLE_(v[4]._DOUBLE_val,contextptr);
-		s += "])";
-		return Console_Eval(s.c_str(),contextptr);
-	      }
-	    }
-	  }
-	}
-      }
-      if (key==KEY_CHAR_ACCOLADES || key==KEY_CHAR_CROCHETS){
-	Console_Input(key==KEY_CHAR_ACCOLADES?"{}":"[]");
-	Console_MoveCursor(CURSOR_LEFT);
-	Console_Disp(1,contextptr);
-	continue;	
-      }
-      if ( (key >= ' ' && key <= '~' )
-	   // (key>='0' && key<='9')|| (key >= 'A' && key <= 'Z') || (key >= 'a' && key <= 'z')
-	   ){
-	tmp_str[0] = key;
-	tmp_str[1] = '\0';
-	Console_Input(tmp_str);
-	Console_Disp(1,contextptr);
-	// tooltip
-	keytooltip=Console_tooltip(contextptr);
-	continue;
-      }
-      if (key == KEY_CTRL_F5 || key==KEY_EQW_TEMPLATE || key==KEY_CTRL_F4 || ( (key==KEY_CTRL_RIGHT || key==KEY_CTRL_LEFT) && Current_Line<Last_Line) ){
-	int l=Current_Line;
-	bool graph=strcmp((const char *)Line[l].str,"Graphic object")==0;
-	if (graph && l>0) --l;
-	char buf[giacmax(512,strlen((const char *)Line[l].str+1))];
-	strcpy(buf,(const char *)Line[l].str);
-	int ret=(alph || key==KEY_CTRL_RIGHT || key==KEY_CTRL_F4) ?textedit(buf,512,false,contextptr):eqws(buf,graph,contextptr);
-	if (ret==KEY_SHUTDOWN)
-	  return ret;
-	if (ret){
-	  if (Current_Line==Last_Line){
-	    Console_Clear_EditLine();
-	    return Console_Input((const char *)buf);
-	  }
-	  else {
-#if 1
-	    if (Line[l].type==LINE_TYPE_INPUT && l<Last_Line-1 && Line[l+1].type==LINE_TYPE_OUTPUT)
-	      return Console_Eval(buf,contextptr);
-	    else {
-	      console_free(Line[l].str);
-	      Line[l].str=(char*)console_malloc(strlen(buf)+1);
-	      Line[l].disp_len = Console_GetDispLen(Line[l].str);
-	      strcpy((char *)Line[l].str,buf);
-	    }
-#else
-	    int x=editline_cursor;
-	    move_line = Last_Line - Current_Line;
-	    for (i = 0; i <=move_line; i++) Console_MoveCursor(CURSOR_DOWN);
-	    Cursor.x=x;
-	    return Console_Input((const char *)buf);
-#endif
-	  }	  
-	}
-	Console_Disp(1,contextptr);
-	continue;
-      }
-      if (0 &&key==KEY_CTRL_F6){
-	char buf[512];
-	if (!showCatalog(buf,0,0))
-	  buf[0]=0;
-	return Console_Input((const char*)buf);
-      }
-      if (key==KEY_CTRL_S || key==KEY_CTRL_T){
-	giac::gen g=sheet(contextptr);
-	if (g.type==_INT_ && g.val==KEY_SHUTDOWN)
-	  return KEY_SHUTDOWN;
-	if (g.type==_VECT)
-	  return Console_Input(g.print(contextptr).c_str());
-	Console_Disp(1,contextptr);
-	continue;
-      }
-      if (key==KEY_SAVE){
-	save(session_filename,contextptr);
-	console_changed=false;
-	console_disp_status(contextptr);
-	continue;
-      }
-      if (key==KEY_LOAD){
-	load(contextptr);
-	Console_Disp(1,contextptr);
-	continue;
-      }
-      if (key==KEY_CTRL_MENU){
-#if 1
-	Menu smallmenu;
-#if defined NUMWORKS && defined DEVICE
-	smallmenu.numitems=20;
-#else
-	smallmenu.numitems=17;
-#endif
-	MenuItem smallmenuitems[smallmenu.numitems];
-      
-	smallmenu.items=smallmenuitems;
-	smallmenu.height=12;
-	smallmenu.scrollbar=1;
-	smallmenu.scrollout=1;
-	//smallmenu.title = "KhiCAS";
-	// smallmenuitems[2].text = (char*)(isRecording ? "Stop Recording" : "Record Script");
-	while(1) {
-	  // moved inside the loop because lang might change
-	  smallmenuitems[0].text = (char*)"Applications (shift ANS)";
-	  string sess=(lang==1)?"Enregistrer ":"Save ";
-	  sess += session_filename;
-	  smallmenuitems[1].text = (char *) (sess.c_str());
-	  smallmenuitems[2].text = (char *) ((lang==1)?"Enregistrer sous":"Save session as");
-	  if (nspire_exam_mode==2) smallmenuitems[1].text = (char*)(lang==1?"Sauvegarde desactivee":"Saving disabled");
-	  if (exam_mode || nspire_exam_mode==2)
-	    smallmenuitems[2].text = (char *) "";
-	  smallmenuitems[3].text = (char*) ((lang==1)?"Charger session":"Load session");
-	  smallmenuitems[4].text = (char*)((lang==1)?"Nouvelle session":"New session");
-	  smallmenuitems[5].text = (char*)((lang==1)?"Executer session":"Run session");
-	  smallmenuitems[6].text = (char*)((lang==1)?"Editeur script":"Script editor");
-	  smallmenuitems[7].text = (char*)((lang==1)?"Ouvrir script":"Open script");
-	  smallmenuitems[8].text = (char*)((lang==1)?"Executer script":"Run script");
-	  smallmenuitems[9].text = (char*)((lang==1)?"Effacer historique (0)":"Clear history");
-	  smallmenuitems[10].text = (char*)((lang==1)?"Effacer script (e^)":"Clear script");
-	  smallmenuitems[11].text = (char*)"Configuration/examen (ln)";
-	  smallmenuitems[12].text = (char *) ((lang==1)?"Aide interface (log)":"Shortcuts");
-	  smallmenuitems[13].text = (char*)((lang==1)?"Editer matrice (i)":"Matrix editor");
-	  smallmenuitems[14].text = (char*) ((lang==1)?"Creer parametre (,)":"Create slider (,)");
-	  smallmenuitems[15].text = (char*) ((lang==1)?"A propos (x^y)":"About");
-#ifdef NSPIRE_NEWLIB
-	  smallmenuitems[16].text = (char*) ((lang==1)?"Quitter (menu)":"Quit");
-#else
-	  smallmenuitems[16].text = (char*) ((lang==1)?"Quitter (HOME)":"Quit");
-#endif
-#if defined NUMWORKS && defined DEVICE
-	  smallmenuitems[16].text = (char*) ((lang==1)?"Reboot autre firmware":"Reboot alt. firmware");
-	  smallmenuitems[17].text = (char*) ((lang==1)?"Sauvegarde multi-firmware":"Backup multi-firmware");
-	  smallmenuitems[18].text = (char*) ((lang==1)?"Restauration multi-firmware":"Restore multi-firmware");
-	  smallmenuitems[19].text = (char*) ((lang==1)?"Quitter (HOME)":"Quit");
-#endif
-	  if (exam_mode)
-	    smallmenuitems[16].text = (char*)((lang==1)?"Quitter le mode examen":"Quit exam mode");
-	  if (nspire_exam_mode==2)
-	    smallmenuitems[16].text = (char*)((lang==1)?"Relancer le mode examen":"Restart exam mode");
-	  if (shutdown_state)
-	    return KEY_SHUTDOWN;
-	  int sres = doMenu(&smallmenu);
-	  if(sres == MENU_RETURN_SELECTION || sres==KEY_CTRL_EXE) {
-#if defined NUMWORKS && defined DEVICE
-	    if (smallmenu.selection==17){
-	      int b1=is_valid(0),b2=is_valid(1),b3=is_valid(2);
-	      const char * boot_tab[]={b1?"Slot 1":"Invalid slot 1",b2?"Slot 2":"Invalid slot 2",b3?"Slot 3":"Invalid slot 3","Bootloader","Cancel/Annuler",0};
-	      int choix=select_item(boot_tab,"Reboot firmware",true);
-	      if (choix>=0 && choix<=2 && !is_valid(choix)){
-		break;
-	      }
-	      if (choix>=0 && choix<=3){
-		if (confirm(lang==1?"Les donnees seront perdues!":"Data will be lost!",lang==1?"OK/Back?":"OK/Back?")==KEY_CTRL_F1)
-		  boot_firmware(choix);
-	      }
-	      break;
-	    }
-	    if (smallmenu.selection==18){
-	      if (!save_backup(1))
-		confirm(lang==1?"Rien a sauvegarder":"Nothing to save","OK?");
-	      break;
-	    }
-	    if (smallmenu.selection==19){
-	      if (restore_backup(3)){
-		if (confirm(lang==1?"Les donnees actuelles vont etre effacees":"Current data will be erased!","OK/Back?")==KEY_CTRL_F1){
-		  confirm(restore_backup(1)?"Success!":"Failure!","OK?");
-		}
-	      }
-	      break;
-	    }
-#endif
-	    if (smallmenu.selection==smallmenu.numitems){
-	      if (nspire_exam_mode==2)
-		check_nspire_exam_mode(contextptr);
-	      if (!exam_mode)
-		return KEY_CTRL_MENU;
-	      leave_exam_mode(contextptr);
-	      break;
-	    }
-	    const char * ptr=0;
-	    if (smallmenu.selection==1){
-	      key=KEY_SHIFT_ANS;
-	      break;
-	    }
-	    if (smallmenu.selection==2){
-	      if (strcmp(session_filename,"session")==0)
-		smallmenu.selection=3;
-	      else {
-		save(session_filename,contextptr);
-		break;
-	      }
-	    }
-	    if (smallmenu.selection==3 && !exam_mode && nspire_exam_mode!=2){
-	      char buf[270];
-	      if (get_filename(buf,".xw")){
-		save(buf,contextptr);
-		string fname(remove_path(giac::remove_extension(buf)));
-		strcpy(session_filename,fname.c_str());
-		if (edptr)
-		  edptr->filename=fname+".py";
-	      }
-	      break;
-	    }
-	    if (smallmenu.selection==4){
-	      load(contextptr);
-	      break;
-	    }
-	    if (0 && smallmenu.selection==5) {
-	      // FIXME: make a menu catalog?
-	      char buf[512];
-	      if (doCatalogMenu(buf,(char*)"CATALOG",0,contextptr))
-		return Console_Input((const char *)buf);
-	      break;
-	    }
-	    if (smallmenu.selection==5) {
-#if 0 // SIMU
-	      // simulator debug load calc.nws into scriptstore
-	      void * ptr=ion_storage();
-	      FILE * f=fopen("calc.nws","r");
-	      if (f){
-		fread(ptr,1,32768,f);
-		fclose(f);
-	      }
-#endif
-	      if (exam_mode){
-		if (do_confirm((lang==1)?"Tout effacer?":"Really clear?")){
-		  Console_Init(contextptr);
-		  Console_Clear_EditLine();
-		  giac::_restart(giac::gen(giac::vecteur(0),giac::_SEQ__VECT),contextptr);
-		}
-	      }
-	      else {
-		char filename[MAX_FILENAME_SIZE+1];
-		drawRectangle(0, 0, LCD_WIDTH_PX, LCD_HEIGHT_PX, COLOR_WHITE);
-		if (get_filename(filename,".xw")){
-		  if (console_changed==0 ||
-		      strcmp(session_filename,"session")==0 ||
-		      confirm((lang==1)?"Session courante perdue?":"Current session will be lost",
-#ifdef NSPIRE_NEWLIB
-			      (lang==1)?"enter: annul, esc: ok":"enter: cancel, esc: ok"
-#else
-			      (lang==1)?"OK: annul, Back: ok":"OK: cancel, Back: ok"
-#endif
-			      )==KEY_CTRL_F6){
-		    clip_pasted=true;
-		    Console_Init(contextptr);
-		    Console_Clear_EditLine();
-		    giac::_restart(giac::gen(giac::vecteur(0),giac::_SEQ__VECT),contextptr);
-		    std::string s(remove_path(giac::remove_extension(filename)));
-		    strcpy(session_filename,s.c_str());
-		    reload_edptr(session_filename,edptr,contextptr);
-		  }
-		}
-	      }
-	      break;
-	    }
-	    if (smallmenu.selection==6) {
-	      run_session(0,contextptr);
-	      break;
-	    }
-	    if (smallmenu.selection==7) {
-	      if (!edptr || merge_area(edptr->elements).size()<2)
-		edit_script((char *)(giac::remove_extension(session_filename)+".py").c_str(),contextptr);
-	      else
-		doTextArea(edptr,contextptr);
-	      break;
-	    }
-	    if (smallmenu.selection==8) {
-	      char filename[MAX_FILENAME_SIZE+1];
-	      drawRectangle(0, 0, LCD_WIDTH_PX, LCD_HEIGHT_PX-8, COLOR_WHITE);
-	      if (giac_filebrowser(filename, "py", "Scripts",2))
-		edit_script(filename,contextptr);
-	      break;
-	    }
-	    if (smallmenu.selection==9) {
-	      char filename[MAX_FILENAME_SIZE+1];
-	      drawRectangle(0, 0, LCD_WIDTH_PX, LCD_HEIGHT_PX-8, COLOR_WHITE);
-	      if (giac_filebrowser(filename, "py", "Scripts",2))
-		run_script(filename,contextptr);
-	      Console_Clear_EditLine();
-	      break;
-	    }
-	    if(smallmenu.selection == 10) {
-	      chk_restart(contextptr);
-	      Console_Init(contextptr);
-	      Console_Clear_EditLine();
-	      break;
-	    }
-	    if (smallmenu.selection==11){
-	      erase_script();
-	      break;
-	    }
-	    if (smallmenu.selection == 12){
-	      menu_setup(contextptr);
-	      continue;
-	    }
-	    if(smallmenu.selection == 13 ||smallmenu.selection == 16 ) {
-	      textArea text;
-	      text.editable=false;
-	      text.clipline=-1;
-	      text.title = smallmenuitems[smallmenu.selection-1].text;
-	      add(&text,smallmenu.selection==13?((lang==1)?shortcuts_fr_string:shortcuts_en_string):((lang==1)?apropos_fr_string:apropos_en_string));
-	      doTextArea(&text,contextptr);
-	      continue;
-	    } 
-	    if (smallmenu.selection==14){
-	      drawRectangle(0, 0, LCD_WIDTH_PX, LCD_HEIGHT_PX-8, COLOR_WHITE);
-	      if (ptr=input_matrix(false,contextptr)) {
-		return Console_Input((const char *)ptr);
-	      }
-	      break;
-	    }
-	    if (smallmenu.selection == 15){
-	      Menu paramenu;
-	      paramenu.numitems=6;
-	      MenuItem paramenuitems[paramenu.numitems];
-	      paramenu.items=paramenuitems;
-	      paramenu.height=12;
-	      paramenu.title = (char *)"Parameter";
-	      char menu_xcur[32],menu_xmin[32],menu_xmax[32],menu_xstep[32],menu_name[16]="name a";
-	      static char curname='a';
-	      menu_name[5]=curname;
-	      ++curname;
-	      double pcur=0,pmin=-5,pmax=5,pstep=0.1;
-	      std::string s;
-	      bool doit;
-	      for (;;){
-		s="cur "+giac::print_DOUBLE_(pcur,contextptr);
-		strcpy(menu_xcur,s.c_str());
-		s="min "+giac::print_DOUBLE_(pmin,contextptr);
-		strcpy(menu_xmin,s.c_str());
-		s="max "+giac::print_DOUBLE_(pmax,contextptr);
-		strcpy(menu_xmax,s.c_str());
-		s="step "+giac::print_DOUBLE_(pstep,contextptr);
-		strcpy(menu_xstep,s.c_str());
-		paramenuitems[0].text = (char *) "OK";
-		paramenuitems[1].text = (char *) menu_name;
-		paramenuitems[2].text = (char *) menu_xcur;
-		paramenuitems[3].text = (char *) menu_xmin;
-		paramenuitems[4].text = (char *) menu_xmax;
-		paramenuitems[5].text = (char *) menu_xstep;
-		int sres = doMenu(&paramenu);
-		doit = sres==MENU_RETURN_SELECTION  || sres==KEY_CTRL_EXE;
-		if (doit) {
-		  std::string s1; double d;
-		  if (paramenu.selection==2){
-		    handle_f5();
-		    if (inputline(menu_name,(lang==1)?"Nouvelle valeur?":"New value?",s1,false)==KEY_CTRL_EXE && s1.size()>0 && isalpha(s1[0])){
-		      if (s1.size()>10)
-			s1=s1.substr(0,10);
-		      strcpy(menu_name,("name "+s1).c_str());
-		    }
-		    continue;
-		  }	
-		  if (paramenu.selection==3){
-		    inputdouble(menu_xcur,pcur,contextptr);
-		    continue;
-		  }
-		  if (paramenu.selection==4){
-		    inputdouble(menu_xmin,pmin,contextptr);
-		    continue;
-		  }
-		  if (paramenu.selection==5){
-		    inputdouble(menu_xmax,pmax,contextptr);
-		    continue;
-		  }
-		  if (paramenu.selection==6){
-		    inputdouble(menu_xstep,pstep,contextptr);
-		    pstep=fabs(pstep);
-		    continue;
-		  }
-		  // if (paramenu.selection==6) break;
-		} // end menu
-		break;
-	      } // end for (;;)
-	      if (doit && pmin<pmax && pstep>0){
-		s="assume(";
-		s += (menu_name+5);
-		s += "=[";
-		s += (menu_xcur+4);
-		s += ',';
-		s += (menu_xmin+4);
-		s += ',';
-		s += (menu_xmax+4);
-		s += ',';
-		s += (menu_xstep+5);
-		s += "])";
-		return Console_Input((const char *)s.c_str());
-	      }
-	      continue;
-	    }
-	  }
-	  break;
-	} // end while(1)
-	if (key!=KEY_SHIFT_ANS){
-	  Console_Disp(1,contextptr);
-	  return CONSOLE_SUCCEEDED;
-	}
-#else
-	char filename[MAX_FILENAME_SIZE+1];
-	//drawRectangle(0, 24, LCD_WIDTH_PX, LCD_HEIGHT_PX-24, COLOR_WHITE);
-	if (get_filename(filename))
-	  edit_script(filename,contextptr);
-	//edit_script(0);
-	return CONSOLE_SUCCEEDED;
-#endif
-      }
-      if (key==KEY_SHIFT_ANS){ // 3rd party app
-	int res=khicas_addins_menu(contextptr);
-	if (res==KEY_CTRL_MENU)
-	  return res;
-	Console_Disp(1,contextptr);
-	return CONSOLE_SUCCEEDED;
-      }
-      if ( (key >= KEY_CTRL_F1 && key <= KEY_CTRL_F6) ||
-	   (key >= KEY_CTRL_F7 && key <= KEY_CTRL_F14) 
-	   ){
-	Console_FMenu(key,contextptr);
-	Console_Disp(1,contextptr);
-	keytooltip=Console_tooltip(contextptr);
-	continue;
-      }
-      if (key==KEY_CTRL_PAGEDOWN){
-	int j=0;
-	for (int i=0;i<10;++i)
-	  j=Console_MoveCursor(CURSOR_DOWN);
-	return j;
-      }
-      if (key==KEY_CTRL_PAGEUP){
-	int j=0;
-	for (int i=0;i<10;++i)
-	  j=Console_MoveCursor(CURSOR_UP);
-	return j;
-      }
-      if (key == KEY_CTRL_UP)
-	return Console_MoveCursor(alph?CURSOR_ALPHA_UP:CURSOR_UP);
-      if (key == KEY_CTRL_DOWN || key=='\t'
-	  // FIREBIRDEMU
-	  || key==KEY_BOOK
-	  ){
-	if (Current_Line==Last_Line && !Line[Current_Line].readonly && Current_Col>0){
-	  console_help_insert(0,contextptr);
-	  Console_Disp(1,contextptr);	  
-	  continue;
-	}
-	return Console_MoveCursor(alph?CURSOR_ALPHA_DOWN:CURSOR_DOWN);
-      }
-      //if (key == KEY_CTRL_PAGEUP)  return Console_MoveCursor(CURSOR_ALPHA_UP);
-      //if (key == KEY_CTRL_PAGEDOWN) return Console_MoveCursor(CURSOR_ALPHA_DOWN);
-      if (key == KEY_CTRL_LEFT)
-	Console_MoveCursor(CURSOR_LEFT);
-      if (key == KEY_CTRL_RIGHT)
-	Console_MoveCursor(CURSOR_RIGHT);
-      if (key == KEY_SHIFT_LEFT)
-	Console_MoveCursor(CURSOR_SHIFT_LEFT);
-      if (key == KEY_SHIFT_RIGHT)
-	Console_MoveCursor(CURSOR_SHIFT_RIGHT);
-      if (key == KEY_SHIFT_RIGHT || key == KEY_SHIFT_LEFT ||
-	  key == KEY_CTRL_RIGHT || key == KEY_CTRL_LEFT){
-	Console_Disp(0,contextptr);
-	continue;
-      }
-      if (key == KEY_CTRL_EXIT){
-	if (Last_Line==Current_Line){
-	  if (!edptr)
-	    edit_script((char *)(giac::remove_extension(session_filename)+".py").c_str(),contextptr);
-	  else {
-	    edptr->y=0;
-	    doTextArea(edptr,contextptr);
-	  }
-	  Console_Disp(1,contextptr);
-	}
-	else {
-	  move_line = Last_Line - Current_Line;
-	  for (i = 0; i <= move_line; i++) Console_MoveCursor(CURSOR_DOWN);
-	}
-	return CONSOLE_SUCCEEDED;
-      }
-      if (key == KEY_CTRL_AC)
-	{
-	  if (Line[Current_Line].readonly){
-	    move_line = Last_Line - Current_Line;
-	    for (i = 0; i <= move_line; i++) Console_MoveCursor(CURSOR_DOWN);
-	    return CONSOLE_SUCCEEDED;
-	  }
-	  if (Edit_Line[0]=='\0'){
-	    //return Console_Input((const char *)"restart");
-	    chk_clearscreen(contextptr);
-	    continue;
-	  }
-	  Edit_Line[0] = '\0';
-	  Line[Current_Line].start_col = 0;
-	  Line[Current_Line].type = LINE_TYPE_INPUT;
-	  Line[Current_Line].disp_len = 0;
-	  Cursor.x = 0;
-	  return CONSOLE_SUCCEEDED;
-	}
-
-      if (key == KEY_CTRL_INS) {
-	if (Current_Line<Last_Line){
-	  Console_Insert_Line();
-	  Console_Insert_Line();
-	}
-	else
-	  Console_Input((const char*)":=");
-	Console_Disp(1,contextptr);
-	continue;
-      }
-      if (key==KEY_AFFECT){
-	Console_Input((const char*)":=");
-	Console_Disp(1,contextptr);
-	continue;
-      }	
-      if (key==KEY_CTRL_D){
-	Console_Input((const char*)"debug(");
-	Console_Disp(1,contextptr);
-	continue;
-      }	
-      if (key == KEY_CTRL_SETUP) {
-	menu_setup(contextptr);
-	Console_Disp(1,contextptr);
-	continue;
-      }
-
-      if (key == KEY_CTRL_EXE || key==KEY_CTRL_OK){
-	if (Current_Line == Last_Line)
-	  {
-	    return Console_NewLine(LINE_TYPE_INPUT, 1);
-	  }
-      }
-      if (key == KEY_CTRL_DEL){
-	Console_Backspace(contextptr);
-	Console_Disp(1,contextptr);
-	keytooltip=Console_tooltip(contextptr);
-	continue;	
-      }
-      if (key == KEY_CTRL_R && (Current_Line!=Last_Line || Cursor.x==0)){
-	run_session(0,contextptr);
-	return 0;
-      }
-      if (key == KEY_CTRL_CLIP){
-	copy_clipboard((const char *)Line[Current_Line].str,true);
-      }
-      if (key==KEY_CTRL_EXE || key==KEY_CTRL_OK){
-	tmp = Line[Current_Line].str;
-      
-#if 1
-	int x=editline_cursor;
-	move_line = Last_Line - Current_Line;
-	for (i = 0; i <= move_line; i++) Console_MoveCursor(CURSOR_DOWN);
-	Cursor.x=x;
-	if (Cursor.x>COL_DISP_MAX)
-	  Line[Last_Line].start_col=Cursor.x-COL_DISP_MAX;
-#else
-	move_line = Last_Line - Current_Line;
-	for (i = 0; i <= move_line; i++) Console_MoveCursor(CURSOR_DOWN);
-	move_col = Line[Current_Line].disp_len - Current_Col;
-	for (i = 0; i <= move_col; i++) Console_MoveCursor(CURSOR_RIGHT);
-#endif
-	return Console_Input(tmp);
-      }
-      const char * ptr=keytostring(key,keyflag,0,contextptr);
-      if (ptr){
-	Console_Input((const char *)ptr);
-	Console_Disp(1,contextptr);
-	keytooltip=Console_tooltip(contextptr);
-	continue;
-      }
-    
-    }
-    return CONSOLE_NO_EVENT;
-  }
-
-  int Console_FMenu(int key,GIAC_CONTEXT){
-    const char * s=console_menu(key,fmenu_cfg,0),*ptr=0;
-    if (!s){
-      //cout << "console " << unsigned(s) << endl;
-      return CONSOLE_NO_EVENT;
-    }
-    if (strcmp("matrix(",s)==0 && (ptr=input_matrix(false,contextptr)) )
-      s=ptr;
-    if (strcmp("makelist(",s)==0 && (ptr=input_matrix(true,contextptr)) )
-      s=ptr;
-    return Console_Input((const char *)s);
-  }
-
-  const char * console_menu(int key,int active_app){
-    return console_menu(key,fmenu_cfg,active_app);
-  }
-
-  const char * console_menu(int key,char* cfg_,int active_app){
-    char * cfg=cfg_;
-    int i, matched = 0;
-    const char * ret=0;
-    const int maxentry_size=64;
-    static char console_buf[maxentry_size];
-    char temp[maxentry_size],menu1[maxentry_size],menu2[maxentry_size],menu3[maxentry_size],menu4[maxentry_size],menu5[maxentry_size],menu6[maxentry_size],menu7[maxentry_size],menu8[maxentry_size];
-    char * tabmenu[8]={menu1,menu2,menu3,menu4,menu5,menu6,menu7,menu8};
-    struct FMenu entry = {0,tabmenu,0};
-    // char* cfg = (char *)memory_load((char *)"\\\\fls0\\FMENU.cfg");
-
-    while (*cfg) {
-      //Get each line
-      for(i=0; i<maxentry_size-1 && *cfg && *cfg!='\r' && *cfg!='\n'; i++, cfg++) {
-	temp[i] = *cfg;
-      }
-      temp[i]=0;
-      //If starting by 'F' followed by the right number, start filling the structure.
-      if (temp[0] == 'F' && temp[1]==(key-KEY_CTRL_F1)+'1'){
-	matched = 1;
-	continue;
-      }
-      if (temp[0] == 'F' && temp[1]!=(key-KEY_CTRL_F1)+'0'){
-	matched = 0;
-	continue;
-      }
-      //Fill the structure
-      if (matched && temp[0] && entry.count<8) {
-	strcpy(tabmenu[entry.count], temp);
-	entry.count++;
-      }
-      cfg++;
-    }
-    if(entry.count > 0) {
-      ret = Console_Draw_FMenu(key, &entry,cfg,active_app);
-      // cout << "console0 " << (unsigned) ret << endl;
-      if (!ret) return ret;
-      if (!strcmp("periodic_table",ret)){
-	const char * name,*symbol;
-	char protons[32],nucleons[32],mass[32],electroneg[32];
-	int res=periodic_table(name,symbol,protons,nucleons,mass,electroneg);
-	if (!res)
-	  return 0;
-	char * ptr=console_buf;
-	if (res & 1)
-	  ptr=strcpy(ptr,name)+strlen(ptr);
-	if (res & 2){
-	  if (res & 1)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,symbol)+strlen(ptr);
-	}
-	if (res & 4){
-	  if (res&3)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,protons)+strlen(ptr);
-	}
-	if (res & 8){
-	  if (res&7)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,nucleons)+strlen(ptr);
-	}
-	if (res & 16){
-	  if (res&15)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,mass+2)+strlen(ptr);
-	}
-	if (res & 32){
-	  if (res&31)
-	    ptr=strcpy(ptr,",")+strlen(ptr);
-	  ptr=strcpy(ptr,electroneg+4)+strlen(ptr);
-	}
-      }
-      else
-	strcpy(console_buf,ret);
-      return console_buf;
-    }
-    return 0;
-  }
-
-  char *Console_Make_Entry(const char* str)
-  {
-    char* entry = NULL;
-    entry = (char*)calloc((strlen((const char *)str)+1), sizeof(char*));
-    if(entry) memcpy(entry, (const char *)str, strlen((const char *)str)+1);
-
-    return entry;
-  }
-
-  void PrintMini(int x,int y,const char * s,int mode){
-    x *=3;
-    y *=3;
-    PrintMini(x,y,(char *)s,mode,COLOR_BLACK, COLOR_WHITE);
-  }
-
-  //Draws and runs the asked for menu.
-  const char * Console_Draw_FMenu(int key, struct FMenu* menu,char * cfg,int active_app)
-  {
-    int i, nb_entries = 0, selector = 0, position_number, position_x, ret, longest = 0;
-    int input_key;
-    char quick[] = "*: ";
-    int quick_len = 2;
-    char **entries;
-    DISPBOX box,box3;
-    
-    position_number = key - KEY_CTRL_F1;
-    if (position_number<0 || position_number>=5)
-      position_number=4;
-    
-    entries  = menu->str;
-    nb_entries = menu->count;
-    
-    for(i=0; i<nb_entries; i++)
-      if(strlen(entries[i]) > longest) longest = strlen(entries[i]);
-    if (longest>15)
-      longest=15;
-    // screen resolution Graph90 384x(216-24), Graph35 128x64
-    // factor 3x3
-    position_x = 17*position_number;
-    if(position_x + longest*4 + quick_len*4 > 115) position_x = 115 - longest*4 - quick_len*4;
-    
-    box.left = position_x;
-    box.right = position_x + longest*4 + quick_len*4  + 6;
-    box.bottom = 63-7;
-    box.top = 63-7-nb_entries*7;
-    box3.left=3*box.left;
-    box3.right=3*box.right;
-    box3.bottom=3*box.bottom+22;
-    box3.top=3*box.top+20;
-  
-    drawRectangle(box3.left,box3.top,box3.right-box3.left,box3.bottom-box3.top,COLOR_WHITE);
-    drawLine(box3.left, box3.top, box3.right, box3.top,COLOR_BLACK);
-    drawLine(box3.left, box3.bottom, box3.left, box3.top,COLOR_BLACK);
-    drawLine(box3.right, box3.bottom, box3.right, box3.top,COLOR_BLACK);
-    drawLine(box3.left, box3.bottom, box3.right, box3.bottom,COLOR_BLACK);
-    
-    // Cursor_SetFlashOff();
-    
-    for (;;){
-      for(i=0; i<nb_entries; i++) {
-	quick[0] = '0'+(i+1);
-	PrintMini(3+position_x, box.bottom-7*i, quick, 0);
-	PrintMini(3+position_x+quick_len*4, box.bottom-7*i, entries[i], 0);
-      }
-      PrintMini(3+position_x+quick_len*4,box.bottom-7*selector, entries[selector], 4);
-      GetKey(&input_key);
-      if (input_key==KEY_PRGM_ACON) Console_Disp(1,0);
-      if (input_key == KEY_CTRL_EXIT || input_key==KEY_CTRL_AC) return 0;
-      if (input_key == KEY_CTRL_UP && selector < nb_entries-1) selector++;	
-      if (input_key == KEY_CTRL_DOWN && selector > 0) selector--;
-      
-      if (input_key == KEY_CTRL_EXE || input_key==KEY_CTRL_OK) return entries[selector];
-      
-      if (input_key >= KEY_CHAR_1 && input_key < KEY_CHAR_1 + nb_entries) return entries[input_key-KEY_CHAR_1];
-      
-      translate_fkey(input_key);
-      
-      if ( active_app==0 &&
-	   ((input_key >= KEY_CTRL_F1 && input_key <= KEY_CTRL_F6) ||
-	    (input_key >= KEY_CTRL_F7 && input_key <= KEY_CTRL_F16) )
-	   ){
-	Console_Disp(1,0);
-	key=input_key;
-	return console_menu(key,cfg,active_app);
-      }
-    } // end while input_key!=EXE/EXIT
-
-    return 0; // never reached
-  }
-
-  void Console_Free(){
-    for (int i = 0; i < _LINE_MAX; i++){
-      if (Line[i].str){
-	if (Line[i].str==Edit_Line)
-	  Edit_Line=0;
-	console_free(Line[i].str);
-	Line[i].str=0;
-      }
-    }
-    if (Edit_Line)
-      console_free(Edit_Line);
-    if (Line){
-      delete [] Line;
-      Line = 0;
-    }
-  }
-
-  int Console_Init(GIAC_CONTEXT){
-    console_changed=1;
-    int i;
-    if (!Line){
-      Line=new console_line[_LINE_MAX];
-      for (i = 0; i < _LINE_MAX; i++){
-	Line[i].str=0;
-      }
-    }
-    Start_Line = 0;
-    Last_Line = 0;
-
-    for (i = 0; i < _LINE_MAX; i++){
-      if (Line[i].str){
-	if (Line[i].str==Edit_Line)
-	  Edit_Line=0;
-	console_free(Line[i].str);
-	Line[i].str=0;
-      }
-      Line[i].readonly = 0;
-      Line[i].type = LINE_TYPE_INPUT;
-      Line[i].start_col = 0;
-      Line[i].disp_len = 0;
-    }
-    if (Edit_Line)
-      console_free(Edit_Line);
-    if ((Edit_Line = (char *)console_malloc(EDIT_LINE_MAX + 1)) == NULL) return CONSOLE_MEM_ERR;
-    Edit_Line[0]=0;
-    Line[0].str = Edit_Line;
-
-    Cursor.x = 0;
-    Cursor.y = 0;
-
-    Case = LOWER_CASE;
-
-    /*for(i = 0; i < 6; i++) {
-      FMenu_entries[i].name = NULL;
-      FMenu_entries[i].count = 0;
-      }*/
-
-    Console_FMenu_Init(contextptr);
-
-    return CONSOLE_SUCCEEDED;
-  }
-
-  // Loads the FMenus' data into memory, from a cfg file
-  void Console_FMenu_Init(GIAC_CONTEXT)
-  {
-    char temp[32] = {'\0'};
-#if 0
-    if (!fmenu_cfg){
-      fmenu_cfg = (char *)conf_standard;
-      std::string cfg_s;
-      // Does the file exists ?
-      if (load_script((char*)"FMENU.cfg",cfg_s)){
-	char * ptr=new char[cfg_s.size()+1];
-	strcpy(ptr,cfg_s.c_str());
-	fmenu_cfg=(char *)ptr;
-      }
-      if(!fmenu_cfg) {
-	save_script((const char *)"FMENU.cfg",conf_standard);
-	fmenu_cfg = (char *)conf_standard;
-      }
-    }
-#else
-    if (xcas_python_eval==1){
-      fmenu_cfg=(char *)python_conf_standard;
-    }
-    else {
-      fmenu_cfg=(char *)conf_standard;
-    }
-#endif
-    const char *cfg=fmenu_cfg;
-    while(*cfg) {
-      //Get each line
-      int i;
-      for(i=0; i<20 && *cfg && *cfg!='\r' && *cfg!='\n'; i++, cfg++) {
-	temp[i] = *cfg;
-      }
-      temp[i]=0;
-      //If starting by 'F', adjust the number and eventually set the name of the menu
-      if(temp[0] == 'F' && temp[1]>='1' && temp[1]<='6') {
-	int number = temp[1]-'0' - 1;
-	if(temp[3] && number<6) {
-	  strcpy(FMenu_entries_name[number], (char*)temp+3);
-	  //FMenu_entries[number].name[4] = '\0';
-	}
-      }
-
-      memset(temp, '\0', 20);
-      cfg++;
-    }
-    //free(fmenu_cfg);
-  }
-
-  /*
-    The following functions are used to display all lines.
-    Note: After calling this function, the first clear the memory.
-  */
-
-#ifndef CURSOR
-  int print_x=0,print_y=0,vfontsize=18,hfontsize=12;
-#endif
-
-  void locate(int x,int y){
-#ifdef CURSOR
-    return locate_OS(x,y);
-#else
-    print_x=(x-1)*hfontsize;
-    print_y=(y-1)*vfontsize;
-#endif
-  }
-
-  void Cursor_SetPosition(int x,int y){
-    return locate(x+1,y+1);
-  }
-
-  int print_color(int print_x,int print_y,const char *s,int color,bool invert,bool minimini,GIAC_CONTEXT){
-    int python=python_compat(contextptr);
-    const char * src=s;
-    char singleword[128];
-    bool linecomment=false;
-    int couleur=color;
-    while (*src && print_y<LCD_WIDTH_PX){
-      const char * oldsrc=src;
-      if ( (python && *src=='#') ||
-	   (!python && *src=='/' && *(src+1)=='/')){
-	linecomment=true;
-	couleur=4;
-      }
-      if (linecomment)
-	src = (char*)toksplit((unsigned char*)src, ' ', (unsigned char*)singleword, minimini?50:35); //break into words; next word
-      else { // skip string (only with delimiters " ")
-	if (*src=='"'){
-	  for (++src;*src;++src){
-	    if (*src=='"' && *(src-1)!='\\')
-	      break;
-	  }
-	  if (*src=='"')
-	    ++src;
-	  int i=src-oldsrc;
-	  strncpy(singleword,oldsrc,i);
-	  singleword[i]=0;
-	}
-	else {
-	  size_t i=0;
-	  for (;*src==' ';++src){ // skip initial whitespaces
-	    ++i;
-	  }
-	  if (i==0){
-	    if (isalpha(*src)){ // skip keyword
-	      for (;isalphanum(*src) || *src=='_';++src){
-		++i;
-	      }
-	    }
-	    // go to next space or alphabetic char
-	    for (;*src;++i,++src){
-	      if (*src==' ' || (i && *src>=' ' && *src<='/') || (python && *src=='#') || (!python && *src=='/' && *(src+1)=='/')|| *src=='"' || isalpha(*src))
-		break;
-	    }
-	  }
-	  strncpy(singleword,oldsrc,i);
-	  singleword[i]=0;
-	  if (i==0){
-	    puts(src); // free(singleword);
-	    return print_x; // FIXME KEY_CTRL_F2;
-	  }
-	} // end normal case
-      } // end else linecomment case
-      couleur=linecomment?5:find_color(singleword,contextptr);
-      if (couleur==1) couleur=COLOR_BLUE;
-      if (couleur==2) couleur=49432; //was COLOR_YELLOWDARK;
-      if (couleur==3) couleur=51712;//33024;
-      if (couleur==4) couleur=COLOR_MAGENTA;
-      if (couleur==5) couleur=COLOR_GREEN;
-      if (linecomment || singleword[0]=='"')
-	print(print_x,print_y,singleword,couleur,invert,/*fake*/false,minimini);
-      else { // print two parts, commandname in color and remain in black
-	char * ptr=singleword;
-	if (isalpha(*ptr)){
-	  while (isalphanum(*ptr) || *ptr=='_')
-	    ++ptr;
-	}
-	char ch=*ptr;
-	*ptr=0;
-	print(print_x,print_y,singleword,couleur,invert,/*fake*/false,minimini);
-	*ptr=ch;
-	print(print_x,print_y,ptr,COLOR_BLACK,invert,/*fake*/false,minimini);
-      }
-      // ?add a space removed from token
-      if( linecomment?*src:*src==' ' ){
-	if (*src==' ')
-	  ++src;
-	print(print_x,print_y," ",COLOR_BLACK,invert,false,minimini);
-      }
-    }
-    return print_x;
-  }    
-
-  void print_color(const char *s,int color,bool invert,bool minimini,GIAC_CONTEXT){
-    print_x=print_color(print_x,print_y,s,color,invert,minimini,contextptr);
-  }
-
-  void PrintRev(const char * s,int color,bool colorsyntax,GIAC_CONTEXT){
-#ifdef CURSOR
-    Print_OS((char *)s,TEXT_MODE_INVERT,0);
-#else
-    print(print_x,print_y,(const char *)s,color,true/* revert*/,false,false);
-#endif  
-  }
-
-  void Print(const char * s,int color,bool colorsyntax,GIAC_CONTEXT){
-#ifdef CURSOR
-    Print_OS((char *)s,TEXT_MODE_NORMAL,0);
-#else
-    if (!colorsyntax || (strlen(s)==1 && (s[0]=='>' || s[0]=='<')))
-      print(print_x,print_y,(const char *)s,color,false,false,false);
-    else
-      print_color(s,color,false,false,contextptr);
-#endif
-  }
-
-  // redraw_mode=1 clear area
-  int Console_Disp(int redraw_mode,GIAC_CONTEXT){
-    bool minimini=false;
-    unsigned int* pBitmap;
-    int i, alpha_shift_status;
-    DISPBOX ficon;
-    int print_y = 0; //pixel y cursor
-    int print_y_locate;
-
-    // if (redraw_mode & 1) Bdisp_AllClr_VRAM();
-
-    //GetFKeyIconPointer( 0x01BE, &ficon );
-    //DisplayFKeyIcon( i, ficon);
-
-    //Reading each "line" that will be printed
-    for (i = 0; (i < LINE_DISP_MAX) && (i + Start_Line <= Last_Line); i++){
-      console_line & curline=Line[i+Start_Line];
-      bool colorsyntax=curline.type == LINE_TYPE_INPUT;
-      if (i == Cursor.y){
-	// cursor line
-	//if ((redraw_mode & 1)==0)
-	  drawRectangle(0,i*vfontsize,LCD_WIDTH_PX,vfontsize,_WHITE);
-	if (curline.type == LINE_TYPE_INPUT || curline.type == LINE_TYPE_OUTPUT && curline.disp_len >= COL_DISP_MAX){
-	  locate(1, i + 1);
-	  if (curline.readonly){
-#ifdef CURSOR
-	    Cursor_SetFlashOff();
-#endif
-	    PrintRev(curline.str + curline.start_col,TEXT_COLOR_BLACK,colorsyntax,contextptr);
-	  }
-	  else 
-	    Print(curline.str+curline.start_col+(Cursor.x>COL_DISP_MAX-1?1:0),TEXT_COLOR_BLACK,colorsyntax,contextptr);
-	}
-	else {
-	  locate(1, i + 1);
-	  print(print_x,print_y,(const char *)curline.str,TEXT_COLOR_BLACK,false,true/*fake*/,minimini); // fake print
-	  print_x=LCD_WIDTH_PX-print_x;
-	  if (curline.readonly){
-#ifdef CURSOR
-	    Cursor_SetFlashOff();
-#endif
-	    PrintRev(curline.str,TEXT_COLOR_BLACK,colorsyntax,contextptr);
-	  }
-	  else 
-	    Print(curline.str,TEXT_COLOR_BLACK,colorsyntax,contextptr);
-	}
-
-	if (
-#if 1 //def CURSOR
-	    curline.disp_len - curline.start_col > COL_DISP_MAX-1
-#else
-	    print_x>LCD_WIDTH_PX-hfontsize
-#endif
-	    ){
-#ifdef CURSOR
-	  locate(COL_DISP_MAX, i + 1);
-#else
-	  print_y=i*vfontsize;
-	  print_x=LCD_WIDTH_PX+2-hfontsize;
-#endif
-	  if (curline.readonly){
-	    if(curline.disp_len - curline.start_col != COL_DISP_MAX) {
-#ifdef CURSOR
-	      Cursor_SetFlashOff();
-#endif
-	      PrintRev((char *)">",COLOR_MAGENTA,colorsyntax,contextptr);
-	    }
-	  }
-	  else if (Cursor.x < COL_DISP_MAX-1){
-	    Print((char *)">",COLOR_MAGENTA,colorsyntax,contextptr);
-	  }
-	}
-
-	if (curline.start_col > 0){
-	  locate(1, i + 1);	
-	  if (curline.readonly){
-#ifdef CURSOR
-	    Cursor_SetFlashOff();
-#endif		  
-	    PrintRev((char *)"<",COLOR_MAGENTA,colorsyntax,contextptr);
-	  }
-	  else {
-	    Print((char *)"<",COLOR_MAGENTA,colorsyntax,contextptr);
-	  }
-	}
-
-	if (!curline.readonly){
-	  int fakestart=curline.start_col+(Cursor.x > COL_DISP_MAX-1?1:0);
-	  int fakex,fakey=Cursor.y*vfontsize;
-	  string fakes;
-	  // parenthese match
-	  const char * str=curline.str;
-	  int pos=Cursor.x+fakestart,pos2;
-	  int l=strlen(str);
-	  char ch=0;
-	  if (pos<l)
-	    ch=str[pos];
-	  int matchdirection=0,paren=0,crochet=0,accolade=0;
-	  if (ch=='(' || ch=='[' || ch=='{')
-	    matchdirection=1;
-	  if (ch=='}' || ch==']' || ch==')')
-	    matchdirection=-1;
-	  if (!matchdirection && pos){
-	    --pos;
-	    ch=str[pos];
-	    if (ch=='(' || ch=='[' || ch=='{')
-	      matchdirection=1;
-	    if (ch=='}' || ch==']' || ch==')')
-	      matchdirection=-1;
-	  }
-	  if (matchdirection){
-	    char buf[2]={0,0};
-	    bool ok=true;
-	    for (pos2=pos;ok && (pos2>=0 && pos2<l);pos2+=matchdirection){
-	      ch=str[pos2];
-	      if (ch=='(') ++paren;
-	      if (ch==')') --paren;
-	      if (ch=='[') ++crochet;
-	      if (ch==']') --crochet;
-	      if (ch=='{') ++accolade;
-	      if (ch=='}') --accolade;
-	      if (matchdirection>0 && (paren<0 || crochet<0 || accolade<0) )
-		ok=false;
-	      if (matchdirection<0 && (paren>0 || crochet>0 || accolade>0) )
-		ok=false;
-	      if (paren==0 && crochet==0 && accolade==0)
-		break;
-	    }
-	    ok = paren==0 && crochet==0 && accolade==0;
-	    if (pos>=fakestart){
-	      fakex=0;
-	      buf[0]=str[pos];
-	      fakes=string((const char *)curline.str).substr(fakestart,pos-fakestart);
-	      print(fakex,fakey,fakes.c_str(),TEXT_COLOR_BLACK,false,true/* fake*/,minimini); // fake print
-	      print(fakex,fakey,buf,ok?TEXT_COLOR_GREEN:TEXT_COLOR_RED,true/* revert*/,false,minimini);
-	    }
-	    if (ok){
-	      fakex=0;
-	      if (pos2>fakestart){
-		fakes=string((const char *)curline.str).substr(fakestart,pos2-fakestart);
-		print(fakex,fakey,fakes.c_str(),TEXT_COLOR_BLACK,false,true/* fake*/,false); // fake print
-		buf[0]=str[pos2];
-		print(fakex,fakey,buf,TEXT_COLOR_GREEN,true/* revert*/,false,minimini);
-	      }
-	    }
-	  }
-#ifdef CURSOR
-	  switch(GetSetupSetting( (unsigned int)0x14)) {
-	  case 0: 
-	    alpha_shift_status = 0;
-	    break;
-	  case 1: //Shift enabled
-	    alpha_shift_status = 1;
-	    break;
-	  case 4: case 0x84:	//Alpha enabled
-	    alpha_shift_status = 2;
-	    break;
-	  case 8: case 0x88:
-	    alpha_shift_status = 4;
-	    break;
-	  default: 
-	    alpha_shift_status = 0;
-	    break;
-	  }
-	  Cursor_SetPosition(Cursor.x, Cursor.y);
-	  Cursor_SetFlashOn(alpha_shift_status);
-	  //Cursor_SetFlashStyle(alpha_shift_status); //Potential 2.00 OS incompatibilty (cf Simon's doc)
-#else
-	  //locate(Cursor.x+1,Cursor.y+1);
-	  //DefineStatusMessage((giac::print_DOUBLE_(Cursor.y,6)+","+giac::print_DOUBLE_(print_y,6)).c_str(),1,0,0);
-	  //DisplayStatusArea();
-	  fakes=string((const char *)curline.str).substr(fakestart,Cursor.x);
-	  fakex=0;
-	  print(fakex,fakey,fakes.c_str(),TEXT_COLOR_BLACK,false,true/* fake*/,minimini); // fake print
-	  drawRectangle(fakex,fakey,2,vfontsize,COLOR_BLACK);
-	  //drawRectangle(Cursor.x*hfontsize,24+Cursor.y*vfontsize,2,vfontsize,COLOR_BLACK);
-#endif
-	}
-      } // end cursor line
-      else {
-	if ((redraw_mode & 1)==0)
-	  continue;
-	drawRectangle(0,i*vfontsize,LCD_WIDTH_PX,vfontsize,_WHITE);
-	bool bigoutput = curline.type==LINE_TYPE_OUTPUT && curline.disp_len>=COL_DISP_MAX-3;
-	locate(bigoutput?3:1,i+1);
-	if (curline.type==LINE_TYPE_INPUT || bigoutput)
-	  Print(curline.str + curline.start_col,TEXT_COLOR_BLACK,colorsyntax,contextptr);
-	else {
-#ifdef CURSOR
-	  locate(COL_DISP_MAX - Line[i + Start_Line].disp_len + 1, i + 1);
-#else
-	  print(print_x,print_y,(const char *)curline.str,TEXT_COLOR_BLACK,false,true/*fake*/,minimini);
-	  print_x=LCD_WIDTH_PX-print_x;
-#endif
-	  Print(curline.str,TEXT_COLOR_BLACK,colorsyntax,contextptr);
-	}
-	if (curline.disp_len - curline.start_col > COL_DISP_MAX){
-#ifdef CURSOR
-	  locate(COL_DISP_MAX, i + 1);
-#else
-	  print_x=LCD_WIDTH_PX+2-hfontsize;
-#endif
-	  Print((char *)">",COLOR_BLUE,colorsyntax,contextptr);
-	}
-	if (curline.start_col > 0){
-#ifdef CURSOR
-	  locate(1, i + 1);
-#else
-	  print_x=0;
-#endif
-	  Print((char *)"<",COLOR_BLUE,colorsyntax,contextptr);
-	}      
-      } // end non cursor line
-    } // end loop on all lines
-    drawRectangle(0,i*vfontsize,LCD_WIDTH_PX,205-i*vfontsize,_WHITE);
-
-    if ((redraw_mode & 1)==1){
-      for (; (i < LINE_DISP_MAX) ; i++)
-	drawRectangle(0,i*vfontsize,LCD_WIDTH_PX,vfontsize,_WHITE);
-#if 0 // def NUMWORKS
-      string menu("shift-Ans help|1 ");
-#else
-      string menu("shift-1 ");
-#endif
-      menu += string(menu_f1);
-      menu += "|2 ";
-      menu += string(menu_f2);
-      menu += "|3 ";
-      menu += string(menu_f3);
-      menu += xcas_python_eval==1?"|4 edt|5 2d|6 logo|7 lin|8 matr|9arit|0 plt":"|4 edt|5 2d|6 regr|7 matr|8 cplx|9 arit|0 rand";
-      int xcas_color=65055,python_color=52832,js_color=63048;
-      int interp_color=xcas_python_eval==-1?js_color:(xcas_python_eval==1?python_color:xcas_color);
-      drawRectangle(0,205,LCD_WIDTH_PX,17,interp_color);
-      PrintMiniMini(0,205,menu.c_str(),0,giac::_BLACK,interp_color);
-    }
-  
-    // status, clock,
-    console_disp_status(contextptr);
-    return CONSOLE_SUCCEEDED;
-  }
-
-  void dConsoleRedraw(){
-    Console_Disp(1,0);
-  }
-
-  char *Console_GetLine(GIAC_CONTEXT)
-  {
-    int return_val;
-	
-    do
-      {
-	return_val = Console_GetKey(contextptr);
-	if (return_val==KEY_SHUTDOWN)
-	  return 0;
-	Console_Disp(1,contextptr);
-	if (return_val == KEY_CTRL_MENU) return 0;
-	if (return_val == CONSOLE_MEM_ERR) return NULL;
-      } while (return_val != CONSOLE_NEW_LINE_SET);
-
-    return Line[Current_Line - 1].str;
-  }
-
-  /*
-    Simple accessor to the Edit_Line buffer.
-  */
-  char* Console_GetEditLine()
-  {
-    return Edit_Line;
-  }
-
-  void save_session(GIAC_CONTEXT){
-    if (nspire_exam_mode==2)
-      return;
-    if (strcmp(session_filename,"session") && console_changed){
-      string tmp(session_filename);
-      tmp += (lang==1)?" a ete modifie!":" was modified!";
-      if (confirm(tmp.c_str(),
-#ifdef NSPIRE_NEWLIB
-		  (lang==1)?"enter: sauve, esc: tant pis":"enter: save, esc: discard changes"
-#else
-		  (lang==1)?"OK: sauve, Back: tant pis":"OK: save, Back: discard changes"
-#endif
-		  )==KEY_CTRL_F1){
-	save(session_filename,contextptr);
-	console_changed=0;
-      }    
-    }
-    save("session",contextptr);
-    // this is only called on exit, no need to reinstall the check_execution_abort timer.
-    if (edptr && edptr->changed && edptr->filename!="session.py"){
-      if (!check_leave(edptr)){
-	save_script("lastprg.py",merge_area(edptr->elements));
-      }
-    }
-  }
-
-#ifdef NSPIRE_NEWLIB
-  bool nspire_fr(){
-    char16_t input_w[] = u"getLangInfo()";
-    void *math_expr = nullptr;
-    int str_offset = 0;
-    
-    int error = TI_MS_evaluateExpr_ACBER(NULL, NULL, (const uint16_t*)input_w, &math_expr, &str_offset);
-    if (error)
-      return false;
-    
-    char16_t *output_w;
-    error = TI_MS_MathExprToStr(math_expr, NULL, (uint16_t**)&output_w);
-    syscall<e_free, void>(math_expr); // Should be TI_MS_DeleteMathExpr
-    
-    if (error)
-      return false;
-    int l=0;
-    for (l=0;l<64;++l){
-      if (output_w[l]==0)
-	break;
-    }
-    bool b=l==4 && output_w[1]=='f' && output_w[2]=='r';
-    // Do something with output_w, it's u"42." here
-    
-    syscall<e_free, void>(output_w);
-    return b;
-  }
-#endif
-
-  tableur * sheetptr=0;
-
-  string print_tableur(const tableur & t,GIAC_CONTEXT){
-    string s="spreadsheet[";
-    for (int i=0;i<t.nrows;++i){
-      printcell_current_row(contextptr)=i;
-      s += "[";
-      gen g=t.m[i];
-      if (g.type!=_VECT) continue;
-      vecteur & v=*g._VECTptr;
-      for (int j=0;j<t.ncols;++j){
-	gen vj=v[j];
-	printcell_current_col(contextptr)=j;
-	s += vj.print(contextptr);
-	if (j==t.ncols-1)
-	  s += "]";
-	else
-	  s += ",";
-      }
-      if (i==t.nrows-1)
-	s += "]";
-      else
-	s += ",";      
-    }
-    return s;
-  }  
-  
-  void fix_sheet(tableur & t,GIAC_CONTEXT){
-    for (int i=0;i<t.nrows;++i){
-      vecteur & v = *t.m[i]._VECTptr;
-      for (int j=0;j<t.ncols;++j){
-	gen & g=v[j];
-	if (g.type==_VECT){
-	  vecteur & w=*g._VECTptr;
-	  if (w[0].type==_SYMB){
-	    // cout << "fix " << w[0] << "\n";
-	    w[0]=spread_convert(w[0],i,j,contextptr);
-	  }
-	}
-      }
-    }
-  }
-
-
-#ifdef NUMWORKS
-  extern "C" void mp_stack_ctrl_init();
-  extern "C" void mp_stack_set_top(void *);
-  extern "C" void mp_stack_set_limit(size_t);
-#endif // NUMWORKS
-
-  int console_main(GIAC_CONTEXT,const char * sessionname){
-#if defined NUMWORKS && defined DEVICE
-    // insure value not too high (_heap_size depends on launcher firmware)
-    if (pythonjs_heap_size>_heap_size-52*1024)
-      pythonjs_heap_size=_heap_size-52*1024;
-#endif
-    mp_stack_ctrl_init();
-    //volatile int stackTop;
-    //mp_stack_set_top((void *)(&stackTop));
-    //mp_stack_set_limit(24*1024);
-#ifdef QUICKJS
-    quickjs_ck_eval("0");
-#endif
-#ifdef MICROPY_LIB
-    giac::micropy_ptr=micropy_ck_eval;
-#endif
-    python_heap=0;
-    sheetptr=0;
-    shutdown=do_shutdown;
-#ifdef NSPIRE_NEWLIB
-    // detect if leds are blinking
-    unsigned green=*(unsigned *) 0x90110b04;
-    unsigned red=*(unsigned *) 0x90110b0c;
-    if (green || red){
-      nspire_exam_mode=1;
-    }
-    // CX and CX II we should modify the led colors to match CAS exam mode
-    // red value should be the same as green value -> yellow
-    // try to detect emulator or real calc
-    unsigned NSPIRE_SPEED=0x900B0000;
-    unsigned speed=*(unsigned *)NSPIRE_SPEED;
-    nspireemu= (speed==1445890);
-    mkdir("Xcas",0755);
-    //mkdir("/Xcas",0755);
-    //mkdir("A:/Xcas",0755);
-    //mkdir("A:\\Xcas",0755);
-    int err=chdir("Xcas");
-    if (err)
-      err=chdir("ndless");
-    bool b=nspire_fr();
-    lang=b?1:0;
-#endif
-    // SetQuitHandler(save_session); // automatically save session when exiting
-    int key;
-    Console_Init(contextptr);
-    if (!turtleptr){
-      turtle();
-      _efface_logo(vecteur(0),contextptr);
-    }
-    caseval("floor"); // init xcas parser for Python syntax coloration (!)
-    Bdisp_AllClr_VRAM();
-    rand_seed(millis(),contextptr);
-    if (nspire_exam_mode){ // disabled: save LED state for restoration at end
-      // set_exam_mode(2,contextptr);
-      exam_mode=0;
-      if (1 || is_cx2){
-	if (!do_confirm(lang?"Le CAS est-il autorise en examen?":"Is CAS allowed during exam?"))
-	  return 0;
-	Bdisp_AllClr_VRAM();
-      }
-    }
-    restore_session(sessionname,contextptr);
-#ifdef SIMU
-    giac::set_language(lang,contextptr);
-#endif
-    giac::angle_radian(os_get_angle_unit()==0,contextptr);
-    //GetKey(&key);
-    Console_Disp(1,contextptr);
-    // GetKey(&key);
-    char *expr=0;
-#ifndef NO_STDEXCEPT
-    try {
-#endif    
-    while(1){
-      if ((expr=Console_GetLine(contextptr))==NULL){
-	save_session(contextptr);
-#ifdef NUMWORKS
-	return 0;
-#endif
-	check_nspire_exam_mode(contextptr);
-#ifdef MICROPY_LIB
-	python_free();
-#endif
-	Console_Free();
-	release_globals();
-	if (sheetptr){
-	  // sheetptr->m.clear();
-	  delete sheetptr;
-	  sheetptr=0;
-	}
-	return 0;
-      }
-      if (strcmp((const char *)expr,"restart")==0){
-	if (confirm((lang==1)?"Effacer variables?":"Clear variables?",
-#ifdef NSPIRE_NEWLIB
-		    (lang==1)?"enter: confirmer,  esc: annuler":"enter: confirm,  esc: cancel"
-#else
-		    (lang==1)?"OK: confirmer,  Back: annuler":"OK: confirm,  Back: cancel"
-#endif
-		    )!=KEY_CTRL_F1){
-	  Console_Output(" cancelled");
-	  Console_NewLine(LINE_TYPE_OUTPUT,1);
-	  //GetKey(&key);
-	  Console_Disp(1,contextptr);
-	  continue;
-	}
-      }
-      // should save in another file
-      if (strcmp((const char *)expr,"=>")==0 || strcmp((const char *)expr,"=>\n")==0){
-	save_session(contextptr);
-	Console_Output("Session saved");
-      }
-      else {
-#ifdef NUMWORKS // add auto-save, to avoid Memory full data loss
-	save("session",contextptr);
-#endif
-	run(expr,7,contextptr);
-      }
-      //print_mem_info();
-      Console_NewLine(LINE_TYPE_OUTPUT,1);
-      //GetKey(&key);
-      Console_Disp(1,contextptr);
-    }
-#ifndef NO_STDEXCEPT
-    } catch(autoshutdown & e) {
-    }
-#endif    
-#ifdef NUMWORKS
-    return 0;
-#endif
-    check_nspire_exam_mode(contextptr);
-    Console_Free();
-    release_globals();
-#ifdef MICROPY_LIB
-    python_free();
-#endif
-    if (sheetptr){
-      // sheetptr->m.clear();
-      delete sheetptr;
-      sheetptr=0;
-    }
-    return 0;
-  }
-
-
-#endif // TEXTAREA
-
-  int rgb24to16(int c){
-    int r=(c>>16)&0xff,g=(c>>8)&0xff,b=c&0xff;
-    return (((r*32)/256)<<11) | (((g*64)/256)<<5) | (b*32/256);
-  }
-
-  // table periodique, code adapte de https://github.com/M4xi1m3/nw-atom
-  // avec l'aimable autorisation de diffusion sous licence GPL de Maxime Friess
-  // https://tiplanet.org/forum/viewtopic.php?f=97&t=23094&p=247471#p247471
-enum AtomType {
-  ALKALI_METAL,
-  ALKALI_EARTH_METAL,
-  LANTHANIDE,
-  ACTINIDE,
-  TRANSITION_METAL,
-  POST_TRANSITION_METAL,
-  METALLOID,
-  HALOGEN,
-  REACTIVE_NONMETAL,
-  NOBLE_GAS,
-  UNKNOWN
-};
-
-struct AtomDef {
-  uint8_t num;
-  uint8_t x;
-  uint8_t y;
-  AtomType type;
-  const char* name;
-  const char* symbol;
-  uint8_t neutrons;
-  double mass;
-  double electroneg;
-};
-
-const AtomDef atomsdefs[] = {
-  {  1,  0,  0, REACTIVE_NONMETAL       , "Hydrogen"     , "H"   ,   0, 1.00784     , 2.2   },
-  {  2, 17,  0, NOBLE_GAS               , "Helium"       , "He"  ,   2, 4.002602    , -1    },
-  
-  
-  {  3,  0,  1, ALKALI_METAL            , "Lithium"      , "Li"  ,   4, 6.938       , 0.98  },
-  {  4,  1,  1, ALKALI_EARTH_METAL      , "Beryllium"    , "Be"  ,   5, 9.012182    , 1.57  },
-  {  5, 12,  1, METALLOID               , "Boron"        , "B"   ,   6, 10.806      , 2.04  },
-  {  6, 13,  1, REACTIVE_NONMETAL       , "Carbon"       , "C"   ,   6, 12.0096     , 2.55  },
-  {  7, 14,  1, REACTIVE_NONMETAL       , "Nitrogen"     , "N"   ,   7, 14.00643    , 3.04  },
-  {  8, 15,  1, REACTIVE_NONMETAL       , "Oxygen"       , "O"   ,   8, 15.99903    , 3.44  },
-  {  9, 16,  1, HALOGEN                 , "Fluorine"     , "F"   ,  10, 18.9984032  , 3.98  },
-  { 10, 17,  1, NOBLE_GAS               , "Neon"         , "Ne"  ,  10, 20.1797     , -1    },
-  
-  
-  { 11,  0,  2, ALKALI_METAL            , "Sodium"       , "Na"  ,  12, 22.9897693  , 0.93  },
-  { 12,  1,  2, ALKALI_EARTH_METAL      , "Magnesium"    , "Mg"  ,  12, 24.3050     , 1.31  },
-  { 13, 12,  2, POST_TRANSITION_METAL   , "Aluminium"    , "Al"  ,  14, 26.9815386  , 1.61  },
-  { 14, 13,  2, METALLOID               , "Silicon"      , "Si"  ,  14, 28.084      , 1.9   },
-  { 15, 14,  2, REACTIVE_NONMETAL       , "Phosphorus"   , "P"   ,  16, 30.973762   , 2.19  },
-  { 16, 15,  2, REACTIVE_NONMETAL       , "Sulfur"       , "S"   ,  16, 32.059      , 2.58  },
-  { 17, 16,  2, HALOGEN                 , "Chlorine"     , "Cl"  ,  18, 35.446      , 3.16  },
-  { 18, 17,  2, NOBLE_GAS               , "Argon"        , "Ar"  ,  22, 39.948      , -1    },
-  
-  
-  { 19,  0,  3, ALKALI_METAL            , "Potassium"    , "K"   ,  20, 39.0983     , 0.82  },
-  { 20,  1,  3, ALKALI_EARTH_METAL      , "Calcium"      , "Ca"  ,  20, 40.078      , 1     },
-  { 21,  2,  3, TRANSITION_METAL        , "Scandium"     , "Sc"  ,  24, 44.955912   , 1.36  },
-  { 22,  3,  3, TRANSITION_METAL        , "Titanium"     , "Ti"  ,  26, 47.867      , 1.54  },
-  { 23,  4,  3, TRANSITION_METAL        , "Vanadium"     , "V"   ,  28, 50.9415     , 1.63  },
-  { 24,  5,  3, TRANSITION_METAL        , "Chromium"     , "Cr"  ,  28, 51.9961     , 1.66  },
-  { 25,  6,  3, TRANSITION_METAL        , "Manganese"    , "Mn"  ,  30, 54.938045   , 1.55  },
-  { 26,  7,  3, TRANSITION_METAL        , "Iron"         , "Fe"  ,  30, 55.845      , 1.83  },
-  { 27,  8,  3, TRANSITION_METAL        , "Cobalt"       , "Co"  ,  32, 58.933195   , 1.88  },
-  { 28,  9,  3, TRANSITION_METAL        , "Nickel"       , "Ni"  ,  30, 58.6934     , 1.91  },
-  { 29, 10,  3, TRANSITION_METAL        , "Copper"       , "Cu"  ,  34, 63.546      , 1.9   },
-  { 30, 11,  3, POST_TRANSITION_METAL   , "Zinc"         , "Zn"  ,  34, 65.38       , 1.65  },
-  { 31, 12,  3, POST_TRANSITION_METAL   , "Gallium"      , "Ga"  ,  38, 69.723      , 1.81  },
-  { 32, 13,  3, METALLOID               , "Germanium"    , "Ge"  ,  42, 72.63       , 2.01  },
-  { 33, 14,  3, METALLOID               , "Arsenic"      , "As"  ,  42, 74.92160    , 2.18  },
-  { 34, 15,  3, REACTIVE_NONMETAL       , "Selenium"     , "Se"  ,  46, 78.96       , 2.55  },
-  { 35, 16,  3, HALOGEN                 , "Bromine"      , "Br"  ,  44, 79.904      , 2.96  },
-  { 36, 17,  3, NOBLE_GAS               , "Krypton"      , "Kr"  ,  48, 83.798      , -1    },
-  
-  { 37,  0,  4, ALKALI_METAL            , "Rubidium"     , "Rb"  ,  48, 85.4678     , 0.82  },
-  { 38,  1,  4, ALKALI_EARTH_METAL      , "Strontium"    , "Sr"  ,  50, 87.62       , 0.95  },
-  { 39,  2,  4, TRANSITION_METAL        , "Yttrium"      , "Y"   ,  50, 88.90585    , 1.22  },
-  { 40,  3,  4, TRANSITION_METAL        , "Zirconium"    , "Zr"  ,  50, 91.224      , 1.33  },
-  { 41,  4,  4, TRANSITION_METAL        , "Niobium"      , "Nb"  ,  52, 92.90638    , 1.6   },
-  { 42,  5,  4, TRANSITION_METAL        , "Molybdenum"   , "Mo"  ,  56, 95.96       , 2.16  },
-  { 43,  6,  4, TRANSITION_METAL        , "Technetium"   , "Tc"  ,  55, 98          , 2.10  },
-  { 44,  7,  4, TRANSITION_METAL        , "Ruthemium"    , "Ru"  ,  58, 101.07      , 2.2   },
-  { 45,  8,  4, TRANSITION_METAL        , "Rhodium"      , "Rh"  ,  58, 102.90550   , 2.28  },
-  { 46,  9,  4, TRANSITION_METAL        , "Palladium"    , "Pd"  ,  60, 106.42      , 2.20  },
-  { 47, 10,  4, TRANSITION_METAL        , "Silver"       , "Ag"  ,  60, 107.8682    , 1.93  },
-  { 48, 11,  4, POST_TRANSITION_METAL   , "Cadmium"      , "Cd"  ,  66, 112.411     , 1.69  },
-  { 49, 12,  4, POST_TRANSITION_METAL   , "Indium"       , "In"  ,  66, 114.818     , 1.78  },
-  { 50, 13,  4, POST_TRANSITION_METAL   , "Tin"          , "Sn"  ,  70, 118.710     , 1.96  },
-  { 51, 14,  4, METALLOID               , "Antimony"     , "Sb"  ,  70, 121.760     , 2.05  },
-  { 52, 15,  4, METALLOID               , "Tellurium"    , "Te"  ,  78, 127.60      , 2.1   },
-  { 53, 16,  4, HALOGEN                 , "Indine"       , "I"   ,  74, 126.90447   , 2.66  },
-  { 54, 17,  4, NOBLE_GAS               , "Xenon"        , "Xe"  ,  78, 131.293     , 2.60  },
-  
-  
-  { 55,  0,  5, ALKALI_METAL            , "Caesium"      , "Cs"  ,  78, 132.905452  , 0.79  },
-  { 56,  1,  5, ALKALI_EARTH_METAL      , "Barium"       , "Ba"  ,  82, 137.327     , 0.89  },
-
-  { 57,  3,  7, LANTHANIDE              , "Lanthanum"    , "La"  ,  82, 138.90547   , 1.10  },
-  { 58,  4,  7, LANTHANIDE              , "Cerium"       , "Ce"  ,  82, 140.116     , 1.12  },
-  { 59,  5,  7, LANTHANIDE              , "Praseodymium" , "Pr"  ,  82, 140.90765   , 1.13  },
-  { 60,  6,  7, LANTHANIDE              , "Neodymium"    , "Nd"  ,  82, 144.242     , 1.14  },
-  { 61,  7,  7, LANTHANIDE              , "Promethium"   , "Pm"  ,  84, 145         , 1.13  },
-  { 62,  8,  7, LANTHANIDE              , "Samarium"     , "Sm"  ,  90, 150.36      , 1.17  },
-  { 63,  9,  7, LANTHANIDE              , "Europium"     , "Eu"  ,  90, 151.964     , 1.12  },
-  { 64, 10,  7, LANTHANIDE              , "Gadolinium"   , "Gd"  ,  94, 157.25      , 1.20  },
-  { 65, 11,  7, LANTHANIDE              , "Terbium"      , "Tb"  ,  94, 158.92535   , 1.12  },
-  { 66, 12,  7, LANTHANIDE              , "Dyxprosium"   , "Dy"  ,  98, 162.500     , 1.22  },
-  { 67, 13,  7, LANTHANIDE              , "Holmium"      , "Ho"  ,  98, 164.93032   , 1.23  },
-  { 68, 14,  7, LANTHANIDE              , "Erbium"       , "Er"  ,  98, 167.259     , 1.24  },
-  { 69, 15,  7, LANTHANIDE              , "Thulium"      , "Tm"  , 100, 168.93421   , 1.25  },
-  { 70, 16,  7, LANTHANIDE              , "Ytterbium"    , "Yb"  , 104, 173.054     , 1.1   },
-  { 71, 17,  7, LANTHANIDE              , "Lutetium"     , "Lu"  , 104, 174.9668    , 1.0   },
-
-  { 72,  3,  5, TRANSITION_METAL        , "Hafnium"      , "Hf"  , 108, 178.49      , 1.3   },
-  { 73,  4,  5, TRANSITION_METAL        , "Tantalum"     , "Ta"  , 108, 180.94788   , 1.5   },
-  { 74,  5,  5, TRANSITION_METAL        , "Tungsten"     , "W"   , 110, 183.84      , 1.7   },
-  { 75,  6,  5, TRANSITION_METAL        , "Rhenium"      , "Re"  , 112, 186.207     , 1.9   },
-  { 76,  7,  5, TRANSITION_METAL        , "Osmium"       , "Os"  , 116, 190.23      , 2.2   },
-  { 77,  8,  5, TRANSITION_METAL        , "Iridium"      , "Ir"  , 116, 192.217     , 2.2   },
-  { 78,  9,  5, TRANSITION_METAL        , "Platinum"     , "Pt"  , 117, 195.084     , 2.2   },
-  { 79, 10,  5, TRANSITION_METAL        , "Gold"         , "Au"  , 118, 196.966569  , 2.4   },
-  { 80, 11,  5, POST_TRANSITION_METAL   , "Mercury"      , "Hg"  , 122, 200.59      , 1.9   },
-  { 81, 12,  5, POST_TRANSITION_METAL   , "Thalium"      , "Tl"  , 124, 204.382     , 1.8   },
-  { 82, 13,  5, POST_TRANSITION_METAL   , "Lead"         , "Pb"  , 126, 207.2       , 1.8   },
-  { 83, 14,  5, POST_TRANSITION_METAL   , "Bismuth"      , "Bi"  , 126, 208.98040   , 1.9   },
-  { 84, 15,  5, POST_TRANSITION_METAL   , "Polonium"     , "Po"  , 126, 209         , 2.0   },
-  { 85, 16,  5, HALOGEN                 , "Astatine"     , "At"  , 125, 210         , 2.2   },
-  { 86, 17,  5, NOBLE_GAS               , "Radon"        , "Rn"  , 136, 222         , 2.2   },
-  
-  
-  { 87,  0,  6, ALKALI_METAL            , "Francium"     , "Fr"  , 136, 223         , 0.7   },
-  { 88,  1,  6, ALKALI_EARTH_METAL      , "Radium"       , "Ra"  , 138, 226         , 0.9   },
-
-  { 89,  3,  8, ACTINIDE                , "Actinium"     , "Ac"  , 138, 227         , 1.1   },
-  { 90,  4,  8, ACTINIDE                , "Thorium"      , "Th"  , 142, 232.03806   , 1.3   },
-  { 91,  5,  8, ACTINIDE                , "Protactinium" , "Pa"  , 140, 231.03588   , 1.5   },
-  { 92,  6,  8, ACTINIDE                , "Uranium"      , "U"   , 146, 238.02891   , 1.38   },
-  { 93,  7,  8, ACTINIDE                , "Neptunium"    , "Np"  , 144, 237         , 1.36   },
-  { 94,  8,  8, ACTINIDE                , "Plutonium"    , "Pu"  , 150, 244         , 1.28   },
-  { 95,  9,  8, ACTINIDE                , "Americium"    , "Am"  , 148, 243         , 1.13  },
-  { 96, 10,  8, ACTINIDE                , "Curium"       , "Cm"  , 151, 247         , 1.28  },
-  { 97, 11,  8, ACTINIDE                , "Berkellum"    , "Bk"  , 150, 247         , 1.3   },
-  { 98, 12,  8, ACTINIDE                , "Californium"  , "Cf"  , 153, 251         , 1.3   },
-  { 99, 13,  8, ACTINIDE                , "Einsteinium"  , "Es"  , 153, 252         , 1.3   },
-  {100, 14,  8, ACTINIDE                , "Fermium"      , "Fm"  , 157, 257         , 1.3   },
-  {101, 15,  8, ACTINIDE                , "Mendelevium"  , "Md"  , 157, 258         , 1.3   },
-  {102, 16,  8, ACTINIDE                , "Nobelium"     , "No"  , 157, 259         , 1.3   },
-  {103, 17,  8, ACTINIDE                , "Lawrencium"   , "Lr"  , 163, 262         , 1.3   },
-
-  {104,  3,  6, TRANSITION_METAL        , "Rutherfordium", "Rf"  , 163, 261         , -1    },
-  {105,  4,  6, TRANSITION_METAL        , "Dubnium"      , "Db"  , 163, 262         , -1    },
-  {106,  5,  6, TRANSITION_METAL        , "Seaborgium"   , "Sg"  , 163, 263         , -1    },
-  {107,  6,  6, TRANSITION_METAL        , "Bohrium"      , "Bh"  , 163, 264         , -1    },
-  {108,  7,  6, TRANSITION_METAL        , "Hassium"      , "Hs"  , 169, 265         , -1    },
-  {109,  8,  6, UNKNOWN                 , "Meitnerium"   , "Mt"  , 169, 268         , -1    },
-  {110,  9,  6, UNKNOWN                 , "Damstadtium"  , "Ds"  , 171, 281         , -1    },
-  {111, 10,  6, UNKNOWN                 , "Roentgenium"  , "Rg"  , 171, 273         , -1    },
-  {112, 11,  6, POST_TRANSITION_METAL   , "Coppernicium" , "Cn"  , 173, 277         , -1    },
-  {113, 12,  6, UNKNOWN                 , "Nihonium"     , "Nh"  , 173, 283         , -1    },
-  {114, 13,  6, UNKNOWN                 , "Flerovium"    , "Fl"  , 175, 285         , -1    },
-  {115, 14,  6, UNKNOWN                 , "Moscovium"    , "Mv"  , 174, 287         , -1    },
-  {116, 15,  6, UNKNOWN                 , "Livermorium"  , "Lv"  , 177, 289         , -1    },
-  {117, 16,  6, UNKNOWN                 , "Tennessine"   , "Ts"  , 177, 294         , -1    },
-  {118, 17,  6, NOBLE_GAS               , "Oganesson"    , "Og"  , 176, 293         , -1    },
-  
-};
-  
-void drawAtom(uint8_t id) {
-  int fill = rgb24to16(0xeeeeee);
-
-  switch(atomsdefs[id].type) {
-    case ALKALI_METAL:
-      fill = rgb24to16(0xffaa00);
-      break;
-    case ALKALI_EARTH_METAL:
-      fill = rgb24to16(0xf6f200);
-      break;
-    case LANTHANIDE:
-      fill = rgb24to16(0xffaa8b);
-      break;
-    case ACTINIDE:
-      fill = rgb24to16(0xdeaacd);
-      break;
-    case TRANSITION_METAL:
-      fill = rgb24to16(0xde999c);
-      break;
-    case POST_TRANSITION_METAL:
-      fill = rgb24to16(0x9cbaac);
-      break;
-    case METALLOID:
-      fill = rgb24to16(0x52ce8b);
-      break;
-    case REACTIVE_NONMETAL:
-      fill = rgb24to16(0x00ee00);
-      break;
-    case NOBLE_GAS:
-      fill = rgb24to16(0x8baaff);
-      break;
-    case HALOGEN:
-      fill = rgb24to16(0x00debd);
-      break;
-    default:
-      break;
-  }
-
-  if (atomsdefs[id].y >= 7) {
-    drawRectangle(6 + atomsdefs[id].x * 17, 15 + atomsdefs[id].y * 17, 18, 18, fill);
-    stroke_rectangle(6 + atomsdefs[id].x * 17, 15 + atomsdefs[id].y * 17, 18, 18, rgb24to16(0x525552));
-    os_draw_string_small(8 + atomsdefs[id].x * 17, 17 + atomsdefs[id].y * 17, _BLACK, fill, atomsdefs[id].symbol);
-  } else {
-    drawRectangle(6 + atomsdefs[id].x * 17, 6 + atomsdefs[id].y * 17, 18, 18, fill);
-    stroke_rectangle(6 + atomsdefs[id].x * 17, 6 + atomsdefs[id].y * 17, 18, 18, rgb24to16(0x525552));
-    os_draw_string_small(8 + atomsdefs[id].x * 17, 8 + atomsdefs[id].y * 17, _BLACK, fill, atomsdefs[id].symbol);
-  }
-}
-
-  int periodic_table(const char * & name,const char * & symbol,char * protons,char * nucleons,char * mass,char * electroneg){
-    bool partial_draw=false,redraw=true;
-    int cursor_pos=0;
-    const int ATOM_NUMS=sizeof(atomsdefs)/sizeof(AtomDef);
-    for (;;){
-      if (redraw){
-	if (partial_draw) {
-	  partial_draw = false;
-	  drawRectangle(50, 0, 169, 57, _WHITE);
-	  drawRectangle(0, 185, LCD_WIDTH_PX, 15, _WHITE);
-	} else {
-	  drawRectangle(0,0,LCD_WIDTH_PX,LCD_HEIGHT_PX,_WHITE);
-	}
-#ifdef NSPIRE_NEWLIB
-	os_draw_string_small_(0,200,gettext("enter: tout, P:protons, N:nucleons, M:mass, E:khi"));
-#else
-	os_draw_string_small_(0,200,gettext("OK: tout, P:protons, N:nucleons, M:mass, E:khi"));
-#endif
-	for(int i = 0; i < ATOM_NUMS; i++) {
-	  drawAtom(i);
-	}
-	if (atomsdefs[cursor_pos].y >= 7) {
-	  stroke_rectangle(6 + atomsdefs[cursor_pos].x * 17, 15 + atomsdefs[cursor_pos].y * 17, 18, 18, 0x000000);
-	  stroke_rectangle(7 + atomsdefs[cursor_pos].x * 17, 16 + atomsdefs[cursor_pos].y * 17, 16, 16, 0x000000);
-	} else {
-	  stroke_rectangle(6 + atomsdefs[cursor_pos].x * 17, 6 + atomsdefs[cursor_pos].y * 17, 18, 18, 0x000000);
-	  stroke_rectangle(7 + atomsdefs[cursor_pos].x * 17, 7 + atomsdefs[cursor_pos].y * 17, 16, 16, 0x000000);
-	}
-  
-	drawRectangle(48,  99, 2, 61,rgb24to16(0x525552));
-	drawRectangle(48, 141, 9,  2, rgb24to16(0x525552));
-	drawRectangle(48, 158, 9,  2, rgb24to16(0x525552));
-
-	int prot=atomsdefs[cursor_pos].num;
-	sprint_int(protons,prot);
-	int nuc=atomsdefs[cursor_pos].neutrons+atomsdefs[cursor_pos].num;
-	sprint_int(nucleons,nuc);
-	
-	symbol=atomsdefs[cursor_pos].symbol;
-	os_draw_string_(73,23,symbol);
-	name=atomsdefs[cursor_pos].name;
-	os_draw_string_small_(110,27,gettext(name));
-	os_draw_string_small_(50,18,nucleons);
-	os_draw_string_small_(50,31,protons);
-	strcpy(mass,"M:");
-	strcpy(electroneg,"khi:");
-	sprint_double(mass+2,atomsdefs[cursor_pos].mass);
-	os_draw_string_small_(0,186,mass);
-	sprint_double(electroneg+4,atomsdefs[cursor_pos].electroneg);
-	os_draw_string_small_(160,186,electroneg);
-      }
-      redraw=false;
-      int key;
-      GetKey(&key);
-      if (key==KEY_SHUTDOWN)
-	return key;
-      if (key==KEY_PRGM_ACON)
-	redraw=true;
-      if (key==KEY_CTRL_EXIT)
-	return 0;
-      if (key==KEY_CTRL_EXE || key==KEY_CTRL_OK)
-	return 1|4|8|16|32;
-      if (key=='s' || key==KEY_CHAR_5)
-	return 2;
-      if (key=='p' || key==KEY_CHAR_LPAR)
-	return 4;
-      if (key=='n' || key==KEY_CHAR_8)
-	return 8;
-      if (key=='m' || key==KEY_CHAR_7)
-	return 16;
-      if (key=='e' || key==KEY_CHAR_COMMA)
-	return 32;
-      if (key==KEY_CTRL_LEFT){
-	if (cursor_pos>0)
-	  --cursor_pos;
-	redraw=partial_draw=true;
-      }
-      if (key==KEY_CTRL_RIGHT){
-	if (cursor_pos< ATOM_NUMS-1)
-	  ++cursor_pos;
-	redraw=partial_draw=true;
-      }
-      if (key==KEY_CTRL_UP){
-	uint8_t curr_x = atomsdefs[cursor_pos].x;
-	uint8_t curr_y = atomsdefs[cursor_pos].y;
-	bool updated = false;
-	
-	if (curr_y > 0 && curr_y <= 9) {
-	  for(uint8_t i = 0; i < ATOM_NUMS; i++) {
-	    if (atomsdefs[i].x == curr_x && atomsdefs[i].y == curr_y - 1) {
-	      cursor_pos = i;
-	      redraw=partial_draw = true;
-	    }
-	  }
-	}
-	
-      }
-      if (key==KEY_CTRL_DOWN){
-	uint8_t curr_x = atomsdefs[cursor_pos].x;
-	uint8_t curr_y = atomsdefs[cursor_pos].y;
-	bool updated = false;
-	
-	if (curr_y >= 0 && curr_y < 9) {
-	  for (uint8_t i = 0; i < ATOM_NUMS; i++) {
-	    if (atomsdefs[i].x == curr_x && atomsdefs[i].y == curr_y + 1) {
-	      cursor_pos = i;
-	      redraw=partial_draw = true;
-	      break;
-	    }
-	  }
-	}
-      }
-    } // end endless for
-  } // end periodic_table
-
-#ifndef NO_NAMESPACE_XCAS
-} // namespace xcas
-#endif // ndef NO_NAMESPACE_XCAS
-
-void console_output(const char * s,int l){
-  char buf[l+1];
-  strncpy(buf,s,l);
-  buf[l]=0;
-  xcas::dConsolePut(buf);
-}
-
-const char * console_input(const char * msg1,const char * msg2,bool numeric,int ypos){
-  static string str;
-  if (!giac::inputline(msg1,msg2,str,numeric,ypos,context0))
-    return 0;
-  return str.c_str();
-}
-
-void c_draw_rectangle(int x,int y,int w,int h,int c){
-  giac::freeze=true;
-  xcas::draw_line(x,y,x+w,y,c);
-  xcas::draw_line(x+w,y,x+w,y+h,c);
-  xcas::draw_line(x,y+h,x+w,y+h,c);
-  xcas::draw_line(x,y,x,y+h,c);
-}
-void c_draw_line(int x0,int y0,int x1,int y1,int c){
-  giac::freeze=true;
-  xcas::draw_line(x0,y0,x1,y1,c);
-}
-void c_draw_circle(int xc,int yc,int r,int color,bool q1,bool q2,bool q3,bool q4){
-  giac::freeze=true;
-  xcas::draw_circle(xc,yc,r,color,q1,q2,q3,q4);
-}
-void c_draw_filled_circle(int xc,int yc,int r,int color,bool left,bool right){
-  giac::freeze=true;
-  xcas::draw_filled_circle(xc,yc,r,color,left,right);
-}
-void c_convert(int *x,int*y,vector< vector<int> > & v){
-  for (int i=0;i<v.size();++i,++x,++y){
-    v[i].push_back(*x);
-    v[i].push_back(*y);
-  }
-}
-void c_draw_polygon(int * x,int *y ,int n,int color){
-  giac::freeze=true;
-  vector< vector<int> > v(n);
-  c_convert(x,y,v);
-  xcas::draw_polygon(v,color);
-}
-void c_draw_filled_polygon(int * x,int *y, int n,int xmin,int xmax,int ymin,int ymax,int color){
-  giac::freeze=true;
-  vector< vector<int> > v(n);
-  c_convert(x,y,v);
-  xcas::draw_filled_polygon(v,xmin,xmax,ymin,ymax,color);
-}
-void c_draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2){
-  giac::freeze=true;
-  xcas::draw_arc(xc,yc,rx,ry,color,theta1,theta2);
-}
-void c_draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment){
-  giac::freeze=true;
-  xcas::draw_filled_arc(x,y,rx,ry,theta1_deg,theta2_deg,color,xmin,xmax,ymin,ymax,segment);
-}
-void c_set_pixel(int x,int y,int c){
-  giac::freeze=true;
-  os_set_pixel(x,y,c);
-}
-void c_fill_rect(int x,int y,int w,int h,int c){
-  giac::freeze=true;
-  if (w<0){
-    w=-w;
-    x -= w; 
-  }
-  if (h<0){
-    h=-h;
-    y -= h; 
-  }
-  if (x<0){ w+=x; x=0;}
-  if (y<0){ h+=y; y=0;}
-  os_fill_rect(x,y,w,h,c);
-}
-int c_draw_string(int x,int y,int c,int bg,const char * s,bool fake){
-  giac::freeze=true;
-  return os_draw_string(x,y,c,bg,s,fake);
-}
-int c_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake){
-  giac::freeze=true;
-  return os_draw_string_small(x,y,c,bg,s,fake);
-}
-int c_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake){
-  giac::freeze=true;
-  return os_draw_string_medium(x,y,c,bg,s,fake);
-}
-
-int select_item(const char ** ptr,const char * title,bool askfor1){
-  int nitems=0;
-  for (const char ** p=ptr;*p;++p)
-    ++nitems;
-  if (nitems==0 || nitems>=256)
-    return -1;
-  if (!askfor1 && nitems==1)
-    return 0;
-  MenuItem smallmenuitems[nitems];
-  for (int i=0;i<nitems;++i){
-    smallmenuitems[i].text=(char *) ptr[i];
-  }
-  Menu smallmenu;
-  smallmenu.numitems=nitems; 
-  smallmenu.items=smallmenuitems;
-  smallmenu.height=12;
-  smallmenu.scrollbar=1;
-  smallmenu.scrollout=1;
-  smallmenu.title = (char*) title;
-  //MsgBoxPush(5);
-  int sres = doMenu(&smallmenu);
-  //MsgBoxPop();
-  if (sres!=MENU_RETURN_SELECTION && sres!=KEY_CTRL_EXE)
-    return -1;
-  return smallmenu.selection-1;
-}
-
-int select_interpreter(){
-  const char * choix[]={"Xcas interpreter","Xcas compat Python ^=**","Xcas compat Python ^=xor","MicroPython interpreter","Javascript (QuickJS)",0};
-  return select_item(choix,"Syntax",false);
-}
-
-ulonglong double2gen(double d){
-  giac::gen g(d);
-  return *(ulonglong *) &g;
-}
-
-ulonglong int2gen(int d){
-  giac::gen g(d);
-  return *(ulonglong *) &g;
-}
-
-void turtle_freeze(){
-  freezeturtle=true;
-}
-
-void doubleptr2matrice(double * x,int n,int m,giac::matrice & M){
-  M.resize(n);
-  for (int i=0;i<n;++i){
-    M[i]=giac::vecteur(m);
-    giac::vecteur & w=*M[i]._VECTptr;
-    for (int j=0;j<m;++j){
-      w[j]=*x;
-      ++x;
-    }
-  }
-}
-
-// x must have enough space!
-bool matrice2doubleptr(const giac::matrice &M,double *x){
-  int n=M.size();
-  if (n==0 || M.front().type!=giac::_VECT)
-    return false;
-  int m=M.front()._VECTptr->size();
-  for (int i=0;i<n;++i){
-    if (M[i].type!=giac::_VECT || M[i]._VECTptr->size()!=m)
-      return false;
-    giac::vecteur & w=*M[i]._VECTptr;
-    for (int j=0;j<m;++j){
-      giac::gen g =giac::evalf_double(w[j],1,giac::context0);
-      if (g.type!=giac::_DOUBLE_)
-	return false;
-      *x=g._DOUBLE_val;
-      ++x;
-    }
-  }
-  return true;
-}
-
-bool r_inv(double * x,int n){
-  giac::matrice M(n);
-  doubleptr2matrice(x,n,n,M);
-  M=giac::minv(M,giac::context0);
-  return matrice2doubleptr(M,x);
-}
-
-
-bool r_rref(double * x,int n,int m){
-  giac::matrice M(n);
-  doubleptr2matrice(x,n,m,M);
-  giac::gen g=giac::_rref(M,giac::context0);
-  if (g.type!=giac::_VECT)
-    return false;
-  return matrice2doubleptr(*g._VECTptr,x);
-}
-
-double r_det(double *x,int n){
-  giac::matrice M(n);
-  doubleptr2matrice(x,n,n,M);
-  giac::gen g=giac::mdet(M,giac::context0);
-  g=giac::evalf_double(g,1,giac::context0);
-  double d=1.0,e=1.0;
-  if (g.type!=_DOUBLE_)
-    return 0.0/(d-e);
-  return g._DOUBLE_val;
-}
-
-void c_complexptr2matrice(c_complex * x,int n,int m,giac::matrice & M){
-  M.resize(n);
-  for (int i=0;i<n;++i){
-    if (m==0){
-      M[i]=gen(x->r,x->i);
-      ++x;
-      continue;
-    }
-    M[i]=giac::vecteur(m);
-    giac::vecteur & w=*M[i]._VECTptr;
-    for (int j=0;j<m;++j){
-      w[j]=gen(x->r,x->i);
-      ++x;
-    }
-  }
-}
-
-c_complex gen2c_complex(giac::gen & g){
-  double d=1.0,e=1.0;
-  c_complex c={0,0};
-  if (g.type!=giac::_DOUBLE_ && g.type!=giac::_CPLX)
-    c.r=c.i=0.0/(d-e);
-  else {
-    if (g.type==giac::_DOUBLE_)
-      c.r=g._DOUBLE_val;
-    else {
-      if (g.subtype!=3)
-	c.r=c.i=0.0/(d-e);
-      c.r=g._CPLXptr->_DOUBLE_val;
-      c.i=(g._CPLXptr+1)->_DOUBLE_val;
-    }
-  }
-  return c;
-}
-
-// x must have enough space!
-bool matrice2c_complexptr(const giac::matrice &M,c_complex *x){
-  int n=M.size();
-  if (n==0)
-    return false;
-  if (M.front().type!=giac::_VECT){
-    for (int i=0;i<n;++i){
-      giac::gen g =giac::evalf_double(M[i],1,giac::context0);
-      if (g.type!=giac::_DOUBLE_ && g.type!=giac::_CPLX)
-	return false;
-      *x=gen2c_complex(g);
-      ++x;
-    }
-    return true;
-  }
-  int m=M.front()._VECTptr->size();
-  for (int i=0;i<n;++i){
-    if (M[i].type!=giac::_VECT || M[i]._VECTptr->size()!=m)
-      return false;
-    giac::vecteur & w=*M[i]._VECTptr;
-    for (int j=0;j<m;++j){
-      giac::gen g =giac::evalf_double(w[j],1,giac::context0);
-      if (g.type!=giac::_DOUBLE_ && g.type!=giac::_CPLX)
-	return false;
-      *x=gen2c_complex(g);
-      ++x;
-    }
-  }
-  return true;
-}
-
-bool c_inv(c_complex * x,int n){
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,n,M);
-  M=giac::minv(M,giac::context0);
-  return matrice2c_complexptr(M,x);
-}
-
-bool c_proot(c_complex * x,int n){
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,0,M);
-  M=giac::proot(M);
-  return matrice2c_complexptr(M,x);
-}
-
-bool c_pcoeff(c_complex * x,int n){
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,0,M);
-  M=giac::pcoeff(M);
-  return matrice2c_complexptr(M,x);
-}
-
-bool c_fft(c_complex * x,int n,bool inverse){
-#if 1
-  complex<double> * X=(complex<double> *) x;
-  double theta=2*M_PI/n;
-  if (!inverse)
-    theta=-theta;
-  fft2(X,n,theta);
-  if (inverse){
-    for (int i=0;i<n;++i)
-      X[i]=X[i]/double(n);
-  }
-  return true;
-#else
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,0,M);
-  gen g=inverse?giac::_ifft(M,giac::context0):giac::_fft(M,giac::context0);
-  if (g.type!=_VECT)
-    return false;
-  return matrice2c_complexptr(*g._VECTptr,x);
-#endif
-}
-
-bool c_egv(c_complex * x,int n){
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,n,M);
-  gen g=giac::_egv(M,giac::context0);
-  if (!ckmatrix(g))
-    return false;
-  return matrice2c_complexptr(*g._VECTptr,x);
-}
-
-bool c_eig(c_complex * x,c_complex * d,int n){
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,n,M);
-  gen g=giac::_jordan(M,giac::context0);
-  if (g.type!=_VECT || g._VECTptr->size()!=2 || !ckmatrix(g[0]) || !ckmatrix(g[1]))
-    return false;
-  return matrice2c_complexptr(*g[0]._VECTptr,x) && matrice2c_complexptr(*g[1]._VECTptr,d);
-}
-
-bool c_rref(c_complex * x,int n,int m){
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,m,M);
-  giac::gen g=giac::_rref(M,giac::context0);
-  if (g.type!=giac::_VECT)
-    return false;
-  return matrice2c_complexptr(*g._VECTptr,x);
-}
-
-c_complex c_det(c_complex *x,int n){
-  giac::matrice M(n);
-  c_complexptr2matrice(x,n,n,M);
-  giac::gen g=giac::mdet(M,giac::context0);
-  g=giac::evalf_double(g,1,giac::context0);
-  return gen2c_complex(g);
-}
-
-void c_sprint_double(char * s,double d){
-  giac::sprint_double(s,d);
-}
-
-void c_turtle_forward(double d){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  //const context * contextptr=caseval_context();
-  giac::_avance(d,cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_left(double d){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  giac::_tourne_gauche(d,cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_up(int i){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  if (i)
-    giac::_leve_crayon(0,cascontextptr);
-  else
-    giac::_baisse_crayon(0,cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_goto(double x,double y){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  giac::_position(makesequence(x,y),cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_cap(double x){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  giac::_cap(x,cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_crayon(int i){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  giac::_crayon(i,cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_rond(int x,int y,int z){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  giac::_rond(makesequence(x,y,z),cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_disque(int x,int y,int z,int centre){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  if (centre)
-    giac::_disque_centre(makesequence(x,y,z),cascontextptr);
-  else
-    giac::_disque(makesequence(x,y,z),cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_fill(int i){
-  gen arg(vecteur(0));
-  if (i==0) 
-    arg.subtype=_SEQ__VECT;
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  giac::_polygone_rempli(arg,cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_fillcolor(double r,double g,double b,int entier){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  if (entier)
-    giac::_polygone_rempli(makesequence(int(r),int(g),int(b)),cascontextptr);
-  else
-    giac::_polygone_rempli(makesequence(r,g,b),cascontextptr);
-  py_ck_ctrl_c();
-}
-
-void c_turtle_getposition(double * x,double * y){
-  context * cascontextptr=(context *)caseval("caseval contextptr");
-  gen arg(vecteur(0)); arg.subtype=_SEQ__VECT;
-  giac::gen g=giac::_position(arg,cascontextptr);
-  if (g.type==_VECT && g._VECTptr->size()==2){
-    gen a=g._VECTptr->front(),b=g._VECTptr->back();
-    a=evalf_double(a,1,cascontextptr);
-    b=evalf_double(b,1,cascontextptr);
-    *x=a._DOUBLE_val;
-    *y=b._DOUBLE_val;
-  }
-}
-
-// auto-shutdown
-int do_shutdown(){
-  xcas::save_console_state_smem("session.xw.tns",false,giac::context0);
-#ifdef NO_STDEXCEPT
-  return 1;
-#else
-  throw autoshutdown();
-#endif
-}
-
-// string translations
-#ifdef NUMWORKS
-#include "numworks_translate.h"
-#else
-#include "aspen_translate.h"
-#endif
-bool tri2(const char4 & a,const char4 & b){
-  int res= strcmp(a[0],b[0]);
-  return res<0;
-}
-
-int giac2aspen(int lang){
-  switch (lang){
-  case 0: case 2:
-    return 1;
-  case 1:
-    return 3;
-  case 3:
-    return 5;
-  case 6:
-    return 7;
-  case 8:
-    return 2;
-  case 5:
-    return 4;
-  }
-  return 0;
-}
-
-const char * gettext(const char * s) { 
-  // 0 and 2 english 1 french 3 sp 4 el 5 de 6 it 7 tr 8 zh 9 pt
-  int aspenlang=giac2aspen(lang);
-  char4 s4={s};
-  std::pair<char4 * const,char4 *const> pp=equal_range(aspen_giac_translations,aspen_giac_translations+aspen_giac_records,s4,tri2);
-  if (pp.first!=pp.second && 
-      pp.second!=aspen_giac_translations+aspen_giac_records &&
-      (*pp.first)[aspenlang]){
-    return (*pp.first)[aspenlang];
-  }
-  return s;
-}
-
-  void process_freeze(){
-    if (freezeturtle){
-      xcas::displaylogo();
-      freezeturtle=false;
-      return;
-    }
-    if (giac::freeze){
-      giac::freeze=false;
-      for (;;){
-#ifdef NSPIRE_NEWLIB
-	DefineStatusMessage((char*)((lang==1)?"Ecran fige. Taper esc":"Screen frozen. Press esc."), 1, 0, 0);
-#else
-	DefineStatusMessage((char*)((lang==1)?"Ecran fige. Taper clear":"Screen frozen. Press clear."), 1, 0, 0);
-#endif
-	DisplayStatusArea();
-	int key;
-	GetKey(&key);
-	if (key==KEY_CTRL_EXIT || key==KEY_CTRL_AC)
-	  break;
-      }
-    }
-  }    
-
-#endif // KHICAS
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.h b/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.h
index f57937cf1..a5aaf0d5f 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.h
@@ -164,6 +164,60 @@ namespace xcas {
   void replace_selection(Equation & eq,const giac::gen & tmp,giac::gen * gsel,const std::vector<int> * gotoptr,const giac::context *);
   int eqw_select_leftright(xcas::Equation & g,bool left,int exchange,const giac::context *);
 
+  typedef short int color_t;
+  typedef struct
+  {
+    std::string s;
+    color_t color=giac::_BLACK;
+    short int newLine=0; // if 1, new line will be drawn before the text
+    short int spaceAtEnd=0;
+    short int lineSpacing=0;
+    short int minimini=0;
+    int nlines=1;
+  } textElement;
+
+#define TEXTAREATYPE_NORMAL 0
+#define TEXTAREATYPE_INSTANT_RETURN 1
+  class Graph2d;
+  typedef struct
+  {
+    int x=0;
+    int y=0;
+    int line=0,undoline=0;
+    int pos=0,undopos=0;
+    int clipline,undoclipline;
+    int clippos,undoclippos;
+    int width=LCD_WIDTH_PX;
+    int lineHeight=17;
+    std::vector<textElement> elements,undoelements;
+    const char* title = NULL;
+    std::string filename; 
+    int scrollbar=1;
+    bool allowEXE=false; //whether to allow EXE to exit the screen
+    bool allowF1=false; //whether to allow F1 to exit the screen
+    bool OKparse=true;
+    bool editable=false;
+    bool changed=false;
+    int python=0;
+    int type=TEXTAREATYPE_NORMAL;
+    int cursorx,cursory; // where the last cursor was displayed
+    Graph2d * gr=0;
+    void set_string_value(int n,const std::string & s); // set n-th entry value
+    int add_entry(int pos); // return line position
+  } textArea;
+
+#define TEXTAREA_RETURN_EXIT 0
+#define TEXTAREA_RETURN_EXE 1
+#define TEXTAREA_RETURN_F1 2
+  int doTextArea(textArea* text,const giac::context * contextptr); //returns 0 when user EXITs, 1 when allowEXE is true and user presses EXE, 2 when allowF1 is true and user presses F1.
+  std::string merge_area(const std::vector<textElement> & v);
+  void save_script(const char * filename,const std::string & s);
+  void add(textArea *edptr,const std::string & s);
+
+  extern textArea * edptr;
+  std::string get_searchitem(std::string & replace);
+  int check_leave(textArea * text);
+  void reload_edptr(const char * filename,textArea *edptr,const giac::context *);
   typedef double float3d;
   // typedef float float3d;
   struct double3 {
@@ -212,7 +266,17 @@ namespace xcas {
 #define giac3d_default_downcolor 12345
 #define giac3d_default_downupcolor 18432 // 12297
 #define giac3d_default_downdowncolor 22539
+
+  enum {
+	FL_PUSH=0,
+	FL_MOVE=1,
+	FL_DRAG=2,
+	FL_RELEASE=3,
+	FL_KEYBOARD=4,
+  };
   
+  giac::gen add_attributs(const giac::gen & g,int couleur_,const giac::context *) ;
+
   class Graph2d{
   public:
     double window_xmin,window_xmax,window_ymin,window_ymax,window_zmin,window_zmax,
@@ -223,7 +287,7 @@ namespace xcas {
     // only 12 used, last line [0,0,0,1], usual matrices, not transposed
     int display_mode,show_axes,show_edges,show_names,labelsize,lcdz,default_upcolor,default_downcolor,default_downupcolor,default_downdowncolor;
     short int precision,diffusionz,diffusionz_limit;
-    bool is3d,doprecise,hide2nd,interval,solid3d;
+    bool is3d,doprecise,hide2nd,interval,solid3d,must_redraw;
     double Ai,Aj,Bi,Bj,Ci,Cj,Di,Dj,Ei,Ej,Fi,Fj,Gi,Gj,Hi,Hj; // visualization cube coordinates
     std::vector< std::vector< std::vector<float3d> > > surfacev;
     std::vector<double3> plan_pointv; // point in plan 
@@ -244,13 +308,71 @@ namespace xcas {
     std::vector<double3> pointv; 
     std::vector<const char *> points; // legende
     std::vector<int4> hyp_color,plan_color,sphere_color,polyedre_color,line_color,curve_color,point_color;
-    giac::gen g;
+    giac::gen g; // normal graph instructions
     const giac::context * contextptr;
+    /* geometry data */
+    double current_i,current_j;
+    int mode=0; // 0 pointer, 1 1-arg, 2 2-args, etc.
+    // plot_tmp=function_tmp(args_tmp) or function_final(args_tmp)
+    // depends whether args.tmp.size()==mode
+    giac::gen function_tmp,function_final,args_push; 
+    giac::vecteur args_tmp; // WARNING should only contain numeric value
+    unsigned args_tmp_push_size;
+    std::vector<std::string> args_help;
+    std::string title,x_axis_name,x_axis_unit,y_axis_name,y_axis_unit,z_axis_name,z_axis_unit,fcnfield,fcnvars;
+    int npixels; // max # of pixels distance for click
+    giac::vecteur plot_instructions,symbolic_instructions,animation_instructions,trace_instructions;
+    double animation_dt; // rate for animated plot
+    bool paused;
+    double animation_last; // clock value at last display
+    int animation_instructions_pos;
+    int rotanim_type,rotanim_danim,rotanim_nstep;
+    double rotanim_rx,rotanim_ry,rotanim_rz,rotanim_tstep;
+    int couleur; // used for new point creation in geometry
+    bool approx; // exact or approx click mouse?
+    std::vector<int> selected; // all items selected in plot_instructions
+    giac::gen drag_original_value,drag_name;
+    int hp_pos; // Position in hp for modification
+    xcas::textArea * hp; // null pointer if normal graph (not geometry)
+    giac::gen title_tmp,plot_tmp;
+    std::string modestr;
+    double push_depth,current_depth;
+    int push_i,push_j,cursor_point_type; // position of mouse push/drag
+    bool pushed=false,moving=false,moving_frame=false,in_area=true;
+    bool moving_param; double param_orig,param_value,param_min,param_max,param_step;
+    int nparams;
+    /* end geometry data */
+    giac::vecteur param(double d) const;
+    void adjust_cursor_point_type();
+    void autoname_plus_plus();
+    void do_handle(const giac::gen & g);
+    void redraw() { must_redraw=true; }
+    void geometry_round(double x,double y,double z,double eps,giac::gen & tmp,const giac::context *) ;
+    giac::gen geometry_round(double x,double y,double z,double eps,giac::gen & original,int & pos,bool selectfirstlevel=false,bool setscroller=false);
+    giac::vecteur selection2vecteur(const std::vector<int> & v);
+    void set_mode(const giac::gen & f_tmp,const giac::gen & f_final,int m,const std::string & help);
+    void add_entry(int pos);
+    double find_eps() const;
+    void find_xyz(double i,double j,double k,double & x,double & y,double & z) const;
+    void set_gen_value(int n,const giac::gen & g,bool exec=true); // set n-th entry value
+    int geo_handle(int event,int key);
+    int ui();
+    giac::vecteur selected_names(bool allobjects,bool withdef) const;
+    void find_title_plot(giac::gen & title_tmp,giac::gen & plot_tmp);
+    void draw_decorations(const giac::gen & title_tmp);
+    bool find_dxdy(double & dx, double & dy) const;
+    void find_xy(double i,double j,double & x,double & y) const ;    
+    void round_xy(double & x, double & y) const;
+    void eval(int start=0); // eval symbolic_instructions to plot_instructions
+    void update_g(); // geometry: plot_instructions, trace/animation -> g
+    giac::vecteur get_current_animation() const;
     bool findij(const giac::gen & e0,double x_scale,double y_scale,double & i0,double & j0,const giac::context * ) const;
     void xyz2ij(const double3 & d,int &i,int &j) const; // d not transformed
     void xyz2ij(const double3 & d,double &i,double &j) const; // d not transformed
+    void xyz2ij(const double3 & d,double &i,double &j,double3 & d3) const; // d not transformed, d3 is
     void XYZ2ij(const double3 & d,int &i,int &j) const; // d is transformed
     void addpolyg(vector<int2> & polyg,double x,double y,double z,int2 & IJmin) const ;
+    void adddepth(vector<int2> & polyg,const double3 &A,const double3 &B,int2 & IJmin) const;
     void update_scales();
     void update();
     void update_rotation(); // update grot
@@ -271,6 +393,8 @@ namespace xcas {
     Graph2d(const giac::gen & g_,const giac::context * );
   };
 
+  extern Graph2d * geoptr;
+  
   struct Turtle {
     void draw();
 #ifdef TURTLETAB
@@ -285,59 +409,9 @@ namespace xcas {
   };
   
   int run(const char * s,int do_logo_graph_eqw,const giac::context * contextptr);
-  int displaygraph(const giac::gen & ge, const giac::context * contextptr);
+  int displaygraph(const giac::gen & ge, const giac::gen & gs,const giac::context * contextptr); // ge evaled, gs instruction
   int displaylogo();
   giac::gen eqw(const giac::gen & ge,bool editable,const giac::context * contextptr);
-  typedef short int color_t;
-  typedef struct
-  {
-    std::string s;
-    color_t color=giac::_BLACK;
-    short int newLine=0; // if 1, new line will be drawn before the text
-    short int spaceAtEnd=0;
-    short int lineSpacing=0;
-    short int minimini=0;
-    int nlines=1;
-  } textElement;
-
-#define TEXTAREATYPE_NORMAL 0
-#define TEXTAREATYPE_INSTANT_RETURN 1
-  typedef struct
-  {
-    int x=0;
-    int y=0;
-    int line=0,undoline=0;
-    int pos=0,undopos=0;
-    int clipline,undoclipline;
-    int clippos,undoclippos;
-    int width=LCD_WIDTH_PX;
-    int lineHeight=17;
-    std::vector<textElement> elements,undoelements;
-    const char* title = NULL;
-    std::string filename;
-    int scrollbar=1;
-    bool allowEXE=false; //whether to allow EXE to exit the screen
-    bool allowF1=false; //whether to allow F1 to exit the screen
-    bool OKparse=true;
-    bool editable=false;
-    bool changed=false;
-    int python=0;
-    int type=TEXTAREATYPE_NORMAL;
-    int cursorx,cursory; // where the last cursor was displayed
-  } textArea;
-
-#define TEXTAREA_RETURN_EXIT 0
-#define TEXTAREA_RETURN_EXE 1
-#define TEXTAREA_RETURN_F1 2
-  int doTextArea(textArea* text,const giac::context * contextptr); //returns 0 when user EXITs, 1 when allowEXE is true and user presses EXE, 2 when allowF1 is true and user presses F1.
-  std::string merge_area(const std::vector<textElement> & v);
-  void save_script(const char * filename,const std::string & s);
-  void add(textArea *edptr,const std::string & s);
-
-  extern textArea * edptr;
-  std::string get_searchitem(std::string & replace);
-  int check_leave(textArea * text);
-  void reload_edptr(const char * filename,textArea *edptr,const giac::context *);
   void print(int &X,int&Y,const char * buf,int color,bool revert,bool fake,bool minimini);
 
   void save_session(const giac::context * );
@@ -472,9 +546,14 @@ namespace xcas {
   void fix_sheet(tableur & t,const giac::context *);
   std::string print_tableur(const tableur & t,const giac::context *);
 
-  int check_do_graph(giac::gen & ge,int do_logo_graph_eqw,const giac::context *);
+  int check_do_graph(giac::gen & ge,const giac::gen & gs,int do_logo_graph_eqw,const giac::context *);
   int get_filename(char * filename,const char * extension);
   int find_color(const char * s,const giac::context *);
+  void geosave(textArea * text,const giac::context *);
+  int newgeo(const giac::context *);
+  void cleargeo();
+  int geoloop(Graph2d * geoptr);
+  bool geoparse(textArea *text,const giac::context *);
 
 #ifndef NO_NAMESPACE_XCAS
 } // namespace xcas
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.h~ b/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.h~
deleted file mode 100755
index 43df12fdc..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/kdisplay.h~
+++ /dev/null
@@ -1,618 +0,0 @@
-// -*- mode:C++ ; compile-command: "g++ -I.. -g -c Equation.cc" -*-
-#ifndef _KDISPLAY_H
-#define _KDISPLAY_H
-#include "config.h"
-#include "giacPCH.h"
-#ifdef KHICAS
-#include "misc.h"
-
-#include <exception>
-#ifdef NUMWORKS
-extern char * freeptr;
-extern const char * flash_buf;
-extern "C" const char * flash_read(const char * filename);
-extern "C" int flash_filebrowser(const char ** filenames,int maxrecords,const char * extension);
-#endif
-class autoshutdown : public std::exception{
-  const char * what () const throw ()
-  {
-    return "autoshutdown";
-  }
-};
-
-extern  const int LCD_WIDTH_PX;
-extern   const int LCD_HEIGHT_PX;
-extern char* fmenu_cfg;
-#define color_gris 57083
-#define STATUS_AREA_PX 0 // 24
-#define GIAC_HISTORY_MAX_TAILLE 32
-#define GIAC_HISTORY_SIZE 2
-
-#ifdef MICROPY_LIB
-extern "C" {
-  int do_file(const char *file);
-  char * micropy_init(int stack_size,int heap_size);
-  int micropy_eval(const char * line);
-  void  mp_deinit();
-  void mp_stack_ctrl_init();
-  extern int parser_errorline,parser_errorcol;
-  void python_free();
-}
-int micropy_ck_eval(const char *line);
-#endif
-
-#include "k_csdk.h"
-
-extern "C" {
-  void process_freeze();
-  int do_shutdown(); // auto-shutdown
-  void console_output(const char *,int );
-  const char * console_input(const char * msg1,const char * msg2,bool numeric,int ypos);
-  void c_draw_rectangle(int x,int y,int w,int h,int c);
-  void c_fill_rect(int x,int y,int w,int h,int c);
-  void c_draw_line(int x0,int y0,int x1,int y1,int c);
-  void c_draw_circle(int xc,int yc,int r,int color,bool q1,bool q2,bool q3,bool q4);
-  void c_draw_filled_circle(int xc,int yc,int r,int color,bool left,bool right);
-  void c_draw_polygon(int * x,int *y ,int n,int color);
-  void c_draw_filled_polygon(int * x,int *y, int n,int xmin,int xmax,int ymin,int ymax,int color);
-  void c_draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2);
-  void c_draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment);
-  void c_set_pixel(int x,int y,int c);
-  int c_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-  int c_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-  int c_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake);
-  int select_item(const char ** ptr,const char * title,bool askfor1=true);
-  // C conversion to gen from atomic data type 
-  unsigned long long c_double2gen(double); 
-  unsigned long long c_int2gen(int);
-  // linalg on double matrices
-  void doubleptr2matrice(double * x,int n,giac::matrice & m);
-  bool matrice2doubleptr(const giac::matrice &M,double *x); // x must have enough space
-  bool r_inv(double *,int n);
-  bool r_rref(double *,int n,int m);
-  double r_det(double *,int);
-  struct double_pair {
-    double r,i;
-  } ;
-  typedef struct double_pair c_complex;
-  bool matrice2c_complexptr(const giac::matrice &M,c_complex *x);
-  void c_complexptr2matrice(c_complex * x,int n,int m,giac::matrice & M);  
-  bool c_inv(c_complex *,int n);
-  bool c_rref(c_complex *,int n,int m);
-  c_complex c_det(c_complex *,int);
-  bool c_egv(c_complex * x,int n); // eigenvectors
-  bool c_eig(c_complex * x,c_complex * d,int n); // x eigenvect, d reduced mat
-  bool c_proot(c_complex * x,int n); // poly root
-  bool c_pcoeff(c_complex * x,int n); // root->coeffs
-  bool c_fft(c_complex * x,int n,bool inverse); // FFT
-  void console_freeze();
-  void c_sprint_double(char * s,double d);
-  extern int python_stack_size,python_heap_size;
-  extern int xcas_python_eval;
-  extern char * python_heap;
-  int python_init(int stack_size,int heap_size);
-  void turtle_freeze();
-  void c_turtle_forward(double d);
-  void c_turtle_left(double d);
-  void c_turtle_up(int i);
-  void c_turtle_goto(double x,double y);
-  void c_turtle_cap(double x);
-  void c_turtle_crayon(int i);
-  void c_turtle_rond(int x,int y,int z);
-  void c_turtle_disque(int x,int y,int z,int centered);
-  void c_turtle_fill(int i);
-  void c_turtle_fillcolor(double r,double g,double b,int entier);
-  void c_turtle_getposition(double * x,double * y);
-}
-extern int lang;
-extern short int nspirelua;
-extern bool warn_nr;
-int select_interpreter(); // 0 Xcas, 1|2 Xcas python_compat(1|2), 3 MicroPython, 4 QuickJS 
-const char * gettext(const char * s) ;
-
-#ifndef NO_NAMESPACE_XCAS
-namespace xcas {
-#endif // ndef NO_NAMESPACE_XCAS
-  void set_exam_mode(int i,const giac::context *);
-  int giac_filebrowser(char * filename,const char * extension,const char * title,int storage=0);
-  void draw_rectangle(int x,int y,int w,int h,int c);
-  void draw_line(int x0,int y0,int x1,int y1,int c);
-  void draw_circle(int xc,int yc,int r,int color,bool q1=true,bool q2=true,bool q3=true,bool q4=true);
-  void draw_filled_circle(int xc,int yc,int r,int color,bool left=true,bool right=true);
-  void draw_polygon(std::vector< std::vector<int> > & v1,int color);
-  void draw_filled_polygon(std::vector< vector<int> > &L,int xmin,int xmax,int ymin,int ymax,int color);
-  void draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2);
-  void draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment);
-
-  //syntax colored printing
-  int print_color(int print_x,int print_y,const char *s,int color,bool invert,bool minimini,const giac::context * contextptr);
-  bool tooltip(int x,int y,int pos,const char * editline,const giac::context * contextptr);
-			   
-  bool textedit(char * s,int bufsize,bool OKparse,const giac::context * contextptr,const char * filename=0);
-  bool textedit(char * s,int bufsize,const giac::context * contextptr);
-  // maximum "size" of symbolics displayed in an Equation (pretty print)
-  extern unsigned max_prettyprint_equation;
-  // matrix select
-  bool eqw_select(const giac::gen & eq,int l,int c,bool select,giac::gen & value);
-  void Equation_select(giac::gen & eql,bool select);
-  int eqw_select_down(giac::gen & g);
-  int eqw_select_up(giac::gen & g);
-
-  giac::gen Equation_compute_size(const giac::gen & g,const giac::attributs & a,int windowhsize,const giac::context * contextptr);
-  giac::eqwdata Equation_total_size(const giac::gen & g);  
-  // Equation_translate(giac::gen & g,int deltax,int deltay);
-  void Equation_vertical_adjust(int hp,int yp,int & h,int & y);
-  bool Equation_find_vector_pos(giac::const_iterateur it,giac::const_iterateur itend,int & i,int &nrows);
-  bool Equation_adjust_xy(giac::gen & g,int & xleft,int & ytop,int & xright,int & ybottom,giac::gen * & gsel,giac::gen * & gselparent,int &gselpos,std::vector<int> * gotosel=0);
-  // select and set value from eqwdata in eql
-  bool do_select(giac::gen & eql,bool select,giac::gen & value);
-
-  class Equation {
-    int _x,_y;
-  public:
-    giac::gen data,undodata; // of type eqwdata or undef if empty
-    giac::attributs attr;
-    const giac::context * contextptr;
-    int x() const { return _x;}
-    int y() const { return _y;}
-    Equation(int x_, int y_, const giac::gen & g,const giac::context *);
-  };
-
-  void display(Equation &eq ,int x,int y,const giac::context *);
-  // replace selection in eq by tmp
-  void replace_selection(Equation & eq,const giac::gen & tmp,giac::gen * gsel,const std::vector<int> * gotoptr,const giac::context *);
-  int eqw_select_leftright(xcas::Equation & g,bool left,int exchange,const giac::context *);
-
-  typedef double float3d;
-  // typedef float float3d;
-  struct double3 {
-    float3d x,y,z;
-    double3(double x_,double y_,double z_):x(x_),y(y_),z(z_){};
-    double3():x(0),y(0),z(0){};
-  };
-
-  struct int4 {
-    int u,d,du,dd;
-    int4(int u_,int d_,int du_,int dd_):u(u_),d(d_),du(du_),dd(dd_) {}
-  };
-  
-  // quaternion struct for more intuitive rotations
-  struct quaternion_double {
-    double w,x,y,z;
-    quaternion_double():w(1),x(0),y(0),z(0) {};
-    quaternion_double(double theta_x,double theta_y,double theta_z);
-    quaternion_double(double _w,double _x,double _y,double _z):w(_w),x(_x),y(_y),z(_z) {};
-    double norm2() const { return w*w+x*x+y*y+z*z;}
-  };
-
-  quaternion_double operator * (const quaternion_double & q,const quaternion_double & q2);
-
-  void get_axis_angle_deg(const quaternion_double & q,double &x,double &y,double & z, double &theta); // q must be a quaternion of unit norm, theta is in deg
-
-  // Euler angle are given in degrees
-  quaternion_double euler_deg_to_quaternion_double(double a,double b,double c);
-  void quaternion_double_to_euler_deg(const quaternion_double & q,double & phi,double & theta, double & psi);
-
-  struct int2 {
-    int i,j;
-    int2(int i_,int j_):i(i_),j(j_) {}
-    int2(): i(0),j(0) {}
-  };
-  inline bool operator < (const int2 & a,const int2 & b){ if (a.i!=b.i) return a.i<b.i; return a.j<b.j;}
-  inline bool operator == (const int2 & a,const int2 & b){ return a.i==b.i && a.j==b.j;}
-
-  struct int2_double2 {
-    int i,j;
-    double arg,norm;
-  };
-  inline bool operator < (const int2_double2 & a,const int2_double2 & b){ if (a.arg!=b.arg) return a.arg<b.arg; return a.norm<b.norm;}
-
-#define giac3d_default_upcolor 65535
-#define giac3d_default_downcolor 12345
-#define giac3d_default_downupcolor 18432 // 12297
-#define giac3d_default_downdowncolor 22539
-  
-  class Graph2d{
-  public:
-    double window_xmin,window_xmax,window_ymin,window_ymax,window_zmin,window_zmax,
-      x_scale,y_scale,z_scale,x_tick,y_tick,z_tick;
-    //double theta_x,theta_y,theta_z;
-    quaternion_double q;
-    double transform[16],invtransform[16];
-    // only 12 used, last line [0,0,0,1], usual matrices, not transposed
-    int display_mode,show_axes,show_edges,show_names,labelsize,lcdz,default_upcolor,default_downcolor,default_downupcolor,default_downdowncolor;
-    short int precision,diffusionz,diffusionz_limit;
-    bool is3d,doprecise,hide2nd,interval;
-    double Ai,Aj,Bi,Bj,Ci,Cj,Di,Dj,Ei,Ej,Fi,Fj,Gi,Gj,Hi,Hj; // visualization cube coordinates
-    std::vector< std::vector< std::vector<float3d> > > surfacev;
-    std::vector<double3> plan_pointv; // point in plan 
-    std::vector<double3> plan_abcv; // plan equation z=a*x+b*y+c
-    std::vector<double3> sphere_centerv;
-    std::vector<double> sphere_radiusv;
-    giac::vecteur sphere_quadraticv; // matrix of the transformed quad. form
-    std::vector< std::vector<double3> > polyedrev;
-    std::vector<double3> polyedre_abcv;
-    std::vector<double> polyedre_xyminmax;
-    std::vector<double3> linev; // 2 double3 per object
-    std::vector<short> linetypev;
-    std::vector<const char *> lines; // legende
-    std::vector< std::vector<double3> > curvev;
-    std::vector<double3> pointv; 
-    std::vector<const char *> points; // legende
-    std::vector<int4> hyp_color,plan_color,sphere_color,polyedre_color,line_color,curve_color,point_color;
-    giac::gen g;
-    const giac::context * contextptr;
-    bool findij(const giac::gen & e0,double x_scale,double y_scale,double & i0,double & j0,const giac::context * ) const;
-    void xyz2ij(const double3 & d,int &i,int &j) const; // d not transformed
-    void xyz2ij(const double3 & d,double &i,double &j) const; // d not transformed
-    void XYZ2ij(const double3 & d,int &i,int &j) const; // d is transformed
-    void addpolyg(vector<int2> & polyg,double x,double y,double z,int2 & IJmin) const ;
-    void update_scales();
-    void update();
-    void update_rotation(); // update grot
-    void zoomx(double d,bool round=false,bool doupdate=true);
-    void zoomy(double d,bool round=false,bool doupdate=true);
-    void zoomz(double d,bool round=false,bool doupdate=true);
-    void zoom(double d,bool doupdate=true);
-    void left(double d);
-    void right(double d);
-    void up(double d);
-    void down(double d);
-    void z_up(double d);
-    void z_down(double d);
-    void autoscale(bool fullview=false,bool doupdate=true);
-    void orthonormalize(bool doupdate=true);
-    void draw();
-    bool glsurface(int w,int h,int lcdz,const giac::context*,int upcolor,int downcolor,int downupcolor,int downdowncolor) ;
-    Graph2d(const giac::gen & g_,const giac::context * );
-  };
-
-  struct Turtle {
-    void draw();
-#ifdef TURTLETAB
-    giac::logo_turtle * turtleptr;
-#else
-    std::vector<giac::logo_turtle> * turtleptr;
-#endif
-    int turtlex,turtley; // Turtle translate
-    double turtlezoom; // Zoom factor for turtle screen
-    short int maillage=0; // 0 (none), 1 (square), 2 (triangle), bit3 used for printing
-    short int speed=0;
-  };
-  
-  int run(const char * s,int do_logo_graph_eqw,const giac::context * contextptr);
-  int displaygraph(const giac::gen & ge, const giac::context * contextptr);
-  int displaylogo();
-  giac::gen eqw(const giac::gen & ge,bool editable,const giac::context * contextptr);
-  typedef short int color_t;
-  typedef struct
-  {
-    std::string s;
-    color_t color=giac::_BLACK;
-    short int newLine=0; // if 1, new line will be drawn before the text
-    short int spaceAtEnd=0;
-    short int lineSpacing=0;
-    short int minimini=0;
-    int nlines=1;
-  } textElement;
-
-#define TEXTAREATYPE_NORMAL 0
-#define TEXTAREATYPE_INSTANT_RETURN 1
-  typedef struct
-  {
-    int x=0;
-    int y=0;
-    int line=0,undoline=0;
-    int pos=0,undopos=0;
-    int clipline,undoclipline;
-    int clippos,undoclippos;
-    int width=LCD_WIDTH_PX;
-    int lineHeight=17;
-    std::vector<textElement> elements,undoelements;
-    const char* title = NULL;
-    std::string filename;
-    int scrollbar=1;
-    bool allowEXE=false; //whether to allow EXE to exit the screen
-    bool allowF1=false; //whether to allow F1 to exit the screen
-    bool OKparse=true;
-    bool editable=false;
-    bool changed=false;
-    int python=0;
-    int type=TEXTAREATYPE_NORMAL;
-    int cursorx,cursory; // where the last cursor was displayed
-  } textArea;
-
-#define TEXTAREA_RETURN_EXIT 0
-#define TEXTAREA_RETURN_EXE 1
-#define TEXTAREA_RETURN_F1 2
-  int doTextArea(textArea* text,const giac::context * contextptr); //returns 0 when user EXITs, 1 when allowEXE is true and user presses EXE, 2 when allowF1 is true and user presses F1.
-  std::string merge_area(const std::vector<textElement> & v);
-  void save_script(const char * filename,const std::string & s);
-  void add(textArea *edptr,const std::string & s);
-
-  extern textArea * edptr;
-  std::string get_searchitem(std::string & replace);
-  int check_leave(textArea * text);
-  void reload_edptr(const char * filename,textArea *edptr,const giac::context *);
-  void print(int &X,int&Y,const char * buf,int color,bool revert,bool fake,bool minimini);
-
-  void save_session(const giac::context * );
-#if 1
-#define MAX_FILENAME_SIZE 63
-  void save_console_state_smem(const char * filename,bool xwaspy,const giac::context *);
-  bool load_console_state_smem(const char * filename,const giac::context *);
-
-  struct DISPBOX {
-    int     left;
-    int     top;
-    int     right;
-    int     bottom;
-    unsigned char mode;
-  } ;
-
-
-  enum CONSOLE_RETURN_VAL {
-			   CONSOLE_NEW_LINE_SET = 1,
-			   CONSOLE_SUCCEEDED = 0,
-			   CONSOLE_MEM_ERR = -1,
-			   CONSOLE_ARG_ERR = -2,
-			   CONSOLE_NO_EVENT = -3,
-  };
-
-  enum CONSOLE_CURSOR_DIRECTION{
-				CURSOR_UP,
-				CURSOR_DOWN,
-				CURSOR_LEFT,
-				CURSOR_RIGHT,
-				CURSOR_SHIFT_LEFT,
-				CURSOR_SHIFT_RIGHT,
-				CURSOR_ALPHA_UP,
-				CURSOR_ALPHA_DOWN,
-  };
-
-  enum CONSOLE_LINE_TYPE{
-			 LINE_TYPE_INPUT=0,
-			 LINE_TYPE_OUTPUT=1
-  };
-
-  enum CONSOLE_CASE{
-		    LOWER_CASE,
-		    UPPER_CASE
-  };
-
-  enum CONSOLE_SCREEN_SPEC {
-#ifdef NSPIRE_NEWLIB
-			    _LINE_MAX = 128,
-			    COL_DISP_MAX = 32,
-#else
-			    _LINE_MAX = 48,
-			    COL_DISP_MAX = 30,//32
-#endif
-			    LINE_DISP_MAX = 11,
-			    EDIT_LINE_MAX = 2048
-  };
-  
-  struct console_line {
-    char *str;
-    short int readonly;
-    short int type;
-    int start_col;
-    int disp_len;
-  };
-
-  struct FMenu{
-    char* name;
-    char** str;
-    unsigned char count;
-  };
-
-  struct location{
-    int x;
-    int y;
-  };
-
-#define MAX_FMENU_ITEMS 8
-#define FMENU_TITLE_LENGHT 4
-
-#define is_wchar(c) ((c == 0x7F) || (c == 0xF7) || (c == 0xF9) || (c == 0xE5) || (c == 0xE6) || (c == 0xE7))
-#define printf(s) Console_Output((const char *)s);
-
-  int Console_DelStr(char *str, int end_pos, int n);
-  int Console_InsStr(char *dest, const char *src, int disp_pos);
-  int Console_GetActualPos(const char *str, int disp_pos);
-  int Console_GetDispLen(const char *str);
-  int Console_MoveCursor(int direction);
-  int Console_Input(const char *str);
-  int Console_Output(const char *str);
-  void Console_Clear_EditLine();
-  int Console_NewLine(int pre_line_type, int pre_line_readonly);
-  int Console_Backspace(const giac::context *);
-  int Console_GetKey(const giac::context *);
-  int Console_Init(const giac::context *);
-  void Console_Free();
-  int Console_Disp(int redraw_mode,const giac::context*ptr);
-  int Console_FMenu(int key,const giac::context *);
-  extern char menu_f1[8],menu_f2[8],menu_f3[8],menu_f4[8],menu_f5[8],menu_f6[8];
-  const char * console_menu(int key,char* cfg,int active_app);
-  void Console_FMenu_Init(const giac::context *);
-  const char * Console_Draw_FMenu(int key, struct FMenu* menu,char * cfg_,int active_app);
-  char *Console_Make_Entry(const char* str);
-  char *Console_GetLine(const giac::context *);
-  char* Console_GetEditLine();
-  void dConsolePut(const char *);
-  void dConsolePutChar(const char );
-  void dConsoleRedraw(void);
-  extern int dconsole_mode;
-  extern int console_changed; // 1 if something new in history
-  extern char session_filename[MAX_FILENAME_SIZE+1];
-  const char * input_matrix(bool list,const giac::context *);
-  void warn_python(int python,bool autochange=false);
-  // void draw_menu(int editor); // 0 console, 1 editor
-  int get_set_session_setting(int value);
-  void menu_setup(const giac::context *);
-  int console_main(const giac::context *,const char * sessionname="session");
-#endif
-  int periodic_table(const char * & name,const char * & symbol,char * protons,char * nucleons,char * mass,char * electroneg);
-
-  struct tableur {
-    giac::matrice m,clip,undo;
-    giac::gen var;
-    int nrows,ncols;
-    int cur_row,cur_col,disp_row_begin,disp_col_begin;
-    int sel_row_begin,sel_col_begin;
-    std::string cmdline,filename;
-    int cmd_pos,cmd_row,cmd_col; // row/col of current cmdline, -1 if not active
-    bool changed,recompute,matrix_fill_cells,movedown,keytooltip;
-  } ;
-  extern tableur * sheetptr;
-  void fix_sheet(tableur & t,const giac::context *);
-  std::string print_tableur(const tableur & t,const giac::context *);
-
-  int check_do_graph(giac::gen & ge,int do_logo_graph_eqw,const giac::context *);
-  int get_filename(char * filename,const char * extension);
-  int find_color(const char * s,const giac::context *);
-
-#ifndef NO_NAMESPACE_XCAS
-} // namespace xcas
-#endif // ndef NO_NAMESPACE_XCAS
-
-giac::gen sheet(const giac::context *); // in kadd.cc
-/* ************************************************************
-**************************************************************
-***********************************************************  */
-
-
-#ifndef NO_NAMESPACE_XCAS
-namespace giac {
-#endif // ndef NO_NAMESPACE_XCAS
-  // back: number of char that should be deleted,
-  // exec=0 or MENU_RETURN_SELECTION, KEY_CHAR_ANS or KEY_CTRL_EXE
-  std::string help_insert(const char * cmdline,int & back,int exec,const giac::context *,bool warn=true);
-  void copy_clipboard(const std::string & s,bool status);
-#define TEXT_MODE_NORMAL 0
-#define TEXT_MODE_INVERT 1
-#define MENUITEM_NORMAL 0
-#define MENUITEM_CHECKBOX 1
-#define MENUITEM_SEPARATOR 2
-#define MENUITEM_VALUE_NONE 0
-#define MENUITEM_VALUE_CHECKED 1
-  struct MenuItem {
-    char* text; // text to be shown on screen. mandatory, must be a valid pointer to a string.
-    int token:20; // for syntax help on keywords not in the catalog
-    int type:4=MENUITEM_NORMAL; // type of the menu item. use MENUITEM_* to set this
-    int value:4=MENUITEM_VALUE_NONE; // value of the menu item. For example, if type is MENUITEM_CHECKBOX and the checkbox is checked, the value of this var will be MENUITEM_VALUE_CHECKED
-    int isselected:4=0; // for file browsers and other multi-select screens, this will show an arrow before the item
-    short int isfolder=0; // for file browsers, this will signal the item is a folder
-    signed char color=giac::_BLACK; // color of the menu item (use TEXT_COLOR_* to define)
-    // The following two settings require the menu type to be set to MENUTYPE_MULTISELECT
-#if 0
-    signed char icon=-1; //for file browsers, to show a file icon. -1 shows no icon (default)
-#endif
-    MenuItem():token(0),type(MENUITEM_NORMAL),value(MENUITEM_VALUE_NONE),isselected(0),isfolder(0),color(giac::_BLACK) {}
-  } ;
-
-  typedef struct
-  {
-    unsigned short data[0x12*0x18];
-  } MenuItemIcon;
-
-#define MENUTYPE_NORMAL 0
-#define MENUTYPE_MULTISELECT 1
-#define MENUTYPE_INSTANT_RETURN 2 // this type of menu insantly returns even if user hasn't selected an option (allows for e.g. redrawing the GUI behind it). if user hasn't exited or selected an option, menu will return MENU_RETURN_INSTANT
-#define MENUTYPE_NO_KEY_HANDLING 3 //this type of menu doesn't handle any keys, only draws.
-#define MENUTYPE_FKEYS 4 // returns GetKey value of a Fkey when one is pressed
-#define MENUTYPE_NO_NUMBER 5
-  typedef struct {
-    char* statusText = NULL; // text to be shown on the status bar, may be empty
-    char* title = NULL; // title to be shown on the first line if not null
-    char* subtitle = NULL;
-    int titleColor=giac::_BLUE; //color of the title
-    char* nodatamsg; // message to show when there are no menu items to display
-    int startX=1; //X where to start drawing the menu. NOTE this is not absolute pixel coordinates but rather character coordinates
-    int startY=0; //Y where to start drawing the menu. NOTE this is not absolute pixel coordinates but rather character coordinates
-    int width=30; // NOTE this is not absolute pixel coordinates but rather character coordinates
-    int height=12; // NOTE this is not absolute pixel coordinates but rather character coordinates
-    int scrollbar=1; // 1 to show scrollbar, 0 to not show it.
-    int scrollout=0; // whether the scrollbar goes out of the menu area (1) or it overlaps some of the menu area (0)
-    int numitems; // number of items in menu
-    int type=MENUTYPE_NORMAL; // set to MENUTYPE_* .
-    int selection=1; // currently selected item. starts counting at 1
-    int scroll=0; // current scrolling position
-    int fkeypage=0; // for MULTISELECT menu if it should allow file selecting and show the fkey label
-    int numselitems=0; // number of selected items
-    int returnOnInfiniteScrolling=0; //whether the menu should return when user reaches the last item and presses the down key (or the first item and presses the up key)
-    int darken=0; // for dark theme on homeGUI menus
-    int miniMiniTitle=0; // if true, title will be drawn in minimini. for calendar week view
-    int pBaRtR=0; //preserve Background And Return To Redraw. Rarely used
-    MenuItem* items; // items in menu
-  } Menu;
-
-#define MENU_RETURN_EXIT 0
-#define MENU_RETURN_SELECTION 1
-#define MENU_RETURN_INSTANT 2
-#define MENU_RETURN_SCROLLING 3 //for returnOnInfiniteScrolling
-
-  typedef struct {
-    const char* name;
-    const char* insert;
-    const char* desc;
-    const char * example;
-    const char * example2;
-    unsigned int category;
-  } catalogFunc;
-
-  void aide2catalogFunc(const giac::aide & a,catalogFunc & c);
-
-  giac::gen select_var(const giac::context * contextptr);
-  const char * keytostring(int key,int keyflag,bool py,const giac::context * contextptr);
-  void insert(std::string & s,int pos,const char * add);
-  
-  int showCatalog(char* insertText,int preselect,int menupos,const giac::context * contextptr);
-  int doMenu(Menu* menu, MenuItemIcon* icontable=NULL);
-  void reset_alpha();
-  // category=0 for CATALOG, 1 for OPTN
-  // returns 0 on exit, 1 on success
-  int doCatalogMenu(char* insertText, const char* title, int category,const giac::context * contextptr);
-  extern const char shortcuts_fr_string[];
-  extern const char shortcuts_en_string[];
-  extern const char apropos_fr_string[];
-  extern const char apropos_en_string[];
-  void init_locale();
-
-  gen _efface_logo(const gen & g,GIAC_CONTEXT);
-  gen turtle_state(const giac::context * contextptr);
-  int inputline(const char * msg1,const char * msg2,std::string & s,bool numeric,int ypos=65,const giac::context *contextptr=0);
-  extern logo_turtle * turtleptr;
-  bool inputdouble(const char * msg1,double & d,const giac::context *contextptr);
-  bool do_confirm(const char * s);
-  int confirm(const char * msg1,const char * msg2,bool acexit=false,int y=40);
-  bool confirm_overwrite();
-  void invalid_varname();
-
-#ifndef NO_NAMESPACE_XCAS
-} // namespace giac
-#endif // ndef NO_NAMESPACE_XCAS
-
-
-#define COLOR_BLACK giac::_BLACK
-#define COLOR_RED giac::_RED
-#define COLOR_GREEN giac::_GREEN
-#define COLOR_CYAN giac::_CYAN
-#define COLOR_BLUE giac::_BLUE
-#define COLOR_YELLOW giac::_YELLOW
-#define COLOR_MAGENTA giac::_MAGENTA
-#define COLOR_WHITE giac::_WHITE
-#define COLOR_YELLOWDARK 64934
-#define COLOR_BROWN 65000
-#define TEXT_COLOR_BLACK giac::_BLACK
-#define TEXT_COLOR_RED giac::_RED
-#define TEXT_COLOR_GREEN giac::_GREEN
-#define TEXT_COLOR_CYAN giac::_CYAN
-#define TEXT_COLOR_BLUE giac::_BLUE
-#define TEXT_COLOR_YELLOW giac::_YELLOW
-#define TEXT_COLOR_WHITE giac::_WHITE
-#define TEXT_COLOR_MAGENTA giac::_MAGENTA
-
-
-#endif // _KDISPLAY_H
-#endif
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/lin.cc b/apps/KhiCAS/src/giac-1.6.0/src/lin.cc
index ce5e1296f..307d3172e 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/lin.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/lin.cc
@@ -1743,6 +1743,8 @@ namespace giac {
     }
     sort(xymin.begin(),xymin.end());
     for (int i=1;i<xymin.size();++i){
+      if (fabs(xymin[i-1]-xymin[i])<1e-8)
+	continue;
       gen chk=makevecteur((xymin[i-1]+xymin[i])/2,ymin);
       if (is_ok(m,-1,vars,chk,contextptr))
 	branches.push_back(makevecteur(gen(xymin[i-1],ymin),gen(xymin[i],ymin)));
@@ -1754,6 +1756,8 @@ namespace giac {
     }
     sort(xymax.begin(),xymax.end());
     for (int i=1;i<xymax.size();++i){
+      if (fabs(xymax[i-1]-xymax[i])<1e-8)
+	continue;
       if (is_ok(m,-1,vars,makevecteur((xymax[i-1]+xymax[i])/2,ymax),contextptr))
 	branches.push_back(makevecteur(gen(xymax[i-1],ymax),gen(xymax[i],ymax)));
     }
@@ -1764,6 +1768,8 @@ namespace giac {
     }
     sort(yxmin.begin(),yxmin.end());
     for (int i=1;i<yxmin.size();++i){
+      if (fabs(yxmin[i-1]-yxmin[i])<1e-8)
+	continue;
       if (is_ok(m,-1,vars,makevecteur(xmin,(yxmin[i-1]+yxmin[i])/2),contextptr))
 	branches.push_back(makevecteur(gen(xmin,yxmin[i-1]),gen(xmin,yxmin[i])));
     }
@@ -1774,6 +1780,8 @@ namespace giac {
     }
     sort(yxmax.begin(),yxmax.end());
     for (int i=1;i<yxmax.size();++i){
+      if (fabs(yxmax[i-1]-yxmax[i])<1e-8)
+	continue;
       if (is_ok(m,-1,vars,makevecteur(xmax,(yxmax[i-1]+yxmax[i])/2),contextptr))
 	branches.push_back(makevecteur(gen(xmax,yxmax[i-1]),gen(xmax,yxmax[i])));
     }
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/maple.cc b/apps/KhiCAS/src/giac-1.6.0/src/maple.cc
index 5dfc6e377..f8bcb5063 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/maple.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/maple.cc
@@ -508,7 +508,7 @@ namespace giac {
   gen _time(const gen & a,GIAC_CONTEXT){
     if ( a.type==_STRNG && a.subtype==-1) return  a;
     if (a.type==_VECT && a.subtype==_SEQ__VECT){
-#if defined VISUALC || defined __MINGW_H
+#if !defined GIAC_HAS_STO_38 && (defined VISUALC || defined __MINGW_H)
     struct _timeb timebuffer;
     _ftime(&timebuffer);
     return timebuffer.time+double(timebuffer.millitm)/1000;
@@ -567,7 +567,7 @@ namespace giac {
     eval(a,level,contextptr);
     return (emcctime()-t1)/1e6;
 #endif
-#if defined VISUALC || defined __MINGW_H
+#if !defined GIAC_HAS_STO_38 && (defined VISUALC || defined __MINGW_H)
     struct _timeb timebuffer0,timebuffer1;
     _ftime(&timebuffer0);
     for (;i<1000;){ // do it 10 times more
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/maple.cc~ b/apps/KhiCAS/src/giac-1.6.0/src/maple.cc~
deleted file mode 100755
index 5dfc6e377..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/maple.cc~
+++ /dev/null
@@ -1,4248 +0,0 @@
-// -*- mode:C++ ; compile-command: "g++-3.4 -I.. -I../include -g -c maple.cc  -DIN_GIAC -DHAVE_CONFIG_H" -*-
-#include "giacPCH.h"
-/*
- *  Copyright (C) 2000,2014 B. Parisse, Institut Fourier, 38402 St Martin d'Heres
- *
- *  This program 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-using namespace std;
-#include <stdexcept>
-#include <cmath>
-#include <cstdlib>
-#include <stdio.h>
-
-#if !defined GIAC_HAS_STO_38 && !defined NSPIRE && !defined FXCG 
-#include <fstream>
-#endif
-
-#if !defined HAVE_NO_SYS_TIMES_H && defined HAVE_SYS_TIME_H
-#include <fcntl.h>
-#include <sys/time.h>
-#include <time.h>
-#else 
-#if 0 // defined VISUALC || defined __MINGW_H
-
-#include <sys/timeb.h>
-#include <sys/types.h>
-#include <winsock2.h>
-
-int gettimeofday(struct timeval* t,void* timezone);
-
-#define __need_clock_t
-
-/* Structure describing CPU time used by a process and its children.  */
-struct tms  {
-  clock_t tms_utime;          /* User CPU time.  */
-  clock_t tms_stime;          /* System CPU time.  */
-  
-  clock_t tms_cutime;         /* User CPU time of dead children.  */
-  clock_t tms_cstime;         /* System CPU time of dead children.  */
-};
-
-/* Store the CPU time used by this process and all its
-   dead children (and their dead children) in BUFFER.
-   Return the elapsed real time, or (clock_t) -1 for errors.
-   All times are in CLK_TCKths of a second.  */
-clock_t times (struct tms *__buffer);
-
-typedef long long suseconds_t ;
-
-int gettimeofday(struct timeval* t,void* timezone)
-{       
-  struct _timeb timebuffer;
-  _ftime( &timebuffer );
-  t->tv_sec=timebuffer.time;
-  t->tv_usec=1000*timebuffer.millitm;
-  return 0;
-}
-
-double clock(){
-  struct _timeb timebuffer;
-  _ftime( &timebuffer );
-  return timebuffer.time*1e6+1000*timebuffer.millitm;
-}
-
-clock_t times (struct tms *__buffer) {
-  __buffer->tms_utime = clock();
-  __buffer->tms_stime = 0;
-  __buffer->tms_cstime = 0;
-  __buffer->tms_cutime = 0;
-  return __buffer->tms_utime;
-}
-#define HAVE_SYS_TIME_H
-#endif // VISUALC || MINGW
-#endif // !defined HAVE_NO_SYS_TIMES_H && defined HAVE_SYS_TIME_H
-
-// #include <sys/resource.h>
-// #include <unistd.h>
-#include "sym2poly.h"
-#include "usual.h"
-#include "moyal.h"
-#include "solve.h"
-#include "intg.h"
-#include "prog.h"
-#include "misc.h"
-#include "maple.h"
-#include "plot.h"
-#include "ifactor.h"
-#include "subst.h"
-#include "input_parser.h"
-#include "sym2poly.h"
-#include "modpoly.h"
-#include "lin.h"
-#include "derive.h"
-#include "ti89.h"
-#include "giacintl.h"
-#ifdef HAVE_LIBGSL
-#include <gsl/gsl_errno.h>
-#include <gsl/gsl_fft_complex.h>
-#include <gsl/gsl_fft_real.h>
-#endif
-#ifndef HAVE_PNG_H
-#undef HAVE_LIBPNG
-#endif
-#ifdef HAVE_LIBPNG
-#include <png.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if defined(EMCC) || defined(EMCC2)
-#include <emscripten.h>
-#endif
-
-
-#if 0 // def GIAC_HAS_STO_38
-  TMillisecs PrimeGetNow();
-#endif
-
-#ifdef KHICAS
-int time_shift;
-#ifdef NUMWORKS
-#ifdef DEVICE
-extern "C" unsigned long long millis();
-#else
-namespace Ion {
-  namespace Timing {
-    
-    void usleep(uint32_t us);
-    void msleep(uint32_t ms);
-    
-    /* millis is the number of milliseconds ellapsed since a random epoch.
-     * On the device, epoch is the boot time. */
-    volatile uint64_t millis();
-    
-  }
-}
-double millis(){
-  return double(Ion::Timing::millis()); // RTC_GetTicks();
-}
-#endif
-#else
-extern "C" double millis();
-#endif
-#endif
-
-
-#if (defined(EMCC) || defined (EMCC2)) && !defined(PNACL)
-extern "C" double emcctime();
-// definition of emcctime should be added in emscripten directory src/library.js
-// search for _time definition, and return only Date.now() for _emcctime
-// otherwise time() will not work
-#endif
-
-#ifndef NO_NAMESPACE_GIAC
-namespace giac {
-#endif // ndef NO_NAMESPACE_GIAC
-
-  gen _zip(const gen & g,const context * contextptr){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int s=-1;
-    if (g.type!=_VECT || (s=g._VECTptr->size())<2)
-      return symbolic(at_zip,g);
-    vecteur & v=*g._VECTptr;
-    gen & f=v[0];
-    if (s==2){
-      if (f.type!=_VECT || v[1].type!=_VECT || f._VECTptr->size()!=v[1]._VECTptr->size())
-	return gendimerr(contextptr);
-      return _tran(g,contextptr);
-    }
-    if (v[1].type!=_VECT || v[2].type!=_VECT)
-      return f(gen(makevecteur(v[1],v[2]),_SEQ__VECT),contextptr);
-    vecteur & w1=*v[1]._VECTptr;
-    vecteur & w2=*v[2]._VECTptr;
-    int s1=int(w1.size()),s2=int(w2.size());
-    vecteur res;
-    int ss=giacmin(s1,s2),i=0;
-    res.reserve(ss);
-    for (;i<ss;++i)
-      res.push_back(_zip(gen(makevecteur(f,w1[i],w2[i]),_SEQ__VECT),contextptr));
-    if (s==3)
-      return res;
-    gen & ff=v[3];
-    for (;i<s1;++i)
-      res.push_back(_zip(gen(makevecteur(f,w1[i],ff),_SEQ__VECT),contextptr));
-    for (;i<s2;++i)
-      res.push_back(_zip(gen(makevecteur(f,ff,w2[i]),_SEQ__VECT),contextptr));
-    return res;
-  }
-  static const char _zip_s []="zip";
-  static define_unary_function_eval (__zip,&_zip,_zip_s);
-  define_unary_function_ptr5( at_zip ,alias_at_zip,&__zip,0,true);
-
-  gen _accumulate_head_tail(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=3)
-      return symbolic(at_accumulate_head_tail,g);
-    vecteur & v=*g._VECTptr;
-    if (v[0].type!=_VECT || v[1].type!=_INT_ || v[2].type!=_INT_)
-      return gensizeerr();
-    vecteur & w=*v[0]._VECTptr;
-    int tail=v[1].val;
-    int head=v[2].val;
-    int s=int(w.size());
-    if (tail<1 || head<1 || tail+head>s)
-      return gensizeerr();
-    gen tmp;
-    int i=0;
-    for (;i<tail;++i)
-      tmp=tmp+w[i];
-    vecteur res;
-    res.push_back(tmp);
-    int t=s-head;
-    for (;i<t;++i)
-      res.push_back(w[i]);
-    tmp=zero;
-    for (;i<s;++i)
-      tmp=tmp+w[i];
-    res.push_back(tmp);
-    return gen(res,v[0].subtype);
-  }
-  static const char _accumulate_head_tail_s []="accumulate_head_tail";
-  static define_unary_function_eval (__accumulate_head_tail,&_accumulate_head_tail,_accumulate_head_tail_s);
-  define_unary_function_ptr5( at_accumulate_head_tail ,alias_at_accumulate_head_tail,&__accumulate_head_tail,0,true);
-
-  gen _divide(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()<2)
-      return gensizeerr();
-    vecteur & v=*g._VECTptr;
-    int s=int(v.size());
-    if (s==2)
-      return _quorem(g,contextptr);
-    gen q("Quo",contextptr),r("Rem",contextptr),arg;
-    gen mode=v.back();
-    if (s==4)
-      arg=gen(makevecteur(v[0],v[1],v[2]),_SEQ__VECT);
-    else
-      arg=gen(makevecteur(v[0],v[1]),_SEQ__VECT);
-    if (mode==q)
-      return _quo(arg,contextptr);
-    if (mode==r)
-      return _rem(arg,contextptr);
-    if (s==4)
-      return _quorem(arg,contextptr);
-    if (s==3 && mode.type==_IDNT)
-      return _quorem(g,contextptr);
-    return gensizeerr();
-    // return 0;
-  }
-  static const char _divide_s []="divide";
-  static define_unary_function_eval (__divide,&_divide,_divide_s);
-  define_unary_function_ptr5( at_divide ,alias_at_divide,&__divide,0,true);
-
-  gen _ratnormal(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return ratnormal(g,contextptr);
-  }
-  static const char _ratnormal_s []="ratnormal";
-  static define_unary_function_eval (__ratnormal,&_ratnormal,_ratnormal_s);
-  define_unary_function_ptr5( at_ratnormal ,alias_at_ratnormal,&__ratnormal,0,true);
-
-  gen _about(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT)
-      return apply(g,contextptr,_about);
-    if (g.type==_IDNT)
-      return g._IDNTptr->eval(1,g,contextptr);
-    return g;
-  }
-  static const char _about_s []="about";
-  static define_unary_function_eval (__about,&_about,_about_s);
-  define_unary_function_ptr5( at_about ,alias_at_about,&__about,0,true);
-
-  gen _inverse(const gen & a_orig,GIAC_CONTEXT){
-    if ( a_orig.type==_STRNG && a_orig.subtype==-1) return  a_orig;
-    matrice a;
-    bool convert_internal,minor_det,keep_pivot;
-    int algorithm,last_col;
-    if (!read_reduction_options(a_orig,a,convert_internal,algorithm,minor_det,keep_pivot,last_col))
-      return inv(a_orig,contextptr);
-    if (keep_pivot)
-      return gensizeerr(gettext("Option keep_pivot not applicable"));
-    if (minor_det){ // not really minors, use Leverrier algorithm
-      vecteur b;
-      vecteur p(mpcar(a,b,true,contextptr));
-      gen res=b.back()/p.back();
-      // if (a.size()%2==0)
-	res=-res;
-      return res;
-    }
-    matrice res;
-    if (!minv(a,res,convert_internal,algorithm,contextptr))
-      return gendimerr(contextptr);
-    return res;
-  }
-  static const char _inverse_s []="inverse";
-  static define_unary_function_eval (__inverse,&_inverse,_inverse_s);
-  define_unary_function_ptr5( at_inverse ,alias_at_inverse,&__inverse,0,true);
-
-  gen _Inverse(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_inverse,g);
-  }
-  static const char _Inverse_s []="Inverse";
-  static define_unary_function_eval (__Inverse,&_Inverse,_Inverse_s);
-  define_unary_function_ptr5( at_Inverse ,alias_at_Inverse,&__Inverse,0,true);
-
-  gen _inverser(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return sto(inv(eval(g,1,contextptr),contextptr),g,contextptr);
-  }
-  static const char _inverser_s []="inverser";
-  static define_unary_function_eval2_quoted (__inverser,&_inverser,_inverser_s,&printastifunction);
-  define_unary_function_ptr5( at_inverser ,alias_at_inverser,&__inverser,_QUOTE_ARGUMENTS,T_LOGO);
-
-  static gen maple_gcdigcd(const gen & a_orig,const unary_function_ptr * u,GIAC_CONTEXT){
-    if (a_orig.type!=_VECT || a_orig._VECTptr->size()<2)
-      return gensizeerr();
-    vecteur v=*a_orig._VECTptr;
-    int s=int(v.size());
-    for (int i=2;i<s;++i){
-      v[i]=unmodunprod(v[i]);
-    }
-    if (s<4)
-      return (*u)(gen(v,a_orig.subtype),contextptr);
-    gen res;
-    if (s==4)
-      res=(*u)(makevecteur(v[0],v[1]),contextptr);
-    else
-      res=(*u)(makevecteur(v[0],v[1],v[2]),contextptr);
-    if (res.type==_VECT && res._VECTptr->size()==3 && v[s-2].type==_IDNT && v[s-1].type==_IDNT){
-      gen tmpsto=sto(res[0],v[s-2],contextptr);
-      if (is_undef(tmpsto))
-	return tmpsto;
-      tmpsto=sto(res[1],v[s-1],contextptr);
-      if (is_undef(tmpsto))
-	return tmpsto;
-      return res[2];
-    }
-    else
-      return res;
-    return gensizeerr();
-  }
-  gen _igcdex(const gen & a_orig,GIAC_CONTEXT){
-    if ( a_orig.type==_STRNG && a_orig.subtype==-1) return  a_orig;
-    return maple_gcdigcd(a_orig,at_iegcd,contextptr);
-  }
-  static const char _igcdex_s []="igcdex";
-  static define_unary_function_eval (__igcdex,&_igcdex,_igcdex_s);
-  define_unary_function_ptr5( at_igcdex ,alias_at_igcdex,&__igcdex,0,true);
-
-  static const char _igcd_s []="igcd";
-  static define_unary_function_eval (__igcd,&_gcd,_igcd_s);
-  define_unary_function_ptr5( at_igcd ,alias_at_igcd,&__igcd,0,true);
-
-  gen _gcdex(const gen & a_orig,GIAC_CONTEXT){
-    if ( a_orig.type==_STRNG && a_orig.subtype==-1) return  a_orig;
-    return maple_gcdigcd(a_orig,at_egcd,contextptr);
-  }
-  static const char _gcdex_s []="gcdex";
-  static define_unary_function_eval (__gcdex,&_gcdex,_gcdex_s);
-  define_unary_function_ptr5( at_gcdex ,alias_at_gcdex,&__gcdex,0,true);
-
-  static const char _indets_s []="indets";
-  static define_unary_function_eval (__indets,&_lname,_indets_s);
-  define_unary_function_ptr5( at_indets ,alias_at_indets,&__indets,0,true);
-
-  gen _revlist(const gen & a,GIAC_CONTEXT){
-    if ( a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type==_VECT){
-      vecteur v=*a._VECTptr;
-      reverse(v.begin(),v.end());
-      return gen(v,a.subtype);
-    }
-    if (a.type==_STRNG){
-      string s=*a._STRNGptr;
-      int l=int(s.size());
-      for (int i=0;i<l/2;++i){
-	char c=s[i];
-	s[i]=s[l-1-i];
-	s[l-1-i]=c;
-      }
-      return string2gen(s,false);
-    }
-    return a;
-  }
-  static const char _revlist_s []="revlist";
-  static define_unary_function_eval (__revlist,&_revlist,_revlist_s);
-  define_unary_function_ptr5( at_revlist ,alias_at_revlist,&__revlist,0,true);
-
-  static const char _reverse_s []="reverse";
-  static define_unary_function_eval (__reverse,&_revlist,_reverse_s);
-  define_unary_function_ptr5( at_reverse ,alias_at_reverse,&__reverse,0,true);
-
-  gen _restart(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    intvar_counter=0;
-    realvar_counter=0;
-    if (args==at_solve) return 1;
-    init_context((context *) ((void *) contextptr));
-    gen res= _rm_all_vars(args,contextptr);
-    *logptr(contextptr) << "============== restarted ===============" << '\n';
-    if (args.type==_VECT && args.subtype==_SEQ__VECT && args._VECTptr->empty())
-      _srand(_time(gen(vecteur(0),_SEQ__VECT),contextptr),contextptr);
-    return res;
-  }
-  static const char _restart_s []="restart";
-  static define_unary_function_eval (__restart,&_restart,_restart_s);
-  define_unary_function_ptr5( at_restart ,alias_at_restart,&__restart,0,T_RETURN);
-
-  static const char _restart_vars_s []="restart_vars";
-  static define_unary_function_eval (__restart_vars,&_rm_all_vars,_restart_vars_s);
-  define_unary_function_ptr5( at_restart_vars ,alias_at_restart_vars,&__restart_vars,0,T_RETURN);
-
-  gen _restart_modes(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (!contextptr)
-      return 0;
-    init_context((context *) ((void *) contextptr));
-    return 1;
-  }
-  static const char _restart_modes_s []="restart_modes";
-  static define_unary_function_eval (__restart_modes,&_restart_modes,_restart_modes_s);
-  define_unary_function_ptr5( at_restart_modes ,alias_at_restart_modes,&__restart_modes,0,T_RETURN);
-
-#ifdef KHICAS
-  gen _time(const gen & a,GIAC_CONTEXT){
-    if ( a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type==_VECT && a.subtype==_SEQ__VECT){
-      if (a._VECTptr->size()==2 && a._VECTptr->front().type==_INT_ && a._VECTptr->back().type==_INT_){
-	int h=a._VECTptr->front().val;
-	h=h%24;
-	if (h<0)
-	  h+=24;
-	int m=a._VECTptr->back().val;
-	m=m%60;
-	if (m<0)
-	  m+=60;
-#ifdef NSPIRE_NEWLIB
-	unsigned NSPIRE_RTC_WADDR=0x90090008;
-	* (volatile unsigned *) NSPIRE_RTC_WADDR = (h*60+m)*60;
-#else
-	time_shift=h*60+m;
-#endif
-	return 1;
-      }
-      return (double) millis();
-    }
-    double delta;
-    int ntimes=1,i=0;
-    int level=eval_level(contextptr);
-    double t1= millis(); // RTC_GetTicks(); // 1 tick=1/128 s
-    // CERR << t1 << endl;
-    for (unsigned i=1;i<=1000;++i){
-      eval(a,level,contextptr);
-      double t2= millis(); // RTC_GetTicks();
-#ifdef NSPIRE_NEWLIB
-      if (t2>=t1+5000)
-	return double(t2-t1)/double(i)/1000;
-#else
-      if (t2>=t1+32)
-	return double(t2-t1)/double(i)/1000;
-#endif
-    }
-    return 0.0;
-  }
-
-#else // KHICAS
-
-
-  double get_realtime(){ 
-#if !defined HAVE_NO_SYS_TIMES_H && defined HAVE_SYS_TIME_H
-    struct timeval t;
-    gettimeofday(&t, NULL);
-    t.tv_sec -= (2021 - 1970)*24*365*3600; // substract 2021, in order to loose less precision when doing a difference of get_realtime()
-    return ((double)t.tv_usec + ((double)t.tv_sec*1e6)) ;
-#else
-    return 0;
-#endif
-  }
-
-  const double realtime_init(get_realtime());
-  double realtime(){
-    double d= get_realtime()-realtime_init;
-    return d*1e-6;
-  }
-
-  cpureal_t clock_realtime(){
-    cpureal_t ans={CLOCK()*1e-6,realtime()};
-    return ans;
-  }
-
-  gen _time(const gen & a,GIAC_CONTEXT){
-    if ( a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type==_VECT && a.subtype==_SEQ__VECT){
-#if defined VISUALC || defined __MINGW_H
-    struct _timeb timebuffer;
-    _ftime(&timebuffer);
-    return timebuffer.time+double(timebuffer.millitm)/1000;
-#endif
-#ifdef GIAC_HAS_STO_38
-      return PrimeGetNow()/1000.;
-#endif
-#if 0 && (defined(EMCC) || defined (EMCC2)) && !defined(GIAC_GGB)
-      double res;
-      res=EM_ASM_DOUBLE_V({
-	  var hw=Date.now();
-	  return hw;
-      });
-      return res*1e-6;
-#endif // GIAC_GGB
-
-#if (defined(EMCC) || defined (EMCC2)) && !defined(PNACL)
-      return emcctime()/1e6;
-#endif
-      return total_time(contextptr);
-    }
-    double delta;
-    int ntimes=1,i=0;
-    int level=eval_level(contextptr);
-#if defined NSPIRE || defined NSPIRE_NEWLIB
-    unsigned NSPIRE_RTC_ADDR=0x90090000;
-    unsigned t1= * (volatile unsigned *) NSPIRE_RTC_ADDR;
-    // CERR << t1 << '\n';
-    for (unsigned i=1;i<=100;++i){
-      eval(a,level,contextptr);
-      unsigned t2= * (volatile unsigned *) NSPIRE_RTC_ADDR;
-      if (t2>=t1+3)
-	return double(t2-t1)/double(i);
-    }
-    return 0.0;
-#endif
-#if 0 && (defined(EMCC) || defined (EMCC2)) && !defined(GIAC_GGB)
-    double T1=EM_ASM_DOUBLE_V({
-	var hw=Date.now();
-	return hw;
-      });
-    eval(a,level,contextptr);
-    double T2=EM_ASM_DOUBLE_V({
-	var hw=Date.now();
-	return hw;
-      });
-    return (T2-T1)*1e-6;
-#endif // GIAC_GGB
-#if (defined(EMCC) || defined (EMCC2)) && !defined(PNACL)
-    // time_t t1,t2;
-    // time(&t1);
-    // eval(a,level,contextptr);
-    // time(&t2);
-    // return difftime(t2,t1);
-    double t1=emcctime();
-    eval(a,level,contextptr);
-    return (emcctime()-t1)/1e6;
-#endif
-#if defined VISUALC || defined __MINGW_H
-    struct _timeb timebuffer0,timebuffer1;
-    _ftime(&timebuffer0);
-    for (;i<1000;){ // do it 10 times more
-      for (;i<ntimes;++i){
-	eval(a,level,contextptr);
-      }
-      _ftime(&timebuffer1);
-      delta=(timebuffer1.time-timebuffer0.time)+double(timebuffer1.millitm-timebuffer0.millitm)/1000;
-      if (delta>0.1)
-	break;
-      if (delta>0.05) // max wait time will be 2 seconds
-	ntimes *= 2;
-      else {
-	if (delta>0.02) 
-	  ntimes *= 5;
-	else
-	  ntimes *= 10;
-      }
-    }
-    return (delta/ntimes);
-#endif
-#if defined(__APPLE__) || defined(PNACL)
-    unsigned u1=CLOCK();
-    struct timezone tz;
-    struct timeval debut,fin;
-    gettimeofday(&debut,&tz);
-    eval(a,level,contextptr);
-    gettimeofday(&fin,&tz);
-    u1=CLOCK()-u1;
-    return makevecteur(double(u1)/CLOCKS_PER_SEC,fin.tv_sec-debut.tv_sec+(fin.tv_usec-debut.tv_usec)/1e6);
-#endif
-#ifdef GIAC_HAS_STO_38
-   int t1=PrimeGetNow(),t2;
-#endif
-#ifdef _RUSAGE
-    struct rusage tmp1,tmp2,tmpc1,tmpc2;
-    getrusage(RUSAGE_SELF,&tmp1);
-    getrusage(RUSAGE_CHILDREN,&tmpc1);
-#else // _RUSAGE
-#ifdef HAVE_SYS_TIMES_H
-    struct tms tmp1,tmp2;
-    times(&tmp1);
-#ifdef HAVE_LIBRT
-    struct timespec real1,real2;
-    clock_gettime(CLOCK_REALTIME,&real1);
-#endif
-#endif
-#endif // _RUSAGE
-    for (;;){ // do it 10 times more
-      for (;i<ntimes;++i){
-	eval(a,level,contextptr);
-      }
-#ifdef GIAC_HAS_STO_38
-      t2=PrimeGetNow();
-      delta=(t2-t1)/1000.;
-#else // GIAC_HAS_STO_38
-#ifdef _RUSAGE
-      getrusage(RUSAGE_SELF,&tmp2);
-      getrusage(RUSAGE_CHILDREN,&tmpc2);
-      delta = tmp2.ru_utime.tv_sec+1e-6*tmp2.ru_utime.tv_usec+tmp2.ru_stime.tv_sec+1e-6*tmp2.ru_stime.tv_usec-(tmp1.ru_utime.tv_sec+1e-6*tmp1.ru_utime.tv_usec+tmp1.ru_stime.tv_sec+1e-6*tmp1.ru_stime.tv_usec);
-      delta += tmpc2.ru_utime.tv_sec+1e-6*tmpc2.ru_utime.tv_usec+tmpc2.ru_stime.tv_sec+1e-6*tmpc2.ru_stime.tv_usec-(tmpc1.ru_utime.tv_sec+1e-6*tmpc1.ru_utime.tv_usec+tmpc1.ru_stime.tv_sec+1e-6*tmpc1.ru_stime.tv_usec);
-#else // RUSAGE
-#ifdef HAVE_SYS_TIMES_H
-#ifdef HAVE_LIBRT
-      clock_gettime(CLOCK_REALTIME,&real2);
-#endif // HAVE_LIBRT
-      times(&tmp2);
-      delta=delta_tms(tmp1,tmp2);
-#else // HAVE_SYS_TIMES_H
-      delta=0.0;
-      break;
-#endif // HAVE_SYS_TIMES_H
-#endif // RUSAGE
-#endif // GIAC_HAS_STO_38
-      if (delta>0.1)
-	break;
-      if (delta>0.05) // max wait time will be 2 seconds
-	ntimes *= 2;
-      else {
-	if (delta>0.02) 
-	  ntimes *= 5;
-	else
-	  ntimes *= 10;
-      }
-    }
-#ifdef GIAC_HAS_STO_38
-    return (delta/ntimes);
-#endif    
-#ifdef HAVE_SYS_TIME_H
-#ifdef HAVE_LIBRT
-    return makevecteur(delta/ntimes,(real2.tv_sec-real1.tv_sec+(real2.tv_nsec-real1.tv_nsec)/1e9)/ntimes);
-#else
-    return (delta/ntimes);
-#endif // HAVE_LIBRT
-#else // HAVE_SYS_TIME_H
-    return (delta/ntimes);
-#endif
-  }
-  
-#endif // KHICAS
-  static const char _time_s []="time";
-  static define_unary_function_eval_quoted (__time,&_time,_time_s);
-  define_unary_function_ptr5( at_time ,alias_at_time,&__time,_QUOTE_ARGUMENTS,true);
-
-  static const char _Phi_s []="Phi";
-  static define_unary_function_eval (__Phi,&_euler,_Phi_s);
-  define_unary_function_ptr5( at_Phi ,alias_at_Phi,&__Phi,0,true);
-
-  static const char _powermod_s []="powermod";
-  static define_unary_function_eval (__powermod,&_powmod,_powermod_s);
-  define_unary_function_ptr5( at_powermod ,alias_at_powermod,&__powermod,0,true);
-
-  static const char _length_s []="length";
-  static define_unary_function_eval (__length,&_size,_length_s);
-  define_unary_function_ptr5( at_length ,alias_at_length,&__length,0,true);
-
-  static const char _len_s []="len";
-  static define_unary_function_eval (__len,&_size,_len_s);
-  define_unary_function_ptr5( at_len ,alias_at_len,&__len,0,true);
-
-  static const char _nops_s []="nops";
-  static define_unary_function_eval (__nops,&_size,_nops_s);
-  define_unary_function_ptr5( at_nops ,alias_at_nops,&__nops,0,true);
-
-  gen _cat(const gen & a_orig,GIAC_CONTEXT){
-    if ( a_orig.type==_STRNG && a_orig.subtype==-1) return  a_orig;
-    vecteur v(gen2vecteur(a_orig));
-    string s;
-    const_iterateur it=v.begin(),itend=v.end();
-    for (;it!=itend;++it){
-      if (it->type==_STRNG)
-	s = s + *it->_STRNGptr;
-      else
-	s = s+it->print(contextptr);
-    }
-    return string2gen(s,false);
-  }
-  static const char _cat_s []="cat";
-  static define_unary_function_eval (__cat,&_cat,_cat_s);
-  define_unary_function_ptr5( at_cat ,alias_at_cat,&__cat,0,true);
-
-  gen _pivot(const gen & a_orig,GIAC_CONTEXT){
-    if ( a_orig.type==_STRNG && a_orig.subtype==-1) return  a_orig;
-    vecteur v(gen2vecteur(a_orig));
-    int s=int(v.size());
-    if (s!=3 && s!=4)
-      return gensizeerr();
-    if (!ckmatrix(v.front()) || v[1].type!=_INT_ || v[2].type!=_INT_)
-      return gentypeerr();
-    matrice m=*v.front()._VECTptr;
-    int ml,mc;
-    mdims(m,ml,mc);
-    for (int i=0;i<ml;++i)
-      m[i]=*m[i]._VECTptr; // create a copy of the matrix
-    int l=v[1].val,c=v[2].val;
-    int shift = array_start(contextptr); // xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38;
-    l -= shift ;
-    c -= shift ;
-    if (l<0 || l>=ml || c<0 || c>=mc)
-      return gensizeerr();
-    gen p=m[l][c];
-    int l1=0,l2=ml-1;
-    if (s==4 && v[3].type==_INT_){
-      int lmin=v[3].val;
-      if (lmin<0){
-	l1 = -lmin;
-	l1 -= shift;
-      }
-      else {
-	lmin -= shift;
-	l2=giacmax(0,giacmin(lmin,ml-1));
-	l1=l2;
-      }
-    }
-    for (;l1<=l2;++l1){
-      if (l1!=l && !is_zero(m[l1][c]))
-	linear_combination(p,*m[l1]._VECTptr,-m[l1][c],*m[l]._VECTptr,plus_one,1,*m[l1]._VECTptr,epsilon(contextptr));
-    }
-    return m;
-  }
-  static const char _pivot_s []="pivot";
-  static define_unary_function_eval (__pivot,&_pivot,_pivot_s);
-  define_unary_function_ptr5( at_pivot ,alias_at_pivot,&__pivot,0,true);
-
-  static gen rowcolspace(const gen & g,bool transpose,GIAC_CONTEXT){
-    if (g.type==_VECT && g._VECTptr->size()==2 && g._VECTptr->back().type!=_VECT){
-      gen tmp=rowcolspace(g._VECTptr->front(),transpose,contextptr),tmpsto;
-      if (transpose)
-	tmpsto=sto(int(tmp._VECTptr->front()._VECTptr->size()),g._VECTptr->back(),contextptr);
-      else
-	tmpsto=sto(int(tmp._VECTptr->size()),g._VECTptr->back(),contextptr);
-      if (is_undef(tmpsto))
-	return tmpsto;
-      return tmp;
-    }
-    if (!ckmatrix(g))
-      return gensizeerr(contextptr);
-    vecteur v=*g._VECTptr;
-    if (transpose)
-      v=mtran(v);
-    v=mrref(v,contextptr);
-    vecteur newv;
-    int s=int(v.size());
-    vecteur cmp(v.front()._VECTptr->size());
-    for (int i=0;i<s;++i){
-      if (v[i]!=cmp)
-	newv.push_back(v[i]);
-    }
-    if (transpose)
-      newv=mtran(newv);
-    return newv; // gen(newv,_SET__VECT);
-  }
-  gen _rowspace(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return rowcolspace(g,false,contextptr);
-  }
-  static const char _rowspace_s []="rowspace";
-  static define_unary_function_eval (__rowspace,&_rowspace,_rowspace_s);
-  define_unary_function_ptr5( at_rowspace ,alias_at_rowspace,&__rowspace,0,true);
-
-  gen _colspace(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return rowcolspace(g,true,contextptr);
-  }
-  static const char _colspace_s []="colspace";
-  static define_unary_function_eval (__colspace,&_colspace,_colspace_s);
-  define_unary_function_ptr5( at_colspace ,alias_at_colspace,&__colspace,0,true);
-
-  static const char _nullspace_s []="nullspace";
-  static define_unary_function_eval (__nullspace,&_ker,_nullspace_s);
-  define_unary_function_ptr5( at_nullspace ,alias_at_nullspace,&__nullspace,0,true);
-
-  gen _copy(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT){
-      vecteur v(*g._VECTptr);
-      iterateur it=v.begin(),itend=v.end();
-      for (;it!=itend;++it)
-	*it=_copy(*it,contextptr);
-      return gen(v,g.subtype);
-    }
-    if (g.type==_MAP)
-      return gen(*g._MAPptr);
-    return g;
-  }
-  static const char _copy_s []="copy";
-  static define_unary_function_eval (___copy,&_copy,_copy_s);
-  define_unary_function_ptr5( at_copy ,alias_at_copy,&___copy,0,true);
-
-  gen _row(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=2)
-      return gensizeerr();
-    int shift = array_start(contextptr); //xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38;
-    gen indice=g._VECTptr->back();
-    if (indice.is_symb_of_sommet(at_interval) && indice._SYMBptr->feuille.type==_VECT)
-      indice=symbolic(at_interval,indice._SYMBptr->feuille-gen(shift)*vecteur(indice._SYMBptr->feuille._VECTptr->size(),1));
-    else
-      indice -= shift;
-    gen res=g._VECTptr->front().operator_at(indice,contextptr);
-    if (ckmatrix(res))
-      return gen(*res._VECTptr,_SEQ__VECT);
-    else
-      return res;
-  }
-  static const char _row_s []="row";
-  static define_unary_function_eval (__row,&_row,_row_s);
-  define_unary_function_ptr5( at_row ,alias_at_row,&__row,0,true);
-
-  gen _col(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=2)
-      return gensizeerr();
-    int shift = array_start(contextptr); //xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38;
-    gen indice=g._VECTptr->back();
-    if (indice.is_symb_of_sommet(at_interval) && indice._SYMBptr->feuille.type==_VECT)
-      indice=symbolic(at_interval,indice._SYMBptr->feuille-gen(shift)*vecteur(indice._SYMBptr->feuille._VECTptr->size(),1));
-    else
-      indice -= shift;
-    gen res=_tran(g._VECTptr->front(),contextptr)[indice];
-    if (ckmatrix(res))
-      return gen(*res._VECTptr,_SEQ__VECT);
-    else
-      return res;
-  }
-  static const char _col_s []="col";
-  static define_unary_function_eval (__col,&_col,_col_s);
-  define_unary_function_ptr5( at_col ,alias_at_col,&__col,0,true);
-
-  static gen count(const gen & f,const gen & v,const context * contextptr,const gen & param){
-    if (v.type!=_VECT)
-      return f(v,contextptr);
-    const_iterateur it=v._VECTptr->begin(),itend=v._VECTptr->end();
-    if (param==at_row){
-      vecteur res;
-      for (;it!=itend;++it){
-	res.push_back(count(f,*it,contextptr,0));
-      }
-      return res;
-    }
-    if (param==at_col){
-      if (!ckmatrix(v))
-	return gentypeerr();
-      return count(f,mtran(*v._VECTptr),contextptr,at_row);
-    }
-    gen res;
-    for (;it!=itend;++it){
-      res=res+count(f,*it,contextptr,0);
-    }
-    return res;
-  }
-  gen _count(const gen & args,const context * contextptr){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if ( (args.type!=_VECT) || (args._VECTptr->size()<2))
-      return gensizeerr(contextptr);
-    if (args.subtype!=_SEQ__VECT) {
-      if (!is_integer_vecteur(*args._VECTptr))
-	return gensizeerr(contextptr);
-      // count elements in list of integers
-      vector<int> x=vecteur_2_vector_int(*args._VECTptr);
-      int m=giacmin(x),M=giacmax(x),s=int(x.size());
-      if (M-m<3*s){
-	vector<int> eff(M-m+1);
-	effectif(x,eff,m);
-	matrice res;
-	for (int i=m;i<=M;++i){
-	  int e=eff[i-m];
-	  if (e>0)
-	    res.push_back(makevecteur(i,e));
-	}
-	return res;
-      }
-      sort(x.begin(),x.end());
-      int old=M,eff=0,cur;
-      matrice res;
-      for (int pos=0;pos<s;++pos){
-	cur=x[pos];
-	if (cur==old){
-	  ++eff;
-	  continue;
-	}
-	if (eff)
-	  res.push_back(makevecteur(old,eff));
-	old=cur;
-	eff=1;
-      }
-      if (eff)
-	res.push_back(makevecteur(old,eff));
-      return res;
-    }
-    gen v((*args._VECTptr)[1]);
-    gen f(args._VECTptr->front());
-    if (f.type==_STRNG && v.type==_STRNG){
-      // (Python-like) count occurrences of v in f
-      int count=0,pos=-1,s=f._STRNGptr->size();
-      for (;pos<s;++count){
-	pos=f._STRNGptr->find(*v._STRNGptr,pos+1);
-	if (pos<0 || pos>=s)
-	  break;
-      }
-      return count;
-    }
-    gen param;
-    if (args._VECTptr->size()>2)
-      param=(*args._VECTptr)[2];
-    else {
-      if (v.type!=_VECT) 
-	return _count_eq(makesequence(v,f),contextptr);
-    }
-    return count(f,v,contextptr,param);
-  }
-  static const char _count_s []="count";
-  static define_unary_function_eval (___count,&_count,_count_s);
-  define_unary_function_ptr5( at_count ,alias_at_count,&___count,0,true);
-
-  static longlong count_eq0(const gen & f,const gen & v,GIAC_CONTEXT){
-    if (v.type!=_VECT)
-      return v==f;
-    const_iterateur it=v._VECTptr->begin(),itend=v._VECTptr->end();
-    longlong res=0;
-    for (;it!=itend;++it){
-      if (it->type!=_VECT){
-	if (*it==f)
-	  ++res;
-      }
-      else
-	res += count_eq0(f,*it,contextptr);
-    }
-    return res;
-  }
-
-  static gen count_eq1(const gen & f,const gen & v,GIAC_CONTEXT){
-    if (v.type!=_VECT)
-      return is_strictly_greater(v,f,contextptr);
-    const_iterateur it=v._VECTptr->begin(),itend=v._VECTptr->end();
-    gen res;
-    for (;it!=itend;++it){
-      res=res+count_eq1(f,*it,contextptr);
-    }
-    return res;
-  }
-
-  static gen count_eq2(const gen & f,const gen & v,GIAC_CONTEXT){
-    if (v.type!=_VECT)
-      return is_strictly_greater(f,v,contextptr);
-    const_iterateur it=v._VECTptr->begin(),itend=v._VECTptr->end();
-    gen res;
-    for (;it!=itend;++it){
-      res=res+count_eq2(f,*it,contextptr);
-    }
-    return res;
-  }
-
-  static gen count_eq(const gen & f,const gen & v,GIAC_CONTEXT,int type,const gen & rowcol){
-    if (rowcol==at_row || rowcol==at_col){
-      if (!ckmatrix(v))
-	return gentypeerr();
-      if (rowcol==at_row){
-	const_iterateur it=v._VECTptr->begin(),itend=v._VECTptr->end();
-	vecteur res;
-	for (;it!=itend;++it){
-	  res.push_back(count_eq(f,*it,contextptr,type,0));
-	}
-	return res;
-      }
-      if (rowcol==at_col)
-	return count_eq(f,mtran(*v._VECTptr),contextptr,type,at_row);
-    }
-    if (type==0)
-      return count_eq0(f,v,contextptr);
-    if (type==1)
-      return count_eq1(f,v,contextptr);
-    if (type==2)
-      return count_eq2(f,v,contextptr);
-    return gentypeerr();
-#if 0
-    if (v.type!=_VECT){
-      switch (type){
-      case 0:
-	return v==f;
-      case 1:
-	return is_strictly_greater(v,f,contextptr);
-      case 2:
-	return is_strictly_greater(f,v,contextptr);
-      default:
-	return gentypeerr();
-      }
-    }
-    const_iterateur it=v._VECTptr->begin(),itend=v._VECTptr->end();
-    gen res;
-    for (;it!=itend;++it){
-      res=res+count_eq(f,*it,contextptr,type,0);
-    }
-    return res;
-#endif
-  }
-
-  gen _count_eq(const gen & args,const context * contextptr){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if ( args.type!=_VECT || args.subtype!=_SEQ__VECT || args._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    gen v((*args._VECTptr)[1]);
-    gen f(args._VECTptr->front());
-    gen param;
-    if (args._VECTptr->size()>2)
-      param=(*args._VECTptr)[2];
-    return count_eq(f,v,contextptr,0,param);
-  }
-  static const char _count_eq_s []="count_eq";
-  static define_unary_function_eval (___count_eq,&_count_eq,_count_eq_s);
-  define_unary_function_ptr5( at_count_eq ,alias_at_count_eq,&___count_eq,0,true);
-
-  gen _count_sup(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if ( args.type!=_VECT || args.subtype!=_SEQ__VECT || args._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    gen v((*args._VECTptr)[1]);
-    gen f(args._VECTptr->front());
-    gen param;
-    if (args._VECTptr->size()>2)
-      param=(*args._VECTptr)[2];
-    return count_eq(f,v,contextptr,1,param);
-  }
-  static const char _count_sup_s []="count_sup";
-  static define_unary_function_eval (___count_sup,&_count_sup,_count_sup_s);
-  define_unary_function_ptr5( at_count_sup ,alias_at_count_sup,&___count_sup,0,true);
-
-  gen _count_inf(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if ( args.type!=_VECT || args.subtype!=_SEQ__VECT || args._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    gen v((*args._VECTptr)[1]);
-    gen f(args._VECTptr->front());
-    gen param;
-    if (args._VECTptr->size()>2)
-      param=(*args._VECTptr)[2];
-    return count_eq(f,v,contextptr,2,param);
-  }
-  static const char _count_inf_s []="count_inf";
-  static define_unary_function_eval (___count_inf,&_count_inf,_count_inf_s);
-  define_unary_function_ptr5( at_count_inf ,alias_at_count_inf,&___count_inf,0,true);
-
-  gen _trunc(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (is_equal(args))
-      return apply_to_equal(args,_trunc,contextptr);
-    if (args.is_symb_of_sommet(at_unit))
-      return apply_unit(args,_trunc,contextptr);
-    if (args.type==_VECT) {
-      if (args.subtype==_SEQ__VECT && args._VECTptr->size()==2 && args._VECTptr->back().type==_INT_){
-#ifdef BCD
-	if (args._VECTptr->front().type==_FLOAT_)
-	  return ftrunc(args._VECTptr->front()._FLOAT_val,args._VECTptr->back().val);
-#endif
-	gen b=args._VECTptr->back();
-	if (b.val<0){
-	  gen gf=_floor(log10(abs(args._VECTptr->front(),contextptr),contextptr),contextptr); 
-	  if (gf.type!=_INT_ && gf.type!=_FLOAT_)
-	    return gensizeerr(contextptr);
-	  b=-1-b-gf;
-	}
-#ifdef _SOFTMATH_H
-	double d=std::giac_gnuwince_pow(10.0,double(b.val));
-#else
-	double d=std::pow(10.0,double(b.val));
-#endif
-	return _floor(d*args._VECTptr->front(),contextptr)/d;
-      }
-      if (args.subtype==_SEQ__VECT && args._VECTptr->size()==2 && args._VECTptr->front().type==_INT_){
-	if (args._VECTptr->front().val)
-	  return zero;
-	return _trunc(args._VECTptr->back(),contextptr);
-      }
-      return apply(args,contextptr,_trunc);
-    }
-    if (is_strictly_positive(-args,contextptr))
-      return -_floor(-args,contextptr);
-    return _floor(args,contextptr);
-  }
-  static const char _trunc_s []="trunc";
-  static define_unary_function_eval (___trunc,&_trunc,_trunc_s);
-  define_unary_function_ptr5( at_trunc ,alias_at_trunc,&___trunc,0,true);
-
-  static const char _giac_s []="giac";
-  static define_unary_function_eval (__giac,&_version,_giac_s);
-  define_unary_function_ptr5( at_giac ,alias_at_giac,&__giac,0,true);
-
-  static const char _div_s []="div";
-  static define_unary_function_eval4 (__div,&_iquo,_div_s,&printsommetasoperator,&texprintsommetasoperator);
-  define_unary_function_ptr5( at_div ,alias_at_div,&__div,0,T_MOD);
-
-  gen _evalc(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT)
-      return apply(g,_evalc,contextptr);
-    gen tmp(_exp2pow(_lin(recursive_normal(g,contextptr),contextptr),contextptr));
-    vecteur l(lop(tmp,at_arg));
-    if (!l.empty()){
-      vecteur lp=*giac::apply(l,gen_feuille)._VECTptr;
-      lp=*apply(lp,contextptr,arg_CPLX)._VECTptr;
-      tmp=subst(tmp,l,lp,false,contextptr);
-    }
-    tmp=recursive_normal(tmp,contextptr);
-    vecteur vtmp(lvar(tmp));
-    if (vtmp.size()==1 && vtmp[0].is_symb_of_sommet(at_exp)){
-      tmp=ratnormal(_halftan(_exp2trig(tmp,contextptr),contextptr),contextptr);
-    }
-    gen r,i;
-    reim(tmp,r,i,contextptr);
-    gen tmp2=_lin(inv(tmp,contextptr),contextptr);
-    gen re2,im2;
-    reim(tmp2,re2,im2,contextptr);
-    if (lvar(makevecteur(re2,im2)).size()<lvar(makevecteur(r,i)).size())
-      reim(inv(ratnormal(re2,contextptr)+cst_i*ratnormal(im2,contextptr),contextptr),r,i,contextptr);
-    // tmp=simplify(i,contextptr);
-    if (is_zero(i))
-      return r;
-    if (is_zero(r))
-      return cst_i*i;
-    return symbolic(at_plus,gen(makevecteur(r,cst_i*i),_SEQ__VECT));
-  }
-  static const char _evalc_s []="evalc";
-  static define_unary_function_eval (__evalc,&_evalc,_evalc_s);
-  define_unary_function_ptr5( at_evalc ,alias_at_evalc,&__evalc,0,true);
-
-  static const char _evala_s []="evala";
-  static define_unary_function_eval (__evala,(const gen_op_context)recursive_normal,_evala_s);
-  define_unary_function_ptr5( at_evala ,alias_at_evala,&__evala,0,true);
-
-#ifndef S_IRUSR
-#define S_IRUSR 00400
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR 00200
-#endif
-
-  // open a file, returns a FD
-  gen _open(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-#if defined(VISUALC) || defined(__MINGW_H) || defined (FIR) || defined(FXCG) || defined(NSPIRE) || defined(__ANDROID__) || defined(NSPIRE_NEWLIB) || defined(EMCC) || defined (EMCC2) || defined(GIAC_GGB) || defined KHICAS
-    return gensizeerr(gettext("not implemented"));
-#else
-    gen tmp=check_secure();
-    if (is_undef(tmp)) return tmp;
-    gen filename(g);
-    if (filename.type!=_STRNG)
-      return gensizeerr();
-    int access=O_RDWR | O_CREAT | O_TRUNC | O_APPEND ;
-    int res=open(filename._STRNGptr->c_str(),access, S_IRUSR|S_IWUSR);
-    if (res==-1)
-      return gensizeerr(gettext("Could not open file"));
-    gen r(res);
-    r.subtype=_INT_FD;
-    return r;
-#endif
-  }
-  static const char _open_s []="open";
-  static define_unary_function_eval (__open,&_open,_open_s);
-  define_unary_function_ptr5( at_open ,alias_at_open,&__open,0,true);
-
-  // open a file, returns a FILE *
-  gen _fopen(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen tmp=check_secure();
-    if (is_undef(tmp)) return tmp;
-    gen filename(g);
-    string mode="w+";
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && g._VECTptr->size()==2 && g._VECTptr->back().type==_STRNG){
-      filename=g._VECTptr->front();
-      mode=*g._VECTptr->back()._STRNGptr;
-    }
-    if (filename.type!=_STRNG || mode.size()>2)
-      return gensizeerr();
-    FILE * f=fopen(filename._STRNGptr->c_str(),mode.c_str());
-    return gen((void *) f,_FILE_POINTER);
-  }
-  static const char _fopen_s []="fopen";
-  static define_unary_function_eval (__fopen,&_fopen,_fopen_s);
-  define_unary_function_ptr5( at_fopen ,alias_at_fopen,&__fopen,0,true);
-
-  // fprint first arg=FD, rest is printed
-  gen _fprint(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen tmp=check_secure();
-    if (is_undef(tmp)) return tmp;
-    if (g.type!=_VECT || g._VECTptr->size()<1)
-      return gensizeerr(gettext("1st arg=open result, then other args"));
-    vecteur & v=*g._VECTptr;
-    int s=int(v.size());
-    FILE * f=0;
-#if !defined(BESTA_OS) && !defined(NSPIRE) && !defined(FXCG)
-    if (v[0].type==_INT_ && v[0].subtype==_INT_FD)
-      f= fdopen(v[0].val,"a");
-#endif    
-    if (v[0].type==_POINTER_ && v[0].subtype==_FILE_POINTER)
-      f=(FILE *) v[0]._POINTER_val;
-    if (f){
-      if (s>1 && v[1]==gen("Unquoted",contextptr)){
-	for (int i=2;i<s;++i)
-	  fprintf(f,"%s",v[i].type==_STRNG?v[i]._STRNGptr->c_str():unquote(v[i].print(contextptr)).c_str());
-      }
-      else if (s>1 && v[1].type==_STRNG && v[1]._STRNGptr->size()==0){
-	for (int i=2;i<s;++i)
-	  fprintf(f,"%s",v[i].type==_STRNG?v[i]._STRNGptr->c_str():unquote(v[i].print(contextptr)).c_str());
-	fprintf(f,"\n");
-      }
-      else {
-	for (int i=1;i<s;++i)
-	  fprintf(f,"%s",v[i].print(contextptr).c_str());
-      }
-      // fclose(f);
-      return plus_one;
-    }
-    return zero;
-  }
-  static const char _fprint_s []="fprint";
-  static define_unary_function_eval (__fprint,&_fprint,_fprint_s);
-  define_unary_function_ptr5( at_fprint ,alias_at_fprint,&__fprint,0,true);
-
-  gen _close(const gen & g0,GIAC_CONTEXT){
-    gen g=eval(g0,1,contextptr);
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-#if !defined(VISUALC) && !defined(BESTA_OS) && !defined(__MINGW_H) && !defined(NSPIRE) && !defined(FXCG)
-    if (g.type==_INT_ && g.subtype==_INT_FD){
-      purgenoassume(g0,contextptr);
-      close(g.val);
-      return plus_one;
-    }
-#endif
-    if (g.type==_POINTER_){
-      purgenoassume(g0,contextptr);
-      fclose((FILE *)g._POINTER_val);
-      return plus_one;
-    }
-    return zero;
-  }
-  static const char _close_s []="close";
-  static define_unary_function_eval_quoted (__close,&_close,_close_s);
-  define_unary_function_ptr5( at_close ,alias_at_close,&__close,_QUOTE_ARGUMENTS,true);
-
-  static const char _fclose_s []="fclose";
-  static define_unary_function_eval_quoted (__fclose,&_close,_fclose_s);
-  define_unary_function_ptr5( at_fclose ,alias_at_fclose,&__fclose,_QUOTE_ARGUMENTS,true);
-
-  gen _blockmatrix(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=3)
-      return gentypeerr();
-    vecteur & v = *g._VECTptr;
-    if (v[0].type!=_INT_ || v[1].type!=_INT_ || v[2].type!=_VECT)
-      return gensizeerr();
-    int n=v[0].val,m=v[1].val;
-    vecteur l=*v[2]._VECTptr;
-    int s=int(l.size());
-    if (n<=0 || m<=0 || n*m!=s)
-      return gendimerr();
-    for (int k=0;k<s;++k){
-      if (!ckmatrix(l[k])){
-	vecteur vtmp(vecteur(1,l[k]));
-	if (ckmatrix(vtmp))
-	  l[k]=mtran(vtmp);
-	if (!ckmatrix(l[k]))
-	  return gentypeerr();
-      }
-    }
-    matrice res;
-    int pos=0;
-    unsigned final=0;
-    for (int i=0;i<n;++i){
-      // glue m matrices from l vertically, these matrices must have same #rows
-      pos=i*m;
-      int nrows=int(l[pos]._VECTptr->size());
-      for (int j=1;j<m;++j){
-	if (l[pos+j]._VECTptr->size()!=unsigned(nrows))
-	  return gendimerr();
-      }
-      for (int k=0;k<nrows;++k){
-	// glue row k of l[pos+j] for j=0..m
-	vecteur tmp;
-	for (int j=0;j<m;++j){
-	  gen cur_row = (*l[pos+j]._VECTptr)[k];
-	  const_iterateur it=cur_row._VECTptr->begin(),itend=cur_row._VECTptr->end();
-	  for (;it!=itend;++it)
-	    tmp.push_back(*it);
-	}
-	if (final && tmp.size()!=final)
-	  return gendimerr();
-	else
-	  final=unsigned(tmp.size());
-	res.push_back(tmp);
-      }
-    }
-    return res;
-  }
-  static const char _blockmatrix_s []="blockmatrix";
-  static define_unary_function_eval (__blockmatrix,&_blockmatrix,_blockmatrix_s);
-  define_unary_function_ptr5( at_blockmatrix ,alias_at_blockmatrix,&__blockmatrix,0,true);
-
-  static gen delrowscols(const gen & g,bool isrow,GIAC_CONTEXT){
-    gen gm,interval,f,fa,fb;
-    if (g.type!=_VECT || g._VECTptr->size()!=2 )
-      return gentypeerr();
-    gm=g._VECTptr->front();
-    if (is_Ans(gm))
-      gm=eval(gm,1,contextptr);
-    if (gm.type==_IDNT){
-      return sto(delrowscols(eval(g,eval_level(contextptr),contextptr),isrow,contextptr),gm,contextptr);
-    }
-    interval=g._VECTptr->back();
-    // if (interval.type==_IDNT || interval.type==_SYMB)
-      interval=eval(interval,1,contextptr);
-    if (!interval.is_symb_of_sommet(at_interval))
-      interval=symb_interval(interval,interval);
-    if (!ckmatrix(gm) || !interval.is_symb_of_sommet(at_interval) || (f=interval._SYMBptr->feuille).type!=_VECT || f._VECTptr->size()!=2 || !is_integral(fa=f._VECTptr->front()) || !is_integral(fb=f._VECTptr->back()) )
-      return gentypeerr();
-    int shift = array_start(contextptr); //xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38;
-    int a=fa.val-shift,b=fb.val-shift,s;
-    matrice m=*gm._VECTptr;
-    if (!isrow)
-      m=mtran(m);
-    s=int(m.size());
-    if (a>=s || b>=s || a<0 || b<0 || a>b)
-      return gendimerr();
-    m.erase(m.begin()+a,m.begin()+b+1);
-    if (!isrow)
-      m=mtran(m);
-    return m;
-  }
-
-  gen _delrows(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return delrowscols(g,true,contextptr);
-  }
-  static const char _delrows_s []="delrows";
-  static define_unary_function_eval (__delrows,&_delrows,_delrows_s);
-  define_unary_function_ptr5( at_delrows ,alias_at_delrows,&__delrows,0,true);
-
-  gen _delcols(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return delrowscols(g,false,contextptr);
-  }
-  static const char _delcols_s []="delcols";
-  static define_unary_function_eval (__delcols,&_delcols,_delcols_s);
-  define_unary_function_ptr5( at_delcols ,alias_at_delcols,&__delcols,0,true);
-
-  static const char _gaussjord_s []="gaussjord";
-  static define_unary_function_eval (__gaussjord,&_rref,_gaussjord_s);
-  define_unary_function_ptr5( at_gaussjord ,alias_at_gaussjord,&__gaussjord,0,true);
-
-  gen _JordanBlock(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int s;
-    if (g.type!=_VECT || g._VECTptr->size()!=2 || g._VECTptr->back().type!=_INT_ )
-      return gentypeerr();
-    s=g._VECTptr->back().val;
-    if (s<=0 || double(s)*s>LIST_SIZE_LIMIT)
-      return gendimerr();
-    --s;
-    gen x=g._VECTptr->front();
-    matrice m;
-    m.reserve(s+1);
-    for (int i=0;i<=s;++i){
-#ifdef TIMEOUT
-      control_c();
-#endif
-      if (ctrl_c || interrupted)
-	return gensizeerr(gettext("Stopped by user interruption."));
-      vecteur v(s+1);
-      v[i]=x;
-      if (i<s)
-	v[i+1]=plus_one;
-      m.push_back(v);
-    }
-    return m;
-  }
-  static const char _JordanBlock_s []="JordanBlock";
-  static define_unary_function_eval (__JordanBlock,&_JordanBlock,_JordanBlock_s);
-  define_unary_function_ptr5( at_JordanBlock ,alias_at_JordanBlock,&__JordanBlock,0,true);
-
-  gen _companion(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v;
-    if (g.type!=_VECT)
-      return _companion(makesequence(g,vx_var),contextptr); // gentypeerr();
-    if (g.subtype==_SEQ__VECT && g._VECTptr->size()==2){
-      gen P=g._VECTptr->front();
-      gen x=g._VECTptr->back();
-      gen Px=_e2r(makevecteur(P,x),contextptr);
-      if (Px.type==_FRAC)
-	Px=inv(Px._FRACptr->den,contextptr)*Px._FRACptr->num;
-      if (Px.type!=_VECT)
-	return gensizeerr();
-      v=*Px._VECTptr;
-    }
-    else
-      v=*g._VECTptr;
-    return companion(v);
-  }
-  static const char _companion_s []="companion";
-  static define_unary_function_eval (__companion,&_companion,_companion_s);
-  define_unary_function_ptr5( at_companion ,alias_at_companion,&__companion,0,true);
-
-  gen _border(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=2 || !ckmatrix(g._VECTptr->front()) || g._VECTptr->back().type!=_VECT)
-      return gensizeerr();
-    matrice m=*g._VECTptr->front()._VECTptr,v=*g._VECTptr->back()._VECTptr;
-    if (m.size()!=v.size())
-      return gendimerr();
-    m=mtran(m);
-    if (ckmatrix(v))
-      m=mergevecteur(m,mtran(v));
-    else
-      m.push_back(v);
-    return mtran(m);
-  }
-  static const char _border_s []="border";
-  static define_unary_function_eval (__border,&_border,_border_s);
-  define_unary_function_ptr5( at_border ,alias_at_border,&__border,0,true);
-
-  // pade(f(x),x,n,p) or pade(f(x),x,N(x),p)
-  // Find P/Q such that P/Q=f(x) mod N(x) [1st case N(x)=x^n], deg(P)<p
-  // Assume deg(f)<n
-  gen _pade(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=4)
-      return gensizeerr();
-    vecteur v =*g._VECTptr;
-    if (v[1].type!=_IDNT || v[3].type!=_INT_)
-      return gensizeerr();
-    int n,p=v[3].val,ns;
-    gen f=v[0],x=v[1],N=v[2];
-    if (v[2].type==_INT_){
-      n=v[2].val+1;
-      N=pow(v[1],n);
-      ns=n;
-    }
-    else {
-      n=p;
-      ns=_degree(makevecteur(N,x),contextptr).val;
-    }
-    if (p<=0 || n<=0)
-      return gensizeerr();
-    f=_series(makevecteur(f,x,zero,ns-1),contextptr);
-    vecteur l1(lop(f,at_order_size));
-    vecteur l2(l1.size(),zero);
-    f=subst(f,l1,l2,false,contextptr);
-    // Convert f and N to poly1
-    vecteur l(1,x);
-    lvar(f,l);
-    lvar(N,l);
-    int ls=int(l.size());
-    gen ff(sym2r(f,l,contextptr));
-    gen fn,fd;
-    fxnd(ff,fn,fd);
-    gen Nf(sym2r(N,l,contextptr));
-    gen Nn,Nd;
-    fxnd(Nf,Nn,Nd); // Note nd has no meaning
-    vecteur fp;
-    if (fn.type==_POLY)
-      fp=polynome2poly1(*fn._POLYptr,1);
-    else
-      return gensizeerr();
-    vecteur Np;
-    if (Nn.type==_POLY)
-      Np=polynome2poly1(*Nn._POLYptr,1);
-    else
-      return gensizeerr();
-    n=int(Np.size())-1;
-    // Check that fp is a poly of degree less than n
-    if (n<1 || p>n || signed(fp.size())>n)
-      return gendimerr();
-    vecteur a,b;
-    if (!egcd_pade(Np,fp,p,a,b,0))
-      *logptr(contextptr) << gettext("Solution may be wrong since a and b are not prime together: ")+gen(a).print(contextptr)+","+gen(b).print(contextptr) << '\n';
-    gen res=poly12polynome(a,1,ls);
-    res=res/(fd*gen(poly12polynome(b,1,ls)));
-    res=r2sym(res,l,contextptr);
-    return res;
-  }
-  static const char _pade_s []="pade";
-  static define_unary_function_eval (__pade,&_pade,_pade_s);
-  define_unary_function_ptr5( at_pade ,alias_at_pade,&__pade,0,true);
-
-  static const char _interp_s []="interp";
-  static define_unary_function_eval (__interp,&_lagrange,_interp_s);
-  define_unary_function_ptr5( at_interp ,alias_at_interp,&__interp,0,true);
-
-  static gen lhsrhs(const gen & g,int i){
-    if (!is_equal(g) && !g.is_symb_of_sommet(at_interval))
-      return gensizeerr();
-    gen & f=g._SYMBptr->feuille;
-    if (f.type!=_VECT || f._VECTptr->size()!=2)
-      return gensizeerr();
-    return (*f._VECTptr)[i];
-  }
-  gen _lhs(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return lhsrhs(g,0);
-  }
-  static const char _lhs_s []="lhs";
-  static define_unary_function_eval (__lhs,&_lhs,_lhs_s);
-  define_unary_function_ptr5( at_lhs ,alias_at_lhs,&__lhs,0,true);
-
-  gen _rhs(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return lhsrhs(g,1);
-  }
-  static const char _rhs_s []="rhs";
-  static define_unary_function_eval (__rhs,&_rhs,_rhs_s);
-  define_unary_function_ptr5( at_rhs ,alias_at_rhs,&__rhs,0,true);
-
-  // Given [v_0 ... v_(2n-1)] (begin of the recurrence sequence) 
-  // return [b_n...b_0] such that b_n*v_{n+k}+...+b_0*v_k=0
-  // Example [1,-1,3,3] -> [1,-3,-6]
-  // -> the recurrence relation is v_{n+2}=3v_{n+1}+6v_n
-  gen _reverse_rsolve(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT)
-      return gensizeerr();
-    vecteur v=reverse_rsolve(*g._VECTptr);
-    return v/v.front();
-  }
-  static const char _reverse_rsolve_s []="reverse_rsolve";
-  static define_unary_function_eval (__reverse_rsolve,&_reverse_rsolve,_reverse_rsolve_s);
-  define_unary_function_ptr5( at_reverse_rsolve ,alias_at_reverse_rsolve,&__reverse_rsolve,0,true);
-
-  static const char _berlekamp_massey_s []="berlekamp_massey";
-  static define_unary_function_eval (__berlekamp_massey,&_reverse_rsolve,_berlekamp_massey_s);
-  define_unary_function_ptr5( at_berlekamp_massey ,alias_at_berlekamp_massey,&__berlekamp_massey,0,true);
-
-  // Approx fft or exact if args=poly1,omega,n
-  gen fft(const gen & g_orig,int direct,GIAC_CONTEXT){
-    if (g_orig.type==_VECT && g_orig.subtype==_SEQ__VECT && g_orig._VECTptr->size()>=3 && g_orig._VECTptr->front().type==_VECT){
-      vecteur & v =*g_orig._VECTptr->front()._VECTptr;
-      int n=int(v.size());
-      if (n<2)
-	return gendimerr();
-      gen omega=(*g_orig._VECTptr)[1];
-      gen modulo=(*g_orig._VECTptr)[2];
-      if (direct==1)
-	omega=invmod(omega,modulo);
-      if (omega.type==_INT_ && modulo.type==_INT_ && n==(1<<(sizeinbase2(n)-1))){
-	if (debug_infolevel)
-	  CERR << CLOCK()*1e-6 << " fft start" << '\n';
-	vector<int> A; A.reserve(n);
-	for (int i=0;i<n;++i){
-	  if (v[i].type==_INT_)
-	    A.push_back(v[i].val);
-	  else
-	    A.push_back(smod(v[i],modulo).val);
-	}
-	int p=modulo.val;
-	fft2(&A.front(),n,omega.val,p,g_orig._VECTptr->size()==3);
-	gen r=vecteur(0);
-	vecteur & res=*r._VECTptr;
-	res.reserve(n);
-	if (direct){
-	  for (int i=0;i<n;++i)
-	    res.push_back(A[i]);
-	}
-	else {
-	  longlong ninv=invmod(n,p);
-	  if (ninv<0) ninv += p;
-	  for (int i=0;i<n;++i)
-	    res.push_back((ninv*A[i])%p);
-	}
-	if (debug_infolevel)
-	  CERR << CLOCK()*1e-6 << "fft end" << '\n';
-	return r;
-      }
-      vecteur w(n),res;
-      iterateur it=w.begin(),itend=w.end();
-      if (omega.type==_INT_ && modulo.type==_INT_){
-	int Omega=omega.val,m=modulo.val;
-	longlong omegan=1;
-	for (;it!=itend;++it,omegan=(Omega*omegan) %m){
-	  *it=int(omegan);
-	}
-      }
-      else {
-	gen omegan=1;
-	for (;it!=itend;++it,omegan=smod(omega*omegan,modulo)){
-	  *it=omegan;
-	}
-      }
-      environment * env = new environment;
-      env->moduloon=true;
-      env->modulo=modulo;
-      fft(v,w,res,env);
-      delete env;
-      if (direct==1)
-	return res;
-      else
-	return smod(invmod(n,modulo)*res,modulo);
-    }
-    gen g=g_orig;
-    if (g.type!=_VECT)
-      return gensizeerr();
-    int n=int(g._VECTptr->size());
-    if (n<2)
-      return gendimerr();
-    vector< complex<double> > vd;
-    if (convert(*g._VECTptr,vd,true)){
-      if (debug_infolevel)
-	CERR << CLOCK()*1e-6 << " fft start" << '\n';
-      double theta=2.0*M_PI/n;
-      if (direct) theta=-theta;
-      bool done=false;
-      if (n==(1<<(sizeinbase2(n)-1))){
-	fft2(&vd.front(),n,theta);
-	done=true;
-      }
-#if 1 //ndef HAVE_LIBGSL
-      if (!done){
-	complex<double> w(std::cos(theta),std::sin(theta));
-	vector< complex<double> > W(n),res(n);
-	for (int i=0;i<n;++i){
-	  if ( i % 64==0)
-	    W[i]=complex<double>(std::cos(i*theta),std::sin(i*theta));
-	  else
-	    W[i]=W[i-1]*w;
-	}
-	fft(&vd[0],n,&W[0],n,&res[0]);
-	done=true;
-      }
-#endif
-      if (done){
-	gen r=vecteur(0);
-	vecteur & v=*r._VECTptr;
-	v.reserve(n);
-	if (direct){
-	  for (int i=0;i<n;++i){
-	    v.push_back(vd[i]);
-	  }
-	}
-	else {
-	  double invn=1.0/n;
-	  for (int i=0;i<n;++i){
-	    v.push_back(gen(invn*vd[i].real(),invn*vd[i].imag()));
-	  }
-	}
-	if (debug_infolevel)
-	  CERR << CLOCK()*1e-6 << " fft end" << '\n';
-	return r;
-      }
-    }
-    g=evalf_double(g_orig,1,contextptr);
-    if (debug_infolevel)
-      CERR << CLOCK()*1e-6 << " fft start" << '\n';
-    vecteur v =*g._VECTptr;
-#ifdef HAVE_LIBGSL
-    if (direct && is_zero(im(v,contextptr))){
-      double * data=new double[n];
-      for (int i=0;i<n;++i){
-	if (v[i].type!=_DOUBLE_){
-	  delete [] data;
-	  return gensizeerr(contextptr);
-	}
-	data[i]=v[i]._DOUBLE_val;
-      }
-      if (n==(1<<(sizeinbase2(n)-1))){
-	gsl_fft_real_radix2_transform(data,1,n);
-	v[0]=data[0];
-	v[n/2]=data[n/2];
-	for (int i=1;i<n/2;++i){
-	  v[i]=gen(data[i],data[n-i]);
-	  v[n-i]=conj(v[i],contextptr);
-	}
-      }
-      else {
-	gsl_fft_real_wavetable * wavetable = gsl_fft_real_wavetable_alloc (n);
-	gsl_fft_real_workspace * workspace = gsl_fft_real_workspace_alloc (n);
-	gsl_fft_real_transform (data, 1, n,wavetable,workspace);
-	gsl_fft_real_wavetable_free (wavetable);
-	gsl_fft_real_workspace_free (workspace);
-	v[0]=data[0];
-	int n2;
-	if (n%2==0){
-	  v[n/2]=data[n-1];
-	  n2=n/2;
-	}
-	else 
-	  n2=n/2+1;
-	for (int i=1;i<n2;++i){
-	  v[i]=gen(data[2*i-1],data[2*i]);
-	  v[n-i]=conj(v[i],contextptr);
-	}
-      }
-      delete [] data;
-      if (debug_infolevel)
-	CERR << CLOCK()*1e-6 << " fft end" << '\n';
-      return v;
-    }
-    // Could be improved by keeping the wavetable
-    double * data=new double[2*n];
-    gen gr,gi;
-    for (int i=0;i<n;++i){
-      reim(v[i],gr,gi,contextptr);
-      gi=evalf_double(gi,1,contextptr);
-      if (gr.type!=_DOUBLE_ || gi.type!=_DOUBLE_){
-	delete [] data;
-	return gensizeerr(contextptr);
-      }
-      data[2*i]=gr._DOUBLE_val;
-      data[2*i+1]=gi._DOUBLE_val;
-    }
-    if (n==(1<<(sizeinbase2(n)-1))){
-      if (direct)
-	gsl_fft_complex_radix2_forward(data,1,n);
-      else
-	gsl_fft_complex_radix2_backward(data,1,n);
-    }
-    else {
-      gsl_fft_complex_wavetable * wavetable = gsl_fft_complex_wavetable_alloc (n);
-      gsl_fft_complex_workspace * workspace=gsl_fft_complex_workspace_alloc (n);
-      if (direct)
-	gsl_fft_complex_forward (data, 1, n,wavetable,workspace);
-      else
-	gsl_fft_complex_backward (data, 1, n,wavetable,workspace);
-      gsl_fft_complex_wavetable_free (wavetable);
-      gsl_fft_complex_workspace_free (workspace);
-    }
-    if (direct){
-      for (int i=0;i<n;++i){
-	v[i]=gen(data[2*i],data[2*i+1]);
-      }
-    }
-    else {
-      for (int i=0;i<n;++i){
-	v[i]=gen(data[2*i],data[2*i+1])/n;
-      }
-    }
-    delete [] data;
-    if (debug_infolevel)
-      CERR << CLOCK()*1e-6 << " fft end" << '\n';
-    return v;
-#endif
-    /* 
-       unsigned m=gen(n).bindigits()-1;
-       if (n!=1<<m)
-       return gensizeerr(gettext("Size is not a power of 2 ")+print_INT_(n));
-    */
-    vecteur res;
-    double theta;
-    vecteur w(n);
-    iterateur it=w.begin(),itend=w.end();
-    for (int i=0;it!=itend;++it,++i){
-      theta = (2*M_PI*i)/n;
-      if (direct==1)
-	*it = gen(std::cos(theta),-std::sin(theta));
-      else
-	*it = gen(std::cos(theta),std::sin(theta));
-    }
-    fft(v,w,res,0);
-    if (direct==1)
-      return res;
-    else
-      return gen(res)/n;
-  }
-
-  gen _fft(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return fft(g,1,contextptr);
-  }
-  static const char _fft_s []="fft";
-  static define_unary_function_eval (__fft,&_fft,_fft_s);
-  define_unary_function_ptr5( at_fft ,alias_at_fft,&__fft,0,true);
-
-  gen _ifft(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return fft(g,0,contextptr);
-  }
-  static const char _ifft_s []="ifft";
-  static define_unary_function_eval (__ifft,&_ifft,_ifft_s);
-  define_unary_function_ptr5( at_ifft ,alias_at_ifft,&__ifft,0,true);
-
-  gen _Resultant(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_resultant,g);
-  }
-  static const char _Resultant_s []="Resultant";
-  static define_unary_function_eval (__Resultant,&_Resultant,_Resultant_s);
-  define_unary_function_ptr5( at_Resultant ,alias_at_Resultant,&__Resultant,0,true);
-
-  gen _Nullspace(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_nullspace,g);
-  }
-  static const char _Nullspace_s []="Nullspace";
-  static define_unary_function_eval (__Nullspace,&_Nullspace,_Nullspace_s);
-  define_unary_function_ptr5( at_Nullspace ,alias_at_Nullspace,&__Nullspace,0,true);
-
-  gen _assign(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && g._VECTptr->size()==2){
-      return sto(g._VECTptr->back(),g._VECTptr->front(),contextptr);
-    }
-    if (is_equal(g)){
-      gen & f=g._SYMBptr->feuille;
-      if (f.type==_VECT && f._VECTptr->size()==2)
-	return sto(f._VECTptr->back(),f._VECTptr->front(),contextptr);
-    }
-    if (g.type!=_VECT)
-      return gensizeerr();
-    return apply(g,_assign,contextptr);
-  }
-  static const char _assign_s []="assign";
-  static define_unary_function_eval (__assign,&_assign,_assign_s);
-  define_unary_function_ptr5( at_assign ,alias_at_assign,&__assign,0,true);
-
-
-  gen _implicitplot3d(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return _plotimplicit(g,contextptr);
-  }
-  static const char _implicitplot3d_s []="implicitplot3d";
-  static define_unary_function_eval (__implicitplot3d,&_implicitplot3d,_implicitplot3d_s);
-  define_unary_function_ptr5( at_implicitplot3d ,alias_at_implicitplot3d,&__implicitplot3d,0,true);
-
-  void convert_double_int(vecteur & v){
-    for (unsigned i=0;i<v.size();++i){
-      if (v[i].type==_DOUBLE_)
-	v[i]=int(v[i]._DOUBLE_val+.5);
-      if (v[i].type==_VECT){
-	vecteur w=*v[i]._VECTptr;
-	convert_double_int(w);
-	v[i]=w;
-      }
-    }
-  }
-
-  bool read_audio(vecteur & v,int & channels,int & sample_rate,int & bits_per_sample,unsigned int & data_size){
-    convert_double_int(v);
-    if (v.size()>1 && v[1].type!=_VECT)
-      v=makevecteur(1,v);
-    gen g=v[0];
-    if (ckmatrix(g)){
-      if (v.size()==2 && v[1].type==_INT_){
-	sample_rate=v[1].val;
-	v=*g._VECTptr;
-	v.insert(v.begin(),makevecteur(1,16,sample_rate));
-	g=v[0];
-      }
-      else {
-	if (v.size()==3 && v[1].type==_INT_ && v[2].type==_INT_){
-	  sample_rate=v[1].val;
-	  bits_per_sample=v[2].val;
-	  v=*g._VECTptr;
-	  v.insert(v.begin(),makevecteur(1,bits_per_sample,sample_rate));
-	  g=v[0];
-	}
-      }
-    }
-    // g=channels,bits_per_sample,sample_rate,data_size,
-    if (g.type==_INT_)
-      g=makevecteur(g,16);
-    if (g.type!=_VECT || g._VECTptr->empty())
-      return false;
-    vecteur w=*g._VECTptr;
-    if (w.size()==1)
-      w.push_back(16);
-    int ws=int(w.size());
-    if (w[0].type!=_INT_ || w[1].type!=_INT_)
-      return false;
-    channels=w[0].val;
-    if (channels<=0 || channels>int(v.size())){
-      channels=int(v.size());
-      if (v.front().type!=_VECT || !is_integer_vecteur(*v.front()._VECTptr))
-	return false;
-      data_size=unsigned(v.front()._VECTptr->size());
-      for (int i=1;i<channels;++i){
-	if (v[i].type!=_VECT || !is_integer_vecteur(*v[i]._VECTptr))
-	  return false;
-	if (data_size>v[i]._VECTptr->size())
-	  data_size=unsigned(v[i]._VECTptr->size());
-      }
-      w=makevecteur(channels,16,44100); ws=3;
-      g=w;
-      v.insert(v.begin(),g);
-    }
-    if (channels<=0 || channels>4 || int(v.size())<=channels)
-      return false;
-    bits_per_sample=(w[1].val/8)*8;
-    if (bits_per_sample<=0)
-      return false;
-    if (ws>=3)
-      sample_rate=w[2].val;
-    else
-      sample_rate=44100;
-    if (sample_rate<1)
-      return false;
-    if (ws>=4 && w[3].type==_INT_)
-      data_size=w[3].val;
-    else
-      data_size=RAND_MAX;
-    for (int i=1;i<=channels;++i){
-      if (v[i].type!=_VECT || !is_integer_vecteur(*v[i]._VECTptr))
-	return false;
-      if (data_size>v[i]._VECTptr->size())
-	data_size=unsigned(v[i]._VECTptr->size());
-    }
-    return true;
-  }
-
-#ifdef HAVE_LIBAO
-#include <ao/ao.h>
-  typedef unsigned short aou16;
-  typedef unsigned int aou32;
-  gen _playsnd(const gen & args,GIAC_CONTEXT){
-    if (args.type==_STRNG){
-      if (args.subtype==-1) return  args;
-      return _playsnd(_readwav(args,contextptr),contextptr);
-    }
-    ao_device *device=0;
-    ao_sample_format format;
-    int default_driver;
-    ao_initialize();
-    default_driver = ao_default_driver_id();
-    memset(&format, 0, sizeof(format));
-    format.bits = 16;
-    format.channels = 2;
-    format.rate = 44100;
-    format.byte_format = AO_FMT_LITTLE;
-    unsigned int data_size=0;
-    vecteur v;
-    if (args.type==_VECT && !args._VECTptr->empty()){
-      // set format
-      v=*args._VECTptr;
-      if (!read_audio(v,format.channels,format.rate,format.bits,data_size))
-	return gensizeerr(gettext("Invalid sound data"));
-    }
-    if (data_size){
-      *logptr(contextptr) << gettext("Using sound parameters: channels, rate, bits, records ") << format.channels << "," << format.rate << "," << format.bits << "," << data_size << '\n';
-      device = ao_open_live(default_driver, &format, NULL /* no options */);
-      if (device == NULL) 
-	return gensizeerr(gettext("Error opening audio device."));
-      unsigned n=data_size*format.channels*format.bits/8;
-      char * buffer=(char *)malloc(n*sizeof(char));
-      // aou16 * bufshort=(aou16 *) buffer;
-      aou32 * bufint=(aou32 *) buffer;
-      if (buffer){
-	// copy data from v into buffer and play it
-	unsigned c=format.channels,b=format.bits/8;
-	for (unsigned i=0;i<data_size;++i){
-	  for (unsigned j=0;j<c;++j){
-	    unsigned u=(*v[j+1]._VECTptr)[i].val;
-	    if (b==1)
-	      buffer[i*c+j]=u;
-	    if (b==2){
-	      buffer[2*(i*c+j)]=u & 0xff;
-	      buffer[2*(i*c+j)+1]=(u>>8) & 0xff;
-	    }
-	    if (b==4)
-	      bufint[i*c+j]=u;
-	  }
-	}
-	ao_play(device, buffer, n);
-      }
-    }
-    ao_close(device);
-    ao_shutdown();
-    return 1;
-  }
-  static const char _playsnd_s []="playsnd";
-  static define_unary_function_eval (__playsnd,&_playsnd,_playsnd_s);
-  define_unary_function_ptr5( at_playsnd ,alias_at_playsnd,&__playsnd,0,true);
-#else
-#if !defined GIAC_GGB && (defined EMCC || defined (EMCC2))// must have EM_ASM code javascript inlined (emscripten 1.30.4 at least?)
-#include <emscripten.h>
-  gen _playsnd(const gen & args,GIAC_CONTEXT){
-    if (args.type==_STRNG){
-      if (args.subtype==-1) return  args;
-      return _playsnd(_readwav(args,contextptr),contextptr);
-    }
-	   
-    int nbits = 16;
-    int nchannels = 2;
-    int nrate = 44100;
-    unsigned int data_size=0;
-    vecteur v;
-    if (args.type==_VECT && !args._VECTptr->empty()){
-      // set format
-      v=*args._VECTptr;
-      if (!read_audio(v,nchannels,nrate,nbits,data_size))
-	return gensizeerr(gettext("Invalid sound data"));
-    }
-    if (data_size){
-      *logptr(contextptr) << gettext("Using sound parameters: channels, rate, bits, records ") << nchannels << "," << nrate << "," << data_size << '\n';
-      unsigned nDataBytes=data_size*nchannels*sizeof(float);
-      // copy data from v into buffer and play it
-      unsigned b=nbits/8;
-      float * ptr = (float *) malloc(nDataBytes);
-      for (unsigned j=0;j<nchannels;++j){
-	vecteur & w=(*v[j+1]._VECTptr);
-	COUT << "channel " << j << '\n';
-	for (unsigned i=0;i<data_size;++i){
-	  unsigned u=w[i].val;
-	  double ud=0;
-	  if (b==1)
-	    ud=u/128.0-1;
-	  if (b==2)
-	    ud=u/32768.0-1;
-	  if (b==4)
-	    ud=u/2147483648.0-1;
-	  ptr[j*data_size+i]=ud;
-	}
-      }
-      COUT << "playing" << '\n';
-      EM_ASM_ARGS({
-	  var nchannels;
-	  var nDataBytes;
-	  var nrate;
-	  var ptr;
-	  var data_size;
-	  nchannels=$0;nDataBytes=$1;nrate=$2;ptr=$3;
-	  data_size=nDataBytes/4/nchannels;
-	  var audioCtx = new (window.AudioContext || window.webkitAudioContext)();
-	  var SoundArrayBuffer = audioCtx.createBuffer(nchannels, nDataBytes, audioCtx.sampleRate);
-	  var dataHeap = new Uint8Array(Module.HEAPU8.buffer, ptr, nDataBytes);
-	  var result = new Float32Array(dataHeap.buffer, dataHeap.byteOffset, nDataBytes/4);
-	  var j;
-	  var i;
-	  for (j=0;j<nchannels;j++){
-	    var v=SoundArrayBuffer.getChannelData(j);
-	    for (i=0;i<data_size;++i)
-	      v[i]=result[j*data_size+i];
-	  }
-	  var source = audioCtx.createBufferSource();
-	  // set the buffer in the AudioBufferSourceNode
-	  source.buffer = SoundArrayBuffer;
-	  // connect the AudioBufferSourceNode to the
-	  // destination so we can hear the sound
-	  source.connect(audioCtx.destination);
-	  // start the source playing
-	  source.start();
-	},nchannels,nDataBytes,nrate,ptr);
-      free(ptr);
-    }
-    return 1;
-  }
-#else
-  gen _playsnd(const gen & args,GIAC_CONTEXT){
-    return gensizeerr("Sorry! libao is not present on system");
-  }
-#endif
-  static const char _playsnd_s []="playsnd";
-  static define_unary_function_eval (__playsnd,&_playsnd,_playsnd_s);
-  define_unary_function_ptr5( at_playsnd ,alias_at_playsnd,&__playsnd,0,true);
-#endif
-
-  gen _soundsec(const gen & args,GIAC_CONTEXT){
-    // nseconds [,rate]
-    gen n,rate=44100;
-    if (args.type==_VECT && args._VECTptr->size()==2){
-      n=args._VECTptr->front();
-      rate=args._VECTptr->back();
-    }
-    else
-      n=args;
-    n=evalf_double(n,1,contextptr);
-    if (n.type!=_DOUBLE_ || n._DOUBLE_val<=0 || rate.type!=_INT_ || rate.val < 1 )
-      return gensizeerr(gettext("Invalid sound parameters"));
-    double r=evalf_double(rate,1,contextptr)._DOUBLE_val;
-    double nr=r*n._DOUBLE_val;
-    if (nr>LIST_SIZE_LIMIT)
-      return gensizeerr("Too many records");
-    vecteur v;
-    v.reserve(int(nr));
-    for (int i=0;i<nr;++i){
-      v.push_back(double(i)/r);
-    }
-    return v;
-  }
-  static const char _soundsec_s []="soundsec";
-  static define_unary_function_eval (__soundsec,&_soundsec,_soundsec_s);
-  define_unary_function_ptr5( at_soundsec ,alias_at_soundsec,&__soundsec,0,true);
-
-  /*
-  gen _beep(const gen & args,GIAC_CONTEXT){
-  }
-  static const char _beep_s []="beep";
-  static define_unary_function_eval (__beep,&_beep,_beep_s);
-  define_unary_function_ptr5( at_beep ,alias_at_beep,&__beep,0,true);
-  */
-
-#ifdef RTOS_THREADX
-  gen _readwav(const gen & args,GIAC_CONTEXT){
-    return undef;
-  }
-  static const char _readwav_s []="readwav";
-  static define_unary_function_eval (__readwav,&_readwav,_readwav_s);
-  define_unary_function_ptr5( at_readwav ,alias_at_readwav,&__readwav,0,true);
-
-  static const char _writewav_s []="writewav";
-  static define_unary_function_eval (__writewav,&_readwav,_writewav_s);
-  define_unary_function_ptr5( at_writewav ,alias_at_writewav,&__writewav,0,true);
-
-#else // RTOS_THREADX
-
-  // http://ccrma.stanford.edu/courses/422/projects/WaveFormat/
-  static bool in_readwav(FILE * f,gen & g){
-    unsigned char c,channels;
-    unsigned int u,s,sample_rate,byte_rate,block_align=0,bits_per_sample=0,data_size=0;
-    // Header
-    if (fread(&u,4,1,f)!=1 || u!=0x46464952) // "RIFF"
-      return false;
-    if (fread(&s,4,1,f)!=1)
-      return false;
-    if (fread(&u,4,1,f)!=1 || u!=0x45564157) // "WAVE"
-      return false;
-    if (fread(&u,4,1,f)!=1 || u!=0x20746d66) // "fmt "
-      return false;
-    if (fread(&u,4,1,f)!=1 || u!=0x10) // 16 for PCM
-      return false;
-    c=fgetc(f);
-    if (c!=1)
-      return false;
-    c=fgetc(f);
-    if (c!=0)
-      return false;
-    channels=fgetc(f);
-    c=fgetc(f);
-    if (c!=0)
-      return false;
-    if (fread(&sample_rate,4,1,f)!=1)
-      return false;
-    if (fread(&byte_rate,4,1,f)!=1)
-      return false;
-    block_align=fgetc(f);
-    block_align=block_align+(fgetc(f)<<8);
-    bits_per_sample=fgetc(f); // 8 or 16
-    bits_per_sample=bits_per_sample+(fgetc(f)<<8);
-    bits_per_sample /= 8;
-    if (fread(&u,4,1,f)!=1 || u!=0x61746164) // "data"
-      return false;
-    if (fread(&data_size,4,1,f)!=1)
-      return false;
-    int n=data_size;
-    // data_size=bits_per_sample/8 * num_samples * channels
-    vecteur v(channels+1);
-    v[0]=makevecteur(int(channels),int(bits_per_sample*8),int(sample_rate),int(data_size));
-    g=v;
-    vecteur & w=*g._VECTptr;
-    for (int i=1;i<=channels;++i){
-      w[i]=vecteur(0);
-      w[i]._VECTptr->reserve(n/(channels*bits_per_sample));
-    }
-    while (n>0 && !feof(f)){
-      for (int i=1;i<=channels;++i){
-	u=0;
-	if (fread(&u,bits_per_sample,1,f)!=1)
-	  return false;
-	// for (int j=0;j<bits_per_sample;++j)
-	//  u += fgetc(f) << (j*8) ;
-	n -= bits_per_sample;
-	if (feof(f))
-	  break;
-	w[i]._VECTptr->push_back(int(u));
-	if (n<=0)
-	  break;
-      }
-    }
-    return true;
-  }
-
-  static bool readwav(const string & s,gen & g){
-    FILE * f = fopen(s.c_str(),"r");
-    if (!f)
-      return false;
-    bool res=in_readwav(f,g);
-    fclose(f);
-    return res;
-  }
-
-  gen _readwav(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_STRNG)
-      return gensizeerr();
-    gen res;
-    bool ok= readwav(*g._STRNGptr,res);
-    if (!ok)
-      return gensizeerr(gettext("File not found or unrecognized wav file format"));
-    return res;
-  }
-  static const char _readwav_s []="readwav";
-  static define_unary_function_eval (__readwav,&_readwav,_readwav_s);
-  define_unary_function_ptr5( at_readwav ,alias_at_readwav,&__readwav,0,true);
-
-  static bool in_writewav(FILE * f,const vecteur & v_){
-    if (v_.empty())
-      return false;
-    vecteur v(v_);
-    int channels,sample_rate=44100,bits_per_sample=0;
-    unsigned int u,byte_rate,block_align=0,data_size=1U<<31;
-    if (!read_audio(v,channels,sample_rate,bits_per_sample,data_size))
-      return false;
-    u=0x46464952;
-    if (fwrite(&u,4,1,f)!=1)
-      return false;
-    u=36+data_size*bits_per_sample/8*channels;
-    if (fwrite(&u,4,1,f)!=1)
-      return false;    
-    u=0x45564157;
-    if (fwrite(&u,4,1,f)!=1)
-      return false;
-    u=0x20746d66;
-    if (fwrite(&u,4,1,f)!=1)
-      return false;
-    u=0x10;
-    if (fwrite(&u,4,1,f)!=1)
-      return false;
-    fputc(1,f);
-    fputc(0,f);
-    fputc(channels,f);
-    fputc(0,f);
-    if (fwrite(&sample_rate,4,1,f)!=1)
-      return false;
-    byte_rate = sample_rate * channels * bits_per_sample/8;
-    if (fwrite(&byte_rate,4,1,f)!=1)
-      return false;
-    block_align=channels * bits_per_sample/8;
-    if (fwrite(&block_align,2,1,f)!=1)
-      return false;
-    if (fwrite(&bits_per_sample,2,1,f)!=1)
-      return false;
-    u=0x61746164; // "data"
-    if (fwrite(&u,4,1,f)!=1)
-      return false;
-    u= bits_per_sample/8* data_size*channels; // should be data_size
-    if (fwrite(&u,4,1,f)!=1)
-      return false;
-    // write data
-    u /= channels;
-    bits_per_sample /= 8;
-    unsigned n = u/ bits_per_sample;
-    for (unsigned i=0;i<n;++i){
-      for (int j=1;j<=channels;++j){
-	u=(*v[j]._VECTptr)[i].val;
-	if (fwrite(&u,bits_per_sample,1,f)!=1)
-	  return false;
-      }
-    }
-    return true;
-  }
-
-  static bool writewav(const string & s,const vecteur & v){
-    FILE * f = fopen(s.c_str(),"w");
-    if (!f)
-      return false;
-    bool res=in_writewav(f,v);
-    fclose(f);
-    return res;
-  }
-
-  gen _writewav(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=2 || g._VECTptr->front().type!=_STRNG || g._VECTptr->back().type!=_VECT)
-      return gensizeerr();
-    bool ok= writewav(*g._VECTptr->front()._STRNGptr,*g._VECTptr->back()._VECTptr);
-    if (!ok)
-      return gensizeerr(gettext("Unable to open file or unable to code data"));
-    return 1;
-  }
-  static const char _writewav_s []="writewav";
-  static define_unary_function_eval (__writewav,&_writewav,_writewav_s);
-  define_unary_function_ptr5( at_writewav ,alias_at_writewav,&__writewav,0,true);
-
-#endif // RTOS_THREADX
-
-  static gen animate2d3d(const gen & g,bool dim3,GIAC_CONTEXT){
-    int s=0,frames=10;
-    if (g.type!=_VECT || (s=int(g._VECTptr->size()))<3)
-      return gensizeerr();
-    vecteur v = *g._VECTptr;
-    gen t;
-    double tmin,tmax;
-    if (!readrange(v[2],gnuplot_tmin,gnuplot_tmax,t,tmin,tmax,contextptr))
-      return gensizeerr();
-    // find a frame argument, otherwise use 10
-    for (int i=3;i<s;++i){
-      if (is_equal(v[i])){
-	gen & f = v[i]._SYMBptr->feuille;
-	if (f.type==_VECT && f._VECTptr->size()==2 && f._VECTptr->front().type==_INT_ && f._VECTptr->front().val==_FRAMES && f._VECTptr->back().type==_INT_)
-	  frames=f._VECTptr->back().val;
-      }
-    }
-    if (frames==0)
-      return gensizeerr();
-    v.erase(v.begin()+2);
-    gen h=symbolic(dim3?at_plotfunc:at_plot,gen(v,g.subtype));
-    v=makevecteur(h,t,tmin,tmax,(tmax-tmin)/frames);
-    gen tmpseq=seqprod(v,0,contextptr);
-    if (is_undef(tmpseq)) return tmpseq;
-    return symbolic(at_animation,tmpseq);
-  }
-
-  gen _animate(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return animate2d3d(g,false,contextptr);
-  }
-  static const char _animate_s []="animate";
-  static define_unary_function_eval (__animate,&_animate,_animate_s);
-  define_unary_function_ptr5( at_animate ,alias_at_animate,&__animate,0,true);
-
-  gen _animate3d(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return animate2d3d(g,true,contextptr);
-  }
-  static const char _animate3d_s []="animate3d";
-  static define_unary_function_eval (__animate3d,&_animate3d,_animate3d_s);
-  define_unary_function_ptr5( at_animate3d ,alias_at_animate3d,&__animate3d,0,true);
-
-  gen _even(const gen & g_,GIAC_CONTEXT){
-    gen g(g_);
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (!is_integral(g)) return gentypeerr(contextptr);
-    return is_zero(smod(g,2));
-  }
-  static const char _even_s []="even";
-  static define_unary_function_eval (__even,&_even,_even_s);
-  define_unary_function_ptr5( at_even ,alias_at_even,&__even,0,true);
-
-  gen _odd(const gen & g_,GIAC_CONTEXT){
-    gen g(g_);
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (!is_integral(g)) return gentypeerr(contextptr);
-    return !is_zero(smod(g,2));
-  }
-  static const char _odd_s []="odd";
-  static define_unary_function_eval (__odd,&_odd,_odd_s);
-  define_unary_function_ptr5( at_odd ,alias_at_odd,&__odd,0,true);
-
-#ifdef HAVE_LIBPNG
-  int write_png(const char *file_name, void *rows_, int w, int h, int colortype, int bitdepth){
-    png_bytep * rows=(png_bytep *) rows_;
-    png_structp png_ptr;
-    png_infop info_ptr;
-    FILE *fp = fopen(file_name, "wb");
-    const char *doing = "open for writing";
-    if (!(fp = fopen(file_name, "wb"))) goto fail;
-    doing = "create png write struct";
-    if (!(png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, 
-					    NULL, NULL))) goto fail;
-    doing = "create png info struct";
-    if (!(info_ptr = png_create_info_struct(png_ptr))) goto fail;
-    if (setjmp(png_jmpbuf(png_ptr))) goto fail;
-    doing = "init IO";
-    png_init_io(png_ptr, fp);
-    doing = "write header";
-    png_set_IHDR(png_ptr, info_ptr, w, h, bitdepth, colortype, 
-		 PNG_INTERLACE_NONE,
-		 PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-    doing = "write info";
-    png_write_info(png_ptr, info_ptr);
-    doing = "write image";
-    png_write_image(png_ptr, rows);
-    doing = "write end";
-    png_write_end(png_ptr, NULL);
-    fclose(fp);
-    return 0;
-  fail:   
-    printf("Write_png: could not %s\n", doing);
-    return -1;
-  }
-
-  static bool writergb(const string & filename,const vecteur & v){
-    if (v.size()==2 && ckmatrix(v[1])){
-      int w,h;
-      mdims(*v[1]._VECTptr,h,w);
-      unsigned i=0,taille=w*h;    
-      unsigned char * screenbuf=new unsigned char[w*h];
-      unsigned rowbytes = w;
-      // fill screenbuf with data from v[] order 1,2,4,3
-      for (;i<taille;++i){
-	vecteur & wnv =*v[1]._VECTptr;
-	int nr=i/rowbytes;
-	vecteur & row =*wnv[nr]._VECTptr;
-	screenbuf[i]=row[i%w].val;
-      }
-      unsigned char *rows[h];
-      for (i = 0; int(i) < h; i++) {
-	rows[i] = &screenbuf[i*w]; // &screenbuf[(h - i - 1)*4*w];
-      }
-      int res=write_png(filename.c_str(), rows, w, h, PNG_COLOR_TYPE_GRAY, 8);
-      delete screenbuf;
-      return res+1;
-    }
-    if (v.size()!=5 || !ckmatrix(v[1]) || !ckmatrix(v[2]) 
-	|| !ckmatrix(v[3]) || !ckmatrix(v[4]))
-      return false;
-    int w,h,w2,w3,w4,h2,h3,h4;
-    mdims(*v[1]._VECTptr,h,w);
-    mdims(*v[2]._VECTptr,h2,w2);
-    mdims(*v[3]._VECTptr,h3,w3);
-    mdims(*v[4]._VECTptr,h4,w4);
-    if (w!=w2 || w!=w3 || w!=w4 || h!=h2 || h!=h3 || h!=h4)
-      return false;
-    unsigned i=0,taille=w*h*4;    
-    unsigned char * screenbuf=new unsigned char[w*h*4];
-    unsigned rowbytes = w*4;
-    // fill screenbuf with data from v[] order 1,2,4,3
-    for (;i<taille;++i){
-      int nv,nr;
-      switch (i%4){
-      case 0: nv=1; break;
-      case 1: nv=2; break;
-      case 2: nv=4; break;
-      case 3: nv=3; break;
-      }
-      vecteur & wnv =*v[nv]._VECTptr;
-      nr=i/rowbytes;
-      vecteur & row =*wnv[nr]._VECTptr;
-      screenbuf[i]=row[(i/4)%w].val;
-    }
-    unsigned char *rows[h];
-    for (i = 0; int(i) < h; i++) {
-      rows[i] = &screenbuf[i*4*w]; // &screenbuf[(h - i - 1)*4*w];
-    }
-    int res=write_png(filename.c_str(), rows, w, h, PNG_COLOR_TYPE_RGBA, 8);
-    delete screenbuf;
-    return res+1;
-  }
-#else // LIBPNG
-  int write_png(const char *file_name, void *rows, int w, int h, int colortype, int bitdepth){
-    return -1;
-  }
-
-  static bool writergb(const string & s,const vecteur & w){
-    return false;
-  }
-#endif // LIBPNG
-
-  gen _writergb(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    if (ckmatrix(v[1])){
-      int l,c;
-      mdims(*v[1]._VECTptr,l,c);
-      vecteur w(1,makevecteur(v.size()==2?1:4,c,l));
-      for (unsigned i=1;i<v.size();++i){
-	if (i==3 && v.size()==4)
-	  w.push_back(vecteur(l,vecteur(c,255)));
-	w.push_back(v[i]);
-      }
-      v=makevecteur(v[0],w);
-    }
-    if (v.size()!=2 || v[0].type!=_STRNG || v[1].type!=_VECT)
-      return gensizeerr();
-    vecteur w=*v[1]._VECTptr;
-    // w[0]==[d,w,h], w[1..4]=data
-    bool ok= writergb(*v[0]._STRNGptr,w);
-    if (!ok)
-      return gensizeerr(gettext("File not found or unrecognized image file format"));
-    gen tmp(_GL_TEXTURE);
-    tmp.subtype=_INT_PLOT;
-    vecteur arg=makevecteur(w[0][2],0,w[0][1]/w[0][2],
-			    symb_equal(tmp,makevecteur(v[0],undef)));
-    tmp=gen(arg,_SEQ__VECT);
-    return _rectangle(tmp,contextptr);
-  }
-  static const char _writergb_s []="writergb";
-  static define_unary_function_eval (__writergb,&_writergb,_writergb_s);
-  define_unary_function_ptr5( at_writergb ,alias_at_writergb,&__writergb,0,true);
-
-  bool (* readrgb_ptr)(const std::string & s,int W,int H,gen & res)=0;
-
-  gen _readrgb(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    if (v.empty() || v[0].type!=_STRNG)
-      return gensizeerr();
-    int s=int(v.size());
-    gen res;
-    bool ok= false;
-    if (readrgb_ptr)
-      ok = readrgb_ptr(*v[0]._STRNGptr,
-		       ( (s>2 && v[1].type==_INT_) ?v[1].val:0),
-		       ( (s>2 && v[2].type==_INT_) ?v[2].val:0),
-		       res);
-    if (!ok)
-      return gensizeerr(gettext("File not found or unrecognized image file format"));
-    return res;
-  }
-  static const char _readrgb_s []="readrgb";
-  static define_unary_function_eval (__readrgb,&_readrgb,_readrgb_s);
-  define_unary_function_ptr5( at_readrgb ,alias_at_readrgb,&__readrgb,0,true);
-
-  gen linear_apply(const gen & e,const gen & x,const gen & l,gen & remains, GIAC_CONTEXT, gen (* f)(const gen &,const gen &,const gen &,gen &,const context *)){
-    if (is_constant_wrt(e,x,contextptr) || (e==x) )
-      return f(e,x,l,remains,contextptr);
-    // e must be of type _SYMB
-    if (e.type!=_SYMB) return gensizeerr(gettext("in linear_apply"));
-    unary_function_ptr u(e._SYMBptr->sommet);
-    gen arg(e._SYMBptr->feuille);
-    gen res;
-    if (u==at_neg){
-      res=-linear_apply(arg,x,l,remains,contextptr,f);
-      remains=-remains;
-      return res;
-    } // end at_neg
-    if (u==at_plus){
-      if (arg.type!=_VECT)
-	return linear_apply(arg,x,l,remains,contextptr,f);
-      const_iterateur it=arg._VECTptr->begin(),itend=arg._VECTptr->end();
-      for (gen tmp;it!=itend;++it){
-	res = res + linear_apply(*it,x,l,tmp,contextptr,f);
-	remains =remains + tmp;
-      }
-      return res;
-    } // end at_plus
-    if (u==at_prod){
-      if (arg.type!=_VECT)
-	return linear_apply(arg,x,l,remains,contextptr,f);
-      // find all constant terms in the product
-      vecteur non_constant;
-      gen prod_constant;
-      decompose_prod(*arg._VECTptr,x,non_constant,prod_constant,true,contextptr);
-      if (non_constant.empty()) return gensizeerr(gettext("in linear_apply 2")); // otherwise the product would be constant
-      if (non_constant.size()==1)
-	res = linear_apply(non_constant.front(),x,l,remains,contextptr,f);
-      else
-	res = f(symbolic(at_prod,non_constant),x,l,remains,contextptr);
-      remains = prod_constant * remains;
-      return prod_constant * res;
-    } // end at_prod
-    return f(e,x,l,remains,contextptr);
-  }
-
-  // discrete product primitive of a polynomial P
-  gen product(const polynome & P,const vecteur & v,const gen & n,gen & remains,GIAC_CONTEXT){
-    // factor P, for a linear factor a*n+b, multiply res by a^n*gamma(n+b/a)
-    // for other factors multiply remains by the factor
-    polynome Pcont;
-    factorization f;
-    gen divan=1,res,extra_div=1;
-    if (!factor(P,Pcont,f,/* is_primitive*/false,/* with_sqrt*/true,/* complex */true,divan,extra_div) || extra_div!=1){
-      remains=r2e(P,v,contextptr);
-      return 1;
-    }
-    res = pow(divan,-n,contextptr);
-    factorization::const_iterator it=f.begin(),itend=f.end();
-    for (;it!=itend;++it){
-      gen tmp=r2e(it->fact,v,contextptr);
-      if (it->fact.lexsorted_degree()!=1){
-	remains = remains * pow(tmp,it->mult);
-      }
-      else {
-	gen a=derive(tmp,n,contextptr);
-	if (is_undef(a))
-	  return a;
-	gen b=normal(tmp-a*n,contextptr);
-	res  = res * pow(a,it->mult*n,contextptr) * pow(symbolic(at_factorial,n+b/a-1),it->mult,contextptr);
-      }
-    }
-    return res*pow(r2e(Pcont,v,contextptr),n,contextptr);
-  }
-
-  // product(P,n=a..b) where the first variable in v is n
-  gen product(const polynome & P,const vecteur & v,const gen & n,const gen & a,const gen & b,GIAC_CONTEXT){
-    gen remains(1),res=product(P,v,n,remains,contextptr);
-    res=subst(res,n,b+1,false,contextptr)/subst(res,n,a,false,contextptr);
-    if (is_one(remains))
-      return res;
-    else
-      return res*symbolic(at_product,gen(makevecteur(remains,n,a,b),_SEQ__VECT));
-  }
-
-  // solve vnext*sol[n+1]+v*sol[n]+vcst=0
-  // example: u_{n+1}=u_n/n+1 -> n*u_{n+1}-u_n-n=0 
-  // vnext=[1,0], v=[1], vcst=[-1,0] -> n solution
-  static bool rsolve_particular(const modpoly & vnext,const modpoly & v,const modpoly & vcst,modpoly & sol,GIAC_CONTEXT){
-    // find majoration of degree for solution
-    int vnextdeg=int(vnext.size())-1,vdeg=int(v.size())-1,vcstdeg=int(vcst.size())-1,soldeg;
-    soldeg=vcstdeg-giacmax(vnextdeg,vdeg);
-    if (vnextdeg==vdeg && is_zero(vnext.front()+v.front()))
-      soldeg++;
-    if (soldeg<0)
-      return false;
-    modpoly vars(soldeg+1);
-    for (int i=0;i<=soldeg;++i){
-      vars[i]=identificateur("rsolve_x"+print_INT_(i));
-    }
-    modpoly equations=operator_plus(operator_times(vnext,taylor(vars,1,0),0),
-				    operator_times(v,vars,0),0);
-    equations=operator_plus(equations,vcst,0);
-    sol=linsolve(equations,vars,contextptr);
-    return !sol.empty() && !is_undef(sol);
-  }
-
-  // solve a recurrence relation x_{n+1}=l0*x_n+e
-  static gen rsolve(const gen & e,const gen & n,const gen & l0,gen & remains,GIAC_CONTEXT){
-    if (is_zero(e)){
-      remains=0;
-      return e;
-    }
-    vecteur v;
-    polynome P,Q,R;
-    if (!is_hypergeometric(e,*n._IDNTptr,v,P,Q,R,contextptr)){
-      *logptr(contextptr) << gettext("Cst part must be hypergeometric") << '\n';
-      remains=e;
-      return 0;
-    }
-    if (Q.lexsorted_degree() || R.lexsorted_degree()){
-      *logptr(contextptr) << gettext("Cst part must be of type a^n*P(n)") << '\n';
-      remains=e;
-      return 0;
-    }
-    gen a=r2e(Q,v,contextptr)/r2e(R,v,contextptr);
-    gen P0=r2e(P,v,contextptr);
-    if (is_zero(P0))
-      return 0;
-    for (int i=0;;i++){
-      gen tmp=normal(subst(e/P0,n,i,false,contextptr),contextptr);
-      if (!is_undef(tmp)){
-	P0=tmp*P0/pow(a,i);
-	break;
-      }
-    }
-    v.clear();
-    v.push_back(n);
-    lvar(P0,v);
-    lvar(l0,v);
-    lvar(a,v);
-    vecteur v1(v.begin()+1,v.end());
-    gen l=e2r(l0,v1,contextptr);
-    P0=e2r(P0,v,contextptr);
-    gen P0n,P0d;
-    fxnd(P0,P0n,P0d);
-    if (P0n.type!=_POLY)
-      P=polynome(P0n,int(v.size()));
-    else
-      P=*P0n._POLYptr;
-    a=e2r(a,v1,contextptr);
-    remains=0;
-    // solve u(n+1)=l*u(n)+a^n*P(n)
-    if (a==l){ // let v(n)=u(n)/l^n, then v(n+1)=v(n)+P(n)/l
-      return pow(l0,n,contextptr)*sum(r2e(P,v,contextptr),n,remains,contextptr)/r2e(l,v1,contextptr)/r2e(P0d,v,contextptr);
-    }
-    // search u(n)=a^n*Q(n) with Q a polynomial of same degree than P
-    // we have u(n+1)=a^(n+1)*Q(n+1)=l*a^n*Q(n)+a^n*P(n)
-    // hence a*Q(n+1)-l*Q(n)=P(n)
-    vecteur p=polynome2poly1(P,1);
-    int pdeg=int(p.size())-1;
-    vecteur q(pdeg+1);
-    reverse(p.begin(),p.end());
-    for (int j=pdeg;j>=0;j--){
-      gen tmp;
-      for (int k=j+1;k<=pdeg;++k){
-	tmp = tmp + comb(k,j)*q[k];
-      }
-      q[j]=(p[j]-a*tmp)/(a-l);
-    }
-    reverse(q.begin(),q.end());
-    gen res=r2e(q,v1,contextptr);
-    if (res.type!=_VECT)
-      return gentypeerr();
-    res=symb_horner(*res._VECTptr,n);
-    res=res*pow(r2e(a,v1,contextptr),n,contextptr)/r2e(P0d,v,contextptr);
-    return res;
-  }
-
-  /*
-  void gen2fracpoly1(const gen & g,vecteur & num,vecteur & den){
-    if (g.type==_FRAC){
-      num=gen2vecteur(g._FRACptr->num);
-      den=gen2vecteur(g._FRACptr->den);	  
-    }
-    else {
-      num=gen2vecteur(g);
-      den=vecteur(1,1);
-    }
-  }
-  */
-
-  // solveseq(expression,[var,value])
-  // var is a vector of dim the number of terms in the recurrence
-  gen _seqsolve(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen f,x=vx_var,uzero=zero,n;
-    int dim=1,udim=1;
-    if (args.type==_VECT){
-      vecteur & v=*args._VECTptr;
-      int s=int(v.size());
-      if (!s)
-	return gentoofewargs("");
-      f=v[0];
-      if (s>1)
-	x=v[1];
-      if (s>2)
-	uzero=eval(v[2],eval_level(contextptr),contextptr);
-      if (x.type==_VECT){
-	dim=int(x._VECTptr->size());
-	if (uzero.type==_VECT)
-	  udim=int(uzero._VECTptr->size());
-      }
-    }
-    else
-      f=args;
-    x=gen2vecteur(x);
-    vecteur fv=gen2vecteur(f);
-    fv=quote_eval(fv,*x._VECTptr,contextptr);
-    bool fv1=false;
-    if (fv.size()==1 && fv.front().type==_VECT){
-      fv1=true;
-      vecteur tmp=*fv.front()._VECTptr;
-      fv=tmp;
-    }
-    if (dim==udim+1){
-      n=x._VECTptr->back();
-      if (n.type!=_IDNT){
-	identificateur nn(" rsolve_n");
-	x._VECTptr->back()=nn;
-	f=quotesubst(f,n,nn,contextptr);
-	gen res=_seqsolve(gen(makevecteur(f,x,uzero),_SEQ__VECT),contextptr);
-	return quotesubst(res,nn,n,contextptr);
-      }
-      x=vecteur(x._VECTptr->begin(),x._VECTptr->end()-1);
-      --dim;
-    }
-    else {
-      if (dim!=udim)
-	return gendimerr();
-      n=gen(identificateur("rsolve_n"));
-    }
-    int fs=int(fv.size());
-    if (dim<fs) return gensizeerr(contextptr);
-    int add=dim-fs;
-    if (f.type!=_VECT && !fv1){
-      f=vecteur(x._VECTptr->end()-add,x._VECTptr->end());
-      f._VECTptr->push_back(fv[0]);
-    }
-    else {
-      for (int i=0;i<add;++i)
-	fv.push_back(x[i]);
-      f=fv;
-    }
-    // check linear recurrence + admissible cst term wrt n
-    gen difff=derive(f,x,contextptr);
-    if (is_undef(difff) || difff.type!=_VECT)
-      return difff;
-    matrice m=mtran(*difff._VECTptr);
-    if (!is_zero(derive(m,x,contextptr))){
-      if (f._VECTptr->size()==1 && x._VECTptr->size()==1 && is_zero(derive(f,n,contextptr))){
-	// homographic?
-	gen tmp=ratnormal(f._VECTptr->front(),contextptr),var(x._VECTptr->front());
-	gen tmpn=_getNum(tmp,contextptr),tmpd=_getDenom(tmp,contextptr),a,b,c,d;
-	if (is_linear_wrt(tmpn,var,a,b,contextptr) && is_linear_wrt(tmpd,var,c,d,contextptr)&& !is_zero(c)){
-	  // u_{n+1}=(a*u_n+b)/(c*u_n+d)
-	  // find fixed points
-	  gen fixed=solve(a*n+b-(c*n+d)*n,n,1,contextptr);
-	  if (fixed.type==_VECT && fixed._VECTptr->size()==2){
-	    gen r1=fixed._VECTptr->front(),r2=fixed._VECTptr->back();
-	    // (u_n-r1)/(u_n-r2) is geometric, compute ratio
-	    gen un1=(a*n+b)/(c*n+d);
-	    gen r=normal((un1-r1)*(n-r2)/((un1-r2)*(n-r1)),contextptr);
-	    if (is_zero(derive(r,n,contextptr))){
-	      un1=pow(r,n,contextptr)*(var-r1)/(var-r2);
-	      return (r1-un1*r2)/(1-un1);
-	    }
-	  }
-	  if (fixed.type==_VECT && fixed._VECTptr->size()==1){
-	    gen r1=fixed._VECTptr->front();
-	    // 1/(u_n-r1) is arithmetic
-	    gen un1=(a*n+b)/(c*n+d);
-	    gen r=normal(inv(un1-r1,contextptr)-inv(n-r1,contextptr),contextptr);
-	    if (is_zero(derive(r,n,contextptr))){
-	      un1=r*n+inv(var-r1,contextptr);
-	      return inv(un1,contextptr)+r1;
-	    }
-	  }
-	}
-      }
-      return symbolic(at_seqsolve,args);
-    }
-    vecteur cst=*normal(subvecteur(*f._VECTptr,multmatvecteur(m,*x._VECTptr)),contextptr)._VECTptr;
-    if (m.size()==1 && cst.size()==1){
-      gen l(m[0][0]),c(cst[0]),remains;
-      gen u0=gen2vecteur(uzero)[0];
-      if (n.type!=_IDNT)
-	return gentypeerr();
-      if (!is_zero(derive(l,n,contextptr))){
-	vecteur v;
-	polynome P,Q,R;
-	if (!is_hypergeometric(l,*n._IDNTptr,v,P,Q,R,contextptr)){
-	  *logptr(contextptr) << gettext("Cst part must be hypergeometric") << '\n';
-	  return symbolic(at_seqsolve,args);
-	}
-	// l(n+1)/l(n) = P(n+1)/P(n)*Q(n)/R(n+1)
-	std::vector< monomial<gen> >::const_iterator it=Q.coord.begin();
-	polynome q0=Tnextcoeff<gen>(it,Q.coord.end()).untrunc1();
-	it=R.coord.begin();
-	polynome r0=Tnextcoeff<gen>(it,R.coord.end()).untrunc1();
-	if (!is_zero(r0*Q-q0*R)){
-	  *logptr(contextptr) << gettext("Unable to handle coeff of homogeneous part") << '\n';
-	  return symbolic(at_seqsolve,args);
-	}
-	// -> l(n)=l(0)*P(n)/P(0) -> product(l(n))
-	gen pn=r2e(P,v,contextptr)/r2e(Q,v,contextptr);
-	gen q0r0=r2e(q0,v,contextptr)/r2e(r0,v,contextptr);
-	gen res=pow(subst(normal(l/pn,contextptr),n,0,false,contextptr),n,contextptr)*simplify(product(P,v,n,0,n-1,contextptr)/product(Q,v,n,0,n-1,contextptr),contextptr)*pow(q0r0,n*(n-1)/2,contextptr);
-	// then we might search for a polynomial particular solution to e
-	if (is_zero(c))
-	  return u0/subst(res,n,0,false,contextptr)*res;
-	if (!is_one(q0r0))
-	  return gensizeerr("Unable to find particular solution, general solution is "+res.print(contextptr));
-	// u_{n+1}=l*u_{n}+c
-	gen tmp=l*x[0]+c,tmpnum,tmpden;
-	vecteur tmpv(1,n);
-	lvar(tmp,tmpv);
-	tmp=e2r(tmp,tmpv,contextptr);
-	fxnd(tmp,tmpnum,tmpden);
-	tmpnum=r2e(tmpnum,tmpv,contextptr);
-	tmpden=r2e(tmpden,tmpv,contextptr);
-	tmpnum=_e2r(gen(makevecteur(tmpnum,n),_SEQ__VECT),contextptr);
-	tmpden=_e2r(gen(makevecteur(tmpden,n),_SEQ__VECT),contextptr);
-	if (is_zero(derive(tmpnum,n,contextptr)) && 
-	    is_zero(derive(tmpnum,n,contextptr)) &&
-	    tmpnum.type==_VECT && tmpden.type==_VECT){
-	  vecteur tmpn,tmpd,ln,cn;
-	  tmpn=*tmpnum._VECTptr;
-	  tmpd=*tmpden._VECTptr;
-	  gen difftmpn=derive(tmpn,x[0],contextptr);
-	  if (is_undef(difftmpn) || difftmpn.type!=_VECT)
-	    return gensizeerr(contextptr);
-	  ln=trim(*difftmpn._VECTptr,0);
-	  cn=trim(subst(tmpn,x[0],0,false,contextptr),0);
-	  if (rsolve_particular(-tmpd,ln,cn,tmpn,contextptr)){
-	    gen sol=_r2e(gen(makevecteur(tmpn,n),_SEQ__VECT),contextptr);
-	    // general solution is sol+C*res, sol(0)+C*res(0)=u0
-	    gen C=subst((u0-sol)/res,n,0,false,contextptr);
-	    return sol+C*res;
-	  }
-	}
-	*logptr(contextptr) << gettext("Unable to find a particular solution for inhomogeneous part") << '\n';
-	return symbolic(at_seqsolve,args);
-      }
-      gen d=linear_apply(c,n,l,remains,contextptr,rsolve);
-      if (!is_zero(remains))
-	*logptr(contextptr) << gettext("Unable to solve recurrence") << '\n';
-      // d is a particular solution of u(n+1)=l*u(n)+c(n)
-      // add a general solution d(n)+C*l^n
-      // such that at n=0 we get u0 -> C+d(0)=u0
-      gen C=normal(u0-quotesubst(d,n,0,contextptr),contextptr);
-      return d+C*pow(l,n,contextptr);
-    }
-    // u(n+1)=M*u(n)+cst
-    // Let M=PDP^-1, v=P^-1*u, v satisfies v(n+1)=Dv(n)+P^-1*cst
-    // solve for v then for u
-    if (!is_zero(derive(m,n,contextptr)))
-      return symbolic(at_seqsolve,args);
-    if (has_num_coeff(m))
-      m=*evalf(m,1,contextptr)._VECTptr;
-    matrice P,Pinv,D;
-    bool b=complex_mode(contextptr);
-    complex_mode(true,contextptr);
-    egv(m,P,D,contextptr,true,false,false);
-    complex_mode(b,contextptr);
-    Pinv=minv(P,contextptr);
-    if (is_undef(Pinv))
-      return Pinv;
-    // if (fs==1) uzero=_revlist(uzero);
-    vecteur vzero=multmatvecteur(Pinv,*uzero._VECTptr);
-    vecteur vcst=multmatvecteur(Pinv,cst);
-    int taille=int(m.size());
-    vecteur res(taille);
-    for (int i=taille-1;i>=0;--i){
-      // find cst coefficient
-      gen c=vcst[i],l=D[i][i];
-      for (int j=i+1;j<taille;j++){
-	c += D[i][j]*res[j];
-      }
-      c=normal(c,contextptr);
-      gen remains,d=linear_apply(c,n,l,remains,contextptr,rsolve);
-      if (!is_zero(remains))
-	*logptr(contextptr) << gettext("Unable to solve recurrence") << '\n';
-      gen C=normal(vzero[i]-quotesubst(d,n,0,contextptr),contextptr);
-      if (is_zero(l))
-	res[i]=d+C*symbolic(at_same,gen(makevecteur(n,0),_SEQ__VECT));
-      else
-	res[i]=d+C*pow(l,n,contextptr);
-    }
-    // u=P*v
-    res=multmatvecteur(P,res);
-    if (fs==1)
-      //return normal(subst(res[0],n,n-add,false,contextptr),contextptr);// normal(res[0]); 
-      return ratnormal(res[0],contextptr);
-    else
-      return ratnormal(res,contextptr);
-  }
-  static const char _seqsolve_s []="seqsolve";
-  static define_unary_function_eval_quoted (__seqsolve,&_seqsolve,_seqsolve_s);
-  define_unary_function_ptr5( at_seqsolve ,alias_at_seqsolve,&__seqsolve,_QUOTE_ARGUMENTS,true);
-
-  static vecteur rsolve_initcond(const vecteur & initcond,const gen & un,const gen & u,const gen & n,const vecteur & uinit,GIAC_CONTEXT){
-    if (initcond.empty())
-      return makevecteur(un);
-    gen initc=subst(initcond,u,_unapply(gen(makevecteur(un,n),_SEQ__VECT),contextptr),false,contextptr);
-    initc=initc.eval(1,contextptr);
-    if (initc.type!=_VECT) 
-      return vecteur(1,gensizeerr());
-    vecteur valv=gsolve(*initc._VECTptr,uinit,/* complex mode */ true,0,contextptr);
-    if (is_undef(valv))
-      return valv;
-    vecteur resv(valv.size());
-    for (unsigned int i=0;i<valv.size();++i){
-      resv[i]=normal(quotesubst(un,uinit,valv[i],contextptr),contextptr);
-    }
-    return resv;
-  }
-
-  // example f : u(n+1)=2*u(n)+n, initcond [u(0)=1]
-  static gen crsolve(const gen & f0,const gen &u,const gen & n,vecteur & initcond0,GIAC_CONTEXT){
-    if (f0.type==_VECT){
-      if (u.type!=_VECT || f0._VECTptr->size()!=u._VECTptr->size())
-	return gendimerr();
-    }
-    else {
-      if (u.type==_VECT)
-	return gendimerr();
-    }
-    vecteur uv(gen2vecteur(u));
-    int uvs=int(uv.size());
-    vecteur initcond;
-    aplatir(*giac::apply(initcond0,equal2diff)._VECTptr,initcond);
-    gen f=apply(f0,equal2diff);
-    if (n.type!=_IDNT){
-      identificateur N(" rsolve_N");
-      gen F=quotesubst(f,n,N,contextptr);
-      gen tmp=crsolve(F,u,N,initcond0,contextptr);
-      return quotesubst(tmp,N,n,contextptr);
-    }
-    vecteur vof0(lop(f,at_of));
-    // keep only those with u
-    vecteur vofa,vofb,vopos,vofun;
-    bool all_one=true,all_bzero=true;
-    for (const_iterateur it=vof0.begin();it!=vof0.end();++it){
-      gen & itf=it->_SYMBptr->feuille;
-      int pos;
-      if (itf.type==_VECT && itf._VECTptr->size()==2 && (pos=equalposcomp(uv,itf._VECTptr->front())) ){
-	gen tmp=it->_SYMBptr->feuille._VECTptr->back(),a,b;
-	if (is_linear_wrt(tmp,n,a,b,contextptr) && !is_zero(a)){
-	  if (!is_one(a))
-	    all_one=false;
-	  if (!is_zero(b))
-	    all_bzero=false;
-	  vofa.push_back(a);
-	  vofb.push_back(b);
-	  vopos.push_back(pos-1);
-	  vofun.push_back(*it);
-	}
-	else
-	  return gensizeerr(gettext("Unable to handle this kind of recurrence"));
-      }
-    }
-    if (vofa.empty())
-      return undef;
-    if (all_one){
-      gen bmin=vofb.front(),bmax=vofb.front();
-      int nmax=0;
-      for (const_iterateur it=vofb.begin();it!=vofb.end();++it){
-	const gen & tmp = *it;
-	if (is_strictly_greater(tmp,bmax,contextptr)){
-	  nmax=int(it-vofb.begin());
-	  bmax=tmp;
-	}
-	if (is_strictly_greater(bmin,tmp,contextptr))
-	  bmin=tmp;
-      }
-      if (bmin.type!=_INT_ || bmax.type!=_INT_)
-	return gensizeerr(gettext("Bad indexes in recurrence"));
-      int m=bmin.val,M=bmax.val;
-      if (uvs>1){
-	if (M!=m+1)
-	  return gendimerr(gettext("Multi-recurrences implemented only for 1 step"));
-	// generate identifiers x0,...,x_{uvs-1} and y0,...,y_{uvs-1}
-	vecteur idx,idX;
-	for (int i=0;i<uvs;++i){
-	  idx.push_back(gen(identificateur("rsolve_x"+print_INT_(i))));
-	  idX.push_back(gen(identificateur("rsolve_X"+print_INT_(i))));
-	}
-	vecteur vofid;
-	for (const_iterateur it=vofb.begin();it!=vofb.end();++it){
-	  if (it->type!=_INT_)
-	    return gensizeerr();
-	  bool isx=it->val==m;
-	  int pos=vopos[it-vofb.begin()].val;
-	  vofid.push_back(isx?idx[pos]:idX[pos]);
-	}
-	gen F=quotesubst(f,vofun,vofid,contextptr);
-	if (F.type!=_VECT)
-	  return gensizeerr();
-	// solves for idX in terms of idx
-	vecteur Fv=gsolve(*F._VECTptr,idX,1/* complex */,0/* approx mode=no*/,contextptr),res;
-	if (is_undef(Fv))
-	  return Fv;
-	for (const_iterateur it=Fv.begin();it!=Fv.end();++it){
-	  vecteur idxn(idx);
-	  idxn.push_back(n);
-	  gen vn=_seqsolve(makevecteur(*it,idxn,idx),contextptr);
-	  gen un=quotesubst(vn,n,n+1-M,contextptr);
-	  if (un.type!=_VECT) 
-	    return gensizeerr("Unable to solve this recurrence");
-	  if (int(un._VECTptr->size())!=uvs)
-	    return gendimerr(contextptr);
-	  if (initcond.empty())
-	    return vecteur(1,un);
-	  // solve initial conditions
-	  vecteur vout;
-	  for (int i=0;i<uvs;++i){
-	    vout.push_back(_unapply(gen(makevecteur(un[i],n),_SEQ__VECT),contextptr));
-	  }	  
-	  gen initc=subst(initcond,uv,vout,false,contextptr);
-	  initc=initc.eval(1,contextptr);
-	  if (initc.type!=_VECT) 
-	    return gensizeerr();
-	  vecteur valv=gsolve(*initc._VECTptr,idx,/* complex mode */ true,/* approx=no */ 0,contextptr);
-	  if (is_undef(valv))
-	    return valv;
-	  for (unsigned int i=0;i<valv.size();++i){
-	    res.push_back(normal(quotesubst(un,idx,valv[i],contextptr),contextptr));
-	  }
-	}
-	return res;
-      }
-      // generate identifiers xm,...,xM
-      vecteur ids;
-      for (int i=m;i<=M;++i){
-	ids.push_back(gen(identificateur("rsolve_x"+print_INT_(i-m))));
-      }
-      // replace vofun
-      vecteur vofid;
-      for (const_iterateur it=vofb.begin();it!=vofb.end();++it){
-	if (it->type!=_INT_)
-	  return gensizeerr();
-	vofid.push_back(ids[it->val-m]);
-      }
-      gen F=quotesubst(f,vofun,vofid,contextptr),a,b;
-      if (!is_linear_wrt(F,ids.back(),a,b,contextptr))
-	return gensizeerr();
-      F=-b/a; // xM in terms of xm to xM-1
-      ids.back()=n;
-      vecteur uinit(ids);
-      uinit.pop_back();
-      // let v_n=u_{n+m} -> u_n=v_{n-m}
-      // old code
-      // gen vn=_seqsolve(makevecteur(F,ids,uinit),contextptr);
-      // gen un=quotesubst(vn,n,n-m,contextptr);
-      // new code that solves rsolve(u(n)=(n)*u(n-1),u(n),u(1)=3);
-      gen Fm=quotesubst(F,n,n-m,contextptr);
-      gen un=_seqsolve(makevecteur(Fm,ids,uinit),contextptr);
-      // end new code
-      return rsolve_initcond(initcond,un,u,n,uinit,contextptr);
-    }
-    // divide and conquier?
-    if (uvs==1 && vofa.size()==2 && all_bzero){
-      gen idy=identificateur("rsolve_y"),x(identificateur("rsolve_x"));
-      vecteur ids(makevecteur(x,idy));
-      // replace vofun
-      vecteur vofid;
-      gen b;
-      if (is_one(vofa[0])){
-	vofid=ids;
-	b=vofa[1];
-      }
-      if (is_one(vofa[1])){
-	vofid=makevecteur(ids[1],ids[0]);
-	b=vofa[0];
-      }
-      if (vofid.empty() || ck_is_greater(1,b,contextptr))
-	return gensizeerr();
-      vofun.push_back(n);
-      vofid.push_back(pow(b,n,contextptr));
-      gen F=quotesubst(f,vofun,vofid,contextptr);
-      // F(x,y,n)=0 where y=t(b*n) x=t(n)
-      // auxiliary sequence u(n)=t(b^n), verifies F(u(n+1),u(n),b^n)=0
-      gen A,B;
-      if (is_linear_wrt(F,idy,A,B,contextptr)){
-	F=-B/A; // u(n+1) in terms of u(n)=x
-	gen vn=_seqsolve(makevecteur(F,makevecteur(x,n),x),contextptr);
-	gen un=quotesubst(vn,n,ln(n,contextptr)/ln(b,contextptr),contextptr);
-	// solve initial cond
-	return rsolve_initcond(initcond,un,u,n,makevecteur(x),contextptr);
-      }
-    }
-    return gensizeerr(gettext("Not yet implemented"));
-  }
-  static gen rsolve(const gen & f0,const gen &u,const gen & n,vecteur & initcond0,int st,GIAC_CONTEXT){
-    bool b=complex_mode(contextptr);
-    complex_mode(true,contextptr);
-    gen res=crsolve(f0,u,n,initcond0,contextptr);
-    if (!b){
-      complex_mode(b,contextptr);
-      // FIXME take real part for res
-    }
-    return res;
-  }
-  // example args=u(n+1)=2*u(n)+n,u(n),u(0)=1
-  gen _rsolve(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    vecteur varg=gen2vecteur(args);
-    if (debug_infolevel>20)
-      varg.dbgprint();
-    int s=int(varg.size());
-    if (!s)
-      return gendimerr();
-    gen f,u,n;
-    vecteur initcond;
-    if (s>1){
-      gen un=varg[1];
-      if (un.is_symb_of_sommet(at_of)){
-	gen & unf=un._SYMBptr->feuille;
-	if (unf.type==_VECT && unf._VECTptr->size()==2){
-	  u=unf._VECTptr->front();
-	  n=unf._VECTptr->back();
-	}
-      }
-      if (un.type==_VECT){
-	vecteur & unv=*un._VECTptr;
-	vecteur uv;
-	for (const_iterateur it=unv.begin();it!=unv.end();++it){
-	  const gen & itg=*it;
-	  if (itg.is_symb_of_sommet(at_of)){
-	    gen & unf=itg._SYMBptr->feuille;
-	    if (unf.type==_VECT && unf._VECTptr->size()==2){
-	      uv.push_back(unf._VECTptr->front());
-	      if (is_zero(n))
-		n=unf._VECTptr->back();
-	      else
-		if (n!=unf._VECTptr->back())
-		  return gentypeerr();
-	    }
-	  }
-	}
-	u=uv;
-      }
-      if (is_zero(n))
-	return gentypeerr();
-    }
-    else {
-      u=gen(identificateur("rsolve_u"));
-      n=gen(identificateur("rsolve_n"));
-    }
-    vecteur quoted=gen2vecteur(u);
-    quoted.push_back(n);
-    varg=quote_eval(varg,quoted,contextptr);
-    f=varg[0];
-    if (s>2){
-      initcond=vecteur(varg.begin()+2,varg.end());
-      if (initcond.size()==1 && initcond.front().type==_VECT){
-	// use a temporary vector,
-	// otherwise the source is destroyed when copying the first element of the vector
-	// another way to do that could be to have a gen with a copy of initcond.front
-	vecteur tmp=*initcond.front()._VECTptr;
-	initcond=tmp;
-      }
-    }
-    else {
-      if (f.type==_VECT && !f._VECTptr->empty()){
-	if (u.type!=_VECT || f._VECTptr->size()!=u._VECTptr->size()){
-	  initcond=*f._VECTptr;
-	  f=initcond.front();
-	  initcond.erase(initcond.begin());
-	}
-      }
-    }
-    int st=step_infolevel(contextptr);
-    step_infolevel(0,contextptr);
-    gen res=rsolve(f,u,n,initcond,st,contextptr);
-    step_infolevel(st,contextptr);
-    return res;
-  }
-  static const char _rsolve_s []="rsolve";
-  static define_unary_function_eval_quoted (__rsolve,&_rsolve,_rsolve_s);
-  define_unary_function_ptr5( at_rsolve ,alias_at_rsolve,&__rsolve,_QUOTE_ARGUMENTS,true);
-
-  static bool islessthanf(const gen & a,const gen & b){
-    if (a.type!=_VECT || b.type!=_VECT)
-      return is_strictly_greater(b,a,context0);
-    vecteur & av =*a._VECTptr;
-    vecteur & bv =*b._VECTptr;
-    int avs=int(av.size()),bvs=int(bv.size());
-    if (avs!=bvs)
-      return avs<bvs;
-    for (int i=0;i<avs;++i){
-      if (av[i]==bv[i])
-	continue;
-      return islessthanf(av[i],bv[i]);
-    }
-    return false;
-  }
-  
-  gen _array(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    // create a table with specified index, may be initialized
-    vecteur args;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT){
-      args=*g._VECTptr;
-      if (!args.empty()){
-	gen f=args.back();
-	if (f==at_float || (f.is_symb_of_sommet(at_equal) && f._SYMBptr->feuille[0]==at_dtype)){
-	  args.pop_back();
-	  return _convert(makesequence(_array(args.size()==1?args.front():gen(args,_SEQ__VECT),contextptr),f.type==_FUNC?f:f._SYMBptr->feuille[1]),contextptr);
-	}
-      }
-    }
-    else
-      args=gen2vecteur(g);
-#if 1 // def NSPIRE
-    gen_map m;
-#else
-    gen_map m(ptr_fun(islessthanf));
-#endif
-    int s=int(args.size());
-    vector<int> indexbegin,indexsize;
-    int nindexes=1;
-    gen initv(vecteur(0));
-    vecteur & init = *initv._VECTptr;
-    int shift = array_start(contextptr); //xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38;
-    for (int i=0;i<s;++i){
-      if (args[i].is_symb_of_sommet(at_interval)){
-	gen & f =args[i]._SYMBptr->feuille;
-	if (f.type!=_VECT || f._VECTptr->size()!=2)
-	  return gendimerr(args[i].print(contextptr));
-	vecteur & fv= *f._VECTptr;
-	if (fv[0].type!=_INT_ || fv[1].type!=_INT_ || fv[1].val<fv[0].val)
-	  return gendimerr(args[i].print(contextptr));
-	indexbegin.push_back(fv.front().val-shift);
-	indexsize.push_back(fv.back().val-fv.front().val+1);
-	nindexes *= indexsize.back();
-      }
-      if (args[i].type==_VECT)
-	init=mergevecteur(init,*args[i]._VECTptr);
-    }
-    if (nindexes>>24)
-      return gendimerr(gettext("Array too large")+print_INT_(nindexes));
-    if (nindexes==1)
-      return g;
-    int is=int(indexsize.size());
-    for (int i=0;i<nindexes;++i){
-      // generate index by writing nindexes in bases indexsize
-      vecteur curidx(is);
-      int pos=i,posj;
-      gen initval=initv;
-      bool initialize=true;
-      for (int j=0;j<is;++j){
-	posj = (pos % indexsize[j]);
-	if (initialize && initval.type==_VECT && (int)initval._VECTptr->size()>posj)
-	  initval=(*initval._VECTptr)[posj];
-	else
-	  initialize=false;
-	curidx[j] = posj + indexbegin[j];
-	pos /= indexsize[j];
-      }
-      // initialize m[curidx]
-      if (initialize)
-	m[curidx]=initval;
-      else
-	m[curidx]=0;
-    }
-    gen res=m;
-    res.subtype=1;
-    return res;
-  }
-  static const char _array_s []="array";
-  static define_unary_function_eval (__array,&_array,_array_s);
-  define_unary_function_ptr5( at_array ,alias_at_array,&__array,0,true);
-
-  static const char _whattype_s []="whattype";
-  static define_unary_function_eval (__whattype,&_type,_whattype_s);
-  define_unary_function_ptr5( at_whattype ,alias_at_whattype,&__whattype,0,true);
-
-  static const char _modp_s []="modp";
-  static define_unary_function_eval (__modp,&_irem,_modp_s);
-  define_unary_function_ptr5( at_modp ,alias_at_modp,&__modp,0,true);
-
-  gen _makemod(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT || args._VECTptr->size()!=2)
-      return gentypeerr();
-    gen a=args._VECTptr->front(),b=args._VECTptr->back();
-    if (is_zero(b))
-      return unmod(a);
-    if (!is_integer(a) || !is_integer(b))
-      return gentypeerr();
-    return makemod(a,b);
-  }
-  static const char _makemod_s []="makemod";
-  static define_unary_function_eval (__makemod,&_makemod,_makemod_s);
-  define_unary_function_ptr5( at_makemod ,alias_at_makemod,&__makemod,0,true);
-
-  gen cpp_convert_0(const gen &g,GIAC_CONTEXT){
-    return g;
-  }
-
-  longlong cpp_convert_2(const gen & g,GIAC_CONTEXT){
-    if (g.type==_INT_)
-      return g.val;
-    gen h=g;
-    if (!is_integral(h)){
-      gensizeerr(contextptr);
-      return 0;
-    }
-    if (h.type==_INT_)
-      return h.val;
-#ifdef USE_GMP_REPLACEMENTS
-    gensizeerr(contextptr);
-    return 0;
-#else 
-    if (mpz_sizeinbase(*h._ZINTptr,2)>62){
-      gensizeerr(contextptr);      
-      return 0;
-    }
-    if (is_greater(0,g,context0))
-      return -cpp_convert_2(-g,contextptr);
-#ifdef BF2GMP_H
-    return mpz_get_ui(*h._ZINTptr);
-#else
-    unsigned int lo, hi;
-    mpz_t tmp;
-    mpz_init( tmp );
-    mpz_mod_2exp( tmp, *h._ZINTptr, 64 );   /* tmp = (lower 64 bits of n) */    
-    lo = mpz_get_ui( tmp );       /* lo = tmp & 0xffffffff */ 
-    mpz_div_2exp( tmp, tmp, 32 ); /* tmp >>= 32 */
-    hi = mpz_get_ui( tmp );       /* hi = tmp & 0xffffffff */
-    mpz_clear( tmp );
-    longlong i=(((unsigned long long)hi) << 32) + lo;
-    return i;
-#endif // BF2GMP
-#endif // GMP_REPLACEMENTS
-  }
-
-  double cpp_convert_1(const gen & g,GIAC_CONTEXT){
-    if (g.type==_DOUBLE_) return g._DOUBLE_val;
-    gen h=evalf_double(g,1,context0);
-    if (h.type!=_DOUBLE_){
-      gensizeerr(contextptr);
-      return 0;
-    }
-    return h._DOUBLE_val;
-  }
-
-  complex<double> cpp_convert_4(const gen & g,GIAC_CONTEXT){
-    gen h=evalf_double(g,1,context0);
-    if (h.type==_DOUBLE_)
-      return h._DOUBLE_val;
-    if (h.type!=_CPLX || h.subtype!=3){
-      gensizeerr(contextptr);
-      return 0;
-    }
-    return complex<double>(h._CPLXptr->_DOUBLE_val,(h._CPLXptr+1)->_DOUBLE_val);
-  }
-
-  vecteur cpp_convert_7(const gen & g,GIAC_CONTEXT){
-    if (g.type!=_VECT){
-      gensizeerr(contextptr);
-      return 0;
-    }
-    return *g._VECTptr;
-  }
-
-  std::string cpp_convert_12(const gen & g,GIAC_CONTEXT){
-    if (g.type!=_STRNG){
-      gensizeerr(contextptr);
-      return "";
-    }
-    return *g._STRNGptr;
-  }
-
-  int is_int_or_double(const gen & g){
-    if (g.type==_INT_)
-      return 2;
-    if (g.type==_DOUBLE_)
-      return _DOUBLE_;
-    if (g.type==_IDNT){
-      const char * ch =g._IDNTptr->id_name;
-      int s=int(strlen(ch));
-      if (s>=3 && ch[s-2]=='_') {
-	switch (ch[s-1]){
-	case 'i': case 'l':
-	  return 2;
-	case 'd':
-	  return _DOUBLE_;
-	}
-      }
-      return 0;
-    }
-    if (g.type==_SYMB){
-      if (g._SYMBptr->sommet==at_floor || g._SYMBptr->sommet==at_irem || g._SYMBptr->sommet==at_iquo || g._SYMBptr->sommet==at_size)
-	return 2;
-      vecteur v=lvar(g._SYMBptr->feuille);
-      return is_int_or_double(v); // this assumes that the function has the same type as the arguments
-    }
-    if (g.type!=_VECT)
-      return 0;
-    const vecteur & v=*g._VECTptr;
-    for (int i=0;i<int(v.size());++i){
-      if (!is_int_or_double(v[i]))
-	return 0;
-    }
-    return 3;
-  }
-
-  int cpp_vartype(const gen & g,const vecteur & allnames,const vecteur & allchecks){
-    switch (g.type){
-    case _INT_: case _ZINT:
-      return 2;
-    case _DOUBLE_:
-      return _DOUBLE_;
-    case _CPLX:
-      return _CPLX;
-    case _VECT:
-      return _VECT;
-    case _STRNG:
-      return _STRNG;
-    }
-    if (g.type==_SYMB){
-      if (g._SYMBptr->sommet==at_at)
-	return 0; // could be improved if we add support for vector of long/double
-      if (g._SYMBptr->sommet==at_of){
-	gen f=g._SYMBptr->feuille[0];
-	int pos=0;
-	if ( (pos=equalposcomp(allnames,f)) && pos<=allchecks.size()){
-	  gen g=allchecks[pos-1];
-	  if (g.is_symb_of_sommet(at_deuxpoints) && g._SYMBptr->feuille[0]==f)
-	    return g._SYMBptr->feuille[1].val;
-	}
-      }
-      if (g._SYMBptr->sommet==at_floor || g._SYMBptr->sommet==at_irem || g._SYMBptr->sommet==at_iquo)
-	return 2;
-      if (g._SYMBptr->sommet==at_size)
-	return 2;
-      if (g._SYMBptr->sommet==at_abs && cpp_vartype(g._SYMBptr->feuille,allnames,allchecks)==3)
-	return 2;
-      vecteur v=lvar(g._SYMBptr->feuille);
-      const_iterateur it=v.begin(),itend=v.end();
-      int cur=-1;
-      for (;it!=itend;++it){
-	int i=cpp_vartype(*it,allnames,allchecks);
-	if (i==0)
-	  return 0;
-	if (cur==2 && i==_DOUBLE_)
-	  cur=_DOUBLE_;
-	if (cur==i || (cur==_DOUBLE_ && i==2))
-	  continue;
-	if (cur==-1)
-	  cur=i;
-	else 
-	  return 0;
-      }
-      return cur;
-    }
-    if (g.type!=_IDNT)
-      return 0;
-    const char * ch=g._IDNTptr->id_name;
-    int cl=int(strlen(ch));
-    if (cl>=3 && ch[cl-2]=='_'){
-      switch (ch[cl-1]){
-      case 'i':case 'l':
-	return 2;
-      case 'd':
-	return _DOUBLE_;
-      case 'c':
-	return _CPLX;
-      case 'v':
-	return _VECT;
-      case 's':
-	return _STRNG;
-      }
-    }
-    return 0;
-  }
-
-  std::string cprintvars(const gen & f0,bool cst,bool ctx0,const string & sep,int * typeptr,const vecteur & allnames,const vecteur & allchecks,GIAC_CONTEXT){
-    vecteur fv=gen2vecteur(f0);
-    if (fv.size()==2 && fv[0].type==_VECT)
-      fv=*fv[0]._VECTptr;
-    string res;
-    for (int i=0;;){
-      gen fvi=fv[i];
-      bool eq=fvi.is_symb_of_sommet(at_equal);
-      bool eqsto=fvi.is_symb_of_sommet(at_sto);
-      if (eq)
-	fvi=fvi[1];
-      if (eqsto)
-	fvi=fvi[2];
-      if (fvi.type!=_IDNT)
-	return "Invalid parameter "+fvi.print(contextptr);
-      const char * ch=fvi._IDNTptr->id_name;
-      int cl=int(strlen(ch));
-      string vtype=cst?"const giac::gen & ":"giac::gen ";
-      if (typeptr) *typeptr=0;
-      if (cl>=3 && ch[cl-2]=='_'){
-	switch (ch[cl-1]){
-	case 'i': case 'l':
-	  vtype="long ";
-	  if (typeptr) *typeptr=2;
-	  break;
-	case 'd':
-	  vtype="double ";
-	  if (typeptr) *typeptr=_DOUBLE_;
-	  break;
-	case 'c':
-	  vtype="complex<double> ";
-	  if (typeptr) *typeptr=_CPLX;
-	  break;
-	case 'v':
-	  vtype="giac::vecteur ";
-	  if (typeptr) *typeptr=_VECT;
-	  break;
-	case 's':
-	  vtype="std::string ";
-	  if (typeptr) *typeptr=_STRNG;
-	  break;
-	}
-      }
-      if (typeptr) ++typeptr;
-      vtype = vtype+ch;
-      if (eq || eqsto){ 
-	gen g=(fv[i])[1];
-	if (eq)
-	  g=(fv[i])[2];
-#if 1
-	int i=cpp_vartype(fvi,allnames,allchecks);
-	int gt=cpp_vartype(g,allnames,allchecks);
-	if (!i || i==gt || (i==2 && gt==_DOUBLE_) || (i==_DOUBLE_ && gt==2))
-	  vtype = vtype + " = " +cprint(g,0,contextptr);
-	else 
-	  vtype = vtype + " = cpp_convert_"+print_INT_(i)+"("+cprint(g,0,contextptr)+(ctx0?",giac::context0)":",contextptr)");
-#else
-	vtype = vtype+'=';
-	int i=is_int_or_double(fvi);
-	if (!i || is_int_or_double(g))
-	  vtype = vtype +g.print(contextptr);
-	else {
-	  vtype = vtype + "("+g.print(contextptr);
-	  vtype += (i==_DOUBLE_)?")._DOUBLE_val":").val";
-	}
-#endif
-      }
-      ++i;
-      if (i==int(fv.size()))
-	return res+vtype;
-      res = res + vtype + sep;
-    }
-  }
-  
-  std::string cpp_stoprint(const gen & g,const vecteur & allnames,const vecteur & allchecks,GIAC_CONTEXT){
-    if (g.is_symb_of_sommet(at_at) && g._SYMBptr->feuille.type==_VECT && g._SYMBptr->feuille._VECTptr->size()==2){
-      gen f=g._SYMBptr->feuille._VECTptr->front();
-      gen i=g._SYMBptr->feuille._VECTptr->back();
-      int t=cpp_vartype(i,allnames,allchecks);
-      if (t!=2)
-	return cprint(f,0,contextptr)+"[cpp_convert_2("+cprint(i,0,contextptr)+",contextptr)]";
-      else
-	return cprint(f,0,contextptr)+"["+cprint(i,0,contextptr)+"]";
-    }
-    return cprint(g,0,contextptr);
-  }
-
-  // name is the program name if args==program(..),
-  // name=1 for vectors of instructions or 0 otherwise or -1 for vector to put in a makesequence
-  // allnames is a list of all variables names that will be converted
-  // allchecks is the same list but maybe with type returned
-  std::string cprint(const gen & args,const gen & name_,const vecteur & allnames,const vecteur & allchecks,GIAC_CONTEXT){
-    gen name=name_.is_symb_of_sommet(at_deuxpoints)?name_._SYMBptr->feuille[0]:name_;
-    if (args.type==_INT_ && args.subtype==_INT_BOOLEAN)
-      return args.val?"true":"false";
-    if (args.type==_IDNT){
-      if (args==cst_pi)
-	return "cst_pi";
-    }
-    if (args.type==_VECT){
-      string sep=name==1?";\n":",";
-      string s;
-      bool ret=!args._VECTptr->empty() && args._VECTptr->back().is_symb_of_sommet(at_return);
-      if (name==0 && args.subtype!=_SEQ__VECT && !ret){
-	s="giac::makevecteur(";
-      }
-      if (name==-1)
-	s="giac::makesequence(";
-      vecteur::const_iterator it=args._VECTptr->begin(), itend=args._VECTptr->end();
-      if (it==itend)
-	return "gen(vecteur(0),"+print_INT_(args.subtype)+")";
-      for(int i=0;;++i){
-	s += cprint(*it,(name.type==_VECT && i<name._VECTptr->size())?name[i]:zero,allnames,allchecks,contextptr);
-	++it;
-	if (it==itend){
-	  break;
-	}
-	s += sep;
-      }
-      if (name==0 && args.subtype!=_SEQ__VECT && !ret) s += ")";
-      if (name==-1) s += ")";
-      if (name==1 || ret) s += ";";
-      return s;
-    }
-    if (args.type==_CPLX)
-      return "gen("+args._CPLXptr->print(contextptr)+","+(args._CPLXptr+1)->print(contextptr)+")";
-    if (args.type==_FUNC){
-      if (args==at_break)
-	return "break";
-      if (args==at_continue)
-	return "continue";
-      string name=args.print(contextptr);
-      if (name.size()>2 && name[0]=='\'' && name[name.size()-1]=='\'')
-	name=name.substr(1,name.size()-2);
-      return "at_"+name;
-    }
-    if (args.type!=_SYMB)
-      return args.print(contextptr);
-    unary_function_ptr & u=args._SYMBptr->sommet;
-    if (u==at_break)
-      return "break";
-    if (u==at_continue)
-      return "continue";
-    gen f=args._SYMBptr->feuille;
-    if ( (u==at_sto || u==at_array_sto) && f.type==_VECT && f._VECTptr->size()==2){
-#if 1
-      if (f[1].type==_VECT){
-	string res="{\n";
-	const vecteur & v=*f[1]._VECTptr;
-	int vs=v.size();
-	res += "giac::vecteur __tmp_=giac::makevecteur("+cprint(f[0],0,allnames,allchecks,contextptr)+");\n";
-	for (int j=0;j<vs;++j){
-	  gen var=f[1][j];
-	  int i=cpp_vartype(var,allnames,allchecks);
-	  res += cpp_stoprint(var,allnames,allchecks,contextptr)+" = cpp_convert_"+print_INT_(i)+"("+"__tmp_["+print_INT_(j)+"],contextptr);";
-	}
-	return res+"\n}";
-      }
-      int i=cpp_vartype(f[1],allnames,allchecks);
-      int f0t=cpp_vartype(f[0],allnames,allchecks);
-      if (!i || i==f0t || (i==_DOUBLE_ && f0t==2) || (i==2 && f0t==_DOUBLE_))
-	return cpp_stoprint(f[1],allnames,allchecks,contextptr)+'='+cprint(f[0],0,allnames,allchecks,contextptr);;
-      string res= cpp_stoprint(f[1],allnames,allchecks,contextptr)+" = cpp_convert_"+print_INT_(i)+"("+cprint(f[0],0,allnames,allchecks,contextptr)+",contextptr)";
-      return res;
-#else
-      int i=is_int_or_double(f[1]);
-      if (!i || is_int_or_double(f[0]))
-	return f[1].print(contextptr)+'='+cprint(f[0],0,allnames,allchecks,contextptr);;
-      string res= f[1].print(contextptr)+"=("+cprint(f[0],0,allnames,allchecks,contextptr);
-      res += (i==_DOUBLE_)?")._DOUBLE_val":").val";
-      return res;
-#endif
-    }
-    if (u==at_equal && f.type==_VECT && f._VECTptr->size()==2){
-#if 1
-      int i=cpp_vartype(f[0],allnames,allchecks);
-      if (!i || i==cpp_vartype(f[1],allnames,allchecks))
-	return cpp_stoprint(f[0],allnames,allchecks,contextptr)+'='+cprint(f[1],0,allnames,allchecks,contextptr);
-      string res= cpp_stoprint(f[0],allnames,allchecks,contextptr)+" = cpp_convert_"+print_INT_(i)+"("+cprint(f[1],0,allnames,allchecks,contextptr)+",contextptr)";
-      return res;
-#else
-      int i=is_int_or_double(f[0]);
-      if (!i || is_int_or_double(f[1]))
-	return f[0].print(contextptr)+'='+cprint(f[1],0,allnames,allchecks,contextptr);;
-      string res= f[0].print(contextptr)+"=("+cprint(f[1],0,allnames,allchecks,contextptr);
-      res += (i==_DOUBLE_)?")._DOUBLE_val":").val";
-      return res;
-#endif
-    }
-    if (u==at_size){
-      int i=cpp_vartype(f,allnames,allchecks);
-      if (i==_VECT)
-	return cprint(f,0,allnames,allchecks,contextptr)+".size()";
-      return "cpp_convert_7("+cprint(f,0,allnames,allchecks,contextptr)+",contextptr).size()";
-    }
-    if (f.type==_VECT && f._VECTptr->size()==2){
-      if (u==at_at){
-	int i=cpp_vartype(f._VECTptr->front(),allnames,allchecks);
-	int j=cpp_vartype(f._VECTptr->back(),allnames,allchecks);
-	if (i==0 || j==2)
-	  return f._VECTptr->front().print(contextptr)+"["+cprint(f._VECTptr->back(),0,allnames,allchecks,contextptr)+"]";
-	return f._VECTptr->front().print(contextptr)+"[cpp_convert_2("+cprint(f._VECTptr->back(),0,allnames,allchecks,contextptr)+",contextptr)]";
-      }
-      if (u==at_of){
-	gen fnc=f._VECTptr->front();
-	if (equalposcomp(allnames,fnc)){
-	  gen evaled_fnc=eval(fnc,1,contextptr);
-	  if (evaled_fnc.is_symb_of_sommet(at_program)){
-	    gen F=evaled_fnc._SYMBptr->feuille;
-	    if (F.type==_VECT && F._VECTptr->size()==3){
-	      vector<int> argtype(gen2vecteur(F[0]).size());
-	      vecteur argF(gen2vecteur(f._VECTptr->back()));
-	      if (argtype.size()==argF.size()){
-		cprintvars(F[0],false,true,",",&argtype.front(),allnames,allchecks,contextptr);
-		string res(fnc.print(contextptr));
-		res += '(';
-		for (size_t pos=0;pos<argF.size();++pos){
-		  int i=argtype[pos];
-		  int j=cpp_vartype(argF[pos],allnames,allchecks);
-		  if (i==j || (i==0 || j==2))
-		    res += cprint(argF[pos],0,allnames,allchecks,contextptr);
-		  else
-		    res += "cpp_convert_"+print_INT_(i)+"("+cprint(argF[pos],0,allnames,allchecks,contextptr)+",contextptr)";
-		  if (pos!=argF.size()-1)
-		    res += ',';
-		}
-		res += ')';
-		return res;
-	      }
-	    }
-	  }
-	}
-      }
-    }
-    if (u==at_program && f.type==_VECT && f._VECTptr->size()==3){
-      // header
-      bool head=name.type==_IDNT;
-      string heads;
-      int convert=0;
-      if (head){
-	// IMPROVE if name=="main" make it argv,argc->int
-	string rtype="giac::gen ";
-	convert=cpp_vartype(name,allnames,allchecks);
-	if (name_.is_symb_of_sommet(at_deuxpoints))
-	  convert = name_._SYMBptr->feuille[1].val;
-	if (convert){
-	  switch (convert){
-	  case _DOUBLE_:
-	    rtype="double ";
-	    break;
-	  case 2:
-	    rtype="long ";
-	    break;
-	  case _VECT:
-	    rtype="giac::vecteur ";
-	    break;
-	  case _STRNG:
-	    rtype="std::string ";
-	    break;
-	  }
-	}
-	heads=rtype+name._IDNTptr->id_name+"(";
-      }
-      else
-	heads="giac::gen f(";
-      vector<int> argtype(gen2vecteur(f[0]).size());
-      heads += cprintvars(f[0],false,true,",",&argtype.front(),allnames,allchecks,contextptr)+",const giac::context * contextptr=0)";
-      // core
-      string core=cprint(f[2],0,allnames,allchecks,contextptr);
-      if (!core.empty()){
-	char ch=core[core.size()-1];
-	if (ch!='}' && ch!=';')
-	  core += ';';
-      }
-      string res= heads+"{\n"+core+"\n}\n";
-      heads="f";
-      if (head)
-	heads=name._IDNTptr->id_name;
-      if (f[0].type!=_VECT || f[0]._VECTptr->size()<=1){
-	if (f[0].type==_VECT && f[0]._VECTptr->empty())
-	  core ="return "+heads+"(contextptr);";
-	else {
-#if 1
-	  if (0 && name_.is_symb_of_sommet(at_deuxpoints))
-	    core = "return cpp_convert_"+print_INT_(name_._SYMBptr->feuille[1].val)+"("+heads+"(cpp_convert_"+print_INT_(cpp_vartype(f[0]._VECTptr->front(),allnames,allchecks))+"(g,contextptr),contextptr));";
-	  else
-	    core = "return "+heads+"(cpp_convert_"+print_INT_(cpp_vartype(f[0]._VECTptr->front(),allnames,allchecks))+"(g,contextptr),contextptr);";
-#else
-	  switch (convert){
-	  case 0:
-	    core="return "+heads+"(g,contextptr);";
-	    break;
-	  case 2:
-	    core="if (g.type!=_INT_) return gensizeerr(contextptr); else return "+heads+"(g.val,contextptr);";
-	    break;
-	  case _DOUBLE_:
-	    core="if (g.type!=_DOUBLE_) return gensizeerr(contextptr); else return "+heads+"(g._DOUBLE_val,contextptr);";
-	    break;
-	  }
-#endif
-	}
-      }
-      else {
-	int nargs=int(f[0]._VECTptr->size());
-	core = "if (g.type!=_VECT || g.subtype!=_SEQ__VECT || g._VECTptr->size()!="+print_INT_(nargs)+") return gendimerr(contextptr);\n";
-	core += "vecteur v = *g._VECTptr;";
-	for (int i=0;i<nargs;++i){
-	  string vi="v["+print_INT_(i)+"]";
-	  switch(argtype[i]){
-	  case _DOUBLE_:
-	    core += vi+"=evalf_double("+vi+",1,contextptr);\n";
-	    core += "if ("+vi+".type!=_DOUBLE_) return gensizeerr(contextptr);\n";
-	    break;
-	  case 2:
-	    core += "if (!is_integral("+vi+")) return gensizeerr(contextptr);\n";
-	    break;
-	  case _VECT:
-	    core += "if ("+vi+".type!=_VECT) return gensizeerr(contextptr);\n";
-	    break;
-	  case _STRNG:
-	    core += "if ("+vi+".type!=_STRNG) return gensizeerr(contextptr);\n";
-	    break;
-	  }
-	}
-	core += "return "+heads+"(" ;
-	for (int i=0;;){
-	  string vi="v["+print_INT_(i)+"]";
-	  switch (argtype[i]){
-	  case _DOUBLE_:
-	    core += vi+"._DOUBLE_val";
-	    break;
-	  case 2:
-	    core += vi+".val";
-	    break;
-	  case _VECT:
-	    core += "*"+vi+"._VECTptr";
-	    break;
-	  case _STRNG:
-	    core += "*"+vi+"._STRNGptr";
-	    break;
-	  default:
-	    core += vi;
-	  }
-	  ++i;
-	  if (i==nargs) break;
-	  core += ",";
-	}
-	core += ",contextptr);";
-      }
-      heads="giac::gen _"+heads+"(const giac::gen & g,const giac::context * contextptr)";
-      res += heads+"{\n"+core+"\n}\n";
-      return res;
-    }
-    if (u==at_irem && f.type==_VECT && f._VECTptr->size()==2){
-      int f0t=cpp_vartype(f[0],allnames,allchecks);
-      int f1t=cpp_vartype(f[1],allnames,allchecks);
-      if ( (f0t==2 || f0t==_DOUBLE_ ) && (f1t==2 || f1t==_DOUBLE_))
-	return "long("+cprint(f[0],0,allnames,allchecks,contextptr)+") % long("+ cprint(f[1],0,allnames,allchecks,contextptr)+")" ;
-    }
-    if (u==at_floor){
-      int ft=cpp_vartype(f,allnames,allchecks);
-      if (ft==2 || ft==_DOUBLE_)
-	return "long("+cprint(f,0,allnames,allchecks,contextptr)+")";
-    }
-    if (u==at_local){
-      gen f0=f[0];
-      string s(cprintvars(f0,false,false,";\n",0,allnames,allchecks,contextptr)+";\n");
-      return s+cprint(f[1],1,allnames,allchecks,contextptr);
-    }
-    if ( (u==at_for || u==at_pour) && f.type==_VECT && f._VECTptr->size()==4){
-      string res="for(";
-      res = res +cprint(f[0],0,allnames,allchecks,contextptr);
-      res = res +';';
-      res = res +cprint(f[1],0,allnames,allchecks,contextptr);
-      res = res +';';
-      res = res +cprint(f[2],0,allnames,allchecks,contextptr);
-      res = res +"){\n";
-      res = res +cprint(f[3],0,allnames,allchecks,contextptr);
-      res = res +";\n}\n"; 
-      return res;
-    }
-    if (u==at_bloc)
-      return cprint(f,1,allnames,allchecks,contextptr);
-    if ( (u==at_ifte || u==at_si) && f.type==_VECT && f._VECTptr->size()==3){
-      string res="if(";
-      res = res +cprint(f[0],0,allnames,allchecks,contextptr);
-      res = res +"){\n";
-      res = res +cprint(f[1],0,allnames,allchecks,contextptr);
-      res = res +";\n}";
-      if (!is_zero(f[2])){
-	res = res + " else {\n";
-	res = res + cprint(f[2],0,allnames,allchecks,contextptr) + ";\n}";
-      }
-      return res;
-    }
-    if (u==at_when){
-      string res("giac::_when(giac::makesequence(");
-      res += cprint(f,0,allnames,allchecks,contextptr);
-      res += "),contextptr)";
-      return res;
-    }
-    if (u==at_try_catch && f.type==_VECT && f._VECTptr->size()>=3){
-      string res="try {\n";
-      res = res +cprint(f[0],0,allnames,allchecks,contextptr);
-      res = res +";\n} catch(";
-      res = res +cprint(f[1],0,allnames,allchecks,contextptr);
-      res = res +"){\n";
-      res = res +cprint(f[2],0,allnames,allchecks,contextptr);
-      res = res +";\n}";
-      return res;
-    }    
-    if (u==at_return){
-      if (f.type==_VECT)
-	return "return giac::makevecteur("+cprint(f,0,allnames,allchecks,contextptr)+")";
-      else
-	return "return "+cprint(f,0,allnames,allchecks,contextptr);
-    }
-    if (u==at_struct_dot){
-      if (f.type==_VECT && f._VECTptr->size()==2){
-	gen f0=f._VECTptr->front(),f1=f._VECTptr->back();
-	if (cpp_vartype(f0,allnames,allchecks)==_VECT){
-	  string f0s=f0.print(contextptr);
-	  gen f1f=f1._SYMBptr->feuille;
-	  if (f1.is_symb_of_sommet(at_append))
-	    return f0s+".push_back("+cprint(f1f,0,allnames,allchecks,contextptr)+")";
-	  if (f1.is_symb_of_sommet(at_prepend))
-	    return f0s+".insert("+f0s+".begin(),"+cprint(f1f,0,allnames,allchecks,contextptr)+")";
-	  if (f1.is_symb_of_sommet(at_suppress)){
-	    f0s=f0s+".erase("+f0s+".begin()+";
-	    if (cpp_vartype(f1f,allnames,allchecks)!=2)
-	      f0s += "cpp_convert_2("+cprint(f1f,0,allnames,allchecks,contextptr)+")";
-	    else
-	      f0s += cprint(f1f,0,allnames,allchecks,contextptr);
-	    return f0s+")";
-	  }
-	  if (f1f.type==_VECT && f1f._VECTptr->empty()){
-	    if (f1.is_symb_of_sommet(at_sort))
-	      return "sort("+f0s+".begin(),"+f0s+".end())";
-	    if (f1.is_symb_of_sommet(at_reverse) || f1.is_symb_of_sommet(at_revlist))
-	      return "reverse("+f0s+".begin(),"+f0s+".end())";
-	  }
-	}
-      }
-      return "// Unable to convert "+args.print(contextptr)+"\n";
-    }
-    if (u.ptr()->cprint)
-      return u.ptr()->cprint(args._SYMBptr->feuille,u.ptr()->s,contextptr);
-    // operators: if all vars are double or int args.print()
-    // otherwise or not an operator giac::opname(,contextptr)
-    string res=u.ptr()->print(contextptr);
-    int idf0=is_int_or_double(f);
-    bool idf= idf0 || cpp_vartype(f,allnames,allchecks)==_CPLX;
-    if (u==at_sin || u==at_cos || u==at_tan || u==at_asin || u==at_acos || u==at_atan || u==at_exp || u==at_ln || u==at_abs){
-      if (idf)
-	return "std::"+args.print(contextptr);
-    }
-    else
-      res = '_'+res;
-    if (u.ptr()->printsommet==printsommetasoperator || u==at_division || 
-	(idf0 && (u==at_inferieur_strict || u==at_inferieur_egal || u==at_superieur_strict || u==at_superieur_egal))){
-      int rs=int(res.size());
-      if ( (idf && (rs!=2 || res[1]!='^')) || (rs==2 && (res[1]=='+' || res[1]=='*' || res[1]=='>' || res[1]=='<')) || (rs==3 && (res[1]=='>' || res[1]=='<') && res[2]=='=') ){
-	res=u.ptr()->print(contextptr);
-	string sres;
-	vecteur v=gen2vecteur(f);
-	for (int i=0;;){
-	  bool b=need_parenthesis(v[i]);
-	  if (b) sres += '(';
-	  sres += cprint(v[i],0,allnames,allchecks,contextptr);
-	  if (b) sres += ')';
-	  ++i;
-	  if (i>=v.size())
-	    break;
-	  sres += res;
-	}
-	return sres;
-      }
-      if (rs==2){
-	switch (res[1]){
-	case '+':
-	  res="_plus";
-	  break;
-	case '*':
-	  res="_prod";
-	  break;
-	case '/':
-	  res="_division";
-	  break;
-	case '<':
-	  res="_inferieur_strict";
-	  break;
-	case '>':
-	  res="_superieur_strict";
-	  break;
-	case '=':
-	  res="_equal";
-	  break;
-	case '^':
-	  res="_pow";
-	  break;
-	}
-      }
-    }
-    if (u==at_increment || u==at_decrement){
-      if (f.type!=_VECT &&  is_int_or_double(f)){
-	return cprint(f,0,allnames,allchecks,contextptr)+(u==at_increment?"++":"--");
-      }
-      if (f.type==_VECT && f._VECTptr->size()==2 && is_int_or_double(f._VECTptr->front()) && is_int_or_double(f._VECTptr->back()) ){
-	return cprint(f._VECTptr->front(),0,allnames,allchecks,contextptr)+(u==at_increment?"+=":"-=")+cprint(f._VECTptr->back(),0,allnames,allchecks,contextptr);
-      }
-    }
-    if (u==at_same || u==at_different || u==at_and || u==at_ou ){
-      return cprint(args._SYMBptr->feuille[0],-1,allnames,allchecks,contextptr)+" "+u.ptr()->s+" "+cprint(args._SYMBptr->feuille[1],-1,allnames,allchecks,contextptr);
-    }
-    if (u==at_neg || u==at_not)
-      return u.ptr()->s+cprint(args._SYMBptr->feuille,-1,allnames,allchecks,contextptr);
-    if (u==at_inferieur_egal)
-      return "giac::is_greater("+cprint(args._SYMBptr->feuille[1],-1,allnames,allchecks,contextptr)+","+cprint(args._SYMBptr->feuille[0],0,allnames,allchecks,contextptr)+",contextptr)";
-    if (u==at_superieur_egal)
-      return "giac::is_greater("+cprint(args._SYMBptr->feuille[0],-1,allnames,allchecks,contextptr)+","+cprint(args._SYMBptr->feuille[1],0,allnames,allchecks,contextptr)+",contextptr)";
-    if (u==at_inferieur_strict)
-      return "!giac::is_greater("+cprint(args._SYMBptr->feuille[0],-1,allnames,allchecks,contextptr)+","+cprint(args._SYMBptr->feuille[1],0,allnames,allchecks,contextptr)+",contextptr)";
-    if (u==at_superieur_strict)
-      return "!giac::is_greater("+cprint(args._SYMBptr->feuille[1],-1,allnames,allchecks,contextptr)+","+cprint(args._SYMBptr->feuille[0],0,allnames,allchecks,contextptr)+",contextptr)";
-    res = "giac::"+res + '(';
-    res = res + cprint(args._SYMBptr->feuille,-1,allnames,allchecks,contextptr);
-    res = res +",contextptr)";
-    return res;
-    // ...
-  }
-
-  // name is the program name if args==program(..) or 1 for vectors of instructions or 0 otherwise or -1 for vector to put in a makesequence
-  std::string cprint(const gen & args,const gen & name,GIAC_CONTEXT){
-    vecteur v,w;
-    if (name.is_symb_of_sommet(at_deuxpoints)){
-      gen f=name._SYMBptr->feuille;
-      if (f.type==_IDNT){
-	v.push_back(f);
-	w.push_back(name);
-      }
-    }
-    else {
-      if (name.type==_IDNT){
-	v.push_back(name);
-	w.push_back(name);
-      }
-    }
-    return cprint(args,name,v,w,contextptr);
-  }
-
-  std::string cprint(const gen & args,GIAC_CONTEXT){
-    return cprint(args,0,contextptr);
-  }
-
-  gen _cprint(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    int x=xcas_mode(contextptr),l=language(contextptr);
-    xcas_mode(0,contextptr);
-    language(2,contextptr);
-    gen args_evaled=eval(args,1,contextptr);
-    string s=cprint(args_evaled,args,contextptr);
-    xcas_mode(x,contextptr);
-    language(l,contextptr);
-    return string2gen(s,false);
-  }
-  static const char _cprint_s []="cprint";
-  static define_unary_function_eval_quoted (__cprint,&_cprint,_cprint_s);
-  define_unary_function_ptr5( at_cprint ,alias_at_cprint,&__cprint,_QUOTE_ARGUMENTS,true);
-
-#if !defined GIAC_HAS_STO_38 && !defined NSPIRE && !defined FXCG && !defined POCKETCAS
-  int cpp_write_compile(const string & filename,const string & funcname,const string &s,GIAC_CONTEXT){
-    ofstream of(filename.c_str());
-#ifdef __APPLE__
-    of << "// -*- mode:c++; compile-command:\" c++ -Wall -fno-strict-aliasing -I/Applications/usr/include -I.. -I. -fPIC -DPIC -g -O2 -dynamiclib giac_" << funcname << ".cpp -o libgiac_" << funcname << ".dylib -L/Applications/usr/lib -L/Applications/usr/64/local/lib -lgiac \" -*-" << '\n';
-#else
-    of << "// -*- mode:c++; compile-command:\" c++ -Wall -fno-strict-aliasing -I.. -I. -fPIC -DPIC -g -O2 -c giac_" << funcname << ".cpp -o giac_" << funcname << ".lo && cc -shared giac_"<<funcname<<".lo -lgiac -lc -Wl,-soname -Wl,libgiac_"<<funcname<<"so.0 -o libgiac_"<<funcname<<".so.0.0.0 && ln -sf libgiac_"<<funcname<<".so.0.0.0 libgiac_"<<funcname<<".so\" -*-" << '\n';
-#endif
-    of << "#include <giac/config.h>" << '\n';
-    of << "#include <giac/giac.h>" << '\n';
-    of << "using namespace std;" << '\n';
-    of << "namespace giac {" << '\n';
-    of << "inline gen _sqrt(const gen & a,GIAC_CONTEXT){return sqrt(a,contextptr);}" << '\n';
-    of << "inline gen _arg(const gen & a,GIAC_CONTEXT){return arg(a,contextptr);}" << '\n';
-    of << "inline gen _complex(const gen & a,GIAC_CONTEXT){return _build_complex(a,contextptr);}" << '\n';
-    of << "inline gen operator *(const gen & a,double b){return b*a;}" << '\n';
-    of << "inline bool operator <= (const gen & a,const gen &b){ return is_greater(b,a,giac::context0); }\ninline bool operator >= (const gen & a,const gen &b){ return is_greater(a,b,giac::context0); }" <<'\n';
-    of << s << '\n';
-    of << "const string _"+funcname+"_s(\""+funcname+"\");" << '\n';
-    of << "unary_function_eval __"+funcname+"(0,&_"+funcname+",_"+funcname+"_s);" << '\n';
-    of << "unary_function_ptr at_"+funcname+"(&__"+funcname+",0,true);" << '\n';
-    of << "}" << '\n';
-    of.close();
-    *logptr(contextptr) << "File " << filename << " created." << '\n';
-    string cmd="indent -br -brf -l256 giac_"+funcname+".cpp"; int not_ok;
-#ifndef __APPLE__
-    *logptr(contextptr) << "Running " << cmd << '\n';
-    not_ok=system_no_deprecation(cmd.c_str());
-    if (not_ok)
-      *logptr(contextptr) << "Warning, indent not found, please install for nice output" << '\n';
-#endif
-#ifdef __APPLE__
-    cmd="g++ -Wall -fno-strict-aliasing -dynamiclib -I/Applications/usr/include -I.. -I. -fPIC -DPIC -g -O2 -dy giac_"+funcname+".cpp -o libgiac_"+funcname+".dylib -L/Applications/usr/lib -L/Applications/usr/64/local/lib -lgiac";
-#else
-    cmd="c++ -Wall -fno-strict-aliasing -I.. -I. -fPIC -DPIC -g -O2 -c giac_"+funcname+".cpp -o giac_"+funcname+".lo";
-#endif
-    *logptr(contextptr) << "Running\n" << cmd << '\n';
-    not_ok=system_no_deprecation(cmd.c_str());
-    if (not_ok){
-      *logptr(contextptr) << "Unable to compile, please fix cpp file" << '\n';
-      return -1;
-    }
-    //cmd="ln -sf giac_"+funcname+".lo giac_"+funcname+".o";
-    //*logptr(contextptr) << "Running " << cmd << '\n';
-    //not_ok=system_no_deprecation(cmd.c_str());
-#ifndef __APPLE__
-    cmd="cc -shared giac_"+funcname+".lo -lgiac -lc -Wl,-soname -Wl,libgiac_"+funcname+".so.0 -o libgiac_"+funcname+".so.0.0.0";
-    *logptr(contextptr) << cmd << '\n';
-    not_ok=system_no_deprecation(cmd.c_str());
-    if (not_ok){
-      *logptr(contextptr) << "Unable to create shared library, perhaps missing libraries?" << '\n';
-      return -2;
-    }
-    //cmd="ln -sf libgiac_"+funcname+".so.0.0.0 libgiac_"+funcname+".so.0";
-    //system_no_deprecation(cmd.c_str());
-    cmd="ln -sf libgiac_"+funcname+".so.0.0.0 libgiac_"+funcname+".so";
-    *logptr(contextptr) << cmd << '\n';
-    not_ok=system_no_deprecation(cmd.c_str());
-#endif
-    *logptr(contextptr) << "You can now run insmod(\"" << funcname << "\")" << '\n';
-    return 1;
-  }
-
-  // make a cpp translation file
-  gen _cpp(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen tmp=check_secure();
-    if (is_undef(tmp)) return tmp;
-    int x=xcas_mode(contextptr),l=language(contextptr),l0=language(context0),p=python_compat(contextptr);
-    if (args.type==_IDNT){
-      xcas_mode(0,contextptr);
-      language(2,contextptr);
-      language(2,context0);
-      python_compat(0,contextptr);
-      gen argnock=args.is_symb_of_sommet(at_deuxpoints)?args._SYMBptr->feuille[0]:args;
-      gen args_evaled=eval(argnock,1,contextptr);
-      //gen args_evaled=eval(args,1,contextptr);
-      string s=cprint(args_evaled,args,contextptr);
-      python_compat(p,contextptr);
-      language(l,contextptr);
-      language(l0,context0);
-      xcas_mode(x,contextptr);
-      string funcname=argnock.print(contextptr);
-      string filename="giac_"+funcname+".cpp";
-      return cpp_write_compile(filename,funcname,s,contextptr);
-    }
-    if (args.type!=_VECT || args.subtype!=_SEQ__VECT || args._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    xcas_mode(0,contextptr);
-    language(2,contextptr);
-    language(2,context0);
-    python_compat(0,contextptr);
-    vecteur allnames(*args._VECTptr);
-    for (int i=0;i<allnames.size();++i){
-      if (allnames[i].is_symb_of_sommet(at_deuxpoints))
-	allnames[i]=allnames[i]._SYMBptr->feuille[0];
-    }
-    gen arg,args_evaled,argnock;
-    string s;
-    for (int i=0;i<args._VECTptr->size();++i){
-      arg=(*args._VECTptr)[i];
-      argnock=allnames[i];
-      args_evaled=eval(argnock,1,contextptr);
-      if (args_evaled.is_symb_of_sommet(at_program))
-	s += cprint(args_evaled,arg,allnames,*args._VECTptr,contextptr);
-      else {
-	if (args_evaled.type==_DOUBLE_)
-	  s += "const double "+arg.print(contextptr)+"="+args_evaled.print(contextptr)+";";
-	else {
-	  if (args_evaled.type==_INT_)
-	    s += "const int "+arg.print(contextptr)+"="+args_evaled.print(contextptr)+";";
-	  else
-	    s += "const gen "+arg.print(contextptr)+"(\""+args_evaled.print(contextptr)+"\",context0);";
-	}
-      }
-    }
-    python_compat(p,contextptr);
-    language(l,contextptr);
-    language(l0,context0);
-    xcas_mode(x,contextptr);
-    string funcname=argnock.print(contextptr);
-    string filename="giac_"+funcname+".cpp";
-    return cpp_write_compile(filename,funcname,s,contextptr);
-    return 1;
-  }
-  static const char _cpp_s []="cpp";
-  static define_unary_function_eval_quoted (__cpp,&_cpp,_cpp_s);
-  define_unary_function_ptr5( at_cpp ,alias_at_cpp,&__cpp,_QUOTE_ARGUMENTS,true);
-#endif
-
-  gen _hexprint(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type == _INT_)
-      return string2gen(hexa_print_INT_(g.val), false);  
-    if (g.type == _ZINT)
-      return string2gen(hexa_print_ZINT(*g._ZINTptr), false);
-    return gentypeerr();
-  }
-  static const char _hexprint_s []="hexprint";
-  static define_unary_function_eval (__hexprint,&_hexprint,_hexprint_s);
-  define_unary_function_ptr5( at_hexprint ,alias_at_hexprint,&__hexprint,0,true);
-  static const char _giac_hex_s []="hex";
-  static define_unary_function_eval (__giac_hex,&_hexprint,_giac_hex_s);
-  define_unary_function_ptr5( at_giac_hex ,alias_at_giac_hex,&__giac_hex,0,true)  
-  gen _octprint(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type == _INT_)
-      return string2gen(octal_print_INT_(g.val), false);	
-    if (g.type == _ZINT)
-      return string2gen(octal_print_ZINT(*g._ZINTptr), false);
-    return gentypeerr();
-  }
-  static const char _octprint_s []="octprint";
-  static define_unary_function_eval (__octprint,&_octprint,_octprint_s);
-  define_unary_function_ptr5( at_octprint ,alias_at_octprint,&__octprint,0,true);
-  
-  gen _binprint(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type == _INT_)
-      return string2gen(binary_print_INT_(g.val), false);
-    if (g.type == _ZINT)
-      return string2gen(binary_print_ZINT(*g._ZINTptr), false);
-    return gentypeerr();
-  }
-  static const char _binprint_s[]="binprint";
-  static define_unary_function_eval(__binprint,&_binprint,_binprint_s);
-  define_unary_function_ptr5(at_binprint,alias_at_binprint,&__binprint,0,true);
-  // const unary_function_ptr at_binprint (&__binprint,0,true);
-
-  static const char _giac_bin_s []="bin";
-  static define_unary_function_eval (__giac_bin,&_binprint,_giac_bin_s);
-  define_unary_function_ptr5( at_giac_bin ,alias_at_giac_bin,&__giac_bin,0,true);
-
-#ifndef NO_NAMESPACE_GIAC
-} // namespace giac
-#endif // ndef NO_NAMESPACE_GIAC
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/misc.cc b/apps/KhiCAS/src/giac-1.6.0/src/misc.cc
index 4c9e8f7b9..0fd5b52f2 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/misc.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/misc.cc
@@ -2281,7 +2281,10 @@ namespace giac {
 
   gen _charpoly(const gen & args,GIAC_CONTEXT){
     string s;
-    if (is_graphe(args.subtype==_SEQ__VECT?args._VECTptr->front():args,s,contextptr))
+    gen arg0=args.type==_VECT && !args._VECTptr->empty() && args.subtype==_SEQ__VECT?args._VECTptr->front():args;
+    if (ckmatrix(arg0))
+      return _pcar(args,contextptr);
+    if (is_graphe(arg0,s,contextptr))
       return _graph_charpoly(args,contextptr);
     return _pcar(args,contextptr);
   }
@@ -6140,8 +6143,12 @@ static define_unary_function_eval (__hamdist,&_hamdist,_hamdist_s);
 		decimal_digits(nd,contextptr);
 		return pnt_attrib(gen(res,_GROUP__VECT),attributs,contextptr);
 	      } // end s==2
-	      if (s>=3)
-		v[2]=_floor(v[2],contextptr);
+	      if (s>=3){
+		if (v[2].type==_DOUBLE_ || v[2].type==_FRAC)
+		  v[2]=_floor((b-a)/v[2],contextptr);
+		else
+		  v[2]=_floor(v[2],contextptr);
+	      }
 	      if (s>=3 && v[2].type==_INT_){
 		int n=v[2].val;
 		if (n<1)
@@ -6557,7 +6564,7 @@ static define_unary_function_eval (__os_version,&_os_version,_os_version_s);
     if (args._STRNGptr->size()>8 && args._STRNGptr->substr(0,8)=="timeout "){
       string t=args._STRNGptr->substr(8,args._STRNGptr->size()-8);
       double f=atof(t.c_str());
-      if (f>=0 && f<24*60){
+      if (f>=0 && f<24*60*60){
 	caseval_maxtime=f;
 	caseval_n=0;
 	caseval_mod=10;
@@ -9277,6 +9284,11 @@ static define_unary_function_eval (__os_version,&_os_version,_os_version_s);
     giac::freeze=true;
   }
 
+  int rgb888to565(int c){
+    int r=(c>>16)&0xff,g=(c>>8)&0xff,b=c&0xff;
+    return (((r*32)/256)<<11) | (((g*64)/256)<<5) | (b*32/256);
+  }
+
   int rgb565to888(int c){
     c &= 0xffff;
     int r=(c>>11)&0x1f,g=(c>>5)&0x3f,b=c&0x1f;
@@ -9623,6 +9635,7 @@ void sync_screen(){}
   }
 
   void draw_polygon(vector< vector<int> > & v1,int color,GIAC_CONTEXT){
+    if (v1.empty()) return;
     if (!(v1.back()==v1.front()))
       v1.push_back(v1.front());
     int n=v1.size()-1;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/misc.cc~ b/apps/KhiCAS/src/giac-1.6.0/src/misc.cc~
deleted file mode 100755
index 11a601037..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/misc.cc~
+++ /dev/null
@@ -1,10549 +0,0 @@
-/* -*- mode:C++ ; compile-command: "g++ -I.. -I../include -DHAVE_CONFIG_H -DIN_GIAC -DGIAC_GENERIC_CONSTANTS -fno-strict-aliasing -g -c misc.cc -Wall" -*- */
-#include "giacPCH.h"
-/*
- *  Copyright (C) 2001, 2007 R. De Graeve, B. Parisse, Institut Fourier, 38402 St Martin d'Heres
- *
- *  This program 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-using namespace std;
-#ifdef HAVE_UNISTD_H
-#ifndef NUMWORKS
-#include <dirent.h>
-#endif
-#include <sys/stat.h>
-#include <sys/types.h>
-#endif
-#include <fstream>
-#include <string>
-#include "misc.h"
-#include "usual.h"
-#include "sym2poly.h"
-#include "rpn.h"
-#include "prog.h"
-#include "derive.h"
-#include "subst.h"
-#include "intg.h"
-#include "vecteur.h"
-#include "ifactor.h"
-#include "solve.h"
-#include "modpoly.h"
-#include "permu.h"
-#include "sym2poly.h"
-#include "plot.h"
-#include "lin.h"
-#include "modpoly.h"
-#include "desolve.h"
-#include "alg_ext.h"
-#include "input_parser.h"
-#include "input_lexer.h"
-#include "maple.h"
-#include "quater.h"
-#include "sparse.h"
-#include "giacintl.h"
-#if defined GIAC_HAS_STO_38 || defined NSPIRE || defined NSPIRE_NEWLIB || defined FXCG || defined GIAC_GGB || defined USE_GMP_REPLACEMENTS || defined KHICAS
-inline bool is_graphe(const giac::gen &g,std::string &disp_out,const giac::context *){ return false; }
-inline giac::gen _graph_charpoly(const giac::gen &g,const giac::context *){ return g;}
-#else
-#include "graphtheory.h"
-#endif
-
-#define GIAC_LMCHANGES 1 // changes by L. Marohnić // regression checks
-
-#ifdef KHICAS
-#include "kdisplay.h"
-const char * mp_hal_input(const char * prompt) ;
-#endif
-
-#ifdef HAVE_LIBCURL
-#include <curl/curl.h>
-#include <curl/easy.h>
-#endif
-
-#ifndef NO_NAMESPACE_GIAC
-namespace giac {
-#endif // ndef NO_NAMESPACE_GIAC
-
-  gen _scalar_product(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT || args._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    vecteur & v=*args._VECTptr;
-    return scalar_product(v[0],v[1],contextptr);
-  }    
-  static const char _scalar_product_s []="scalar_product";
-  static define_unary_function_eval (__scalar_product,&_scalar_product,_scalar_product_s);
-  define_unary_function_ptr5( at_scalar_product ,alias_at_scalar_product,&__scalar_product,0,true);
-
-  static const char _dot_s []="dot";
-  static define_unary_function_eval (__dot,&_scalar_product,_dot_s);
-  define_unary_function_ptr5( at_dot ,alias_at_dot,&__dot,0,true);
-
-  gen _compare(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT || args._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    vecteur & v=*args._VECTptr;
-    return v[0].islesscomplexthan(v[1]);
-  }    
-  static const char _compare_s []="compare";
-  static define_unary_function_eval (__compare,&_compare,_compare_s);
-  define_unary_function_ptr5( at_compare ,alias_at_compare,&__compare,0,true);
-
-  gen _preval(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return symbolic(at_preval,args);
-    vecteur & v=*args._VECTptr;
-    int s=int(v.size());
-    if (s<3)
-      return gentoofewargs("");
-    gen f(v[0]),x,a,b;
-    a=v[1];
-    b=v[2];
-    if (s==3){
-      x=vx_var;
-      if (a.is_symb_of_sommet(at_equal)){
-	x=a._SYMBptr->feuille[0];
-	a=a._SYMBptr->feuille[1];
-	if (b.is_symb_of_sommet(at_equal))
-	  b=b._SYMBptr->feuille[1];
-      }
-    }
-    else 
-      x=v[3];
-    if (x.type!=_IDNT)
-      return gentypeerr(contextptr);
-    return preval(f,x,a,b,contextptr);
-  }    
-  static const char _preval_s []="preval";
-  static define_unary_function_eval (__preval,&_preval,_preval_s);
-  define_unary_function_ptr5( at_preval ,alias_at_preval,&__preval,0,true);
-
-  // return suitable gen for interpolation
-  // if possible return j, if j is too large, return a GF element
-  gen interpolate_xi(int j,const gen &coeff){
-    if (coeff.type==_MOD){
-    }
-    if (coeff.type!=_USER)
-      return j;
-#ifndef NO_RTTI
-    if (galois_field * gf=dynamic_cast<galois_field *>(coeff._USERptr)){
-      if (j<gf->p.val)
-	return j;
-      galois_field g(*gf); // copy
-      g.a=_revlist(_convert(makesequence(j,change_subtype(_BASE,_INT_MAPLECONVERSION),gf->p),context0),context0);
-      return g;
-    }
-#endif
-    return j;
-  }
-  // characteristic must be large enough to interpolate the resultant
-  // d1+1 evaluations + there is a probab. of 2/p of bad evaluation
-  // (d1+1)*p/(p-2)<p -> p>d1+3 + we add some more for safety
-  // on Galois fields comparison should be (d+1)*p/(p-2)<p^m
-  // assuming interpolation is done with all fields elements
-  bool interpolable_resultant(const polynome & P,int d1,gen & coefft,bool extend,GIAC_CONTEXT){
-    int tt=coefft.type;
-    if (tt!=_USER)
-      tt=coefftype(P,coefft);
-    return interpolable(d1,coefft,extend,contextptr);
-  }
-
-  bool interpolable(int d1,gen & coefft,bool extend,GIAC_CONTEXT){
-    int tt=coefft.type;
-    if (tt==_USER){
-#ifndef NO_RTTI
-      if (galois_field * gf=dynamic_cast<galois_field *>(coefft._USERptr)){
-	gen m=gf->p;
-	if (!is_integer(m))
-	  return false;
-	return is_greater(pow(m,gf->P._VECTptr->size()-1,contextptr),d1+20,contextptr);
-      }
-      return true;
-#endif
-    }
-    if (tt==_MOD){
-      gen m=*(coefft._MODptr+1);
-      if (!is_integer(m))
-	return false;
-      if (is_greater(m,d1+20,contextptr))
-	return true;
-      if (!extend || !_isprime(m,contextptr).val)
-	return false;
-      // build a suitable field extension...
-      int n=int(std::ceil(std::log(d1+20.0)/std::log(evalf_double(m,1,contextptr)._DOUBLE_val)));
-#ifdef NO_RTTI
-      return false;
-#else
-      coefft=_galois_field(makesequence(m,n),contextptr);
-      return true;
-#endif
-    }
-    return true;
-  }
-  vecteur divided_differences(const vecteur & x,const vecteur & y){
-    vecteur res(y);
-    int s=int(x.size());
-    for (int k=1;k<s;++k){
-      for (int j=s-1;j>=k;--j){
-	res[j]=(res[j]-res[j-1])/(x[j]-x[j-k]);
-      }
-      //CERR << k << res << '\n';
-    }
-    return res;
-  }
-  gen _lagrange(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return symbolic(at_lagrange,args);
-    vecteur & v=*args._VECTptr;
-    int s=int(v.size());
-    if (s<2)
-      return gentoofewargs("");
-    gen v0(v[0]),v1(v[1]),x=vx_var;
-    if (ckmatrix(v0) && v0._VECTptr->size()==2){
-      x=v1;
-      v1=v0._VECTptr->back();
-      v0=v0._VECTptr->front();
-    }
-    if (s>=3)
-      x=v[2];
-    if (v0.type!=_VECT && v1.type==_VECT){
-      gen tmp=v1;
-      v1=_apply(makesequence(v0,v1),contextptr);
-      v0=tmp;
-    }
-    if (v1.type!=_VECT && v0.type==_VECT)
-      v1=_apply(makesequence(v1,v0),contextptr);
-    if ( (v0.type!=_VECT) || (v1.type!=_VECT) )
-      return gensizeerr(contextptr);
-    vecteur & vx =*v0._VECTptr;
-    vecteur & vy=*v1._VECTptr;
-    s=int(vx.size());
-    if (!s || vy.size()!=unsigned(s))
-      return gendimerr(contextptr);
-    // Using divided difference instead of the theoretical formula
-    if (x.type==_VECT && x._VECTptr->empty()){
-      vecteur res;
-      interpolate(vx,vy,res,0);
-      return res;
-    }
-    vecteur w=divided_differences(vx,vy);
-    if (x==at_lagrange)
-      return w;
-    gen pi(1),res(w[s-1]);
-    for (int i=s-2;i>=0;--i){
-      res = res*(x-vx[i])+w[i];
-      if (i%100==99) // otherwise segfault 
-	res=ratnormal(res,contextptr);
-    }
-    return res;
-    /*
-    gen res(zero);
-    for (int i=0;i<s;++i){
-      gen pix(plus_one),pix0(plus_one),x0(vx[i]);
-      for (int j=0;j<s;++j){
-	if (j==i)
-	  continue;
-	pix=pix*(x-vx[j]);
-	pix0=pix0*(x0-vx[j]);
-      }
-      res=res+vy[i]*rdiv(pix,pix0);
-    }
-    return res;
-    */
-  }    
-  static const char _lagrange_s []="lagrange";
-  static define_unary_function_eval (__lagrange,&_lagrange,_lagrange_s);
-  define_unary_function_ptr5( at_lagrange ,alias_at_lagrange,&__lagrange,0,true);
-
-  gen _reorder(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return symbolic(at_reorder,args);
-    vecteur & v=*args._VECTptr;
-    int s=int(v.size());
-    if (s<2)
-      return gentoofewargs("");
-    gen e(v[0]),l(v[1]);
-    if (e.type<=_POLY) return e;
-    if (l.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur w(*l._VECTptr);
-    lvar(e,w);
-    e=e2r(e,w,contextptr);
-    return r2e(e,w,contextptr);
-  }    
-  static const char _reorder_s []="reorder";
-  static define_unary_function_eval (__reorder,&_reorder,_reorder_s);
-  define_unary_function_ptr5( at_reorder ,alias_at_reorder,&__reorder,0,true);
-
-  gen _adjoint_matrix(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return symbolic(at_adjoint_matrix,args);
-    matrice mr(*args._VECTptr);
-    if (!is_squarematrix(mr))
-      return gensizeerr(contextptr);
-    matrice m_adj;
-    vecteur p_car;
-    p_car=mpcar(mr,m_adj,true,true,contextptr);
-    return makevecteur(p_car,m_adj);
-  }    
-  static const char _adjoint_matrix_s []="adjoint_matrix";
-  static define_unary_function_eval (__adjoint_matrix,&_adjoint_matrix,_adjoint_matrix_s);
-  define_unary_function_ptr5( at_adjoint_matrix ,alias_at_adjoint_matrix,&__adjoint_matrix,0,true);
-
-  gen _equal2diff(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return apply(args,equal2diff);
-  }    
-  static const char _equal2diff_s []="equal2diff";
-  static define_unary_function_eval (__equal2diff,&_equal2diff,_equal2diff_s);
-  define_unary_function_ptr5( at_equal2diff ,alias_at_equal2diff,&__equal2diff,0,true);
-
-  static gen equal2list(const gen & arg){
-    if ( !is_equal(arg))
-      return makevecteur(arg,zero);
-    return arg._SYMBptr->feuille;
-  }
-  gen _equal2list(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return apply(args,equal2list);
-  }    
-  static const char _equal2list_s []="equal2list";
-  static define_unary_function_eval (__equal2list,&_equal2list,_equal2list_s);
-  define_unary_function_ptr5( at_equal2list ,alias_at_equal2list,&__equal2list,0,true);
-
-  gen _rank(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return gentypeerr(contextptr); // return symbolic(at_adjoint_matrix,args);
-    matrice mr(*args._VECTptr);
-    if (!ckmatrix(mr))
-      return gensizeerr(contextptr);
-    mr=mrref(mr,contextptr);
-    int r=int(mr.size());
-    for (;r;--r){
-      if (!is_zero(mr[r-1]))
-	break;
-    }
-    return r;
-  }    
-  static const char _rank_s []="rank";
-  static define_unary_function_eval (__rank,&_rank,_rank_s);
-  define_unary_function_ptr5( at_rank ,alias_at_rank,&__rank,0,true);
-
-  gen _sec(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return inv(cos(args,contextptr),contextptr);
-  }    
-  static const char _sec_s []="sec";
-  static define_unary_function_eval (__sec,&_sec,_sec_s);
-  define_unary_function_ptr5( at_sec ,alias_at_sec,&__sec,0,true);
-
-  gen _csc(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return inv(sin(args,contextptr),contextptr);
-  }    
-  static const char _csc_s []="csc";
-  static define_unary_function_eval (__csc,&_csc,_csc_s);
-  define_unary_function_ptr5( at_csc ,alias_at_csc,&__csc,0,true);
-
-  gen _cot(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return rdiv(cos(args,contextptr),sin(args,contextptr),contextptr);
-  }    
-  static const char _cot_s []="cot";
-  static define_unary_function_eval (__cot,&_cot,_cot_s);
-  define_unary_function_ptr5( at_cot ,alias_at_cot,&__cot,0,true);
-
-  gen _asec(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return acos(inv(args,contextptr),contextptr);
-  }    
-  static const char _asec_s []="asec";
-  static define_unary_function_eval (__asec,&_asec,_asec_s);
-  define_unary_function_ptr5( at_asec ,alias_at_asec,&__asec,0,true);
-
-  static const char _arcsec_s []="arcsec";
-  static define_unary_function_eval (__arcsec,&_asec,_arcsec_s);
-  define_unary_function_ptr5( at_arcsec ,alias_at_arcsec,&__arcsec,0,true);
-
-  gen _acsc(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return asin(inv(args,contextptr),contextptr);
-  }    
-  static const char _acsc_s []="acsc";
-  static define_unary_function_eval (__acsc,&_acsc,_acsc_s);
-  define_unary_function_ptr5( at_acsc ,alias_at_acsc,&__acsc,0,true);
-
-  static const char _arccsc_s []="arccsc";
-  static define_unary_function_eval (__arccsc,&_acsc,_arccsc_s);
-  define_unary_function_ptr5( at_arccsc ,alias_at_arccsc,&__arccsc,0,true);
-
-  gen _acot(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (is_zero(args))
-      //grad
-      return angle_radian(contextptr)?cst_pi_over_2:(angle_degree(contextptr)?90:100);
-#if 0
-    if (abs_calc_mode(contextptr)==38)
-      return cst_pi_over_2-atan(args,contextptr);
-#endif
-    return atan(inv(args,contextptr),contextptr);
-  }    
-  static const char _acot_s []="acot";
-  static define_unary_function_eval (__acot,&_acot,_acot_s);
-  define_unary_function_ptr5( at_acot ,alias_at_acot,&__acot,0,true);
-
-  static const char _arccot_s []="arccot";
-  static define_unary_function_eval (__arccot,&_acot,_arccot_s);
-  define_unary_function_ptr5( at_arccot ,alias_at_arccot,&__arccot,0,true);
-
-  // args=[u'*v,v] or [[F,u'*v],v] -> [F+u*v,-u*v']
-  // a third argument would be the integration var
-  // if v=0 returns F+integrate(u'*v,x)
-  gen _ibpu(const gen & args,GIAC_CONTEXT) {
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if ( (args.type!=_VECT) || (args._VECTptr->size()<2) )
-      return symbolic(at_ibpu,args);
-    vecteur & w=*args._VECTptr;
-    gen X(vx_var),x(vx_var),a,b;
-    bool bound=false;
-    if (w.size()>=3)
-      x=X=w[2];
-    if (is_equal(x))
-      x=x._SYMBptr->feuille[0];
-    if (w.size()>=5)
-      X=symb_equal(x,symb_interval(w[3],w[4]));
-    if (is_equal(X) && X._SYMBptr->feuille[1].is_symb_of_sommet(at_interval)){
-      a=X._SYMBptr->feuille[1]._SYMBptr->feuille[0];
-      b=X._SYMBptr->feuille[1]._SYMBptr->feuille[1];
-      bound=true;
-    }
-    gen u,v(w[1]),uprimev,F;
-    if (w.front().type==_VECT){
-      vecteur & ww=*w.front()._VECTptr;
-      if (ww.size()!=2)
-	return gensizeerr(contextptr);
-      F=ww.front();
-      uprimev=ww.back();
-    }
-    else 
-      uprimev=w.front();
-    if (is_zero(v) || is_one(v)){
-      gen tmp=integrate_gen(uprimev,x,contextptr);
-      if (is_undef(tmp)) return tmp;
-      if (bound)
-	tmp=preval(tmp,x,a,b,contextptr);
-      return tmp+F;
-    }
-    gen uprime(normal(rdiv(uprimev,v,contextptr),contextptr));
-    u=integrate_gen(uprime,x,contextptr);
-    if (is_undef(u)) return u;
-    if (bound)
-      F += preval(u*v,x,a,b,contextptr);
-    else
-      F += u*v;      
-    return makevecteur(F,normal(-u*derive(v,x,contextptr),contextptr));
-  }
-  static const char _ibpu_s []="ibpu";
-  static define_unary_function_eval (__ibpu,&_ibpu,_ibpu_s);
-  define_unary_function_ptr5( at_ibpu ,alias_at_ibpu,&__ibpu,0,true);
-
-  gen _changebase(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return symbolic(at_changebase,args);
-    vecteur & v=*args._VECTptr;
-    if (v.size()!=2)
-      return gentypeerr(contextptr);
-    gen a=v.front(),p=v.back();
-    if (!is_squarematrix(p))
-      return gensizeerr(contextptr);
-    return minv(*p._VECTptr,contextptr)*a*p;
-  }    
-  static const char _changebase_s []="changebase";
-  static define_unary_function_eval (__changebase,&_changebase,_changebase_s);
-  define_unary_function_ptr5( at_changebase ,alias_at_changebase,&__changebase,0,true);
-
-  static gen epsilon2zero(const gen & g,GIAC_CONTEXT){
-    switch (g.type){
-    case _DOUBLE_:
-      if (fabs(g._DOUBLE_val)<epsilon(contextptr))
-	return zero;
-      else
-	return g;
-    case _CPLX:
-      return epsilon2zero(re(g,contextptr),contextptr)+cst_i*epsilon2zero(im(g,contextptr),contextptr);
-    case _SYMB:
-      return symbolic(g._SYMBptr->sommet,epsilon2zero(g._SYMBptr->feuille,contextptr));
-    case _VECT:
-      return apply(g,epsilon2zero,contextptr);
-    default:
-      return g;
-    }
-  }
-  gen _epsilon2zero(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type==_VECT && args.subtype==_SEQ__VECT && args._VECTptr->size()==2){
-      gen p=evalf_double(args._VECTptr->back(),1,contextptr);
-      if (p.type==_DOUBLE_ && p._DOUBLE_val>0){
-	double eps=epsilon(contextptr);
-	epsilon(p._DOUBLE_val,contextptr);
-	gen res=epsilon2zero(args._VECTptr->front(),contextptr);
-	epsilon(eps,contextptr);
-	return res;
-      }
-    }
-    return epsilon2zero(args,contextptr);
-  }    
-  static const char _epsilon2zero_s []="epsilon2zero";
-  static define_unary_function_eval (__epsilon2zero,&_epsilon2zero,_epsilon2zero_s);
-  define_unary_function_ptr5( at_epsilon2zero ,alias_at_epsilon2zero,&__epsilon2zero,0,true);
-
-  gen _suppress(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return symbolic(at_suppress,args);
-    vecteur & v=*args._VECTptr;
-    if (v.size()==3 && v[1].type==_INT_ && v[2].type==_INT_){
-      int i1=v[1].val-array_start(contextptr); //(xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38);
-      int i2=v[2].val-array_start(contextptr); //(xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38);
-      if (i1 >i2 || i1<0 || i2 < 0)
-	return gendimerr(contextptr);
-      if (v[0].type==_VECT){
-	vecteur w=*v[0]._VECTptr;
-	if (i1>=int(w.size()) || i2>=int(w.size()))
-	  return gendimerr(contextptr);
-	return gen(mergevecteur(vecteur(w.begin(),w.begin()+i1),vecteur(w.begin()+i2+1,w.end())),v[0].subtype);
-      }
-      if (v[0].type==_STRNG){
-	string s=*v[0]._STRNGptr;
-	if (i1>=int(s.size()) || i2>=int(s.size()))
-	  return gendimerr(contextptr);
-	return string2gen(s.substr(0,i1)+s.substr(i2+1,s.size()-i2-1),false);
-      }
-      return gensizeerr(contextptr);
-    }
-    if (v.size()!=2)
-      return gentypeerr(contextptr);
-    gen l=v.front(),i=v.back();
-    if (i.is_symb_of_sommet(at_deuxpoints))
-      return _suppress(makesequence(l,i[1],i[2]-1),contextptr);
-    if (i.is_symb_of_sommet(at_interval))
-      return _suppress(makesequence(l,i[1],i[2]),contextptr);
-    int ii=0;
-    if (i.type==_VECT){
-      i=sortad(*i._VECTptr,false,contextptr);
-      if (i.type==_VECT){
-	const_iterateur it=i._VECTptr->begin(),itend=i._VECTptr->end();
-	for (;it!=itend;++it){
-	  l=_suppress(makesequence(l,*it),contextptr);
-	}
-	return l;
-      }
-    }
-    if (i.type==_INT_ )
-      ii=i.val-array_start(contextptr); //(xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38);
-    if (l.type==_STRNG){
-      string res;
-      string & s=*l._STRNGptr;
-      int n=int(s.size());
-      if (i.type==_INT_ && ii>=0 && ii<n)
-	res=s.substr(0,ii)+s.substr(ii+1,n-ii-1);
-      if (i.type==_STRNG){
-	string & remove=*i._STRNGptr;
-	int removen=int(remove.size());
-	for (int j=0;j<n;++j){
-	  int k=int(remove.find(s[j]));
-	  if (k<0 || k>=removen)
-	    res += s[j];
-	}
-      }
-      return string2gen(res,false);
-    }
-    if ( (l.type!=_VECT) || (i.type!=_INT_) )
-      return gensizeerr(contextptr);
-    const_iterateur it=l._VECTptr->begin(),itend=l._VECTptr->end();
-    vecteur res;
-    res.reserve(itend-it);
-    for (int j=0;it!=itend;++it,++j){
-      if (j!=ii)
-	res.push_back(*it);
-    }
-    return gen(res,l.subtype);
-  }    
-  static const char _suppress_s []="suppress";
-  static define_unary_function_eval (__suppress,&_suppress,_suppress_s);
-  define_unary_function_ptr5( at_suppress ,alias_at_suppress,&__suppress,0,true);
-
-  void adjust_pixels_dim(const vecteur & V,int & I,int &J){
-    const_iterateur it=V.begin(),itend=V.end();
-    for (;it!=itend;++it){
-      gen g=remove_at_pnt(*it);
-      if (g.is_symb_of_sommet(at_pixon) && g._SYMBptr->feuille.type==_VECT){
-	vecteur &v=*g._SYMBptr->feuille._VECTptr;
-	if (v[0].type!=_INT_ || v[1].type!=_INT_)
-	  continue;
-	int psx=0,psy=0;
-	if (v.size()>3 && v[3].type==_INT_){
-	  if (v[3].val>0) psy=v[3].val; else psx=-v[3].val;
-	}
-	if (I<v[0].val+psx)
-	  I=v[0].val+psx;
-	if (J<v[1].val+psy)
-	  J=v[1].val+psy;
-      }
-    }
-    ++I; ++J;
-  }
-
-  void cleanup_pixels(vecteur & V){
-    V=merge_pixon(V);
-    // find dimensions
-    int I=screen_w,J=screen_h;
-    adjust_pixels_dim(V,I,J);
-    vector<bool> used(I*J);
-    for (int i=screen_w;i<I;++i){
-      for (int j=screen_h;j<J;++j)
-	used[i*J+j]=true;
-    }
-    vecteur W;
-    iterateur it=V.end(),itend=V.begin();
-    for (--it;it>=itend;--it){
-      W.push_back(*it);
-      gen g=remove_at_pnt(*it);
-      if (g.is_symb_of_sommet(at_pixon) && g._SYMBptr->feuille.type==_VECT){
-	vecteur &v=*g._SYMBptr->feuille._VECTptr;
-	if (v[0].type!=_INT_ || v[1].type!=_INT_)
-	  continue;
-	int psx=0,psy=0;
-	if (v.size()>3 && v[3].type==_INT_){
-	  if (v[3].val>0) psy=v[3].val; else psx=-v[3].val;
-	}
-	// look if pixels are already in use
-	int di=v[0].val,dj=v[1].val,i,j;
-	for (i=giacmax(di,0);i<=di+psx;++i){
-	  for (j=giacmax(dj,0);j<=dj+psy;++j){
-	    bool b=used[i*J+j];
-	    if (!b)
-	      break;
-	  }
-	  if (j<=dj+psy)
-	    break;
-	}
-	if (i>di+psx) // all pixels were already used, clean up this pixel
-	  W.pop_back();
-	else {
-	  // mark pixels
-	  for (i=giacmax(di,0);i<=di+psx;++i){
-	    for (j=giacmax(dj,0);j<=dj+psy;++j){
-	      used[i*J+j]=true;
-	    }
-	  }
-	}
-      }
-    }
-    reverse(W.begin(),W.end());
-    V.swap(W);
-  }
-
-#if defined GIAC_HAS_STO_38 || defined FXCG || defined NSPIRE
-  const int pixel_lines=1; // 320; // calculator screen 307K
-  const int pixel_cols=1; // 240;
-#else
-#ifdef KHICAS
-  const int pixel_lines=320;
-  const int pixel_cols=240;
-#else
-  const int pixel_lines=1024;
-  const int pixel_cols=768;
-#endif
-#endif
-#ifdef KHICAS
-  void clear_pixel_buffer(){
-  }
-  vecteur get_pixel_v(){
-    return vecteur(0);
-  }
-#else
-  int pixel_buffer[pixel_lines][pixel_cols]; 
-  void clear_pixel_buffer(){
-    for (int i=0;i<pixel_lines;++i){
-      int * ptr=pixel_buffer[i];
-      int * ptrend = ptr+pixel_cols;
-      for (;ptr<ptrend;++ptr){
-	*ptr=int(FL_WHITE);
-      }
-    }
-  }
-
-  static gen & pixel_v(){
-    static gen * ptr=0;
-    if (ptr==0){
-      clear_pixel_buffer();
-      ptr=new gen(makevecteur(0));
-    }
-    return *ptr;
-  }
-
-  vecteur get_pixel_v(){
-    return *pixel_v()._VECTptr;
-  }
-
-  void pixel_v_clear(){
-    pixel_v()._VECTptr->clear();
-  }
-
-  void cleanup_pixel_v(){
-    cleanup_pixels(*pixel_v()._VECTptr);
-  }
-  void pixel_v_push_back(const gen & b){
-    pixel_v()._VECTptr->push_back(b);
-  }
-#endif
-  gen _clear(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type==_VECT && args._VECTptr->empty()){
-#ifdef KHICAS
-      os_fill_rect(0,0,pixel_lines,pixel_cols,_WHITE);
-#else // KHICAS
-#ifdef GIAC_HAS_STO_38
-      static gen RECT_P(identificateur("RECT_P"));
-      _of(makesequence(RECT_P,args),contextptr);
-#else
-      clear_pixel_buffer();
-#endif // else HP
-      pixel_v_clear();
-      history_plot(contextptr).clear();
-#endif // else KHICAS
-      return 1;
-    }
-    gen g=eval(args,1,contextptr);
-    if (g.type==_STRNG) 
-      g=string2gen("",false);
-    else {
-      if (g.type!=_VECT)
-	return gensizeerr(contextptr);
-      g=gen(vecteur(0),args.subtype);
-    }
-    if (args.type==_STRNG || args.type==_VECT)
-      return g;
-    return sto(g,args,contextptr);
-  }
-  static const char _clear_s []="clear";
-  static define_unary_function_eval_quoted (__clear,&_clear,_clear_s);
-  define_unary_function_ptr5( at_clear ,alias_at_clear,&__clear,_QUOTE_ARGUMENTS,true);
-
-#ifdef KHICAS
-  gen _show_pixels(const gen & args,GIAC_CONTEXT){
-    return undef;
-  }
-#else
-  gen _show_pixels(const gen & args,GIAC_CONTEXT){
-#ifdef GIAC_HAS_STO_38
-    static gen FREEZE(identificateur("FREEZE"));
-    return _of(makesequence(FREEZE,args),contextptr);
-#else
-#if defined(EMCC) || defined(EMCC2)
-    return get_pixel_v();
-#else
-    return makesequence(symb_equal(change_subtype(_AXES,_INT_PLOT),0),get_pixel_v());
-#endif // EMCC
-#endif // STO_38
-  }
-#endif // KHICAS
-  static const char _show_pixels_s []="show_pixels";
-  static define_unary_function_eval (__show_pixels,&_show_pixels,_show_pixels_s);
-  define_unary_function_ptr5( at_show_pixels ,alias_at_show_pixels,&__show_pixels,0,true);
-
-  gen _show(const gen & args,GIAC_CONTEXT){
-    return history_plot(contextptr);
-  }
-  static const char _show_s []="show";
-  static define_unary_function_eval (__show,&_show,_show_s);
-  define_unary_function_ptr5( at_show ,alias_at_show,&__show,0,true);
-
-  gen _insert(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur & v=*args._VECTptr;
-    if (v.size()!=3)
-      return gensizeerr(contextptr);
-    gen i=v[1];
-    if (!is_integral(i) || i.type!=_INT_) 
-      return gensizeerr(contextptr);
-    int ii=i.val-array_start(contextptr); //(xcas_mode(contextptr)!=0 || abs_calc_mode(contextptr)==38);
-    if (v[0].type==_VECT){
-      vecteur w=*v[0]._VECTptr;
-      if (ii<0 || ii>int(w.size()))
-	return gendimerr(contextptr);
-      w.insert(w.begin()+ii,v[2]);
-      return gen(w,v[0].subtype);
-    }
-    if (v[0].type==_STRNG){
-      string s=*v[0]._STRNGptr;
-      if (ii<0 || ii>int(s.size()))
-	return gendimerr(contextptr);
-      string add=(v[2].type==_STRNG)?*v[2]._STRNGptr:v[2].print(contextptr);
-      s=s.substr(0,ii)+add+s.substr(ii,s.size()-ii);
-      return string2gen(s,false);
-    }
-    return gensizeerr(contextptr);
-  }    
-  static const char _insert_s []="insert";
-  static define_unary_function_eval (__insert,&_insert,_insert_s);
-  define_unary_function_ptr5( at_insert ,alias_at_insert,&__insert,0,true);
-
-  gen _pop(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type==_VECT && args.subtype==_SEQ__VECT && args._VECTptr->size()==2 ){
-      if (args._VECTptr->front().type==_MAP){
-	const gen & m=args._VECTptr->front();
-	const gen & indice=args._VECTptr->back();
-	gen_map::iterator it=m._MAPptr->find(indice),itend=m._MAPptr->end();
-	if (it==itend)
-	  return gensizeerr(gettext("Bad index")+indice.print(contextptr));
-	m._MAPptr->erase(it);
-	return 1;
-      }
-      if (args._VECTptr->back().type==_INT_){
-	int pos=args._VECTptr->back().val;
-	gen g=args._VECTptr->front();
-	if (pos>=0 && g.type==_VECT && g._VECTptr->size()>pos){
-	  gen res=(*g._VECTptr)[pos];
-	  g._VECTptr->erase(g._VECTptr->begin()+pos);
-	  return res;
-	}
-      }
-    }
-    if (args.type!=_VECT || args._VECTptr->empty()) 
-      return gensizeerr(contextptr);
-    gen res=args._VECTptr->back();
-    args._VECTptr->pop_back();
-    return res;
-  }
-  static const char _pop_s []="pop";
-  static define_unary_function_eval (__pop,&_pop,_pop_s);
-  define_unary_function_ptr5( at_pop ,alias_at_pop,&__pop,0,true);
-
-  static int valuation(const polynome & p){
-    if (p.coord.empty())
-      return -1;
-    return p.coord.back().index.front();
-  }
-  gen _valuation(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen p,x;
-    if (args.type!=_VECT){
-      x=vx_var;
-      p=args;
-    }
-    else {
-      vecteur & v=*args._VECTptr;
-      int s=int(v.size());
-      if (!s)
-	return minus_inf;
-      if (s==2 && is_integer(v[0]) && is_integer(v[1])){
-	if (is_zero(v[0]))
-	  return plus_inf;
-	mpz_t a,b,q,r;
-	mpz_init(q); mpz_init(r);
-	if (v[0].type==_INT_)
-	  mpz_init_set_si(a,v[0].val);
-	else
-	  mpz_init_set(a,*v[0]._ZINTptr);
-	if (v[1].type==_INT_)
-	  mpz_init_set_si(b,v[1].val);
-	else
-	  mpz_init_set(b,*v[1]._ZINTptr);
-	int res=0;
-	for (;;++res){
-	  mpz_fdiv_qr(q,r,a,b);
-	  if (mpz_cmp_si(r,0)!=0){
-	    mpz_clear(r); mpz_clear(q); mpz_clear(a); mpz_clear(b);
-	    return res;
-	  }
-	  mpz_set(a,q);
-	}
-      }
-      if ( (args.subtype==_POLY1__VECT) || (s!=2) || (v[1].type!=_IDNT) ){
-	int j=s;
-	for (;j;--j){
-	  if (!is_zero(v[j-1]))
-	    break;
-	}
-	return s-j;
-      }
-      x=v.back();
-      p=v.front();
-    }
-    vecteur lv(1,x);
-    lvar(p,lv);
-    gen aa=e2r(p,lv,contextptr),aan,aad;
-    if (is_zero(aa))
-      return minus_inf;
-    fxnd(aa,aan,aad);
-    if ( (aad.type==_POLY) && (aad._POLYptr->lexsorted_degree() ) )
-      return gensizeerr(contextptr);
-    if (aan.type!=_POLY)
-      return zero;
-    int res=valuation(*aan._POLYptr);
-    if (res==-1)
-      return minus_inf;
-    else
-      return res;
-  }    
-  static const char _valuation_s []="valuation";
-  static define_unary_function_eval (__valuation,&_valuation,_valuation_s);
-  define_unary_function_ptr5( at_valuation ,alias_at_valuation,&__valuation,0,true);
-
-  static const char _ldegree_s []="ldegree";
-  static define_unary_function_eval (__ldegree,&_valuation,_ldegree_s);
-  define_unary_function_ptr5( at_ldegree ,alias_at_ldegree,&__ldegree,0,true);
-
-  int sum_degree(const index_m & v1,int vars){
-    int i=0;
-    for (index_t::const_iterator it=v1.begin();it!=v1.end() && it!=v1.begin()+vars;++it)
-      i=i+(*it);
-    return(i);
-  }
-
-  int total_degree(const polynome & p,int vars) {
-    std::vector< monomial<gen> >::const_iterator it=p.coord.begin();
-    std::vector< monomial<gen> >::const_iterator it_end=p.coord.end();
-    int res=0;
-    for (;it!=it_end;++it){
-      int temp=sum_degree(it->index,vars);
-      if (res<temp)
-	res=temp;
-    }
-    return res;
-  }
-
-
-  gen _degree_(const gen & args,bool total,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen p,x;
-    if (args.type!=_VECT){
-      p=args;
-      if (calc_mode(contextptr)==1)
-	x=ggb_var(p);
-      else
-	x=vx_var;
-    }
-    else {
-      vecteur & v=*args._VECTptr;
-      int s=int(v.size());
-      if ( (args.subtype==_POLY1__VECT) || (s!=2) || (v[1].type!=_IDNT && v[1].type!=_VECT) )
-	return s-1;
-      x=v.back();
-      p=v.front();
-    }
-    if (p.type==_POLY){
-      if (x.type==_INT_ && x.val>=0 && x.val<p._POLYptr->dim)
-	return p._POLYptr->degree(x.val);
-      else {
-	vecteur res(p._POLYptr->dim);
-	index_t idx(p._POLYptr->degree());
-	for (int i=0;i<p._POLYptr->dim;++i)
-	  res[i]=idx[i];
-	return res;
-      }
-    }
-    vecteur lv(1,x);
-    if (x.type==_VECT)
-      lv=*x._VECTptr;
-    lvar(p,lv);
-    gen aa=e2r(p,lv,contextptr),aan,aad;
-    if (is_zero(aa))
-      return zero;
-    fxnd(aa,aan,aad);
-    if (x.type==_VECT){
-      if (total){
-	int deg=0;
-	if (aad.type==_POLY)
-	  deg -= total_degree(*aad._POLYptr,int(x._VECTptr->size()));
-	if (aan.type==_POLY)
-	  deg += total_degree(*aan._POLYptr,int(x._VECTptr->size()));
-	return deg;
-      }
-      int s=int(x._VECTptr->size());
-      vecteur res(s);
-      for (int i=0;i<s;++i){
-	int deg=0;
-	if (aad.type==_POLY)
-	  deg -= aad._POLYptr->degree(i);;
-	if (aan.type!=_POLY)
-	  res[i]=deg;
-	else
-	  res[i]=deg+aan._POLYptr->degree(i);
-      }
-      return res;
-    }
-    int deg=0;
-    if ( (aad.type==_POLY) && (aad._POLYptr->lexsorted_degree() ) )
-      deg -= aad._POLYptr->lexsorted_degree();;
-    if (aan.type!=_POLY)
-      return deg;
-    return deg+aan._POLYptr->lexsorted_degree();
-  }    
-  gen _degree(const gen & args,GIAC_CONTEXT){
-    return _degree_(args,false,contextptr);
-  }
-  static const char _degree_s []="degree";
-  static define_unary_function_eval (__degree,&_degree,_degree_s);
-  define_unary_function_ptr5( at_degree ,alias_at_degree,&__degree,0,true);
-
-  gen _total_degree(const gen & args,GIAC_CONTEXT){
-    return _degree_(args,true,contextptr);
-  }
-  static const char _total_degree_s []="total_degree";
-  static define_unary_function_eval (__total_degree,&_total_degree,_total_degree_s);
-  define_unary_function_ptr5( at_total_degree ,alias_at_total_degree,&__total_degree,0,true);
-
-  gen _lcoeff(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen x,p,order;
-    int s=2;
-    if (args.type!=_VECT){
-      x=vx_var;
-      p=args;
-    }
-    else {
-      vecteur & v=*args._VECTptr;
-      s=int(v.size());
-      if (!s)
-	return args;
-      if ( (args.subtype!=_SEQ__VECT) || (s<2) )
-	return v.front();
-      x=v[1];
-      p=v[0];
-      if (s>2)
-	order=v[2];
-    }
-    gen g=_e2r(makesequence(p,x),contextptr),n,d;
-    fxnd(g,n,d);
-    if (n.type!=_VECT){
-      if (n.type==_POLY){
-	polynome nlcoeff(*n._POLYptr);
-	if (!nlcoeff.coord.empty()){
-	  if (order.type==_INT_)
-	    change_monomial_order(nlcoeff,order);
-	  nlcoeff.coord.erase(nlcoeff.coord.begin()+1,nlcoeff.coord.end());
-	}
-	n=nlcoeff;
-      }
-      return _r2e(gen(makevecteur(n/d,x),_SEQ__VECT),contextptr);
-    }
-    return n._VECTptr->front()/d;
-  }
-  static const char _lcoeff_s []="lcoeff";
-  static define_unary_function_eval (__lcoeff,&_lcoeff,_lcoeff_s);
-  define_unary_function_ptr5( at_lcoeff ,alias_at_lcoeff,&__lcoeff,0,true);
-
-  static gen tcoeff(const vecteur & v){
-    int s=int(v.size());
-    gen g;
-    for (;s;--s){
-      g=v[s-1];
-      if (!is_zero(g))
-	return g;
-    }
-    return zero;
-  }
-  gen _tcoeff(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen x,p;
-    if (args.type!=_VECT){
-      x=vx_var;
-      p=args;
-    }
-    else {
-      vecteur& v=*args._VECTptr;
-      int s=int(v.size());
-      if ( (args.subtype!=_SEQ__VECT) || (s!=2) || (v[1].type!=_IDNT) )
-	return tcoeff(v);
-      x=v[1];
-      p=v[0];
-    }
-    gen g=_e2r(makesequence(p,x),contextptr),n,d;
-    fxnd(g,n,d);
-    if (n.type!=_VECT)
-      return zero;
-    return tcoeff(*n._VECTptr)/d;
-  }
-  static const char _tcoeff_s []="tcoeff";
-  static define_unary_function_eval (__tcoeff,&_tcoeff,_tcoeff_s);
-  define_unary_function_ptr5( at_tcoeff ,alias_at_tcoeff,&__tcoeff,0,true);
-
-  gen _homogeneize(const gen & args,GIAC_CONTEXT){
-    if (args.type==_STRNG && args.subtype==-1) return  args;
-    gen t,p;
-    int s=2;
-    if (args.type!=_VECT){
-      t=t__IDNT_e;
-      p=args;
-    }
-    else {
-      vecteur & v=*args._VECTptr;
-      s=int(v.size());
-      if (!s)
-	return args;
-      if ( (args.subtype!=_SEQ__VECT) || (s<2) )
-	return v.front();
-      t=v[1];
-      p=v[0];
-    }
-    vecteur lv(lidnt(p));
-    vecteur lt(lv);
-    lt.push_back(t);
-    gen g=_e2r(makesequence(p,lv),contextptr),n,d;
-    fxnd(g,n,d);
-    if (n.type!=_POLY)
-      return p;
-    polynome nlcoeff(*n._POLYptr);
-    nlcoeff=nlcoeff.homogeneize();
-    if (d.type==_POLY){
-      polynome dlcoeff=d._POLYptr->homogeneize();
-      g=r2e(dlcoeff,lt,contextptr);
-    }
-    else
-      g=r2e(d,lv,contextptr);
-    return r2e(nlcoeff,lt,contextptr)/g;
-  }
-  static const char _homogeneize_s []="homogeneize";
-  static define_unary_function_eval (__homogeneize,&_homogeneize,_homogeneize_s);
-  define_unary_function_ptr5( at_homogeneize ,alias_at_homogeneize,&__homogeneize,0,true);
-
-  static gen sqrfree(const gen & g,const vecteur & l,GIAC_CONTEXT){
-    if (g.type!=_POLY)
-      return r2sym(g,l,contextptr);
-    factorization f(sqff(*g._POLYptr));
-    factorization::const_iterator it=f.begin(),itend=f.end();
-    gen res(plus_one);
-    for (;it!=itend;++it)
-      res=res*pow(r2e(it->fact,l,contextptr),it->mult);
-    return res;
-  }
-  static vecteur sqrfree(const gen & g,const vecteur & l,int mult,GIAC_CONTEXT){
-    vecteur res;
-    if (g.type!=_POLY){
-      if (is_one(g))
-	return res;
-      return vecteur(1,makevecteur(r2sym(g,l,contextptr),mult));
-    }
-    factorization f(sqff(*g._POLYptr));
-    factorization::const_iterator it=f.begin(),itend=f.end();
-    for (;it!=itend;++it){
-      const polynome & p=it->fact;
-      gen pg=r2e(p,l,contextptr);
-      if (!is_one(pg))
-	res.push_back(makevecteur(pg,mult*it->mult));
-    }
-    return res;
-  }
-  gen _sqrfree(const gen & args_,GIAC_CONTEXT){
-    gen args(args_);
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    bool factors=false;
-    if (args.type==_VECT){
-      vecteur argv=*args._VECTptr;
-      if (!argv.empty() && argv.back()==at_factors){
-	factors=true;
-	argv.pop_back();
-	if (argv.size()==1)
-	  args=argv.front();
-	else
-	  args=gen(argv,args.subtype);
-      }
-    }
-    if (args.type==_VECT) // fixme take care of factors
-      return apply(args,_sqrfree,contextptr);
-    if (args.type!=_SYMB)
-      return factors?makevecteur(args,1):args;
-    gen a,b;
-    if (is_algebraic_program(args,a,b)) // fixme take care of factors
-      return symbolic(at_program,makesequence(a,0,_sqrfree(b,contextptr)));
-    vecteur l(alg_lvar(args));
-    gen g=e2r(args,l,contextptr);
-    if (g.type==_FRAC){
-      fraction f=*g._FRACptr;
-      if (factors)
-	return mergevecteur(sqrfree(f.num,l,1,contextptr),sqrfree(f.den,l,-1,contextptr));
-      return sqrfree(f.num,l,contextptr)/sqrfree(f.den,l,contextptr);
-    }
-    else {
-      if (factors)
-	return sqrfree(g,l,1,contextptr);
-      return sqrfree(g,l,contextptr);
-    }
-  }
-  static const char _sqrfree_s []="sqrfree";
-  static define_unary_function_eval (__sqrfree,&_sqrfree,_sqrfree_s);
-  define_unary_function_ptr5( at_sqrfree ,alias_at_sqrfree,&__sqrfree,0,true);
-
-  gen _truncate(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen e(args);
-    int n,s=1;
-    vecteur w(1,vx_var);
-    gen gn(5);
-    if (args.type==_VECT){
-      vecteur & v=*args._VECTptr;
-      s=int(v.size());
-      if (s==0)
-	return gensizeerr(contextptr);
-      e=v[0];
-      if (s==3){
-	w=gen2vecteur(v[1]);
-	gn=v[2];
-      }
-      else {
-	if (s==2)
-	  gn=v[1];
-      }
-    }
-    if (gn.type!=_INT_)
-      return gensizeerr(contextptr);
-    n=gn.val;
-    int nvar=int(w.size()); // number of var w.r.t. which we truncate
-    vecteur l(lop(e,at_order_size));
-    vecteur lp(l.size(),zero);
-    e=subst(e,l,lp,false,contextptr);
-    // FIXME if l not empty, adjust order of truncation using arg of order_size
-    lvar(e,w);
-    e=e2r(e,w,contextptr);
-    gen num,den;
-    fxnd(e,num,den);
-    if ( (den.type==_POLY) && (den._POLYptr->lexsorted_degree() ) )
-      return gensizeerr(contextptr);
-    if (num.type==_POLY){
-      vector< monomial<gen> >::const_iterator it=num._POLYptr->coord.begin(),itend=num._POLYptr->coord.end();
-      vector< monomial<gen> > res;
-      for (;it!=itend;++it){
-	index_t::const_iterator i=it->index.begin();
-	int deg=0;
-	for (int j=0;j<nvar;++j,++i)
-	  deg=deg+(*i);
-	if (deg<=n)
-	  res.push_back(*it);
-      }
-      num._POLYptr->coord=res;
-    }
-    return r2e(rdiv(num,den,contextptr),w,contextptr);
-  }    
-  static const char _truncate_s []="truncate";
-  static define_unary_function_eval (__truncate,&_truncate,_truncate_s);
-  define_unary_function_ptr5( at_truncate ,alias_at_truncate,&__truncate,0,true);
-
-  gen _canonical_form(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen p,x,a,b,c;
-    if (is_equal(args))
-      return _canonical_form(equal2diff(args),contextptr);
-    if (is_algebraic_program(args,a,b))
-      return symbolic(at_program,makesequence(a,0,_canonical_form(gen(makevecteur(b,a[0]),_SEQ__VECT),contextptr)));
-    if (args.type!=_VECT){
-      p=args;
-      x=ggb_var(p);
-    }
-    else {
-      vecteur & v=*args._VECTptr;
-      if (v.size()!=2)
-	return gentypeerr(contextptr);
-      p=v.front();
-      x=v.back();
-    }
-    if (x.type!=_IDNT)
-      return gentypeerr(contextptr);
-    if (!is_quadratic_wrt(p,x,a,b,c,contextptr))
-      return gensizeerr(contextptr);
-    if (is_zero(a))
-      return b*x+c;
-    // a*x^2+b*x+c -> a*(x+b/(2*a))^2+(b^2-4*a*c)/(4*a)
-    return a*pow(x+symbolic(at_neg,(-b)/(2*a)),2)+(4*a*c-pow(b,2))/(4*a);
-  }    
-  static const char _canonical_form_s []="canonical_form";
-  static define_unary_function_eval (__canonical_form,&_canonical_form,_canonical_form_s);
-  define_unary_function_ptr5( at_canonical_form ,alias_at_canonical_form,&__canonical_form,0,true);
-
-  gen _taux_accroissement(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen p,x,a,b,c;
-    if (args.type!=_VECT || args._VECTptr->size()<3)
-      return gensizeerr(contextptr);
-    vecteur v = *args._VECTptr;
-    if (is_algebraic_program(v.front(),a,b)){
-      return _taux_accroissement(gen(makevecteur(b,a[0],v[1],v[2]),_SEQ__VECT),contextptr);
-      // return symbolic(at_program,makevecteur(v[1],0,_taux_accroissement(gen(makevecteur(b,a[0],v[1],v[2]),_SEQ__VECT),contextptr)));
-    }
-    if (v.size()<4)
-      v.insert(v.begin()+1,vx_var);
-    if (v[1].type!=_IDNT)
-      return gentypeerr(contextptr);
-    return (subst(v.front(),v[1],v[3],false,contextptr)-subst(v.front(),v[1],v[2],false,contextptr))/(v[3]-v[2]);
-  }    
-  static const char _taux_accroissement_s []="taux_accroissement";
-  static define_unary_function_eval (__taux_accroissement,&_taux_accroissement,_taux_accroissement_s);
-  define_unary_function_ptr5( at_taux_accroissement ,alias_at_taux_accroissement,&__taux_accroissement,0,true);
-
-  gen _fcoeff(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen x;
-    vecteur p;
-    if (args.type!=_VECT)
-      return symbolic(at_fcoeff,args);
-    vecteur & v=*args._VECTptr;
-    if ( (v.size()!=2) || (v.front().type!=_VECT) ){
-      p=v;
-      x=vx_var;
-    }
-    else {
-      p=*v.front()._VECTptr;
-      x=v.back();
-    }
-    if (x.type!=_IDNT)
-      return gentypeerr(contextptr);    
-    const_iterateur it=p.begin(),itend=p.end();
-    if ( (itend-it)%2 )
-      return gensizeerr(contextptr);
-    gen res(plus_one);
-    for (;it!=itend;it+=2){
-      res=res*pow(x-*it,*(it+1),contextptr);
-    }
-    return res;
-  }    
-  static const char _fcoeff_s []="fcoeff";
-  static define_unary_function_eval (__fcoeff,&_fcoeff,_fcoeff_s);
-  define_unary_function_ptr5( at_fcoeff ,alias_at_fcoeff,&__fcoeff,0,true);
-
-  static void addfactors(const gen & p,const gen & x,int mult,vecteur & res,GIAC_CONTEXT){
-    vecteur v=sqff_factors(p,contextptr); // factors(p,x,contextptr);
-    const_iterateur it=v.begin(),itend=v.end();
-    for (;it!=itend;){
-      vecteur w=solve(*it,x,1,contextptr);
-      ++it;
-      int n=it->val;
-      ++it;
-      const_iterateur jt=w.begin(),jtend=w.end();
-      for (;jt!=jtend;++jt){
-	res.push_back(*jt);
-	res.push_back(n*mult);
-      }
-    }
-  }    
-
-  gen _froot(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen p,x;
-    if (args.type!=_VECT){
-      x=vx_var;
-      p=args;
-    }
-    else {
-      vecteur & v=*args._VECTptr;
-      if (v.size()!=2)
-	return gensizeerr(contextptr);
-      x=v.back();
-      if (x.type!=_IDNT)
-	return gensizeerr(gettext("2nd arg"));
-      p=v.front();
-    }
-    vecteur lv(lvar(p));
-    gen aa=e2r(p,lv,contextptr),aan,aad;
-    fxnd(aa,aan,aad);
-    vecteur res;
-    addfactors(r2e(aan,lv,contextptr),x,1,res,contextptr);
-    addfactors(r2e(aad,lv,contextptr),x,-1,res,contextptr);
-    return res;
-  }
-
-  static const char _froot_s []="froot";
-  static define_unary_function_eval (__froot,&_froot,_froot_s);
-  define_unary_function_ptr5( at_froot ,alias_at_froot,&__froot,0,true);
-
-  gen _roots(const gen & g_,GIAC_CONTEXT){
-    if ( g_.type==_STRNG && g_.subtype==-1) return g_;
-    gen eq=0;
-    gen g(g_);
-    if (g.type==_VECT && g._VECTptr->size()==3 && g._VECTptr->back()==at_equal && g.subtype==_SEQ__VECT){
-      eq=(*g._VECTptr)[1];
-      g=makesequence(g._VECTptr->front(),eq);
-    }
-    gen r=_froot(g,contextptr);
-    if (r.type!=_VECT || (r._VECTptr->size() % 2) )
-      return gensizeerr(contextptr);
-    vecteur & v = *r._VECTptr;
-    vecteur res;
-    int s=int(v.size()/2);
-    for (int i=0;i<s;++i){
-      if (v[2*i+1].val>0)
-	res.push_back(makevecteur(eq==0?v[2*i]:symb_equal(eq,v[2*i]),v[2*i+1]));
-    }
-    return res;
-  }
-  static const char _roots_s []="roots";
-  static define_unary_function_eval (__roots,&_roots,_roots_s);
-  define_unary_function_ptr5( at_roots ,alias_at_roots,&__roots,0,true);
-
-  gen _divpc(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen p,q,x;
-    if (args.type!=_VECT)
-      return symbolic(at_divpc,args);
-    vecteur & v=*args._VECTptr;
-    int s=int(v.size());
-    if (s<3)
-      return gensizeerr(contextptr);
-    p=v.front();
-    q=v[1];
-    if (v[2].type!=_INT_)
-      return gensizeerr(contextptr);
-    if (s==3)
-      x=vx_var;
-    else 
-      x=v.back();
-    vecteur lv(1,x);
-    lvar(p,lv);
-    lvar(q,lv);
-    gen aa=e2r(p,lv,contextptr),aan,aad;
-    fxnd(aa,aan,aad);
-    gen ba=e2r(q,lv,contextptr),ban,bad;
-    fxnd(ba,ban,bad);
-    if ( ( aad.type==_POLY && aad._POLYptr->lexsorted_degree())
-	 || (bad.type==_POLY && bad._POLYptr->lexsorted_degree())
-	 )
-      return gensizeerr(contextptr);
-    if (ban.type!=_POLY)
-      return r2e(rdiv(aan*bad,ban*aad,contextptr),lv,contextptr);
-    vecteur a;
-    if (aan.type==_POLY)
-      a=polynome2poly1(*aan._POLYptr,1);
-    else
-      a=vecteur(1,aan);
-    vecteur b=polynome2poly1(*ban._POLYptr,1);
-    if (is_zero(b.back()))
-      divisionby0err(q);
-    reverse(a.begin(),a.end());
-    reverse(b.begin(),b.end());
-    int n=int(b.size()-a.size())+v[2].val;
-    for (int i=0;i<n;++i)
-      a.push_back(zero);
-    vecteur quo,rem;
-    environment * env=new environment;
-    DivRem(a,b,env,quo,rem);
-    delete env;
-    reverse(quo.begin(),quo.end());
-    gen res(vecteur2polynome(quo,int(lv.size())));
-    res=rdiv(res*bad,aad,contextptr);
-    return r2e(res,lv,contextptr);
-  }
-
-  static const char _divpc_s []="divpc";
-  static define_unary_function_eval (__divpc,&_divpc,_divpc_s);
-  define_unary_function_ptr5( at_divpc ,alias_at_divpc,&__divpc,0,true);
-
-  gen _ptayl(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen p,q,x;
-    if (args.type!=_VECT){
-      p=_POLY1__VECT;
-      p.subtype=_INT_MAPLECONVERSION;
-      return _series(makesequence(args,p),contextptr);
-    }
-    vecteur v=*args._VECTptr;
-    int s=int(v.size());
-    if (s<2)
-      return gensizeerr(contextptr);
-    if (s>3 || v[1].is_symb_of_sommet(at_equal) || (s==3 && v[2].type==_INT_)){
-      p=_POLY1__VECT;
-      p.subtype=_INT_MAPLECONVERSION;
-      v.push_back(p);
-      return _series(gen(v,_SEQ__VECT),contextptr);
-    }
-    p=v.front();
-    q=v[1];
-    if (p.type==_VECT)
-      return taylor(*p._VECTptr,q,0);
-    if (s==2)
-      x=vx_var;
-    else 
-      x=v.back();
-    if (is_integral(x)){
-      p=_POLY1__VECT;
-      p.subtype=_INT_MAPLECONVERSION;
-      v.push_back(p);
-      return _series(makesequence(gen(v,_SEQ__VECT)),contextptr);
-    }
-    if (!is_zero(derive(q,x,contextptr)))
-      return gensizeerr(contextptr);
-    vecteur lv(1,x);
-    lvar(p,lv);
-    lvar(q,lv);
-    gen aa=e2r(p,lv,contextptr),aan,aad;
-    fxnd(aa,aan,aad);
-    if ( ( (aad.type==_POLY)&&(aad._POLYptr->lexsorted_degree()) )
-	 )
-      return gensizeerr(contextptr);
-    if (aan.type!=_POLY)
-      return p;
-    gen ba=e2r(q,vecteur(lv.begin()+1,lv.end()),contextptr);
-    vecteur a(polynome2poly1(*aan._POLYptr,1));
-    vecteur res=taylor(a,ba,0);
-    return r2e(vecteur2polynome(res,int(lv.size())),lv,contextptr)/r2e(aad,lv,contextptr);
-  }
-
-  static const char _ptayl_s []="ptayl";
-  static define_unary_function_eval (__ptayl,&_ptayl,_ptayl_s);
-  define_unary_function_ptr5( at_ptayl ,alias_at_ptayl,&__ptayl,0,true);
-  
-  vecteur gen2continued_fraction(const gen & g,int n,GIAC_CONTEXT){
-    // Compute a vector of size n+1 with last element=remainder
-    vecteur res,remain;
-    gen tmp(g),f;
-#ifndef HAVE_LIBMPFR
-    if (!alg_lvar(tmp).empty())
-      tmp=evalf_double(tmp,1,contextptr);
-#endif
-    int i=0,j;
-    for (;i<n;++i){
-      if ( (j=equalposcomp(remain,tmp)) ){
-	// int s=remain.size();
-	res.push_back(vecteur(res.begin()+j-1,res.end()));
-	return res;
-      }
-      else
-	remain.push_back(tmp);
-      f=_floor(tmp,0);
-      if (has_op(f,*at_floor)){
-	*logptr(contextptr) << "Unable to simplify " << f << "\n";
-	return res; 
-      }
-      res.push_back(f);
-      if (is_zero(tmp-f))
-	return res;
-      tmp=normal(inv(tmp-f,contextptr),contextptr);
-    }
-    res.push_back(tmp);
-    return res;
-  }
-  gen _dfc(const gen & g_orig,GIAC_CONTEXT){
-    if ( g_orig.type==_STRNG && g_orig.subtype==-1) return  g_orig;
-    gen g=g_orig;
-    if (g.type==_FRAC){
-      gen tmp=_floor(g,contextptr);
-      vecteur res(1,tmp);
-      g -= tmp;
-      for (;!is_zero(g);){
-	g = inv(g,contextptr);
-	tmp = _floor(g,contextptr);
-	res.push_back(tmp);
-	g -=tmp;
-      }
-      return res;
-    }
-    double eps=epsilon(contextptr);
-    if (g.type==_VECT && g._VECTptr->size()==2){
-      gen gf=evalf_double(g._VECTptr->back(),1,contextptr);
-      if (is_integral(gf))
-	return gen2continued_fraction(g._VECTptr->front(),gf.val,contextptr);
-      if (gf.type==_DOUBLE_){
-	eps=gf._DOUBLE_val;
-	g=evalf_double(g._VECTptr->front(),1,contextptr);
-      }
-    }
-    g=evalf_double(g,1,contextptr);
-    if (g.type!=_DOUBLE_)
-      return gensizeerr(contextptr);
-    return vector_int_2_vecteur(float2continued_frac(g._DOUBLE_val,eps));
-  }
-  static const char _dfc_s []="dfc";
-  static define_unary_function_eval (__dfc,&_dfc,_dfc_s);
-  define_unary_function_ptr5( at_dfc ,alias_at_dfc,&__dfc,0,true);
-
-  gen _dfc2f(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->empty())
-      return gensizeerr(contextptr);
-    vecteur v =(*g._VECTptr);
-    gen res(v.back());
-    if (v.back().type==_VECT){
-      // represent a quadratic x=[... x], find equation
-      identificateur tmp(" x");
-      gen eq(tmp);
-      const_iterateur it=v.back()._VECTptr->end()-1,itend=v.back()._VECTptr->begin()-1;
-      for (;it!=itend;--it)
-	eq=inv(eq,contextptr)+(*it);
-      vecteur w=solve(eq-tmp,tmp,0,contextptr);
-      gen ws=_sort(w,0);
-      if (ws.type!=_VECT || ws._VECTptr->empty())
-	return gensizeerr(contextptr);
-      res=ws._VECTptr->back();
-    }
-    for (;;){
-      v.pop_back();
-      if (v.empty())
-	return res;
-      res=inv(res,contextptr);
-      res=res+v.back();
-    }
-    // return continued_frac2gen(vecteur_2_vector_int(*g._VECTptr),nan(),epsilon);
-  }
-  static const char _dfc2f_s []="dfc2f";
-  static define_unary_function_eval (__dfc2f,&_dfc2f,_dfc2f_s);
-  define_unary_function_ptr5( at_dfc2f ,alias_at_dfc2f,&__dfc2f,0,true);
-
-  gen float2rational(double d_orig,double eps,GIAC_CONTEXT){
-    double d=d_orig;
-    if (d<0)
-      return -float2rational(-d,eps,contextptr);
-    if (d>RAND_MAX)
-      return d;    // reconstruct
-    vector<int> v(float2continued_frac(d,eps));
-    return continued_frac2gen(v,d_orig,eps,contextptr);
-  }
-  gen _float2rational(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    switch (g.type){
-    case _DOUBLE_:
-      return float2rational(g._DOUBLE_val,epsilon(contextptr),contextptr);
-    case _REAL:
-      return float2rational(evalf_double(g,1,contextptr)._DOUBLE_val,epsilon(contextptr),contextptr);
-    case _CPLX:
-      return _float2rational(re(g,contextptr),contextptr)+cst_i*_float2rational(im(g,contextptr),contextptr);
-    case _SYMB:
-      return symbolic(g._SYMBptr->sommet,_float2rational(g._SYMBptr->feuille,contextptr));
-    case _VECT:
-      return apply(g,_float2rational,contextptr);
-    default:
-      return g;
-    }
-  }
-  static const char _float2rational_s []="float2rational";
-  static define_unary_function_eval (__float2rational,&_float2rational,_float2rational_s);
-  define_unary_function_ptr5( at_float2rational ,alias_at_float2rational,&__float2rational,0,true);
-
-  gen _fmod(const gen & g,GIAC_CONTEXT){
-    if (g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g.subtype!=_SEQ__VECT || g._VECTptr->size()!=2) 
-      return gensizeerr(contextptr);
-    const gen & a=g._VECTptr->front(),b=g._VECTptr->back();
-    if (a.type==_DOUBLE_ && b.type==_DOUBLE_)
-      return a._DOUBLE_val-std::floor(a._DOUBLE_val/b._DOUBLE_val)*b._DOUBLE_val;
-    return a-_floor(a/b,contextptr)*b;
-  }
-  static const char _fmod_s []="fmod";
-  static define_unary_function_eval (__fmod,&_fmod,_fmod_s);
-  define_unary_function_ptr5( at_fmod ,alias_at_fmod,&__fmod,0,true);
-
-  gen _gramschmidt(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT)
-      return symbolic(at_gramschmidt,g);
-    vecteur & v(*g._VECTptr);
-    if (ckmatrix(v))
-      return gramschmidt(v,true,contextptr);
-    if (v.size()==2){
-      gen lvect=v[0];
-      gen scalaire=v[1];
-      if (scalaire.type==_INT_ && ckmatrix(lvect))
-	return gramschmidt(*lvect._VECTptr,scalaire.val,contextptr);
-      if (lvect.type!=_VECT)
-	return gensizeerr(contextptr);
-      vecteur lv=*lvect._VECTptr;
-      int s=int(lv.size());
-      if (!s)
-	return lv;
-      vecteur sc(1,scalaire(gen(makevecteur(lv[0],lv[0]),_SEQ__VECT),contextptr));
-      for (int i=1;i<s;++i){
-	gen cl;
-	for (int j=0;j<i;++j){
-	  gen tmp=rdiv(scalaire(gen(makevecteur(lv[i],lv[j]),_SEQ__VECT),contextptr),sc[j],contextptr)*lv[j];
-	  cl=cl+tmp;
-	}
-	lv[i]=lv[i]-cl;
-	sc.push_back(scalaire(gen(makevecteur(lv[i],lv[i]),_SEQ__VECT),contextptr));
-      }
-      for (int i=0;i<s;++i)
-	lv[i]=rdiv(lv[i],sqrt(sc[i],contextptr),contextptr);
-      return lv;
-    }
-    return gensizeerr(contextptr);
-  }
-  static const char _gramschmidt_s []="gramschmidt";
-  static define_unary_function_eval (__gramschmidt,&_gramschmidt,_gramschmidt_s);
-  define_unary_function_ptr5( at_gramschmidt ,alias_at_gramschmidt,&__gramschmidt,0,true);
-
-  void aplatir(const matrice & m,vecteur & v,bool full){
-    int s=int(m.size());
-    if (!full){
-      v.clear();
-      v.reserve(2*s);
-    }
-    const_iterateur it=m.begin(),itend=m.end(),jt,jtend;
-    for (;it!=itend;++it){
-      if (it->type!=_VECT || it->subtype==_GGB__VECT)
-	v.push_back(*it);
-      else {
-	if (full){
-	  aplatir(*it->_VECTptr,v,full);
-	  continue;
-	}
-	jt=it->_VECTptr->begin(),jtend=it->_VECTptr->end();
-	for (;jt!=jtend;++jt)
-	  v.push_back(*jt);
-      }
-    }
-  }
-
-  static void change_scale2(vecteur & v,const gen & g){
-    gen l(g);
-    for (unsigned i=1;i<v.size();++i){
-      v[i]=v[i]/l;
-      l=g*l;
-    }
-  }
-
-  /*
-  gen exptorootof(const gen & g,GIAC_CONTEXT){
-    gen h=ratnormal(g/cst_two_pi/cst_i,contextptr);
-    if (h.type!=_FRAC || h._FRACptr->num.type!=_INT_ || h._FRACptr->den.type!=_INT_)
-      return symbolic(at_exp,g);
-    int n=h._FRACptr->num.val,d=h._FRACptr->den.val;
-    n=n%d;
-    if (d<0){ d=-d; n=-n; }
-    vecteur v=cyclotomic(d);
-    vecteur w(absint(n)+1);
-    w[0]=1;
-    w=w%v;
-    h=symbolic(at_rootof,makesequence(w,v));
-    if (n>0)
-      return h;
-    return inv(h,contextptr);
-  }
-  const gen_op_context exp2rootof_tab[]={exptorootof,0};
-  gen exp2rootof(const gen & g,GIAC_CONTEXT){
-    return subst(g,exp_tab,exp2rootof_tab,false,contextptr);
-  }
-  gen _exp2rootof(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen var,res;
-    if (is_algebraic_program(args,var,res))
-      return symbolic(at_program,makesequence(var,0,_exp2rootof(res,contextptr)));
-    if (is_equal(args))
-      return apply_to_equal(args,_exp2rootof,contextptr);
-    return exp2rootof(args,contextptr);
-  }
-  static const char _exp2rootof_s []="exp2rootof";
-  static define_unary_function_eval (__exp2rootof,&_exp2rootof,_exp2rootof_s);
-  define_unary_function_ptr5( at_exp2rootof ,alias_at_exp2rootof,&__exp2rootof,0,true);
-  */
-
-  static gen pmin(const matrice & m,GIAC_CONTEXT){
-    int s=int(m.size());
-    matrice mpow(midn(s));
-    matrice res;
-    vecteur v;
-    for (int i=0;i<=s;++i){
-      if (is_zero(mpow)){
-	vecteur w(i+1);
-	w[0]=1;
-	return w;
-      }
-      aplatir(mpow,v);
-      v.push_back(pow(vx_var,i));
-      res.push_back(v);
-      mpow=mmult(mpow,m);
-    }
-    matrice r;
-    gen det;
-    mrref(res,r,v,det,0,s+1,0,s*s,
-	  /* fullreduction */0,1,true,1,0,
-	  contextptr);
-    // find 1st line with zeros (except in the last col)
-    const_iterateur it=r.begin(),itend=r.end();
-    for (;it!=itend;++it){
-      if (is_zero(vecteur(it->_VECTptr->begin(),it->_VECTptr->end()-1)))
-	break;
-    }
-    if (it==itend)
-      return gensizeerr(contextptr);
-    gen t= _e2r(makesequence(it->_VECTptr->back(),vx_var),contextptr);
-    if (t.type==_VECT)
-      return gen(t/lgcd(*t._VECTptr),_POLY1__VECT);
-    else
-      return t;
-  }
-  gen _pmin(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (is_squarematrix(g)){
-      matrice &m =*g._VECTptr;
-      vecteur w;
-      gen p=m[0][0];
-      if (p.type==_USER){
-	std_matrix<gen> M;
-	matrice2std_matrix_gen(m,M);
-	mod_pcar(M,w,true);
-	return gen(w,_POLY1__VECT);
-      }
-      if (p.type==_MOD && (p._MODptr+1)->type==_INT_){
-	gen mg=unmod(m);
-	if (mg.type==_VECT){
-	  matrice M=*mg._VECTptr;
-	  vector< vector<int> > N;
-	  int modulo=(p._MODptr+1)->val;
-	  bool krylov=true;
-	  vector<int> res;
-	  if (mod_pcar(M,N,modulo,krylov,res,contextptr,true)){
-	    vector_int2vecteur(res,w);
-	    return makemod(gen(w,_POLY1__VECT),modulo);
-	    // environment env; w=modularize(w,modulo,&env);
-	    // return gen(w,_POLY1__VECT);
-	  }
-	}
-      }
-      if (is_integer_matrice(m)){
-	w=mpcar_int(m,true,contextptr,true);
-	return gen(w,_POLY1__VECT);
-      }
-      if (poly_pcar_interp(m,w,true,contextptr))
-	return gen(w,_POLY1__VECT);
-      if (proba_epsilon(contextptr) && probabilistic_pmin(m,w,true,contextptr))
-	return gen(w,_POLY1__VECT);
-      return pmin(m,contextptr);
-    }
-    if (is_integer(g) || g.type==_MOD)
-      return gen(makevecteur(1,-g),_POLY1__VECT);
-    // if (g.type==_FRAC) return gen(makevecteur(g._FRACptr->den,-g._FRACptr->num),_POLY1__VECT);
-    if (is_cinteger(g) && g.type==_CPLX){
-      gen a=*g._CPLXptr,b=*(g._CPLXptr+1);
-      // z=(a+i*b), (z-a)^2=-b^2
-      return gen(makevecteur(1,-2*a,a*a+b*b),_POLY1__VECT);
-    }
-    if (g.type==_FRAC)
-      return gen(makevecteur(g._FRACptr->den,-g._FRACptr->num),_POLY1__VECT);
-    if (g.type==_USER){
-#ifndef NO_RTTI
-      if (galois_field * gf=dynamic_cast<galois_field *>(g._USERptr)){
-	gen gfa=char2_uncoerce(gf->a),gfP=char2_uncoerce(gf->P);
-	if (gfa.type!=_VECT || gfP.type!=_VECT || !is_integer(gf->p))
-	  return gensizeerr("Bad GF element");
-	environment env;
-	env.modulo=gf->p;
-	env.pn=env.modulo;
-	env.moduloon=true;
-	// compute 1,a,a^2,...,a^n in lines then transpose and find ker
-	int n=int(gfP._VECTptr->size())-1;
-	vecteur & A=*gfa._VECTptr;
-	vecteur current(1,1),suivant,temp;
-	matrice m(n+1);
-	m[0]=vecteur(n);
-	m[0]._VECTptr->front()=1; 
-	// put constant term in first column (row) to avoid cancellation problems
-	for (int i=1;i<=n;++i){
-	  mulmodpoly(current,A,&env,temp);
-	  suivant=operator_mod(temp,*gfP._VECTptr,&env);
-	  m[i]=new ref_vecteur(n);
-	  for (unsigned j=0;j<suivant.size();++j){
-	    (*m[i]._VECTptr)[j]=makemod(suivant[suivant.size()-1-j],gf->p);
-	  }
-	  swap(current,suivant);
-	}
-	vecteur noyau;
-	m=mtran(m);
-	mker(m,noyau,0,contextptr);
-	if (noyau.empty() || noyau.front().type!=_VECT)
-	  return gensizeerr("Internal error, no relation found");
-	temp=*noyau.front()._VECTptr;
-	for (;!temp.empty() && is_zero(temp.back());)
-	  temp.pop_back();
-	reverse(temp.begin(),temp.end());
-	mulmodpoly(temp,inv(temp.front(),contextptr),0,temp);
-	return gen(temp,_POLY1__VECT);
-      }
-#endif
-    }
-    if (g.type==_EXT)
-      return minimal_polynomial(g,true,contextptr);
-    if (g.type!=_VECT){
-      gen g_(g);
-      //if (!lop(g_,at_exp).empty())
-      g_=cossinexp2rootof(g_,contextptr,32767);
-      vecteur v=alg_lvar(g_);
-      if (v.size()==1 && v.front().type==_VECT && v.front()._VECTptr->empty()){
-	gen tmp=e2r(g_,v,contextptr);
-	gen d=1;
-	if (tmp.type==_FRAC){
-	  d=tmp._FRACptr->den;
-	  tmp=tmp._FRACptr->num;
-	  if (d.type==_CPLX){
-	    tmp=tmp*conj(d,contextptr);
-	    d=d*conj(d,contextptr);
-	  }
-	}
-	if (tmp.type==_POLY && tmp._POLYptr->dim==0)
-	  tmp=tmp._POLYptr->coord.front().value;
-	if (tmp.type==_EXT){
-	  if (has_i(*tmp._EXTptr)){
-	    gen r,i;
-	    reim(tmp,r,i,contextptr);
-	    tmp=r+algebraic_EXTension(makevecteur(1,0),makevecteur(1,0,1))*i;
-	    while (tmp.type==_FRAC){
-	      d=d*tmp._FRACptr->den;
-	      tmp=tmp._FRACptr->num;
-	    }
-	  }
-	  tmp=minimal_polynomial(tmp,true,contextptr);
-	  if (tmp.type!=_VECT)
-	    return gensizeerr(contextptr);
-	  vecteur v=*tmp._VECTptr;
-	  change_scale2(v,d);
-	  return gen(v,_POLY1__VECT);
-	}
-      }
-    }
-    if (g.type!=_VECT || g._VECTptr->size()!=2)
-      return symbolic(at_pmin,g);
-    vecteur & v(*g._VECTptr);
-    if (!is_squarematrix(v.front())){
-      gen res=_pmin(v.front(),contextptr);
-      if (res.type==_VECT)
-	return symb_horner(*res._VECTptr,v.back());
-      return gensizeerr(contextptr);
-    }
-    matrice &m=*v.front()._VECTptr;
-    // probabilistic minimal polynomial
-    vecteur w;
-    if (proba_epsilon(contextptr) &&probabilistic_pmin(m,w,true,contextptr))
-      return symb_horner(w,v.back());
-    else
-      return _r2e(gen(makevecteur(_pmin(m,contextptr),v.back()),_SEQ__VECT),contextptr);
-  }
-  static const char _pmin_s []="pmin";
-  static define_unary_function_eval (__pmin,&_pmin,_pmin_s);
-  define_unary_function_ptr5( at_pmin ,alias_at_pmin,&__pmin,0,true);
-
-  gen fastpow(const gen & a,const gen & k_,GIAC_CONTEXT){
-    gen a2k(a),res(1),k(k_);
-    while (k!=0){
-      if (k.type==_ZINT){
-	int m=modulo(*k._ZINTptr,2);
-	if (m%2)
-	  res=res*a2k;
-	k=(k-m)/2;
-      }
-      else {
-	if (k.val % 2)
-	  res=res*a2k;
-	k.val /= 2;
-      }
-      a2k=a2k*a2k;
-    }
-    return res;
-  }
-
-  // multiplicative order of g, a divisor of mult
-  gen order(const gen &g,const gen & mult,GIAC_CONTEXT){
-    vecteur v=ifactors(mult,contextptr);
-    gen o(mult);
-    int s=v.size();
-    for (int i=0;i<s/2;++i){
-      gen n(v[2*i]);
-      gen m(v[2*i+1]);
-      for (;m.val;--m.val){
-	gen o1(o/n);
-	gen chk=fastpow(g,o1,contextptr);
-	if (!is_one(chk))
-	  break;
-	o=o1;
-      }
-    }
-    return o;
-  }
-
-  gen _order(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (is_squarematrix(g)){
-      matrice &m =*g._VECTptr;
-      if (!mker(m,contextptr).empty())
-	return gensizeerr(gettext("Not invertible"));
-      gen m00=m[0][0],extdeg,p;
-      if (m00.type==_USER){
-#ifndef NO_RTTI
-	if (galois_field * gf=dynamic_cast<galois_field *>(m00._USERptr)){
-	  if (gf->a.type!=_VECT || gf->P.type!=_VECT || !is_integer(gf->p))
-	    return gensizeerr("Bad GF element");
-	  extdeg=gf->P._VECTptr->size()-1;
-	  p=gf->p;
-	  // a divisor of the lcm of gf->p^(n*degree)-1 for degree of irred factors of pmin
-	}
-#endif
-      }
-      if (m00.type==_MOD){
-	p=*(m00._MODptr+1);
-	if (!is_probab_prime_p(p))
-	  return gensizeerr("0 or prime characteristic required");
-	// a divisor of the lcm of p^degree-1 for degree of irred factors of pmin
-	extdeg=1;
-      }
-      if (extdeg!=0){
-	gen tmp=_pmin(makesequence(g,vx_var),contextptr);
-	tmp=_factors(tmp,contextptr);
-	if (tmp.type==_VECT){
-	  const vecteur & v=*tmp._VECTptr;
-	  gen res=1;
-	  for (int i=0;i<v.size()/2;++i){
-	    int m=v[2*i+1].val; 
-	    gen o=pow(p,extdeg*_degree(v[2*i],contextptr),contextptr)-1;
-	    res=lcm(res,o);
-	    if (m>0)
-	      res=lcm(res,p);
-	  }
-	  return res;
-	}
-      }
-    }
-    if (g.type==_MOD){
-      gen a=*g._MODptr,n=*(g._MODptr+1);
-      if (!is_one(gcd(a,n,contextptr)))
-	return gensizeerr(gettext("Not invertible"));
-      gen p=euler(n,contextptr);
-      return order(g,p,contextptr);
-    }
-    if (g.type==_USER){
-      if (is_zero(g))
-	return gensizeerr(gettext("Not invertible"));
-#ifndef NO_RTTI
-      if (galois_field * gf=dynamic_cast<galois_field *>(g._USERptr)){
-	if (gf->a.type!=_VECT || gf->P.type!=_VECT || !is_integer(gf->p))
-	  return gensizeerr("Bad GF element");
-	// a divisor of gf->p^n-1
-	return order(g,pow(gf->p,gf->P._VECTptr->size()-1,contextptr)-1,contextptr);
-      }
-#endif
-    } 
-    return undef;
-  }
-  static const char _order_s []="order";
-  static define_unary_function_eval (__order,&_order,_order_s);
-  define_unary_function_ptr5( at_order ,alias_at_order,&__order,0,true);
-
-  // a faire: vpotential, signtab
-  gen _potential(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if ( (g.type!=_VECT) || (g._VECTptr->size()!=2) )
-      return symbolic(at_potential,g);
-    vecteur v(plotpreprocess(g,contextptr));
-    if (is_undef(v))
-      return v;
-    gen f=v[0];
-    gen x=v[1];
-    if ( (f.type!=_VECT) || (x.type!=_VECT) )
-      return gensizeerr(contextptr);
-    vecteur & fv=*f._VECTptr;
-    vecteur & xv=*x._VECTptr;
-    int s=int(fv.size());
-    if (unsigned(s)!=xv.size())
-      return gendimerr(contextptr);
-    for (int i=0;i<s;++i){
-      for (int j=i+1;j<s;++j){
-	if (!is_zero(simplify(derive(fv[i],xv[j],contextptr)-derive(fv[j],xv[i],contextptr),contextptr)))
-	  return gensizeerr(gettext("Not a potential"));
-      }
-    }
-    gen res;
-    for (int i=0;i<s;++i){
-      res=res+integrate_gen(simplify(fv[i]-derive(res,xv[i],contextptr),contextptr),xv[i],contextptr);
-    }
-    return res;
-  }
-  static const char _potential_s []="potential";
-  static define_unary_function_eval_quoted (__potential,&_potential,_potential_s);
-  define_unary_function_ptr5( at_potential ,alias_at_potential,&__potential,_QUOTE_ARGUMENTS,true);
-
-  gen _vpotential(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if ( (g.type!=_VECT) || (g._VECTptr->size()!=2) )
-      return symbolic(at_vpotential,g);
-    vecteur v(plotpreprocess(g,contextptr));
-    if (is_undef(v))
-      return v;
-    gen f=v[0];
-    gen x=v[1];
-    if ( (f.type!=_VECT) || (x.type!=_VECT) )
-      return gensizeerr(contextptr);
-    vecteur & fv=*f._VECTptr;
-    vecteur & xv=*x._VECTptr;
-    unsigned int s=unsigned(fv.size());
-    if ( (s!=3) || (s!=xv.size()) )
-      return gendimerr(contextptr);
-    if (!is_zero(simplify(_divergence(g,contextptr),contextptr)))
-      return gensizeerr(gettext("Not a vector potential"));
-    vecteur res(3);
-    /* return A0=0, A1=int[B_2,x0], A2=-int[B_1,x0]+F(x1,x2)
-     * where F=int[B0+d_2[int[B_2,x0]]+d_1[int[B_1,x0]],x1]
-     * F does not depend on x0 since divergence[B]=0 */
-    res[1]=integrate_gen(fv[2],xv[0],contextptr);
-    res[2]=integrate_gen(fv[1],xv[0],contextptr);
-    gen F=simplify(fv[0]+derive(res[1],xv[2],contextptr)+derive(res[2],xv[1],contextptr),contextptr);
-    F=integrate_gen(F,xv[1],contextptr);
-    res[2]=F-res[2];
-    return res;
-  }
-  static const char _vpotential_s []="vpotential";
-  static define_unary_function_eval_quoted (__vpotential,&_vpotential,_vpotential_s);
-  define_unary_function_ptr5( at_vpotential ,alias_at_vpotential,&__vpotential,_QUOTE_ARGUMENTS,true);
-
-  gen _poly2symb(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g.subtype!=_SEQ__VECT)
-      return _r2e(gen(makevecteur(g,vx_var),_SEQ__VECT),contextptr);      
-    return _r2e(g,contextptr);
-  }
-  static const char _poly2symb_s []="poly2symb";
-  static define_unary_function_eval (__poly2symb,&_poly2symb,_poly2symb_s);
-  define_unary_function_ptr5( at_poly2symb ,alias_at_poly2symb,&__poly2symb,0,true);
-
-  gen _symb2poly(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return _e2r(g,contextptr);
-  }
-  static const char _symb2poly_s []="symb2poly";
-  static define_unary_function_eval (__symb2poly,&_symb2poly,_symb2poly_s);
-  define_unary_function_ptr5( at_symb2poly ,alias_at_symb2poly,&__symb2poly,0,true);
-
-  gen _exp2trig(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return _sincos(g,contextptr);
-  }
-  static const char _exp2trig_s []="exp2trig";
-  static define_unary_function_eval (__exp2trig,&_exp2trig,_exp2trig_s);
-  define_unary_function_ptr5( at_exp2trig ,alias_at_exp2trig,&__exp2trig,0,true);
-
-  gen _nrows(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (!ckmatrix(g))
-      return gensizeerr(contextptr);
-    return int(g._VECTptr->size());
-  }
-  static const char _nrows_s []="nrows";
-  static define_unary_function_eval (__nrows,&_nrows,_nrows_s);
-  define_unary_function_ptr5( at_nrows ,alias_at_nrows,&__nrows,0,true);
-
-  gen _ncols(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (!ckmatrix(g))
-      return gensizeerr(contextptr);
-    if (g._VECTptr->empty())
-      return zero;
-    return int(g._VECTptr->front()._VECTptr->size());
-  }
-  static const char _ncols_s []="ncols";
-  static define_unary_function_eval (__ncols,&_ncols,_ncols_s);
-  define_unary_function_ptr5( at_ncols ,alias_at_ncols,&__ncols,0,true);
-
-  gen _l2norm(const gen & g0,GIAC_CONTEXT){
-    if ( g0.type==_STRNG && g0.subtype==-1) return  g0;
-    gen g=remove_at_pnt(g0);
-    if (g.type==_VECT && g.subtype==_VECTOR__VECT && g._VECTptr->size()==2)
-      g=g._VECTptr->back()-g._VECTptr->front();
-    if (g.type!=_VECT)
-      return abs(g,contextptr);
-    vecteur v;
-    if (g._VECTptr->size()==2 && g._VECTptr->front().type==_VECT && g._VECTptr->back()==at_vector){
-      aplatir(*g._VECTptr->front()._VECTptr,v);
-      return l2norm(v,contextptr);      
-    }
-    if (ckmatrix(g)){
-      gen tmp=_SVL(g,contextptr);
-      if (tmp.type==_VECT && tmp._VECTptr->size()==2 && tmp._VECTptr->back().type==_VECT) 
-	tmp=tmp._VECTptr->back();
-      return _max(tmp,contextptr);
-    }
-    v=*g._VECTptr;
-    return l2norm(v,contextptr);
-  }
-  static const char _l2norm_s []="l2norm";
-  static define_unary_function_eval (__l2norm,&_l2norm,_l2norm_s);
-  define_unary_function_ptr5( at_l2norm ,alias_at_l2norm,&__l2norm,0,true);
-
-  static const char _norm_s []="norm";
-  static define_unary_function_eval (__norm,&_l2norm,_norm_s);
-  define_unary_function_ptr5( at_norm ,alias_at_norm,&__norm,0,true);
-
-  gen _normalize(const gen & a,GIAC_CONTEXT){
-    if ( a.type==_STRNG && a.subtype==-1) return  a;
-    return a/_l2norm(a,contextptr);
-  }
-  static const char _normalize_s []="normalize";
-  static define_unary_function_eval (__normalize,&_normalize,_normalize_s);
-  define_unary_function_ptr5( at_normalize ,alias_at_normalize,&__normalize,0,true);
-
-  static const char _randmatrix_s []="randmatrix";
-  static define_unary_function_eval (__randmatrix,&_ranm,_randmatrix_s);
-  define_unary_function_ptr5( at_randmatrix ,alias_at_randmatrix,&__randmatrix,0,true);
-
-  extern const unary_function_ptr * const  at_lgcd;
-  gen _lgcd(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return symbolic(at_lgcd,args);
-    return lgcd(*args._VECTptr);
-  }
-  static const char _lgcd_s []="lgcd";
-  static define_unary_function_eval (__lgcd,&_lgcd,_lgcd_s);
-  define_unary_function_ptr5( at_lgcd ,alias_at_lgcd,&__lgcd,0,true);
-
-  // synonyms
-  gen _float(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen g_=g;
-    if (g.type==_STRNG)
-      g_=gen(*g._STRNGptr,contextptr);
-    return evalf(g_,1,contextptr);
-  }
-  static const char _float_s []="float";
-  static define_unary_function_eval (__float,&_float,_float_s);
-  define_unary_function_ptr5( at_float ,alias_at_float,&__float,0,true);
-
-  gen _build_complex(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g._VECTptr->size()==2)
-      return gen(g._VECTptr->front(),g._VECTptr->back());
-    if (g.type==_STRNG)
-      return gen(*g._STRNGptr,contextptr);
-    return g;
-  }
-  static const char _build_complex_s []="complex";
-  static define_unary_function_eval (__build_complex,&_build_complex,_build_complex_s);
-  define_unary_function_ptr5( at_complex ,alias_at_build_complex,&__build_complex,0,true);
-
-  gen _hold(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return g;
-  }
-  static const char _hold_s []="hold";
-  static define_unary_function_eval_quoted (__hold,&_hold,_hold_s);
-  define_unary_function_ptr5( at_hold ,alias_at_hold,&__hold,_QUOTE_ARGUMENTS,true);
-
-  gen _eigenvals(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (!is_squarematrix(g))
-      return gendimerr(contextptr);
-    bool b=complex_mode(contextptr);
-    complex_mode(true,contextptr);
-    matrice m;
-    vecteur d;
-    if (!egv(*g._VECTptr,m,d,contextptr,false,false,true))
-      *logptr(contextptr) << gettext("Low accuracy") << '\n';
-    complex_mode(b,contextptr);
-    return gen(d,_SEQ__VECT);
-  }
-  static const char _eigenvals_s []="eigenvals";
-  static define_unary_function_eval (__eigenvals,&_eigenvals,_eigenvals_s);
-  define_unary_function_ptr5( at_eigenvals ,alias_at_eigenvals,&__eigenvals,0,true);
-
-  static const char _giackernel_s []="kernel";
-  static define_unary_function_eval (__giackernel,&_ker,_giackernel_s);
-  define_unary_function_ptr5( at_kernel ,alias_at_kernel,&__giackernel,0,true);
-
-  gen _eigenvects(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    bool b=complex_mode(contextptr);
-    complex_mode(true,contextptr);
-    gen res=_egv(g,contextptr);
-    complex_mode(b,contextptr);
-    return res;
-  }
-  static const char _eigenvects_s []="eigenvects";
-  static define_unary_function_eval (__eigenvects,&_eigenvects,_eigenvects_s);
-  define_unary_function_ptr5( at_eigenvects ,alias_at_eigenvects,&__eigenvects,0,true);
-
-  static const char _eigenvalues_s []="eigenvalues";
-  static define_unary_function_eval (__eigenvalues,&_eigenvals,_eigenvalues_s);
-  define_unary_function_ptr5( at_eigenvalues ,alias_at_eigenvalues,&__eigenvalues,0,true);
-
-  gen _charpoly(const gen & args,GIAC_CONTEXT){
-    string s;
-    if (is_graphe(args.subtype==_SEQ__VECT?args._VECTptr->front():args,s,contextptr))
-      return _graph_charpoly(args,contextptr);
-    return _pcar(args,contextptr);
-  }
-  static const char _charpoly_s []="charpoly";
-  static define_unary_function_eval (__charpoly,&_charpoly,_charpoly_s);
-  define_unary_function_ptr5( at_charpoly ,alias_at_charpoly,&__charpoly,0,true);
-
-  static const char _eigenvectors_s []="eigenvectors";
-  static define_unary_function_eval (__eigenvectors,&_eigenvects,_eigenvectors_s);
-  define_unary_function_ptr5( at_eigenvectors ,alias_at_eigenvectors,&__eigenvectors,0,true);
-
-  static const char _rowdim_s []="rowdim";
-  static define_unary_function_eval (__rowdim,&_nrows,_rowdim_s);
-  define_unary_function_ptr5( at_rowdim ,alias_at_rowdim,&__rowdim,0,true);
-
-  static const char _coldim_s []="coldim";
-  static define_unary_function_eval (__coldim,&_ncols,_coldim_s);
-  define_unary_function_ptr5( at_coldim ,alias_at_coldim,&__coldim,0,true);
-
-  static const char _multiply_s []="multiply";
-  static define_unary_function_eval (__multiply,&_prod,_multiply_s);
-  define_unary_function_ptr5( at_multiply ,alias_at_multiply,&__multiply,0,true);
-
-  /* Maple inert forms */
-  gen _Gcd(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_gcd,g);
-  }
-  static const char _Gcd_s []="Gcd";
-  static define_unary_function_eval (__Gcd,&_Gcd,_Gcd_s);
-  define_unary_function_ptr5( at_Gcd ,alias_at_Gcd,&__Gcd,0,true);
-
-  gen _Gcdex(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_gcdex,g);
-  }
-  static const char _Gcdex_s []="Gcdex";
-  static define_unary_function_eval (__Gcdex,&_Gcdex,_Gcdex_s);
-  define_unary_function_ptr5( at_Gcdex ,alias_at_Gcdex,&__Gcdex,0,true);
-
-  gen _Factor(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_factor,g);
-  }
-  static const char _Factor_s []="Factor";
-  static define_unary_function_eval (__Factor,&_Factor,_Factor_s);
-  define_unary_function_ptr5( at_Factor ,alias_at_Factor,&__Factor,0,true);
-
-  gen _Rref(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_rref,g);
-  }
-  static const char _Rref_s []="Rref";
-  static define_unary_function_eval (__Rref,&_Rref,_Rref_s);
-  define_unary_function_ptr5( at_Rref ,alias_at_Rref,&__Rref,0,true);
-
-  gen _Rank(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_rank,g);
-  }
-  static const char _Rank_s []="Rank";
-  static define_unary_function_eval (__Rank,&_Rank,_Rank_s);
-  define_unary_function_ptr5( at_Rank ,alias_at_Rank,&__Rank,0,true);
-
-  gen _Det(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_det,g);
-  }
-  static const char _Det_s []="Det";
-  static define_unary_function_eval (__Det,&_Det,_Det_s);
-  define_unary_function_ptr5( at_Det ,alias_at_Det,&__Det,0,true);
-
-  gen _Quo(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_quo,g);
-  }
-  static const char _Quo_s []="Quo";
-  static define_unary_function_eval (__Quo,&_Quo,_Quo_s);
-  define_unary_function_ptr5( at_Quo ,alias_at_Quo,&__Quo,0,true);
-
-  gen _Rem(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_rem,g);
-  }
-  static const char _Rem_s []="Rem";
-  static define_unary_function_eval (__Rem,&_Rem,_Rem_s);
-  define_unary_function_ptr5( at_Rem ,alias_at_Rem,&__Rem,0,true);
-
-  gen _Int(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return symbolic(at_integrate,g);
-  }
-  static const char _Int_s []="Int";
-  static define_unary_function_eval (__Int,&_Int,_Int_s);
-  define_unary_function_ptr5( at_Int ,alias_at_Int,&__Int,0,true);
-
-  gen _divisors(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen res=_idivis(g,contextptr);
-    if (res.type==_VECT) res.subtype=_SET__VECT;
-    return res;
-  }
-  static const char _divisors_s []="divisors";
-  static define_unary_function_eval (__divisors,&_divisors,_divisors_s);
-  define_unary_function_ptr5( at_divisors ,alias_at_divisors,&__divisors,0,true);
-
-  gen _maxnorm(const gen & g0,GIAC_CONTEXT){
-    if ( g0.type==_STRNG && g0.subtype==-1) return  g0;
-    gen g=remove_at_pnt(g0);
-    if (g.type==_VECT && g.subtype==_VECTOR__VECT)
-      g=vector2vecteur(*g._VECTptr);
-    return linfnorm(g,contextptr);
-  }
-  static const char _maxnorm_s []="maxnorm";
-  static define_unary_function_eval (__maxnorm,&_maxnorm,_maxnorm_s);
-  define_unary_function_ptr5( at_maxnorm ,alias_at_maxnorm,&__maxnorm,0,true);
-
-  gen l1norm(const vecteur & v,GIAC_CONTEXT){
-    gen res;
-    const_iterateur it=v.begin(),itend=v.end();
-    for (;it!=itend;++it)
-      res=res+linfnorm(*it,contextptr);
-    return res;
-  }
-
-  gen _l1norm(const gen & g0,GIAC_CONTEXT){
-    if ( g0.type==_STRNG && g0.subtype==-1) return  g0;
-    gen g=remove_at_pnt(g0);
-    if (g.type==_VECT && g.subtype==_VECTOR__VECT)
-      g=vector2vecteur(*g._VECTptr);
-    if (g.type!=_VECT)
-      return linfnorm(g,contextptr);
-    if (g._VECTptr->size()==2 && g._VECTptr->front().type==_VECT && g._VECTptr->back()==at_vector){
-      vecteur v;
-      aplatir(*g._VECTptr->front()._VECTptr,v);
-      return l1norm(v,contextptr);      
-    }
-    if (ckmatrix(g))
-      return _rowNorm(mtran(*g._VECTptr),contextptr);
-    return l1norm(*g._VECTptr,contextptr);
-  }
-  static const char _l1norm_s []="l1norm";
-  static define_unary_function_eval (__l1norm,&_l1norm,_l1norm_s);
-  define_unary_function_ptr5( at_l1norm ,alias_at_l1norm,&__l1norm,0,true);
-
-  gen _linfnorm(const gen & g0,GIAC_CONTEXT){
-    if ( g0.type==_STRNG && g0.subtype==-1) return  g0;
-    gen g=remove_at_pnt(g0);
-    if (g.type==_VECT && g.subtype==_VECTOR__VECT)
-      g=vector2vecteur(*g._VECTptr);
-    if (g.type!=_VECT)
-      return linfnorm(g,contextptr);
-    if (g._VECTptr->size()==2 && g._VECTptr->front().type==_VECT && g._VECTptr->back()==at_vector){
-      vecteur v;
-      aplatir(*g._VECTptr->front()._VECTptr,v);
-      return linfnorm(v,contextptr);      
-    }
-    if (ckmatrix(g))
-      return _rowNorm(g,contextptr);
-    return linfnorm(*g._VECTptr,contextptr);
-  }
-  static const char _linfnorm_s []="linfnorm";
-  static define_unary_function_eval (__linfnorm,&_linfnorm,_linfnorm_s);
-  define_unary_function_ptr5( at_linfnorm ,alias_at_linfnorm,&__linfnorm,0,true);
-
-  gen _frobenius_norm(const gen & g0,GIAC_CONTEXT){
-    if ( g0.type==_STRNG && g0.subtype==-1) return  g0;
-    gen g=remove_at_pnt(g0);
-    if (g.type==_VECT && g.subtype==_VECTOR__VECT)
-      g=vector2vecteur(*g._VECTptr);
-    vecteur v;
-    if (ckmatrix(g))
-      aplatir(*g._VECTptr,v);
-    else
-      v=*g._VECTptr;
-    return l2norm(v,contextptr);
-  }
-  static const char _frobenius_norm_s []="frobenius_norm";
-  static define_unary_function_eval (__frobenius_norm,&_frobenius_norm,_frobenius_norm_s);
-  define_unary_function_ptr5( at_frobenius_norm ,alias_at_frobenius_norm,&__frobenius_norm,0,true);
-
-  gen _matrix_norm(const gen & g0,GIAC_CONTEXT){
-    if ( g0.type==_STRNG && g0.subtype==-1) return  g0;
-    if (g0.type!=_VECT || g0._VECTptr->empty())
-      return gentypeerr(contextptr);
-    if (g0._VECTptr->back()==0){
-      gen g=g0._VECTptr->front();
-      if (!ckmatrix(g))
-	return _linfnorm(g,contextptr);
-      vecteur & v =*g._VECTptr;
-      gen res=0;
-      for (unsigned i=0;i<v.size();++i){
-	res=max(res,linfnorm(v[i],contextptr),contextptr);
-      }
-      return res;
-    }
-    if (g0._VECTptr->back()==1)
-      return _l1norm(g0._VECTptr->front(),contextptr);
-    if (g0._VECTptr->back()==2)
-      return _l2norm(g0._VECTptr->front(),contextptr);
-    if (is_inf(g0._VECTptr->back()))
-      return _linfnorm(g0._VECTptr->front(),contextptr);
-    return _frobenius_norm(g0,contextptr);
-  }
-  static const char _matrix_norm_s []="matrix_norm";
-  static define_unary_function_eval (__matrix_norm,&_matrix_norm,_matrix_norm_s);
-  define_unary_function_ptr5( at_matrix_norm ,alias_at_matrix_norm,&__matrix_norm,0,true);
-
-  gen _dotprod(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if ( (g.type!=_VECT) || (g._VECTptr->size()!=2))
-      return gentypeerr(contextptr);
-    vecteur v=*g._VECTptr;
-    if (v[0].type==_VECT && v[1].type==_VECT)
-      return scalarproduct(*v[0]._VECTptr,*v[1]._VECTptr,contextptr);
-    return dotvecteur(v[0],v[1]);
-  }
-  static const char _dotprod_s []="dotprod";
-  static define_unary_function_eval (__dotprod,&_dotprod,_dotprod_s);
-  define_unary_function_ptr5( at_dotprod ,alias_at_dotprod,&__dotprod,0,true);
-
-  static const char _crossproduct_s []="crossproduct";
-  static define_unary_function_eval (__crossproduct,&_cross,_crossproduct_s);
-  define_unary_function_ptr5( at_crossproduct ,alias_at_crossproduct,&__crossproduct,0,true);
-
-  gen _diag(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->empty())
-      return gensizeerr(contextptr);
-    vecteur v=*g._VECTptr;
-    int l=int(v.size());
-    if (l==2){
-      if (ckmatrix(v[0])){
-	if (v[1]==at_left){
-	  matrice m=*v[0]._VECTptr,res;
-	  int n=int(m.size());
-	  res.reserve(n);
-	  for (int i=0;i<n;++i){
-	    vecteur v=*m[i]._VECTptr;
-	    int s=int(v.size());
-	    for (int j=i+1;j<s;++j)
-	      v[j]=0;
-	    res.push_back(v);
-	  }
-	  return res;
-	}
-	if (v[1]==at_right){
-	  matrice m=*v[0]._VECTptr,res;
-	  int n=int(m.size());
-	  res.reserve(n);
-	  for (int i=0;i<n;++i){
-	    vecteur v=*m[i]._VECTptr;
-	    for (int j=0;j<i;++j)
-	      v[j]=0;
-	    res.push_back(v);
-	  }
-	  return res;
-	}
-	if (v[1]==at_lu){
-	  matrice m=*v[0]._VECTptr,resl,resu,diag;
-	  int n=int(m.size());
-	  resl.reserve(n); resu.reserve(n);
-	  for (int i=0;i<n;++i){
-	    vecteur v=*m[i]._VECTptr;
-	    diag.push_back(v[i]);
-	    for (int j=0;j<=i;++j)
-	      v[j]=0;
-	    resu.push_back(v);
-	    v=*m[i]._VECTptr;
-	    int s=int(v.size());
-	    for (int j=i;j<s;++j)
-	      v[j]=0;
-	    resl.push_back(v);
-	  }
-	  return makesequence(resl,diag,resu);
-	}
-	if (is_integral(v[1]) && v[1].type==_INT_){
-	  // sub diagonal extraction
-	  int shift=v[1].val;
-	  const vecteur & V = *v[0]._VECTptr;
-	  const_iterateur it=V.begin();
-	  int vs=int(V.size());
-	  vecteur res;
-	  for (int i=giacmax(0,-shift);i<vs;++i){
-	    const vecteur & ligne=*V[i]._VECTptr;
-	    if (i+shift>=ligne.size())
-	      break;
-	    res.push_back(ligne[i+shift]);
-	  }
-	  return res;
-	}
-      }// if (ckmatrix(v[0])
-      else {
-	if (v[1].is_symb_of_sommet(at_equal))
-	  v[1]=v[1]._SYMBptr->feuille[1];
-	if (v[0].type==_VECT &&is_integral(v[1]) && v[1].type==_INT_){
-	  int shift=v[1].val;
-	  const vecteur & V = *v[0]._VECTptr;
-	  const_iterateur it=V.begin();
-	  int vs=int(V.size());
-	  int ts=vs+absint(shift);
-	  vecteur res(ts);
-	  for (int i=0;i<ts;++i){
-	    vecteur ligne(ts);
-	    int j=i+shift;
-	    if (j>=0 && j<ts){
-	      ligne[j]=*it;
-	      ++it;
-	    }
-	    res[i]=ligne;
-	  }
-	  return gen(res,_MATRIX__VECT);
-	}
-      }
-    }
-    if (l==3 && v[0].type==_VECT && v[1].type==_VECT && v[2].type==_VECT && v[0]._VECTptr->size()+1==v[1]._VECTptr->size() && v[0]._VECTptr->size()==v[2]._VECTptr->size() ){
-      vecteur & l=*v[0]._VECTptr;
-      vecteur & d=*v[1]._VECTptr;
-      vecteur & u=*v[2]._VECTptr;
-      int n=int(d.size());
-      matrice res(n);
-      for (int i=0;i<n;++i){
-	vecteur w(n);
-	if (i)
-	  w[i-1]=l[i-1];
-	w[i]=d[i];
-	if (i<n-1)
-	  w[i+1]=u[i];
-	res[i]=w;
-      }
-      return res;
-    }
-    if (is_squarematrix(v)){
-      vecteur res(l);
-      for (int i=0;i<l;++i)
-	res[i]=v[i][i];
-      return res;
-    }
-    if (ckmatrix(v)){
-      if (l==1 && v[0].type==_VECT){
-	v=*v[0]._VECTptr;
-      }
-      else
-	v=*mtran(v)[0]._VECTptr;
-    }
-    l=int(v.size());
-    matrice res;
-    if (l && ckmatrix(v.front()) ){
-      int s=0,r=0;
-      for (int i=0;i<l;++i){
-	if (!is_squarematrix(v[i]))
-	  return gentypeerr(contextptr);
-	s += int(v[i]._VECTptr->size());
-      }
-      for (int i=0;i<l;++i){
-	vecteur & current=*v[i]._VECTptr;
-	int c=int(current.size());
-	for (int j=0;j<c;++j){
-	  vecteur tmp(r);
-	  vecteur & currentj=*current[j]._VECTptr;
-	  for (int k=0;k<c;++k){
-	    tmp.push_back(currentj[k]);
-	  }
-	  for (int k=c+r;k<s;++k)
-	    tmp.push_back(zero);
-	  res.push_back(tmp);
-	}
-	r += c;
-      }
-      return res;
-    }
-    for (int i=0;i<l;++i){
-      vecteur tmp(i);
-      tmp.push_back(v[i]);
-      res.push_back(mergevecteur(tmp,vecteur(l-1-i)));
-    }
-    return res;
-  }
-  static const char _diag_s []="diag";
-  static define_unary_function_eval (__diag,&_diag,_diag_s);
-  define_unary_function_ptr5( at_diag ,alias_at_diag,&__diag,0,true);
-
-  static const char _BlockDiagonal_s []="BlockDiagonal";
-  static define_unary_function_eval (__BlockDiagonal,&_diag,_BlockDiagonal_s);
-  define_unary_function_ptr5( at_BlockDiagonal ,alias_at_BlockDiagonal,&__BlockDiagonal,0,true);
-
-  gen _input(const gen & args,GIAC_CONTEXT){
-#ifdef KHICAS
-#if 0 // def NUMWORKS
-    const char * sn=mp_hal_input("?") ;
-    if (sn)
-      return string2gen(sn,false);
-#endif
-    std::string S;
-    const char * prompt = args.type==_STRNG?args._STRNGptr->c_str():"?";
-    inputline(prompt,0,S,false,194,contextptr);
-    *logptr(contextptr) << prompt << S << '\n';
-    return string2gen(S,false);
-    string s;
-#else // KHICAS
-    if (interactive_op_tab && interactive_op_tab[0])
-      return interactive_op_tab[0](args,contextptr);
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return _input(args,false,contextptr);
-#endif
-  }
-  static const char _input_s []="input";
-#ifdef RTOS_THREADX
-  // const unary_function_eval __input(0,(const gen_op_context)_input,_input_s);
-  define_unary_function_eval_quoted(__input,(const gen_op_context)_input,_input_s);
-#else
-  unary_function_eval __input(0,(const gen_op_context)_input,_input_s);
-#endif
-  define_unary_function_ptr5( at_input ,alias_at_input,&__input,_QUOTE_ARGUMENTS,true);
-
-  gen _textinput(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return _input(args,true,contextptr);
-  }
-  static const char _textinput_s []="textinput";
-  static define_unary_function_eval_quoted (__textinput,&_textinput,_textinput_s);
-  define_unary_function_ptr5( at_textinput ,alias_at_textinput,&__textinput,_QUOTE_ARGUMENTS,true);
-
-  static const char _f2nd_s []="f2nd";
-  static define_unary_function_eval (__f2nd,&_fxnd,_f2nd_s);
-  define_unary_function_ptr5( at_f2nd ,alias_at_f2nd,&__f2nd,0,true);
-
-  // service=-3 for content -2 for primpart -1 for coeff, degree for coeff
-  static gen primpartcontent(const gen& g,int service,GIAC_CONTEXT){
-    vecteur v;
-    if (g.type==_VECT && g.subtype !=_SEQ__VECT){
-      if (calc_mode(contextptr)==1)
-	v=makevecteur(g,ggb_var(g));
-      else
-	v=makevecteur(g,vx_var);
-    }
-    else
-      v=gen2vecteur(g);
-    if (!v.empty() && v[0].type==_POLY)
-      v.insert(v.begin()+1,vecteur(0));
-    int s=int(v.size());
-    if (s==2 && v[1].is_symb_of_sommet(at_pow)){
-      gen & f = v[1]._SYMBptr->feuille;
-      if (f.type==_VECT && f._VECTptr->size()==2 && f._VECTptr->back().type==_INT_){
-	v[1]=f._VECTptr->front();
-	service=f._VECTptr->back().val;
-      }
-    }
-    if (s>=2 && v[1].type==_VECT){
-      vecteur l(*v[1]._VECTptr);
-      int outerdim=int(l.size());
-      lvar(v[0],l);
-      int innerdim=int(l.size())-outerdim;
-      fraction f(1);
-      if (v[0].type==_POLY)
-	f.num=v[0];
-      else
-	f=sym2r(v[0],l,contextptr);
-      vecteur ll(l.begin()+outerdim,l.end());
-      if (f.num.type!=_POLY){
-	if (service==-1){
-	  gen res=r2e(v[0],l,contextptr);
-	  if (s==3){
-	    if (is_zero(v[2]))
-	      return res;
-	    else
-	      return zero;
-	  }
-	  return makevecteur(res);
-	}
-	if (service==-2)
-	  return r2e(inv(f.den,contextptr),l,contextptr);
-	if (service==-3)
-	  return r2e(f.num,l,contextptr);
-	if (service==-4)
-	  return is_integer(f.num)?f.num:plus_one;
-	return gensizeerr(contextptr);
-      }
-      if (service==-4)
-	return Tcontent(*f.num._POLYptr);
-      polynome & p_aplati=*f.num._POLYptr;
-      polynome p=splitmultivarpoly(p_aplati,innerdim); 
-      vector< monomial<gen> >::const_iterator it=p.coord.begin(),itend=p.coord.end();
-      vecteur coeffs;
-      coeffs.reserve(itend-it);
-      for (;it!=itend;++it)
-	coeffs.push_back(it->value);
-      if (service==-1){
-	gen gden=r2e(f.den,l,contextptr);
-	if (s==3 && v[2].type==_VECT){
-	  index_t ind;
-	  if (!vecteur2index(*v[2]._VECTptr,ind))
-	    return zero;
-	  index_m i(ind);
-	  it=p.coord.begin();
-	  for (;it!=itend;++it){
-	    if (it->index==i)
-	      return r2e(it->value,ll,contextptr)/gden;
-	  }
-	  return zero;
-	}
-	return r2e(coeffs,ll,contextptr)/gden;
-      }
-      if (service==-2){
-	p=p/_lgcd(coeffs,contextptr);
-	p=unsplitmultivarpoly(p,innerdim);
-	return r2e(p/f.den,l,contextptr);
-      }
-      if (service==-3)
-	return r2e(_lgcd(coeffs,contextptr),ll,contextptr);
-      return gensizeerr(contextptr);
-    }
-    if (s!=1 && s!=2)
-      return gensizeerr(contextptr);
-    gen x(vx_var);
-    if (calc_mode(contextptr)==1)
-      x=ggb_var(v[0]);
-    if (s==2)
-      x=v[1];
-    gen f(_e2r(gen(makevecteur(v[0],x),_SEQ__VECT),contextptr));
-    gen deno(1);
-    if (f.type==_FRAC){
-      deno=f._FRACptr->den;
-      f=f._FRACptr->num;
-    }
-    if (f.type!=_VECT){
-      switch(service){
-      case -1:
-	return makevecteur(f)/deno;
-      case -2:
-	return plus_one;
-      case -3:
-	return f;
-      case -4:
-	return (is_integer(f)?f:plus_one)/(is_integer(deno)?deno:plus_one);
-      default:
-	if (service>0)
-	  return zero;
-	else
-	  return f;
-      }
-    }
-    switch (service){
-    case -1:
-      return f/deno;
-    case -2:
-      return symb_horner(*f._VECTptr/_lgcd(f,contextptr),x);
-    case -3: 
-      return _lgcd(f,contextptr)/deno;
-    case -4:
-      f=_lgcd(f,contextptr);
-      return _icontent(makesequence(f,lvar(f)),contextptr)/(is_integer(deno)?deno:plus_one);
-    }
-    vecteur & w=*f._VECTptr;
-    int ss=int(w.size());
-    if (service>=ss)
-      return zero;
-    return w[ss-service-1]/deno;
-  }
-  gen _primpart(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return primpartcontent(g,-2,contextptr);
-  }
-  static const char _primpart_s []="primpart";
-  static define_unary_function_eval (__primpart,&_primpart,_primpart_s);
-  define_unary_function_ptr5( at_primpart ,alias_at_primpart,&__primpart,0,true);
-
-  gen _content(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return primpartcontent(g,-3,contextptr);
-  }
-  static const char _content_s []="content";
-  static define_unary_function_eval (__content,&_content,_content_s);
-  define_unary_function_ptr5( at_content ,alias_at_content,&__content,0,true);
-
-  gen _icontent(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return primpartcontent(g,-4,contextptr);
-  }
-  static const char _icontent_s []="icontent";
-  static define_unary_function_eval (__icontent,&_icontent,_icontent_s);
-  define_unary_function_ptr5( at_icontent ,alias_at_icontent,&__icontent,0,true);
-
-  gen _coeff(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_USER){
-#ifndef NO_RTTI
-      if (galois_field * gptr=dynamic_cast<galois_field *>(g._USERptr))
-	return gptr->a;
-#endif
-    }
-    if (g.type==_VECT && !g._VECTptr->empty() && 
-	(g._VECTptr->back().type==_INT_ || g._VECTptr->back().type==_DOUBLE_ || g._VECTptr->back().type==_FRAC)){
-      vecteur v=*g._VECTptr;
-      if (v.size()==2 && v.front().type==_SPOL1){
-	const sparse_poly1 & s=*v.front()._SPOL1ptr;
-	sparse_poly1::const_iterator it=s.begin(),itend=s.end();
-	gen n=v.back();
-	for (;it!=itend;++it){
-	  if (it->exponent==n)
-	    return it->coeff;
-	  if (is_greater(it->exponent,n,contextptr))
-	    return 0;
-	}
-	return undef;
-      }
-      is_integral(v.back());
-      if (v.back().val<0)
-	return gendimerr(contextptr);
-      int n=absint(v.back().val);
-      v.pop_back();
-      if (v.size()==1 && v.front().type==_USER){
-#ifndef NO_RTTI
-	if (galois_field * gptr=dynamic_cast<galois_field *>(v.front()._USERptr)){
-	  gen ga=gptr->a;
-	  if (ga.type==_VECT){
-	    int s=ga._VECTptr->size();
-	    if (n>=s)
-	      return 0;
-	    n=s-1-n;
-	    if (n>=0 && n<s)
-	      return ga[n];
-	  }
-	  return gendimerr(contextptr);
-	}
-#endif
-      }
-      return primpartcontent(gen(v,g.subtype),n,contextptr);
-    }
-    if (xcas_mode(contextptr)==1 && g.type==_VECT && g._VECTptr->size()==2 && g._VECTptr->back().type==_IDNT){
-      return primpartcontent(g,1,contextptr);
-    }
-    return primpartcontent(g,-1,contextptr);
-  }
-  static const char _coeff_s []="coeff";
-  static define_unary_function_eval (__coeff,&_coeff,_coeff_s);
-  define_unary_function_ptr5( at_coeff ,alias_at_coeff,&__coeff,0,true);
-
-  static const char _coeffs_s []="coeffs";
-  static define_unary_function_eval (__coeffs,&_coeff,_coeffs_s);
-  define_unary_function_ptr5( at_coeffs ,alias_at_coeffs,&__coeffs,0,true);
-
-  static const char _ichrem_s []="ichrem";
-  static define_unary_function_eval (__ichrem,&_ichinrem,_ichrem_s);
-  define_unary_function_ptr5( at_ichrem ,alias_at_ichrem,&__ichrem,0,true);
-
-  gen _chrem(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (!ckmatrix(g) || g._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    matrice m=mtran(*g._VECTptr);
-    const_iterateur it=m.begin(),itend=m.end();
-    if (it==itend)
-      return gensizeerr(contextptr);
-    gen res=*it;
-    for (++it;it!=itend;++it){
-      res=_ichinrem(makesequence(res,*it),contextptr);
-    }
-    return res;
-  }
-  static const char _chrem_s []="chrem";
-  static define_unary_function_eval (__chrem,&_chrem,_chrem_s);
-  define_unary_function_ptr5( at_chrem ,alias_at_chrem,&__chrem,0,true);
-
-  gen _genpoly(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()!=3)
-      return gentypeerr(contextptr);
-    vecteur & v=*g._VECTptr;
-    gen n=v[0],b=v[1],x=v[2];
-    if (b.type!=_INT_ && b.type!=_ZINT)
-      return gentypeerr(contextptr);
-    b=abs(b,contextptr);
-    if (is_zero(b)||is_one(b))
-      return gensizeerr(contextptr);
-    vecteur l(lvar(n));
-    fraction f(e2r(n,l,contextptr));
-    if (is_integer(f.num))
-      f.num=pzadic(polynome(f.num,0),b);
-    else {
-      if (f.num.type==_POLY)
-	f.num=pzadic(*f.num._POLYptr,b);
-    }
-    if (is_integer(f.den))
-      f.den=pzadic(polynome(f.den,0),b);
-    else {
-      if (f.den.type==_POLY)
-	f.den=pzadic(*f.den._POLYptr,b);
-    }
-    l.insert(l.begin(),x);
-    return r2e(f,l,contextptr);
-  }
-  static const char _genpoly_s []="genpoly";
-  static define_unary_function_eval (__genpoly,&_genpoly,_genpoly_s);
-  define_unary_function_ptr5( at_genpoly ,alias_at_genpoly,&__genpoly,0,true);
-
-  static gen freq_quantile(const matrice & v,double d,GIAC_CONTEXT){
-    if (!ckmatrix(v))
-      return undef;
-    matrice w;
-    if (v.size()==2)
-      w=mtran(v);
-    else
-      w=v;
-    if (w.front()._VECTptr->size()!=2)
-      return undef;
-    // Row Sort (using row 1)
-    gen_sort_f(w.begin(),w.end(),first_ascend_sort);
-    w=mtran(w);
-    // w[0]=data, w[1]=frequencies
-    vecteur data=*w[0]._VECTptr;
-    vecteur freq=*w[1]._VECTptr;
-    gen sigma=d*prodsum(freq,false);
-    if (is_undef(sigma)) return sigma;
-    int s=int(freq.size());
-    gen partial_sum;
-    for (int i=0;i<s;++i){
-      partial_sum=partial_sum+freq[i];
-      if (!is_zero(partial_sum) && is_strictly_greater(partial_sum,sigma,contextptr))
-	return data[i];
-      if (partial_sum==sigma && i<s)
-	return (i==s-1 || (calc_mode(contextptr)!=1 && abs_calc_mode(contextptr)!=38) )?data[i]:(data[i]+data[i+1])/2;
-    }
-    return undef;
-  }
-  gen _median(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && v.size()==2)
-      return freq_quantile(v,0.5,contextptr);
-    if (!ckmatrix(v)){
-      if (!is_fully_numeric(evalf(v,1,contextptr))){
-	islesscomplexthanf_sort(v.begin(),v.end());
-	return v[int(std::ceil(v.size()/2.0))-1]; // v[(v.size()-1)/4];
-      }
-      matrice mt=mtran(ascsort(mtran(vecteur(1,v)),true));
-      if ( (calc_mode(contextptr)==1 || abs_calc_mode(contextptr)==38) && !v.empty() && !(v.size()%2))
-	return (mt[v.size()/2][0]+mt[v.size()/2-1][0])/2;
-      return mt[int(std::ceil(v.size()/2.0))-1][0];
-    }
-    else
-      v=ascsort(v,true);
-    v=mtran(v);
-    if ( (calc_mode(contextptr)==1 || abs_calc_mode(contextptr)==38) && !v.empty() && !(v.size()%2))
-      return (v[v.size()/2]+v[v.size()/2-1])/2;
-    return v[int(std::ceil(v.size()/2.0))-1]; // v[(v.size()-1)/2];
-  }
-  static const char _median_s []="median";
-  static define_unary_function_eval(unary_median,&_median,_median_s);
-  define_unary_function_ptr5( at_median ,alias_at_median,&unary_median,0,true);
-
-  gen _quartile1(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && v.size()==2)
-      return freq_quantile(v,0.25,contextptr);
-    if (!ckmatrix(v)){
-      if (!is_fully_numeric(evalf(v,1,contextptr))){
-	islesscomplexthanf_sort(v.begin(),v.end());
-	return v[int(std::ceil(v.size()/4.0))-1]; // v[(v.size()-1)/4];
-      }
-      return mtran(ascsort(mtran(vecteur(1,v)),true))[int(std::ceil(v.size()/4.0))-1][0];
-    }
-    else
-      v=ascsort(v,true);
-    v=mtran(v);
-    return v[int(std::ceil(v.size()/4.0))-1]; // v[(v.size()-1)/4];
-  }
-  static const char _quartile1_s []="quartile1";
-  static define_unary_function_eval(unary_quartile1,&_quartile1,_quartile1_s);
-  define_unary_function_ptr5( at_quartile1 ,alias_at_quartile1,&unary_quartile1,0,true);
-
-  gen _quartile3(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && v.size()==2)
-      return freq_quantile(v,0.75,contextptr);
-    if (!ckmatrix(v)){
-      if (!is_fully_numeric(evalf(v,1,contextptr))){
-	islesscomplexthanf_sort(v.begin(),v.end());
-	return v[int(std::ceil(3*v.size()/4.0))-1]; // v[(v.size()-1)/4];
-      }
-      return mtran(ascsort(mtran(vecteur(1,v)),true))[int(std::ceil(3*v.size()/4.0))-1][0];
-    }
-    else
-      v=ascsort(v,true);
-    v=mtran(v);
-    return v[int(std::ceil(3*v.size()/4.0))-1]; // v[(3*(v.size()-1))/4];
-  }
-  static const char _quartile3_s []="quartile3";
-  static define_unary_function_eval(unary_quartile3,&_quartile3,_quartile3_s);
-  define_unary_function_ptr5( at_quartile3 ,alias_at_quartile3,&unary_quartile3,0,true);
-
-  gen _quantile(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    if (v.size()<2 || v.front().type!=_VECT)
-      return gensizeerr(contextptr);
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && v.size()==3){
-      gen tmp=evalf_double(v.back(),1,contextptr);
-      if (tmp.type!=_DOUBLE_)
-	return gensizeerr(contextptr);
-      double d=tmp._DOUBLE_val;
-      if (d<=0 || d>=1)
-	return gendimerr(contextptr);
-      return freq_quantile(makevecteur(v[0],v[1]),d,contextptr);
-    }
-    if (v.size()!=2)
-      return gensizeerr(contextptr);
-    bool vect=v.back().type==_VECT;
-    vecteur w=gen2vecteur(v.back()),res;
-    v=*v.front()._VECTptr;
-    bool matrix=true;
-    if (!ckmatrix(v)){
-      matrix=false;
-      if (!is_fully_numeric(evalf(v,1,contextptr))){
-	islesscomplexthanf_sort(v.begin(),v.end());
-	for (unsigned j=0;j<w.size();++j){
-	  gen tmp=evalf_double(w[j],1,contextptr);
-	  if (tmp.type!=_DOUBLE_ || tmp._DOUBLE_val<=0 || tmp._DOUBLE_val>=1)
-	    res.push_back(undef);
-	  else
-	    res.push_back(v[int(std::ceil(tmp._DOUBLE_val*v.size()))-1]);
-	}
-	return vect?res:res.front(); 
-      }
-      v=ascsort(mtran(vecteur(1,v)),true);
-    }
-    else
-      v=ascsort(v,true);
-    v=mtran(v);
-    for (unsigned j=0;j<w.size();++j){
-      gen tmp=evalf_double(w[j],1,contextptr);
-      if (tmp.type!=_DOUBLE_ || tmp._DOUBLE_val<=0 || tmp._DOUBLE_val>=1)
-	res.push_back(undef);
-      else {
-	gen data=v[int(std::ceil(tmp._DOUBLE_val*v.size()))-1];
-	if (!matrix && data.type==_VECT && data._VECTptr->size()==1)
-	  data=data._VECTptr->front();
-	res.push_back(data);
-      }
-    }
-    return vect?res:res.front();
-  }
-  static const char _quantile_s []="quantile";
-  static define_unary_function_eval(unary_quantile,&_quantile,_quantile_s);
-  define_unary_function_ptr5( at_quantile ,alias_at_quantile,&unary_quantile,0,true);
-
-  gen _quartiles(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && v.size()==2)
-      return makevecteur(freq_quantile(v,0.0,contextptr),freq_quantile(v,0.25,contextptr),freq_quantile(v,0.5,contextptr),freq_quantile(v,0.75,contextptr),freq_quantile(v,1.0,contextptr));
-    if (!ckmatrix(v)){
-      if (!is_fully_numeric(evalf(v,1,contextptr))){
-	islesscomplexthanf_sort(v.begin(),v.end());
-	int s=int(v.size());
-	return makevecteur(v[0],v[int(std::ceil(s/4.))-1],v[int(std::ceil(s/2.))-1],v[int(std::ceil(3*s/4.))-1],v[s-1]);
-      }
-      v=ascsort(mtran(vecteur(1,v)),true);
-    }
-    else
-      v=ascsort(v,true);
-    v=mtran(v);
-    int s=int(v.size());
-    if (s==0)
-      return gensizeerr(contextptr);
-    return makevecteur(v[0],v[int(std::ceil(s/4.))-1],v[int(std::ceil(s/2.))-1],v[int(std::ceil(3*s/4.))-1],v[s-1]);
-  }
-  static const char _quartiles_s []="quartiles";
-  static define_unary_function_eval(unary_quartiles,&_quartiles,_quartiles_s);
-  define_unary_function_ptr5( at_quartiles ,alias_at_quartiles,&unary_quartiles,0,true);
-
-  gen _moustache(const gen & g_orig,GIAC_CONTEXT){
-    if ( g_orig.type==_STRNG && g_orig.subtype==-1) return  g_orig;
-    vecteur attributs(1,default_color(contextptr));
-    gen g(g_orig);
-    bool horizontal=true;
-    double ymin=global_window_ymin;
-    double ymax=global_window_ymax;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT){
-      vecteur v(*g._VECTptr);
-      int s=read_attributs(v,attributs,contextptr);
-      if (s>1){
-	gen tmp=v[s-1];
-	if (is_equal(tmp)){
-	  if (tmp._SYMBptr->feuille[0]==x__IDNT_e)
-	    horizontal=false;
-	  tmp=tmp._SYMBptr->feuille[1];
-	}
-	if (tmp.is_symb_of_sommet(at_interval)){
-	  ymin=evalf_double(tmp._SYMBptr->feuille[0],1,contextptr)._DOUBLE_val;
-	  ymax=evalf_double(tmp._SYMBptr->feuille[1],1,contextptr)._DOUBLE_val;
-	  --s;
-	}
-      }
-      if (s==1)
-	g=v.front();
-      else
-	g=gen(vecteur(v.begin(),v.begin()+s),g_orig.subtype);
-    }
-    gen tmpp=_quartiles(g,contextptr);
-    if (tmpp.type!=_VECT)
-      return tmpp;
-    vecteur v0(*tmpp._VECTptr),v;
-    if (!ckmatrix(v0))
-      v=vecteur(1,v0);
-    else
-      v=mtran(v0);
-    // _Pictsize(0);
-    int s=int(v.size());
-    vecteur res;
-    double xmin=gnuplot_xmin,xmax=gnuplot_xmax;
-    gen tmpx=_min(v0[0],contextptr),tmpxx=_max(v0[4],contextptr);
-    if (tmpx.type==_DOUBLE_)
-      xmin=tmpx._DOUBLE_val;
-    if (tmpxx.type==_DOUBLE_)
-      xmax=tmpxx._DOUBLE_val;
-    vecteur attr(attributs);
-    vecteur legendes(1,string2gen("",false));
-    if (attributs.size()>=2)
-      legendes=gen2vecteur(attributs[1]);
-    else
-      attr.push_back(legendes);
-    int ls=int(legendes.size());
-    vecteur affichages(gen2vecteur(attributs[0]));
-    int as=int(affichages.size());
-    if (horizontal){
-      double y_scale=(ymax-ymin)/(4*s);
-      for (int i=0;i<s;++i){
-	attr[0]=(i<as?affichages[i]:affichages[0]);
-	attr[1]=(i<ls?legendes[i]:legendes[0]);
-	double y_up=ymax-(4*i+1)*y_scale;
-	double y_middle=ymax-(4*i+2)*y_scale;
-	double y_down=ymax-(4*i+3)*y_scale;
-	vecteur current=gen2vecteur(v[i]);
-	if (current.size()!=5)
-	  continue;
-	// trait min -> 1er quartile
-	res.push_back(symb_segment(current[0]+y_middle*cst_i,current[1]+y_middle*cst_i,attr,_GROUP__VECT,contextptr));
-	// rectangle 
-	res.push_back(pnt_attrib(gen(makevecteur(current[3]+y_down*cst_i,current[1]+y_down*cst_i,current[1]+y_up*cst_i,current[3]+y_up*cst_i,current[3]+y_down*cst_i),_GROUP__VECT),attr,contextptr));
-	// mediane
-	res.push_back(symb_segment(current[2]+y_down*cst_i,current[2]+y_up*cst_i,attr,_GROUP__VECT,contextptr));
-	// trait 3eme quartile -> fin
-	res.push_back(symb_segment(current[3]+y_middle*cst_i,current[4]+y_middle*cst_i,attr,_GROUP__VECT,contextptr));
-      }
-    } else { // vertical picture
-      swapdouble(xmin,ymin);
-      swapdouble(xmax,ymax);
-      double x_scale=(xmax-xmin)/(4*s);
-      for (int i=0;i<s;++i){
-	attr[0]=(i<as?affichages[i]:affichages[0]);
-	attr[1]=(i<ls?legendes[i]:legendes[0]);
-	double x_up=xmax-(4*i+1)*x_scale;
-	double x_middle=xmax-(4*i+2)*x_scale;
-	double x_down=xmax-(4*i+3)*x_scale;
-	vecteur current=gen2vecteur(v[i]);
-	if (current.size()!=5)
-	  continue;
-	// trait min -> 1er quartile
-	res.push_back(symb_segment(x_middle+current[0]*cst_i,current[1]*cst_i+x_middle,attr,_GROUP__VECT,contextptr));
-	// rectangle
-	res.push_back(pnt_attrib(gen(makevecteur(current[1]*cst_i+x_up,current[1]*cst_i+x_down,current[3]*cst_i+x_down,current[3]*cst_i+x_up,current[1]*cst_i+x_up),_GROUP__VECT),attr,contextptr));
-	// mediane
-	res.push_back(symb_segment(current[2]*cst_i+x_down,current[2]*cst_i+x_up,attr,_GROUP__VECT,contextptr));
-	// trait 3eme quartile -> fin
-	res.push_back(symb_segment(current[3]*cst_i+x_middle,current[4]*cst_i+x_middle,attr,_GROUP__VECT,contextptr));
-      }
-    }
-    return gen(res,_SEQ__VECT);
-  }
-  static const char _moustache_s []="moustache";
-  static define_unary_function_eval(unary_moustache,&_moustache,_moustache_s);
-  define_unary_function_ptr5( at_moustache ,alias_at_moustache,&unary_moustache,0,true);
-
-  static const char _boxwhisker_s []="boxwhisker";
-  static define_unary_function_eval(unary_boxwhisker,&_moustache,_boxwhisker_s);
-  define_unary_function_ptr5( at_boxwhisker ,alias_at_boxwhisker,&unary_boxwhisker,0,true);
-
-
-  static gen stddevmean(const vecteur & v,int withstddev,int xcol,int freqcol,GIAC_CONTEXT){
-    int sv=int(v.size());
-    if (xcol>=sv || freqcol>=sv)
-      return gendimerr(contextptr);
-    if (v[xcol].type!=_VECT || v[freqcol].type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur v1(*v[xcol]._VECTptr),v2(*v[freqcol]._VECTptr);
-    // if v1 is made of intervals replace by the center of these intervals
-    iterateur it=v1.begin(),itend=v1.end();
-    for (;it!=itend;++it){
-      if (it->is_symb_of_sommet(at_interval)){
-	gen & f=it->_SYMBptr->feuille;
-	if (f.type==_VECT && f._VECTptr->size()==2)
-	  *it=(f._VECTptr->front()+f._VECTptr->back())/2;
-      }
-    }
-    if (ckmatrix(v1) ^ ckmatrix(v2))
-      return gensizeerr(contextptr);
-    int n=int(v1.size());
-    if (unsigned(n)!=v2.size())
-      return gensizeerr(contextptr);
-    gen m,m2,s;
-    for (int i=0;i<n;++i){
-      s = s + v2[i];
-      m = m + apply(v2[i],v1[i],prod);
-      if (withstddev)
-	m2 = m2 + apply(v2[i],apply(v1[i],v1[i],prod),prod);
-    }
-    m = apply(m,s,contextptr,rdiv);
-    if (withstddev){
-      m2=m2-apply(s,apply(m,m,prod),prod);
-      if (s.type!=_VECT && is_greater(1,s,contextptr) && withstddev==2)
-	*logptr(contextptr) << "stddevp called with N<=1, perhaps you are misusing this command with frequencies" << '\n';
-      m2=apply(m2,s-(withstddev==2),contextptr,rdiv);
-      if (withstddev==3)
-	return m2;
-      return apply(m2,sqrt,contextptr);
-    }
-    else
-      return m;
-  }
-  // withstddev=0 (mean), 1 (stddev divided by n), 2 (by n-1), 3 (variance)
-  static gen stddevmean(const gen & g,int withstddev,GIAC_CONTEXT){
-    vecteur & v=*g._VECTptr;
-    int s=int(v.size());
-    if (s<2)
-      return gensizeerr(contextptr);
-    if (v[1].type!=_INT_)
-      return stddevmean(v,withstddev,0,1,contextptr);
-    if (v[0].type!=_VECT)
-      return gensizeerr(contextptr);
-    int xcol=v[1].val;
-    int freqcol=xcol+1;
-    if (s>2 && v[2].type==_INT_)
-      freqcol=v[2].val;
-    return stddevmean(mtran(*v[0]._VECTptr),withstddev,xcol,freqcol,contextptr);
-  }
-
-  gen _mean(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int nd=is_distribution(g);
-    if (g.type==_SYMB && nd){
-      gen f=g._SYMBptr->feuille;
-      if (f.type==_VECT && f._VECTptr->size()==1)
-	f=f._VECTptr->front();
-      int s=f.type==_VECT?int(f._VECTptr->size()):1;
-      if (s!=distrib_nargs(nd))
-	return gensizeerr(contextptr);
-      if (nd==1)
-	return f[0];
-      if (nd==2)
-	return f[0]*f[1];
-      if (nd==3)
-	return f[0]*(1-f[1])/f[1];
-      if (nd==4 || nd==11)
-	return f;
-      if (nd==5)
-	return (f.type<_IDNT && is_strictly_greater(1,f,contextptr))?undef:0;
-      if (nd==6)
-	return (f[1].type<_IDNT && is_greater(2,f[1],contextptr))?undef:f[1]/(f[1]-2);
-      if (nd==8)
-	return f[1]*Gamma(1+inv(f[0],contextptr),contextptr);
-      if (nd==9)
-	return f[0]/(f[0]+f[1]);
-      if (nd==10)
-	return f[0]/f[1];
-      if (nd==12)
-	return inv(f[0],contextptr);
-      if (nd==13)
-	return (f[1]+f[0])/2;
-      if (nd==14)
-	return inv(f[0],contextptr);
-      return undef;
-    }
-    if (g.type==_VECT && !g._VECTptr->empty() && g._VECTptr->front().type==_FUNC && (nd=is_distribution(g._VECTptr->front()))){
-      return _mean(symbolic(*g._VECTptr->front()._FUNCptr,gen(vecteur(g._VECTptr->begin()+1,g._VECTptr->end()),_SEQ__VECT)),contextptr);
-    }
-    if (g.type==_VECT && g.subtype==_SEQ__VECT)
-      return stddevmean(g,0,contextptr);
-    vecteur v(gen2vecteur(g));
-    if (!ckmatrix(v))
-      return mean(mtran(vecteur(1,v)),true)[0];
-    else
-      v=mean(v,true);
-    return v;
-  }
-  static const char _mean_s []="mean";
-  static define_unary_function_eval (__mean,&_mean,_mean_s);
-  define_unary_function_ptr5( at_mean ,alias_at_mean,&__mean,0,true);
-
-  static const char _moyenne_s []="moyenne";
-  static define_unary_function_eval (__moyenne,&_mean,_moyenne_s);
-  define_unary_function_ptr5( at_moyenne ,alias_at_moyenne,&__moyenne,0,true);
-
-  gen _stdDev(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT)
-      return stddevmean(g,2,contextptr);
-    vecteur v(gen2vecteur(g));
-    if (!ckmatrix(v))
-      return stddev(mtran(vecteur(1,v)),true,2)[0];
-    else
-      v=stddev(v,true,2);
-    return v;
-  }
-  static const char _stdDev_s []="stdDev";
-  static define_unary_function_eval (__stdDev,&_stdDev,_stdDev_s);
-  define_unary_function_ptr5( at_stdDev ,alias_at_stdDev,&__stdDev,0,true);
-
-  static const char _stddevp_s []="stddevp";
-  static define_unary_function_eval (__stddevp,&_stdDev,_stddevp_s);
-  define_unary_function_ptr5( at_stddevp ,alias_at_stddevp,&__stddevp,0,true);
-
-  static const char _ecart_type_population_s []="ecart_type_population";
-  static define_unary_function_eval (__ecart_type_population,&_stdDev,_ecart_type_population_s);
-  define_unary_function_ptr5( at_ecart_type_population ,alias_at_ecart_type_population,&__ecart_type_population,0,true);
-
-  gen _stddev(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int nd;
-    if (g.type==_SYMB && (nd=is_distribution(g))){
-      gen f=g._SYMBptr->feuille;
-      if (f.type==_VECT && f._VECTptr->size()==1)
-	f=f._VECTptr->front();
-      int s=f.type==_VECT?int(f._VECTptr->size()):1;
-      if (s!=distrib_nargs(nd))
-	return gensizeerr(contextptr);
-      if (nd==1)
-	return f[1];
-      if (nd==2)
-	return sqrt(f[0]*f[1]*(1-f[1]),contextptr);
-      if (nd==3)
-	return sqrt(f[0]*(1-f[1]),contextptr)/f[1];
-      if (nd==4)
-	return sqrt(f,contextptr);
-      if (nd==11)
-	return sqrt(2*f,contextptr);
-      if (nd==5){
-	if (f.type<_IDNT && is_greater(1,f,contextptr)) return undef;
-	if (f.type<_IDNT && is_greater(2,f,contextptr)) return plus_inf;
-	return sqrt(f/(f-2),contextptr);
-      }
-      if (nd==6)
-	return (f[1].type<_IDNT && is_greater(4,f[1],contextptr))?undef:f[1]/(f[1]-2)*sqrt(2*(f[0]+f[1]-2)/f[0]/(f[1]-4),contextptr);
-      if (nd==8)
-	return f[1]*sqrt(Gamma(1+gen(2)/f[0],contextptr)-pow(Gamma(1+gen(1)/f[0],contextptr),2,contextptr),contextptr);
-      if (nd==9)
-	return sqrt(f[0]*f[1]/(f[0]+f[1]+1),contextptr)/(f[0]+f[1]);
-      if (nd==10)
-	return sqrt(f[0],contextptr)/f[1];
-      if (nd==12)
-	return sqrt(1-f[0],contextptr)/f[0];
-      if (nd==13)
-	return (f[1]-f[0])*sqrt(3,contextptr)/6;
-      if (nd==14)
-	return inv(f[0],contextptr);
-      return undef;
-    }
-    if (g.type==_VECT && !g._VECTptr->empty() && g._VECTptr->front().type==_FUNC && (nd=is_distribution(g._VECTptr->front()))){
-      return _stddev(symbolic(*g._VECTptr->front()._FUNCptr,gen(vecteur(g._VECTptr->begin()+1,g._VECTptr->end()),_SEQ__VECT)),contextptr);
-    }
-    if (g.type==_VECT && g.subtype==_SEQ__VECT)
-      return stddevmean(g,1,contextptr);
-    vecteur v(gen2vecteur(g));
-    if (!ckmatrix(v))
-      return stddev(mtran(vecteur(1,v)),true,1)[0];
-    else
-      v=stddev(v,true,1);
-    return v;
-  }
-  static const char _stddev_s []="stddev";
-  static define_unary_function_eval (__stddev,&_stddev,_stddev_s);
-  define_unary_function_ptr5( at_stddev ,alias_at_stddev,&__stddev,0,true);
-
-  static const char _ecart_type_s []="ecart_type";
-  static define_unary_function_eval (__ecart_type,&_stddev,_ecart_type_s);
-  define_unary_function_ptr5( at_ecart_type ,alias_at_ecart_type,&__ecart_type,0,true);
-
-  gen _variance(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT)
-      return stddevmean(g,3,contextptr);
-    vecteur v(gen2vecteur(g));
-    if (!ckmatrix(v))
-      return stddev(mtran(vecteur(1,v)),true,3)[0];
-    else
-      v=stddev(v,true,3);
-    return v;
-  }
-  static const char _variance_s []="variance";
-static define_unary_function_eval (__variance,&_variance,_variance_s);
-  define_unary_function_ptr5( at_variance ,alias_at_variance,&__variance,0,true);
-
-  vecteur genpoint2vecteur(const gen & g,GIAC_CONTEXT){
-    vecteur v(gen2vecteur(g));
-    for (unsigned i=0;i<v.size();++i){
-      gen & tmp = v[i];
-      if (tmp.is_symb_of_sommet(at_pnt))
-	tmp=complex2vecteur(remove_at_pnt(tmp),contextptr);
-    }
-    return v;
-  }
-
-  static vecteur covariance_correlation(const gen & g,const gen & u1,const gen & u2,int xcol,int ycol,int freqcol,GIAC_CONTEXT){
-    if (is_undef(g))
-      return makevecteur(g,g);
-    vecteur v(genpoint2vecteur(g,contextptr));
-    if (!ckmatrix(v) || v.empty() || v.front()._VECTptr->size()<2)
-      return makevecteur(undef,undef);
-    gen sigmax,sigmay,sigmaxy,sigmax2,sigmay2,tmpx,tmpy,n,freq;
-    if (freqcol<-1){
-      // g is interpreted as a double-entry table with 1st col = x-values
-      // 1st line=y-values, line/col is a frequency for this value of x/y
-      int r,c;
-      mdims(v,r,c);
-      if (r<2 || c<2)
-	return makevecteur(gendimerr(contextptr),gendimerr(contextptr));
-      vecteur & vy=*v[0]._VECTptr;
-      for (int i=1;i<r;++i){
-	vecteur & w=*v[i]._VECTptr;
-	gen & currentx=w[0];
-	for (int j=1;j<c;++j){
-	  gen & currenty=vy[j];
-	  freq=w[j];
-	  n=n+freq;
-	  sigmax=sigmax+currentx*freq;
-	  sigmax2=sigmax2+currentx*currentx*freq;
-	  sigmay=sigmay+currenty*freq;
-	  sigmay2=sigmay2+currenty*currenty*freq;
-	  sigmaxy=sigmaxy+currentx*currenty*freq;
-	}
-      }
-    }
-    else {
-      const_iterateur it=v.begin(),itend=v.end();
-      int s=int(it->_VECTptr->size());
-      if (xcol>=s || ycol>=s || freqcol >=s)
-	return makevecteur(gendimerr(contextptr),gendimerr(contextptr));
-      for (;it!=itend;++it){
-	vecteur & w=*it->_VECTptr;
-	if (u1.type==_FUNC)
-	  tmpx=u1(w[xcol],contextptr);
-	else
-	  tmpx=w[xcol];
-	if (u2.type==_FUNC)
-	  tmpy=u2(w[ycol],contextptr);
-	else
-	  tmpy=w[ycol];
-	if (freqcol>=0)
-	  freq=w[freqcol];
-	else
-	  freq=plus_one;
-	n = n+freq;
-	sigmax = sigmax + tmpx*freq;
-	sigmax2 = sigmax2 + tmpx*tmpx*freq;
-	sigmay = sigmay + tmpy*freq;
-	sigmay2 = sigmay2 + tmpy*tmpy*freq;
-	sigmaxy = sigmaxy + tmpx*tmpy*freq;
-      }
-    }
-    gen covariance=(n*sigmaxy-sigmax*sigmay)/(n*n);
-    gen correlation=(n*sigmaxy-sigmax*sigmay)/sqrt((n*sigmax2-sigmax*sigmax)*(n*sigmay2-sigmay*sigmay),contextptr);
-    return makevecteur(covariance,correlation);
-  }
-  
-  static void find_xyfreq(const gen & g,gen & gv,int & xcol,int & ycol,int &freqcol,GIAC_CONTEXT){
-    xcol=0;
-    ycol=1;
-    freqcol=-1;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && !g._VECTptr->empty()){
-      vecteur v=*g._VECTptr;
-      if (v[0].type!=_VECT){
-	gv=gensizeerr(contextptr);
-	return;
-      }
-      int s=int(v.size());
-      if (s==3 && v[1].type==_VECT){
-	if (!ckmatrix(v[2]))
-	  v[2]=_diag(v[2],contextptr);
-	int n,c;
-	mdims(*v[2]._VECTptr,n,c);
-	if (unsigned(n)==v[0]._VECTptr->size() && unsigned(c)==v[1]._VECTptr->size()){
-	  vecteur v0(*v[1]._VECTptr);
-	  v0.insert(v0.begin(),zero);
-	  matrice m(mtran(*v[2]._VECTptr));
-	  m.insert(m.begin(),v[0]);
-	  m=mtran(m);
-	  m.insert(m.begin(),v0);
-	  gv=m;
-	  freqcol=-2;
-	  return;
-	}
-      }
-      if (s>1) {
-	if (v[1].type==_INT_){
-	  xcol=v[1].val;
-	  if (xcol<0)
-	    freqcol=-2;
-	}
-	else {
-	  if (!ckmatrix(v))
-	    gv=gensizeerr(contextptr);
-	  else
-	    gv=mtran(v);
-	  return;
-	}
-      }
-      if (s>2 && v[2].type==_INT_)
-	ycol=v[2].val;
-      if (s>3 && v[3].type==_INT_)
-	freqcol=v[3].val;
-      gv=v[0];
-    }
-    else {
-      gv=genpoint2vecteur(g,contextptr);
-      if (!ckmatrix(gv) || gv._VECTptr->empty()){
-	gv=gensizeerr(contextptr);
-	return;
-      }
-      if (gv._VECTptr->front()._VECTptr->size()>2)
-	freqcol=2;
-      if (gv._VECTptr->front()._VECTptr->front().type==_STRNG)
-	freqcol=-2;
-    }
-  }
-  gen _covariance_correlation(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int xcol,ycol,freqcol;
-    gen gv;
-    find_xyfreq(g,gv,xcol,ycol,freqcol,contextptr);
-    if (is_undef(gv)) return gv;
-    return covariance_correlation(gv,zero,zero,xcol,ycol,freqcol,contextptr);      
-  }
-  static const char _covariance_correlation_s []="covariance_correlation";
-static define_unary_function_eval (__covariance_correlation,&_covariance_correlation,_covariance_correlation_s);
-  define_unary_function_ptr5( at_covariance_correlation ,alias_at_covariance_correlation,&__covariance_correlation,0,true);
-
-  gen _covariance(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int xcol,ycol,freqcol;
-    gen gv;
-    find_xyfreq(g,gv,xcol,ycol,freqcol,contextptr);
-    if (is_undef(gv)) return gv;
-    return covariance_correlation(gv,zero,zero,xcol,ycol,freqcol,contextptr)[0];
-  }
-  static const char _covariance_s []="covariance";
-static define_unary_function_eval (__covariance,&_covariance,_covariance_s);
-  define_unary_function_ptr5( at_covariance ,alias_at_covariance,&__covariance,0,true);
-
-  gen _correlation(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    int xcol,ycol,freqcol;
-    gen gv;
-    find_xyfreq(g,gv,xcol,ycol,freqcol,contextptr);
-    if (is_undef(gv)) return gv;
-    return covariance_correlation(gv,zero,zero,xcol,ycol,freqcol,contextptr)[1];
-  }
-  static const char _correlation_s []="correlation";
-static define_unary_function_eval (__correlation,&_correlation,_correlation_s);
-  define_unary_function_ptr5( at_correlation ,alias_at_correlation,&__correlation,0,true);
-
-  gen _interval2center(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT)
-      return apply(g,_interval2center,contextptr);
-    if (g.type==_REAL)
-      return _milieu(g,contextptr);
-    if (g.is_symb_of_sommet(at_interval)){
-      gen & tmp=g._SYMBptr->feuille;
-      if (tmp.type!=_VECT || tmp._VECTptr->size()!=2)
-	return gensizeerr(contextptr);
-      vecteur & v=*tmp._VECTptr;
-      return (v.front()+v.back())/2;
-    }
-    return g;
-  }
-  static const char _interval2center_s []="interval2center";
-  static define_unary_function_eval (__interval2center,&_interval2center,_interval2center_s);
-  define_unary_function_ptr5( at_interval2center ,alias_at_interval2center,&__interval2center,0,true);
-
-  vector<double> vector3(const gen & x,const gen &y,const gen & f,GIAC_CONTEXT){
-    vector<double> res;
-    res.push_back(evalf_double(x,1,contextptr)._DOUBLE_val);
-    res.push_back(evalf_double(y,1,contextptr)._DOUBLE_val);
-    res.push_back(evalf_double(f,1,contextptr)._DOUBLE_val);
-    return res;
-  }
-
-  void Tran4(double * colmat){
-    giac::swapdouble(colmat[1],colmat[4]);
-    giac::swapdouble(colmat[2],colmat[8]);
-    giac::swapdouble(colmat[3],colmat[12]);
-    giac::swapdouble(colmat[6],colmat[9]);
-    giac::swapdouble(colmat[7],colmat[13]);
-    giac::swapdouble(colmat[11],colmat[14]);    
-  }
-
-  void Mult4(double * colmat,double * vect,double * res){
-    res[0]=colmat[0]*vect[0]+colmat[4]*vect[1]+colmat[8]*vect[2]+colmat[12]*vect[3];
-    res[1]=colmat[1]*vect[0]+colmat[5]*vect[1]+colmat[9]*vect[2]+colmat[13]*vect[3];
-    res[2]=colmat[2]*vect[0]+colmat[6]*vect[1]+colmat[10]*vect[2]+colmat[14]*vect[3];
-    res[3]=colmat[3]*vect[0]+colmat[7]*vect[1]+colmat[11]*vect[2]+colmat[15]*vect[3];
-  }
-
-  void Mult4(double * c,double k,double * res){
-    for (int i=0;i<16;i++)
-      res[i]=k*c[i];
-  }
-  
-  double Det4(double * c){
-    return c[0]*c[5]*c[10]*c[15]-c[0]*c[5]*c[14]*c[11]-c[0]*c[9]*c[6]*c[15]+c[0]*c[9]*c[14]*c[7]+c[0]*c[13]*c[6]*c[11]-c[0]*c[13]*c[10]*c[7]-c[4]*c[1]*c[10]*c[15]+c[4]*c[1]*c[14]*c[11]+c[4]*c[9]*c[2]*c[15]-c[4]*c[9]*c[14]*c[3]-c[4]*c[13]*c[2]*c[11]+c[4]*c[13]*c[10]*c[3]+c[8]*c[1]*c[6]*c[15]-c[8]*c[1]*c[14]*c[7]-c[8]*c[5]*c[2]*c[15]+c[8]*c[5]*c[14]*c[3]+c[8]*c[13]*c[2]*c[7]-c[8]*c[13]*c[6]*c[3]-c[12]*c[1]*c[6]*c[11]+c[12]*c[1]*c[10]*c[7]+c[12]*c[5]*c[2]*c[11]-c[12]*c[5]*c[10]*c[3]-c[12]*c[9]*c[2]*c[7]+c[12]*c[9]*c[6]*c[3];
-  }
-
-  void Inv4(double * c,double * res){
-    res[0]=c[5]*c[10]*c[15]-c[5]*c[14]*c[11]-c[10]*c[7]*c[13]-c[15]*c[9]*c[6]+c[14]*c[9]*c[7]+c[11]*c[6]*c[13];
-    res[1]=-c[1]*c[10]*c[15]+c[1]*c[14]*c[11]+c[10]*c[3]*c[13]+c[15]*c[9]*c[2]-c[14]*c[9]*c[3]-c[11]*c[2]*c[13];
-    res[2]=c[1]*c[6]*c[15]-c[1]*c[14]*c[7]-c[6]*c[3]*c[13]-c[15]*c[5]*c[2]+c[14]*c[5]*c[3]+c[7]*c[2]*c[13];
-    res[3]=-c[1]*c[6]*c[11]+c[1]*c[10]*c[7]+c[6]*c[3]*c[9]+c[11]*c[5]*c[2]-c[10]*c[5]*c[3]-c[7]*c[2]*c[9];
-    res[4]=-c[4]*c[10]*c[15]+c[4]*c[14]*c[11]+c[10]*c[7]*c[12]+c[15]*c[8]*c[6]-c[14]*c[8]*c[7]-c[11]*c[6]*c[12];
-    res[5]=c[0]*c[10]*c[15]-c[0]*c[14]*c[11]-c[10]*c[3]*c[12]-c[15]*c[8]*c[2]+c[14]*c[8]*c[3]+c[11]*c[2]*c[12];
-    res[6]=-c[0]*c[6]*c[15]+c[0]*c[14]*c[7]+c[6]*c[3]*c[12]+c[15]*c[4]*c[2]-c[14]*c[4]*c[3]-c[7]*c[2]*c[12];
-    res[7]=c[0]*c[6]*c[11]-c[0]*c[10]*c[7]-c[6]*c[3]*c[8]-c[11]*c[4]*c[2]+c[10]*c[4]*c[3]+c[7]*c[2]*c[8];
-    res[8]=c[4]*c[9]*c[15]-c[4]*c[13]*c[11]-c[9]*c[7]*c[12]-c[15]*c[8]*c[5]+c[13]*c[8]*c[7]+c[11]*c[5]*c[12];
-    res[9]=-c[0]*c[9]*c[15]+c[0]*c[13]*c[11]+c[9]*c[3]*c[12]+c[15]*c[8]*c[1]-c[13]*c[8]*c[3]-c[11]*c[1]*c[12];
-    res[10]=c[0]*c[5]*c[15]-c[0]*c[13]*c[7]-c[5]*c[3]*c[12]-c[15]*c[4]*c[1]+c[13]*c[4]*c[3]+c[7]*c[1]*c[12];
-    res[11]=-c[0]*c[5]*c[11]+c[0]*c[9]*c[7]+c[5]*c[3]*c[8]+c[11]*c[4]*c[1]-c[9]*c[4]*c[3]-c[7]*c[1]*c[8];
-    res[12]=-c[4]*c[9]*c[14]+c[4]*c[13]*c[10]+c[9]*c[6]*c[12]+c[14]*c[8]*c[5]-c[13]*c[8]*c[6]-c[10]*c[5]*c[12];
-    res[13]=c[0]*c[9]*c[14]-c[0]*c[13]*c[10]-c[9]*c[2]*c[12]-c[14]*c[8]*c[1]+c[13]*c[8]*c[2]+c[10]*c[1]*c[12];
-    res[14]=-c[0]*c[5]*c[14]+c[0]*c[13]*c[6]+c[5]*c[2]*c[12]+c[14]*c[4]*c[1]-c[13]*c[4]*c[2]-c[6]*c[1]*c[12];
-    res[15]=c[0]*c[5]*c[10]-c[0]*c[9]*c[6]-c[5]*c[2]*c[8]-c[10]*c[4]*c[1]+c[9]*c[4]*c[2]+c[6]*c[1]*c[8];
-    double det=Det4(c);
-    Mult4(res,1/det,res);
-  }
-  gen function_regression(const gen & g,const gen & u1,const gen & u2,gen & a,gen &b,double & xmin,double & xmax,gen & correl2,GIAC_CONTEXT){
-    gen gv,freq;
-    int xcol,ycol,freqcol;
-    xmin=1e300;
-    xmax=-xmin;
-    double ymin=1e300,ymax=-ymin; // for trig regressions initial guess
-    find_xyfreq(g,gv,xcol,ycol,freqcol,contextptr);
-    if (!ckmatrix(gv))
-      return gensizeerr(contextptr);
-    vecteur & v = *gv._VECTptr;
-    gen n;
-    gen sigmax,sigmay,sigmaxy,sigmax2,sigmay2,tmpx,tmpy;
-    vector< vector<double> > trig;
-    if (freqcol<-1){
-      int r,c;
-      mdims(v,r,c);
-      if (r<2 || c<2)
-	return gendimerr(contextptr);
-      vecteur & vy=*v[0]._VECTptr;
-      gen currentx,currenty;
-      for (int i=1;i<r;++i){
-	vecteur & w=*v[i]._VECTptr;
-	gen tmpg=evalf_double(w[0],1,contextptr);
-	if (tmpg.type==_DOUBLE_){
-	  double tmp=tmpg._DOUBLE_val;
-	  if (tmp<xmin)
-	    xmin=tmp;
-	  if (tmp>xmax)
-	    xmax=tmp;
-	}
-	if (u1.type==_FUNC && u1!=at_sin){
-	  currentx=u1(w[0],contextptr);
-	}
-	else
-	  currentx=w[0];
-	for (int j=1;j<c;++j){
-	  if (u2.type==_FUNC)
-	    currenty=u2(vy[j],contextptr);
-	  else
-	    currenty=vy[j];
-	  currenty=_interval2center(currenty,contextptr);
-	  if (is_undef(currenty))
-	    return currenty;
-	  tmpg=evalf_double(currenty,1,contextptr);
-	  if (tmpg.type==_DOUBLE_){
-	    double tmp=tmpg._DOUBLE_val;
-	    if (tmp<ymin)
-	      ymin=tmp;
-	    if (tmp>ymax)
-	      ymax=tmp;
-	  }
-	  freq=w[j];
-	  if (u1==at_sin)
-	    trig.push_back(vector3(currentx,currenty,freq,contextptr));
-	  n=n+freq;
-	  sigmax=sigmax+currentx*freq;
-	  sigmax2=sigmax2+currentx*currentx*freq;
-	  sigmay=sigmay+currenty*freq;
-	  sigmay2=sigmay2+currenty*currenty*freq;
-	  sigmaxy=sigmaxy+currentx*currenty*freq;
-	}
-      }
-    }
-    else {
-      const_iterateur it=v.begin(),itend=v.end();
-      for (;it!=itend;++it){
-	vecteur & w=*it->_VECTptr;
-	gen tmpg=evalf_double(w[xcol],1,contextptr);
-	if (tmpg.type==_DOUBLE_){
-	  double tmp=tmpg._DOUBLE_val;
-	  if (tmp<xmin)
-	    xmin=tmp;
-	  if (tmp>xmax)
-	    xmax=tmp;
-	}
-	if (u1.type==_FUNC && u1!=at_sin){
-	  tmpx=u1(w[xcol],contextptr);
-	}
-	else
-	  tmpx=w[xcol];
-	tmpx=_interval2center(tmpx,contextptr);
-	if (is_undef(tmpx))
-	  return tmpx;
-	if (u2.type==_FUNC)
-	  tmpy=u2(w[ycol],contextptr);
-	else
-	  tmpy=w[ycol];
-	tmpy=_interval2center(tmpy,contextptr);
-	if (is_undef(tmpy))
-	  return tmpy;
-	tmpg=evalf_double(tmpy,1,contextptr);
-	if (tmpg.type==_DOUBLE_){
-	  double tmp=tmpg._DOUBLE_val;
-	  if (tmp<ymin)
-	    ymin=tmp;
-	  if (tmp>ymax)
-	    ymax=tmp;
-	}	
-	if (freqcol<0)
-	  freq=plus_one;
-	else
-	  freq=w[freqcol];
-	if (u1==at_sin)
-	  trig.push_back(vector3(tmpx,tmpy,freq,contextptr));
-	sigmax = sigmax + freq*tmpx;
-	sigmax2 = sigmax2 + freq*tmpx*tmpx;
-	sigmay = sigmay + freq*tmpy;
-	sigmay2 = sigmay2 + freq*tmpy*tmpy;
-	sigmaxy = sigmaxy + freq*tmpx*tmpy;
-	n = n + freq;
-      }
-    }
-    gen tmp=(n*sigmaxy-sigmax*sigmay);
-    a=tmp/(n*sigmax2-sigmax*sigmax);
-    b=(sigmay-a*sigmax)/n;
-    correl2=(tmp*tmp)/(n*sigmax2-sigmax*sigmax)/(n*sigmay2-sigmay*sigmay);
-    if (u1==at_sin){ // trig regression a*sin(omega*x+phi)+b
-      // initial guess b=(ymax+ymin)/2, a=(ymax-ymin)
-      // estimate period with crossings of y=b
-      double b_=(ymax+ymin)/2,a_=(ymax-ymin)/2,omega,phi;
-      int n=trig.size();
-      vector<double> crossup,crossdown,cross;
-      for (int i=1;i<n;++i){
-	double x0=trig[i-1][0],x1=trig[i][0];
-	double y0=trig[i-1][1],y1=trig[i][1];
-	double m=(y1-y0)/(x1-x0);
-	double xb=x0+(b_-y0)/m;
-	if ( (y1-b_)>0 && (y0-b_)<=0 ){
-	  crossup.push_back(xb);
-	  cross.push_back(xb);
-	}
-	if ( (y1-b_)<0 && (y0-b_)>=0 ){
-	  crossdown.push_back(xb);
-	  cross.push_back(xb);
-	}
-      }
-      if (cross.size()<2)
-	return gensizeerr(contextptr);
-      double half_period=(cross.back()-cross.front())/(cross.size()-1);
-      double period=2*half_period;
-      omega=2*M_PI/period;
-      phi=0;
-      for (int i=0;i<crossup.size();++i){
-	phi -= crossup[i]-i*period;
-      }
-      phi /= crossup.size();
-      phi -= std::floor(phi/2/M_PI+.5)*2*M_PI;
-#if 1
-      while (1){
-	// E = 1/2*sum( f*(a*sin(x*o+phi)+b-y)^2)
-	// Newton iteration compute first and second derivatives 
-	// E:=1/2*f*(a*sin(x*o+phi)+b-y)^2
-	// subst(factor(diff(E,[a,b,o,phi])),[sin(x*o+phi),cos(x*o+phi)],[s,c])
-	// subst(factor(diff(diff(E,[a,b,o,phi]),[a,b,o,phi])),[sin(x*o+phi),cos(x*o+phi)],[s,c])
-	double dE[4]={0,0,0,0},delta[4];
-	double d2E[16]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},invd2E[16];
-	for (int i=0;i<n;++i){
-	  double x=trig[i][0];
-	  double y=trig[i][1];
-	  double f=trig[i][2];
-	  double s=std::sin(x*omega+phi);
-	  double c=std::cos(x*omega+phi);
-	  double asby=(a_*s+b_-y);
-	  // [f*s*(a*s+b-y),f*(a*s+b-y),a*c*f*x*(a*s+b-y),a*c*f*(a*s+b-y)]
-	  dE[0] += f*s*asby;
-	  dE[1] += f*asby;
-	  dE[2] += a_*f*x*c*asby;
-	  dE[3] += a_*f*c*asby;
-	  double as2by=(2*a_*s+b_-y);
-	  // f*s^2,f*s,c*f*x*(2*a*s+b-y),c*f*(2*a*s+b-y)
-	  d2E[0] += f*s*s;
-	  d2E[1] += f*s;
-	  d2E[2] += c*f*x*as2by;
-	  d2E[3] += c*f*as2by;
-	  // f*s,f,a*c*f*x,a*c*f
-	  d2E[4] += f*s;
-	  d2E[5] += f;
-	  d2E[6] += a_*c*f*x;
-	  d2E[7] += a_*c*f;
-	  double ac2s2=a_*(s*s-c*c)+s*(b_-y);
-	  // c*f*x*(2*a*s+b-y),a*c*f*x,-a*f*x^2*(-a*c^2+a*s^2+b*s-s*y),-a*f*x*(-a*c^2+a*s^2+b*s-s*y)
-	  d2E[8] += c*f*x*as2by;
-	  d2E[9] += a_*c*f*x;
-	  d2E[10] += -a_*f*x*x*ac2s2;
-	  d2E[11] += -a_*f*x*ac2s2;
-	  // c*f*(2*a*s+b-y),a*c*f,-a*f*x*(-a*c^2+a*s^2+b*s-s*y),-a*f*(-a*c^2+a*s^2+b*s-s*y)
-	  d2E[12] += c*f*as2by;
-	  d2E[13] += a_*c*f;
-	  d2E[14] += -a_*f*x*ac2s2;
-	  d2E[15] += -a_*f*ac2s2;
-	}
-	Tran4(d2E);
-	Inv4(d2E,invd2E);
-	Mult4(invd2E,dE,delta);
-	a_ -= delta[0];
-	b_ -= delta[1];
-	omega -= delta[2];
-	phi -= delta[3];
-	if (fabs(a_?delta[0]/a_:delta[0])+fabs(b_?delta[1]/b_:delta[1])+fabs(omega?delta[2]/omega:delta[2])+fabs(phi?delta[3]/phi:delta[3])<1e-7)
-	  break;	
-      }
-      a=makesequence(a_,b_,omega,phi);
-#else
-      gen E,A(identificateur("A")),B(identificateur("B")),O(identificateur("omega")),P(identificateur("phi"));
-      for (int i=0;i<n;++i){
-	double x=trig[i][0];
-	double y=trig[i][1];
-	E += trig[i][2]*symb_pow(A*sin(x*O+P,contextptr)+B-y,2);
-      }
-      // now solve E'=0
-      gen vars(makevecteur(A,B,O,P));
-      a=_fsolve(makesequence(symb_equal(derive(E,vars,contextptr),0),vars,makevecteur(a_,b_,omega,phi)),contextptr);
-#endif
-      b=undef;
-    }
-    return makevecteur(sigmax,sigmay,n,sigmax2,sigmay2);
-    // cerr << sigmax << " "<< sigmay << " " << sigmaxy << " " << n << " " << sigmax2 << " " << sigmay2 << '\n';
-  }
-
-  static gen function_regression(const gen & g,const gen & u1,const gen & u2,GIAC_CONTEXT){
-    gen a,b,correl2;
-    double xmin,xmax;
-    gen errcode=function_regression(g,u1,u2,a,b,xmin,xmax,correl2,contextptr);
-    if (is_undef(errcode)) return errcode;
-    return gen(makevecteur(a,b),_SEQ__VECT);
-  }
-
-  gen _linear_regression(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return function_regression(g,zero,zero,contextptr);
-  }
-  static const char _linear_regression_s []="linear_regression";
-static define_unary_function_eval (__linear_regression,&_linear_regression,_linear_regression_s);
-  define_unary_function_ptr5( at_linear_regression ,alias_at_linear_regression,&__linear_regression,0,true);
-
-  gen _sin_regression(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen res=function_regression(g,at_sin,zero,contextptr);
-    if (res.type!=_VECT || res._VECTptr->size()!=2) return gensizeerr(contextptr);
-    res=res._VECTptr->front();
-    return makesequence(res,res[0]*symb_sin(res[2]*vx_var+res[3])+res[1]);
-  }
-  static const char _sin_regression_s []="sin_regression";
-static define_unary_function_eval (__sin_regression,&_sin_regression,_sin_regression_s);
-  define_unary_function_ptr5( at_sin_regression ,alias_at_sin_regression,&__sin_regression,0,true);
-
-  gen _exponential_regression(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return exp(function_regression(g,zero,at_ln,contextptr),contextptr);
-  }
-  static const char _exponential_regression_s []="exponential_regression";
-static define_unary_function_eval (__exponential_regression,&_exponential_regression,_exponential_regression_s);
-  define_unary_function_ptr5( at_exponential_regression ,alias_at_exponential_regression,&__exponential_regression,0,true);
-
-  gen _logarithmic_regression(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return function_regression(g,at_ln,zero,contextptr);
-  }
-  static const char _logarithmic_regression_s []="logarithmic_regression";
-static define_unary_function_eval (__logarithmic_regression,&_logarithmic_regression,_logarithmic_regression_s);
-  define_unary_function_ptr5( at_logarithmic_regression ,alias_at_logarithmic_regression,&__logarithmic_regression,0,true);
-
-  gen _power_regression(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen res= function_regression(evalf(g,1,contextptr),at_ln,at_ln,contextptr);
-    if (res.type==_VECT && res._VECTptr->size()==2){
-      vecteur v(*res._VECTptr);
-      v[1]=exp(v[1],contextptr);
-      return gen(v,_SEQ__VECT);
-    }
-    return res;
-  }
-  static const char _power_regression_s []="power_regression";
-static define_unary_function_eval (__power_regression,&_power_regression,_power_regression_s);
-  define_unary_function_ptr5( at_power_regression ,alias_at_power_regression,&__power_regression,0,true);
-
-  gen regression_plot_attributs(const gen & g,vecteur & attributs,bool & eq,bool & r,GIAC_CONTEXT){
-    gen res=g;
-    r=false; eq=false;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT){
-      int n=read_attributs(*g._VECTptr,attributs,contextptr);
-      vecteur v=vecteur(g._VECTptr->begin(),g._VECTptr->begin()+n);
-      vecteur & w=*g._VECTptr;
-      int ws=int(w.size());
-      for (int i=0;i<ws;++i){
-	if (w[i]==at_equation){
-	  eq=true;
-	  if (i<n){
-	    v.erase(v.begin()+i);
-	    --n;
-	    --i;
-	  }
-	}
-	if (w[i]==at_correlation){
-	  r=true;
-	  if (i<n){
-	    v.erase(v.begin()+i);
-	    --n;
-	    --i;
-	  }
-	}
-      }
-      if (n==1)
-	res=g._VECTptr->front();
-      else
-	res=gen(v,_SEQ__VECT);
-    }
-    else
-      attributs=vecteur(1,default_color(contextptr));
-    return res;
-  }
-
-  gen _linear_regression_plot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen a,b,correl2;
-    double xmin,xmax;
-    vecteur attributs;
-    bool eq,r;
-    gen G=regression_plot_attributs(g,attributs,eq,r,contextptr);
-    gen errcode=function_regression(G,zero,zero,a,b,xmin,xmax,correl2,contextptr);
-    if (is_undef(errcode)) return errcode;
-    xmax += (xmax-xmin); 
-    gen ad(evalf_double(a,1,contextptr)),bd(evalf_double(b,1,contextptr)),cd(evalf_double(correl2,1,contextptr));
-    if (ad.type==_DOUBLE_ && bd.type==_DOUBLE_ && cd.type==_DOUBLE_){
-      string eqs="y="+print_DOUBLE_(ad._DOUBLE_val,3)+"*x+"+print_DOUBLE_(bd._DOUBLE_val,3);
-      string R2s=" , R2="+print_DOUBLE_(cd._DOUBLE_val,3);
-      *logptr(contextptr) << eqs << R2s << '\n';
-      string s;
-      if (eq)
-	s += eqs;
-      if (r)
-	s += R2s;
-      attributs.push_back(string2gen(s,false));
-    }
-    return makesequence(_scatterplot(g,contextptr),put_attributs(_droite(makesequence(b*cst_i,1+(b+a)*cst_i),contextptr),attributs,contextptr));
-  }
-  static const char _linear_regression_plot_s []="linear_regression_plot";
-static define_unary_function_eval (__linear_regression_plot,&_linear_regression_plot,_linear_regression_plot_s);
-  define_unary_function_ptr5( at_linear_regression_plot ,alias_at_linear_regression_plot,&__linear_regression_plot,0,true);
-
-  gen _exponential_regression_plot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen a,b,correl2;
-    double xmin,xmax;
-    vecteur attributs;
-    bool eq,r;
-    gen G=regression_plot_attributs(g,attributs,eq,r,contextptr);
-    gen errcode=function_regression(G,zero,at_ln,a,b,xmin,xmax,correl2,contextptr);
-    if (is_undef(errcode)) return errcode;
-    gen ad(evalf_double(a,1,contextptr)),bd(evalf_double(b,1,contextptr)),cd(evalf_double(correl2,1,contextptr));
-    if (ad.type==_DOUBLE_ && bd.type==_DOUBLE_ && cd.type==_DOUBLE_){
-      string eqs="y="+print_DOUBLE_(std::exp(ad._DOUBLE_val),3)+"^x*"+print_DOUBLE_(std::exp(bd._DOUBLE_val),3);
-      string R2s=" , R2="+print_DOUBLE_(cd._DOUBLE_val,3);
-      *logptr(contextptr) << eqs << R2s << '\n';
-      string s;
-      if (eq)
-	s += eqs;
-      if (r)
-	s += R2s;
-      attributs.push_back(string2gen(s,false));
-    }
-    return makesequence(_scatterplot(g,contextptr),put_attributs(_plotfunc(gen(makevecteur(evalf(exp(b,contextptr),1,contextptr)*exp(a*vx_var,contextptr),symb_equal(vx_var,symb_interval(xmin,xmax))),_SEQ__VECT),contextptr),attributs,contextptr));
-  }
-  static const char _exponential_regression_plot_s []="exponential_regression_plot";
-static define_unary_function_eval (__exponential_regression_plot,&_exponential_regression_plot,_exponential_regression_plot_s);
-  define_unary_function_ptr5( at_exponential_regression_plot ,alias_at_exponential_regression_plot,&__exponential_regression_plot,0,true);
-
-  gen _logarithmic_regression_plot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen a,b,correl2;
-    double xmin,xmax;
-    vecteur attributs;
-    bool eq,r;
-    gen G=regression_plot_attributs(g,attributs,eq,r,contextptr);
-    gen errcode=function_regression(G,at_ln,zero,a,b,xmin,xmax,correl2,contextptr);
-    if (is_undef(errcode)) return errcode;
-    xmax += (xmax-xmin); 
-    gen ad(evalf_double(a,1,contextptr)),bd(evalf_double(b,1,contextptr)),cd(evalf_double(correl2,1,contextptr));
-    if (ad.type==_DOUBLE_ && bd.type==_DOUBLE_ && cd.type==_DOUBLE_){
-      string eqs="y="+print_DOUBLE_(ad._DOUBLE_val,3)+"*ln(x)+"+print_DOUBLE_(bd._DOUBLE_val,3);
-      string R2s=" , R2="+print_DOUBLE_(cd._DOUBLE_val,3);
-      *logptr(contextptr) << eqs << R2s << '\n';
-      string s;
-      if (eq)
-	s += eqs;
-      if (r)
-	s += R2s;
-      attributs.push_back(string2gen(s,false));
-    }
-    return makesequence(_scatterplot(g,contextptr),put_attributs(_plotfunc(gen(makevecteur(a*ln(vx_var,contextptr)+b,symb_equal(vx_var,symb_interval(xmin,xmax))),_SEQ__VECT),contextptr),attributs,contextptr));
-  }
-  static const char _logarithmic_regression_plot_s []="logarithmic_regression_plot";
-static define_unary_function_eval (__logarithmic_regression_plot,&_logarithmic_regression_plot,_logarithmic_regression_plot_s);
-  define_unary_function_ptr5( at_logarithmic_regression_plot ,alias_at_logarithmic_regression_plot,&__logarithmic_regression_plot,0,true);
-
-  gen _sin_regression_plot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen a,b,correl2;
-    double xmin,xmax;
-    vecteur attributs;
-    bool eq,r;
-    gen G=regression_plot_attributs(g,attributs,eq,r,contextptr);
-    gen res=function_regression(G,at_sin,zero,a,b,xmin,xmax,correl2,contextptr);
-    res=a;
-    if (is_undef(res) || res.type!=_VECT || res._VECTptr->size()!=4) return res;
-    res = res[0]*symb_sin(res[2]*vx_var+res[3])+res[1];
-    string eqs="y="+res.print(contextptr);
-    *logptr(contextptr) << eqs << '\n';
-    return makesequence(_scatterplot(g,contextptr),put_attributs(_plot(makesequence(res,vx_var,xmin,xmax),contextptr),attributs,contextptr));
-  }
-  static const char _sin_regression_plot_s []="sin_regression_plot";
-static define_unary_function_eval (__sin_regression_plot,&_sin_regression_plot,_sin_regression_plot_s);
-  define_unary_function_ptr5( at_sin_regression_plot ,alias_at_sin_regression_plot,&__sin_regression_plot,0,true);
-
-  gen _power_regression_plot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen a,b,correl2;
-    double xmin,xmax;
-    vecteur attributs;
-    bool eq,r;
-    gen G=regression_plot_attributs(g,attributs,eq,r,contextptr);
-    gen errcode=function_regression(G,at_ln,at_ln,a,b,xmin,xmax,correl2,contextptr);
-    if (is_undef(errcode)) return errcode;
-    xmax += (xmax-xmin); 
-    gen ad(evalf_double(a,1,contextptr)),bd(evalf_double(b,1,contextptr)),cd(evalf_double(correl2,1,contextptr));
-    if (ad.type==_DOUBLE_ && bd.type==_DOUBLE_ && cd.type==_DOUBLE_){
-      string eqs="y="+print_DOUBLE_(exp(bd,contextptr)._DOUBLE_val,3)+"*x^"+print_DOUBLE_(ad._DOUBLE_val,3);
-      string R2s=" , R2="+print_DOUBLE_(cd._DOUBLE_val,3);
-      *logptr(contextptr) << eqs << R2s << '\n';
-      string s;
-      if (eq)
-	s += eqs;
-      if (r)
-	s += R2s;
-      attributs.push_back(string2gen(s,false));
-    }
-    return makesequence(_scatterplot(g,contextptr),put_attributs(_plotfunc(gen(makevecteur(exp(b,contextptr)*pow(vx_var,a,contextptr),symb_equal(vx_var,symb_interval(xmin,xmax))),_SEQ__VECT),contextptr),attributs,contextptr));
-  }
-  static const char _power_regression_plot_s []="power_regression_plot";
-static define_unary_function_eval (__power_regression_plot,&_power_regression_plot,_power_regression_plot_s);
-  define_unary_function_ptr5( at_power_regression_plot ,alias_at_power_regression_plot,&__power_regression_plot,0,true);
-
-  static gen polynomial_regression(const gen & g,int d,const gen & u1, const gen & u2,double & xmin, double & xmax,GIAC_CONTEXT){
-    xmin=1e300,xmax=-xmin;
-    vecteur v(genpoint2vecteur(g,contextptr));
-    if (!ckmatrix(v) || v.empty() || v.front()._VECTptr->size()<2)
-      return undef;
-    // use first and second column
-    const_iterateur it=v.begin(),itend=v.end();
-    // int n(itend-it);
-    gen sigmax,sigmay,sigmaxy,sigmax2,sigmay2,tmpx,tmpxd,tmpy;
-    vecteur xmoment(2*d+1),xymoment(d+1);
-    for (;it!=itend;++it){
-      vecteur & w=*it->_VECTptr;
-      if (u1.type==_FUNC)
-	tmpx=u1(w.front(),contextptr);
-      else
-	tmpx=w.front();
-      tmpxd=evalf_double(tmpx,1,contextptr);
-      if (tmpxd.type==_DOUBLE_){
-	double tmpxdd=tmpxd._DOUBLE_val;
-	if (tmpxdd<xmin)
-	  xmin=tmpxdd;
-	if (tmpxdd>xmax)
-	  xmax=tmpxdd;
-      }
-      if (u2.type==_FUNC)
-	tmpy=u2(w.back(),contextptr);
-      else
-	tmpy=w.back();
-      xmoment[0]=xmoment[0]+1;
-      xymoment[0]=xymoment[0]+tmpy;
-      for (int i=1;i<=2*d;++i)
-	xmoment[i]=xmoment[i]+pow(tmpx,i);
-      for (int i=1;i<=d;++i)
-	xymoment[i]=xymoment[i]+pow(tmpx,i)*tmpy;      
-    }
-    // make linear system
-    matrice mat;
-    for (int i=0;i<=d;++i){
-      vecteur tmp;
-      for (int j=d;j>=0;--j){
-	tmp.push_back(xmoment[i+j]);
-      }
-      mat.push_back(tmp);
-    }
-    // return multmatvecteur(minv(mat,contextptr),xymoment); 
-    return linsolve(mat,xymoment,contextptr);
-  }
-  static gen polynomial_regression(const gen & g,double & xmin,double & xmax,GIAC_CONTEXT){
-    if (g.type==_VECT && g._VECTptr->size()==3){
-      vecteur & v=*g._VECTptr;
-      if (v[0].type==_VECT && v[1].type==_VECT && v[0]._VECTptr->size()==v[1]._VECTptr->size())
-	return polynomial_regression(makevecteur(mtran(makevecteur(v[0],v[1])),v[2]),xmin,xmax,contextptr);
-    }
-    if (g.type!=_VECT || g._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    gen last=_floor(g._VECTptr->back(),contextptr);
-    if (last.type!=_INT_)
-      return gensizeerr(contextptr);
-    return polynomial_regression(g._VECTptr->front(),absint(last.val),zero,zero,xmin,xmax,contextptr);
-  }
-  gen _polynomial_regression(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    double xmin,xmax;
-    return polynomial_regression(g,xmin,xmax,contextptr);
-  }
-  static const char _polynomial_regression_s []="polynomial_regression";
-static define_unary_function_eval (__polynomial_regression,&_polynomial_regression,_polynomial_regression_s);
-  define_unary_function_ptr5( at_polynomial_regression ,alias_at_polynomial_regression,&__polynomial_regression,0,true);
-  gen _polynomial_regression_plot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    double xmin,xmax;
-    vecteur attributs;
-    bool eq,r;
-    gen G=regression_plot_attributs(g,attributs,eq,r,contextptr);
-    gen res=polynomial_regression(G,xmin,xmax,contextptr);
-    if (is_undef(res)) return res;
-    xmax += (xmax-xmin); 
-    res=horner(res,vx_var);
-    return put_attributs(_plotfunc(gen(makevecteur(res,symb_equal(vx_var,symb_interval(xmin,xmax))),_SEQ__VECT),contextptr),attributs,contextptr);
-  }
-  static const char _polynomial_regression_plot_s []="polynomial_regression_plot";
-static define_unary_function_eval (__polynomial_regression_plot,&_polynomial_regression_plot,_polynomial_regression_plot_s);
-  define_unary_function_ptr5( at_polynomial_regression_plot ,alias_at_polynomial_regression_plot,&__polynomial_regression_plot,0,true);
-
-  // logistic_regression
-  // Qt=instant production at time t
-  // Pt=cumulative production at time t
-  // arg1=Qt_1...Qt_n, arg2=t1..tn or t1, arg3=Pt_1
-  // or arg1=Qt_1...Qt_n, arg2=t1..tn or t1, n>=10, using Pt_1=Qt_1/(1-tau)
-  // where tau is fitted from the first 5 records 
-  static gen logistic_regression(const gen & g,double & xmin,double & xmax,gen & r,GIAC_CONTEXT){
-    if (g.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur & v = *g._VECTptr;
-    int s=int(v.size());
-    if (s<2 || s>3)
-      return gendimerr(contextptr);
-    gen data=v[0];
-    if (data.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur & w=*data._VECTptr;
-    int n=int(w.size());
-    gen Pinit;
-    if (s==2){
-      if (n<20)
-	return gendimerr(gettext("Guessing initial production requires more than 20 samples"));
-      gen args=gen(makevecteur(makevecteur(0,1,2,3,4),ln(vecteur(w.begin(),w.begin()+5),contextptr)),_SEQ__VECT);
-      gen res=_linear_regression(args,contextptr);
-      if (res.type!=_VECT || res._VECTptr->size()!=2)
-	return gentypeerr(contextptr);
-      gen tmp=_correlation(evalf_double(args,1,contextptr),contextptr);
-      if (tmp.type==_STRNG && tmp.subtype==-1) return  tmp;
-      Pinit=w[0]/(exp(res._VECTptr->front(),contextptr)-1);
-      *logptr(contextptr) << gettext("Initial cumulative estimated to ") << Pinit << '\n' << gettext("Correlation for 5 first years to estimate initial cumulative : ") << tmp << '\n';
-    }
-    else
-      Pinit=v[2];
-    gen time=v[1],tinit,tend;
-    if (time.is_symb_of_sommet(at_interval)){
-      gen tmp=time._SYMBptr->feuille;
-      if (tmp.type!=_VECT || tmp._VECTptr->size()!=2)
-	return gensizeerr(contextptr);
-      tinit=tmp._VECTptr->front();
-      tend=tmp._VECTptr->back();
-    }
-    else {
-      tinit=time;
-      tend=time+int(w.size())-1;
-    }
-    tinit=evalf_double(tinit,1,contextptr);
-    tend=evalf_double(tend,1,contextptr);
-    if (tinit.type!=_DOUBLE_ || tend.type!=_DOUBLE_)
-      return gensizeerr(contextptr);
-    xmin = tinit._DOUBLE_val;
-    xmax = tend._DOUBLE_val;
-    gen tscale=(tend+1-tinit)/n;
-    // compute cumulated production
-    vecteur cum(n),quot(n);
-    cum[0]=Pinit+w[0];
-    quot[0]=w[0]/cum[0];
-    for (int i=1;i<n;++i){
-      cum[i]=cum[i-1]+w[i];
-      quot[i]=w[i]/cum[i];
-    }
-    // linear regression of quot vs cum
-    gen args=gen(makevecteur(cum,quot),_SEQ__VECT);
-    gen res=_linear_regression(args,contextptr);
-    r=_correlation(args,contextptr);
-    if (r.type==_STRNG && r.subtype==-1) return  r;
-    if (res.type!=_VECT || res._VECTptr->size()!=2)
-      return gendimerr(contextptr);
-    gen a=res._VECTptr->front(),b=res._VECTptr->back(),urr=-b/a;
-    *logptr(contextptr) << gettext("Pinstant=") << a << gettext("*Pcumul+") << b << '\n' << gettext("Correlation ") << r << gettext(", Estimated total P=") << urr << '\n' << gettext("Returning estimated Pcumul, Pinstant, Ptotal, Pinstantmax, tmax, R")<< '\n';
-    if (is_positive(-urr,contextptr))
-      return gensizeerr(gettext("Data not suited for logistic regression (instant production should be a decreasing function of cumulated production)"));
-    // y'/y=a*y+b -> y=urr/[1+exp(-b*(t-t0))]
-    // urr/y-1=exp(-b*(t-t0))
-    // -> -b*(t-t0) = ln(urr/y-1)
-    vecteur lnurr(n),t(n);
-    for (int i=0;i<n;++i){
-      lnurr[i]=ln(urr/cum[i]-1,contextptr);
-      t[i]=tinit+i*tscale;
-    }
-    args=gen(makevecteur(t,lnurr),_SEQ__VECT);
-    res=_linear_regression(args,contextptr);
-    if (res.type!=_VECT || res._VECTptr->size()!=2)
-      return gendimerr(contextptr);
-    gen b2=res._VECTptr->front(),bt0=res._VECTptr->back();
-    return makevecteur(urr/(1+exp(b2*vx_var+bt0,contextptr)),urr*b/2/(1+cosh(b2*vx_var+bt0,contextptr)),urr,urr*b/4,-bt0/b2,r);
-  }
-
-  gen _logistic_regression(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    double xmin,xmax;
-    gen r;
-    return logistic_regression(g,xmin,xmax,r,contextptr);
-  }
-  static const char _logistic_regression_s []="logistic_regression";
-static define_unary_function_eval (__logistic_regression,&_logistic_regression,_logistic_regression_s);
-  define_unary_function_ptr5( at_logistic_regression ,alias_at_logistic_regression,&__logistic_regression,0,true);
-
-  gen _logistic_regression_plot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    double xmin,xmax;
-    vecteur attributs;
-    bool eq,r;
-    gen rcorr;
-    gen G=regression_plot_attributs(g,attributs,eq,r,contextptr);
-    gen res=logistic_regression(G,xmin,xmax,rcorr,contextptr);
-    if (res.type==_STRNG && res.subtype==-1) return res;
-    if (r){
-      rcorr=rcorr*rcorr;
-      string s = "R2="+rcorr.print(contextptr);
-      attributs.push_back(string2gen(s,false));
-    }
-    xmax += (xmax-xmin); 
-    if (res.type!=_VECT || res._VECTptr->empty())
-      return gensizeerr(contextptr);
-    res=res[1];
-    return put_attributs(_plotfunc(gen(makevecteur(res,symb_equal(vx_var,symb_interval(xmin,xmax))),_SEQ__VECT),contextptr),attributs,contextptr);
-  }
-  static const char _logistic_regression_plot_s []="logistic_regression_plot";
-static define_unary_function_eval (__logistic_regression_plot,&_logistic_regression_plot,_logistic_regression_plot_s);
-  define_unary_function_ptr5( at_logistic_regression_plot ,alias_at_logistic_regression_plot,&__logistic_regression_plot,0,true);
-
-  static gen gen_interpolate(const gen & g,int deg,GIAC_CONTEXT){
-    // args = matrix with 2 rows (x,y), xmin, xmax, xstep -> matrix of [x,y]
-    if (g.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur & v =*g._VECTptr;
-    int s=int(v.size());
-    if (s<4)
-      return gensizeerr(contextptr);
-    gen m=evalf_double(v[0],1,contextptr),
-      Xmin=evalf_double(v[1],1,contextptr),
-      Xmax=evalf_double(v[2],1,contextptr),
-      Xstep=evalf_double(v[3],1,contextptr);
-    if (!ckmatrix(m) || m._VECTptr->size()!=2 || Xmin.type!=_DOUBLE_ || Xmax.type!=_DOUBLE_ || Xstep.type!=_DOUBLE_)
-      return gensizeerr(contextptr);
-    double xmin=Xmin._DOUBLE_val,xmax=Xmax._DOUBLE_val,xstep=absdouble(Xstep._DOUBLE_val);
-    // sort x in m
-    matrice M(mtran(*m._VECTptr)); // 2 cols
-    islesscomplexthanf_sort(M.begin(),M.end());
-    reverse(M.begin(),M.end());
-    int Ms=int(M.size());
-    if (Ms<2)
-      return gendimerr(contextptr);
-    gen X0=M[0]._VECTptr->front(),X1=M[Ms-1]._VECTptr->front();
-    if (X0.type!=_DOUBLE_ || X1.type!=_DOUBLE_)
-      return gensizeerr(contextptr);
-    double x0=X0._DOUBLE_val,x1=X1._DOUBLE_val;
-    if (xmin<x0 || xmax>x1)
-      return gensizeerr(gettext("Values out of range"));
-    matrice res;
-    int pos=0; 
-    gen Mcur=Xmin,Mnext=M[1]._VECTptr->front(),
-      Ycur=M[0]._VECTptr->back(),Ynext=M[1]._VECTptr->back();
-    double ycur;
-    if (deg==1){
-      for (double xcur=xmin;xcur<=xmax;xcur+=xstep){
-	// find interval containing xcur in matrix
-	for (;;){
-	  if (Mnext._DOUBLE_val>xcur)
-	    break;
-	  ++pos;
-	  if (pos==Ms)
-	    break;
-	  Mcur=M[pos]._VECTptr->front();
-	  Ycur=M[pos]._VECTptr->back();
-	  if (pos!=Ms-1){
-	    Mnext = M[pos+1]._VECTptr->front();
-	    Ynext = M[pos+1]._VECTptr->back();
-	  }
-	}
-	if (pos>=Ms-1){ // use Ycur
-	  res.push_back(makevecteur(xcur,Ycur));
-	}
-	else {
-	  ycur = Ycur._DOUBLE_val+(xcur-Mcur._DOUBLE_val)/(Mnext._DOUBLE_val-Mcur._DOUBLE_val)*(Ynext._DOUBLE_val-Ycur._DOUBLE_val);
-	  res.push_back(makevecteur(xcur,ycur));
-	}
-      }
-    }
-    else {
-      vecteur current(deg+1); // contains the current Taylor expansion
-      current[deg]=Ycur;
-      // find z=current[0]: z*(Mnext-Mcur)^deg+Ycur=Ynext
-      current[0]=(Ynext-Ycur)/pow(Mnext-Mcur,deg);
-      for (double xcur=xmin;xcur<=xmax;xcur+=xstep){
-	if (xcur>Mnext._DOUBLE_val){ // translate current, modify current[0]
-	  current=taylor(current,Mnext-Mcur);
-	  current[0]=0;
-	  Ycur=Ynext;
-	  Mcur=Mnext;
-	  ++pos;
-	  if (pos<Ms-1){
-	    Mnext = M[pos+1]._VECTptr->front();
-	    Ynext = M[pos+1]._VECTptr->back();
-	    current[0]=(Ynext-horner(current,Mnext-Mcur))/pow(Mnext-Mcur,deg);
-	  }
-	}
-	ycur=horner(current,xcur-Mcur)._DOUBLE_val;
-	res.push_back(makevecteur(xcur,ycur));
-      }
-    }
-    return mtran(res);
-  }
-  gen _linear_interpolate(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return gen_interpolate(g,1,contextptr);
-  }
-  static const char _linear_interpolate_s []="linear_interpolate";
-static define_unary_function_eval (__linear_interpolate,&_linear_interpolate,_linear_interpolate_s);
-  define_unary_function_ptr5( at_linear_interpolate ,alias_at_linear_interpolate,&__linear_interpolate,0,true);
-
-  gen _parabolic_interpolate(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return gen_interpolate(g,2,contextptr);
-  }
-  static const char _parabolic_interpolate_s []="parabolic_interpolate";
-static define_unary_function_eval (__parabolic_interpolate,&_parabolic_interpolate,_parabolic_interpolate_s);
-  define_unary_function_ptr5( at_parabolic_interpolate ,alias_at_parabolic_interpolate,&__parabolic_interpolate,0,true);
-
-  static vector<double> prepare_effectifs(const vecteur & v,GIAC_CONTEXT){
-    if (v.empty())
-      return vector<double>(0);
-    vecteur w;
-    if (ckmatrix(v)){
-      int s=int(v.front()._VECTptr->size());
-      if (s==1)
-	w=*evalf_double(mtran(v)[0],1,contextptr)._VECTptr;
-      else
-	return vector<double>(0);
-    }
-    else
-      w=*evalf_double(v,1,contextptr)._VECTptr;
-    // vector will be sorted keeping only DOUBLE data
-    int s=int(w.size());
-    vector<double> w1;
-    w1.reserve(s);
-    for (int i=0;i<s;++i){
-      if (w[i].type==_DOUBLE_)
-	w1.push_back(w[i]._DOUBLE_val);
-    }
-    sort(w1.begin(),w1.end());
-    s=int(w1.size());
-    if (!s)
-      return vector<double>(0);
-    return w1;
-  }
-  matrice effectifs(const vecteur & data,double class_minimum,double class_size,GIAC_CONTEXT){
-    if (data.empty())
-      return data;
-    if (class_size<=0){
-      *logptr(contextptr) << gettext("Invalid class size (replaced by 1) ") << class_size << '\n';
-      class_size=1;
-    }
-    vector<double>  w1;
-    if (ckmatrix(data)){
-      if (!data.empty() && data.front()._VECTptr->size()>1){
-	matrice tmp=data;
-	gen_sort_f(tmp.begin(),tmp.end(),first_ascend_sort);
-	tmp=mtran(tmp);
-	vecteur tmpval=*evalf_double(tmp[0],1,contextptr)._VECTptr;
-	vecteur tmpeff=*tmp[1]._VECTptr;
-	if (tmpval.front().type!=_DOUBLE_ || tmpval.back().type!=_DOUBLE_)
-	  return vecteur(1,undef);
-	double kbegin=std::floor((tmpval.front()._DOUBLE_val-class_minimum)/class_size);
-	double kend=std::floor((tmpval.back()._DOUBLE_val-class_minimum)/class_size);
-	int s=int(tmpval.size()),i=0;
-	vecteur res;
-	for (;kbegin<=kend;++kbegin){
-	  // count in this class
-	  double min_class=kbegin*class_size+class_minimum;
-	  double max_class=min_class+class_size;
-	  gen effectif;
-	  for (;i<s;effectif=effectif+tmpeff[i],++i){
-	    if (tmpval[i].type!=_DOUBLE_)
-	      return vecteur(1,undef);
-	    if (tmpval[i]._DOUBLE_val>=max_class)
-	      break;
-	  }
-	  res.push_back(makevecteur(symbolic(at_interval,makesequence(min_class,max_class)),effectif));
-	}
-	return res;
-      }
-      w1=prepare_effectifs(*mtran(data)[0]._VECTptr,contextptr);
-    }
-    else
-      w1=prepare_effectifs(data,contextptr);
-    if (w1.empty())
-      return vecteur(1,undef);
-    // class_min + k*class_size <= mini hence k
-    double kbegin=std::floor((w1.front()-class_minimum)/class_size);
-    double kend=std::floor((w1.back()-class_minimum)/class_size);
-    if (kend-kbegin>LIST_SIZE_LIMIT)
-      return vecteur(1,gendimerr("Too many classes"));
-    vector<double>::const_iterator it=w1.begin(),itend=w1.end();
-    vecteur res;
-    for (;kbegin<=kend;++kbegin){
-      // count in this class
-      double min_class=kbegin*class_size+class_minimum;
-      double max_class=min_class+class_size;
-      int effectif=0;
-      for (;it!=itend;++it,++effectif){
-	if (*it>=max_class)
-	  break;
-      }
-      res.push_back(makevecteur(symbolic(at_interval,makesequence(min_class,max_class)),effectif));
-    }
-    return res;
-  }
-
-  static matrice effectifs(const vecteur & data,const vecteur & intervalles,GIAC_CONTEXT){
-    int s=int(intervalles.size());
-    matrice res(s);
-    vector<double> sorted_data;
-    if (ckmatrix(data))
-      sorted_data=prepare_effectifs(*mtran(data)[0]._VECTptr,contextptr);
-    else
-      sorted_data=prepare_effectifs(data,contextptr);
-    if (sorted_data.empty())
-      return vecteur(1,undef);
-    vector<double>::const_iterator it=sorted_data.begin(),itend=sorted_data.end();
-    for (int i=0;i<s;++i){
-      gen cur_intervalle=intervalles[i];
-      double debut,fin;
-      if (!chk_double_interval(cur_intervalle,debut,fin,contextptr))
-	return vecteur(1,undef);
-      for (;it!=itend;++it){
-	if (*it>=debut)
-	  break;
-      }
-      int effectif=0;
-      for (;it!=itend;++it,++effectif){
-	if (*it>=fin)
-	  break;
-      }
-      res[i]=makevecteur(cur_intervalle,effectif);
-    }
-    return res;
-  }
-
-  static vecteur centres2intervalles(const vecteur & centres,double class_min,bool with_class_min,GIAC_CONTEXT){
-    if (centres.size()<2)
-      return vecteur(1,gensizeerr(contextptr));
-    double d0=evalf_double(centres[0],1,contextptr)._DOUBLE_val,d1=evalf_double(centres[1],1,contextptr)._DOUBLE_val;
-    double debut=class_min;
-    if (!with_class_min || debut<=-1e307)
-      debut=d0+(d0-d1)/2;
-    vecteur res;
-    const_iterateur it=centres.begin(),itend=centres.end();
-    res.reserve(itend-it);
-    for (;it!=itend;++it){
-      gen g=evalf_double(*it,1,contextptr);
-      if (g.type!=_DOUBLE_)
-	return vecteur(1,gensizeerr(contextptr));
-      double milieu=g._DOUBLE_val;
-      double fin=milieu+(milieu-debut);
-      if (it+1!=itend){
-	g=evalf_double(*(it+1),1,contextptr);
-	if (g.type!=_DOUBLE_)
-	  return vecteur(1,gensizeerr(contextptr));
-	fin=(milieu+g._DOUBLE_val)/2;
-      }
-      if (fin<=debut)
-	return vecteur(1,gensizeerr(contextptr));
-      res.push_back(symb_interval(debut,fin));
-      debut=fin;
-    }
-    return res;
-  }
-
-  gen _center2interval(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT)
-      return gentypeerr(contextptr);
-    if (g.subtype==_SEQ__VECT && g._VECTptr->size()==2){
-      vecteur & v=*g._VECTptr;
-      gen c=evalf_double(v[1],1,contextptr);
-      if (v[0].type!=_VECT || c.type!=_DOUBLE_)
-	return gentypeerr(contextptr);
-      return gen(centres2intervalles(*v[0]._VECTptr,c._DOUBLE_val,true,contextptr),_SEQ__VECT);
-    }
-    return gen(centres2intervalles(*g._VECTptr,0.0,false,contextptr),_SEQ__VECT);
-  }
-  static const char _center2interval_s []="center2interval";
-static define_unary_function_eval (__center2interval,&_center2interval,_center2interval_s);
-  define_unary_function_ptr5( at_center2interval ,alias_at_center2interval,&__center2interval,0,true);
-
-
-  static gen histogram(const vecteur & v,double class_minimum,double class_size,const vecteur & attributs,GIAC_CONTEXT){
-#ifndef WIN32
-    bool old_iograph=io_graph(contextptr);
-    io_graph(false,contextptr);
-#endif
-    if (class_size<=0){
-      // find class_minimum and class_size from data and number of classes
-      int nc=int(class_minimum); // arg passed is the number of classes
-      vector<double> w=prepare_effectifs(v,contextptr);
-      if (w.size()<2)
-	return gensizeerr(contextptr);
-      class_minimum=w.front();
-      class_size=((w.back()-w.front())*(1+1e-12))/nc;
-    }
-    if (ckmatrix(v) && !v.empty() && v.front()._VECTptr->size()==2){
-      // matrix format is 2 columns 1st column=interval, 2nd column=frequency
-      // OR value/frequencies
-      // get total of population
-      const_iterateur it=v.begin(),itend=v.end();
-      double n=0;
-      for (;it!=itend;++it)
-	n += evalf_double(it->_VECTptr->back(),1,contextptr)._DOUBLE_val;
-      // get surface
-      gen g=v.front()._VECTptr->front();
-      if (g.is_symb_of_sommet(at_interval)){
-	g=g._SYMBptr->feuille;
-	if (g.type!=_VECT || g._VECTptr->size()!=2)
-	  return gentypeerr(contextptr);
-	g=evalf_double(g._VECTptr->front(),1,contextptr);
-      }
-      else
-	g=g-class_size/2;
-      gen h=(itend-1)->_VECTptr->front();
-      if (h.is_symb_of_sommet(at_interval)){
-	h=h._SYMBptr->feuille;
-	if (h.type!=_VECT || h._VECTptr->size()!=2)
-	  return gentypeerr(contextptr);
-	h=evalf_double(h._VECTptr->back(),1,contextptr);
-      }
-      else
-	h=h+class_size/2;
-      if (g.type!=_DOUBLE_ || h.type!=_DOUBLE_ || g._DOUBLE_val>=h._DOUBLE_val)
-	return gensizeerr(contextptr);
-      double inf,sup; // delta=h._DOUBLE_val-g._DOUBLE_val;
-      it=v.begin();
-      //  int nclass=itend-it;
-#if defined GIAC_LMCHANGES // changes by L. Marohnić
-      vecteur res(1,symb_equal(change_subtype(gen(_AXES),_INT_PLOT),3));
-#else
-      vecteur res;
-#endif
-      for (;it!=itend;++it){
-	gen current=it->_VECTptr->front();
-	if (current.is_symb_of_sommet(at_interval)){
-	  if (!chk_double_interval(current,inf,sup,contextptr))
-	    return gentypeerr(contextptr);
-	}
-	else {
-	  gen tmp=evalf_double(current,1,contextptr);
-	  if (tmp.type!=_DOUBLE_)
-	    return gentypeerr(contextptr);
-	  inf = tmp._DOUBLE_val -class_size/2;
-	  sup = tmp._DOUBLE_val + class_size/2;
-	}
-	double height=1/(sup-inf);
-	height=height*evalf_double(it->_VECTptr->back(),1,contextptr)._DOUBLE_val/n;
-	gen mini(inf,height),maxi(sup,height);
-	gen rectan(makevecteur(inf,sup,maxi,mini,inf),_LINE__VECT);
-	res.push_back(pnt_attrib(rectan,attributs,contextptr));
-#ifdef GIAC_LMCHANGES // changes by L. Marohnić
-	res.push_back(_segment(makevecteur(inf,mini),contextptr));
-	res.push_back(_segment(makevecteur(mini,maxi),contextptr));
-	res.push_back(_segment(makevecteur(maxi,sup),contextptr));
-	res.push_back(_segment(makevecteur(inf,sup),contextptr));
-#else
-	// res.push_back(_segment(makevecteur(inf,mini),contextptr));
-	// res.push_back(_segment(makevecteur(mini,maxi),contextptr));
-	// res.push_back(_segment(makevecteur(maxi,sup),contextptr));	    
-#endif
-      }
-#ifndef WIN32
-    io_graph(old_iograph,contextptr);
-#endif
-      return res;
-    }
-    vector<double>  w1=prepare_effectifs(v,contextptr);
-    int s=int(w1.size());
-    if (!s)
-      return gendimerr(contextptr);
-    // class_min + k*class_size <= mini hence k
-    double kbegin=std::floor((w1.front()-class_minimum)/class_size);
-    double kend=std::floor((w1.back()-class_minimum)/class_size);
-    vector<double>::const_iterator it=w1.begin(),itend=w1.end();
-#if defined GIAC_LMCHANGES // changes by L. Marohnić
-    vecteur res(1,symb_equal(change_subtype(gen(_AXES),_INT_PLOT),3));
-#else
-    vecteur res;
-#endif
-    for (;kbegin<=kend;++kbegin){
-      // count in this class
-      double min_class=kbegin*class_size+class_minimum;
-      double max_class=min_class+class_size;
-      double effectif=0;
-      for (;it!=itend;++it,++effectif){
-	if (*it>=max_class)
-	  break;
-      }
-      effectif /= s*class_size; // height of the class
-      gen ming=min_class+gen(0.0,effectif);
-      gen maxg=max_class+gen(0.0,effectif);
-      gen rectan(makevecteur(min_class,max_class,maxg,ming,min_class),_LINE__VECT);
-      res.push_back(pnt_attrib(rectan,attributs,contextptr));
-#ifdef GIAC_LMCHANGES // changes by L. Marohnić
-      res.push_back(_segment(makevecteur(min_class,ming),contextptr));
-      res.push_back(_segment(makevecteur(ming,maxg),contextptr));
-      res.push_back(_segment(makevecteur(maxg,max_class),contextptr));
-      res.push_back(_segment(makevecteur(min_class,max_class),contextptr));
-#else
-      // res.push_back(_segment(makevecteur(min_class,ming),contextptr));
-      // res.push_back(_segment(makevecteur(ming,maxg),contextptr));
-      // res.push_back(_segment(makevecteur(maxg,max_class),contextptr));
-#endif
-    }
-#ifndef WIN32
-    io_graph(old_iograph,contextptr);
-#endif
-    return res; // gen(res,_SEQ__VECT);
-  }
-  gen _histogram(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_SYMB && is_distribution(g)){
-      vecteur v(gen2vecteur(g._SYMBptr->feuille));
-      v.insert(v.begin(),g._SYMBptr->sommet);
-      return _histogram(gen(v,_SEQ__VECT),contextptr);
-    }
-    if (g.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur args;
-    if (g.subtype==_SEQ__VECT)
-      args=*g._VECTptr;
-#if defined GIAC_LMCHANGES // changes by L. Marohnić
-    vecteur attributs(1,int(FL_DARK1));
-    int s=read_attributs(args,attributs,contextptr);
-    int col=attributs[0].val;
-    col=int(unsigned(col) | _FILL_POLYGON);
-    attributs[0]=col;
-#else
-    vecteur attributs(1,default_color(contextptr));
-    int s=read_attributs(args,attributs,contextptr);
-#endif
-    args=vecteur(args.begin(),args.begin()+s);
-    int nd;
-    if (s>=1 && (nd=is_distribution(args[0]))){
-      if (args[0].type==_SYMB){
-	vecteur tmp(gen2vecteur(args[0]._SYMBptr->feuille));
-	for (unsigned i=0;i<tmp.size();++i)
-	  args.insert(args.begin()+1+i,tmp[i]); // inefficient ...
-	args[0]=args[0]._SYMBptr->sommet;
-	s+=int(tmp.size());
-      }
-      gen a,b;
-      if (distrib_support(nd,a,b,true) || s!=distrib_nargs(nd)+1)
-	return gensizeerr(contextptr);
-      args.push_back(vx_var);
-      gen res;
-      if (args[0].type==_FUNC)
-	res=symbolic(*args[0]._FUNCptr,gen(vecteur(args.begin()+1,args.end()),_SEQ__VECT));
-      else
-	res=args[0](gen(vecteur(args.begin()+1,args.end()),_SEQ__VECT),contextptr);
-      if (nd==2) // binomial
-	b=args[1];
-      if (a.type!=_INT_ || !is_integral(b) || b.type!=_INT_ || b.val<=0)
-	return gensizeerr(contextptr);
-      int A=a.val,B=b.val;
-      vecteur v;
-      for (int i=A;i<=B;++i){
-	gen y=subst(res,vx_var,i,false,contextptr);
-	vecteur w=makevecteur(i-.5,i+.5,i+.5+cst_i*y,i-.5+cst_i*y);
-	w.push_back(w.front());
-	v.push_back(pnt_attrib(gen(w,_GROUP__VECT),attributs,contextptr));
-      }
-      return v;
-    }
-    if (s>=2){
-      if (args[0].type!=_VECT)
-	return gensizeerr(contextptr);
-      vecteur data=*args[0]._VECTptr;
-      if (data.empty())
-	return gensizeerr(contextptr);
-      if (data.front().type==_VECT && data.front()._VECTptr->size()==1 && ckmatrix(data))
-	data=*mtran(data).front()._VECTptr;
-      gen arg1=evalf_double(args[1],1,contextptr);
-      if (ckmatrix(data)&&arg1.type==_DOUBLE_){ // [ [center, effectif] ... ], min
-	data=mtran(data); // 1st line = all centers
-	if (data.size()!=2)
-	  return gensizeerr(contextptr);
-	data[0]=centres2intervalles(*data[0]._VECTptr,arg1._DOUBLE_val,true,contextptr);
-	if (is_undef(data[0]))
-	  return gensizeerr(contextptr);
-	data=mtran(data);
-	gen g=data[0][0];
-	if (g.is_symb_of_sommet(at_interval) && g._SYMBptr->feuille.type==_VECT && g._SYMBptr->feuille._VECTptr->size()==2){
-	  gen g1=g._SYMBptr->feuille._VECTptr->front();
-	  g1=evalf_double(g1,1,contextptr);
-	  gen g2=g._SYMBptr->feuille._VECTptr->back();
-	  g2=evalf_double(g2,1,contextptr);
-	  if (g1.type==_DOUBLE_ && g2.type==_DOUBLE_)
-	    return histogram(data,g1._DOUBLE_val,(g2-g1)._DOUBLE_val,attributs,contextptr);
-	}
-	return histogram(data,0.0,0.0,attributs,contextptr);
-      }
-      if (s==3){
-	gen arg2=evalf_double(args[2],1,contextptr);
-	if (arg1.type==_DOUBLE_ && arg2.type==_DOUBLE_)
-	  return histogram(data,arg1._DOUBLE_val,arg2._DOUBLE_val,attributs,contextptr);
-      }
-      if (s==2 && is_integral(arg1) && arg1.type==_INT_ && arg1.val>0)
-	return histogram(data,arg1.val,0.0,attributs,contextptr);
-      if (s==2 && args[1].type==_VECT)
-	return _histogram(gen(makevecteur(mtran(args),-1.1e307),_SEQ__VECT),contextptr);
-      return gensizeerr(contextptr);
-    }
-    if (s==1 && args.front().type==_VECT)
-      args=*args.front()._VECTptr;
-    else
-      args=gen2vecteur(g);
-    if (ckmatrix(args)){
-      gen tmp=args[0];
-      if (tmp._VECTptr->size()==2 && !tmp._VECTptr->front().is_symb_of_sommet(at_interval)){
-	vecteur data=mtran(args); // 1st line = all centers
-	if (data.size()!=2)
-	  return gensizeerr(contextptr);
-	data[0]=centres2intervalles(*data[0]._VECTptr,0,false,contextptr);
-	if (is_undef(data[0]))
-	  return gensizeerr(contextptr);
-	data=mtran(data);
-	return histogram(data,0.0,1e-14,attributs,contextptr);
-      }
-    }
-    return histogram(args,class_minimum,class_size,attributs,contextptr);
-  }
-  static const char _histogram_s []="histogram";
-static define_unary_function_eval (__histogram,&_histogram,_histogram_s);
-  define_unary_function_ptr5( at_histogram ,alias_at_histogram,&__histogram,0,true);
-
-  struct xeff {
-    double x;
-    double eff;
-    xeff(): x(0),eff(0) {}
-    xeff(double x0,double eff0): x(x0),eff(eff0) {}
-  };
-
-  bool operator <(const xeff & a,const xeff & b){
-    return a.x<b.x;
-  }
-
-  vecteur frequencies(const gen & v,GIAC_CONTEXT){
-    gen g(_sort(v,contextptr));
-    if (g.type!=_VECT)
-      return vecteur(1,g);
-    vecteur & w = *g._VECTptr;
-    double total=double(w.size());
-    vecteur res;
-    gen current=w[0]; unsigned count=1;
-    for (unsigned i=1;i<w.size();++i){
-      if (w[i]!=current){
-	res.push_back(makevecteur(current,count/total));
-	current=w[i];
-	count=0;
-      }
-      ++count;
-    }
-    res.push_back(makevecteur(current,count/total));
-    return res;
-  }
-  gen _frequencies(const gen & g,GIAC_CONTEXT){
-    gen h=evalf_double(g,1,contextptr);
-    if (h.type!=_VECT || !is_numericv(*h._VECTptr) || h._VECTptr->empty())
-      return gensizeerr(contextptr);
-    return frequencies(g,contextptr);
-  }
-  static const char _frequencies_s []="frequencies";
-  static define_unary_function_eval (__frequencies,&_frequencies,_frequencies_s);
-  define_unary_function_ptr5( at_frequencies ,alias_at_frequencies,&__frequencies,0,true);
-
-  gen _cumulated_frequencies(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    gen g0(g);
-    double class_min=class_minimum;//,class_s=class_size;
-    if (g0.type==_VECT && g0.subtype==_SEQ__VECT && g0._VECTptr->size()==2){
-      vecteur v = *g._VECTptr;
-      gen tmp=evalf_double(v[1],1,contextptr);
-      if (tmp.type!=_DOUBLE_) {
-	if (ckmatrix(g)){
-	  // if (!v[0]._VECTptr->front().is_symb_of_sommet(at_interval)) v[0]=centres2intervalles(*v[0]._VECTptr,-1.1e307,true,contextptr);
-	  if (is_undef(v[0]))
-	    return gensizeerr(contextptr);
-	  g0=mtran(v);
-	}
-      }
-      else {
-	g0=v[0];
-	class_min=tmp._DOUBLE_val;
-      }
-    }
-    if (!ckmatrix(g0)){
-      gen h=evalf_double(g0,1,contextptr);
-      if (h.type!=_VECT || !is_numericv(*h._VECTptr) || h._VECTptr->empty())
-	return gensizeerr(contextptr);
-      g0=frequencies(g0,contextptr);
-    }
-    // 1st column = values (or classes), 2nd column = effectif
-    matrice m= *g0._VECTptr ;
-    if (m.empty() || m[0]._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    int s=int(m[0]._VECTptr->size());
-    vecteur ans;
-    for (int k=1;k<s;++k){
-      // compute total eff
-      iterateur it=m.begin(),itend=m.end();
-      vector<xeff> veff;
-      double n=0,x=0;
-      if (it !=itend && it->_VECTptr->front().is_symb_of_sommet(at_interval)){
-	gen tmp=it->_VECTptr->front()._SYMBptr->feuille;
-	if (tmp.type!=_VECT || tmp._VECTptr->size()!=2)
-	  return gensizeerr(contextptr);
-	else
-	  tmp=tmp._VECTptr->front();
-	tmp=evalf_double(tmp,1,contextptr);
-	if (tmp.type!=_DOUBLE_)
-	  return gensizeerr(contextptr);
-	veff.push_back(xeff(tmp._DOUBLE_val,0));
-      }
-      else
-	veff.push_back(xeff(class_min,0));
-      bool interv=false;
-      for (;it!=itend;++it){
-	vecteur & v = *it->_VECTptr;
-	gen tmp=evalf_double(v[k],1,contextptr);
-	if (tmp.type!=_DOUBLE_)
-	  return gensizeerr(contextptr);
-	// class_s = tmp._DOUBLE_val - x;
-	n = n + (x=tmp._DOUBLE_val) ;
-	if (v.front().is_symb_of_sommet(at_interval)){
-	  interv=true;
-	  tmp=v.front()._SYMBptr->feuille;
-	  if (tmp.type!=_VECT || tmp._VECTptr->size()!=2)
-	    return gensizeerr(contextptr);
-	  else
-	    tmp=tmp._VECTptr->back();
-	}
-	else
-	  tmp=v.front(); // +class_s/2; // FIX 30/11/2012 for e.g. cumulated_frequencies([[1,0.3],[2,0.5],[3,0.2]])
-	tmp=evalf_double(tmp,1,contextptr);
-	if (tmp.type!=_DOUBLE_)
-	  return gensizeerr(contextptr);
-	veff.push_back(xeff(tmp._DOUBLE_val,x));
-      }
-      sort(veff.begin(),veff.end());
-      vecteur res;
-      vecteur respnt;
-      vector<xeff>::const_iterator jt=veff.begin(),jtend=veff.end();
-      double cumul=0,oldcumul=0;
-      for (;jt!=jtend;++jt){
-	cumul += jt->eff/n ;
-	if (!interv)
-	  res.push_back(gen(jt->x)+cst_i*gen(oldcumul));
-	res.push_back(gen(jt->x)+cst_i*gen(cumul));
-	oldcumul=cumul;
-	respnt.push_back(symb_pnt(gen(jt->x)+cst_i*gen(cumul),k+_POINT_WIDTH_2,contextptr));
-      }
-      ans.push_back(symb_pnt(gen(res,_GROUP__VECT),k,contextptr));
-      ans.push_back(respnt);
-    }
-    return gen(ans,_SEQ__VECT);
-  }
-  static const char _cumulated_frequencies_s []="cumulated_frequencies";
-  static define_unary_function_eval (__cumulated_frequencies,&_cumulated_frequencies,_cumulated_frequencies_s);
-  define_unary_function_ptr5( at_cumulated_frequencies ,alias_at_cumulated_frequencies,&__cumulated_frequencies,0,true);
-
-  // classes(vector or column matrix,begin of class, class size)
-  // "      ( "                     ,list of intervals)
-  // "      ( "                     ,list of centers,begin of 1st class)
-  gen _classes(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT){
-      vecteur & args=*g._VECTptr;
-      int s=int(args.size());
-      if (s<2)
-	return gensizeerr(contextptr);
-      if (args[0].type!=_VECT)
-	return gensizeerr(contextptr);
-      vecteur data=*args[0]._VECTptr;
-      if (s==2 && args[1].type==_VECT){ // 2nd arg=list of intervals
-	return effectifs(data,*args[1]._VECTptr,contextptr);
-      }
-      if (s==3){
-	gen arg2=evalf_double(args[2],1,contextptr);
-	gen arg1=evalf_double(args[1],1,contextptr);
-	if (args[2].type==_VECT && arg1.type==_DOUBLE_){
-	  vecteur tmp=centres2intervalles(*args[2]._VECTptr,0.0,false,contextptr);
-	  if (is_undef(tmp))
-	    return gensizeerr(contextptr);
-	  return effectifs(data,tmp,contextptr);
-	}
-	if (arg1.type==_DOUBLE_ && arg2.type==_DOUBLE_)
-	  return effectifs(data,arg1._DOUBLE_val,arg2._DOUBLE_val,contextptr);
-      }
-      return gensizeerr(contextptr);
-    }
-    vecteur v(gen2vecteur(g));
-    return effectifs(v,class_minimum,class_size,contextptr);
-  }
-  static const char _classes_s []="classes";
-  static define_unary_function_eval (__classes,&_classes,_classes_s);
-  define_unary_function_ptr5( at_classes ,alias_at_classes,&__classes,0,true);
-
-  static vecteur listplot(const gen & g,vecteur & attributs,GIAC_CONTEXT){
-    if (g.type!=_VECT || g._VECTptr->empty())
-      return vecteur(1,gensizeerr(contextptr));
-    int s=read_attributs(*g._VECTptr,attributs,contextptr);
-    vecteur v;
-    if (g.subtype==_SEQ__VECT && s>=4 && g[1].type==_IDNT)
-      return listplot(_seq(g,contextptr),attributs,contextptr);
-    if (s>=2 && g._VECTptr->front().type<=_DOUBLE_ && g[1].type==_VECT){
-      int l=int(g[1]._VECTptr->size());
-      v=*g._VECTptr;
-      v[0]=vecteur(l);
-      double d=evalf_double(g._VECTptr->front(),1,contextptr)._DOUBLE_val;
-      for (int j=0;j<l;++j){
-	(*v[0]._VECTptr)[j]=j+d;
-      }
-      if (!ckmatrix(v))
-	return vecteur(1,gendimerr(contextptr));
-      v=mtran(v);
-    }
-    else {
-      if (g._VECTptr->front().type==_VECT){
-	vecteur & v0 = *g._VECTptr->front()._VECTptr;
-	int v0s=int(v0.size());
-	if (s==1)
-	  v=v0;
-	else {
-	  if (v0s==1 && ckmatrix(g))
-	    v=*mtran(*g._VECTptr).front()._VECTptr;
-	  else
-	    v=*g._VECTptr;
-	}
-      }
-      else
-	v=*g._VECTptr;
-    }
-    s=int(v.size());
-    vecteur res;
-    res.reserve(s);
-    for (int i=0;i<s;++i){
-      gen tmp=v[i];
-      if (tmp.type==_VECT){
-	if (tmp._VECTptr->size()==2)
-	  res.push_back(tmp._VECTptr->front()+cst_i*tmp._VECTptr->back());
-	else
-	  return vecteur(1,gendimerr(contextptr));
-      }
-      else
-	res.push_back(i+(xcas_mode(contextptr)?1:0)+cst_i*tmp);
-    }
-    return res;
-  }
-
-  gen _listplot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur attributs(1,default_color(contextptr));
-    vecteur res=listplot(g,attributs,contextptr);
-    if (is_undef(res) && !res.empty())
-      return res.front();
-    if (attributs.size()>1)
-      return symb_pnt_name(gen(res,_GROUP__VECT),attributs[0],attributs[1],contextptr);
-    else
-      return symb_pnt(gen(res,_GROUP__VECT),attributs[0],contextptr);
-  }
-  static const char _listplot_s []="listplot";
-static define_unary_function_eval (__listplot,&_listplot,_listplot_s);
-  define_unary_function_ptr5( at_listplot ,alias_at_listplot,&__listplot,0,true);
-  static const char _plotlist_s []="plotlist";
-static define_unary_function_eval (__plotlist,&_listplot,_plotlist_s);
-  define_unary_function_ptr5( at_plotlist ,alias_at_plotlist,&__plotlist,0,true);
-
-  // [[x1 y1] [x2 y2] ...]
-  static gen scatterplot(const gen & g,int mode,GIAC_CONTEXT){
-    bool polygone=bool(mode&1),scatter=bool(mode&2),bar=bool(mode &4);
-    vecteur v(gen2vecteur(g));
-    vecteur attr(1,default_color(contextptr));
-    int s=read_attributs(v,attr,contextptr);
-    if (s==1 && ckmatrix(v.front()))
-      v=*v.front()._VECTptr;
-    else
-      v=vecteur(v.begin(),v.begin()+s);
-    if (s>2 && v.back().type==_INT_){
-      // discard size
-      --s;
-      v.pop_back();
-    }
-    if (g.type==_VECT && s==2 && g.subtype==_SEQ__VECT){
-      if (!ckmatrix(v))
-	return gensizeerr(contextptr); 
-      v=mtran(v);
-    }
-    unsigned ncol=0;
-    const gen & vf=v.front();
-    if (vf.type!=_VECT){
-      if (polygone)
-	return _listplot(g,contextptr);
-      vecteur attributs(1,default_color(contextptr));
-      vecteur res=listplot(g,attributs,contextptr);
-      int s=int(res.size());
-      for (int i=0;i<s;++i){
-	res[i]=symb_pnt(res[i],attributs[0],contextptr);
-      }
-      return gen(res,_SEQ__VECT);
-    }
-    if (!ckmatrix(v)||v.empty() || (ncol=unsigned(vf._VECTptr->size()))<2)
-      return gensizeerr(contextptr);
-    if (vf._VECTptr->front().type==_STRNG){
-      if (attr.size()==1)
-	attr.push_back(vecteur(vf._VECTptr->begin()+1,vf._VECTptr->end()));
-      v.erase(v.begin());
-    }
-#ifndef WIN32
-    bool old_iograph=io_graph(contextptr);
-    io_graph(false,contextptr);
-#endif
-    const_iterateur it=v.begin(),itend=v.end();
-    stable_sort(v.begin(),v.end(),first_ascend_sort);
-    vecteur res;
-    string nullstr;
-    vecteur vres;
-    for (unsigned j=1;j<ncol;++j){
-      vecteur attributs(1,int(j<=FL_WHITE?j-1:j));
-      attributs.push_back(string2gen("",false));
-      if (!attr.empty()){ 
-	if (ncol==2)
-	  attributs[0]=attr[0];
-	if (attr[0].type==_VECT && attr[0]._VECTptr->size()>=j)
-	  attributs[0]=(*attr[0]._VECTptr)[j-1];
-	if (attr.size()>1){
-	  if (ncol==2)
-	    attributs[1]=attr[1];
-	  if (attr[1].type==_VECT && attr[1]._VECTptr->size()>=j)
-	    attributs[1]=(*attr[1]._VECTptr)[j-1];
-	}
-      }
-      res.clear();
-      for (it=v.begin();it!=itend;++it){
-	gen tmp=(*it->_VECTptr)[j];
-	if (tmp.type==_STRNG && attributs[1].type==_STRNG && *attributs[1]._STRNGptr==nullstr)
-	  attributs[1]=gen(*tmp._STRNGptr,contextptr);
-	else {
-	  if (is_equal(tmp))
-	    read_attributs(vecteur(1,tmp),attributs,contextptr);
-	  else {
-	    if (polygone)
-	      res.push_back(it->_VECTptr->front()+cst_i*tmp);
-	    if (scatter)
-	      vres.push_back(symb_pnt_name(it->_VECTptr->front()+cst_i*tmp,attributs[0],string2gen(( (it==v.begin() && !polygone) ?gen2string(attributs[1]):""),false),contextptr));
-	    if (bar)
-	      vres.push_back(symb_segment(it->_VECTptr->front(),it->_VECTptr->front()+cst_i*tmp,attributs,_GROUP__VECT,contextptr));
-	  }
-	}
-      }
-      if (polygone)
-	vres.push_back(symb_pnt_name(res,attributs[0],attributs[1],contextptr));
-    }
-#ifndef WIN32
-    io_graph(old_iograph,contextptr);
-#endif
-    if (polygone && !scatter && ncol==2)
-      return vres.front();
-    return gen(vres,_SEQ__VECT);
-  }
-  gen _scatterplot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return scatterplot(g,2,contextptr);
-  }
-  static const char _scatterplot_s []="scatterplot";
-static define_unary_function_eval (__scatterplot,&_scatterplot,_scatterplot_s);
-  define_unary_function_ptr5( at_scatterplot ,alias_at_scatterplot,&__scatterplot,0,true);
-
-  static const char _nuage_points_s []="nuage_points";
-static define_unary_function_eval (__nuage_points,&_scatterplot,_nuage_points_s);
-  define_unary_function_ptr5( at_nuage_points ,alias_at_nuage_points,&__nuage_points,0,true);
-
-  gen _polygonplot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return scatterplot(g,1,contextptr);
-  }
-  static const char _polygonplot_s []="polygonplot";
-static define_unary_function_eval (__polygonplot,&_polygonplot,_polygonplot_s);
-  define_unary_function_ptr5( at_polygonplot ,alias_at_polygonplot,&__polygonplot,0,true);
-
-  static const char _ligne_polygonale_s []="ligne_polygonale";
-static define_unary_function_eval (__ligne_polygonale,&_polygonplot,_ligne_polygonale_s);
-  define_unary_function_ptr5( at_ligne_polygonale ,alias_at_ligne_polygonale,&__ligne_polygonale,0,true);
-
-  gen _polygonscatterplot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return scatterplot(g,3,contextptr);
-  }
-  static const char _polygonscatterplot_s []="polygonscatterplot";
-static define_unary_function_eval (__polygonscatterplot,&_polygonscatterplot,_polygonscatterplot_s);
-  define_unary_function_ptr5( at_polygonscatterplot ,alias_at_polygonscatterplot,&__polygonscatterplot,0,true);
-
-  static const char _ligne_polygonale_pointee_s []="ligne_polygonale_pointee";
-static define_unary_function_eval (__ligne_polygonale_pointee,&_polygonscatterplot,_ligne_polygonale_pointee_s);
-  define_unary_function_ptr5( at_ligne_polygonale_pointee ,alias_at_ligne_polygonale_pointee,&__ligne_polygonale_pointee,0,true);
-
-  gen _batons(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return scatterplot(g,4,contextptr);
-  }
-  static const char _batons_s []="batons";
-static define_unary_function_eval (__batons,&_batons,_batons_s);
-  define_unary_function_ptr5( at_batons ,alias_at_batons,&__batons,0,true);
-
-  static gen read_camembert_args(const gen & g,vecteur & vals,vecteur & names,vecteur & attributs,GIAC_CONTEXT){
-    if (g.type!=_VECT)
-      return gensizeerr(contextptr);
-    attributs=vecteur(1,default_color(contextptr) | _FILL_POLYGON);
-    int s=read_attributs(*g._VECTptr,attributs,contextptr);
-    gen args=(s==1)?g._VECTptr->front():gen(vecteur(g._VECTptr->begin(),g._VECTptr->begin()+s),g.subtype);
-    if (ckmatrix(args)){
-      matrice tmp(*args._VECTptr);
-      if (tmp.empty())
-	return gendimerr(contextptr);
-      if (tmp.size()!=2)
-	tmp=mtran(tmp);
-      int ts=int(tmp.size());
-      if (ts<2)
-	return gendimerr(contextptr);
-      if (ts>2){
-	// draw a camembert for each line
-	// [ list_of_class_names camembert1_values camembert2_values etc. ]
-	// camembertj_values may begin with a title string
-	names=*tmp.front()._VECTptr;
-	if (names.size()<2)
-	  return gendimerr(contextptr);
-	if (names[1].type!=_STRNG)
-	  return gensizeerr(contextptr);
-	vals=vecteur(tmp.begin()+1,tmp.end());
-	return 0;
-      }
-      vals=*tmp[1]._VECTptr;
-      names=*tmp[0]._VECTptr;
-      if (vals.front().type==_STRNG)
-	std::swap(vals,names);
-      vals=vecteur(1,vals);
-      return 0;
-    }
-    if (args.type!=_VECT)
-      return gensizeerr(contextptr);
-    vals=*args._VECTptr;
-    names=vecteur(vals.size(),string2gen("",false));
-    vals=vecteur(1,vals);
-    return 0;
-  }
-
-  // list of values or matrix with col1=list of legends, col2=list of values
-  gen _diagramme_batons(const gen & g_,GIAC_CONTEXT){
-    gen g(g_);
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur vals,names,attributs,res;
-    double largeur=.8;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT){
-      vecteur v=*g._VECTptr;
-      if (v.size()>1 && v.front().type==_VECT && v.back().type!=_VECT){
-	gen l=evalf_double(v.back(),1,contextptr);
-	if (l.type==_DOUBLE_){
-	  largeur=v.back()._DOUBLE_val;
-	  v.pop_back();
-	  if (v.size()==1)
-	    v=*v.front()._VECTptr;
-	}
-      }
-      for (unsigned i=0;i<v.size();++i){
-	if (v[i].is_symb_of_sommet(at_equal) && v[i]._SYMBptr->feuille.type==_VECT){
-	  gen f=v[i]._SYMBptr->feuille._VECTptr->front();
-	  if (f==at_size || (f.type==_IDNT && strcmp(f._IDNTptr->id_name,"width")==0)){
-	    gen tmp=v[i]._SYMBptr->feuille._VECTptr->back();
-	    tmp=evalf_double(tmp,1,contextptr);
-	    if (tmp.type!=_DOUBLE_ || tmp._DOUBLE_val<=0 || tmp._DOUBLE_val>1)
-	      return gensizeerr(contextptr);
-	    largeur=tmp._DOUBLE_val;
-	    v.erase(v.begin()+i);
-	    --i;
-	  }
-	}
-      }
-      if (v.size()==1)
-	g=v.front();
-      else
-	g=gen(v,_SEQ__VECT);
-    }
-    largeur /=2;
-    gen errcode=read_camembert_args(g,vals,names,attributs,contextptr);
-    if (is_undef(errcode)) return errcode;
-    vecteur attr(gen2vecteur(attributs[0]));
-    int ncamemberts=int(vals.size()),s=int(vals.front()._VECTptr->size()),t=int(attr.size());
-    int c=default_color(contextptr) & 0xffff;
-    if (t==1){
-      t=0;
-      c=attr[0].val;
-    }
-    gen namesf=evalf(names,1,contextptr);
-    if (namesf.type==_VECT && !is_numericv(*namesf._VECTptr))
-      res.push_back(symb_equal(change_subtype(gen(_AXES),_INT_PLOT),2));
-#if defined HAVE_LIBFLTK && defined GIAC_LMCHANGES // changes by L. Marohnić
-    vecteur allvals(0);
-    for (const_iterateur it=vals.begin();it!=vals.end();++it) {
-      if (it->type==_VECT)
-        allvals=mergevecteur(allvals,vecteur(it->_VECTptr->begin()+(it->_VECTptr->front().type==_STRNG?1:0),
-                                             it->_VECTptr->end()));
-    }
-    double dsc=2.0,padding=0.0;
-    if (!allvals.empty()) {
-      gen maxval=_evalf(_max(allvals,contextptr),contextptr);
-      if (maxval.type==_DOUBLE_ && is_positive(maxval,contextptr)) {
-        dsc=maxval.DOUBLE_val()*0.1;
-        padding=maxval.DOUBLE_val()*0.02;
-      }
-    }
-    for (int j=0;j<ncamemberts;j++){
-      vecteur & Vals = *vals[j]._VECTptr;
-      int i=0;
-      gen xy=(s-0.25)*j;
-      if (Vals[0].type==_STRNG){
-	// add title
-	res.push_back(symb_pnt_name(xy-largeur-dsc*cst_i,_POINT_INVISIBLE,Vals[0],contextptr));
-	++i;
-      }
-      for (;i<s;++i){
-	gen tmp,xpos;
-	if (names[i].type!=_STRNG && has_evalf(names[i],xpos,1,contextptr)){
-	  tmp=gen(makevecteur(xpos+largeur+cst_i*Vals[i],xpos+largeur,xpos-largeur,xpos-largeur+cst_i*Vals[i],xpos+largeur+cst_i*Vals[i]),_LINE__VECT);
-	  res.push_back(symb_pnt(tmp,i<t?attr[i]:(c | _FILL_POLYGON),contextptr));
-	}
-	else {
-	  tmp=gen(makevecteur(xy+i-1+largeur+cst_i*Vals[i],xy+i-1+largeur,xy+i-1-largeur,xy+i-1-largeur+cst_i*Vals[i],xy+i-1+largeur+cst_i*Vals[i]),_LINE__VECT);
-	  res.push_back(symb_pnt(tmp,i<t?attr[i]:((i==7?0:i) | _FILL_POLYGON),contextptr));
-    res.push_back(symb_pnt_name(xy+i-1+largeur+cst_i*(Vals[i]+padding),_POINT_INVISIBLE | _QUADRANT2,names[i],contextptr));
-	}
-      }
-    }
-#else
-    for (int j=0;j<ncamemberts;j++){
-      vecteur & Vals = *vals[j]._VECTptr;
-      int i=0;
-      gen xy=s*j;
-      if (Vals[0].type==_STRNG){
-	// add title
-	res.push_back(symb_pnt_name(xy+.5-2*cst_i,_POINT_INVISIBLE,Vals[0],contextptr));
-	++i;
-      }
-      for (;i<s;++i){
-	gen tmp,xpos;
-	if (names[i].type!=_STRNG && has_evalf(names[i],xpos,1,contextptr)){
-	  tmp=gen(makevecteur(xpos+largeur+cst_i*Vals[i],xpos+largeur,xpos-largeur,xpos-largeur+cst_i*Vals[i],xpos+largeur+cst_i*Vals[i]),_LINE__VECT);
-	  res.push_back(symb_pnt(tmp,i<t?attr[i]:(c | _FILL_POLYGON | _QUADRANT2),contextptr));
-	}
-	else {
-	  tmp=gen(makevecteur(xy+i+largeur+cst_i*Vals[i],xy+i+largeur,xy+i-largeur,xy+i-largeur+cst_i*Vals[i],xy+i+largeur+cst_i*Vals[i]),_LINE__VECT);
-	  res.push_back(symb_pnt_name(tmp,i<t?attr[i]:((i==7?0:i) | _FILL_POLYGON | _QUADRANT2),names[i],contextptr));
-	}
-      }
-    }
-#endif
-    return res;
-  }
-  static const char _diagramme_batons_s []="bar_plot";
-  static define_unary_function_eval (__diagramme_batons,&_diagramme_batons,_diagramme_batons_s);
-  define_unary_function_ptr5( at_diagramme_batons ,alias_at_diagramme_batons,&__diagramme_batons,0,true);
-
-  static const char _diagrammebatons_s []="barplot";
-  static define_unary_function_eval (__diagrammebatons,&_diagramme_batons,_diagrammebatons_s);
-  define_unary_function_ptr5( at_diagrammebatons ,alias_at_diagrammebatons,&__diagrammebatons,0,true);
-
-  gen _camembert(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur vals,names,attributs,res;
-#if 1 // changes by L. Marohnić
-    res.push_back(symb_equal(change_subtype(gen(_AXES),_INT_PLOT),0));
-    res.push_back(symb_equal(change_subtype(gen(_GL_ORTHO),_INT_PLOT),1));
-    gen errcode=read_camembert_args(g,vals,names,attributs,contextptr);
-    if (is_undef(errcode)) return errcode;
-    vecteur attr(gen2vecteur(attributs[0]));
-    int ncamemberts=int(vals.size()),s=int(vals.front()._VECTptr->size()),t=int(attr.size());
-    int rowlen=2;
-    if (ncamemberts>4) rowlen=3;
-    if (ncamemberts>6) rowlen=4;
-    for (int j=0;j<ncamemberts;j++){
-      gen xy=5*(j%rowlen)-5*(j/rowlen)*cst_i;
-      gen diametre=makevecteur(-1+xy,1+xy);
-      gen a(0),da;
-      double da100;
-      char ss[256];
-      vecteur & Vals = *vals[j]._VECTptr;
-      gen somme;
-      int i=0,pos=0;;
-      if (Vals[0].type==_STRNG){
-	// add title
-	res.push_back(symb_pnt_name(xy-1+1.75*cst_i,_POINT_INVISIBLE,Vals[0],contextptr));
-	++i;
-	somme=_plus(vecteur(Vals.begin()+1,Vals.end()),contextptr);
-      }
-      else
-	somme=_plus(Vals,contextptr);
-  string name;
-      for (;i<s;++i){
-	if (ck_is_strictly_positive(-Vals[i],contextptr))
-	  return gensizeerr(gettext("Negative value encoutered"));
-	da=2*cst_pi*Vals[i]/somme;
-	da100=evalf_double(100*Vals[i]/somme,1,contextptr)._DOUBLE_val;
-	if (da100>0){        
-	  sprintfdouble(ss,"%.4g",da100);
-	  if (is_positive(a-cst_pi/2,contextptr))
-	    pos=_QUADRANT2;
-	  if (is_positive(a-cst_pi,contextptr))
-	    pos=_QUADRANT3;
-	  if (is_positive(a-3*cst_pi/2,contextptr))
-	    pos=_QUADRANT4;
-	  gen tmp=symbolic(at_cercle,gen(makevecteur(diametre,a,a+da),_PNT__VECT));
-    name=gen2string(names[i]);
-    if (name.length()>1)
-      name+=": ";
-	  res.push_back(symb_pnt_name(tmp,i<t?attr[i]:(i%7 | _FILL_POLYGON | pos),
-                                string2gen(name+string(ss)+"%",false),contextptr));
-	  a=a+da;
-	}
-      }
-    }
-#else
-    gen errcode=read_camembert_args(g,vals,names,attributs,contextptr);
-    if (is_undef(errcode)) return errcode;
-    vecteur attr(gen2vecteur(attributs[0]));
-    int ncamemberts=int(vals.size()),s=int(vals.front()._VECTptr->size()),t=int(attr.size());
-    for (int j=0;j<ncamemberts;j++){
-      gen xy=5*(j%4)-5*(j/4)*cst_i;
-      gen diametre=makevecteur(-1+xy,1+xy);
-      gen a(0),da;
-      double da100;
-      char ss[256];
-      vecteur & Vals = *vals[j]._VECTptr;
-      gen somme;
-      int i=0,pos=0;;
-      if (Vals[0].type==_STRNG){
-	// add title
-	res.push_back(symb_pnt_name(xy-1+2*cst_i,_POINT_INVISIBLE,Vals[0],contextptr));
-	++i;
-	somme=_plus(vecteur(Vals.begin()+1,Vals.end()),contextptr);
-      }
-      else
-	somme=_plus(Vals,contextptr);
-      for (;i<s;++i){
-	if (ck_is_strictly_positive(-Vals[i],contextptr))
-	  return gensizeerr(gettext("Negative value encoutered"));
-	da=2*cst_pi*Vals[i]/somme;
-	da100=evalf_double(100*Vals[i]/somme,1,contextptr)._DOUBLE_val;
-	if (da100>0){        
-	  sprintfdouble(ss,"%.4g",da100);
-	  if (is_positive(a-cst_pi/2,contextptr))
-	    pos=_QUADRANT2;
-	  if (is_positive(a-cst_pi,contextptr))
-	    pos=_QUADRANT3;
-	  if (is_positive(a-3*cst_pi/2,contextptr))
-	    pos=_QUADRANT4;
-	  gen tmp=symbolic(at_cercle,gen(makevecteur(diametre,a,a+da),_PNT__VECT));
-	  res.push_back(symb_pnt_name(tmp,i<t?attr[i]:(i%7 | _FILL_POLYGON | pos),string2gen(gen2string(names[i])+":"+string(ss)+"%",false),contextptr));
-	  a=a+da;
-	}
-      }
-    }
-#endif
-    return res;
-  }
-  static const char _camembert_s []="camembert";
-static define_unary_function_eval (__camembert,&_camembert,_camembert_s);
-  define_unary_function_ptr5( at_camembert ,alias_at_camembert,&__camembert,0,true);
-
-  gen _axis(const gen & g,GIAC_CONTEXT){
-    if (g.type!=_VECT || g._VECTptr->size()<4)
-      return gensizeerr(contextptr);
-    const vecteur & v=*g._VECTptr;
-    gen X(symb_equal(change_subtype(_GL_X,_INT_PLOT),symb_interval(v[0],v[1])));
-    history_plot(contextptr).push_back(X);
-    gen Y(symb_equal(change_subtype(_GL_Y,_INT_PLOT),symb_interval(v[2],v[3])));
-    history_plot(contextptr).push_back(Y);
-    if (v.size()<6)
-      return makesequence(X,Y);
-    gen Z(symb_equal(change_subtype(_GL_Z,_INT_PLOT),symb_interval(v[4],v[5])));
-    history_plot(contextptr).push_back(Z);
-    return makesequence(X,Y,Z);
-  }
-  static const char _axis_s []="axis";
-  static define_unary_function_eval (__axis,&_axis,_axis_s);
-  define_unary_function_ptr5( at_axis ,alias_at_axis,&__axis,0,true);
-
-  gen _grid(const gen & g,GIAC_CONTEXT){
-    bool b=is_exactly_zero(g);
-    return symb_equal(change_subtype(_AXES,_INT_PLOT),b?0:(g==2?2:1));
-  }
-  static const char _grid_s []="grid";
-  static define_unary_function_eval (__grid,&_grid,_grid_s);
-  define_unary_function_ptr5( at_grid ,alias_at_grid,&__grid,0,true);
-
-  // Graham scan convex hull
- static bool graham_sort_function(const gen & a,const gen & b){
-   if (a.type!=_VECT || b.type!=_VECT || a._VECTptr->size()!=3 || b._VECTptr->size()!=3){
-#ifdef NO_STDEXCEPT
-     return false; 
-#else
-     setsizeerr(gettext("graham_sort_function"));
-#endif
-   }
-   vecteur & v=*a._VECTptr;
-   vecteur & w=*b._VECTptr;
-   return is_strictly_greater(w[1],v[1],context0) || (v[1]==w[1] && is_strictly_greater(w[2],v[2],context0)) ;
- }
-
-  gen cross_prod(const gen & a,const gen & b,const gen & c,GIAC_CONTEXT){
-    gen ab=b-a,ac=c-a;
-    gen A(re(ab,contextptr)),B(im(ab,contextptr)),C(re(ac,contextptr)),D(im(ac,contextptr));
-    return A*D-B*C;
-  }
-
-  gen _convexhull(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT)
-      return gensizeerr(contextptr); 
-    vecteur l0(*_affixe(g,contextptr)._VECTptr),l;
-    int s=int(l0.size());
-    for (int i=0;i<s;++i){
-      if (l0[i].type==_VECT)
-	l=mergevecteur(l,*l0[i]._VECTptr);
-      else
-	l.push_back(l0[i]);
-    }
-    s=int(l.size());
-    if (s<=3){
-#if 0
-      if (abs_calc_mode(contextptr)==38)
-	return _polygone(l,contextptr);
-#endif
-      return l;
-    }
-    gen zmin=l[0],zcur;
-    gen ymin=im(zmin,contextptr),ycur,xmin=re(zmin,contextptr),xcur;
-    for (int j=1;j<s;++j){
-      zcur=l[j]; ycur=im(zcur,contextptr); xcur=re(zcur,contextptr);
-      if ( is_strictly_greater(ymin,ycur,contextptr) ||
-	   (ycur==ymin && is_strictly_greater(xmin,xcur,contextptr)) ){
-	zmin=zcur; ymin=ycur; xmin=xcur;
-      }
-    }
-    vecteur ls;
-    for (int j=0;j<s;++j){
-      zcur=l[j];
-      if (zcur!=zmin){
-	ls.push_back(makevecteur(zcur,arg(zcur-zmin,contextptr),(zcur-zmin)*conj(zcur-zmin,contextptr)));
-      }
-    }
-    gen_sort_f(ls.begin(),ls.end(),graham_sort_function);
-    vecteur res(makevecteur(zmin,ls[0][0]));
-    int ress=2;
-    gen o;
-    for (int j=1;j<s-1;++j){
-      zcur=ls[j][0];
-      o=cross_prod(res[ress-2],res[ress-1],zcur,contextptr);
-      if (is_zero(o))
-	res[ress-1]=zcur;
-      else {
-	if (is_strictly_positive(o,contextptr)){
-	  res.push_back(zcur);
-	  ress++;
-	}
-	else {
-	  while (!is_positive(o,contextptr) && ress>2){
-	    res.pop_back();
-	    ress--;
-	    o=cross_prod(res[ress-2],res[ress-1],zcur,contextptr);
-	  }
-	  res.push_back(zcur);
-	  ress++;
-	}
-      }
-    }
-#if 0
-    if (abs_calc_mode(contextptr)==38)
-      return _polygone(res,contextptr);
-#endif
-    return gen(res,g.subtype);
-  }
-  static const char _convexhull_s []="convexhull";
-static define_unary_function_eval (__convexhull,&_convexhull,_convexhull_s);
-  define_unary_function_ptr5( at_convexhull ,alias_at_convexhull,&__convexhull,0,true);
-
-#ifdef RTOS_THREADX
-  gen _simplex_reduce(const gen & args,GIAC_CONTEXT){
-    return undef;
-  }
-  static const char _simplex_reduce_s []="simplex_reduce";
-static define_unary_function_eval (__simplex_reduce,&_simplex_reduce,_simplex_reduce_s);
-  define_unary_function_ptr5( at_simplex_reduce ,alias_at_simplex_reduce,&__simplex_reduce,0,true);
-#else
-  // Simplex algorithm solving max c.x where constraints on x are in 
-  // canonical form: A*x <= b with b>= 0
-  // Variables are added to get [A|I] (x,x_slack) = b
-  // 
-  // Arguments:
-  // m must contain an identity matrix in the n-1 first rows
-  // like [A|I|b], to solve for b>=0, A*x<=b (I is for "slack" variables)
-  // <variables d'ecarts ajoutees pour transformer <= en egalite >
-  // last line (objective function row) [-c|0|0], maximize or minimize c.x
-  // if the coefficients of the last row at the columns of the identity 
-  // are not zero, step 0 will transform the last row to set them to 0.
-  // max_pb is true for maximization and false for min
-  // choose_first=true if we choose the first possible entering/outgoing index
-  // 
-  // Returns:
-  // optimum will contain the max (min) value, if not +/-inf
-  // bfs contains the coordinates of a solution
-  // At the end of the algorithm we have [B^-1*A|B^-1|B^-1*b] for the
-  // n-1 first row, and for last row [-c+c_B * B^-1*A | c_B*B^-1|c_B*B^-1*b]
-  // where all coeffs of non-basic variables are + (for a max) and other are 0
-  // Since the function to maximize + (last row) scalar (x,x_slack_variables)
-  // = c_B*B^-1*b, it is not possible to improve c_B*B^-1*b
-  // The reason is that the current solution has non-0 components
-  // corresponding to the 0 value in the last row 
-  // and 0 components corresponding to non-0 positive values in the last row
-  // If we move one 0 component of the current solution, it must increase 
-  // hence we have to decrease one of the coeff corresponding to non-0
-  // positive coeffs in the last row, decreasing the value of the function
-  // to maximize.
-  // 
-  // Not yet implemented: how to reduce any linear programming problem
-  // to a feasible canonical matrix m
-  // The idea is to add artificial variables (as many as there are equalities)
-  // and maximize -sum(artificial variables) starting with all non
-  // artificial variables equal to 0
-  // If the max is not 0 there is no solution
-  // otherwise all artificial variables are set to 0 and we have a
-  // basic feasible solution to start with
-  //
-  // NB: If a coeff of the bfs is 0 we may cycle, using choose_first=true
-  // will insure we do not cycle (Bland's rule)
-  // another rule might be implemented by keeping somewhere all the
-  // visited basis corresponding to the same max value
-  matrice simplex_reduce(const matrice & m_orig,vecteur & bfs,gen & optimum,bool max_pb,bool choose_first,GIAC_CONTEXT){
-    matrice m(m_orig);
-    int nr=int(m.size());
-    int nc=int(m.front()._VECTptr->size());
-    if (nc<nr+1)
-      return vecteur(1,gendimerr(contextptr));
-    // Step 0 set the coefficients of the last row in the idn column to 0
-    vecteur lastline(nr-1);
-    matrice mt(mtran(m)); 
-    for (int i=0;i<nc-1;++i){
-      int cur_col=-1;
-      vecteur & mti=*mt[i]._VECTptr;
-      for (int j=0;j<nr-1;++j){
-	if (is_zero(mti[j]))
-	  continue;
-	if (!is_one(mti[j]) || cur_col>=0){
-	  cur_col=-1;
-	  break; // not an idn line
-	}
-	cur_col=j;	    
-      }
-      if (cur_col>=0)
-	lastline[cur_col]=mti[nr-1];
-    }
-    for (int i=0;i<nr-1;++i){
-      if (!is_zero(lastline[i]))
-	m[nr-1]=subvecteur(*m[nr-1]._VECTptr,multvecteur(lastline[i],*m[i]._VECTptr));
-    }
-    for (;;){
-      // Step 1: find the most positive (min_pb) or negative (max_pb) 
-      // coefficient of the objective function row (last row)
-      // or choose the first + or - if choose_first is true
-      gen mincoeff=0;
-      int J=-1;
-      vecteur &last=*m.back()._VECTptr;
-      for (int j=0;j<nc-1;++j){
-	if (is_strictly_greater((max_pb?mincoeff:last[j]),
-				(max_pb?last[j]:mincoeff),contextptr)){
-	  J=j;
-	  mincoeff=last[j];
-	  if (choose_first)
-	    break;
-	}
-      }
-      if (J==-1){ // Find bfs and optimum
-	optimum=m[nr-1][nc-1];
-	bfs=vecteur(nc-1);
-	// Push back 0 or m[i][nc-1] if column is an identity column
-	matrice mt=mtran(m);
-	int counter=nr-1;
-	for (int i=0;i<nc-1 && counter>0;++i){
-	  int cur_col=-1;
-	  if (is_zero(mt[i][nr-1])){
-	    for (int j=0;j<nr-1;++j){
-	      if (is_zero(mt[i][j]))
-		continue;
-	      if (cur_col>=0){
-		cur_col=-1;
-		break; // not an idn line
-	      }
-	      cur_col=j;	    
-	    }
-	  }
-	  if (cur_col>=0 && is_one(mt[i][cur_col])){ // BUGFIX by Luka Marohnić: a proper check for idn line
-	    --counter;
-	    bfs[i]=mt[nc-1][cur_col];
-	  }
-	}
-	return m;
-      }
-      int I=-1;
-      mincoeff=plus_inf;
-      gen ratio;
-      // We will move the J-th variable from 0 to something positive
-      // We have to find which variables govern how much positive xJ can be
-      // -> find the smallest positive ratio 
-      // and choose the 1st one if the smallest ratio is reached several times
-      for (int i=0;i<nr-1;++i){
-	gen m1(m[i][J]);
-	if (is_strictly_positive(m1,contextptr) && 
-	    is_strictly_greater(mincoeff,ratio=m[i][nc-1]/m1,contextptr)){
-	  I=i;
-	  mincoeff=ratio;
-	}
-      }
-      if (I==-1){ // The function is not bounded since xJ can grow to +inf
-	optimum=max_pb?plus_inf:minus_inf;
-	return m;
-      }
-      if (is_zero(mincoeff)) // Bland's rule
-	choose_first=true;
-      // Pivot found, line I, column J, reduce matrix (Gauss-like)
-      m[I]=divvecteur(*m[I]._VECTptr,m[I][J]);
-      vecteur & pivot_v = *m[I]._VECTptr;
-      gen a;
-      for (int i=0;i<nr;++i){
-	if (i==I)
-	  continue;
-	vecteur & v=*m[i]._VECTptr;
-	a=v[J];
-	for (int j=0;j<nc;++j){
-	  v[j]=v[j]-a*pivot_v[j];
-	}
-      }
-    }
-  }
-
-  // solve max(c.x) under Ax<=b, returns optimum value, solution x0
-  // and reduced matrix
-  gen _simplex_reduce(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    matrice m;
-    vecteur v; 
-    gen optimum;
-    if (g.type ==_VECT && g.subtype==_SEQ__VECT && g._VECTptr->size()==3){
-      vecteur & gv =*g._VECTptr;
-      if (gv[0].type!=_VECT || gv[1].type!=_VECT || gv[2].type!=_VECT)
-	return gentypeerr(contextptr);
-      m=*gv[0]._VECTptr;
-      int add=int(m.size());
-      m=mtran(m);
-      m=mergevecteur(m,midn(add));
-      m.push_back(gv[1]);
-      if (!ckmatrix(m))
-	return gendimerr(contextptr);
-      m=mtran(m);
-      m.push_back(mergevecteur(*(-gv[2])._VECTptr,vecteur(add+1,0)));
-      if (!ckmatrix(m))
-	return gendimerr(contextptr);
-    }
-    else {
-      if (!ckmatrix(g))
-	return gensizeerr(contextptr); 
-      m=*g._VECTptr;
-    }
-    m=simplex_reduce(m,v,optimum,true,false,contextptr);
-    if (is_undef(m) && !m.empty())
-      return m.front();
-    return gen(makevecteur(optimum,v,m),_SEQ__VECT);
-  }
-  static const char _simplex_reduce_s []="simplex_reduce";
-static define_unary_function_eval (__simplex_reduce,&_simplex_reduce,_simplex_reduce_s);
-  define_unary_function_ptr5( at_simplex_reduce ,alias_at_simplex_reduce,&__simplex_reduce,0,true);
-#endif
-
-  // natural_spline([x0,...,xn],[y0,...,yn],x,d)
-  // -> spline of degree d, in C^{d-1}, with values yk at xk
-  // and initial/final derivatives = 0 from order 1 to (d-1)/2, 
-  // d-1 conditions
-  // returns a list of n polynomials with respect to x
-  // to get the value of the spline, find the right interval hence polynomial
-  // and call horner(poly,value-xi)
-  // x and d are optional, if not precised d is 3
-  gen _spline(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type!=_VECT || g._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    vecteur w(*g._VECTptr);
-    if (w.size()<3)
-      w.push_back(vx_var);
-    if (w.size()<4)
-      w.push_back(3);
-    gen X(w[0]), Y(w[1]), xvar(w[2]), dg(w[3]);
-    if (dg.type!=_INT_ || dg.val<1 || X.type!=_VECT || Y.type!=_VECT)
-      return gentypeerr(contextptr);
-    vecteur &x=*X._VECTptr;
-    vecteur &y=*Y._VECTptr;
-    int n=int(x.size())-1;
-    if (n<1 || y.size()!=unsigned(n+1))
-      return gendimerr(contextptr);
-    int d(dg.val);
-    // create n unknowns, the values of the highest derivative coeff
-    // at x0, ..., xn-1
-    // and (d-1)/2 unknowns, the values of diff(spline,x$k) for k=1 to (d-1)/2
-    vecteur z(n),f((d-1)/2),pol;
-    for (int i=0;i<n;++i){
-      z[i]=identificateur(" z"+print_INT_(i));
-    }
-    for (int i=0;i<(d-1)/2;++i){
-      f[i]=identificateur(" f"+print_INT_(i));
-    }
-    // create vector of linear equations to solve for
-    vecteur lineq;
-    // create initial taylor polynomial form of the poly
-    vecteur v(d+1);
-    v[0]=z[0]; // z[0]*(x-x0)^d + f_(d-1)/2 * (x-x0)^{(d-1)/2} + ...+f_0*(x-x_0) + y0
-    for (int i=1;i<=(d-1)/2;++i)
-      v[d-i]=f[i-1];
-    v[d]=y[0]; // all conditions at x0 are solved
-    pol.push_back(v);
-    for (int i=0;i<n;++i){   
-      // move from xi to xi+1
-      v=*ratnormal(taylor(v,x[i+1]-x[i]),contextptr)._VECTptr;
-      lineq.push_back(v[d]-y[i+1]);
-      // new v changes by the first coeff of v only
-      v[0]=(i==n-1)?0:z[i+1];
-      pol.push_back(v);
-    }
-    // add conditions at x[n]
-    for (int i=1;i<=(d-1)/2;++i){
-      lineq.push_back(v[i]);
-    }
-    vecteur inconnu(mergevecteur(z,f));
-    vecteur zf=linsolve(lineq,inconnu,contextptr);
-    if (is_undef(zf)) return zf;
-    pol.pop_back();
-    pol=*ratnormal(subst(pol,inconnu,zf,false,contextptr),contextptr)._VECTptr;
-    for (int i=0;i<n;++i){
-      if (pol[i].type==_VECT)
-	pol[i]=symb_horner(*pol[i]._VECTptr,xvar-x[i]);
-    }
-    return pol;
-  }
-  static const char _spline_s []="spline";
-static define_unary_function_eval (__spline,&_spline,_spline_s);
-  define_unary_function_ptr5( at_spline ,alias_at_spline,&__spline,0,true);
-
-  gen giac_bitand(const gen & a,const gen & b){
-    register unsigned t=(a.type<< _DECALAGE) | b.type;
-    if (!t)
-      return( a.val & b.val);
-    register ref_mpz_t * e;
-    switch ( t ) {
-    case _ZINT__ZINT:
-      e = new ref_mpz_t;
-      mpz_and(e->z,*a._ZINTptr,*b._ZINTptr);
-      return e;
-    case _INT___ZINT: 
-      e = new ref_mpz_t;
-      mpz_set_ui(e->z,a.val);
-      mpz_and(e->z,e->z,*b._ZINTptr);
-      return(e);
-    case _ZINT__INT_:
-      e = new ref_mpz_t;
-      mpz_set_ui(e->z,b.val);
-      mpz_and(e->z,*a._ZINTptr,e->z);
-      return(e);
-    }
-    return symbolic(at_bitand,gen(makevecteur(a,b),_SEQ__VECT));
-  }
-  gen giac_bitor(const gen & a,const gen & b){
-    register unsigned t=(a.type<< _DECALAGE) | b.type;
-    if (!t)
-      return( a.val | b.val);
-    register ref_mpz_t * e;
-    switch ( t ) {
-    case _ZINT__ZINT:
-      e = new ref_mpz_t;
-      mpz_ior(e->z,*a._ZINTptr,*b._ZINTptr);
-      return(e);
-    case _INT___ZINT: 
-      e = new ref_mpz_t;
-      mpz_set_ui(e->z,a.val);
-      mpz_ior(e->z,e->z,*b._ZINTptr);
-      return(e);
-    case _ZINT__INT_:
-      e = new ref_mpz_t;
-      mpz_set_ui(e->z,b.val);
-      mpz_ior(e->z,*a._ZINTptr,e->z);
-      return(e);
-    }
-    return symbolic(at_bitor,gen(makevecteur(a,b),_SEQ__VECT));
-  }
-  gen giac_bitxor(const gen & a,const gen & b){
-    register unsigned t=(a.type<< _DECALAGE) | b.type;
-    if (!t)
-      return( a.val ^ b.val);
-    register ref_mpz_t * e;
-    switch ( t ) {
-    case _ZINT__ZINT:
-      e = new ref_mpz_t;
-      mpz_xor(e->z,*a._ZINTptr,*b._ZINTptr);
-      return(e);
-    case _INT___ZINT: 
-      e = new ref_mpz_t;
-      mpz_set_ui(e->z,a.val);
-      mpz_xor(e->z,e->z,*b._ZINTptr);
-      return(e);
-    case _ZINT__INT_:
-      e = new ref_mpz_t;
-      mpz_set_ui(e->z,b.val);
-      mpz_xor(e->z,*a._ZINTptr,e->z);
-      return(e);
-    }
-    return symbolic(at_bitxor,gen(makevecteur(a,b),_SEQ__VECT));
-  }
-
-  gen giac_hamdist(const gen & a,const gen & b){
-    unsigned long t=(a.type<< _DECALAGE) | b.type;
-    if (t==0){
-      unsigned res=0;
-      unsigned val=a.val ^ b.val;
-      for (int i=0;i<31;++i){
-	res += (val >>i) & 1; 
-      }
-      return int(res);
-    }
-    ref_mpz_t *  e = new ref_mpz_t;
-    switch ( t ) {
-      /*
-    case 0:
-      mpz_set_ui(e->z,a.val ^ b.val);
-      t = mpz_popcount(e->z);
-      break;
-      */
-    case _ZINT__ZINT:
-      t=mpz_hamdist(*a._ZINTptr,*b._ZINTptr);
-      break;
-    case _INT___ZINT: 
-      mpz_set_ui(e->z,a.val);
-      t=mpz_hamdist(e->z,*b._ZINTptr);
-      break;
-    case _ZINT__INT_:
-      mpz_set_ui(e->z,b.val);
-      t=mpz_hamdist(*a._ZINTptr,e->z);
-      break;
-    default:
-      delete e;
-      return symbolic(at_hamdist,gen(makevecteur(a,b),_SEQ__VECT));
-    }
-    delete e;
-    return longlong(t);
-  }
-
-  gen binop(const gen & g,gen (* f) (const gen &, const gen &)){
-    if (g.type!=_VECT || g._VECTptr->empty())
-      return gensizeerr(gettext("binop"));
-    const_iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
-    gen res=*it;
-    for (++it;it!=itend;++it){
-      res=apply(res,*it,f);
-    }
-    return res;
-  }
-  gen _bitand(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return binop(g,giac_bitand);
-  }
-  static const char _bitand_s []="bitand";
-static define_unary_function_eval (__bitand,&_bitand,_bitand_s);
-  define_unary_function_ptr5( at_bitand ,alias_at_bitand,&__bitand,0,true);
-
-  gen _bitor(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return binop(g,giac_bitor);
-  }
-  static const char _bitor_s []="bitor";
-static define_unary_function_eval (__bitor,&_bitor,_bitor_s);
-  define_unary_function_ptr5( at_bitor ,alias_at_bitor,&__bitor,0,true);
-
-  gen _bitxor(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    return binop(g,giac_bitxor);
-  }
-  static const char _bitxor_s []="bitxor";
-static define_unary_function_eval (__bitxor,&_bitxor,_bitxor_s);
-  define_unary_function_ptr5( at_bitxor ,alias_at_bitxor,&__bitxor,0,true);
-
-  gen _bitnot(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_INT_)
-      return ~g.val;
-#if !defined(USE_GMP_REPLACEMENTS) && !defined(BF2GMP_H)
-    if (g.type==_ZINT){
-      ref_mpz_t *  e = new ref_mpz_t;
-      mpz_com(e->z,*g._ZINTptr);
-      return e;
-    }
-#endif
-    return gensizeerr();
-  }
-  static const char _bitnot_s []="bitnot";
-  static define_unary_function_eval (__bitnot,&_bitnot,_bitnot_s);
-  define_unary_function_ptr5( at_bitnot ,alias_at_bitnot,&__bitnot,0,true);
-
-  gen _hamdist(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    if (g.type==_VECT && g.subtype==_SEQ__VECT && g._VECTptr->size()==2 && g._VECTptr->front().type==_VECT && g._VECTptr->back().type==_VECT && g._VECTptr->front().subtype!=_LIST__VECT && g._VECTptr->back().subtype!=_LIST__VECT){
-      const vecteur & f=*g._VECTptr->front()._VECTptr;
-      const vecteur & b=*g._VECTptr->back()._VECTptr;
-      size_t fs=f.size();
-      if (f.size()==b.size()){
-	int res=0;
-	for (size_t i=0;i<fs;++i){
-	  if (f[i]!=b[i]) 
-	    res++;
-	}
-	return res;
-      }
-    }
-    return binop(g,giac_hamdist);
-  }
-  static const char _hamdist_s []="hamdist";
-static define_unary_function_eval (__hamdist,&_hamdist,_hamdist_s);
-  define_unary_function_ptr5( at_hamdist ,alias_at_hamdist,&__hamdist,0,true);
-
-
-  // ploarea(polygone), plotarea(f(x),x=a..b), plotarea(f(x),x=a..b,n,method)
-  // method=trapeze,point_milieu,rectangle_gauche,rectangle_droit
-  gen _plotarea(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    vecteur attributs(default_color(contextptr));
-    int s=read_attributs(v,attributs,contextptr);
-    if (!s)
-      return gensizeerr(contextptr);
-    if (attributs.size()<2)
-      attributs.push_back(0);
-    if (attributs[0].type==_INT_)
-      attributs[0].val= attributs[0].val | _FILL_POLYGON;
-    v[0]=remove_at_pnt(v[0]);
-    if (v[0].type==_VECT){
-      attributs[1]=_aire(v[0],contextptr);
-      return pnt_attrib(v[0],attributs,contextptr);
-    }
-    if (s>=2 && v[0].type!=_VECT){
-      gen tmp(v[1]),a,b,x(vx_var);
-      if (is_equal(tmp) && tmp._SYMBptr->feuille.type==_VECT && tmp._SYMBptr->feuille._VECTptr->size()==2){
-	x=tmp._SYMBptr->feuille[0];
-	tmp=tmp._SYMBptr->feuille[1];
-      }
-      if (tmp.is_symb_of_sommet(at_interval) && tmp._SYMBptr->feuille.type==_VECT && tmp._SYMBptr->feuille._VECTptr->size()==2){
-	a=tmp._SYMBptr->feuille[0];
-	b=tmp._SYMBptr->feuille[1];
-      }
-      else
-	return gensizeerr(gettext("plotarea(f(x),x=a..b[,n,method])"));
-      if (s>=2){
-	int s1=s-1;
-	for (;s1>0;--s1){
-	  if (v[s1].type!=_INT_)
-	    break;
-	}
-	gen graph=funcplotfunc(gen(vecteur(v.begin(),v.begin()+s1+1),_SEQ__VECT),false,contextptr); // must be a graph of fcn
-	if (is_undef(graph))
-	  return graph;
-	// extract polygon
-	gen graphe=remove_at_pnt(graph);
-	if (graphe.type==_VECT && graphe._VECTptr->size()==2)
-	  graphe=symbolic(at_curve,makesequence(v.front(),graphe));
-	if (graphe.is_symb_of_sommet(at_curve) && graphe._SYMBptr->feuille.type==_VECT){
-	  vecteur & graphev=*graphe._SYMBptr->feuille._VECTptr;
-	  if (graphev.size()>1){
-	    gen polyg=graphev[1];
-	    if (polyg.type==_VECT){
-	      if (s==2){
-		// add verticals and horizontal
-		vecteur res(*polyg._VECTptr);
-		res.insert(res.begin(),a);
-		res.insert(res.begin(),b);
-		res.push_back(b);
-		int nd=decimal_digits(contextptr);
-		decimal_digits(3,contextptr);
-		attributs[1]=string2gen(_gaussquad(gen(makevecteur(v[0],v[1]),_SEQ__VECT),contextptr).print(contextptr),false);
-		decimal_digits(nd,contextptr);
-		return pnt_attrib(gen(res,_GROUP__VECT),attributs,contextptr);
-	      } // end s==2
-	      if (s>=3)
-		v[2]=_floor(v[2],contextptr);
-	      if (s>=3 && v[2].type==_INT_){
-		int n=v[2].val;
-		if (n<1)
-		  return gensizeerr(contextptr);
-		vecteur res;
-		res.push_back(b);
-		res.push_back(a);
-		gen dx=(b-a)/n,x0=a,xf=x0,fxf,f=v[0],A;
-		int method=_TRAPEZE;
-		if (s>=4 && v[3].type==_INT_)
-		  method = v[3].val;
-		if (method==_RECTANGLE_DROIT || method==_RECTANGLE_GAUCHE || method==_POINT_MILIEU){
-		  if (method==_RECTANGLE_DROIT)
-		    xf=x0+dx;
-		  if (method==_POINT_MILIEU)
-		    xf=x0+dx/2;
-		  for (int i=0;i<n;++i){
-		    fxf=evalf(quotesubst(f,x,xf,contextptr),1,contextptr);
-		    A=A+dx*fxf;
-		    res.push_back(x0+fxf*cst_i);
-		    x0=x0+dx;
-		    xf=xf+dx;
-		    res.push_back(x0+fxf*cst_i);
-		  }
-		}
-		if (method==_TRAPEZE){
-		  fxf=evalf(quotesubst(f,x,xf,contextptr),1,contextptr);
-		  A=dx*fxf/2;
-		  res.push_back(xf+fxf*cst_i);
-		  xf=x0+dx;
-		  for (int i=0;i<n-1;++i){
-		    fxf=evalf(quotesubst(f,x,xf,contextptr),1,contextptr);
-		    A=A+dx*fxf;
-		    res.push_back(xf+fxf*cst_i);
-		    x0=x0+dx;
-		    xf=xf+dx;
-		  }
-		  fxf=evalf(quotesubst(f,x,b,contextptr),1,contextptr);
-		  A=A+dx*fxf/2;
-		  res.push_back(b+fxf*cst_i);
-		}
-		res.push_back(b);
-		int nd=decimal_digits(contextptr);
-		decimal_digits(3,contextptr);
-		attributs[1]=string2gen(A.print(contextptr),false);
-		decimal_digits(nd,contextptr);
-		return gen(makevecteur(gen(makevecteur(pnt_attrib(res,attributs,contextptr),graph),_SEQ__VECT),_couleur(makevecteur(graph,_RED+_DASH_LINE+_LINE_WIDTH_3),contextptr)),_SEQ__VECT);
-	      } // end if (s>=3)
-	    } // end polyg.type==_VECT
-	  }
-	}
-      } // end s>=2
-    }
-    return gensizeerr(gettext("not supported"));
-  }
-  static const char _plotarea_s []="plotarea";
-  static define_unary_function_eval (__plotarea,&_plotarea,_plotarea_s);
-  define_unary_function_ptr5( at_plotarea ,alias_at_plotarea,&__plotarea,0,true);
-
-  static const char _areaplot_s []="areaplot";
-  static define_unary_function_eval (__areaplot,&_plotarea,_areaplot_s);
-  define_unary_function_ptr5( at_areaplot ,alias_at_areaplot,&__areaplot,0,true);
-
-  gen _add_language(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type==_INT_){
-      add_language(args.val,contextptr);
-      return 1;
-    }
-    if (args.type==_STRNG){
-      string s=*args._STRNGptr;
-      s=s.substr(0,2);
-      int i=string2lang(s);
-      if (i){
-	add_language(i,contextptr);
-	return 1;
-      }
-    }
-    return 0;
-  }
-  static const char _add_language_s []="add_language";
-static define_unary_function_eval (__add_language,&_add_language,_add_language_s);
-  define_unary_function_ptr5( at_add_language ,alias_at_add_language,&__add_language,0,true);
-
-  gen _remove_language(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type==_INT_){
-      remove_language(args.val,contextptr);
-      return 1;
-    }
-    if (args.type==_STRNG){
-      string s=*args._STRNGptr;
-      s=s.substr(0,2);
-      int i=string2lang(s);
-      if (i){
-	remove_language(i,contextptr);
-	return 1;
-      }
-    }
-    return 0;
-  }
-  static const char _remove_language_s []="remove_language";
-static define_unary_function_eval (__remove_language,&_remove_language,_remove_language_s);
-  define_unary_function_ptr5( at_remove_language ,alias_at_remove_language,&__remove_language,0,true);
-
-  gen _show_language(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    return vector_int_2_vecteur(lexer_localization_vector());
-  }
-  static const char _show_language_s []="show_language";
-static define_unary_function_eval (__show_language,&_show_language,_show_language_s);
-  define_unary_function_ptr5( at_show_language ,alias_at_show_language,&__show_language,0,true);
-
-  gen _set_language(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_INT_)
-      return undef;
-#if 0
-    static int i=0;
-    if (language(contextptr)==args.val){
-      ++i;
-      return string2gen("ans("+print_INT_(i)+")= ",false);
-    }
-#endif
-    gen res=string2gen(set_language(args.val,contextptr),false);
-    return res;
-  }
-  static const char _set_language_s []="set_language";
-static define_unary_function_eval (__set_language,&_set_language,_set_language_s);
-  define_unary_function_ptr5( at_set_language ,alias_at_set_language,&__set_language,0,true);
-
-  gen _os_version(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-#ifdef WIN32
-    return string2gen("win",false);
-#else
-#ifdef __APPLE__
-    return string2gen("macos",false);
-#else
-    return string2gen("unix",false);
-#endif
-#endif
-  }
-  static const char _os_version_s []="os_version";
-static define_unary_function_eval (__os_version,&_os_version,_os_version_s);
-  define_unary_function_ptr5( at_os_version ,alias_at_os_version,&__os_version,0,true);
-
-#ifndef GIAC_HAS_STO_38
-  gen plotproba(const gen & args,const vecteur & positions,const vecteur & attributs,GIAC_CONTEXT){
-    if (args.type!=_VECT)
-      return gensizeerr(contextptr);
-    matrice m (*args._VECTptr);
-    // check if there is a row of legende strings
-    gen leg;
-    if (!is_squarematrix(m)){
-      if (!ckmatrix(m) || m.empty())
-	return gensizeerr(contextptr);
-      int r=m.size();
-      int c=m[0]._VECTptr->size();
-      if (c==r+1){
-	m=mtran(m);
-	c=r;
-      }
-      else {
-	if (r!=c+1)
-	  return gensizeerr(contextptr);
-      }
-      // first or last row?
-      gen m00=m[0][0];
-      if (m00.type==_IDNT || m00.type==_STRNG){
-	leg=m.front();
-	m=vecteur(m.begin()+1,m.end());
-      }
-      else {
-	leg=m.back();
-	m.pop_back();
-      }
-    }
-    int ms=m.size();
-    if (ms<2)
-      return gendimerr(contextptr);
-    // check if coeffs>=0 and sum coeffs = 1 on rows or on columns
-    gen g=_sum(args,contextptr);
-    if (!is_zero(g-vecteur(ms,1))){
-      m=mtran(m);
-      ms=m.size();
-      g=_sum(m,contextptr);
-      if (!is_zero(g-vecteur(ms,1)))
-	*logptr(contextptr) << gettext("Warning: not a graph matrix!") << '\n';
-    }
-    // first make points, 
-    double xmin(0),xmax(0),ymin(0),ymax(0);
-    vecteur l(ms),pos(ms),col(ms,_BLACK);
-    switch (ms){
-    case 2:
-      xmin=-0.5; xmax=1.5; ymin=-0.5; ymax=0.5;
-      l[0]=0.; pos[0]=_QUADRANT3;
-      l[1]=1.; pos[1]=_QUADRANT4; col[1]=35;
-      break;
-    case 3:
-      xmin=-0.5; xmax=1.5; ymin=-0.5; ymax=1;
-      l[0]=0.0; pos[0]=_QUADRANT3;
-      l[1]=1.0; pos[1]=_QUADRANT4;col[1]=35;
-      l[2]=gen(0.5,std::sqrt(3.0)/2); pos[2]=_QUADRANT1; col[2]=11;
-      break;
-    case 4:
-      xmin=-0.5; xmax=1.5; ymin=-0.5; ymax=1;
-      l[0]=0.; pos[0]=_QUADRANT3;
-      l[1]=1; pos[1]=_QUADRANT4;col[1]=35;
-      l[2]=gen(0.5,0.5*std::sqrt(3.0));  pos[2]=_QUADRANT1; col[2]=11;
-      l[3]=(l[1]+l[2])/3; // isobarycenter
-      col[3]=58;
-      break;
-    case 5:
-      xmin=-0.5; xmax=3.5; ymin=-0.5; ymax=3;
-      l[0]=0.; pos[0]=_QUADRANT3;
-      l[1]=3.; pos[1]=_QUADRANT4;col[1]=35;
-      l[2]=gen(1.5,1.5*std::sqrt(3.0));  pos[2]=_QUADRANT1; col[2]=11;
-      l[3]=gen(1.,.75); col[3]=58;
-      l[4]=gen(2.,.75); col[4]=_MAGENTA;
-      break;
-    case 6:
-      xmin=-0.5; xmax=3.5; ymin=-0.5; ymax=3;
-      l[0]=0.; pos[0]=_QUADRANT3;
-      l[1]=3.; pos[1]=_QUADRANT4;col[1]=35;
-      l[2]=gen(1.5,1.5*std::sqrt(3.0));  pos[2]=_QUADRANT1; col[2]=11;
-      l[3]=gen(1.,.5); col[3]=58;
-      l[4]=gen(2.,.5); col[4]=_MAGENTA;
-      l[5]=gen(1.5,1.36602540378); col[5]=220;
-      break;
-    default:
-      xmin=-0.5; xmax=3.5; ymin=-0.5; ymax=3;
-      l[0]=0.; pos[0]=_QUADRANT3;
-      l[1]=3.; pos[1]=_QUADRANT4;col[1]=35;
-      l[2]=gen(1.5,1.5*std::sqrt(3.0));  pos[2]=_QUADRANT1; col[2]=11;
-      l[3]=gen(1.,.5); col[3]=58;
-      l[4]=gen(2.,.5); col[4]=_MAGENTA;
-      l[5]=gen(1.5,1.36602540378); col[5]=220;
-      l[6]=gen(1.36,0.97); col[6]=_RED;
-      break;
-    }
-    if (int(positions.size())==ms){
-      vecteur tmp=positions;
-      for (int i=0;i<ms;++i){
-	tmp[i]=eval(tmp[i],1,contextptr);
-	gen p=evalf_double(tmp[i],1,contextptr);
-	tmp[i]=remove_at_pnt(p);
-	if (tmp[i].type<_POLY){
-	  l[i]=tmp[i];
-	  // adjust color and position
-	  if (p.is_symb_of_sommet(at_pnt) && p._SYMBptr->feuille.type==_VECT && p._SYMBptr->feuille._VECTptr->size()>1){
-	    p=(*p._SYMBptr->feuille._VECTptr)[1];
-	    if (p.type==_VECT && !p._VECTptr->empty())
-	      p=p._VECTptr->front();
-	    p=exact(p,contextptr);
-	    if (p.type==_INT_){
-	      if ((p.val & 0xffff)){
-		pos[i]=0;
-		col[i]=p.val;
-	      }
-	      else
-		pos[i]=p.val;
-	    }
-	  }
-	}
-      }
-    }
-    else {
-      if (ms>7)
-	return gendimerr(contextptr);
-    }
-    if (!attributs.empty() && attributs[0].type==_VECT && int(attributs[0]._VECTptr->size())==ms)
-      col=*attributs[0]._VECTptr;
-    // then link if matrix cell is not 0
-    vecteur res;
-    res.reserve(2*ms*ms+ms+3);
-    res.push_back(symb_equal(change_subtype(_AXES,_INT_PLOT),0));
-    if (xmin!=xmax && ymin!=ymax){
-      res.push_back(symb_equal(change_subtype(_GL_X,_INT_PLOT),symb_interval(xmin,xmax)));
-      res.push_back(symb_equal(change_subtype(_GL_Y,_INT_PLOT),symb_interval(ymin,ymax)));
-    }
-    for (int i=0;i<ms;++i){
-      string s;
-      if (leg.type==_VECT && int(leg._VECTptr->size())>i)
-	s=leg[i].print(contextptr);
-      else {
-	if (int(positions.size())>i && positions[i].type==_IDNT)
-	  s = positions[i].print(contextptr);
-	else
-	  s+=char('A'+i);
-      }
-      gen mii=m[i][i];
-      if (mii.type==_DOUBLE_)
-	mii=_round(makesequence(mii,3),contextptr);
-      if (!is_zero(mii))
-	s += ':'+mii.print();
-      gen legende=symb_equal(at_legende,string2gen(s,false));
-      pos[i].subtype=_INT_PLOT;
-      col[i].subtype=_INT_PLOT;
-      gen aff=symb_equal(at_display,pos[i]+col[i]);
-      res.push_back(_point(gen(makevecteur(l[i],legende,aff),_SEQ__VECT),contextptr));
-    }
-    for (int i=0;i<ms;++i){
-      for (int j=0;j<ms;++j){
-	if (i==j)
-	  continue;
-	gen mij=m[i][j];
-	if (mij.type==_DOUBLE_)
-	  mij=_round(makesequence(mij,3),contextptr);
-	if (mij!=0){
-	  gen legende=symb_equal(at_legende,mij);
-	  gen aff=symb_equal(at_display,col[j]);
-	  res.push_back(_arc(gen(makevecteur(l[i],l[j],0.6,2,legende,aff),_SEQ__VECT),contextptr));
-	}
-      }
-    }
-    return res;
-  }
-
-  // plotproba(matrix)
-  // display a graph from a weight matrix
-  gen _plotproba(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    vecteur attributs(1,default_color(contextptr));
-    vecteur v(seq2vecteur(args));
-    int s=read_attributs(v,attributs,contextptr);
-    if (!s || s>2 || (s==2 && v[1].type!=_VECT) )
-      return gendimerr(contextptr);
-    v.front()=eval(v.front(),1,contextptr);
-    if (s==2 && v.front().type==_VECT && is_squarematrix(v.front()) && !v[1]._VECTptr->empty() && v[1]._VECTptr->front().type==_STRNG){
-      vecteur mb=*v.front()._VECTptr;
-      mb.push_back(v.back());
-      v.front()=mb;
-      s=1;
-    }
-    if (s==1)
-      return plotproba(v.front(),vecteur(0),attributs,contextptr);
-    return plotproba(v[0],*v[1]._VECTptr,attributs,contextptr);
-  }
-  static const char _plotproba_s []="plotproba";
-  static define_unary_function_eval_quoted (__plotproba,&_plotproba,_plotproba_s);
-  define_unary_function_ptr5( at_plotproba ,alias_at_plotproba,&__plotproba,_QUOTE_ARGUMENTS,true);
-#endif
-
-  gen _flatten(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT) return gensizeerr(contextptr);
-    vecteur res;
-    aplatir(*args._VECTptr,res,true);
-    return gen(res,args.subtype);
-  }
-  static const char _flatten_s []="flatten";
-  static define_unary_function_eval (__flatten,&_flatten,_flatten_s);
-  define_unary_function_ptr5( at_flatten ,alias_at_flatten,&__flatten,0,true);
-
-  gen _flatten1(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT) return gensizeerr(contextptr);
-    vecteur res;
-    aplatir(*args._VECTptr,res,false);
-    return res;
-  }
-  static const char _flatten1_s []="flatten1";
-  static define_unary_function_eval (__flatten1,&_flatten1,_flatten1_s);
-  define_unary_function_ptr5( at_flatten1 ,alias_at_flatten1,&__flatten1,0,true);
-
-  bool has_undef_stringerr(const gen & g,std::string & err){
-    if (g.type==_STRNG && g.subtype==-1){
-      err=*g._STRNGptr;
-      return true;
-    }
-    if (g.type==_VECT){
-      unsigned s=unsigned(g._VECTptr->size());
-      for (unsigned i=0;i<s;++i){
-	if (has_undef_stringerr((*g._VECTptr)[i],err))
-	  return true;
-      }
-      return false;
-    }
-    if (g.type==_POLY){
-      unsigned s=unsigned(g._POLYptr->coord.size());
-      for (unsigned i=0;i<s;++i){
-	if (has_undef_stringerr(g._POLYptr->coord[i].value,err))
-	  return true;
-      }
-      return false;
-    }
-    if (g.type==_SYMB)
-      return has_undef_stringerr(g._SYMBptr->feuille,err);
-    return false;
-  }
-
-  gen _caseval(const gen & args,GIAC_CONTEXT){
-#ifdef TIMEOUT
-    caseval_begin=time(0);
-#endif
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_STRNG){
-      gen g=protecteval(args,1,contextptr);
-      string err;
-      if (has_undef_stringerr(g,err)){
-	err = "GIAC_ERROR: "+err;
-	g=string2gen(err,false);
-	g.subtype=-1;
-      }
-      return g;
-    }
-    if (*args._STRNGptr=="init geogebra")
-      init_geogebra(1,contextptr);
-    if (*args._STRNGptr=="close geogebra")
-      init_geogebra(0,contextptr);
-#ifdef TIMEOUT
-    if (args._STRNGptr->size()>8 && args._STRNGptr->substr(0,8)=="timeout "){
-      string t=args._STRNGptr->substr(8,args._STRNGptr->size()-8);
-      double f=atof(t.c_str());
-      if (f>=0 && f<24*60){
-	caseval_maxtime=f;
-	caseval_n=0;
-	caseval_mod=10;
-	return string2gen("Max eval time set to "+gen(f).print(),false);
-      }
-    }
-    if (args._STRNGptr->size()>8 && args._STRNGptr->substr(0,8)=="ckevery "){
-      string t=args._STRNGptr->substr(8,args._STRNGptr->size()-8);
-      int f=atoi(t.c_str());
-      if (f>0 && f<1e6){
-	caseval_mod=f;
-	return string2gen("Check every "+gen(f).print(),false);
-      }
-    }
-#endif
-    return string2gen(caseval(args._STRNGptr->c_str()),false);
-  }
-  static const char _caseval_s []="caseval";
-  static define_unary_function_eval_quoted (__caseval,&_caseval,_caseval_s);
-  define_unary_function_ptr5( at_caseval ,alias_at_caseval,&__caseval,_QUOTE_ARGUMENTS,true);
-
-  gen scalarproduct(const vecteur & a,const vecteur & b,GIAC_CONTEXT){
-    vecteur::const_iterator ita=a.begin(), itaend=a.end();
-    vecteur::const_iterator itb=b.begin(), itbend=b.end();
-    gen res,tmp;
-    for (;(ita!=itaend)&&(itb!=itbend);++ita,++itb){
-      type_operator_times(conj(*ita,contextptr),(*itb),tmp);
-      res += tmp;
-    }
-    return res;
-  }
-
-  gen conjugate_gradient(const matrice & A,const vecteur & b_orig,const vecteur & x0,double eps,int maxiter,GIAC_CONTEXT){
-    int n=int(A.size());
-    vecteur b=subvecteur(b_orig,multmatvecteur(A,x0));
-    vecteur xk(x0);
-    vecteur rk(b),pk(b);
-    gen rk2=scalarproduct(rk,rk,contextptr);
-    vecteur Apk(n),tmp(n);
-    for (int k=1;k<=maxiter;++k){
-      multmatvecteur(A,pk,Apk);
-      gen alphak=rk2/scalarproduct(pk,Apk,contextptr);
-      multvecteur(alphak,pk,tmp);
-      addvecteur(xk,tmp,xk);
-      multvecteur(alphak,Apk,tmp);
-      subvecteur(rk,tmp,rk);
-      gen newrk2=scalarproduct(rk,rk,contextptr);
-      if (is_greater(eps*eps,newrk2,contextptr))
-	return xk;
-      multvecteur(newrk2/rk2,pk,tmp);
-      addvecteur(rk,tmp,pk);
-      rk2=newrk2;
-    }
-    *logptr(contextptr) << gettext("Warning! Leaving conjugate gradient algorithm after dimension of matrix iterations. Check that your matrix is hermitian/symmetric definite.") << '\n';
-    return xk;
-  }
-
-  // Ax=b where A=D+B, Dx_{n+1}=b-B*x_n
-  gen jacobi_linsolve(const matrice & A,const vecteur & b_orig,const vecteur & x0,double eps,int maxiter,GIAC_CONTEXT){
-    int n=int(A.size());
-    matrice B(A);
-    vecteur D(n);
-    vecteur b=*evalf_double(b_orig,1,contextptr)._VECTptr;
-    for (int i=0;i<n;++i){
-      vecteur Ai=*evalf(A[i],1,contextptr)._VECTptr;
-      D[i]=Ai[i];
-      Ai[i]=0;
-      B[i]=Ai;
-    }
-    vecteur tmp(n),xn(x0),prev(n);
-    gen bn=l2norm(b,contextptr);
-    for (int i=0;i<maxiter;++i){
-      prev=xn;
-      multmatvecteur(B,xn,tmp);
-      subvecteur(b,tmp,xn);
-      iterateur jt=xn.begin(),jtend=xn.end(),dt=D.begin();
-      for (;jt!=jtend;++jt){
-	*jt=*jt / *dt;
-      }
-      gen g=l2norm(xn-prev,contextptr)/bn;
-      if (is_greater(eps,g,contextptr))
-	return xn;
-    }
-    *logptr(contextptr) << gettext("Warning! Leaving Jacobi iterative algorithm after maximal number of iterations. Check that your matrix is diagonal dominant.") << '\n';
-    return xn;    
-  }
-  
-  // Ax=b where A=L+D+U, (D+L)x_{n+1}=b-U*x_n (Gauss-Seidel for omega==1)
-  // or (L+D/omega)*x_{n+1}=b-(U+D*(1-1/omega))*x_n
-  gen gauss_seidel_linsolve(const matrice & A,const vecteur & b_orig,const vecteur & x0,double omega,double eps,int maxiter,GIAC_CONTEXT){
-    int n=int(A.size());
-    double invomega=1/omega;
-    matrice L(n),U(n);
-    vecteur b=*evalf_double(b_orig,1,contextptr)._VECTptr;
-    for (int i=0;i<n;++i){
-      vecteur Ai=*evalf(A[i],1,contextptr)._VECTptr;
-      L[i]=vecteur(Ai.begin(),Ai.begin()+i); 
-      L[i]._VECTptr->reserve(n);
-      L[i]._VECTptr->push_back(invomega*Ai[i]);
-      for (int j=i+1;j<n;++j) L[i]._VECTptr->push_back(0.0);
-      vecteur tmp(i+1,0.0);
-      tmp[i]=(1-invomega)*Ai[i];
-      U[i]=mergevecteur(tmp,vecteur(Ai.begin()+i+1,Ai.end()));
-    }
-    vecteur tmp(n),xn(x0),prev(n);
-    gen bn=l2norm(b,contextptr);
-    for (int i=0;i<maxiter;++i){
-      prev=xn;
-      multmatvecteur(U,xn,tmp);
-      subvecteur(b,tmp,tmp);
-      linsolve_l(L,tmp,xn);
-      gen g=l2norm(xn-prev,contextptr)/bn;
-      if (is_greater(eps,g,contextptr))
-	return xn;
-    }
-    *logptr(contextptr) << gettext("Warning! Leaving Gauss-Seidel iterative algorithm after maximal number of iterations. Check that your matrix is diagonal dominant.") << '\n';
-    return xn;    
-  }
-  
-  // params: matrix A, vector b, optional init value x0, optional precision eps
-  gen iterative_solver(const gen & args,int method,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT || args._VECTptr->size()<2)
-      return gensizeerr(contextptr);
-    vecteur v = *args._VECTptr;
-    double omega=1.0;
-    if (!v.empty() && v[0].type!=_VECT && v[0].type!=_MAP){
-      gen v0=evalf_double(v[0],1,contextptr);
-      if (v0.type!=_DOUBLE_)
-	return gensizeerr("Bad omega value or bad first argument value");
-      omega=v0._DOUBLE_val;
-      if (omega<=0)
-	omega=epsilon(contextptr);
-      if (omega>=2)
-	omega=2-epsilon(contextptr);
-      v.erase(v.begin());
-    }
-    int s=int(v.size());
-    gen A=v[0];
-    gen b=v[1];
-    bool creux=A.type==_MAP && b.type==_VECT;
-    int n;
-    if (creux)
-      n=int(b._VECTptr->size());
-    else {
-      if (!is_squarematrix(A) || b.type!=_VECT)
-	return gensizeerr(contextptr);
-      n=int(A._VECTptr->size());
-      if (n!=int(b._VECTptr->size()))
-	return gensizeerr(contextptr);
-    }
-    vecteur x0(n);
-    gen eps; gen niter(-1);
-    if (s>=3){
-      if (v[2].type==_VECT){
-	if (int(v[2]._VECTptr->size())!=n)
-	  return gensizeerr(contextptr);
-	x0=*v[2]._VECTptr;
-	if (s>3){
-	  eps=v[3];
-	  if (s>4)
-	    niter=v[4];
-	}
-      }
-      else {
-	eps=v[2];
-	if (s>3)
-	  niter=v[3];
-      }
-    }
-    if (is_greater(eps,1,contextptr))
-      swapgen(eps,niter);
-    if (niter==-1){
-      switch (method){
-      case 1: case 2:
-	niter=SOLVER_MAX_ITERATE*n;
-	break;
-      case 4:
-	niter=n;
-	break;
-      default:
-	niter=n;
-      }
-    }
-    eps=evalf_double(eps,1,contextptr);
-    if (eps.type!=_DOUBLE_ || eps._DOUBLE_val < 0 || eps._DOUBLE_val>=1)
-      return gentypeerr(contextptr);
-    if (!is_integral(niter) || niter.val<1)
-      return gentypeerr(contextptr);
-    if (method==1)
-      return creux?sparse_jacobi_linsolve(*A._MAPptr,*b._VECTptr,x0,eps._DOUBLE_val,niter.val,contextptr):jacobi_linsolve(*A._VECTptr,*b._VECTptr,x0,eps._DOUBLE_val,niter.val,contextptr);
-    if (method==2)
-      return creux?sparse_gauss_seidel_linsolve(*A._MAPptr,*b._VECTptr,x0,omega,eps._DOUBLE_val,niter.val,contextptr):gauss_seidel_linsolve(*A._VECTptr,*b._VECTptr,x0,omega,eps._DOUBLE_val,niter.val,contextptr);
-    if (method==4)
-      return creux?sparse_conjugate_gradient(*A._MAPptr,*b._VECTptr,x0,eps._DOUBLE_val,niter.val,contextptr):conjugate_gradient(*A._VECTptr,*b._VECTptr,x0,eps._DOUBLE_val,niter.val,contextptr);
-    return gensizeerr(contextptr);
-  }
-  // params: matrix A, vector b, optional init value x0, optional precision eps
-  gen _conjugate_gradient(const gen & args,GIAC_CONTEXT){
-    return iterative_solver(args,4,contextptr);
-  }
-  static const char _conjugate_gradient_s []="conjugate_gradient";
-  static define_unary_function_eval (__conjugate_gradient,&_conjugate_gradient,_conjugate_gradient_s);
-  define_unary_function_ptr5( at_conjugate_gradient ,alias_at_conjugate_gradient,&__conjugate_gradient,0,true);
-
-  gen _jacobi_linsolve(const gen & args,GIAC_CONTEXT){
-    return iterative_solver(args,1,contextptr);
-  }
-  static const char _jacobi_linsolve_s []="jacobi_linsolve";
-  static define_unary_function_eval (__jacobi_linsolve,&_jacobi_linsolve,_jacobi_linsolve_s);
-  define_unary_function_ptr5( at_jacobi_linsolve ,alias_at_jacobi_linsolve,&__jacobi_linsolve,0,true);
-
-  gen _gauss_seidel_linsolve(const gen & args,GIAC_CONTEXT){
-    return iterative_solver(args,2,contextptr);
-  }
-  static const char _gauss_seidel_linsolve_s []="gauss_seidel_linsolve";
-  static define_unary_function_eval (__gauss_seidel_linsolve,&_gauss_seidel_linsolve,_gauss_seidel_linsolve_s);
-  define_unary_function_ptr5( at_gauss_seidel_linsolve ,alias_at_gauss_seidel_linsolve,&__gauss_seidel_linsolve,0,true);
-
-  gen _subtype(const gen & args,GIAC_CONTEXT){
-    if (args.type==_INT_ && args.subtype==0)
-      return change_subtype(0,_INT_TYPE);
-    if (args.type==_ZINT && args.subtype==0)
-      return change_subtype(2,_INT_TYPE);
-    if (args.type==_DOUBLE_)
-      return change_subtype(1,_INT_TYPE);
-    if (args.type==_REAL)
-      return change_subtype(3,_INT_TYPE);
-    return args.subtype;
-  }
-  static const char _subtype_s []="subtype";
-  static define_unary_function_eval (__subtype,&_subtype,_subtype_s);
-  define_unary_function_ptr5( at_subtype ,alias_at_subtype,&__subtype,0,true);
-
-  // Graph utilities
-  // convert matrice of probability to matrice of booleans
-  // m[i][j]!=0 means there is a link from i to j
-  bool proba2adjacence(const matrice & m,vector< vector<unsigned> >& v,bool check,GIAC_CONTEXT){
-    if (!is_integer_matrice(m) && !is_zero(1-_plus(m.front(),contextptr),contextptr)){
-      if (!check)
-	return false;
-      return proba2adjacence(mtran(m),v,false,contextptr);
-    }
-    int l,c;
-    mdims(m,l,c);
-    v.resize(l);
-    for (int i=0;i<l;++i){
-      vecteur & mi=*m[i]._VECTptr;
-      vector<unsigned> & vi =v[i];
-      vi.clear();
-      vi.resize((c+31)/32);
-      for (int j=0;j<c;++j){
-	if (!is_zero(mi[j]))
-	  vi[j/32] |= 1<<(j%32);
-      }
-    }
-    return true;
-  }
-
-  // For large graphs, use Tarjan algorithm 
-  struct vertex {
-    int index,lowlink;
-    vertex():index(-1),lowlink(-1){}; // -1 means undefined
-  };
-
-  void strongconnect(const vector< vector<unsigned> > & G,vector<vertex> & V,int & index,vector<unsigned> & S,vector<bool> & inS,vector< vector<unsigned> > & SCC,unsigned v){
-    V[v].index=index;
-    V[v].lowlink=index;
-    ++index;
-    S.push_back(v);
-    inS[v]=true;
-    const vector<unsigned> & Gv=G[v];
-    for (unsigned i=0;i<Gv.size();++i){
-      unsigned Gvi=Gv[i];
-      if (!Gvi)
-	continue;
-      for (unsigned j=0;Gvi && j<32;Gvi/=2, ++j){
-	if (!(Gvi %2))
-	  continue;
-	unsigned w=i*32+j;
-	if (V[w].index==-1){
-	  // Successor w has not yet been visited; recurse on it
-	  strongconnect(G,V,index,S,inS,SCC,w);
-	  V[v].lowlink=giacmin(V[v].lowlink,V[w].lowlink);
-	  continue;
-	}
-	if (inS[w]){
-	  // successor of w is in stack S, hence is in the current SCC
-	  V[v].lowlink=giacmin(V[v].lowlink,V[w].index);
-	}
-      }
-    } // end for (visit all vertices connected to v)
-    // If v is a root node, pop the stack and generate a strongly connected component
-    if (V[v].lowlink==V[v].index){
-      vector<unsigned> scc;
-      for (;!S.empty();){
-	scc.push_back(S.back());
-	S.pop_back();
-	inS[scc.back()]=false;
-	if (scc.back()==v)
-	  break;
-      }
-      SCC.push_back(scc);
-    }
-  }
-
-  void tarjan(const vector< vector<unsigned> > & G,vector< vector<unsigned> > & SCC){
-    vector<vertex> V(G.size());
-    SCC.clear();
-    vector<unsigned> S;
-    S.reserve(G.size());
-    vector<bool> inS(G.size(),false);
-    int index=0;
-    for (unsigned v=0;v<G.size();++v){
-      if (V[v].index==-1)
-	strongconnect(G,V,index,S,inS,SCC,v);
-    }
-  }
-
-  void classify_scc(const vector< vector<unsigned> > & G,vector< vector<unsigned> > & SCC, vector< vector<unsigned> > & SCCrec,vector< vector<unsigned> > & SCCtrans){
-    // Look at each SCC: if it has all outgoing edges going to the same component, 
-    // then this is a recurrent positive, and we can compute the invariant probability
-    if (SCC.empty())
-      tarjan(G,SCC);
-    for (unsigned i=0;i<SCC.size();++i){
-      const vector<unsigned> & SCCi=SCC[i];
-      vector<bool> in(G.size(),false);
-      for (unsigned j=0;j<SCCi.size();++j){
-	in[SCCi[j]]=true;
-      }
-      bool recurrent=true;
-      for (unsigned j=0;recurrent && j<SCCi.size();++j){
-	unsigned source=SCCi[j];
-	const vector<unsigned> & targetv=G[source];
-	for (unsigned k=0;recurrent && k<targetv.size();++k){
-	  unsigned Gsk=targetv[k];
-	  unsigned l=k*32;
-	  for (;Gsk;++l,Gsk/=2){
-	    if (Gsk %2 && !in[l]){
-	      recurrent=false;
-	      break;
-	    }
-	  }
-	}
-      }
-      if (recurrent)
-	SCCrec.push_back(SCCi);
-      else
-	SCCtrans.push_back(SCCi);
-    } // end loop on strong connected components
-  }
-
-  void vector_unsigned2vecteur(const vector<unsigned> & V,vecteur & v){
-    v.clear();
-    v.reserve(V.size());
-    for (unsigned i=0;i<V.size();++i)
-      v.push_back(int(V[i]));
-  }
-
-  void matrix_unsigned2matrice(const vector< vector<unsigned> > & M,matrice & m){
-    m.clear();
-    m.reserve(M.size());
-    for (unsigned i=0;i<M.size();++i){
-      vecteur v;
-      vector_unsigned2vecteur(M[i],v);
-      m.push_back(v);
-    }
-  }
-
-  // Input matrix of adjacency or transition matrix
-  // Output a list of strongly connected components
-  gen _graph_scc(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (!is_squarematrix(args))
-      return gensizeerr(contextptr);
-    vector< vector<unsigned> > G,GRAPH_SCC;
-    if (!proba2adjacence(*args._VECTptr,G,true,contextptr))
-      return gensizeerr(contextptr);
-    tarjan(G,GRAPH_SCC);
-    matrice m;
-    matrix_unsigned2matrice(GRAPH_SCC,m);
-    return m;
-  }
-  static const char _graph_scc_s []="graph_scc";
-  static define_unary_function_eval (__graph_scc,&_graph_scc,_graph_scc_s);
-  define_unary_function_ptr5( at_graph_scc ,alias_at_graph_scc,&__graph_scc,0,true);
-
-  void extract_submatrix(const matrice & M,const vector<unsigned> & v,matrice & m){
-    m.reserve(v.size());
-    vecteur current(v.size());
-    for (unsigned j=0;j<v.size();++j){
-      vector<unsigned>::const_iterator it=v.begin(),itend=v.end();
-      const_iterateur jt=M[v[j]]._VECTptr->begin();
-      iterateur kt=current.begin();
-      for (;it!=itend;++kt,++it)
-	*kt=*(jt+*it);
-      m.push_back(current);
-    }
-  }
-
-  // check that g is a stochastic right or left matrix
-  // if so set M to the matrix with sum of rows=1
-  bool is_stochastic(const gen & g,matrice & M,GIAC_CONTEXT){
-    if (!is_squarematrix(g))
-      return false;
-    gen gd=evalf_double(g,1,contextptr);
-    if (!is_fully_numeric(gd))
-      return false;
-    M=*g._VECTptr;
-    int ms=int(M.size());
-    for (int i=0;i<ms;++i){
-      const vecteur & v=*M[i]._VECTptr;
-      for (int j=0;j<ms;++j){
-	if (is_strictly_greater(0,v[j],contextptr))
-	  return false;
-      }
-    }
-    gen sg=_sum(_tran(g,contextptr),contextptr);
-    if (!is_zero(sg-vecteur(ms,1),contextptr)){
-      M=mtran(M);
-      sg=_sum(g,contextptr);
-      if (!is_zero(sg-vecteur(ms,1),contextptr))
-	return false;
-    }
-    return true;
-  }
-
-  // returns
-  // -> recurrent states: a list of at least one list: 
-  //                      each sublist is a strongly connected component
-  // -> invariant probability state (1-eigenstate) for each recurrent loop
-  // -> transient states: a list of lists, each sublist is strongly connected
-  // -> final probability: starting from each site, probability to end up
-  //    in any of the invariant probability state
-  gen _markov(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    gen g;
-    double eps(epsilon(contextptr));
-    if (args.type==_VECT && args.subtype==_SEQ__VECT && args._VECTptr->size()>=2){
-      g=evalf_double(args._VECTptr->back(),1,contextptr);
-      if (g.type!=_DOUBLE_)
-	return gensizeerr(contextptr);
-      eps=g._DOUBLE_val;
-      g=args._VECTptr->front();
-    }
-    else
-      g=args;
-    matrice M;
-    if (!is_stochastic(g,M,contextptr))
-      return gensizeerr("Not a stochastic matrix!");
-    int ms=int(M.size());
-    vector< vector<unsigned> > G,GRAPH_SCC,SCCrec,SCCtrans;
-    proba2adjacence(M,G,true,contextptr);
-    classify_scc(G,GRAPH_SCC,SCCrec,SCCtrans);
-    matrice mrec,mtrans,meigen;
-    matrix_unsigned2matrice(SCCrec,mrec);
-    matrix_unsigned2matrice(SCCtrans,mtrans);
-    // Find eigenstate 1 for each component of SCCrec
-    for (unsigned i=0;i<SCCrec.size();++i){
-      vector<unsigned> v=SCCrec[i];
-      // extract corresponding submatrix from M
-      matrice m;
-      sort(v.begin(),v.end());
-      if (v.size()==M.size())
-	m=M;
-      else 
-	extract_submatrix(M,v,m);
-      m=mtran(m); // find standard linear algebra 1-eigenvector
-      vecteur w,z;
-      if (is_exact(m)){
-	vecteur k;
-	mker(subvecteur(m,midn(int(m.size()))),k,contextptr);
-	//k=negvecteur(k);
-	if (k.size()==1 && k.front().type==_VECT){
-	  // if dim Ker(m-idn)>1 should find a vector with all coordinate >0
-	  z=divvecteur(*k.front()._VECTptr,prodsum(k.front(),false));
-	}
-      }
-      if (z.empty()){
-	w=vecteur(m.size(),evalf(1,1,contextptr)/int(m.size())); // initial guess
-	for (;;){
-	  multmatvecteur(m,w,z);
-	  if (is_greater(eps,l1norm(w-z,contextptr),contextptr))
-	    break;
-	  swap(w,z);
-	}
-      }
-      if (v.size()==M.size())
-	meigen.push_back(z);
-      else {
-	w.clear();
-	unsigned pos=0;
-	for (unsigned j=0;j<v.size();++j){
-	  for (;pos<v[j];++pos)
-	    w.push_back(0);
-	  w.push_back(z[j]);
-	  ++pos;
-	}
-	for (;pos<M.size();++pos)
-	  w.push_back(0);
-	meigen.push_back(w);
-      }
-    }
-    int nrec=int(meigen.size());
-    if (nrec==1)
-      return makesequence(mrec,meigen,mtrans,vecteur(ms,vecteur(1,1)));
-    // For each initial pure state, find probability to end in 
-    // the recurrents states from meigen
-    M=mtran(M); // linear algebra iteration v->M*v
-    matrice mfinal; // will have nrec columns
-    for (unsigned i=0;int(i)<ms;++i){
-      vecteur line;
-      line.reserve(nrec);
-      // start at state i
-      // speedup: first look if i is in a recurrent strong component 
-      // if so the final state is the recurrent strong component eigenstate
-      for (unsigned j=0;j<SCCrec.size();++j){
-	if (equalposcomp(SCCrec[j],i)){
-	  line=vecteur(nrec,0);
-	  line[j]=1;
-	  break;
-	}
-      }
-      if (!line.empty()){
-	mfinal.push_back(line);
-	continue;
-      }
-      // otherwise iterate starting from 1 at position i
-      vecteur w(ms),z(ms);
-      w[i]=1;
-      for (;;){
-	multmatvecteur(M,w,z);
-	if (is_greater(eps,l1norm(w-z,contextptr),contextptr))
-	  break;
-	swap(w,z);
-      }
-      // find z as a linear combination of the vectors of meigen
-      for (unsigned j=0;j<meigen.size();++j){
-	const vecteur & cur=*meigen[j]._VECTptr;
-	// find the largest component of mcur
-	int pos=0;
-	gen maxcur=0;
-	for (unsigned k=0;k<cur.size();++k){
-	  if (is_strictly_greater(cur[k],maxcur,contextptr)){
-	    maxcur=cur[k];
-	    pos=k;
-	  }
-	}
-	// find coefficient
-	line.push_back(z[pos]/cur[pos]);
-      }
-      mfinal.push_back(line);
-    }
-    return makesequence(mrec,meigen,mtrans,mfinal);
-  }
-  static const char _markov_s []="markov";
-  static define_unary_function_eval (__markov,&_markov,_markov_s);
-  define_unary_function_ptr5( at_markov ,alias_at_markov,&__markov,0,true);
-
-  // random iterations for a Markov chain of transition matrix M, initial state i,
-  // number of iterations n
-  // randmarkov(M,i,n) returns the list of n+1 states starting at i
-  // randmarkov(M,[i1,..,ip],b) returns the matrix of p rows, each row is
-  //   the list of n+1 states starting at ip
-  // randmarkov([n1,..,np],nt) make a random Markov transition matrix
-  // with p recurrent loops of size n1,...,np and nt transient states
-  gen _randmarkov(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    if (args.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur v = *args._VECTptr;
-    vecteur attributs(1,default_color(contextptr));
-    int vs=read_attributs(v,attributs,contextptr);
-    if (vs<2 || vs>4)
-      return gensizeerr(contextptr);
-    bool plot=int(args._VECTptr->size())>vs;
-    bool polygon=true;
-    if (vs==4) {
-      if (v[3]==at_plot || v[3]==at_polygonplot || v[3]==at_scatterplot){
-	if (v[3]==at_scatterplot)
-	  polygon=true;
-	plot=true;
-      }
-      else
-	return gensizeerr(contextptr);
-    }
-    if (vs==2){
-      is_integral(v[1]); 
-      if (v[1].type!=_INT_ || v[1].val<0)
-	return gensizeerr(contextptr);
-      vecteur w=gen2vecteur(v[0]);
-      if (!is_integer_vecteur(w))
-	return gensizeerr(contextptr);
-      unsigned ws=unsigned(w.size()),n=0;
-      vector<unsigned> W(ws),Wc(ws+1);
-      for (unsigned i=0;i<ws;++i){
-	if (w[i].type!=_INT_ || w[i].val<=0)
-	  return gendimerr(contextptr);
-	n += (W[i]=w[i].val);
-	Wc[i+1]=Wc[i]+W[i];
-      }
-      int nt=v[1].val,nnt=n+nt;
-      if (nnt*nnt>LIST_SIZE_LIMIT)
-	return gendimerr(contextptr);
-      matrice res(nnt);
-      int pos=0; // position in W
-      // first lines (recurrent states)
-      int cur=Wc[0],next=Wc[1];
-      for (int i=0;i<int(n);++i){
-	if (i>=next){
-	  ++pos;
-	  cur=next;
-	  next=Wc[pos+1];
-	}
-	vecteur line(nnt);
-	// create Wc[pos] zeros
-	// then Wc[pos+1]-Wc[pos] probabilities
-	for (int j=cur;j<next;++j){
-	  line[j]=giac_rand(contextptr)/(rand_max2+1.0);
-	}
-	res[i]=divvecteur(line,prodsum(line,false));
-      }
-      // transient states
-      for (int i=n;i<nnt;++i){
-	vecteur line(nnt);
-	for (int j=0;j<nnt;++j){
-	  line[j]=giac_rand(contextptr)/(rand_max2+1.0);
-	}
-	res[i]=divvecteur(line,prodsum(line,false));
-      }
-      return res;
-    }
-    vecteur v1=gen2vecteur(v[1]);
-    if (!is_integer_vecteur(v1))
-      return gensizeerr();
-    is_integral(v[2]);
-    if (v[2].type!=_INT_ || v[2].val<0)
-      return gensizeerr(contextptr);
-    int n=v[2].val;
-    gen g=v[0];
-    matrice M;
-    if (!is_stochastic(g,M,contextptr))
-      return gensizeerr("Not a stochastic matrix!");
-    int shift=array_start(contextptr); //0;
-    //if (xcas_mode(contextptr) || abs_calc_mode(contextptr)==38) shift=1;
-    vector<unsigned> start(v1.size());
-    for (unsigned i=0;i<v1.size();++i){
-      int pos=v1[i].val-shift;
-      if (pos<0 || pos>=int(M.size()))
-	return gendimerr(contextptr);
-      start[i]=pos;
-    }
-    // find cumulated frequencies for each row
-    matrix_double Mcumul(int(M.size()));
-    for (unsigned I=0;I<Mcumul.size();++I){
-      const vecteur & v=*M[I]._VECTptr;
-      vector<giac_double> vcumul(v.size()+1);
-      vcumul[0]=0;
-      for (unsigned j=1;j<=v.size();++j){
-	vcumul[j] = vcumul[j-1]+evalf_double(v[j-1],1,contextptr)._DOUBLE_val;
-      }
-      Mcumul[I]=vcumul;
-    }
-    // iterate
-    matrice res;
-    vecteur line1;
-    for (int j=0;j<=int(n);++j){
-      line1.push_back(j);
-    }
-    for (unsigned pos=0;pos<start.size();++pos){
-      int i=start[pos];
-      vecteur line(1,i);
-      for (int j=0;j<n;++j){
-	double d=giac_rand(contextptr)/(rand_max2+1.0);
-	if (i>int(Mcumul.size()))
-	  return gendimerr(contextptr);	
-	int pos=dichotomy(Mcumul[i],d);
-	if (pos==-1)
-	  return gendimerr(contextptr);
-	i=pos;
-	line.push_back(i+shift);
-      }
-      res.push_back(line);
-    }
-    if (v[1].type==_INT_){
-      if (plot){
-	gen tmp=makesequence(line1,res.front());
-	if (polygon)
-	  return _polygonscatterplot(tmp,contextptr);
-	else
-	  return _scatterplot(tmp,contextptr);
-      }
-      return res.front();
-    }
-    if (plot){
-      res.insert(res.begin(),line1);
-      if (polygon)
-	return _polygonplot(_tran(res,contextptr),contextptr);
-      else
-	return _scatterplot(_tran(res,contextptr),contextptr);
-    }
-    return res;
-  }
-  static const char _randmarkov_s []="randmarkov";
-  static define_unary_function_eval (__randmarkov,&_randmarkov,_randmarkov_s);
-  define_unary_function_ptr5( at_randmarkov ,alias_at_randmarkov,&__randmarkov,0,true);
-
-  vecteur lvarxwithinvsqrt(const gen &e,const gen & x,GIAC_CONTEXT){
-    gen ee=subst(e,invpowtan_tab,invpowtan2_tab,false,contextptr);
-    ee=remove_nop(ee,x,contextptr);
-    vecteur w(lvar(ee)),v;
-    for (int i=0;i<w.size();++i){
-      if (!is_constant_wrt(w[i],x,contextptr))
-	v.push_back(w[i]);
-    }
-    return v; // to remove nop do a return *(eval(v)._VECTptr);
-  }
-  
-  gen _is_polynomial(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    vecteur v;
-    if (args.type==_VECT && args.subtype!=_SEQ__VECT)
-      v=vecteur(1,args);
-    else
-      v=gen2vecteur(args);
-    if (v.empty())
-      return gensizeerr(contextptr);
-    if (v.size()==1)
-      v.push_back(ggb_var(args));
-    gen tmp=giac::apply(v,equal2diff);
-    vecteur lv=lvarxwithinvsqrt(tmp,v[1],contextptr);
-    gen res=lv.size()<2?1:0;
-    res.subtype=_INT_BOOLEAN;
-    return res;
-  }
-  static const char _is_polynomial_s []="is_polynomial";
-  static define_unary_function_eval (__is_polynomial,&_is_polynomial,_is_polynomial_s);
-  define_unary_function_ptr5( at_is_polynomial ,alias_at_is_polynomial,&__is_polynomial,0,true);
-
-  // find positions of object in list or first position of substring in string
-  gen _find(const gen & args,GIAC_CONTEXT){
-    if ( args.type==_STRNG && args.subtype==-1) return  args;
-    vecteur v = gen2vecteur(args);
-    if (v.size()!=2 && v.size()!=3)
-      return gensizeerr(contextptr);
-    gen a=v.front();
-    int pos=0;
-    if (v.size()==3){
-      if (v[2].type!=_INT_)
-	return gensizeerr(contextptr);
-      pos=v[2].val;
-    }
-    int shift=array_start(contextptr); //xcas_mode(contextptr)>0 || abs_calc_mode(contextptr)==38;
-    bool py=python_compat(contextptr);
-    if (a.type==_STRNG && v[1].type!=_VECT){
-      if (v[1].type!=_STRNG)
-	return gensizeerr(contextptr);
-      string s=*v[1]._STRNGptr;
-      string as=*a._STRNGptr;
-      if (s.size()>as.size()){
-	s.swap(as);
-	*logptr(contextptr) << "Exchanging arguments" << '\n';
-      }
-      vecteur res;
-      for (;;++pos){
-	pos=int(as.find(s,pos));
-	if (py)
-	  return pos;
-	if (pos<0 || pos>=int(as.size()))
-	  break;
-	res.push_back(pos+shift);
-      }
-      return res;
-    }
-    if (v[1].type!=_VECT){
-      if (a.type==_VECT){
-	*logptr(contextptr) << "Exchanging arguments" << '\n';
-	v[0]=v[1];
-	v[1]=a;
-	a=v[0];
-      }
-      else
-	return gensizeerr(contextptr);
-    }
-    const vecteur & w =*v[1]._VECTptr;
-    int s=int(w.size());
-    vecteur res;
-    for (int i=pos;i<s;++i){
-      if (a==w[i]){
-	if (py)
-	  return i;
-	res.push_back(i+shift);
-      }
-    }
-    return res;
-  }
-  static const char _find_s []="find";
-  static define_unary_function_eval (__find,&_find,_find_s);
-  define_unary_function_ptr5( at_find ,alias_at_find,&__find,0,true);
-
-  gen _max_index(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_VECT || args._VECTptr->empty()) return gensizeerr(contextptr);
-    const vecteur & v=*args._VECTptr;
-    int s=v.size(),pos=0; gen val=v[0];
-    for (int i=1;i<s;++i){
-      if (ck_is_strictly_greater(v[i],val,contextptr)){
-	pos=i;
-	val=v[i];
-      }
-    }
-    return makevecteur(val,pos);
-  }
-  static const char _max_index_s []="max_index";
-  static define_unary_function_eval (__max_index,&_max_index,_max_index_s);
-  define_unary_function_ptr5( at_max_index ,alias_at_max_index,&__max_index,0,true);
-
-  gen _dayofweek(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_VECT || args._VECTptr->size()!=3)
-      return gensizeerr(contextptr);
-    vecteur & v = *args._VECTptr;
-    gen d=v[0],m=v[1],a=v[2];
-    if (!is_integral(d) && !is_integral(m) && !is_integral(a))
-      return gensizeerr(contextptr);
-    int D=d.val,M=m.val,A=a.val;
-    if (D<1 || D>31 || M<1 || M>12)
-      return gensizeerr(contextptr);
-    int x=A;
-    if (M<3) x--;
-    int y=(23*M)/9+D+4+A+x/4-x/100+x/400;
-    if (M<3) y=y%7; else y=(y-2)%7;
-    return y;
-  }
-  static const char _dayofweek_s []="dayofweek";
-  static define_unary_function_eval (__dayofweek,&_dayofweek,_dayofweek_s);
-  define_unary_function_ptr5( at_dayofweek ,alias_at_dayofweek,&__dayofweek,0,true);
-
-  gen _evalfa(const gen & args,GIAC_CONTEXT){
-    vecteur v(lop(args,at_rootof));
-    gen w=evalf(v,1,contextptr);
-    return subst(args,v,w,false,contextptr);
-  }
-  static const char _evalfa_s []="evalfa";
-  static define_unary_function_eval (__evalfa,&_evalfa,_evalfa_s);
-  define_unary_function_ptr5( at_evalfa ,alias_at_evalfa,&__evalfa,0,true);
-
-  gen _linspace(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_VECT || args._VECTptr->size()<2) return gensizeerr(contextptr);
-    int n=100;
-    vecteur v = *args._VECTptr;
-    gen start=v[0],stop=v[1];
-    if (v.size()>2){
-      gen N=v[2];
-      if (!is_integral(N) || N.val<2)
-	return gendimerr(contextptr);
-      n=N.val;
-    }
-    gen step=(stop-start)/(n-1);
-    vecteur w(n);
-    for (int i=0;i<n;++i){
-      w[i]=start+i*step;
-    }
-    return w;
-  }
-  static const char _linspace_s []="linspace";
-  static define_unary_function_eval (__linspace,&_linspace,_linspace_s);
-  define_unary_function_ptr5( at_linspace ,alias_at_linspace,&__linspace,0,true);
-
-  gen _Li(const gen & args,GIAC_CONTEXT){
-    return _Ei(ln(args,contextptr),contextptr);
-  }
-  static const char _Li_s []="Li";
-  static define_unary_function_eval (__Li,&_Li,_Li_s);
-  define_unary_function_ptr5( at_Li ,alias_at_Li,&__Li,0,true);
-
-  gen _coth(const gen & args,GIAC_CONTEXT){
-    return inv(tanh(args,contextptr),contextptr);
-  }
-  static const char _coth_s []="coth";
-  static define_unary_function_eval (__coth,&_coth,_coth_s);
-  define_unary_function_ptr5( at_coth ,alias_at_coth,&__coth,0,true);
-
-  gen _atan2(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_VECT)
-      return gensizeerr(contextptr);
-    if (//&& args.subtype==_SEQ__VECT 
-	args._VECTptr->size()==2)
-      return arg(args._VECTptr->back()+cst_i*args._VECTptr->front(),contextptr);
-    return gensizeerr(contextptr); //apply(args,_atan2,contextptr);
-  }
-  static const char _atan2_s []="atan2";
-  static define_unary_function_eval (__atan2,&_atan2,_atan2_s);
-  define_unary_function_ptr5( at_atan2 ,alias_at_atan2,&__atan2,0,true);
-
-  gen _acoth(const gen & args,GIAC_CONTEXT){
-    return atanh(inv(args,contextptr),contextptr);
-  }
-  static const char _acoth_s []="acoth";
-  static define_unary_function_eval (__acoth,&_acoth,_acoth_s);
-  define_unary_function_ptr5( at_acoth ,alias_at_acoth,&__acoth,0,true);
-
-  gen _add_autosimplify(const gen & args,GIAC_CONTEXT){
-    return eval(add_autosimplify(args,contextptr),eval_level(contextptr),contextptr);
-  }
-  static const char _add_autosimplify_s []="add_autosimplify";
-  static define_unary_function_eval_quoted (__add_autosimplify,&_add_autosimplify,_add_autosimplify_s);
-  define_unary_function_ptr5( at_add_autosimplify ,alias_at_add_autosimplify,&__add_autosimplify,_QUOTE_ARGUMENTS,true);
-
-
-#if 0
-  // Small graphs, not tested
-  bool different(const vector<unsigned> & a,const vector<unsigned> & b,vector<int> & pos){
-    pos.clear();
-    int s=a.size();
-    for (int i=0;i<s;++i){
-      unsigned ai=a[i],bi=b[i];
-      if (ai!=bi){
-	int p=i*32;
-	for (;ai&&bi;++p,ai/=2,bi/=2){
-	  if ( ai%2 != bi%2 )
-	    pos.push_back(p);
-	}
-      }
-    }
-    return !pos.empty();
-  }
-
-  // v[i][j]==true if i is connected to j
-  // compute w such that w[i][j]==true if i is connected to j using a path of length >= 1
-  // at the end, if w[i][i]=true then i is recurrent, else transient
-  // i is recurrent positive if for all j w[i][j]=true => w[j][i]=true
-  void connected(const vector< vector<unsigned> >& v,vector< vector<unsigned> > & w){
-    int l=v.size();
-    int c=v.front().size(); // number of columns = c*32
-    w=v;
-    vector<int> pos;
-    for (int i=0;i<l;++i){
-      // compute w[i]
-      vector<unsigned> oldvi(c);
-      vector<unsigned> curvi(w[i]);
-      vector<unsigned> newvi(c);
-      // oldvi[i/32] = 1 << (i%32); 
-      for (;;){
-	// find indices that differ between oldvi and curvi, 
-	if (!different(oldvi,curvi,pos))
-	  break;
-	newvi=curvi;
-	for (unsigned j=0;j<pos.size();++j){
-	  // make an OR of curvi with w[pos[j]]
-	  vector<unsigned>::const_iterator wit=w[pos[j]].begin();
-	  vector<unsigned>::iterator newit=newvi.begin(),newitend=newvi.end();
-	  for (;newit!=newitend;++wit,++newit){
-	    *newit |= *wit;
-	  }
-	}
-	oldvi=curvi;
-	curvi=newvi;
-      }
-      w[i]=curvi;
-    }
-  }
-#endif
-
-  // step by step utilities
-
-  bool is_periodic(const gen & f,const gen & x,gen & periode,GIAC_CONTEXT){
-    periode=0;
-    vecteur vx=lvarx(f,x);
-    for (unsigned i=0;i<vx.size();++i){
-      if (vx[i].type!=_SYMB || (vx[i]._SYMBptr->sommet!=at_exp && vx[i]._SYMBptr->sommet!=at_sin && vx[i]._SYMBptr->sommet!=at_cos && vx[i]._SYMBptr->sommet!=at_tan)){
-	if (f.type==_SYMB)
-	  return is_periodic(f._SYMBptr->feuille,x,periode,contextptr);
-	return false;
-      }
-    }
-    gen g=_lin(trig2exp(f,contextptr),contextptr);
-    vecteur v;
-    rlvarx(g,x,v);
-    islesscomplexthanf_sort(v.begin(),v.end());
-    int i,s=int(v.size());
-    if (s<2)
-      return false;
-    gen a,b,v0,alpha,beta,alphacur,betacur,gof,periodecur;
-    for (i=1;i<s;++i){
-      if (!v[i].is_symb_of_sommet(at_exp)){
-	if (!is_periodic(v[i]._SYMBptr->feuille,x,periodecur,contextptr))
-	  return false;
-	periode=gcd(periode,periodecur,contextptr);
-	continue;
-      }
-      v0=v[i];
-      gen v0arg=v0._SYMBptr->feuille;
-      if (is_linear_wrt(v0arg,x,alphacur,betacur,contextptr)){ 
-	periodecur=normal(alphacur/cst_i,contextptr);
-	if (!is_zero(im(periodecur,contextptr)))
-	  return false;
-	periode=gcd(periode,periodecur,contextptr);
-      }
-      else
-	return false;
-    }
-    periode=ratnormal(cst_two_pi/periode);
-    return !is_zero(periode);
-  }
-
-  bool in_domain(const gen & df,const gen &x,const gen & x0,GIAC_CONTEXT){
-    if (df==x)
-      return true;
-    if (df.type==_VECT){
-      const vecteur v=*df._VECTptr;
-      for (int i=0;i<int(v.size());++i){
-	if (in_domain(v[i],x,x0,contextptr))
-	  return true;
-      }
-      return false;
-    }
-    gen g=eval(subst(df,x,x0,false,contextptr),1,contextptr);
-    return is_one(g);
-  }
-
-  // convert series expansion f at x=x0 to polynomial Taylor expansion
-  // a is set to the predominant non constant monomial coefficient
-  // (i.e. start from end first non 0)
-  bool convert_polynom(const gen & f,const gen & x,const gen & x0,vecteur & v,gen & a,int &order,GIAC_CONTEXT){
-    v.clear();
-    vecteur l(lop(f,at_order_size));
-    vecteur lp(l.size(),zero);
-    gen g=subst(f,l,lp,false,contextptr);
-    l=vecteur(1,x);
-    lp=vecteur(1,x+x0);
-    g=subst(g,l,lp,false,contextptr);
-    lvar(g,l);
-    gen temp=e2r(g,l,contextptr);
-    if (is_zero(temp))
-      return true;
-    l.erase(l.begin());
-    gen res;
-    gen tmp2(polynome2poly1(temp,1));
-    res=l.empty()?tmp2:((tmp2.type==_FRAC && tmp2._FRACptr->den.type==_VECT && tmp2._FRACptr->den._VECTptr->size()>1)?gen(fraction(r2e(tmp2._FRACptr->num,l,contextptr),r2e(tmp2._FRACptr->den,l,contextptr))):r2e(tmp2,l,contextptr));
-    if (res.type==_FRAC && res._FRACptr->num.type==_VECT && res._FRACptr->den.type<_POLY){
-      res=inv(res._FRACptr->den,contextptr)*res._FRACptr->num;
-    }
-    if (res.type!=_VECT)
-      return false;
-    v=*res._VECTptr;
-    order=0;
-    for (int i=int(v.size())-2;i>=0;--i){
-      if (v[i]!=0){
-	a=v[i];
-	order=int(v.size())-i-1;
-	break;
-      }
-    }
-    return true;
-  }
-
-  static gen write_legende(const gen & g,bool exactlegende,GIAC_CONTEXT){
-    if (exactlegende)
-      return symb_equal(at_legende,g);
-    int digits=decimal_digits(contextptr);
-    decimal_digits(3,contextptr);
-    gen res=evalf(g,1,contextptr);
-    res=string2gen(res.print(contextptr),false);
-    res=symb_equal(at_legende,res);
-    decimal_digits(digits,contextptr);
-    return res;
-  }
-  
-  vecteur endpoints(const gen & g){
-    vecteur res;
-    if (g.type==_VECT){
-      const_iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
-      for (;it!=itend;++it)
-	res=mergevecteur(res,endpoints(*it));
-      return res;
-    }
-    if (g.type!=_SYMB)
-      return res;
-    if (g._SYMBptr->sommet==at_and || g._SYMBptr->sommet==at_ou)
-      return endpoints(g._SYMBptr->feuille);
-    if (is_inequation(g) || g._SYMBptr->sommet==at_different || g._SYMBptr->sommet==at_equal)
-      return vecteur(1,g._SYMBptr->feuille[1]);
-    return res;
-  }
-
-  static gen crunch_rootof(const gen & g,GIAC_CONTEXT){
-    if (has_op(g,*at_rootof)) 
-      return evalf(g,1,contextptr);
-    if (!lop(g,*at_LambertW).empty())
-      return evalf(g,1,contextptr);
-    return g;
-  }
-
-  gen try_limit_undef(const gen & f,const identificateur & x,const gen & x0,int direction,GIAC_CONTEXT){
-    gen res;
-    //COUT << "try_limit_undef " << f << " " << x << "=" << x0 << '\n';
-#ifdef NO_STDEXCEPT
-    res=limit(f,x,x0,direction,contextptr);
-    if (res.type==_STRNG)
-      res=undef; // message too long
-#else
-    try {
-      res=limit(f,x,x0,direction,contextptr);
-    } catch (std::runtime_error & err){
-      res=undef;
-    }
-#endif    
-    return res;
-  }
-
-  int step_param_(const gen & f,const gen & g,const gen & t,gen & tmin,gen&tmax,vecteur & poi,vecteur & tvi,bool printtvi,bool exactlegende,GIAC_CONTEXT){
-    if (t.type!=_IDNT)
-      return 0;
-    gprintf(gettext("====================\nParametric plot (%gen,%gen), variable %gen"),makevecteur(f,g,t),1,contextptr);
-    gen periodef,periodeg,periode;
-    if (is_periodic(f,t,periodef,contextptr) && is_periodic(g,t,periodeg,contextptr)){
-      periode=gcd(periodef,periodeg,contextptr);
-      if (is_greater(tmax-tmin,periode,contextptr)){
-	tmin=normal(-periode/2,contextptr);
-	tmax=normal(periode/2,contextptr);
-      }
-    }
-    int eof=0,eog=0;
-    if (tmin==-tmax && (eof=is_even_odd(f,t,contextptr)) && (eog=is_even_odd(g,t,contextptr))){
-      if (eof==1){
-	if (eog==1)
-	  gprintf(gettext("Even functions."),vecteur(0),1,contextptr);
-	else
-	  gprintf(gettext("Even function %gen, odd function %gen. Reflection Ox"),makevecteur(f,g),1,contextptr);
-      }
-      else {
-	if (eog==1)
-	  gprintf(gettext("Odd function %gen, even function %gen. Reflection Oy"),makevecteur(f,g),1,contextptr);
-	else
-	  gprintf(gettext("Odd functions. Center O"),vecteur(0),1,contextptr);
-      }
-      tmin=0;
-    }
-    gen tmin0=ratnormal(tmin,contextptr),tmax0=ratnormal(tmax,contextptr);
-    vecteur lv=lidnt(evalf(f,1,contextptr));
-    if (lv.empty())
-      return 1;
-    if (lv.size()!=1 || lv.front()!=t)
-      return 0;
-    gen fg=symbolic(at_nop,makesequence(f,g));
-    gen df=domain(fg,t,0,contextptr);
-    if (ctrl_c || interrupted)
-      return 0;
-    gprintf(gettext("Domain %gen"),vecteur(1,df),1,contextptr);
-    gen df1=domain(fg,t,1,contextptr); // singular values only
-    if (df1.type!=_VECT){
-      gensizeerr(gettext("Unable to find singular points"));
-      return 0;
-    }
-    // Singularities
-    vecteur sing,crit;
-    identificateur xid=*t._IDNTptr;
-    iterateur it=df1._VECTptr->begin(),itend=df1._VECTptr->end();
-    for (;it!=itend;++it){
-      if (is_greater(*it,tmin,contextptr) && is_greater(tmax,*it,contextptr)){
-	sing.push_back(*it);
-      }
-    }
-    // Extremas
-    int st=step_infolevel(contextptr); 
-    step_infolevel(0,contextptr);
-    gen f1=_factor(derive(f,t,contextptr),contextptr),g1=_factor(derive(g,t,contextptr),contextptr);
-    gen f2=derive(f1,t,contextptr),g2=derive(g1,t,contextptr);
-    gen conv=f1*g2-f2*g1;
-    gen tval=eval(t,1,contextptr);
-    giac_assume(symb_and(symb_superieur_egal(t,tmin),symb_inferieur_egal(t,tmax)),contextptr);
-    int cm=calc_mode(contextptr);
-    calc_mode(-38,contextptr); // avoid rootof
-    gen cx=recursive_normal(solve(f1,t,periode==0?2:0,contextptr),contextptr);
-    if (ctrl_c || interrupted)
-      return 0;
-    gen cy=recursive_normal(solve(g1,t,periode==0?2:0,contextptr),contextptr);
-    if (ctrl_c || interrupted)
-      return 0;
-    gen cc=recursive_normal(solve(conv,t,periode==0?2:0,contextptr),contextptr);
-    if (ctrl_c || interrupted)
-      return 0;
-    calc_mode(cm,contextptr); // avoid rootof
-    if (t!=tval)
-      sto(tval,t,contextptr);
-    step_infolevel(st,contextptr);
-    if (cx.type!=_VECT || cy.type!=_VECT){
-      *logptr(contextptr) << gettext("Unable to find critical points") << '\n';
-      purgenoassume(t,contextptr);
-      return 0;
-    }
-    vecteur c=mergevecteur(*cx._VECTptr,*cy._VECTptr),infl;
-    if (cc.type==_VECT){
-      infl=*cc._VECTptr;
-      c=mergevecteur(c,infl);
-    }
-    else
-      *logptr(contextptr) << gettext("Unable to find inflection points") << '\n';
-    for (int i=0;i<int(infl.size());++i)
-      infl[i]=ratnormal(infl[i],contextptr);
-    for (int i=0;i<int(c.size());++i)
-      c[i]=ratnormal(c[i],contextptr);
-    comprim(c);
-    if (!lidnt(evalf(c,1,contextptr)).empty()){
-      *logptr(contextptr) << gettext("Infinite number of critical points. Try with optional argument ") << t << "=tmin..tmax" << '\n';
-      purgenoassume(t,contextptr);
-      return 0;
-    }
-    it=c.begin();itend=c.end();
-    for (;it!=itend;++it){
-      if (ctrl_c || interrupted)
-	return 0;
-      if (!lop(*it,at_rootof).empty())
-	*it=re(evalf(*it,1,contextptr),contextptr);
-      *it=recursive_normal(*it,contextptr);
-      if (in_domain(df,t,*it,contextptr) && is_greater(*it,tmin,contextptr) && is_greater(tmax,*it,contextptr)){
-	crit.push_back(*it);
-	gen fx=try_limit_undef(f,xid,*it,0,contextptr);
-	fx=recursive_normal(fx,contextptr);
-	gen gx=try_limit_undef(g,xid,*it,0,contextptr);
-	gx=recursive_normal(gx,contextptr);
-	gen ax,ay;
-	bool singp=equalposcomp(*cx._VECTptr,*it) && equalposcomp(*cy._VECTptr,*it);
-	if (singp){
-	  // singular point, find tangent (and kind?)
-	  /* ax=try_limit_undef(f2,xid,*it,0,contextptr);
-	  ax=recursive_normal(ax,contextptr);
-	  ay=try_limit_undef(g2,xid,*it,0,contextptr);
-	  ay=recursive_normal(ay,contextptr); */
-	  int ordre=5;
-	  vecteur vx,vy;
-	  int ox=0,oy=0,o1=0,o2=0;
-	  while (ordre<=20 && o1==0){
-	    if (ctrl_c || interrupted)
-	      return 0;
-	    // series expansion
-	    if (!convert_polynom(series(f,xid,*it,ordre,contextptr),xid,*it,vx,ax,ox,contextptr))
-	      break;
-	    if (!convert_polynom(series(g,xid,*it,ordre,contextptr),xid,*it,vy,ay,oy,contextptr))
-	      break;
-	    o1=ox;
-	    if (ox<oy)
-	      ay=0;
-	    if (oy<ox){
-	      ax=0;
-	      o1=oy;
-	    }
-	    if (o1){
-	      // find cusp kind / type de rebroussement
-	      reverse(vx.begin(),vx.end());
-	      reverse(vy.begin(),vy.end());
-	      while (vx.size()<vy.size())
-		vx.push_back(0);
-	      while (vy.size()<vx.size())
-		vy.push_back(0);
-	      o2=o1+1;
-	      int vs=int(vx.size());
-	      for (;o2<vs;++o2){
-		gen determinant=simplify(vx[o1]*vy[o2]-vx[o2]*vy[o1],contextptr);
-		if (!is_zero(determinant))
-		  break;
-	      }
-	      if (o2==vs)
-		o1=0;
-	    }
-	    ordre *= 2;
-	  }
-	  gprintf(gettext("Singular point %gen, point %gen direction %gen kind (%gen,%gen)\nTaylor expansions %gen"),makevecteur(symb_equal(t__IDNT_e,*it),makevecteur(fx,gx),makevecteur(ax,ay),o1,o2,makevecteur(vx,vy)),1,contextptr);
-	  gprintf(" \n",vecteur(0),1,contextptr);
-	}
-	else {
-	  ax=try_limit_undef(f1,xid,*it,0,contextptr);
-	  ay=try_limit_undef(g1,xid,*it,0,contextptr);
-	  ax=recursive_normal(ax,contextptr);
-	  ay=recursive_normal(ay,contextptr);
-	}
-	gen n=sqrt(ax*evalf(ax,1,contextptr)+ay*ay,contextptr);
-	if (!is_undef(fx) && !is_inf(fx) && !is_undef(gx) && !is_inf(gx)){
-	  gen pnt=_point(makesequence(fx,gx,write_legende(makevecteur(fx,gx),exactlegende,contextptr),symb_equal(at_couleur,equalposcomp(infl,*it)?_RED:_MAGENTA)),contextptr);
-	  poi.push_back(pnt);	
-	  if (singp){
-	    vecteur ve=makevecteur(_point(makesequence(fx,gx),contextptr),makevecteur(ax/n,ay/n),symb_equal(at_couleur,_BLUE));
-	    ve.push_back(write_legende(makevecteur(ax,ay),exactlegende,contextptr));
-	    gen vv=_vector(gen(ve,_SEQ__VECT),contextptr);
-	    poi.push_back(vv);
-	  }
-	}	
-      }
-    }
-    if (tmin==minus_inf && !equalposcomp(sing,minus_inf)){
-      if (in_domain(df,t,tmin,contextptr))
-	sing.push_back(tmin);
-      tmin=plus_inf;
-    }
-    if (tmax==plus_inf && !equalposcomp(sing,plus_inf)){
-      if (in_domain(df,t,tmax,contextptr))
-	sing.push_back(tmax);
-      tmax=minus_inf;
-    }
-    it=crit.begin();itend=crit.end();
-    for (;it!=itend;++it){
-      if (!is_inf(*it)){ 
-	if (is_greater(tmin,*it,contextptr))
-	  tmin=*it;
-	if (is_greater(*it,tmax,contextptr))
-	  tmax=*it;
-      }
-    }
-    it=infl.begin();itend=infl.end();
-    for (;it!=itend;++it){
-      if (!is_inf(*it)){ 
-	if (is_greater(tmin,*it,contextptr))
-	  tmin=*it;
-	if (is_greater(*it,tmax,contextptr))
-	  tmax=*it;
-      }
-    }
-    // asymptotes
-    gen xmin(plus_inf),xmax(minus_inf),ymin(plus_inf),ymax(minus_inf);
-    it=sing.begin();itend=sing.end();
-    for (;it!=itend;++it){
-      if (ctrl_c || interrupted)
-	return 0;
-      if (!is_inf(*it)){
-	if (is_greater(tmin,*it,contextptr))
-	  tmin=*it;
-	if (is_greater(*it,tmax,contextptr))
-	  tmax=*it;	
-      }
-      gen fx=try_limit_undef(f,xid,*it,0,contextptr);
-      fx=recursive_normal(fx,contextptr);
-      if (!is_inf(fx) && !lidnt(evalf(fx,1,contextptr)).empty()) continue;
-      gen fy=try_limit_undef(g,xid,*it,0,contextptr);
-      fy=recursive_normal(fy,contextptr);
-      if (!is_inf(fy) && !lidnt(evalf(fy,1,contextptr)).empty()) continue;
-      if (is_inf(fx)){
-	if (!is_inf(fy)){
-	  gen equ=symb_equal(y__IDNT_e,fy);
-	  if (is_greater(ymin,fy,contextptr))
-	    ymin=fy;
-	  if (is_greater(fy,ymax,contextptr))
-	    ymax=fy;
-	  gprintf(gettext("Horizontal asymptote at %gen : %gen"),makevecteur(*it,equ),1,contextptr);
-	  gen dr=_droite(makesequence(equ,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr);
-	  if (!equalposcomp(poi,dr))
-	    poi.push_back(dr);
-	  continue;
-	}
-	gen a=try_limit_undef(g/f,xid,*it,0,contextptr);
-	a=recursive_normal(a,contextptr);
-	if (is_undef(a)) continue;
-	if (is_inf(a)){
-	  gprintf(gettext("Vertical parabolic asymptote at %gen"),vecteur(1,*it),1,contextptr);
-	  continue;
-	}
-	else
-	  if (!lidnt(evalf(a,1,contextptr)).empty()) continue;
-	if (is_zero(a)){
-	  gprintf(gettext("Horizontal parabolic asymptote at %gen"),vecteur(1,*it),1,contextptr);
-	  continue;
-	}
-	gen b=try_limit_undef(g-a*f,xid,*it,0,contextptr);
-	b=recursive_normal(b,contextptr);
-	if (is_undef(b)) continue;
-	if (is_inf(b)){
-	  gprintf(gettext("Parabolic asymptote direction at %gen: %gen"),makevecteur(*it,symb_equal(y__IDNT_e,a*x__IDNT_e)),1,contextptr);
-	  continue;
-	}
-	else
-	  if (!lidnt(evalf(b,1,contextptr)).empty()) continue;
-	gen equ=symb_equal(y__IDNT_e,a*x__IDNT_e+b);
-	gprintf(gettext("Asymptote at %gen: %gen"),makevecteur(*it,equ),1,contextptr);
-	gen dr=_droite(makesequence(equ,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr);
-	if (!equalposcomp(poi,dr))
-	  poi.push_back(dr);
-	continue;
-      }
-      if (is_inf(fy)){
-	gen equ=symb_equal(x__IDNT_e,fx);
-	if (is_greater(xmin,fx,contextptr))
-	  xmin=fx;
-	if (is_greater(fx,xmax,contextptr))
-	  xmax=fx;
-	gprintf(gettext("Vertical asymptote at %gen: %gen"),makevecteur(*it,equ),1,contextptr);
-	gen dr=_droite(makesequence(equ,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr);
-	if (!equalposcomp(poi,dr))
-	  poi.push_back(dr);
-	continue;
-      }
-    }
-    for (int i=0;i<int(sing.size());++i)
-      sing[i]=ratnormal(sing[i],contextptr);
-    for (int i=0;i<int(crit.size());++i)
-      crit[i]=ratnormal(crit[i],contextptr);
-    vecteur tvx=mergevecteur(sing,crit);
-    if (in_domain(df,t,tmin0,contextptr))
-      tvx.insert(tvx.begin(),tmin0);
-    if (in_domain(df,t,tmax0,contextptr))
-      tvx.push_back(tmax0);
-    // add endpoints of df
-    vecteur ep=endpoints(df);
-    for (size_t i=0;i<ep.size();++i){
-      if (is_greater(ep[i],tmin0,contextptr) && is_greater(tmax0,ep[i],contextptr) && in_domain(df,t,ep[i],contextptr))
-	tvx.push_back(ep[i]);
-    }
-    comprim(tvx);
-    gen tmp=_sort(tvx,contextptr);
-    if (tmp.type!=_VECT){
-      purgenoassume(t,contextptr);
-      return 0;
-    }
-    tvx=*tmp._VECTptr;
-    int pos=equalposcomp(tvx,minus_inf);
-    if (pos){
-      tvx.erase(tvx.begin()+pos-1);
-      tvx.insert(tvx.begin(),minus_inf);
-    }
-    pos=equalposcomp(tvx,plus_inf);
-    if (pos){
-      tvx.erase(tvx.begin()+pos-1);
-      tvx.push_back(plus_inf);
-    }
-    gen nextt=tvx.front();
-    vecteur tvit=makevecteur(t,nextt);
-    gen x=try_limit_undef(f,xid,nextt,1,contextptr);
-    if (!has_inf_or_undef(x) && is_greater(xmin,x,contextptr))
-      xmin=x;
-    if (!has_inf_or_undef(x) && is_greater(x,xmax,contextptr))
-      xmax=x;
-    gen y=try_limit_undef(g,xid,nextt,1,contextptr);
-    if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-      ymin=y;
-    if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-      ymax=y;
-    vecteur tvif=makevecteur(symb_equal(x__IDNT_e,f),x);
-    vecteur tvig=makevecteur(symb_equal(y__IDNT_e,g),y);
-    gen nothing=string2gen(" ",false);
-    vecteur tvidf=makevecteur(symb_equal(symbolic(at_derive,x__IDNT_e),f1),try_limit_undef(f1,xid,nextt,1,contextptr));
-    vecteur tvidg=makevecteur(symb_equal(symbolic(at_derive,y__IDNT_e),g1),try_limit_undef(g1,xid,nextt,1,contextptr));
-    vecteur tviconv=makevecteur(symbolic(at_derive,x__IDNT_e)*symbolic(at_derive,symbolic(at_derive,y__IDNT_e))-symbolic(at_derive,y__IDNT_e)*symbolic(at_derive,symbolic(at_derive,x__IDNT_e)),try_limit_undef(conv,xid,nextt,1,contextptr));
-    int tvs=int(tvx.size());
-    for (int i=1;i<tvs;++i){
-      if (ctrl_c || interrupted)
-	return 0;
-      gen curt=nextt,dfx,dgx,convt;
-      nextt=tvx[i];
-      tvit.push_back(nothing);
-      if (is_inf(nextt) && is_inf(curt)){
-	dfx=try_limit_undef(f1,xid,0,0,contextptr);
-	dgx=try_limit_undef(g1,xid,0,0,contextptr);
-	convt=try_limit_undef(conv,xid,0,0,contextptr);	
-      }
-      else {
-	if (curt==minus_inf){
-	  dfx=try_limit_undef(f1,xid,nextt-1,0,contextptr);
-	  dgx=try_limit_undef(g1,xid,nextt-1,0,contextptr);
-	  convt=try_limit_undef(conv,xid,nextt-1,0,contextptr);
-	}
-	else {
-	  if (nextt==plus_inf){
-	    dfx=try_limit_undef(f1,xid,curt+1,0,contextptr);
-	    dgx=try_limit_undef(g1,xid,curt+1,0,contextptr);
-	    convt=try_limit_undef(conv,xid,curt+1,0,contextptr);
-	  }
-	  else {
-	    gen milieut=(curt+nextt)/2;
-	    gen curxd=evalf_double(curt,1,contextptr);
-	    gen nextxd=evalf_double(nextt,1,contextptr);
-	    if (curxd.type==_DOUBLE_ && nextxd.type==_DOUBLE_){
-	      double cd=curxd._DOUBLE_val,nd=nextxd._DOUBLE_val;
-	      if (nd-cd>1e-6*(absdouble(cd)+absdouble(nd))){
-		milieut=exact((cd+nd)/2,contextptr);
-	      }
-	    }
-	    dfx=try_limit_undef(f1,xid,milieut,0,contextptr);
-	    dgx=try_limit_undef(g1,xid,milieut,0,contextptr);
-	    convt=try_limit_undef(conv,xid,(curt+nextt)/2,0,contextptr);
-	  }
-	}
-      }
-      if (is_zero(dfx) || is_zero(dgx)){
-	purgenoassume(t,contextptr);
-	return 0;
-      }
-      if (is_strictly_positive(dfx,contextptr)){
-#if defined NSPIRE || defined NSPIRE_NEWLIB || defined KHICAS || defined HAVE_WINT_T 
-#ifdef KHICAS
-	  tvif.push_back(string2gen("inc",false));
-#else
-	  tvif.push_back(string2gen("↑",false));
-#endif
-#else
-	  tvif.push_back(string2gen("↗",false));
-#endif
-	tvidf.push_back(string2gen("+",false));
-      }
-      else {
-#if defined NSPIRE || defined NSPIRE_NEWLIB || defined KHICAS || defined HAVE_WINT_T 
-#ifdef KHICAS
-	  tvif.push_back(string2gen("dec",false));
-#else
-	  tvif.push_back(string2gen("↓",false));
-#endif
-#else
-	  tvif.push_back(string2gen("↘",false));
-#endif
-	tvidf.push_back(string2gen("-",false));
-      }
-      bool convtpos=is_strictly_positive(convt,contextptr);
-      if (convtpos)
-	tviconv.push_back(string2gen(abs_calc_mode(contextptr)==38?"∪":"convex",false));
-      else
-	tviconv.push_back(string2gen(abs_calc_mode(contextptr)==38?"∩":"concav",false));
-      if (is_strictly_positive(dgx,contextptr)){
-#if defined NSPIRE || defined NSPIRE_NEWLIB || defined KHICAS || defined HAVE_WINT_T 
-#ifdef KHICAS
-	  tvig.push_back(string2gen("inc",false));
-#else
-	  tvig.push_back(string2gen("↑",false));
-#endif
-#else
-	  tvig.push_back(string2gen("↗",false));
-#endif
-	tvidg.push_back(string2gen("+",false));
-      }
-      else {
-#if defined NSPIRE || defined NSPIRE_NEWLIB || defined KHICAS || defined HAVE_WINT_T 
-#ifdef KHICAS
-	  tvig.push_back(string2gen("dec",false));
-#else
-	  tvig.push_back(string2gen("↓",false));
-#endif
-#else
-	  tvig.push_back(string2gen("↘",false));
-#endif
-	tvidg.push_back(string2gen("-",false));
-      }
-      if (i<tvs-1 && equalposcomp(sing,nextt)){
-	x=try_limit_undef(f,xid,nextt,-1,contextptr);
-	x=recursive_normal(x,contextptr);
-	if (!has_inf_or_undef(x) && is_greater(xmin,x,contextptr))
-	  xmin=x;
-	if (!has_inf_or_undef(x) && is_greater(x,xmax,contextptr))
-	  xmax=x;
-	y=try_limit_undef(g,xid,nextt,-1,contextptr);
-	y=recursive_normal(y,contextptr);
-	if (ctrl_c || interrupted)
-	  return 0;
-	if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-	  ymin=y;
-	if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-	  ymax=y;
-	tvit.push_back(nextt);
-	tvif.push_back(x);
-	tvig.push_back(crunch_rootof(y,contextptr));
-	tvidf.push_back(nothing);
-	tvidg.push_back(nothing);
-	tviconv.push_back(nothing);
-	gen x=try_limit_undef(f,xid,nextt,1,contextptr);
-	x=recursive_normal(x,contextptr);
-	if (!has_inf_or_undef(x) && is_greater(xmin,x,contextptr))
-	  xmin=x;
-	if (!has_inf_or_undef(x) && is_greater(x,xmax,contextptr))
-	  xmax=x;
-	y=try_limit_undef(g,xid,nextt,1,contextptr);
-	y=recursive_normal(y,contextptr);
-	if (ctrl_c || interrupted)
-	  return 0;
-	if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-	  ymin=y;
-	if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-	  ymax=y;
-	tvit.push_back(nextt);
-	tvif.push_back(x);
-	tvig.push_back(crunch_rootof(y,contextptr));
-	tvidf.push_back(nothing);
-	tvidg.push_back(nothing);
-	tviconv.push_back(nothing);
-      }
-      else {
-	gen x=try_limit_undef(f,xid,nextt,-1,contextptr);
-	x=recursive_normal(x,contextptr);
-	if (!has_inf_or_undef(x) && is_greater(xmin,x,contextptr))
-	  xmin=x;
-	if (!has_inf_or_undef(x) && is_greater(x,xmax,contextptr))
-	  xmax=x;
-	y=try_limit_undef(g,xid,nextt,-1,contextptr);
-	y=recursive_normal(y,contextptr);
-	if (ctrl_c || interrupted)
-	  return 0;
-	if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-	  ymin=y;
-	if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-	  ymax=y;
-	tvit.push_back(nextt);
-	tvif.push_back(x);
-	tvig.push_back(y);
-	y=try_limit_undef(f1,xid,nextt,-1,contextptr);
-	y=recursive_normal(y,contextptr);
-	tvidf.push_back(crunch_rootof(y,contextptr));
-	y=try_limit_undef(g1,xid,nextt,-1,contextptr);
-	y=recursive_normal(y,contextptr);
-	if (ctrl_c || interrupted)
-	  return 0;
-	tvidg.push_back(crunch_rootof(y,contextptr));
-	if (equalposcomp(infl,nextt)) y=0;
-	else {
-	  y=try_limit_undef(conv,xid,nextt,-1,contextptr);
-	  y=recursive_normal(y,contextptr);
-	}
-	tviconv.push_back(crunch_rootof(y,contextptr));
-      }
-    }
-    tvi=makevecteur(tvit,tvif,tvidf,tvig,tvidg,tviconv);
-    gen xscale=xmax-xmin;
-    if (is_inf(xscale) || xscale==0)
-      xscale=gnuplot_xmax-gnuplot_xmin;
-    if (eof==2){
-      xmax=max(xmax,-xmin,contextptr);
-      xmin=-xmax;
-    }
-    if (eog==2){
-      ymax=max(ymax,-ymin,contextptr);
-      ymin=-ymax;
-    }
-    if (eof && eog)
-      tmin=-tmax;
-    if (periode==0){
-      gen tscale=tmax-tmin;
-      tmax += tscale/2;
-      tmin -= tscale/2;
-    }
-    if (tmax==tmin){
-      tmin=gnuplot_tmin;
-      tmax=gnuplot_tmax;
-    }
-    gen glx(_GL_X);
-    glx.subtype=_INT_PLOT;
-    glx=symb_equal(glx,symb_interval(xmin-xscale/2,xmax+xscale/2));
-    poi.insert(poi.begin(),glx);
-    gen yscale=ymax-ymin;
-    if (is_inf(yscale) || yscale==0){
-      yscale=gnuplot_ymax-gnuplot_ymin;
-      ymax=gnuplot_ymax;
-      ymin=gnuplot_ymin;
-    }
-    if (eog==2){
-      ymax=max(ymax,-ymin,contextptr);
-      ymin=-ymax;
-    }
-    gen gly(_GL_Y);
-    gly.subtype=_INT_PLOT;
-    gly=symb_equal(gly,symb_interval(ymin-yscale/2,ymax+yscale/2));
-    poi.insert(poi.begin(),gly);
-    gprintf(gettext("Variations (%gen,%gen)\n%gen"),makevecteur(f,g,tvi),1,contextptr);
-#if !defined(EMCC) && !defined(EMCC2)
-    if (printtvi && step_infolevel(contextptr)==0)
-      *logptr(contextptr) << tvi << '\n';
-#endif
-    // finished!
-    purgenoassume(t,contextptr);
-    return 1 + (periode!=1);
-  }
-
-  int step_param(const gen & f,const gen & g,const gen & t,gen & tmin,gen&tmax,vecteur & poi,vecteur & tvi,bool printtvi,bool exactlegende,GIAC_CONTEXT){
-    bool c=complex_mode(contextptr); int st=step_infolevel(contextptr),s=0;
-    if (t==x__IDNT_e || t==y__IDNT_e)
-      *logptr(contextptr) << gettext("Warning, using x or y as variable in parametric plot may lead to confusion!") << '\n';
-    step_infolevel(0,contextptr);
-#ifdef NO_STDEXCEPT
-    s=step_param_(f,g,t,tmin,tmax,poi,tvi,printtvi,exactlegende,contextptr);
-#else
-    try {
-      s=step_param_(f,g,t,tmin,tmax,poi,tvi,printtvi,exactlegende,contextptr);
-    } catch(std::runtime_error & e){ 
-      last_evaled_argptr(contextptr)=NULL;
-      s=0;
-    }
-#endif
-    complex_mode(c,contextptr);
-    step_infolevel(st,contextptr);
-    return s;
-  }
-
-  gen strict2large(const gen & g){
-    if (g.type==_VECT){
-      vecteur v(*g._VECTptr);
-      for (size_t i=0;i<v.size();++i)
-	v[i]=strict2large(v[i]);
-      return gen(v,g.subtype);
-    }
-    if (g.type!=_SYMB)
-      return g;
-    if (g._SYMBptr->sommet==at_superieur_strict)
-      return symbolic(at_superieur_egal,g._SYMBptr->feuille);
-    if (g._SYMBptr->sommet==at_inferieur_strict)
-      return symbolic(at_inferieur_egal,g._SYMBptr->feuille);
-    if (g._SYMBptr->sommet==at_different)
-      return 1;
-    return symbolic(g._SYMBptr->sommet,strict2large(g._SYMBptr->feuille));
-  }
-
-  // x->f in xmin..xmax
-  // pass -inf and inf by default.
-  // poi will contain point of interest: asymptotes and extremas
-  // xmin and xmax will be set to values containing all points in poi
-  int step_func_(const gen & f,const gen & x,gen & xmin,gen&xmax,vecteur & poi,vecteur & tvi,gen& periode,vecteur & asym,vecteur & parab,vecteur & crit,vecteur & infl,bool printtvi,bool exactlegende,GIAC_CONTEXT,int do_inflex_tabsign){
-    if (x.type!=_IDNT)
-      return 0;
-    if (do_inflex_tabsign!=2) 
-      gprintf(gettext("====================\nFunction plot %gen, variable %gen"),makevecteur(f,x),1,contextptr);
-    if (is_periodic(f,x,periode,contextptr)){
-      gprintf(gettext("Periodic function T=%gen"),vecteur(1,periode),1,contextptr);
-      if (is_strictly_greater(xmax-xmin,periode,contextptr)){
-	if (!is_inf(xmin)) // ? do_inflex_tabsign==2 && 
-	  xmax=xmin+periode;
-	else {
-	  if (!is_inf(xmax)) // ? do_inflex_tabsign==2 && 
-	    xmin=xmax-periode;
-	  else {
-	    xmin=normal(-periode/2,contextptr);
-	    xmax=normal(periode/2,contextptr);
-	  }
-	}
-      }
-    }
-    int eo=0;
-    if (xmin==-xmax && (eo=is_even_odd(f,x,contextptr))){
-      if (eo==1)
-	gprintf(gettext("Even function %gen. Reflection Oy"),vecteur(1,f),1,contextptr);
-      else
-	gprintf(gettext("Odd function %gen. Center O"),vecteur(1,f),1,contextptr);
-      if ((do_inflex_tabsign & 1)==1)
-	xmin=0;
-    }
-    gen xmin0=ratnormal(xmin,contextptr),xmax0=ratnormal(xmax,contextptr);
-    vecteur lv=lidnt(evalf(f,1,contextptr));
-    if (lv.empty())
-      lv=lidnt(f);
-    if (lv.empty())
-      return 1;
-    if (lv.size()!=1 || lv.front()!=x)
-      return 0;
-    gen xval=eval(x,1,contextptr);
-    giac_assume(symb_and(symb_superieur_egal(x,xmin),symb_inferieur_egal(x,xmax)),contextptr);
-    gen df=domain(f,x,0,contextptr);
-    gen dflarge=strict2large(df);
-    gprintf(gettext("Domain %gen"),vecteur(1,df),1,contextptr);
-    gen df1=domain(f,x,1,contextptr); // singular values only
-    if (df1.type!=_VECT){
-      gensizeerr(gettext("Unable to find singular points"));
-      return 0;
-    }
-    // Asymptotes
-    vecteur sing;
-    identificateur xid=*x._IDNTptr;
-    iterateur it=df1._VECTptr->begin(),itend=df1._VECTptr->end();
-    for (;it!=itend;++it){
-      if (in_domain(dflarge,x,*it,contextptr) && is_greater(*it,xmin,contextptr) && is_greater(xmax,*it,contextptr)){
-	sing.push_back(*it);
-      }
-    }
-    // Extremas
-    int st=step_infolevel(contextptr);
-    step_infolevel(0,contextptr);
-    gen f1=do_inflex_tabsign==2?f:_factor(derive(f,x,contextptr),contextptr);
-    gen f2=derive(f1,x,contextptr);
-#if 1
-    int cm=calc_mode(contextptr);
-    gen c,c1,c2;
-#ifndef NO_STDEXCEPT
-    try {
-#endif
-    calc_mode(-38,contextptr); // avoid rootof
-    c1=solve(f1,x,periode==0?2:0,contextptr);
-    if (is_undef(c1)){
-      calc_mode(cm,contextptr); 
-      return 0;
-    }
-    // add approx root if not detected by exact solver
-    double eps=epsilon(contextptr);
-    gen c1f=evalf(c1,1,contextptr);
-    if (c1.type==_VECT && c1f.type==_VECT){
-      vecteur c1v=*c1f._VECTptr,w=*c1._VECTptr;
-      c1f=_fsolve(makesequence(f1,symb_equal(x,symb_interval(xmin,xmax))),contextptr);
-      if (c1f.type==_VECT){
-	vecteur c1fv=*c1f._VECTptr;
-	for (int i=0;i<c1fv.size();++i){
-	  gen r=c1fv[i];
-	  int j=0;
-	  for (;j<c1v.size();++j){
-	    if (is_greater(eps,abs(r-c1v[j],contextptr),contextptr))
-	      break;
-	  }
-	  if (j==c1v.size())
-	    w.push_back(r);
-	}
-      }
-      c1=gen(w,c1.subtype);
-    }
-    c2=(!(do_inflex_tabsign & 1) || is_zero(f2))?gen(vecteur(0)):solve(_numer(f2,contextptr),x,periode==0?2:0,contextptr);
-    c=c1;
-#ifndef NO_STDEXCEPT
-    } catch (std::runtime_error & err) { calc_mode(cm,contextptr); throw(err);}
-#endif
-    calc_mode(cm,contextptr);
-    step_infolevel(st,contextptr);
-    if (x!=xval)
-      sto(xval,x,contextptr);
-    if (c1.type!=_VECT){
-      *logptr(contextptr) << gettext("Unable to find critical points") << '\n';
-      return 0;
-    }
-    if (c2.type==_VECT){
-      infl=*c2._VECTptr;
-      c=gen(mergevecteur(gen2vecteur(c1),infl));
-    }
-    else
-      *logptr(contextptr) << gettext("Unable to find convexity") << '\n';
-    // if (c.type==_VECT && c._VECTptr->empty()) c=_fsolve(makesequence(f,x),contextptr);
-#else
-    gen c=critical(makesequence(f,x),false,contextptr);
-    step_infolevel(st,contextptr);
-    if (c.type!=_VECT){
-      *logptr(contextptr) << gettext("Unable to find critical points") << '\n';
-      purgenoassume(x,contextptr);
-      return 0;
-    }
-#endif
-    if (ctrl_c || interrupted)
-      return 0;
-    if (!lidnt(evalf(c,1,contextptr)).empty()){
-      *logptr(contextptr) << gettext("Infinite number of critical points. Try with optional argument ") << x << "=xmin..xmax" << '\n';
-      purgenoassume(x,contextptr);
-      return 0;
-    }
-    it=c._VECTptr->begin();itend=c._VECTptr->end();
-    for (;it!=itend;++it){
-      if (ctrl_c || interrupted)
-	return 0;
-      if (!lop(*it,at_rootof).empty())
-	*it=re(evalf(*it,1,contextptr),contextptr);
-      if (in_domain(df,x,*it,contextptr) && is_greater(*it,xmin,contextptr) && is_greater(xmax,*it,contextptr)){
-	crit.push_back(*it);
-	gen fx=try_limit_undef(f,xid,*it,0,contextptr);
-	fx=recursive_normal(fx,contextptr);
-	if (!is_undef(fx) && !is_inf(fx)){
-	  if (1 || exactlegende)
-	    poi.push_back(_point(makesequence(*it,fx,write_legende(makevecteur(*it,fx),exactlegende,contextptr),symb_equal(at_couleur,equalposcomp(infl,*it)?_GREEN:_MAGENTA)),contextptr));
-	  else {
-	    gen abscisse=evalf_double(*it,1,contextptr);
-	    gen ordonnee=evalf_double(fx,1,contextptr);
-	    if (abscisse.type==_DOUBLE_ && ordonnee.type==_DOUBLE_)
-	      poi.push_back(_point(makesequence(*it,fx,write_legende(string2gen(print_DOUBLE_(abscisse._DOUBLE_val,3)+","+print_DOUBLE_(ordonnee._DOUBLE_val,3),false),exactlegende,contextptr),symb_equal(at_couleur,_MAGENTA)),contextptr));
-	  }
-	}
-      }
-    }
-    if (xmin==minus_inf && !equalposcomp(sing,minus_inf)){
-      if (in_domain(df,x,xmin,contextptr))
-	sing.push_back(xmin);
-      xmin=plus_inf;
-    }
-    if (xmax==plus_inf && !equalposcomp(sing,plus_inf)){
-      if (in_domain(df,x,xmax,contextptr))
-	sing.push_back(xmax);
-      xmax=minus_inf;
-    }
-    it=crit.begin();itend=crit.end();
-    for (;it!=itend;++it){
-      if (ctrl_c || interrupted)
-	return 0;
-      if (!has_inf_or_undef(*it)){ 
-	if (is_greater(xmin,*it,contextptr))
-	  xmin=*it;
-	if (is_greater(*it,xmax,contextptr))
-	  xmax=*it;
-      }
-    }
-    it=sing.begin();itend=sing.end();
-    for (;do_inflex_tabsign!=2 && it!=itend;++it){
-      if (ctrl_c || interrupted)
-	return 0;
-      gen equ;
-      if (!has_inf_or_undef(*it)){ // vertical
-	if (is_greater(xmin,*it,contextptr))
-	  xmin=*it;
-	if (is_greater(*it,xmax,contextptr))
-	  xmax=*it;
-	gen l=try_limit_undef(f,xid,*it,1,contextptr);
-	l=recursive_normal(l,contextptr);
-	if (is_inf(l)){
-	  equ=symb_equal(x__IDNT_e,*it);
-	  asym.push_back(makevecteur(*it,equ));
-	  gprintf(gettext("Vertical asymptote %gen"),vecteur(1,equ),1,contextptr);
-	  poi.push_back(_droite(makesequence(*it,*it+cst_i,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr));
-	  if (eo && *it!=0){
-	    equ=symb_equal(x__IDNT_e,-*it);
-	    asym.push_back(makevecteur(-*it,equ));
-	    gprintf(gettext("Symmetric vertical asymptote %gen"),vecteur(1,equ),1,contextptr);
-	    poi.push_back(_droite(makesequence(-*it,-*it+cst_i,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr));
-	  }
-	}
-	continue;
-      }
-      gen l=try_limit_undef(f,xid,*it,0,contextptr);
-      l=recursive_normal(l,contextptr);
-      if (is_undef(l)) continue;
-      if (!is_inf(l)){
-	if (!lidnt(evalf(l,1,contextptr)).empty()) continue;
-	equ=symb_equal(y__IDNT_e,l);
-	asym.push_back(makevecteur(*it,equ));
-	gprintf(gettext("Horizontal asymptote %gen"),vecteur(1,equ),1,contextptr);
-	gen dr=_droite(makesequence(l*cst_i,l*cst_i+1,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr);
-	if (!equalposcomp(poi,dr))
-	  poi.push_back(dr);
-	if (eo==2 && *it!=0 && l!=0){
-	  equ=symb_equal(y__IDNT_e,l);
-	  asym.push_back(makevecteur(-*it,-equ));
-	  gprintf(gettext("Symmetric horizontal asymptote %gen"),vecteur(1,-equ),1,contextptr);
-	  dr=_droite(makesequence(-l*cst_i,-l*cst_i+1,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr);
-	  if (!equalposcomp(poi,dr))
-	    poi.push_back(dr);
-	}
-	continue;
-      }
-      gen a=try_limit_undef(f/x,xid,*it,0,contextptr);
-      a=recursive_normal(a,contextptr);
-      if (is_undef(a)) continue;
-      if (is_inf(a)){
-	parab.push_back(makevecteur(*it,a));
-	gprintf(gettext("Vertical parabolic asymptote at %gen"),vecteur(1,*it),1,contextptr);
-	continue;
-      }
-      else
-	if (!lidnt(evalf(a,1,contextptr)).empty()) continue;
-      if (is_zero(a)){
-	parab.push_back(makevecteur(*it,0));
-	gprintf(gettext("Horizontal parabolic asymptote at %gen"),vecteur(1,*it),1,contextptr);
-	continue;
-      }
-      gen b=try_limit_undef(f-a*x,xid,*it,0,contextptr);
-      b=recursive_normal(b,contextptr);
-      if (is_undef(b)) continue;
-      // avoid bounded_function
-      if (is_inf(b)){
-	parab.push_back(makevecteur(*it,a));
-	gprintf(gettext("Parabolic asymptote direction %gen at infinity"),vecteur(1,symb_equal(y__IDNT_e,a*x__IDNT_e)),1,contextptr);
-	continue;
-      }
-      else
-	if (!lidnt(evalf(b,1,contextptr)).empty()) continue;
-      equ=symb_equal(y__IDNT_e,a*x__IDNT_e+b);
-      asym.push_back(makevecteur(*it,equ));
-      gprintf(gettext("Asymptote %gen"),vecteur(1,equ),1,contextptr);
-      gen dr=_droite(makesequence(equ,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr);
-      if (!equalposcomp(poi,dr))
-	poi.push_back(dr);
-      if (eo && *it!=0){
-	if (eo==1)
-	  equ=symb_equal(y__IDNT_e,-a*x__IDNT_e+b);
-	else
-	  equ=symb_equal(y__IDNT_e,a*x__IDNT_e-b);
-	asym.push_back(makevecteur(*it,equ));
-	gprintf(gettext("Symmetric asymptote %gen"),vecteur(1,equ),1,contextptr);
-	gen dr=_droite(makesequence(equ,write_legende(equ,exactlegende,contextptr),symb_equal(at_couleur,_RED)),contextptr);
-	if (!equalposcomp(poi,dr))
-	  poi.push_back(dr);
-      }
-    }
-    // merge sing and crit, add xmin0, xmax0, build variation matrix
-    for (int i=0;i<int(sing.size());++i)
-      sing[i]=ratnormal(sing[i],contextptr);
-    for (int i=0;i<int(crit.size());++i)
-      crit[i]=ratnormal(crit[i],contextptr);
-    vecteur tvx=mergevecteur(sing,crit);
-    if (in_domain(df,x,xmin0,contextptr))
-      tvx.insert(tvx.begin(),xmin0);
-    if (in_domain(df,x,xmax0,contextptr))
-      tvx.push_back(xmax0);
-    // add endpoints of df
-    vecteur ep=endpoints(df);
-    for (size_t i=0;i<ep.size();++i){
-      if (is_greater(ep[i],xmin0,contextptr) && is_greater(xmax0,ep[i],contextptr) && in_domain(df,x,ep[i],contextptr))
-	tvx.push_back(ep[i]);
-    }
-    // add sign/abs
-    vecteur lsignabs(mergevecteur(lop(f,at_sign),lop(f,at_abs)));
-    if (!lsignabs.empty()){
-      lsignabs=lvarx(lsignabs,x);
-      for (size_t i=0;i<lsignabs.size();++i){
-	tvx=mergevecteur(tvx,solve(lsignabs[i]._SYMBptr->feuille,x,periode==0?2:0,contextptr));
-      }
-    }
-    comprim(tvx);    
-    gen tmp=_sort(tvx,contextptr);
-    if (tmp.type!=_VECT){
-      purgenoassume(x,contextptr);
-      return 0;
-    }
-    tvx=*tmp._VECTptr;
-    int pos=equalposcomp(tvx,minus_inf);
-    if (pos){
-      tvx.erase(tvx.begin()+pos-1);
-      tvx.insert(tvx.begin(),minus_inf);
-    }
-    pos=equalposcomp(tvx,plus_inf);
-    if (pos){
-      tvx.erase(tvx.begin()+pos-1);
-      tvx.push_back(plus_inf);
-    }
-    gen nextx=tvx.front();
-    if (!lop(nextx,at_rootof).empty())
-      nextx=re(evalf(nextx,1,contextptr),contextptr);
-    vecteur tvix=makevecteur(x,nextx);
-    gen y=try_limit_undef(f,xid,nextx,1,contextptr),ymin(plus_inf),ymax(minus_inf);
-    if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-      ymin=y;
-    if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-      ymax=y;
-    gen yof=y__IDNT_e; // symb_of(y__IDNT_e,x); // 
-    vecteur tvif=makevecteur(symb_equal(yof,f),y);
-    gen nothing=string2gen(" ",false);
-    vecteur tvidf=makevecteur(do_inflex_tabsign==2?f1:symb_equal(symbolic(at_derive,yof),f1),try_limit_undef(f1,xid,nextx,1,contextptr));
-    vecteur tvidf2;
-    if ((do_inflex_tabsign & 1))
-      tvidf2=makevecteur(symbolic(at_derive,symbolic(at_derive,yof)),try_limit_undef(f2,xid,nextx,1,contextptr));
-    int tvs=int(tvx.size());
-    for (int i=1;i<tvs;++i){
-      if (ctrl_c || interrupted)
-	return 0;
-      gen curx=nextx,dfx,df2;
-      nextx=tvx[i];
-      if (!lop(nextx,at_rootof).empty())
-	nextx=re(evalf(nextx,1,contextptr),contextptr);
-      tvix.push_back(nothing);
-      if (is_inf(nextx) && is_inf(curx)){
-	dfx=try_limit_undef(f1,xid,0,0,contextptr);
-	if ((do_inflex_tabsign & 1)) df2=try_limit_undef(f2,xid,0,0,contextptr);
-      }
-      else {
-	if (curx==minus_inf){
-	  dfx=try_limit_undef(f1,xid,nextx-1,0,contextptr);
-	  if ((do_inflex_tabsign & 1)) df2=try_limit_undef(f2,xid,nextx-1,0,contextptr);
-	}
-	else {
-	  if (nextx==plus_inf){
-	    dfx=try_limit_undef(f1,xid,curx+1,0,contextptr);
-	    if ((do_inflex_tabsign & 1)) df2=try_limit_undef(f2,xid,curx+1,0,contextptr);
-	  }
-	  else {
-	    gen m=(curx+nextx)/2;
-	    gen curxd=evalf_double(curx,1,contextptr);
-	    gen nextxd=evalf_double(nextx,1,contextptr);
-	    if (curxd.type==_DOUBLE_ && nextxd.type==_DOUBLE_){
-	      double cd=curxd._DOUBLE_val,nd=nextxd._DOUBLE_val;
-	      if (nd-cd>1e-6*(absdouble(cd)+absdouble(nd))){
-		m=exact((cd+nd)/2,contextptr);
-	      }
-	    }
-	    if (in_domain(df,x,m,contextptr)){
-	      dfx=try_limit_undef(f1,xid,m,0,contextptr);
-	      if ((do_inflex_tabsign & 1)) df2=try_limit_undef(f2,xid,m,0,contextptr);
-	    }
-	    else dfx=df2=undef;
-	  }
-	}
-      }
-      if (is_zero(dfx)){
-	purgenoassume(x,contextptr);
-	return 0;
-      }
-      if (is_undef(dfx)){
-	tvif.push_back(string2gen("X",false));
-	tvidf.push_back(string2gen("X",false));
-      }
-      else {
-	if (is_strictly_positive(dfx,contextptr)){
-#if defined NSPIRE || defined NSPIRE_NEWLIB || defined KHICAS || defined HAVE_WINT_T 
-#ifdef KHICAS
-	  tvif.push_back(string2gen("inc",false));
-#else
-	  tvif.push_back(string2gen("↑",false));
-#endif
-#else
-	  tvif.push_back(string2gen("↗",false));
-#endif
-	  tvidf.push_back(string2gen("+",false));
-	}
-	else {
-#if defined NSPIRE || defined NSPIRE_NEWLIB || defined KHICAS || defined HAVE_WINT_T 
-#ifdef KHICAS
-	  tvif.push_back(string2gen("dec",false));
-#else
-	  tvif.push_back(string2gen("↓",false));
-#endif
-#else
-	  tvif.push_back(string2gen("↘",false));
-#endif
-	  tvidf.push_back(string2gen("-",false));
-	}
-      }
-      if ((do_inflex_tabsign & 1)){
-	if (is_undef(df2))
-	  tvidf2.push_back(string2gen("X",false));
-	else {
-	  if (is_strictly_positive(df2,contextptr)){
-#ifdef KHICAS
-	    tvidf2.push_back(string2gen("+ (U)",false));
-#else
-	    tvidf2.push_back(string2gen(abs_calc_mode(contextptr)==38?"∪":"+ (∪)",false));
-#endif
-	  }
-	  else {
-#ifdef KHICAS
-	    tvidf2.push_back(string2gen("- (^)",false));
-#else
-	    tvidf2.push_back(string2gen(abs_calc_mode(contextptr)==38?"∩":"- (∩)",false));
-#endif
-	  }
-	}
-      }
-      if (i<tvs-1 && equalposcomp(sing,nextx)){
-	y=try_limit_undef(f,xid,nextx,-1,contextptr);
-	y=recursive_normal(y,contextptr);
-	if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-	  ymin=y;
-	if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-	  ymax=y;
-	tvix.push_back(nextx);
-	tvif.push_back(crunch_rootof(y,contextptr));
-	tvidf.push_back(string2gen("||",false));
-	if ((do_inflex_tabsign & 1)) tvidf2.push_back(string2gen("||",false));
-	y=try_limit_undef(f,xid,nextx,1,contextptr);
-	y=recursive_normal(y,contextptr);
-	if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-	  ymin=y;
-	if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-	  ymax=y;
-	tvix.push_back(nextx);
-	tvif.push_back(crunch_rootof(y,contextptr));
-	tvidf.push_back(string2gen("||",false));
-	if ((do_inflex_tabsign & 1)) tvidf2.push_back(string2gen("||",false));
-      }
-      else {
-	y=try_limit_undef(f,xid,nextx,-1,contextptr); 
-	if (0 && !is_inf(nextx) && !is_zero(recursive_normal(y-try_limit_undef(f,xid,nextx,1,contextptr),contextptr))) // should not happen
-	  y=undef;
-	y=recursive_normal(y,contextptr);
-	if (!has_inf_or_undef(y) && is_greater(ymin,y,contextptr))
-	  ymin=y;
-	if (!has_inf_or_undef(y) && is_greater(y,ymax,contextptr))
-	  ymax=y;
-	tvix.push_back(crunch_rootof(nextx,contextptr));
-	tvif.push_back(crunch_rootof(y,contextptr));
-	y=try_limit_undef(f1,xid,nextx,-1,contextptr); 
-	// additional check for same bidirectional limit
-	gen ysecond;
-	if (!is_inf(nextx) && !is_zero(recursive_normal(y-(ysecond=try_limit_undef(f1,xid,nextx,1,contextptr)),contextptr)))
-	  y=makevecteur(y,ysecond);
-	y=recursive_normal(y,contextptr);
-	tvidf.push_back(crunch_rootof(y,contextptr));
-	if ((do_inflex_tabsign & 1)){
-	  y=try_limit_undef(f2,xid,nextx,0,contextptr);
-	  y=recursive_normal(y,contextptr);
-	  tvidf2.push_back(crunch_rootof(y,contextptr));
-	}
-      }
-    }
-    tvi=do_inflex_tabsign==2?makevecteur(tvix,tvidf):makevecteur(tvix,tvidf,tvif);
-    if ((do_inflex_tabsign & 1)) tvi.push_back(tvidf2);
-    vecteur tvit(mtran(tvi));
-    for (size_t i=1;i<tvit.size();++i){
-      if (tvit[i]==tvit[i-1])
-	tvit.erase(tvit.begin()+i);
-    }
-    tvi=mtran(tvit);
-    gen yscale=ymax-ymin;
-    if (is_inf(yscale) || yscale==0){
-      yscale=xmax-xmin;
-      ymax=gnuplot_ymax;
-      ymin=gnuplot_ymin;
-    }
-    if (is_inf(yscale) || yscale==0){
-      yscale=gnuplot_ymax-gnuplot_ymin;
-      ymax=gnuplot_ymax;
-      ymin=gnuplot_ymin;
-    }
-    if (eo){
-      xmax=max(xmax,-xmin,contextptr);
-      xmin=-xmax;
-      if (eo==2){
-	ymax=max(ymax,-ymin,contextptr);
-	ymin=-ymax;
-      }
-    }
-    gen gly(_GL_Y);
-    gly.subtype=_INT_PLOT;
-    gly=symb_equal(gly,symb_interval(ymin-yscale/2,ymax+yscale/2));
-    poi.insert(poi.begin(),gly);
-    gprintf(gettext(do_inflex_tabsign==2?"Sign %gen\n%gen":"Variations %gen\n%gen"),makevecteur(f,tvi),1,contextptr);
-#if !defined(EMCC) && !defined(EMCC2)
-    if (printtvi && step_infolevel(contextptr)==0)
-      *logptr(contextptr) << tvi << '\n';
-#endif
-    // finished!
-    purgenoassume(x,contextptr);
-    return 1 + (periode!=0);
-  }
-
-  // bit 0 of do_inflex_tabsign = set to 1 for inflexion (valid for tabvar)
-  // bit 1 of do_inflex_tabsign = set to 1 for tabsign, 0 for tabvar
-  int step_func(const gen & f,const gen & x,gen & xmin,gen&xmax,vecteur & poi,vecteur & tvi,gen & periode,vecteur & asym,vecteur & parab,vecteur & crit,vecteur & inflex,bool printtvi,bool exactlegende,GIAC_CONTEXT,int do_inflex_tabsign){
-    bool c=complex_mode(contextptr); int st=step_infolevel(contextptr),s=0;
-    step_infolevel(0,contextptr);
-#ifdef NO_STDEXCEPT
-    s=step_func_(f,x,xmin,xmax,poi,tvi,periode,asym,parab,crit,inflex,printtvi,exactlegende,contextptr,do_inflex_tabsign);
-#else
-    try {
-      s=step_func_(f,x,xmin,xmax,poi,tvi,periode,asym,parab,crit,inflex,printtvi,exactlegende,contextptr,do_inflex_tabsign);
-    } catch (std::runtime_error & e){
-      last_evaled_argptr(contextptr)=NULL;
-      s=0;
-    }
-#endif
-    complex_mode(c,contextptr);
-    step_infolevel(st,contextptr);
-    return s;
-  }
-
-  gen _tabvar(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(g.type==_VECT && g.subtype==_SEQ__VECT?*g._VECTptr:vecteur(1,g));
-    int s=int(v.size());
-#if defined(EMCC) || defined(EMCC2)
-    int plot=1;
-#else
-    int plot=0;
-#endif
-    bool return_tabvar=false,return_equation=false,return_coordonnees=false;
-    int do_inflex_tabsign=1;
-    for (int i=0;i<s;++i){
-      if (v[i]==at_sign){
-	v.erase(v.begin()+i);
-	do_inflex_tabsign=2;
-	--s; --i; continue;
-      }
-      if (v[i]==at_plot){
-	plot=2;
-	v.erase(v.begin()+i);
-	--s; --i; continue;
-      }
-      if (v[i]==at_tabvar){
-	return_tabvar=true;
-	v.erase(v.begin()+i);
-	--s; --i; continue;
-      }
-      if (v[i]==at_equation){
-	return_equation=true;
-	v.erase(v.begin()+i);
-	--s; --i; continue;
-      }
-      if (v[i]==at_coordonnees){
-	return_coordonnees=true;
-	v.erase(v.begin()+i);
-	--s; --i; continue;
-      }
-      if (v[i]==at_derive){
-	do_inflex_tabsign=0;
-	v.erase(v.begin()+i);
-	--s; --i; continue;
-      }
-      if (v[i].is_symb_of_sommet(at_equation)){
-	gen & f=v[i]._SYMBptr->feuille;
-	if (f.type==_VECT && f._VECTptr->size()==2 && f._VECTptr->front()==at_derive){
-	  if (f._VECTptr->back()==2)
-	    do_inflex_tabsign=1;
-	  else
-	    do_inflex_tabsign=0;
-	  v.erase(v.begin()+i);
-	  --s; --i; continue;
-	}
-      }
-    }
-    bool exactlegende=false;
-    if (s>1 && v[s-1]==at_exact){
-      exactlegende=true;
-      v.pop_back();
-      --s;
-    }
-    if (s==2 && v[1].type==_SYMB && v[1]._SYMBptr->sommet!=at_equal)
-      v=makevecteur(v,ggb_var(v));
-    if (s==1){
-      v.push_back(ggb_var(g));
-      ++s;
-    }
-    if (s<2)
-      return gensizeerr(contextptr);
-    gen f=exact(v[0],contextptr);
-    gen x=v[1];
-    int s0=2;
-    gen xmin(minus_inf),xmax(plus_inf);
-    bool default_interval=true;
-    if (x.is_symb_of_sommet(at_equal)){
-      gen g=x._SYMBptr->feuille;
-      if (g.type!=_VECT || g._VECTptr->size()!=2)
-	return gensizeerr(contextptr);
-      x=g._VECTptr->front();
-      g=g._VECTptr->back();
-      if (g.is_symb_of_sommet(at_interval)){
-	xmin=g._SYMBptr->feuille[0];
-	xmax=g._SYMBptr->feuille[1];
-	default_interval=(xmin==minus_inf && xmax==plus_inf);
-      }
-    }
-    else {
-      if (s>=4){
-	xmin=v[2];
-	xmax=v[3];
-	default_interval=(xmin==minus_inf && xmax==plus_inf);
-	s0=4;
-      }
-      if (s==2 && x.type!=_IDNT)
-	return _tabvar(makevecteur(f,x),contextptr);
-    }
-    if (!when2sign(f,x,contextptr))
-      return gensizeerr("Bad when");
-    vecteur tvi,poi;
-    bool param=f.type==_VECT && f._VECTptr->size()==2;
-    int periodic=0;
-    if (param)
-      periodic=step_param(f._VECTptr->front(),f._VECTptr->back(),x,xmin,xmax,poi,tvi,false,exactlegende,contextptr);
-    else {
-      gen periode; vecteur asym,parab,crit,inflex;
-      periodic=step_func(f,x,xmin,xmax,poi,tvi,periode,asym,parab,crit,inflex,false,exactlegende,contextptr,do_inflex_tabsign);
-    }
-    // round floats in tvi
-    for (int i=0;i<int(tvi.size());++i){
-      gen tmp=tvi[i];
-      if (tmp.type==_VECT){
-	vecteur v=*tmp._VECTptr;
-	for (int j=0;j<int(v.size());++j){
-	  if (v[j].type==_DOUBLE_)
-	    v[j]=_round(makesequence(v[j],3),contextptr);
-	}
-	tvi[i]=gen(v,tmp.subtype);
-      }
-    }
-    if (periodic==0)
-      return undef;
-    if (return_tabvar)
-      return tvi;
-    if (return_equation)
-      return _equation(poi,contextptr);
-    if (return_coordonnees)
-      return _coordonnees(poi,contextptr);
-    gen scale=(gnuplot_xmax-gnuplot_xmin)/5.0;
-    gen m=xmin,M=xmax;
-    if (is_inf(m))
-      m=gnuplot_xmin;
-    if (is_inf(M))
-      M=gnuplot_xmax;
-    if (m!=M)
-      scale=(M-m)/3.0;
-    if (xmin!=xmax && (periodic==2 || !default_interval) ){
-      m=m-0.009*scale; M=M+0.01*scale;
-    }
-    else {
-      m=m-0.973456*scale; M=M+1.018546*scale;
-    }
-    x=symb_equal(x,symb_interval(m,M));
-    vecteur w=makevecteur(f,x);
-    for (;s0<s;++s0){
-      w.push_back(v[s0]);
-    }
-    gen p;
-    if (param)
-      p=paramplotparam(gen(w,_SEQ__VECT),false,contextptr);
-    else
-      p=funcplotfunc(gen(w,_SEQ__VECT),false,contextptr);
-    if (plot){
-      poi=mergevecteur(poi,gen2vecteur(p));
-      if (plot==2)
-	return gen(poi,_SEQ__VECT);
-      if (plot==1)
-	return tvi; // gprintf("%gen",makevecteur(gen(poi,_SEQ__VECT)),1,contextptr);
-    }
-    if (abs_calc_mode(contextptr)!=38){
-      *logptr(contextptr) << (param?"plotparam(":"plotfunc(") << gen(w,_SEQ__VECT) << ')'
-#if defined HAVE_LIBFLTK && defined GIAC_LMCHANGES
-			  <<"\nInside Xcas you can see the function with Cfg>Show>DispG."
-#endif
-			  <<  '\n';
-    }
-    return tvi;
-  }
-  static const char _tabvar_s []="tabvar";
-  static define_unary_function_eval (__tabvar,&_tabvar,_tabvar_s);
-  define_unary_function_ptr5( at_tabvar ,alias_at_tabvar,&__tabvar,0,true);
-
-  gen _tabsign(const gen & g,GIAC_CONTEXT){
-    if ( g.type==_STRNG && g.subtype==-1) return  g;
-    vecteur v(gen2vecteur(g));
-    v.push_back(at_sign);
-    return _tabvar(gen(v,_SEQ__VECT),contextptr);
-  }
-  static const char _tabsign_s []="tabsign";
-  static define_unary_function_eval (__tabsign,&_tabsign,_tabsign_s);
-  define_unary_function_ptr5( at_tabsign ,alias_at_tabsign,&__tabsign,0,true);
-
-  gen _printf(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_VECT || args.subtype!=_SEQ__VECT){
-      int st=step_infolevel(contextptr);
-      step_infolevel(1,contextptr);
-      gprintf("%gen",vecteur(1,args),contextptr);
-      step_infolevel(st,contextptr);
-      return 1;
-    }
-    vecteur v=*args._VECTptr;
-    if (v.empty() || v.front().type!=_STRNG)
-      return 0;
-    string s=*v.front()._STRNGptr;
-    v.erase(v.begin());
-    int st=step_infolevel(contextptr);
-    step_infolevel(1,contextptr);
-    gprintf(s,v,contextptr);
-    step_infolevel(st,contextptr);
-    return 1;
-  }
-  static const char _printf_s []="printf";
-  static define_unary_function_eval (__printf,&_printf,_printf_s);
-  define_unary_function_ptr5( at_printf ,alias_at_printf,&__printf,0,true);
-
-  gen _sech(const gen & args,GIAC_CONTEXT){
-    return inv(cosh(args,contextptr),contextptr);
-  }
-  static const char _sech_s []="sech";
-  static define_unary_function_eval (__sech,&_sech,_sech_s);
-  define_unary_function_ptr5( at_sech ,alias_at_sech,&__sech,0,true);
-
-  gen _csch(const gen & args,GIAC_CONTEXT){
-    return inv(sinh(args,contextptr),contextptr);
-  }
-  static const char _csch_s []="csch";
-  static define_unary_function_eval (__csch,&_csch,_csch_s);
-  define_unary_function_ptr5( at_csch ,alias_at_csch,&__csch,0,true);
-
-  // ggb function for latitude of a 3-d point
-  // was ggbalt(x):=when(type(x)==DOM_IDENT,altsymb(x),when(x[0]=='pnt',when(is3dpoint(x),atan2(x[1][2],sqrt(x[1][0]^2+x[1][1]^2)),0),?))
-  gen _ggbalt(const gen & args,GIAC_CONTEXT){
-    if (args.type==_IDNT)
-      return symbolic(at_ggbalt,args);
-    if (args.is_symb_of_sommet(at_pnt)){
-      gen x=remove_at_pnt(args);
-      if (x.type==_VECT && x.subtype==_POINT__VECT && x._VECTptr->size()==3 ){
-	vecteur v=*x._VECTptr;
-	return arg(sqrt(pow(v[0],2,contextptr)+pow(v[1],2,contextptr),contextptr)+cst_i*v[2],contextptr);
-      }
-      if (args.type==_SYMB && equalposcomp(not_point_sommets,args._SYMBptr->sommet))
-	return undef;
-      return 0;
-    }
-    return undef;
-  }
-  static const char _ggbalt_s []="ggbalt";
-  static define_unary_function_eval (__ggbalt,&_ggbalt,_ggbalt_s);
-  define_unary_function_ptr5( at_ggbalt ,alias_at_ggbalt,&__ggbalt,0,true);
-
-  // ggbsort(x):=when(length(x)==0,{},when(type(x[0])==DOM_LIST,x,sort(x)))
-  gen _ggbsort(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_VECT || args._VECTptr->empty() || args._VECTptr->front().type==_VECT) return args;
-    return _sort(args,contextptr);
-  }
-  static const char _ggbsort_s []="ggbsort";
-  static define_unary_function_eval (__ggbsort,&_ggbsort,_ggbsort_s);
-  define_unary_function_ptr5( at_ggbsort ,alias_at_ggbsort,&__ggbsort,0,true);
-
-  int charx2int(char c){
-    if (c>='0' && c<='9') return c-'0';
-    if (c>='a' && c<='z') return c-'a'+10;
-    if (c>='A' && c<='Z') return c-'A'+10;
-    return -1;
-  }
-
-  string html_filter(const string & s){
-    int ss=s.size();
-    string res;
-    bool semi=false;
-    for (int i=0;i<ss;++i){
-      char c=s[i];
-      if (i<ss-2 && c=='%'){
-	c = char(charx2int(s[i+1])*16+charx2int(s[i+2]));
-	i += 2;
-      }
-      if (c==';') 
-	semi=true;
-      else {
-	if (c!=' ' && c!='\n')
-	  semi=false;
-      }
-      res += c;
-    }
-    if (!semi)
-      res += ';';
-    return res;
-  }
-
-  // translate HTML Xcas for Firefox link to a giac list of commands
-  string link2giac(const string & s,GIAC_CONTEXT){
-    string res;
-    // find # position, then create normal line for +, slider for *
-    int pos=s.find('#'),L=s.size();
-    if (pos>0 && pos<L){
-      bool finished=false;
-      while (!finished){
-	int nextpos=s.find('&',pos+1);
-	if (nextpos > L){
-	  nextpos=L;
-	  finished=true;
-	}
-	if (nextpos<pos+2)
-	  break;
-	string txt=s.substr(pos+2,nextpos-pos-2);
-	txt=html_filter(txt);
-	if (s[pos+1]=='*'){
-	  gen g(txt,contextptr);
-	  if (g.type==_VECT && g._VECTptr->size()>=5){
-	    txt="assume("+g[0].print(contextptr)+"=["+g[1].print(contextptr)+","+g[2].print(contextptr)+","+g[3].print(contextptr)+","+g[4].print(contextptr)+"])";
-	  }
-	}
-	res += txt;
-	pos=nextpos;
-      }
-    }
-    return res;
-  }
-
-  gen _link2giac(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_STRNG)
-      return gensizeerr(contextptr);
-    return string2gen(link2giac(*args._STRNGptr,contextptr),false);
-  }
-  static const char _link2giac_s []="link2giac";
-  static define_unary_function_eval (__link2giac,&_link2giac,_link2giac_s);
-  define_unary_function_ptr5( at_link2giac ,alias_at_link2giac,&__link2giac,0,true);
-
-  gen _range(const gen & args,GIAC_CONTEXT){
-    gen g(args);
-    if (is_integral(g) && g.type==_INT_ && g.val>=0){
-      int n=g.val;
-      vecteur v(n);
-      for (int i=0;i<n;++i)
-	v[i]=i;
-      return v;
-    }
-    if (g.type==_VECT && g._VECTptr->size()>=2){
-      gen a=g._VECTptr->front(),b=(*g._VECTptr)[1],c=1;
-      if (g._VECTptr->size()==3)
-	c=g._VECTptr->back();
-      if (is_integral(a) && is_integral(b) && is_integral(c)){
-	int A=a.val,B=b.val,C=c.val;
-	if ( (A<=B && C>0) || (A>=B && C<0)){
-	  int s=std::ceil(double(B-A)/C);
-	  vecteur w(s);
-	  for (int i=0;i<s;++i)
-	    w[i]=A+i*C;
-	  return w;
-	}
-      }
-      a=evalf_double(a,1,contextptr);
-      b=evalf_double(b,1,contextptr);
-      c=evalf_double(c,1,contextptr);
-      if (a.type==_DOUBLE_ && b.type==_DOUBLE_ && c.type==_DOUBLE_){
-	double A=a._DOUBLE_val,B=b._DOUBLE_val,C=c._DOUBLE_val;
-	if ( (A<=B && C>0) || (A>=B && C<0)){
-	  int s=std::ceil((B-A)/C);
-	  vecteur w(s);
-	  for (int i=0;i<s;++i)
-	    w[i]=A+i*C;
-	  return w;
-	}
-      }
-    }
-    return gensizeerr(contextptr);
-  }
-  static const char _range_s []="range";
-  static define_unary_function_eval (__giac_range,&_range,_range_s);
-  define_unary_function_ptr5( at_range ,alias_at_range,&__giac_range,0,true);
-
-  string strip(const string & s,const string &chars){
-    int ss=int(s.size()),cs=int(chars.size()),i,j;
-    for (i=0;i<ss;++i){
-      int pos=chars.find(s[i]);
-      if (pos<0 || pos>=cs)
-	break;
-    }
-    for (j=ss-1;j>=i;--j){
-      int pos=chars.find(s[j]);
-      if (pos<0 || pos>=cs)
-	break;
-    }
-    return s.substr(i,j-i+1);
-  }
-  
-  gen _strip(const gen & args,GIAC_CONTEXT){
-    if (args.type==_STRNG)
-      return string2gen(strip(*args._STRNGptr," "),false);
-    if (args.type==_VECT && args._VECTptr->size()==2 && args._VECTptr->front().type==_STRNG && args._VECTptr->back().type==_STRNG)
-      return string2gen(strip(*args._VECTptr->front()._STRNGptr,*args._VECTptr->back()._STRNGptr),false);
-    return gensizeerr(contextptr);
-  }
-  static const char _strip_s []="strip";
-  static define_unary_function_eval (__strip,&_strip,_strip_s);
-  define_unary_function_ptr5( at_strip ,alias_at_strip,&__strip,0,true);
-
-  gen _lower(const gen & args,GIAC_CONTEXT){
-    if (ckmatrix(args)){
-      vecteur res(*args._VECTptr);
-      int l=int(res.size());
-      for (int i=0;i<l;++i){
-	vecteur ligne=*res[i]._VECTptr;
-	int c=int(ligne.size());
-	for (int j=i+1;j<c;++j)
-	  ligne[j]=0;
-	res[i]=ligne;
-      }
-      return gen(res,_MATRIX__VECT);
-    }
-    if (args.type!=_STRNG)
-      return gensizeerr(contextptr);
-    string s(*args._STRNGptr);
-    int ss=s.size();
-    for (int i=0;i<ss;++i)
-      s[i]=tolower(s[i]);
-    return string2gen(s,false);
-  }
-  static const char _lower_s []="lower";
-  static define_unary_function_eval (__lower,&_lower,_lower_s);
-  define_unary_function_ptr5( at_lower ,alias_at_lower,&__lower,0,true);
-
-  gen _upper(const gen & args,GIAC_CONTEXT){
-    if (ckmatrix(args)){
-      vecteur res(*args._VECTptr);
-      int l=int(res.size());
-      for (int i=0;i<l;++i){
-	vecteur ligne=*res[i]._VECTptr;
-	int c=int(ligne.size());
-	for (int j=0;j<i;++j)
-	  ligne[j]=0;
-	res[i]=ligne;
-      }
-      return gen(res,_MATRIX__VECT);
-    }
-    if (args.type!=_STRNG)
-      return gensizeerr(contextptr);
-    string s(*args._STRNGptr);
-    int ss=s.size();
-    for (int i=0;i<ss;++i)
-      s[i]=toupper(s[i]);
-    return string2gen(s,false);
-  }
-  static const char _upper_s []="upper";
-  static define_unary_function_eval (__upper,&_upper,_upper_s);
-  define_unary_function_ptr5( at_upper ,alias_at_upper,&__upper,0,true);
-
-  gen _isinf(const gen & a,GIAC_CONTEXT){
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    return change_subtype(is_inf(a),_INT_BOOLEAN);
-  }
-  static const char _isinf_s []="isinf";
-  static define_unary_function_eval (__isinf,&_isinf,_isinf_s);
-  define_unary_function_ptr5( at_isinf ,alias_at_isinf,&__isinf,0,true);
-
-  gen _isnan(const gen & a,GIAC_CONTEXT){
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    return change_subtype(is_undef(a),_INT_BOOLEAN);
-  }
-  static const char _isnan_s []="isnan";
-  static define_unary_function_eval (__isnan,&_isnan,_isnan_s);
-  define_unary_function_ptr5( at_isnan ,alias_at_isnan,&__isnan,0,true);
-
-  gen _isfinite(const gen & a,GIAC_CONTEXT){
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    return change_subtype(!is_inf(a) && !is_undef(a),_INT_BOOLEAN);
-  }
-  static const char _isfinite_s []="isfinite";
-  static define_unary_function_eval (__isfinite,&_isfinite,_isfinite_s);
-  define_unary_function_ptr5( at_isfinite ,alias_at_isfinite,&__isfinite,0,true);
-
-  gen _is_matrix(const gen & a,GIAC_CONTEXT){
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    return change_subtype(ckmatrix(a),_INT_BOOLEAN);
-  }
-  static const char _is_matrix_s []="is_matrix";
-  static define_unary_function_eval (__is_matrix,&_is_matrix,_is_matrix_s);
-  define_unary_function_ptr5( at_is_matrix ,alias_at_is_matrix,&__is_matrix,0,true);
-
-  // Python compat convert to list
-  gen _python_list(const gen & a,GIAC_CONTEXT){
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type==_VECT) return a;
-    if (a.type==_STRNG){
-      const string & as=*a._STRNGptr;
-      unsigned ass=as.size();
-      vecteur res(ass);
-      for (unsigned i=0;i<ass;++i)
-	res[i]=string2gen(string(1,as[i]),false);
-      return res;
-    }
-    return _convert(makesequence(a,change_subtype(_MAPLE_LIST,_INT_MAPLECONVERSION)),contextptr);
-  }
-  static const char _python_list_s []="python_list";
-  static define_unary_function_eval (__python_list,&_python_list,_python_list_s);
-  define_unary_function_ptr5( at_python_list ,alias_at_python_list,&__python_list,0,true);
-
-  bool freeze=false;
-  void console_freeze(){
-    giac::freeze=true;
-  }
-
-  int rgb565to888(int c){
-    c &= 0xffff;
-    int r=(c>>11)&0x1f,g=(c>>5)&0x3f,b=c&0x1f;
-    return (r<<19)|(g<<10)|(b<<3);
-  }
-
-  inline int rgb(const gen & g,GIAC_CONTEXT){
-    return g.type==_INT_?g.val:_rgb(g,contextptr).val;
-  }
-  gen remove_at_display(const gen &g,GIAC_CONTEXT){
-    if (g.is_symb_of_sommet(at_equal)){
-      const gen & f=g._SYMBptr->feuille;
-      if (f.type==_VECT && f._VECTptr->size()==2 && f._VECTptr->front()==at_display)
-	return rgb(f._VECTptr->back(),contextptr);
-    }
-    return rgb(g,contextptr);
-  }
-
-#if !defined KHICAS && !defined GIAC_HAS_STO_38
-void sync_screen(){}
-#endif
-
-  gen _set_pixel(const gen & a_,GIAC_CONTEXT){
-    freeze=true;
-    gen a(a_);
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type==_VECT && a._VECTptr->empty()){
-#ifdef KHICAS
-      sync_screen();
-#else 
-      cleanup_pixel_v();
-#endif
-      // cleanup_pixels(history_plot(contextptr));
-      // should also cleanup_pixels Xcas_DispG->plot_instructions
-      return 1;
-    }
-    if (a.type==_INT_)
-      a=evalf_double(a,1,contextptr);
-    if (a.type==_DOUBLE_){
-      // display getKey window and pause
-#ifdef KHICAS
-      sync_screen();
-      usleep(a._DOUBLE_val);
-#else 
-#ifdef GIAC_HAS_STO_38
-      wait_1ms(a._DOUBLE_val/1000);
-#else
-      cleanup_pixel_v();
-      return __getKey.op(a,contextptr);
-#endif
-#endif
-    }
-#if defined GIAC_HAS_STO_38 || defined KHICAS
-    if (a.type!=_VECT || a._VECTptr->size()<2)
-      return gentypeerr(contextptr);
-    const vecteur & v=*a._VECTptr;
-    size_t vs=v.size();
-    if (vs>=2){
-      gen x=v.front();
-      gen y=v[1];
-      if (x.type==_DOUBLE_)
-	x=int(x._DOUBLE_val+.5);
-      if (y.type==_DOUBLE_)
-	y=int(y._DOUBLE_val+.5);
-      if (x.type==_INT_ &&  y.type==_INT_ ){
-#ifdef KHICAS
-	os_set_pixel(x.val,y.val,vs==2?0:remove_at_display(v[2],contextptr).val);
-#else
-	aspen_set_pixel(x.val,y.val,vs==2?0:remove_at_display(v[2],contextptr).val);
-#endif // KHICAS
-	return 1;
-      }
-    }
-    return gensizeerr(contextptr);
-    //static gen PIXEL(identificateur("PIXON_P"));
-    //return _of(makesequence(PIXEL,a_),contextptr);
-#else // HP && KHICAS
-    if (a.type==_VECT && a._VECTptr->empty())
-      return get_pixel_v();
-    if (is_integral(a)){
-      pixel_v_clear();
-      if (a==0) a=vecteur(0);
-      return _pixon(a,contextptr);
-    }
-    else {
-      vecteur v=*a._VECTptr;
-      if (v.size()==3)
-	v[2]=remove_at_display(v[2],contextptr);
-      if (a.type!=_VECT || a._VECTptr->size()<2 || !is_integer_vecteur(v))
-	return 0;
-      gen b(v,_SEQ__VECT);
-      pixel_v_push_back(_pixon(b,contextptr));
-      size_t vs=v.size();
-      if (vs>=2){
-	const gen & x=v.front();
-	const gen & y=v[1];
-	if (x.type==_INT_ && x.val>=0 && x.val < pixel_cols && y.type==_INT_ && y.val>=0 && y.val<pixel_lines){
-	  pixel_buffer[y.val][x.val]=vs==2?int(FL_BLACK):v[2].val;
-	}
-      }
-    }
-    return 1;
-#endif // else HP && KHICAS
-  }
-#ifdef KHICAS
-  void set_pixel(int x,int y,int c,GIAC_CONTEXT){
-    os_set_pixel(x,y,c);
-  }
-  void set_pixel(double x,double y,int c,GIAC_CONTEXT){
-    os_set_pixel(int(x+.5),int(y+.5),c);
-  }
-#else  
-  void set_pixel(int x,int y,int c,GIAC_CONTEXT){
-    _set_pixel(makesequence(x,y,c),contextptr);
-  }
-  void set_pixel(int x,int y,int c){
-    _set_pixel(makesequence(x,y,c),context0);
-  }
-  void set_pixel(double x,double y,int c,GIAC_CONTEXT){
-    _set_pixel(makesequence(int(x+.5),int(y+.5),c),contextptr);
-  }
-#endif
-  static const char _set_pixel_s []="set_pixel";
-  static define_unary_function_eval (__set_pixel,&_set_pixel,_set_pixel_s);
-  define_unary_function_ptr5( at_set_pixel ,alias_at_set_pixel,&__set_pixel,0,true);
-
-  int screen_w=320,screen_h=240;
-  gen _set_screen(const gen & g,GIAC_CONTEXT){
-    if (g.type!=_VECT)
-      return gensizeerr(contextptr);
-    if (g._VECTptr->empty())
-      return makevecteur(screen_w,screen_h);
-    if (g._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    gen w=g._VECTptr->front(),h=g._VECTptr->back();
-    if (!is_integral(w) || !is_integral(h))
-      return gensizeerr(contextptr);
-    screen_w=giacmax(1,w.val);
-    screen_h=giacmax(1,h.val);
-    return 1;
-  }
-  static const char _set_screen_s []="set_screen";
-  static define_unary_function_eval (__set_screen,&_set_screen,_set_screen_s);
-  define_unary_function_ptr5( at_set_screen ,alias_at_set_screen,&__set_screen,0,true);
-
-  static const char _draw_pixel_s []="draw_pixel";
-  static define_unary_function_eval (__draw_pixel,&_set_pixel,_draw_pixel_s);
-  define_unary_function_ptr5( at_draw_pixel ,alias_at_draw_pixel,&__draw_pixel,0,true);
-
-  //Uses the Bresenham line algorithm 
-  void draw_line(int x1, int y1, int x2, int y2, int color,GIAC_CONTEXT) {
-    int w =(color & 0x00070000) >> 16;
-    ++w;
-    int type_line =(color & 0x01c00000) >> 22,mask=0xffff; // 3 bits
-    switch (type_line){
-    case 1:
-      mask=0xff00;
-      break;
-    case 2:
-      mask=0xf0f0;
-      break;
-    case 3:
-      mask=0xcccc;
-      break;
-    case 4:
-      mask=0xaaaa;
-      break;
-    case 5:
-      mask=0xfff0;
-      break;
-    case 6:
-      mask=0xf000;
-      break;
-    case 7:
-      mask=0xc0c0;
-      break;
-    }
-    color &= 0xffff;
-    signed char ix; 
-    signed char iy; 
-    
-    // if x1 == x2 or y1 == y2, then it does not matter what we set here 
-    int delta_x = (x2 > x1?(ix = 1, x2 - x1):(ix = -1, x1 - x2)) << 1; 
-    int delta_y = (y2 > y1?(iy = 1, y2 - y1):(iy = -1, y1 - y2)) << 1; 
-    int count=0;
-    set_pixel(x1, y1, color,contextptr);  
-    if (delta_x >= delta_y) { 
-      int error = delta_y - (delta_x >> 1);        // error may go below zero 
-      while (x1 != x2) { 
-	if (error >= 0) { 
-	  if (error || (ix > 0)) { 
-	    y1 += iy; 
-	    error -= delta_x; 
-	  }                           // else do nothing 
-	}                              // else do nothing 
-	x1 += ix; 
-	error += delta_y;
-	++count;
-	if (mask & (1 << (count%16)) ){
-#if 1
-	  int y__=y1+(w+1)/2;
-	  for (int y_=y1-w/2;y_<y__;++y_)
-	    set_pixel(x1, y_, color,contextptr);
-#else
-	  set_pixel(x1, y1, color,contextptr);
-#endif
-	}
-      } 
-    } else { 
-      int error = delta_x - (delta_y >> 1);      // error may go below zero 
-      while (y1 != y2) { 
-	if (error >= 0) { 
-	  if (error || (iy > 0)) { 
-	    x1 += ix; 
-	    error -= delta_y; 
-	  }                           // else do nothing 
-	}                              // else do nothing 
-	y1 += iy; 
-	error += delta_x;
-	++count;
-	if (mask & (1 << (count%16)) ){
-#if 1
-	  int x__=x1+(w+1)/2;
-	  for (int x_=x1-w/2;x_<x__;++x_)
-	    set_pixel(x_, y1, color,contextptr);
-#else
-	  set_pixel(x1, y1, color,contextptr);
-#endif
-	}
-      } 
-    }
-  }
-
-  int asc_sort_int(const void * vptr,const void *wptr){
-    const vector<int> * v=(const vector<int> * )vptr;
-    const vector<int> * w=(const vector<int> * )wptr;
-    for (size_t i=0;i<v->size();++i){
-      int vi=(*v)[i];
-      int wi=(*w)[i];
-      if (vi!=wi)
-	return vi<wi?-1:1;
-    }
-    return 0;
-  }
-
-  int asc_sort_double(const void * vptr,const void *wptr){
-    const vector<double> * v=(const vector<double> * )vptr;
-    const vector<double> * w=(const vector<double> * )wptr;
-    for (size_t i=0;i<v->size();++i){
-      double vi=(*v)[i];
-      double wi=(*w)[i];
-      if (abs(vi-wi)>1e-6*abs(wi))
-	return vi<wi?-1:1;
-    }
-    return 0;
-  }
-
-  // L might be modified by closing the polygon
-  void draw_filled_polygon(vector< vector<int> > &L,int xmin,int xmax,int ymin,int ymax,int color,GIAC_CONTEXT){
-    int n=L.size();
-    // close polygon if it is open
-    if (!(L[n-1]==L[0]))
-      L.push_back(L[0]);
-    else
-      n--;
-    // ordered list of ymin,x,index (ordered by ascending ymin)
-    vector< vector<int> > om(n,vector<int>(4)); // size==12K for n==384 
-    for (int j=0;j<n;j++){
-      int y0=L[j][1],y1=L[j+1][1];
-      om[j][0]=y0<y1?y0:y1;
-      om[j][1]=y0<y1?L[j][0]:L[j+1][0];
-      om[j][2]=j;
-      om[j][3]=y0<y1?j:(j==n-1?0:j+1);
-    }
-    qsort(&om.front(),om.size(),sizeof(vector<int>),asc_sort_int);
-    // reverse(om.begin(),om.end());
-    vector<double> p(n); // inverses of slopes
-    for (int j=0;j<n;j++){
-      double dx=L[j+1][0]-L[j][0];
-      double dy=L[j+1][1]-L[j][1];
-      p[j]=dy==0?(dx>0?1e300:-1e300):dx/dy;
-    }
-    // initialization, lowest horizontal that is crossing the polygon
-    // y at ymin-1, that way lxj is initialized in the loop
-    int y=om[0][0]-1,j,ompos=0;
-    vector< vector<double> > lxj; // size about 12K for n==384
-    // main loop
-    for (;y<ymax;){
-      if (y>=ymin){ // draw pixels for this horizontal frame
-	size_t lxjs=lxj.size();
-	qsort(&lxj.front(),lxjs,sizeof(vector<double>),asc_sort_double);
-	bool odd=false;
-	vector<char> impair(lxjs);
-	for (size_t k=0;k<lxjs;++k){
-	  int arete=lxj[k][1]; // edge L[arete]->L[arete+1]
-	  int y1=L[arete][1],y2=L[arete+1][1];
-	  if (y!=y1 && y!=y2)
-	    odd=!odd;
-	  else {
-	    int ym=giacmin(y1,y2);
-	    if ( y1!=y2 && (ym==y || ym==y)){
-	      odd=!odd;
-	    }
-	  }
-	  impair[k]=odd;
-	}
-	for (size_t k=0;k<lxjs;++k){
-	  if (impair[k]){
-	    int x1=giacmax(xmin,int(lxj[k][0]+.5));
-	    int x2=k==lxjs-1?xmax:giacmin(xmax,int(lxj[k+1][0]+.5));
-	    for (;x1<=x2;++x1)
-	      set_pixel(x1,y,color,contextptr);
-	  }
-	}
-      } // end if y>=ymin
-      y++;
-      if (y>=ymax) break;
-      // update lxj
-      for (j=0;j<lxj.size();++j){
-	int k=lxj[j][1];
-	if (y<=giacmax(L[k][1],L[k+1][1]))
-	  lxj[j][0] += p[k];
-	else {
-	  lxj.erase(lxj.begin()+j);
-	  --j;
-	}
-      }
-      // new edges
-      for (j=ompos;j<n;++j){
-	ompos=j;
-	if (om[j][0]>y)
-	  break;
-	if (om[j][0]<y)
-	  continue;
-	vector<double> add(2,om[j][1]);
-	add[1]=om[j][2];
-	lxj.push_back(add);
-      }
-    } // end for (;y<ymax;)
-  }
-
-  void draw_polygon(vector< vector<int> > & v1,int color,GIAC_CONTEXT){
-    if (!(v1.back()==v1.front()))
-      v1.push_back(v1.front());
-    int n=v1.size()-1;
-    for (int i=0;i<n;++i){
-      int x1=v1[i][0],y1=v1[i][1],x2=v1[i+1][0],y2=v1[i+1][1];
-      draw_line(x1,y1,x2,y2,color,contextptr);
-    }
-  }
-  
-  gen _draw_polygon(const gen & a,GIAC_CONTEXT){
-    freeze=true;
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type!=_VECT || a._VECTptr->size()<2)
-      return gentypeerr(contextptr);
-    const vecteur & v=*a._VECTptr;
-    vector< vector<int> > v1;
-    if (ckmatrix(v) && v.front()._VECTptr->size()==2){
-      if (!vecteur2vectvector_int(v,0,v1))
-	return gensizeerr(contextptr);
-      draw_polygon(v1,0,contextptr);
-      return 1;
-    }
-    gen g(v[0]);
-    if (!ckmatrix(g) || g._VECTptr->front()._VECTptr->size()!=2 || !vecteur2vectvector_int(*g._VECTptr,0,v1))
-      return gensizeerr(contextptr);
-    int attr=remove_at_display(v.back(),contextptr).val;
-    if (attr & 0x40000000)
-      draw_filled_polygon(v1,0,1024,0,768,attr & 0xffff,contextptr);
-    else
-      draw_polygon(v1,attr & 0xffff,contextptr);
-    return 1;
-  }
-  static const char _draw_polygon_s []="draw_polygon";
-  static define_unary_function_eval (__draw_polygon,&_draw_polygon,_draw_polygon_s);
-  define_unary_function_ptr5( at_draw_polygon ,alias_at_draw_polygon,&__draw_polygon,0,true);
-
-  void draw_rectangle(int x, int y, int width, int height, unsigned short color,GIAC_CONTEXT){
-    if (x<0){ width+=x; x=0;}
-    if (y<0){ height+=y; y=0;}
-    if (width<0 || height<0) return;
-#ifdef KHICAS
-    os_fill_rect(x,y,width,height,color);
-#else
-    for (int j=0;j<=height;++j){
-      for (int i=0;i<width;++i)
-	set_pixel(x+i,y+j,color,contextptr);
-    }
-#endif
-  }
-
-  void draw_circle(int xc,int yc,int r,int color,bool q1,bool q2,bool q3,bool q4,GIAC_CONTEXT){
-    int x=0,y=r,delta=0;
-    while (x<=y){
-      if (q4){
-	set_pixel(xc+x,yc+y,color,contextptr);
-	set_pixel(xc+y,yc+x,color,contextptr);
-      }
-      if (q3){
-	set_pixel(xc-x,yc+y,color,contextptr);
-	set_pixel(xc-y,yc+x,color,contextptr);
-      }
-      if (q1){
-	set_pixel(xc+x,yc-y,color,contextptr);
-	set_pixel(xc+y,yc-x,color,contextptr);
-      }
-      if (q2){
-	set_pixel(xc-x,yc-y,color,contextptr);
-	set_pixel(xc-y,yc-x,color,contextptr);
-      }
-      ++x;
-      if (delta<0){
-	delta += 2*y+1;
-	--y;
-      }
-      delta += 1-2*x;
-    }
-  }
-
-  void draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment,GIAC_CONTEXT){
-    // approximation by a filled polygon
-    // points: (x,y), (x+rx*cos(theta)/2,y+ry*sin(theta)/2) theta=theta1..theta2
-    while (theta2_deg<theta1_deg)
-      theta2_deg+=360;
-    if (theta2_deg-theta1_deg>=360){
-      theta1_deg=0;
-      theta2_deg=360;
-    }
-    int N0=theta2_deg-theta1_deg+1;
-    // reduce N if rx or ry is small
-    double red=double(rx)/1024*double(ry)/768;
-    if (red>1) red=1;
-    if (red<0.1) red=0.1;
-    int N=red*N0;
-    if (N<5)
-      N=N0>5?5:N0;
-    if (N<2)
-      N=2;
-    vector< vector<int> > v(segment?N+1:N+2,vector<int>(2));
-    int i=0;
-    if (!segment){
-      v[0][0]=x;
-      v[0][1]=y;
-      ++i;
-    }
-    double theta=theta1_deg*M_PI/180;
-    double thetastep=(theta2_deg-theta1_deg)*M_PI/(180*(N-1));
-    for (;i<v.size()-1;++i){
-      v[i][0]=int(x+rx*std::cos(theta)+.5);
-      v[i][1]=int(y-ry*std::sin(theta)+.5); // y is inverted
-      theta += thetastep;
-    }
-    v.back()=v.front();
-    draw_filled_polygon(v,xmin,xmax,ymin,ymax,color,contextptr);
-  }    
-
-
-  // arc of ellipse, for y/x in [t1,t2] and in quadrant 1, 2, 3, 4
-  // y must be replaced by -y 
-  void draw_arc(int xc,int yc,int rx,int ry,int color,double t1, double t2,bool q1,bool q2,bool q3,bool q4,GIAC_CONTEXT){
-    double x=0,y=rx,delta=0;
-    double ryx=double(ry)/rx;
-    // *logptr(contextptr) << "t1,t2:" << t1 << "," << t2 << ",q1234" << q1 << "," << q2 << "," << q3 << "," << q4 << '\n';
-    while (x<=y){
-      double xeff=x*ryx,yeff=y*ryx;
-      if (q4){
-	if (y>=-x*t2 && y<=-x*t1) set_pixel(xc+x,yc+yeff,color,contextptr);
-	if (x>=-y*t2 && x<=-y*t1) set_pixel(xc+y,yc+xeff,color,contextptr);
-      }
-      if (q3){
-	if (y>=x*t1 && y<=x*t2) set_pixel(xc-x,yc+yeff,color,contextptr);
-	if (x>=y*t1 && x<=y*t2) set_pixel(xc-y,yc+xeff,color,contextptr);
-      }
-      if (q1){
-	if (y>=x*t1 && y<=x*t2) set_pixel(xc+x,yc-yeff,color,contextptr);
-	if (x>=y*t1 && x<=y*t2) set_pixel(xc+y,yc-xeff,color,contextptr);
-      }
-      if (q2){
-	if (y>=-x*t2 && y<=-x*t1) set_pixel(xc-x,yc-yeff,color,contextptr);
-	if (x>=-y*t2 && x<=-y*t1) set_pixel(xc-y,yc-xeff,color,contextptr);
-      }
-      ++x;
-      if (delta<0){
-	delta += 2*y+1;
-	--y;
-      }
-      delta += 1-2*x;
-    }
-  }
-  
-  void draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2,GIAC_CONTEXT){
-    if (theta2-theta1>=2*M_PI){
-      draw_arc(xc,yc,rx,ry,color,-1e307,1e307,true,true,true,true,contextptr);
-      return;
-    }
-    // at most one vertical in [theta1,theta2]
-    double t1=std::tan(theta1);
-    double t2=std::tan(theta2);
-    int n=int(std::floor(theta1/M_PI+.5));
-    // n%2==0 -pi/2<theta1<pi/2, n%2==1 pi/2<theta1<3*pi/2
-    double theta=(n+.5)*M_PI;
-    // if theta1 is almost pi/2 mod pi, t1 might be wrong because of rounding
-    if (std::fabs(theta1-(theta-M_PI))<1e-6 && t1>0) 
-	t1=-1e307;
-    //*logptr(contextptr) << "thetas:" << theta1 << "," << theta << "," << theta2 << ", n " << n << ", t:" << t1 << "," << t2 << '\n';
-    if (theta2>theta){
-      if (theta2>=theta+M_PI){
-	if (n%2==0){ // -pi/2<theta1<pi/2<3*pi/2<theta2
-	  draw_arc(xc,yc,rx,ry,color,t1,1e307,true,false,false,false,contextptr);
-	  draw_arc(xc,yc,rx,ry,color,-1e307,1e307,false,true,true,false,contextptr);	  
-	  draw_arc(xc,yc,rx,ry,color,-1e307,t2,false,false,false,true,contextptr);
-	}
-	else { // -3*pi/2<theta1<-pi/2<pi/2<theta2
-	  draw_arc(xc,yc,rx,ry,color,t1,1e307,false,false,true,false,contextptr);
-	  draw_arc(xc,yc,rx,ry,color,-1e307,1e307,true,false,false,true,contextptr);
-	  draw_arc(xc,yc,rx,ry,color,-1e307,t2,false,true,false,false,contextptr);
-	}
-	return;
-      }
-      if (n%2==0){ // -pi/2<theta1<pi/2<theta2<3*pi/2
-	draw_arc(xc,yc,rx,ry,color,t1,1e307,true,false,false,false,contextptr);
-	draw_arc(xc,yc,rx,ry,color,-1e307,t2,false,true,false,false,contextptr);
-      }
-      else { // -3*pi/2<theta1<-pi/2<theta2<pi/2
-	draw_arc(xc,yc,rx,ry,color,t1,1e307,false,false,true,false,contextptr);
-	draw_arc(xc,yc,rx,ry,color,-1e307,t2,false,false,false,true,contextptr);
-      }
-      return;
-    }
-    if (n%2==0) { // -pi/2<theta1<theta2<pi/2
-      draw_arc(xc,yc,rx,ry,color,t1,t2,true,false,false,true,contextptr);	
-    }
-    else { // pi/2<theta1<theta2<3*pi/2
-      draw_arc(xc,yc,rx,ry,color,t1,t2,false,true,true,false,contextptr);	
-    }
-  }
-  
-  void draw_filled_circle(int xc,int yc,int r,int color,bool left,bool right,GIAC_CONTEXT){
-    int x=0,y=r,delta=0;
-    while (x<=y){
-      for (int Y=-y;Y<=y;Y++){
-	if (right)
-	  set_pixel(xc+x,yc+Y,color,contextptr);
-	if (left)
-	  set_pixel(xc-x,yc+Y,color,contextptr);
-      }
-      for (int Y=-x;Y<=x;Y++){
-	if (right)
-	  set_pixel(xc+y,yc+Y,color,contextptr);
-	if (left)
-	  set_pixel(xc-y,yc+Y,color,contextptr);
-      }
-      ++x;
-      if (delta<0){
-	delta += 2*y+1;
-	--y;
-      }
-      delta += 1-2*x;
-    }
-  }
-  
-  gen _draw_arc(const gen & a_,int arc,GIAC_CONTEXT){
-    freeze=true;
-    gen a(a_);
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type!=_VECT || a._VECTptr->size()<2)
-      return gentypeerr(contextptr);
-    const vecteur & v=*a._VECTptr;
-    size_t vs=v.size();
-    if ( (arc&1) && vs<6)
-      return gendimerr(contextptr);
-    if (vs>=3){
-      gen x0=v.front();
-      gen y0=v[1];
-      gen r=v[2];
-      if (x0.type==_DOUBLE_)
-	x0=int(x0._DOUBLE_val+.5);
-      if (y0.type==_DOUBLE_)
-	y0=int(y0._DOUBLE_val+.5);
-      if (r.type==_DOUBLE_)
-	r=int(r._DOUBLE_val+.5);
-      int attr=vs==( (arc&1) ?6:3)?0:remove_at_display(v.back(),contextptr).val;
-      if (x0.type==_INT_ &&  y0.type==_INT_ && r.type==_INT_){
-	if (arc & 1){
-	  gen ry=v[3];
-	  if (ry.type==_DOUBLE_)
-	    ry=int(ry._DOUBLE_val+.5);
-	  gen theta1=evalf_double(v[4],1,contextptr);
-	  gen theta2=evalf_double(v[5],1,contextptr);
-	  if ((arc &2) || (attr & 0x40000000))
-	    draw_filled_arc(x0.val,y0.val,r.val,ry.val,int(theta1._DOUBLE_val*180/M_PI+.5),int(theta2._DOUBLE_val*180/M_PI+.5),attr & 0xffff,0,pixel_cols,0,pixel_lines,false,contextptr);
-	  draw_arc(x0.val,y0.val,r.val,ry.val,attr & 0xffff,theta1._DOUBLE_val,theta2._DOUBLE_val,contextptr);
-	}
-	else {
-	  if ((arc&2) ||(attr & 0x40000000))
-	    draw_filled_circle(x0.val,y0.val,r.val,attr &0xffff,true,true,contextptr);
-	  else
-	    draw_circle(x0.val,y0.val,r.val,attr & 0xffff,true,true,true,true,contextptr);
-	}
-	return 1;
-      }
-    }
-    return gensizeerr(contextptr);
-    //static gen PIXEL(identificateur("PIXON_P"));
-    //return _of(makesequence(PIXEL,a_),contextptr);
-  }
-  gen _draw_circle(const gen & a_,GIAC_CONTEXT){
-    return _draw_arc(a_,0,contextptr);
-  }
-  static const char _draw_circle_s []="draw_circle";
-  static define_unary_function_eval (__draw_circle,&_draw_circle,_draw_circle_s);
-  define_unary_function_ptr5( at_draw_circle ,alias_at_draw_circle,&__draw_circle,0,true);
-
-  gen _draw_filled_circle(const gen & a_,GIAC_CONTEXT){
-    return _draw_arc(a_,2,contextptr);
-  }
-  static const char _draw_filled_circle_s []="draw_filled_circle";
-  static define_unary_function_eval (__draw_filled_circle,&_draw_filled_circle,_draw_filled_circle_s);
-  define_unary_function_ptr5( at_draw_filled_circle ,alias_at_draw_filled_circle,&__draw_filled_circle,0,true);
-
-  gen _draw_arc(const gen & a_,GIAC_CONTEXT){
-    return _draw_arc(a_,1,contextptr);
-  }
-  static const char _draw_arc_s []="draw_arc";
-  static define_unary_function_eval (__draw_arc,&_draw_arc,_draw_arc_s);
-  define_unary_function_ptr5( at_draw_arc ,alias_at_draw_arc,&__draw_arc,0,true);
-
-  gen _draw_filled_arc(const gen & a_,GIAC_CONTEXT){
-    return _draw_arc(a_,3,contextptr);
-  }
-  static const char _draw_filled_arc_s []="draw_filled_arc";
-  static define_unary_function_eval (__draw_filled_arc,&_draw_filled_arc,_draw_filled_arc_s);
-  define_unary_function_ptr5( at_draw_filled_arc ,alias_at_draw_filled_arc,&__draw_filled_arc,0,true);
-
-  gen draw_line_or_rectangle(const gen & a_,GIAC_CONTEXT,int rect){
-    gen a(a_);
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type!=_VECT || a._VECTptr->size()<2)
-      return gentypeerr(contextptr);
-    const vecteur & v=*a._VECTptr;
-    size_t vs=v.size();
-    if (vs>=4){
-      gen x0=v.front();
-      gen y0=v[1];
-      gen x1=v[2];
-      gen y1=v[3];
-      if (x0.type==_DOUBLE_)
-	x0=int(x0._DOUBLE_val+.5);
-      if (y0.type==_DOUBLE_)
-	y0=int(y0._DOUBLE_val+.5);
-      if (x1.type==_DOUBLE_)
-	x1=int(x1._DOUBLE_val+.5);
-      if (y1.type==_DOUBLE_)
-	y1=int(y1._DOUBLE_val+.5);
-      if (x0.type==_INT_ &&  y0.type==_INT_ && x1.type==_INT_ && y1.type==_INT_){
-	if (rect){
-	  int attr=vs==4?0:remove_at_display(v[4],contextptr).val;
-	  if (rect==2 || (attr & 0x40000000))
-	    draw_rectangle(x0.val,y0.val,x1.val,y1.val,attr & 0xffff,contextptr);
-	  else {
-	    draw_line(x0.val,y0.val,x0.val+x1.val,y0.val,attr & 0xffff,contextptr);
-	    draw_line(x0.val+x1.val,y0.val,x0.val+x1.val,y0.val+y1.val,attr & 0xffff,contextptr);
-	    draw_line(x0.val+x1.val,y0.val+y1.val,x0.val,y0.val+y1.val,attr & 0xffff,contextptr);
-	    draw_line(x0.val,y0.val,x0.val,y0.val+y1.val,attr & 0xffff,contextptr);
-	  }	    
-	}
-	else
-	  draw_line(x0.val,y0.val,x1.val,y1.val,vs==4?0:remove_at_display(v[4],contextptr).val,contextptr);
-	return 1;
-      }
-    }
-    return gensizeerr(contextptr);
-    //static gen PIXEL(identificateur("PIXON_P"));
-    //return _of(makesequence(PIXEL,a_),contextptr);
-  }
-  gen _draw_line(const gen & a_,GIAC_CONTEXT){
-    freeze=true;
-    return draw_line_or_rectangle(a_,contextptr,0);
-  }
-  static const char _draw_line_s []="draw_line";
-  static define_unary_function_eval (__draw_line,&_draw_line,_draw_line_s);
-  define_unary_function_ptr5( at_draw_line ,alias_at_draw_line,&__draw_line,0,true);
-
-  gen _draw_rectangle(const gen & a_,GIAC_CONTEXT){
-    freeze=true;
-    return draw_line_or_rectangle(a_,contextptr,1);
-  }
-  static const char _draw_rectangle_s []="draw_rectangle";
-  static define_unary_function_eval (__draw_rectangle,&_draw_rectangle,_draw_rectangle_s);
-  define_unary_function_ptr5( at_draw_rectangle ,alias_at_draw_rectangle,&__draw_rectangle,0,true);
-
-  gen _fill_rect(const gen & a_,GIAC_CONTEXT){
-    freeze=true;
-    return draw_line_or_rectangle(a_,contextptr,2);
-  }
-  static const char _fill_rect_s []="fill_rect";
-  static define_unary_function_eval (__fill_rect,&_fill_rect,_fill_rect_s);
-  define_unary_function_ptr5( at_fill_rect ,alias_at_fill_rect,&__fill_rect,0,true);
-
-  gen _draw_string(const gen & a_,GIAC_CONTEXT){
-    freeze=true;
-#ifdef GIAC_HAS_STO_38
-    static gen PIXEL(identificateur("TEXTOUT_P"));
-    return _of(makesequence(PIXEL,a_),contextptr);
-#else // HP
-    gen a(a_);
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type!=_VECT)
-      return gensizeerr(contextptr);
-    vecteur v(*a._VECTptr);
-    if (v.size()<3 || v.size()>5)
-      return gendimerr(contextptr);
-    if (v[2].type==_STRNG){
-      gen g=v[2];
-      v[2]=v[1];
-      v[1]=v[0];
-      v[0]=g;
-    }
-    if (v[0].type!=_STRNG || !is_integral(v[1]) || !is_integral(v[2]))
-      return gensizeerr(contextptr);
-    gen s=v[0];
-#ifdef KHICAS
-    os_draw_string(v[1].val,v[2].val,v.size()>3?remove_at_display(v[3],contextptr).val:_BLACK,v.size()>4?remove_at_display(v[4],contextptr).val:_WHITE,s._STRNGptr->c_str());
-    return 1;
-#else
-    v.erase(v.begin());
-    v.push_back(s);
-    pixel_v_push_back(_pixon(gen(v,_SEQ__VECT),contextptr));
-    return 1;
-#endif // KHICAS
-#endif // HP
-  }
-  static const char _draw_string_s []="draw_string";
-  static define_unary_function_eval (__draw_string,&_draw_string,_draw_string_s);
-  define_unary_function_ptr5( at_draw_string ,alias_at_draw_string,&__draw_string,0,true);
-
-  gen _get_pixel(const gen & a_,GIAC_CONTEXT){
-#ifdef GIAC_HAS_STO_38
-    static gen PIXEL(identificateur("GETPIX_P"));
-    return _of(makesequence(PIXEL,a_),contextptr);
-#else // GIAC_HAS_STO_38
-    gen a(a_);
-    if (a.type==_STRNG && a.subtype==-1) return  a;
-    if (a.type!=_VECT || a._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    gen x=a._VECTptr->front(),y=a._VECTptr->back();
-    if (x.type==_INT_ && x.val>=0 && x.val<pixel_cols && y.type==_INT_ && y.val>=0 && y.val<pixel_lines){
-#ifdef KHICAS
-      int c=os_get_pixel(x.val,y.val);
-#else      
-      int c=pixel_buffer[y.val][x.val];
-#endif
-      if (python_compat(contextptr)==2){
-	c &= 0xffff;
-	int r=(c>>11)&0x1f,g=(c>>5)&0x3f,b=c&0x1f;
-	return gen(makevecteur(r<<3,g<<2,b<<3),_TUPLE__VECT);
-      }
-      return c;
-    }
-#ifdef KHICAS
-    return undef;
-#else // KHICAS
-    const vecteur v= get_pixel_v();
-    for (size_t i=0;i<v.size();++i){
-      const gen & vi_=v[i];
-      const gen * vi=&vi_;
-      if (vi_.type==_SYMB && vi_._SYMBptr->sommet==at_pnt){
-	const gen & f=vi_._SYMBptr->feuille;
-	if (f.type==_VECT){
-	  const vecteur & w=*f._VECTptr;
-	  if (!w.empty())
-	    vi=&v.front();
-	}
-      }
-      if (vi->is_symb_of_sommet(at_pixon)){
-	const gen & f=vi->_SYMBptr->feuille;
-	if (f.type==_VECT){
-	  const vecteur & w=*f._VECTptr;
-	  int ws=w.size();
-	  if (ws>=2 && w.front()==x && w[1]==y){
-	    if (ws>=3) return w[2];
-	    return int(FL_BLACK);
-	  }
-	} 
-      }
-    }
-    return int(FL_WHITE);
-#endif // KHICAS
-#endif // GIAC_HAS_STO_38
-  }
-  static const char _get_pixel_s []="get_pixel";
-  static define_unary_function_eval (__get_pixel,&_get_pixel,_get_pixel_s);
-  define_unary_function_ptr5( at_get_pixel ,alias_at_get_pixel,&__get_pixel,0,true);
-
-  gen _dtype(const gen & args,GIAC_CONTEXT){
-    gen g(args);
-    while (g.type==_VECT && !g._VECTptr->empty())
-      g=g._VECTptr->front();
-    return change_subtype(g.type,_INT_TYPE);
-  }
-  static const char _dtype_s []="dtype";
-  static define_unary_function_eval (__dtype,&_dtype,_dtype_s);
-  define_unary_function_ptr5( at_dtype ,alias_at_dtype,&__dtype,0,true);
-
-  gen _rgb(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_VECT || args._VECTptr->size()<3)
-      return gensizeerr(contextptr);
-    const vecteur & v=*args._VECTptr;
-    gen a=v[0],b=v[1],c=v[2];
-    if (a.type==_DOUBLE_ || b.type==_DOUBLE_ || c.type==_DOUBLE_){
-      a=_floor(255*a+.5,contextptr);
-      b=_floor(255*b+.5,contextptr);
-      c=_floor(255*c+.5,contextptr);
-    }
-    if (a.type==_INT_ && b.type==_INT_ && c.type==_INT_ && a.val>=0 && b.val>=0 && c.val>=0 ){
-      int d=0,av=giacmin(a.val,255),bv=giacmin(b.val,255),cv=giacmin(c.val,255);
-      if (v.size()==4 && (v.back()==888 || v.back()==at_pixon || v.back()==at_set_pixel)){
-	d=(av<<16)|(bv<<8)|cv;
-	if (d>0 && d<512) 
-	  d += (1<<16);
-      }
-      else {
-	if (v.size()==4 && v.back()!=565)
-	  return gensizeerr(contextptr);
-	d=(((av*32)/256)<<11) | (((bv*64)/256)<<5) | ((cv*32)/256);
-	if (d>0 && d<512){
-	  d += (1<<11);
-	}
-      }
-      return d;
-    }
-    return gensizeerr(contextptr);
-  }
-  static const char _rgb_s []="rgb";
-  static define_unary_function_eval (__rgb,&_rgb,_rgb_s);
-  define_unary_function_ptr5( at_rgb ,alias_at_rgb,&__rgb,0,true);
-
-  gen prediction(const gen & args,int type,GIAC_CONTEXT){
-    if (args.type!=_VECT || args._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    const vecteur & v=*args._VECTptr;
-    gen p=v[0],n=v[1],b=inv(sqrt(n,contextptr),contextptr);
-    if (type==0 || type==2){
-      if (type==0 &&(is_strictly_greater(25,n,contextptr) || is_strictly_greater(.2,p,contextptr) || is_strictly_greater(p,.8,contextptr)))
-	return gensizeerr("Unable to predict");
-      return makevecteur(max(p-b,0,contextptr),min(p+b,1,contextptr));
-    }
-    if (type==1){
-      b=1.96*sqrt(p*(1-p),contextptr)*b;
-      if (is_strictly_greater(30,n,contextptr) || is_greater(5,n*p,contextptr) || is_greater(5,n*(1-p),contextptr))
-	return gensizeerr("Unable to predict");
-      return makevecteur(max(p-b,0,contextptr),min(p+b,1,contextptr));
-    }
-    return undef;
-  }
-  gen _prediction(const gen & args,GIAC_CONTEXT){
-    return prediction(args,0,contextptr);
-  }
-  static const char _prediction_s []="prediction";
-  static define_unary_function_eval (__prediction,&_prediction,_prediction_s);
-  define_unary_function_ptr5( at_prediction ,alias_at_prediction,&__prediction,0,true);
-
-  gen _confidence(const gen & args,GIAC_CONTEXT){
-    return prediction(args,2,contextptr);
-  }
-  static const char _confidence_s []="confidence";
-  static define_unary_function_eval (__confidence,&_confidence,_confidence_s);
-  define_unary_function_ptr5( at_confidence ,alias_at_confidence,&__confidence,0,true);
-
-  gen _prediction95(const gen & args,GIAC_CONTEXT){
-    return prediction(args,1,contextptr);
-  }
-  static const char _prediction95_s []="prediction95";
-  static define_unary_function_eval (__prediction95,&_prediction95,_prediction95_s);
-  define_unary_function_ptr5( at_prediction95 ,alias_at_prediction95,&__prediction95,0,true);
-
-  gen _log2(const gen & args,GIAC_CONTEXT){
-    return _logb(makesequence(args,2),contextptr);
-  }
-  static const char _log2_s []="log2";
-  static define_unary_function_eval (__log2,&_log2,_log2_s);
-  define_unary_function_ptr5( at_log2 ,alias_at_log2,&__log2,0,true);
-
-  gen _radians(const gen & args,GIAC_CONTEXT){
-    return M_PI/180*args;
-  }
-  static const char _radians_s []="radians";
-  static define_unary_function_eval (__radians,&_radians,_radians_s);
-  define_unary_function_ptr5( at_radians ,alias_at_radians,&__radians,0,true);
-
-  gen _degrees(const gen & args,GIAC_CONTEXT){
-    return 180/M_PI*args;
-  }
-  static const char _degrees_s []="degrees";
-  static define_unary_function_eval (__degrees,&_degrees,_degrees_s);
-  define_unary_function_ptr5( at_degrees ,alias_at_degrees,&__degrees,0,true);
-
-  gen _modf(const gen & args,GIAC_CONTEXT){
-    gen g=evalf_double(args,1,contextptr);
-    if (g.type!=_DOUBLE_)
-      return gensizeerr(contextptr);
-    double d=g._DOUBLE_val;
-    bool neg=d<0;
-    if (neg) d=-d;
-    double d1=std::floor(d),d2=d-d1;
-    if (neg){ d1=-d1; d2=-d2; }
-    return makesequence(d2,d1);
-  }
-  static const char _modf_s []="modf";
-  static define_unary_function_eval (__modf,&_modf,_modf_s);
-  define_unary_function_ptr5( at_modf ,alias_at_modf,&__modf,0,true);
-
-  gen _leafsize(const gen & g,GIAC_CONTEXT){
-    return int(taille(g,RAND_MAX));
-  }
-  static const char _leafsize_s []="leafsize";
-  static define_unary_function_eval (__leafsize,&_leafsize,_leafsize_s);
-  define_unary_function_ptr5( at_leafsize ,alias_at_leafsize,&__leafsize,0,true);
-  
-#if defined HAVE_UNISTD_H && !defined NUMWORKS
-  void locate_files(const char * dirname,const char * ext_,vector<string> & v,bool recurse,GIAC_CONTEXT){
-    DIR *dp;
-    struct dirent *ep;
-    string ext(".");
-    ext += ext_;
-    int taille=ext.size();
-    dp = opendir (dirname);
-    bool root=strcmp(dirname,"/")==0;
-    if (dp != NULL){
-      string s;
-      int t;
-      while ( (ep = readdir (dp)) ){
-	s=ep->d_name;
-	t=s.size();
-	if (s=="." || s=="..")
-	  continue;
-	s="/"+s;
-	if (!root)
-	  s=dirname+s;
-#ifdef NSPIRE_NEWLIB
-	if (recurse && (t<4 || s.substr(t-4,4)!=".tns") )
-	  locate_files(s.c_str(),ext_,v,recurse,contextptr);
-#else
-#ifdef _DIRENT_HAVE_D_TYPE
-	if (recurse && ep->d_type==DT_DIR)
-	  locate_files(s.c_str(),ext_,v,recurse,contextptr);
-#else
-	  struct stat stbuf;
-	stat(ep->d_name, &stbuf);
-	if (recurse && S_ISDIR(stbuf.st_mode))
-	  locate_files(s.c_str(),ext_,v,recurse,contextptr);
-#endif
-#endif // NSPIRE_NEWLIB
-	// *logptr(contextptr) << s << '\n';
-	if (taille==1 || (t>taille && s.substr(t-taille,taille)==ext))
-	  v.push_back(s);
-      }
-      closedir (dp);
-    }
-  }
-
-  gen _locate(const gen & args,GIAC_CONTEXT){
-    vector<string> v;
-    if (args.type!=_STRNG)
-      locate_files("..","",v,true,contextptr);
-    else {
-      if (args.type==_STRNG)
-	return gensizeerr(contextptr);      
-      locate_files("..",args._STRNGptr->c_str(),v,true,contextptr);
-    }
-    return args;
-  }
-  static const char _locate_s []="locate";
-  static define_unary_function_eval (__locate,&_locate,_locate_s);
-  define_unary_function_ptr5( at_locate ,alias_at_locate,&__locate,0,true);
-
-  gen _ls(const gen & args,GIAC_CONTEXT){
-    vector<string> v;
-    if (args.type==_VECT && args._VECTptr->empty())
-      locate_files("..","",v,false,contextptr);
-    else {
-      if (args.type!=_STRNG)
-	return gensizeerr(contextptr);
-      string s=args._STRNGptr->c_str();
-      bool recurse=s.size()>1 && s[s.size()-1]=='/';
-      if (recurse)
-	s=s.substr(0,s.size()-1);
-      locate_files(s.c_str(),"",v,recurse,contextptr);
-    }
-    vecteur res;
-    for (int i=0;i<v.size();++i){
-      res.push_back(string2gen(v[i],false));
-    }
-    return res;
-  }
-  static const char _ls_s []="ls";
-  static define_unary_function_eval (__ls,&_ls,_ls_s);
-  define_unary_function_ptr5( at_ls ,alias_at_ls,&__ls,0,true);
-
-  int cp(const char * sourcename,const char * targetname){
-    DIR *dp;
-    struct dirent *ep;
-    dp = opendir (sourcename);
-    if (dp != NULL){
-      while ( (ep = readdir (dp)) ){
-	const char * s=ep->d_name;
-	if (strcmp(s,".")==0 || strcmp(s,"..")==0)
-	  continue;
-	string dest(targetname+string("/")+s);
-	if (!cp((sourcename+string("/")+s).c_str(),dest.c_str())) {
-	  closedir(dp);
-	  return 0;
-	}
-      }
-      closedir(dp);
-      return 1;
-    }
-    dp = opendir (targetname);
-    if (dp!=NULL){ // target is a directory, use same filename
-      closedir(dp);
-      return cp(sourcename,(targetname+("/"+remove_path(sourcename))).c_str());
-    }
-    FILE * source=fopen(sourcename,"r");
-    if (!source)
-      return 0;
-    FILE * target=fopen(targetname,"w");
-    if (!target){ // make path and try again
-      string path=get_path(targetname);
-#ifdef _WIN32
-      mkdir(path.c_str());
-#else
-      mkdir(path.c_str(),0755);
-#endif
-      target=fopen(targetname,"w");
-    }
-    if (target){
-      while (1){
-	unsigned char c=fgetc(source);
-	if (feof(source))
-	  break;
-	fputc(c,target);
-      }
-      fclose(target);
-    }
-    fclose(source);
-    return target?1:0;
-  }
-  gen _cp(const gen & args,GIAC_CONTEXT){
-    if (is_undef(check_secure())) return undef;
-    if (args.type!=_VECT && args._VECTptr->size()!=2)
-      return gensizeerr(contextptr);
-    gen s=args._VECTptr->front(),t=args._VECTptr->back();
-    if (s.type!=_STRNG || t.type!=_STRNG)
-      return gentypeerr(contextptr);    
-    return cp(s._STRNGptr->c_str(),t._STRNGptr->c_str());
-  }
-  static const char _cp_s []="cp";
-  static define_unary_function_eval (__cp,&_cp,_cp_s);
-  define_unary_function_ptr5( at_cp ,alias_at_cp,&__cp,0,true);
-
-  gen _more(const gen & args,GIAC_CONTEXT){
-    if (is_undef(check_secure())) return undef;
-    vector<string> v;
-    if (args.type!=_STRNG)
-      return gensizeerr(contextptr);
-    string s=args._STRNGptr->c_str();
-#if defined KHICAS && !defined NSPIRE_NEWLIB
-    if (!file_exists(s.c_str()))
-      return undef;
-    const char * ptr=read_file(s.c_str());
-    return string2gen(ptr,false);
-#else
-    FILE * f=fopen(args._STRNGptr->c_str(),"r");
-    if (!f)
-      return undef;
-    string S;
-    while (!feof(f)){
-      unsigned char c=fgetc(f);
-      S += (c>=32 && c<=127)?c:'.';
-    }
-    fclose(f);
-    return string2gen(S,false);
-#endif
-  }
-  static const char _more_s []="more";
-  static define_unary_function_eval (__more,&_more,_more_s);
-  define_unary_function_ptr5( at_more ,alias_at_more,&__more,0,true);
-
-  int rm(const char * filename){
-    DIR *dp;
-    dp = opendir (filename);
-    if (dp){
-      struct dirent *ep;
-      while ( (ep = readdir (dp)) ){
-	const char * s=ep->d_name;
-	if (strcmp(s,".")==0 || strcmp(s,"..")==0)
-	  continue;
-	string dest(filename+string("/")+s);
-	if (!rm(dest.c_str())){
-	  closedir(dp);
-	  return 0;
-	}
-      }
-      closedir(dp);
-      return !rmdir(filename);
-    }
-    return !unlink(filename);
-  }
-  gen _rm(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_STRNG)
-      return gensizeerr(contextptr);
-    string s=args._STRNGptr->c_str();
-    return rm(s.c_str());
-  }
-  static const char _rm_s []="rm";
-  static define_unary_function_eval (__rm,&_rm,_rm_s);
-  define_unary_function_ptr5( at_rm ,alias_at_rm,&__rm,0,true);
-
-  gen _mkdir(const gen & args,GIAC_CONTEXT){
-    if (args.type!=_STRNG)
-      return gensizeerr(contextptr);
-    string s=args._STRNGptr->c_str();
-#ifdef _WIN32
-    return !mkdir(s.c_str());
-#else
-    return !mkdir(s.c_str(),0755);
-#endif
-  }
-  static const char _mkdir_s []="mkdir";
-  static define_unary_function_eval (__mkdir,&_mkdir,_mkdir_s);
-  define_unary_function_ptr5( at_mkdir ,alias_at_mkdir,&__mkdir,0,true);
-
-#else
-  gen _locate(const gen & args,GIAC_CONTEXT){
-    return undef;
-  }
-  static const char _locate_s []="locate";
-  static define_unary_function_eval (__locate,&_locate,_locate_s);
-  define_unary_function_ptr5( at_locate ,alias_at_locate,&__locate,0,true);
-  static const char _ls_s []="ls";
-  static define_unary_function_eval (__ls,&_locate,_ls_s);
-  define_unary_function_ptr5( at_ls ,alias_at_ls,&__ls,0,true);
-
-  static const char _more_s []="more";
-  static define_unary_function_eval (__more,&_locate,_more_s);
-  define_unary_function_ptr5( at_more ,alias_at_more,&__more,0,true);
-
-  static const char _cp_s []="cp";
-  static define_unary_function_eval (__cp,&_locate,_cp_s);
-  define_unary_function_ptr5( at_cp ,alias_at_cp,&__cp,0,true);
-
-  static const char _rm_s []="rm";
-  static define_unary_function_eval (__rm,&_locate,_rm_s);
-  define_unary_function_ptr5( at_rm ,alias_at_rm,&__rm,0,true);
-  
-  static const char _mkdir_s []="mkdir";
-  static define_unary_function_eval (__mkdir,&_locate,_mkdir_s);
-  define_unary_function_ptr5( at_mkdir ,alias_at_mkdir,&__mkdir,0,true);
-  
-#endif // UNISTD
-
-#if defined(EMCC) || defined(EMCC2)
-#ifdef EMCC_FETCH
-  // with emscripten 1.37.28, it does not work
-#include <emscripten/fetch.h>
-
-  string fetch(const string & url){
-    COUT << "fetch " << url << '\n';
-    emscripten_fetch_attr_t attr;
-    emscripten_fetch_attr_init(&attr);
-    strcpy(attr.requestMethod, "GET");
-    attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY | EMSCRIPTEN_FETCH_SYNCHRONOUS;
-    emscripten_fetch_t *fetch = emscripten_fetch(&attr, url.c_str()); // Blocks here until the operation is complete.
-    COUT << "status, bytes: " << fetch->status << "," << fetch->numBytes << '\n';
-    if (fetch->status == 200) {
-      string fetch_string="";
-      for (int i=0;i< fetch->numBytes;++i)
-	fetch_string += char(fetch->data[i]);
-      return fetch_string;
-    }
-    return "Failed";
-  }
-#else
-#include <emscripten/emscripten.h>
-
-  string fetch(const string & url){
-    COUT << "wget_data " << url << '\n';
-    char * buf;
-#if 0 // does not work emscripten 1.34/37
-    int data_size,data_error;
-    emscripten_wget_data(url.c_str(),(void **)&buf,&data_size,&data_error);
-    if (data_size>0){
-      buf[data_size-1]=0;
-      string s(buf);
-      COUT << "buffer " << s << '\n';
-      free(buf);
-      return s;
-    }
-    return "ERROR";
-#else
-    const int bufsize=512*1024;
-    buf=(char *)malloc(bufsize);
-    EM_ASM_ARGS({
-	var url=UTF8ToString($0);//Module.Pointer_stringify($0);
-	console.log("url:"+url);
-	var req = new XMLHttpRequest();
-	var bufsize=$2;
-	req.open("GET", url, false); // false: synchrone, true: async
-	req.overrideMimeType("text/plain; charset=x-user-defined");
-	req.send(null); 
-	// will not work on different domain, except if 
-	// cross-domain is enabled (firefox CORS extension like Cross Domain)
-	if (req.status === 200) {
-	  console.log("Réponse reçue: %s", req.responseText);
-	  var s=req.responseText;
-	  if (s.length>=bufsize-1)
-	    s=s.substr(0,bufsize-1);
-	  Module.writeStringToMemory(s,$1);
-	} else {
-	  console.log("Status de la réponse: %d (%s)", req.status, req.statusText);
-	  Module.writeStringToMemory("ERROR",$1);
-	}
-      },url.c_str(),buf,bufsize);
-    string s(buf);
-    free(buf);
-    return s;
-#endif
-  }
-#endif // EMCC_FETCH
-    
-#else // EMCC
-#ifdef HAVE_LIBCURL
-  //#include <curl/curlbuild.h>
-  size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream) {
-    string data((const char*) ptr, (size_t) size * nmemb);
-    *((stringstream*) stream) << data << '\n';
-    return size * nmemb;
-  }
-  string fetch(const string & url){
-    void * curl = curl_easy_init();
-    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-    /* example.com is redirected, so we tell libcurl to follow redirection */
-    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-    curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); //Prevent "longjmp causes uninitialized stack frame" bug
-    curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "deflate");
-    std::stringstream out;
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &out);
-    /* Perform the request, res will get the return code */
-    CURLcode res = curl_easy_perform(curl);
-    /* Check for errors */
-    if (res != CURLE_OK) {
-      string s=string("Failure: ")+curl_easy_strerror(res);
-      curl_easy_cleanup(curl);
-      return s;
-    }
-    curl_easy_cleanup(curl);
-    return out.str();
-  }
-#else
-  string fetch(const string & url){
-    return "Failed";
-  }
-#endif // HAVE_LIBCURL
-#endif // EMCC
-
-#ifndef NO_NAMESPACE_GIAC
-} // namespace giac
-#endif // ndef NO_NAMESPACE_GIAC
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/misc.h b/apps/KhiCAS/src/giac-1.6.0/src/misc.h
index d772ccf96..da4d6306b 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/misc.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/misc.h
@@ -262,6 +262,7 @@ namespace giac {
 
   bool has_undef_stringerr(const gen & g,std::string & err);
   gen _is_polynomial(const gen & args,GIAC_CONTEXT);
+  bool is_periodic(const gen & f,const gen & x,gen & periode,GIAC_CONTEXT);
 
   // step by step utilities
   // poi=point of interest, tvi=table of variation
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/mklib~ b/apps/KhiCAS/src/giac-1.6.0/src/mklib~
deleted file mode 100755
index 9adbe0118..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/mklib~
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-make -f Makefile.numworks.n0110 libgiac.a
-/bin/cp libgiac.a ~/Omega-External/apps/KhiCAS/src/lib/
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/modpoly.cc b/apps/KhiCAS/src/giac-1.6.0/src/modpoly.cc
index 1765de833..d5ce66464 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/modpoly.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/modpoly.cc
@@ -6899,6 +6899,9 @@ namespace giac {
     memcpy(b,&*q.begin(),bs*sizeof(int));
     int * t;
     for (;b!=bend;swapab=!swapab){
+      if (*b % m==0){ // make sure leading coeff of b is not 0
+	++b; continue;
+      }
       rem(a,aend,b,bend,m,qcur,0);
       t=a; a=b; b=t;
       t=aend; aend=bend; bend=t;      
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/moyal.cc b/apps/KhiCAS/src/giac-1.6.0/src/moyal.cc
index 63f449ef0..e1dabaf07 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/moyal.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/moyal.cc
@@ -4241,6 +4241,8 @@ namespace giac {
     complex<double> w; 
     // initial guess
     w=2.0*(M_E*z+1.0);
+    if (std::abs(w)<1e-13)
+      return -1.0;
     if (std::abs(w)<0.1 && (n==0 || ( n==1 && z.imag()<0) || (n==-1 && z.imag()>0))){
       // near -1/e, set p=sqrt(2(ez+1)), -1+p-1/3*p^2+11/72*p^3+...
       w=std::sqrt(w);
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/plot.cc b/apps/KhiCAS/src/giac-1.6.0/src/plot.cc
index 37bd61891..ba6425264 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/plot.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/plot.cc
@@ -567,6 +567,7 @@ namespace giac {
   }
 #endif
 
+  bool gnuplot_opengl=false;
 #ifdef WITH_GNUPLOT
   vecteur plot_instructions;
 
@@ -1103,11 +1104,6 @@ namespace giac {
     } 
   }
 
-  int rgb888to565(int c){
-    int r=(c>>16)&0xff,g=(c>>8)&0xff,b=c&0xff;
-    return (((r*32)/256)<<11) | (((g*64)/256)<<5) | (b*32/256);
-  }
-
   static const int arc_en_ciel_colors=15;
   int density(double z,double fmin,double fmax){
     // z -> 256+arc_en_ciel_colors*(z-fmin)/(fmax-fmin)
@@ -1770,7 +1766,7 @@ namespace giac {
 	    if (fval._DOUBLE_val>fmax)
 	      fmax=fval._DOUBLE_val;
 	  }
-#if defined KHICAS || defined GIAC_HAS_STO_38 // FIXME format is not translatable, etc.
+#if defined KHICAS || defined GIAC_HAS_STO_38 // || defined HYPERSURFACE3 FIXME format is not translatable, etc.
 	  if (!densityplot){
 	    tmp.push_back(x); tmp.push_back(y); tmp.push_back(fval);
 	  } 
@@ -3491,8 +3487,8 @@ namespace giac {
 #else
     ee.subtype=-1;
 #endif
-    history_plot(contextptr).push_back(ee);
 #ifndef KHICAS
+    history_plot(contextptr).push_back(ee);
     if (io_graph(contextptr))
       __interactive.op(ee,contextptr);
 #endif
@@ -6074,6 +6070,8 @@ namespace giac {
 	loop=false;
       else if (res.type==_SYMB && has_i(res))
 	loop=false;
+      if (res.is_symb_of_sommet(at_curve))
+	loop=true; /* workaround for ggb area([circle(x^(2)+4y^(2)=1)]) */
       if (loop){
 	res=0;
 	for (unsigned i=0;i<args._VECTptr->size();++i)
@@ -8961,6 +8959,26 @@ namespace giac {
     if (g.type==_VECT){
       v=*g._VECTptr;
       int s=int(v.size()),nd=0,nargs=0;
+      if (s){
+	vecteur attributs(1,default_color(contextptr));
+	int a=read_attributs(v,attributs,contextptr);
+	if (a==s-1 && attributs!=vecteur(1,default_color(contextptr))){
+	  gen res=_plot(a==1?v.front():gen(vecteur(v.begin(),v.begin()+a),g.subtype),contextptr);
+	  if (res.type==_VECT){
+	    vecteur w=*res._VECTptr;
+	    for (int i=0;i<w.size();++i){
+	      if (w[i].is_symb_of_sommet(at_pnt)){
+		// FIXME keep filled attribute
+		w[i]=pnt_attrib(remove_at_pnt(w[i]),attributs,contextptr);
+	      }
+	    }
+	    res=gen(w,res.subtype);
+	    return res;
+	  } 
+	  res=remove_at_pnt(res);
+	  return pnt_attrib(res,attributs,contextptr);
+	}
+      }
       if (s && v[0].type==_FUNC && (nd=is_distribution(v[0])) && 1+(nargs=distrib_nargs(nd))<=s){
 	if (is_discrete_distribution(nd))
 	  return _histogram(g,contextptr);
@@ -9027,8 +9045,11 @@ namespace giac {
     }
     if (s<1)
       return _plotfunc(g,contextptr);
-    if (g.type==_VECT && g.subtype!=_SEQ__VECT)
+    if (g.type==_VECT && g.subtype!=_SEQ__VECT){
+      if (v.size()==2 && v.back().type!=_VECT)
+	return _plotparam(g,contextptr);
       return plotpoints(v,attributs,contextptr);
+    }
     double xmin=gnuplot_xmin,xmax=gnuplot_xmax,ymin=gnuplot_ymin,ymax=gnuplot_ymax,zmin=gnuplot_zmin,zmax=gnuplot_zmax;
     gen xvar=vx_var,yvar=y__IDNT_e;
     int nstep=gnuplot_pixels_per_eval;
@@ -11062,6 +11083,16 @@ namespace giac {
 	vecteur & valv = *valf._VECTptr;
 	int s = int(valv.size());
 	if (s>1){
+	  gen valv0=valv[0];
+	  if (valv0.is_symb_of_sommet(at_legende)){
+	    valv0=valv0._SYMBptr->feuille;
+	    valv0=valv0[1];
+	    if (valv0.type==_STRNG){
+	      valv0=gen(*valv0._STRNGptr,contextptr);
+	      if (valv0.type<=_SYMB)
+		return valv0;
+	    }
+	  }
 	  gen valv1=valv[1];
 	  if (valv1.type==_VECT && valv1._VECTptr->size()>2){
 	    tmp=(*valv1._VECTptr)[1];
@@ -11834,6 +11865,8 @@ namespace giac {
       is >> type;
       if (type==_FL_WIDGET_POINTER && fl_widget_unarchive_function)
 	return fl_widget_unarchive_function(is);
+    case _USER:
+      return unarchive(is,contextptr);
     case _ZINT:
       return unarchivezint(is,contextptr);
 #if 0 // ndef USE_GMP_REPLACEMENTS
@@ -12002,6 +12035,8 @@ namespace giac {
 	if (galois_field * gf=dynamic_cast<galois_field *>(e._USERptr)){
 	  return os << et << "GF(" << gf->p << "," << gf->P << "," << gf->x << "," << gf->a << ")" << '\n';
 	}
+	os << et << " ";
+	return archive(os,e._USERptr->giac_constructor(contextptr),contextptr);
       }
 #endif
     default:
@@ -12200,8 +12235,9 @@ namespace giac {
       g=_floor(g,0);
       if (g.type!=_INT_)
 	return false; // setsizeerr(contextptr);
-#ifdef WITH_GNUPLOT
       int i=g.val;
+      gnuplot_opengl=(i/4) %2;
+#ifdef WITH_GNUPLOT
       gnuplot_hidden3d=(i %2)!=0;
       i =i/2;
       gnuplot_pm3d=(i%2)!=0;
@@ -12253,7 +12289,7 @@ namespace giac {
     v.push_back(axes);
     v.push_back(class_min);
     v.push_back(class_size);
-    v.push_back(int(gnuplot_hidden3d+2*gnuplot_pm3d));
+    v.push_back(int(gnuplot_hidden3d+2*gnuplot_pm3d+4*gnuplot_opengl));
     return symbolic(at_xyztrange,v);
   }
   gen _xyztrange(const gen & args,GIAC_CONTEXT){
@@ -16576,6 +16612,16 @@ gen _vers(const gen & g,GIAC_CONTEXT){
   // moved from plot3d.cc for implicittex_plot_sommets_alias
   gen _plot3d(const gen & g,const context * contextptr){
     if ( g.type==_STRNG && g.subtype==-1) return  g;
+    if (g.type!=_VECT){
+      vecteur v(lidnt(eval(g,1,contextptr)));
+      if (v.size()==2)
+	return _plot3d(makesequence(g,v.front(),v.back()),contextptr);
+      if (v.size()==1){
+	gen z=v.front();
+	gen G=subst(g,z,x__IDNT_e+cst_i*y__IDNT_e,false,contextptr);
+	return _plot3d(makesequence(G,x__IDNT_e,y__IDNT),contextptr);
+      }
+    }
     if (g.type!=_VECT || g._VECTptr->size()<2)
       return symbolic(at_plot3d,g);
     vecteur v=*g._VECTptr;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/plot.h b/apps/KhiCAS/src/giac-1.6.0/src/plot.h
index efc5b9bf9..303144693 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/plot.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/plot.h
@@ -246,6 +246,7 @@ namespace giac {
    when all fork/child etc. will be removed */
   extern vecteur plot_instructions;
 #endif
+  extern bool gnuplot_opengl;
   int gnuplot_show_pnt(const symbolic & e,GIAC_CONTEXT);
 
   gen rationalparam2equation(const gen & at_orig,const gen & t_orig,const gen &x,const gen & y,GIAC_CONTEXT);
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/plot3d.cc b/apps/KhiCAS/src/giac-1.6.0/src/plot3d.cc
index 51d879cdb..def5dc1e4 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/plot3d.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/plot3d.cc
@@ -1062,7 +1062,7 @@ namespace giac {
 	for (int j=0;j<=nv;++j,y+=dy){
 	  vals[1]=y;
 	  gen tmppnt=evalf_double(subst(f,vars,vals,false,contextptr),1,contextptr);
-#if defined KHICAS || defined GIAC_HAS_STO_38
+#if defined KHICAS || defined GIAC_HAS_STO_38 // defined HYPERSURFACE3 
 	  tmp.push_back(tmppnt[0]);
 	  tmp.push_back(tmppnt[1]);
 	  tmp.push_back(tmppnt[2]);
@@ -1557,6 +1557,49 @@ namespace giac {
     return segments2polygone(res,contextptr);
   }
 
+#if 1
+  gen volume_polyedre(const vecteur & p,GIAC_CONTEXT){
+    const_iterateur it=p.begin(),itend=p.end();
+    gen V=0,c=0; int n=0;
+    // find isobarycenter
+    for (it=p.begin();it!=itend;++it){
+      if (it->type!=_VECT)
+	continue;
+      vecteur v=*it->_VECTptr;
+      int s=int(v.size());
+      if (s && v.front()==v.back())
+	--s;
+      if (s<3)
+	continue;
+      for (int i=0;i<s;++i)
+	c += v[i];
+      n += s;
+    }
+    c = c/n;
+    for (it=p.begin();it!=itend;++it){
+      if (it->type!=_VECT)
+	continue;
+      vecteur v=*it->_VECTptr;
+      int s=int(v.size());
+      if (s && v.front()==v.back())
+	--s;
+      if (s<3)
+	continue;
+      gen a=v[0];
+      for (int i=2;i<s;++i){
+	gen cote1=v[i-1]-a,cote2=v[i]-a;
+	gen n=cross(*cote1._VECTptr,*cote2._VECTptr,contextptr);
+	gen ps=dotvecteur(a,n,contextptr);
+	if (is_positive(dotvecteur(a-c,n),contextptr))
+	  V += ps;
+	else
+	  V -= ps;
+      }
+    }
+    return V/6;
+  }
+
+#else
  static bool graham_sort_function(const gen & a,const gen & b){
    vecteur & v=*a._VECTptr;
    vecteur & w=*b._VECTptr;
@@ -1600,7 +1643,7 @@ namespace giac {
     vecteur ls;
     for (int j=0;j<lx.size();++j){
       ycur=ly[j]; xcur=lx[j];
-      gen dy=ycur-ymin,dx=xcur-xmin;
+      gen dy=normal(ycur-ymin,contextptr),dx=normal(xcur-xmin,contextptr);
       if (dx!=0 || dy!=0){
 	ls.push_back(makevecteur(makevecteur(dx,dy),arg(dx+cst_i*dy,contextptr),dx*dx+dy*dy));
       }
@@ -1613,7 +1656,7 @@ namespace giac {
       vecteur cur=*ls[i]._VECTptr->front()._VECTptr;
       res +=  cur[1]*prec[0]-cur[0]*prec[1];
     }
-    return abs(res,contextptr);
+    return res;//abs(res,contextptr);
   }
 
   static bool infe(const gen & a,const gen &b){
@@ -1647,16 +1690,20 @@ namespace giac {
     // compute volume by Simpson formula
     int s=Z.size();
     gen prev=area_polyedre_z(p,Z.front(),contextptr);
+    // CERR << 0 << " " << prev << '\n';
     gen V=0;
     for (int i=1;i<s;++i){
       gen mid=area_polyedre_z(p,(Z[i-1]+Z[i])/2,contextptr);
+      // CERR << i << " " << evalf(mid,1,contextptr) << '\n';
       gen nxt=area_polyedre_z(p,Z[i],contextptr);
+      // CERR << i << " " << evalf(nxt,1,contextptr) << '\n';
       gen dz=Z[i]-Z[i-1];
       V += (prev+4*mid+nxt)*dz;
       prev=nxt;
     }
     return V/12;
   }
+#endif
 
   gen _volume(const gen & args,GIAC_CONTEXT){
     if ( args.type==_STRNG && args.subtype==-1) return  args;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/plot3d.h b/apps/KhiCAS/src/giac-1.6.0/src/plot3d.h
index e054faa56..fda09ff53 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/plot3d.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/plot3d.h
@@ -37,6 +37,10 @@ namespace giac {
   extern const unary_function_ptr * const  at_sphere ;
   extern const unary_function_ptr * const  at_cylindre ;
   extern const unary_function_ptr * const  at_plan ;
+  extern const unary_function_ptr * const  at_tetraedre ;
+  extern const unary_function_ptr * const  at_octaedre ;
+  extern const unary_function_ptr * const  at_dodecaedre ;
+  extern const unary_function_ptr * const  at_icosaedre ;
   gen hypersurface(const gen & args,const gen & equation,const gen & vars);
   gen do_point3d(const gen & g);
   bool is3d(const gen & g);
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/poly.h b/apps/KhiCAS/src/giac-1.6.0/src/poly.h
index bf9d6f4e7..7d64e2c5a 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/poly.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/poly.h
@@ -999,15 +999,15 @@ namespace giac {
       if (!a0.Texactquotient(b0,q,allowrational))
 	return false;
       qdeg=rdeg-bdeg;
-      if (qdeg){
-	if (it!=itend && it->index.front()==rdeg-1)
-	  a1=Tnextcoeff<T>(it,itend);
+      if (1 && qdeg && it!=itend && it->index.front()==rdeg-1){ // FIXME, fails for integrate((e*x+d)^(3/2)*(c*x^2+b*x+a)^p,x);
+	a1=Tnextcoeff<T>(it,itend);
 #if defined GIAC_VECTOR || defined NSPIRE // fix for * on arm compiler
 	tensor<T> tmp(q.dim);
 	tmp.coord=q.coord*b1.coord;
 	a1.TSub(tmp,a1);
 #else
-	a1.TSub(q*b1,a1); // a1=a1-q*b1; 
+	a1.TSub(q*b1,a1);  
+	// a1=a1-q*b1; 
 #endif
 	q=q.untrunc1(qdeg);
 	if (!a1.Texactquotient(b0,q1,allowrational))
@@ -1036,7 +1036,8 @@ namespace giac {
       tmp.coord=q.coord*b.coord;
       r.TSub(tmp,r); // r=r-q*b;       
 #else
-      r.TSub(q*b,r); // r=r-q*b; 
+      r.TSub(q*b,r); 
+      //r=r-q*b; 
 #endif
       if (r.coord.empty())
 	return true;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/prog.cc b/apps/KhiCAS/src/giac-1.6.0/src/prog.cc
index fecd6bcde..44bda00bf 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/prog.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/prog.cc
@@ -8594,6 +8594,8 @@ namespace giac {
 	gen tmp=eval(*it,1,contextptr);
 	if (it->type==_IDNT){
 	  gen tmp2=*it;
+	  if (tmp.type==_USER)
+	    tmp=tmp._USERptr->giac_constructor(contextptr);
 	  inf << symb_sto(tmp,tmp2) << ";" << '\n';
 	}
 	else
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/quater.cc b/apps/KhiCAS/src/giac-1.6.0/src/quater.cc
index 34cc5c4b4..10a8a41b1 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/quater.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/quater.cc
@@ -441,6 +441,10 @@ namespace giac {
     return "";
   }
 
+  gen galois_field::giac_constructor(GIAC_CONTEXT) const {
+    return symbolic(at_galois_field,makesequence(p,P,x,a));
+  }
+
   string galois_field::texprint(GIAC_CONTEXT) const {
     gen xid(x);
     gen A(a);
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/quater.h b/apps/KhiCAS/src/giac-1.6.0/src/quater.h
index cad4f7399..a5312e11f 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/quater.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/quater.h
@@ -75,6 +75,7 @@ namespace giac {
     virtual gen inv () const ;
     virtual std::string print (GIAC_CONTEXT) const ;
     virtual std::string texprint (GIAC_CONTEXT) const ;
+    virtual gen giac_constructor (GIAC_CONTEXT) const ;
     virtual bool operator == (const gen &) const ;
     virtual bool is_zero() const;
     virtual bool is_one() const;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/series.cc b/apps/KhiCAS/src/giac-1.6.0/src/series.cc
index 6924df050..e09de763a 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/series.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/series.cc
@@ -1616,6 +1616,11 @@ namespace giac {
 	    return false;
 	  for (int i=1;i<ordre;i++){
 	    gen add= limit(fdiff,*k._IDNTptr,upper,-1,contextptr)-limit(fdiff,*k._IDNTptr,lower,1,contextptr);
+	    gen chk=limit(add/pow(x,2*i-2),x,0,1,contextptr);
+	    if (!is_zero(chk)){
+	      ordre=2*i-3;
+	      break;
+	    }
 	    add=add*bernoulli(2*i)/factorial(2*i);
 	    eff += add; // fdiff flimdiff 2 fois
 	    fdiff=derive(fdiff,k,contextptr);
@@ -1623,11 +1628,16 @@ namespace giac {
 	    if (is_undef(fdiff))
 	      return false;
 	  }
+	  // find order of add
 	  // must do a recursive call since eff may contain new functions
-	  gen coeff,mrv_var,exponent; 
+	  // FIXME: "Parameters" might depend on x, search for effg 
+	  // example series(sum(k/n*ln(k/n), k = 1 .. n ),n=inf);
+	  gen Coeff,Mrv_var,Exponent; 
 	  eff =subst(eff,x,inv(x,contextptr),true,contextptr);
-	  if (!mrv_lead_term(eff,x,coeff,mrv_var,exponent,s,ordre,contextptr,true))
+	  if (!mrv_lead_term(eff,x,Coeff,Mrv_var,Exponent,s,ordre,contextptr,true))
 	    return false;
+	  ptruncate(s,ordre,contextptr); // add remainder term
+	  s=subst(s,x,inv(x,contextptr),true,contextptr);
 	  lvx_s.push_back(s);
 	  continue;
 	  // never reached setsizeerr();
@@ -2342,7 +2352,7 @@ namespace giac {
 	  gen tmp;
 	  if (v[i]._SYMBptr->feuille.type==_VECT && v[i]._SYMBptr->feuille._VECTptr->size()==4){
 	    vecteur & vv=*v[i]._SYMBptr->feuille._VECTptr;
-	    if (derive(vv[2],x,contextptr)==0 && derive(vv[2],x,contextptr)==0)
+	    if (derive(vv[2],x,contextptr)==0 && derive(vv[3],x,contextptr)==0)
 	      continue;
 	  }
 	  if (!convert_to_euler_mac_laurin(v[i],x,tmp,contextptr))
@@ -2945,7 +2955,14 @@ namespace giac {
     bool dont_invert=is_zero(in_limit(faster_var.front(),x,plus_inf,0,contextptr));
     vecteur faster_var_tmp(faster_var);
     stable_sort(faster_var.begin(),faster_var.end(),symb_size_less_t());
-    identificateur w(" w");
+    vecteur ecopyv(lidnt(ecopy));
+    string ws("w");
+    identificateur w(ws); 
+    // create free identifier, not present in ecopy
+    while (equalposcomp(ecopyv,w)){
+      ws+='_';
+      w=identificateur(ws);
+    }
     vecteur faster_var_subst(1,w);
     gen g=faster_var.front()._SYMBptr->feuille;
     iterateur it=faster_var.begin()+1,itend=faster_var.end();
@@ -2970,6 +2987,8 @@ namespace giac {
       f=subst(f,w,inv(w,contextptr),false,contextptr);
     if (faster_var.front().is_symb_of_sommet(at_exp)){
       // replace ln(exp(g)^k*...) by k*g+ln(...)
+      // where g=ln(w)
+      gen effg(g); // symbolic(at_ln,w)); does not work
       vecteur lf(lop(f,at_ln)),lf1,lf2;
       iterateur it=lf.begin(),itend=lf.end();
       for (;it!=itend;++it){
@@ -2979,7 +2998,7 @@ namespace giac {
 	  if (!is_zero(p.front().exponent))
 	    argln=argln*symbolic(at_pow,gen(makevecteur(w,-p.front().exponent),_SEQ__VECT));
 	  lf1.push_back(*it);
-	  lf2.push_back(p.front().exponent*(dont_invert?g:-g)+symbolic(at_ln,argln));
+	  lf2.push_back(p.front().exponent*(dont_invert?effg:-effg)+symbolic(at_ln,argln));
 	}
       }
       if (!lf1.empty())
@@ -3584,14 +3603,14 @@ namespace giac {
       gen f0=f._VECTptr->front();
       gen x =f[1];
       if (x.type!=_IDNT){
-	*logptr(contextptr) << gettext("Unable to convert to euler mac laurin");
+	*logptr(contextptr) << gettext("Unable to convert to euler mac laurin") << ' ';
 	return false;
       }
       gen f0prime=derive(f0,x,contextptr), f03=derive(f0prime,x,contextptr);
       f03=derive(f03,x,contextptr);
       if (is_undef(f03)) return false;
       l=in_limit(f03/f0prime,n,plus_inf,1,contextptr);
-      if (!is_zero(l))
+      if (!is_zero(l)) 
 	return false;
       gen remains;
       gen F0=integrate_gen_rem(f0,x,remains,0,contextptr);
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/solve.cc b/apps/KhiCAS/src/giac-1.6.0/src/solve.cc
index 985151d1d..6057f8c8e 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/solve.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/solve.cc
@@ -652,7 +652,7 @@ namespace giac {
 	      // A*exp(a*x+b)+C*x+D=0, t=a*x+b
 	      // A*exp(t)+C*(t-b)/a+D=0 -> A*exp(t)+C/a*t+D-C*b/a=0
 	      gen a_(A),b_(C/a),c_(D-C*b/a);
-	      gen delta=a_/b_*exp(-c_/b_,contextptr);
+	      gen delta=ratnormal(a_/b_*exp(-c_/b_,contextptr),contextptr);
 	      if (is_strictly_greater(m1,delta,contextptr))
 		return; // no solution
 	      gen sol=-_LambertW(delta,contextptr)-c_/b_;
@@ -1963,7 +1963,10 @@ namespace giac {
       if (real && has_i(tmp))
 	continue;
 #ifdef HAVE_LIBMPFR
-      tmp=_evalf(makesequence(tmp,100),contextptr);
+      if (has_op(sol[i],*at_LambertW)) // workaround for solve([(a)*(k)=1, (a)*(exp((3)*(k)))=(3)*(e)],[a, k]);, eval with 100 digits in moyal.cc takes too much time
+	tmp=_evalf(makesequence(tmp,30),contextptr);
+      else
+	tmp=_evalf(makesequence(tmp,100),contextptr);
 #endif
       tmp=evalf_double(tmp,1,contextptr);
       if (real && tmp.type==_CPLX)
@@ -2014,6 +2017,20 @@ namespace giac {
     }
     if (expr.is_symb_of_sommet(at_neg))
       expr=expr._SYMBptr->feuille;
+    if (expr.is_symb_of_sommet(at_inv)){
+      // if expr has tan inside, subst tan by 1/x then x->0 if it's 0 we have additional solutions if arg of tan=pi/2
+      vecteur lv(lvarx(expr,x));
+      if (lv.size()==1 && lv[0].is_symb_of_sommet(at_tan)){
+	gen chk=subst(expr,lv[0],inv(x,contextptr),false,contextptr);
+	chk=limit(chk,x,0,0,contextptr);
+	if (chk==0){
+	  chk=cos(lv[0]._SYMBptr->feuille,contextptr);
+	  vecteur v1(solve_cleaned(chk,e_check,x,isolate_mode,contextptr));
+	  return v1;
+	}
+      }
+      return vecteur(0);
+    }
     if (expr.is_symb_of_sommet(at_prod)){
       vecteur v=gen2vecteur(expr._SYMBptr->feuille),res;
       for (unsigned i=0;i<v.size();++i){
@@ -3837,7 +3854,12 @@ namespace giac {
     if (s==2 && v[1].type==_IDNT){ 
       // no initial guess, check for poly-like equation
       vecteur lv(lvar(v0));
-      lv=lvar(evalf(lv,1,contextptr));
+      if (contextptr && contextptr->quoted_global_vars){
+	contextptr->quoted_global_vars->push_back(lv[1]);
+	lv=lvar(evalf(lv,1,contextptr)); // this should not evalf v[1], otherwise x:=10; solve(x^(3/2)=3.,x); will fail
+	contextptr->quoted_global_vars->pop_back();
+      } else
+	lv=lvar(evalf(lv,1,contextptr)); 
       int lvs=int(lv.size());
       bool poly=true;
       for (unsigned i=0;i<lv.size();++i){
@@ -4252,6 +4274,8 @@ namespace giac {
       res.pop_back();
       return res;
     }
+    if (ckmatrix(sl,false,false)) // check whether sl has undef inside
+      return vecteur(x.size(),undef);
     A=sxa(sl,x,contextptr);
     vecteur B,R(x);
     gen rep;
@@ -4545,7 +4569,7 @@ namespace giac {
     for (int j=1;j<5;j++,niter2 *=2, niter1 *=2){ 
       gen a;
       int b;
-      //on prend un départ au hasard (a=x0=un _DOUBLE_)
+      //on prend un d�part au hasard (a=x0=un _DOUBLE_)
       // a=gen(2.0);
       if (guess_first)
 	a=j*4*(rand()/(RAND_MAX+1.0)-0.5);
@@ -4621,8 +4645,8 @@ namespace giac {
       invdf=mtran(*invdf._VECTptr);
     bool guess_first=is_undef(guess);
     // Main loop with random initialization
-    int j=1;
-    for (;j<=5 ;j++,niter += 5){ 
+    int j=1; //NEWTON_MAX_RANDOM_RESTART=20;
+    for (;j<=NEWTON_MAX_RANDOM_RESTART;j++,niter += 5){ 
       if (guess_first){
 	a=newton_rand(j,real,rand_xmin,rand_xmax,f,contextptr);
       }
@@ -6635,48 +6659,84 @@ namespace giac {
 	return vecteur(1,gensizeerr(gen(l).print(contextptr)+gettext(" is not rational w.r.t. ")+it->print(contextptr)));
       }
     }
+    // if one equation factors recurse with each factor
+    for (size_t i=0;i<eq.size();++i){
+      vecteur vi=factors(eq[i],var[0],contextptr);
+      if (vi.size()/2==0) continue;
+      if (is_cinteger(vi[vi.size()-2])){
+	vi.pop_back();
+	vi.pop_back();
+      }
+      if (vi.size()>2){
+	vecteur res;
+	for (size_t j=0;j<vi.size();j+=2){
+	  if (is_strictly_positive(vi[j+1],contextptr)){
+	    eq[i]=vi[j];
+	    vecteur sol=gsolve(eq,var,complexmode,evalf_after,contextptr);
+	    res=mergevecteur(res,sol);
+	  }
+	}
+	return res;
+      }
+    }
+    // end recurse if one equation factors
     int varsize=int(var.size());
 #if 1 // trying with rational univariate rep., assuming radical ideal of dim 0
-    if (varsize<=GROEBNER_VARS && varsize==int(eq.size())){
-      double eps=epsilon(contextptr);
-      if (varsize==2){ // try by resultant
-	//eq=*eqs._VECTptr;
-	gen r=_resultant(makesequence(eq[0],eq[1],var[0]),contextptr);
-	if (!is_zero(r)){
-	  // solve r w.r.t. var[1]
-	  vecteur S,res;
-	  if (convertapprox){
-	    gen p=_symb2poly(makesequence(r,var[1]),contextptr);
-	    p=evalf(p,1,contextptr);
-	    p=_proot(p,contextptr);
-	    if (p.type!=_VECT) return vecteur(1,gensizeerr(contextptr));
-	    S=*p._VECTptr;
-	  }
-	  else
-	    S=solve(r,var[1],complexmode,contextptr);
-	  for (int i=0;i<int(S.size());++i){
-	    gen y=S[i];
-	    if (has_num_coeff(y)){
-	      vecteur T=solve(subst(eq[0],var[1],y,false,contextptr),var[0],complexmode,contextptr);
+    double eps=epsilon(contextptr);
+    if (varsize==2 && eq.size()>=2){ // try by resultant
+      //eq=*eqs._VECTptr;
+      gen r=0;
+      for (size_t i=1;i<eq.size();++i)
+	r=gcd(r,_resultant(makesequence(eq[0],eq[i],var[0]),contextptr),contextptr);
+      if (!is_zero(r)){
+	// solve r w.r.t. var[1]
+	vecteur S,res;
+	if (convertapprox){
+	  gen p=_symb2poly(makesequence(r,var[1]),contextptr);
+	  p=evalf(p,1,contextptr);
+	  p=_proot(p,contextptr);
+	  if (p.type!=_VECT) return vecteur(1,gensizeerr(contextptr));
+	  S=*p._VECTptr;
+	}
+	else
+	  S=solve(r,var[1],complexmode,contextptr);
+	for (int i=0;i<int(S.size());++i){
+	  gen y=S[i];
+	  if (has_num_coeff(y)){
+	    vecteur T=solve(subst(eq[0],var[1],y,false,contextptr),var[0],complexmode,contextptr);
+	    for (size_t k=1;k<eq.size();++k){
+	      vecteur newT;
 	      for (int j=0;j<int(T.size());++j){
 		gen x=T[j];
-		gen tst=subst(subst(eq[1],var[1],y,false,contextptr),var[0],x,false,contextptr);
+		gen tst=subst(subst(eq[k],var[1],y,false,contextptr),var[0],x,false,contextptr);
 		if (is_greater(1e-6,abs(tst,contextptr),contextptr))
-		  res.push_back(makevecteur(x,y));
+		  newT.push_back(x);
 	      }	    
+	      newT.swap(T);
 	    }
-	    else {
-	      gen G=gcd(subst(eq[0],var[1],y,false,contextptr),subst(eq[1],var[1],y,false,contextptr));
-	      vecteur T=solve(G,var[0],complexmode,contextptr);
-	      for (int j=0;j<int(T.size());++j){
-		res.push_back(makevecteur(T[j],y));
-	      }
+	    for (int k=0;k<T.size();++k)
+	      res.push_back(makevecteur(T[k],y));
+	  }
+	  else {
+	    gen G=subst(eq[0],var[1],y,false,contextptr);
+	    for (size_t j=1;j<eq.size();++j)
+	      G=gcd(G,subst(eq[j],var[1],y,false,contextptr),contextptr);
+	    vecteur T=solve(G,var[0],complexmode,contextptr);
+	    for (int j=0;j<int(T.size());++j){
+	      res.push_back(makevecteur(T[j],y));
 	    }
 	  }
-	  return res;
-	} // end resultant not 0
-      } // end #var=2
+	}
+	return res;
+      } // end resultant not 0
+    } // end #var=2
+    if (varsize<=GROEBNER_VARS && varsize<=int(eq.size())){
       gen G=_gbasis(makesequence(eq,var,change_subtype(_RUR_REVLEX,_INT_GROEBNER)),contextptr);
+      if (G.type==_VECT && G._VECTptr->size()==1){
+	if (!is_zero(G._VECTptr->front()))
+	  return vecteur(0); // system was equivalent to 1=0
+	gensizeerr("solve.cc internal error");
+      }
       if (G.type==_VECT && G._VECTptr->size()==var.size()+4 && G._VECTptr->front().type==_INT_ && G._VECTptr->front().val==_RUR_REVLEX){
 	vecteur Gv=*G._VECTptr,S;
 	gen rurvar=var.front();
@@ -7706,6 +7766,10 @@ namespace giac {
 	    eqs.erase(eqs.begin()+i);
 	    for (unsigned k=0;k<eqs.size();++k){
 	      eqs[k]=_numer(subst(eqs[k],elim[j],elimj,false,contextptr),contextptr);
+	      if (is_zero(eqs[k])){
+		eqs.erase(eqs.begin()+k);
+		--k;
+	      }
 	    }
 	    elim.erase(elim.begin()+j);
 	    gen res=_eliminate(makesequence(eqs,elim,symb_equal(at_irem,modular),symb_equal(at_eliminate,gbasis_param.eliminate_flag)),contextptr);
@@ -7818,13 +7882,20 @@ namespace giac {
 	    } 
 	  }
 	  // make resultant of all equations except posi with cureq, curvar
+	  gen G=_gcd(eqs,contextptr);
+	  // if G depends on bestvar, then we can not deduce anything
+	  if (!is_zero(derive(G,bestvar,contextptr))){
+	    *logptr(contextptr) << gettext("No relation found, if following equation holds 0=") << G << '\n';
+	    return vecteur(0);
+	  }
 	  vecteur neweq;
 	  for (int i=0;i<neq;++i){
 	    if (i==bestpos) continue;
 	    gen a=_simp2(makesequence(eqs[i],besteq),contextptr);
 	    if (a.type!=_VECT || a._VECTptr->size()!=2)
 	      return gensizeerr(contextptr);
-	    gen r=_resultant(makesequence(a._VECTptr->front(),a._VECTptr->back(),bestvar),contextptr)*_gcd(makesequence(eqs[i],besteq),contextptr);;
+	    gen G=_gcd(makesequence(eqs[i],besteq),contextptr);
+	    gen r=_resultant(makesequence(a._VECTptr->front(),a._VECTptr->back(),bestvar),contextptr)*G;
 	    vecteur vr(lidnt(r));
 	    if (!vr.empty()){
 	      gen dr=_diff(makesequence(r,vr[0]),contextptr);
@@ -8144,13 +8215,9 @@ namespace giac {
     return gensizeerr(contextptr);
   }
 #else // GIAC_HAS_STO_38
-  struct gen_context {
-    gen g; //  should be a vector [function,conditions,variables]
-    const context * contextptr;
-  };
   // state is a pointer of type gen_context
   int cobyla_giac_function(int n, int m, double *x, double *f, double *con,void *state){
-    gen_context * gptr=(gen_context *)state;
+    cobyla_gc * gptr=(cobyla_gc *)state;
     if (gptr->g.type!=_VECT || gptr->g._VECTptr->size()!=3)
       return 1; //error
     gen F=(*gptr->g._VECTptr)[0];
@@ -8162,7 +8229,7 @@ namespace giac {
     for (int i=0;i<n;++i)
       values[i]=x[i];
     gen Fx=subst(F,variables,values,false,gptr->contextptr);
-    Fx=evalf_double(Fx,1,gptr->contextptr);
+    Fx=_evalf(Fx,gptr->contextptr); // changed evalf_double to _evalf which allows for quoted objectives (L. Marohnić)
     if (Fx.type!=_DOUBLE_)
       return 1;
     *f=Fx._DOUBLE_val;
@@ -8203,7 +8270,7 @@ namespace giac {
 	*it=it->_SYMBptr->feuille._VECTptr->back()-it->_SYMBptr->feuille._VECTptr->front();
     }
     gen fcv=makevecteur(f,con,variables);
-    gen_context gc={fcv,contextptr};
+    cobyla_gc gc={fcv,contextptr};
     int n=variables.size(),m=con.size(),message(debug_infolevel),maxfun(1000);
     gen maxiter(maxiter0);
     gen eps0d=evalf_double(eps0,1,contextptr);
@@ -8213,11 +8280,14 @@ namespace giac {
       maxfun=maxiter.val;
     if (int(guess.size())!=n)
       return gendimerr(contextptr);
+/*
 #ifdef VISUALC
     double x[100];
 #else
     double x[n];
 #endif
+*/
+    double *x=new double[n]; // added by L. Marohnić
     for (int i=0;i<n;++i){
       gen tmp=evalf_double(guess[i],1,contextptr);
       if (tmp.type!=_DOUBLE_)
@@ -8236,6 +8306,7 @@ namespace giac {
     vecteur res(n);
     for (int i=0;i<n;++i)
       res[i]=x[i];
+    delete[] x;
     if (cres==0)
       return res;
     return makevecteur(string2gen(gettext("Unable to minimize at given precision, last value "),false),res); // changed 2021/feb/22 to be able to process the result further
@@ -8243,8 +8314,41 @@ namespace giac {
     return undef;
   }
 
+  int giac_cobyla(cobyla_gc *gc,vecteur &x0,int &maxiter,double eps,int msg) {
+    int n = gc->g._VECTptr->at(2)._VECTptr->size(), m = gc->g._VECTptr->at(1)._VECTptr->size();
+    double *x;
+#ifndef NO_STDEXCEPT
+    try {
+     x = new double[n];
+    } catch (const std::bad_alloc &e) {
+      return COBYLA_ENOMEM;
+    }
+#else
+    x = (double *) malloc (n*sizeof(double));
+    if (!x) return COBYLA_ENOMEM;
+#endif
+    for (int i = 0; i < n; ++i)
+    {
+      gen tmp = evalf_double(x0[i], 1, gc->contextptr);
+      if (tmp.type != _DOUBLE_)
+        return COBYLA_EINVAL;
+      x[i] = tmp._DOUBLE_val;
+    }
+    int cres = cobyla(n, m, x, x[0] / 100, eps, msg, &maxiter, cobyla_giac_function, gc);
+    vecteur res(n);
+    for (int i = 0; i < n; ++i)
+      x0[i] = x[i];
+#ifndef NO_STDEXCEPT
+    delete[] x;
+#else
+    free(x);
+#endif
+    return cres;
+  }
+
 #endif // GIAC_HAS_STO_38
 
+
 #ifndef NO_NAMESPACE_GIAC
 } // namespace giac
 #endif // ndef NO_NAMESPACE_GIAC
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/solve.h b/apps/KhiCAS/src/giac-1.6.0/src/solve.h
index 7cd1b04df..3067cc709 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/solve.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/solve.h
@@ -155,6 +155,20 @@ namespace giac {
   // returns an error or the vecteur of coordinates of variables
   // and sets min_value to f at this point
   gen fmin_cobyla(const gen & f,const vecteur & constraints,const vecteur & variables,const vecteur & guess,const gen & eps0,const gen & maxiter0,GIAC_CONTEXT);
+  // gen-context struct (moved from solve.cc by L. Marohnić)
+  typedef struct gen_context {
+    gen g; //  should be a vector [function,conditions,variables]
+    const context * contextptr;
+  } cobyla_gc;
+  // minimize F subject to CON. (added by L. Marohnić)
+  // F: the expression to be minimized
+  // CON: list of expressions that must be positive for feasibility
+  // X: list of variables
+  // X0: on input, initial point; on output, the last obtained point
+  // MAXITER: on input, maximum allowed number of function evaluations; on output, the total number of evaluations
+  // EPS: tolerance, a positive number
+  // MSG: verbosity level for COBYLA algorithm; from 0 (no output) to 3 (full output)
+  int giac_cobyla(cobyla_gc *gc,vecteur &x0,int &maxiter,double eps=1e-8,int msg=0);
 
 #ifndef NO_NAMESPACE_GIAC
 } // namespace giac
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/static_lexer__numworks.h~ b/apps/KhiCAS/src/giac-1.6.0/src/static_lexer__numworks.h~
deleted file mode 100755
index 66150e42c..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/static_lexer__numworks.h~
+++ /dev/null
@@ -1,1519 +0,0 @@
- & at_PERCENT,
- & at_PERCENTCHANGE,
- & at_PERCENTTOTAL,
- & at_struct_dot,
- & at_ABS,
- & at_ACOS,
- & at_ACOSH,
- & at_ACOT,
- & at_ACSC,
- & at_ADDCOL,
- & at_ADDROW,
- & at_ALOG,
- & at_ARC,
- & at_ARG,
- & at_ASEC,
- & at_ASIN,
- & at_ASINH,
- & at_ATAN,
- & at_ATANH,
- & at_Airy_Ai,
- & at_Airy_Bi,
- & at_Ans,
- & at_Archive,
- & at_BINOMIAL,
- & at_BesselI,
- & at_BesselJ,
- & at_BesselK,
- & at_BesselY,
- & at_Beta,
- & at_Bezier,
- & at_BlockDiagonal,
- & at_CEILING,
- & at_CHOOSE,
- & at_COLNORM,
- & at_COMB,
- & at_CONCAT,
- & at_COND,
- & at_CONJ,
- & at_COS,
- & at_COSH,
- & at_COT,
- & at_CROSS,
- & at_CSC,
- & at_Celsius2Fahrenheit,
- & at_Ci,
- & at_Ci0,
- & at_Circle,
- & at_ClrDraw,
- & at_ClrGraph,
- & at_ClrIO,
- & at_CopyVar,
- & at_CyclePic,
- & at_DEGXRAD,
- & at_DELCOL,
- & at_DELROW,
- & at_DET,
- & at_DISP,
- & at_DOT,
- & at_DROP,
- & at_DUP,
- & at_DelFold,
- & at_DelVar,
- & at_Det,
- & at_Dirac,
- & at_DispG,
- & at_DispHome,
- & at_DrawFunc,
- & at_DrawInv,
- & at_DrawParm,
- & at_DrawPol,
- & at_DrawSlp,
- & at_DrwCtour,
- & at_EDITMAT,
- & at_EIGENVAL,
- & at_EIGENVV,
- & at_EXP,
- & at_EXPM1,
- & at_EXPORT,
- & at_Ei,
- & at_Ei0,
- & at_Ei_f,
- & at_Eta,
- & at_Exec,
- & at_FLOOR,
- & at_FNROOT,
- & at_Factor,
- & at_Fahrenheit2Celsius,
- & at_Fill,
- & at_GETKEY,
-#ifndef NO_RTTI
- & at_GF,
-#endif
- & at_Gamma,
- & at_Gcd,
- & at_Gcdex,
- & at_Get,
- & at_GetCalc,
- & at_GetFold,
- & at_Graph,
- & at_HMSX,
- & at_Heaviside,
- & at_IDENMAT,
- & at_IFTE,
- & at_IM,
- & at_INPUT,
- & at_INVERSE,
- & at_ISOLATE,
- & at_ITERATE,
- & at_Input,
- & at_InputStr,
- & at_Int,
- & at_Inverse,
- & at_JordanBlock,
- & at_Kronecker,
- & at_LINE,
- & at_IS_LINEAR,
- & at_LN,
- & at_LNP1,
- & at_LOG,
- & at_LQ,
- & at_LSQ,
- & at_LU,
- & at_Line,
- & at_LineHorz,
- & at_LineTan,
- & at_LineVert,
- & at_MAKELIST,
- & at_MAKEMAT,
- & at_MANT,
- & at_MAX,
- & at_MAXREAL,
- & at_MIN,
- & at_MINREAL,
- & at_MINUS,
- & at_MOD,
- & at_MSGBOX,
- & at_NOP,
- & at_NORMALD,
- & at_NTHROOT,
- & at_NewFold,
- & at_NewPic,
- & at_Nop,
- & at_Nullspace,
- & at_OVER,
- & at_Output,
- & at_Ox_2d_unit_vector,
- & at_Ox_3d_unit_vector,
- & at_Oy_2d_unit_vector,
- & at_Oy_3d_unit_vector,
- & at_Oz_3d_unit_vector,
- & at_PERM,
- & at_PICK,
- & at_PIECEWISE,
- & at_PIXOFF,
- & at_PIXON,
- & at_POISSON,
- & at_POLYCOEF,
- & at_POLYEVAL,
- & at_POLYFORM,
- & at_POLYROOT,
- & at_POS,
- & at_PRINT,
- & at_Pause,
- & at_Phi,
- & at_Pictsize,
- & at_PopUp,
- & at_Prompt,
- & at_Psi,
- & at_Psi_minus_ln,
- & at_PtOff,
- & at_PtOn,
- & at_PtText,
- & at_PxlOff,
- & at_PxlOn,
- & at_QR,
- & at_QUAD,
- & at_QUOTE,
- & at_Quo,
- & at_RADXDEG,
- & at_RANDMAT,
- & at_RANDOM,
- & at_RANDSEED,
- & at_RANK,
- & at_RCL,
- & at_RE,
- & at_RECT,
- & at_RECURSE,
- & at_REDIM,
- & at_REPLACE,
- & at_REVERSE,
- & at_ROUND,
- & at_ROWNORM,
- & at_RREF,
- & at_RandSeed,
- & at_Rank,
- & at_RclPic,
- & at_Rem,
- & at_Resultant,
- & at_RplcPic,
- & at_Rref,
- & at_SCALE,
- & at_SCALEADD,
- & at_SCHUR,
- & at_SEC,
- & at_SIGN,
- & at_SIN,
- & at_SINH,
- & at_SIZE,
- & at_SORT,
- & at_SPECNORM,
- & at_SPECRAD,
- & at_SUB,
- & at_SVD,
- & at_SVL,
- & at_SWAP,
- & at_SWAPCOL,
- & at_SWAPROW,
- & at_SetFold,
- & at_Si,
- & at_SiCi_f,
- & at_SiCi_g,
- & at_SortA,
- & at_SortD,
- & at_StoPic,
- & at_Store,
- & at_Sum,
- & at_TAN,
- & at_TANH,
- & at_TAYLOR,
- & at_TRACE,
- & at_TRN,
- & at_TRUNCATE,
- & at_TeX,
- & at_UTPC,
- & at_UTPF,
- & at_UTPN,
- & at_UTPT,
- & at_Unarchiv,
- & at_VAS,
- & at_VAS_positive,
- & at_VIEWS,
- & at_WAIT,
- & at_XHMS,
- & at_XPON,
- & at_Zeta,
- & at_ZoomRcl,
- & at_ZoomSto,
- & at_a2q,
- & at_abcuv,
- & at_about,
- & at_abs,
- & at_abscissa,
- & at_accumulate_head_tail,
- & at_acos,
- & at_acos2asin,
- & at_acos2atan,
- & at_acosh,
- & at_acot,
- & at_acoth,
- & at_acsc,
- & at_add,
- & at_add_autosimplify,
- & at_add_language,
- & at_additionally,
- & at_adjoint_matrix,
- & at_display,
- & at_affix,
- & at_alg,
- & at_algsubs,
- & at_algvar,
- & at_alog10,
- & at_alors,
- & at_altitude,
- & at_and,
- & at_angle,
- & at_angleat,
- & at_angleatraw,
- & at_animate,
- & at_animate3d,
- & at_animation,
- & at_ans,
- & at_append,
- & at_apply,
- & at_approx,
- & at_arc,
- & at_arcLen,
- & at_archive,
- & at_arclen,
- & at_area,
- & at_areaat,
- & at_areaatraw,
- & at_areaplot,
- & at_arg,
- & at_array,
- & at_array_sto,
- & at_as_function_of,
- & at_asc,
- & at_asec,
- & at_asin,
- & at_asin2acos,
- & at_asin2atan,
- & at_asinh,
- & at_giac_assert,
- & at_assign,
- & at_assume,
- & at_atan,
- & at_atan2,
- & at_atan2acos,
- & at_atan2asin,
- & at_atanh,
- & at_atrig2ln,
- & at_augment,
- & at_autosimplify,
- & at_avance,
- & at_avgRC,
- & at_axis,
- & at_back,
- & at_background,
- & at_backward,
- & at_baisse_crayon,
- & at_bar_plot,
- & at_barplot,
- & at_barycenter,
- & at_basis,
- & at_batons,
- & at_bernoulli,
- & at_besselI,
- & at_besselJ,
- & at_besselK,
- & at_besselY,
- & at_betad,
- & at_betad_cdf,
- & at_betad_icdf,
- & at_bezier,
- & at_bezout_entiers,
- & at_binomial,
- & at_binomial_cdf,
- & at_binomial_icdf,
- & at_binprint,
- & at_bisector,
- & at_bitand,
- & at_bitmap,
- & at_bitor,
- & at_bitxor,
- & at_black,
- & at_blockmatrix,
- & at_blockmatrix_mult_size,
- & at_blue,
- & at_border,
- & at_bounded_function,
- & at_boxwhisker,
- & at_break,
- & at_breakpoint,
- & at_c1oc2,
- & at_c1op2,
- & at_cFactor,
- & at_cSolve,
- & at_cZeros,
- & at_cache_tortue,
- & at_calc_mode,
- & at_camembert,
- & at_canonical_form,
- & at_cap,
- & at_cas_setup,
- & at_caseval,
- & at_cat,
- & at_cauchy,
- & at_cauchy_cdf,
- & at_cauchy_icdf,
- & at_cauchyd,
- & at_cauchyd_cdf,
- & at_cauchyd_icdf,
- & at_cd,
- & at_cdf,
- & at_cdfplot,
- & at_ceil,
- & at_ceiling,
- & at_cell,
- & at_center,
- & at_center2interval,
- & at_centered_cube,
- & at_centered_tetrahedron,
- & at_center,
- & at_circle,
- & at_cfactor,
- & at_cfsolve,
- & at_changebase,
- & at_char,
- & at_charpoly,
- & at_chinrem,
- & at_chisquare,
- & at_chisquare_cdf,
- & at_chisquare_icdf,
- & at_chisquared,
- & at_chisquared_cdf,
- & at_chisquared_icdf,
- & at_chisquaret,
- & at_choice,
- & at_cholesky,
- & at_choosebox,
- & at_chr,
- & at_chrem,
- & at_circle,
- & at_circumcircle,
- & at_classes,
- & at_clear,
- & at_clearscreen,
- & at_click,
- & at_close,
- & at_coeff,
- & at_coeffs,
- & at_col,
- & at_colDim,
- & at_colNorm,
- & at_colSwap,
- & at_coldim,
- & at_collect,
- & at_colnorm,
- & at_color,
- & at_colspace,
- & at_colswap,
- & at_comDenom,
- & at_comb,
- & at_combine,
- & at_comment,
- & at_common_perpendicular,
- & at_companion,
- & at_compare,
- & at_complex,
- & at_complexroot,
- & at_concat,
- & at_cond,
- & at_cone,
- & at_confidence,
- & at_conic,
- & at_conj,
- & at_conjugate_gradient,
- & at_cont,
- & at_contains,
- & at_content,
- & at_contourplot,
- & at_convert,
- & at_convert3d,
- & at_convertir,
- & at_convexhull,
- & at_coordinates,
- & at_coordinates,
- & at_copy,
- & at_correlation,
- & at_cos,
- & at_cos2sintan,
- & at_cosh,
- & at_cot,
- & at_cote,
- & at_coth,
- & at_count,
- & at_count_eq,
- & at_count_inf,
- & at_count_sup,
- & at_courbe_parametrique,
- & at_courbe_polaire,
- & at_covariance,
- & at_covariance_correlation,
- & at_cpartfrac,
- & at_crationalroot,
- & at_crayon,
- & at_critical,
- & at_cross,
- & at_crossP,
- & at_cross_ratio,
- & at_crossproduct,
- & at_csc,
- & at_csch,
- & at_csolve,
- & at_csv2gen,
- & at_cube,
- & at_cumSum,
- & at_cumsum,
- & at_cumulated_frequencies,
- & at_curl,
- & at_current_sheet,
- & at_curvature,
- & at_curve,
- & at_cyan,
- & at_cycle2perm,
- & at_cycleinv,
- & at_cycles2permu,
- & at_cyclotomic,
- & at_cylinder,
- & at_czeros,
- & at_dayofweek,
- & at_de,
- & at_deSolve,
- & at_debug,
- & at_debug_infolevel,
- & at_debut_enregistrement,
- & at_decrement,
- & at_degree,
- & at_del,
- & at_delcols,
- & at_delrows,
- & at_deltalist,
- & at_denom,
- & at_densityplot,
- & at_deriver,
- & at_desolve,
- & at_dessine_tortue,
- & at_det,
- & at_det_minor,
- & at_developper,
- & at_developper_transcendant,
- & at_dfc,
- & at_dfc2f,
- & at_diag,
- & at_diff,
- & at_dim,
- & at_display,
- & at_disque,
- & at_disque_centre,
- & at_distance,
- & at_distance2,
- & at_distanceat,
- & at_distanceatraw,
- & at_div,
- & at_divcrement,
- & at_divergence,
- & at_divide,
- & at_divis,
- & at_division_point,
- & at_divisors,
- & at_divmod,
- & at_divpc,
- & at_dodecahedron,
- & at_domain,
- & at_dot,
- & at_dotP,
- & at_dotprod,
- & at_baisse_crayon,
- & at_draw_arc,
- & at_draw_circle,
- & at_draw_line,
- & at_set_pixel,
- & at_draw_polygon,
- & at_draw_rectangle,
- & at_draw_string,
- & at_droit,
- & at_line,
- & at_droite_tangente,
- & at_dsolve,
- & at_dtype,
- & at_e2r,
- & at_ecart_type,
- & at_ecart_type_population,
- & at_ecris,
- & at_efface,
- & at_egcd,
- & at_egv,
- & at_egvl,
- & at_eigVc,
- & at_eigVl,
- & at_eigenvals,
- & at_eigenvalues,
- & at_eigenvectors,
- & at_eigenvects,
- & at_element,
- & at_eliminate,
- & at_ellipse,
- & at_entry,
- & at_envelope,
- & at_epsilon2zero,
- & at_equal2diff,
- & at_equal2list,
- & at_equation,
- & at_equilateral_triangle,
- & at_erase3d,
- & at_erf,
- & at_erfc,
- & at_erfs,
- & at_et,
- & at_euler,
- & at_euler_mac_laurin,
- & at_eval,
- & at_eval_level,
- & at_evala,
- & at_evalb,
- & at_evalc,
- & at_evalf,
- & at_evalfa,
- & at_evalm,
- & at_even,
- & at_evolute,
- & at_exact,
- & at_exbisector,
- & at_excircle,
- & at_execute,
- & at_exp,
- & at_exp2list,
- & at_exp2pow,
- & at_exp2trig,
- & at_expexpand,
- & at_expln2trig,
- & at_exponential,
- & at_exponential_cdf,
- & at_exponential_icdf,
- & at_exponential_regression,
- & at_exponential_regression_plot,
- & at_exponentiald,
- & at_exponentiald_cdf,
- & at_exponentiald_icdf,
- & at_expr,
- & at_extend,
- & at_extract_measure,
- & at_ezgcd,
- & at_f2nd,
- & at_fMax,
- & at_fMin,
- & at_fPart,
- & at_faces,
- & at_facteurs_premiers,
- & at_factor,
- & at_factor_xn,
- & at_factorial,
- & at_factoriser,
- & at_factoriser_entier,
- & at_factoriser_sur_C,
- & at_factoriser_xn,
- & at_factors,
- & at_faire,
- & at_fclose,
- & at_fcoeff,
- & at_fft,
- & at_fft_mult_size,
- & at_fieldplot,
- & at_fill_rect,
- & at_filled,
- & at_filter,
- & at_fin_enregistrement,
- & at_find,
- & at_findhelp,
- & at_fisher,
- & at_fisher_cdf,
- & at_fisher_icdf,
- & at_fisherd,
- & at_fisherd_cdf,
- & at_fisherd_icdf,
- & at_flatten,
- & at_flatten1,
- & at_float,
- & at_float2rational,
- & at_floor,
- & at_fmod,
- & at_fonction,
- & at_fonction_derivee,
- & at_fopen,
- & at_format,
- & at_forward,
- & at_fourier_an,
- & at_fourier_bn,
- & at_fourier_cn,
- & at_fprint,
- & at_frac,
- & at_fracmod,
- & at_frame_2d,
- & at_frame_3d,
- & at_frenet,
- & at_frequencies,
- & at_frexp,
- & at_frobenius_norm,
- & at_froot,
- & at_fsolve,
- & at_funcplot,
- & at_function_diff,
- & at_fxnd,
- & at_galoisconj,
- & at_gammad,
- & at_gammad_cdf,
- & at_gammad_icdf,
- & at_gauche,
- & at_gauss,
- & at_gauss_seidel_linsolve,
- & at_gaussjord,
- & at_gaussquad,
- & at_gbasis,
- & at_gcd,
- & at_gcdex,
- & at_genpoly,
- & at_geo2d,
- & at_geo3d,
- & at_geometric,
- & at_geometric_cdf,
- & at_geometric_icdf,
- & at_getDenom,
- & at_getKey,
- & at_getNum,
- & at_getType,
- & at_getKey,
- & at_get_pixel,
- & at_ggb_ang,
- & at_ggbalt,
- & at_ggbsort,
- & at_giac,
- & at_goto,
- & at_grad,
- & at_gramschmidt,
- & at_graph2tex,
- & at_graph3d2tex,
- & at_graph_scc,
- & at_graphe,
- & at_graphe3d,
- & at_graphe_suite,
- & at_greduce,
- & at_green,
- & at_grid_paper,
- & at_groupermu,
- & at_hadamard,
- & at_half_cone,
- & at_half_line,
- & at_halftan,
- & at_halftan_hyp2exp,
- & at_halt,
- & at_hamdist,
- & at_harmonic,
- & at_harmonic_conjugate,
- & at_harmonic_division,
- & at_has,
- & at_hasard,
- & at_head,
- & at_heading,
- & at_heap_mult,
- & at_heapify,
- & at_heappop,
- & at_heappush,
- & at_help,
- & at_hermite,
- & at_hessenberg,
- & at_hessian,
- & at_heugcd,
- & at_hexagon,
- & at_hexprint,
- & at_hidden_name,
- & at_hideturtle,
- & at_hilbert,
- & at_histogram,
- & at_hold,
- & at_homothety,
- & at_horner,
- & at_hp38,
- & at_hyp2exp,
- & at_hyperbola,
- & at_hyperplan,
- & at_hypersphere,
- & at_hypersurface,
- & at_iPart,
- & at_iabcuv,
- & at_ibasis,
- & at_ibpdv,
- & at_ibpu,
- & at_icdf,
- & at_ichinrem,
- & at_ichrem,
- & at_icontent,
- & at_icosahedron,
- & at_id,
- & at_identity,
- & at_idivis,
- & at_idn,
- & at_iegcd,
- & at_ifactor,
- & at_ifactors,
- & at_ifft,
- & at_igamma_exp,
- & at_igcd,
- & at_igcdex,
- & at_ihermite,
- & at_ilaplace,
- & at_im,
- & at_imag,
- & at_image,
- & at_implicit_diff,
- & at_implicitplot,
- & at_implicitplot3d,
- & at_inString,
- & at_in_ideal,
- & at_incircle,
- & at_increment,
- & at_indets,
- & at_index,
- & at_inequationplot,
- & at_inferieur_strict_sort,
- & at_innertln,
- & at_input,
- & at_inputform,
- & at_insert,
- & at_insmod,
- & at_int,
- & at_intDiv,
- & at_integer_format,
- & at_integrate,
- & at_integrer,
- & at_inter,
- & at_interactive,
- & at_interactive_odeplot,
- & at_interactive_plotode,
- & at_interp,
- & at_interval2center,
- & at_inv,
- & at_invd_blocksize,
- & at_inverse,
- & at_inversion,
- & at_invlaplace,
- & at_invztrans,
- & at_iquo,
- & at_iquorem,
- & at_iquosto,
- & at_iratrecon,
- & at_irem,
- & at_iremsto,
- & at_isPrime,
- & at_is_3dpoint,
- & at_is_collinear,
- & at_is_concyclic,
- & at_is_conjugate,
- & at_is_coplanar,
- & at_is_cospherical,
- & at_is_cycle,
- & at_is_element,
- & at_is_equilateral,
- & at_is_harmonic,
- & at_is_harmonic_circle_bundle,
- & at_is_harmonic_line_bundle,
- & at_is_included,
- & at_is_isosceles,
- & at_is_orthogonal,
- & at_is_parallel,
- & at_is_parallelogram,
- & at_is_permu,
- & at_is_perpendicular,
- & at_is_polynomial,
- & at_is_prime,
- & at_is_pseudoprime,
- & at_is_rectangle,
- & at_is_rhombus,
- & at_is_square,
- & at_isfinite,
- & at_isinf,
- & at_ismith,
- & at_isnan,
- & at_isobarycenter,
- & at_isom,
- & at_isopolygon,
- & at_isosceles_triangle,
- & at_isprime,
- & at_ithprime,
- & at_jacobi_linsolve,
- & at_jacobi_symbol,
- & at_javascript,
- & at_join,
- & at_jordan,
- & at_jump,
- & at_ker,
- & at_kernel,
- & at_keydown,
- & at_kill,
- & at_kolmogorovd,
- & at_kolmogorovt,
- & at_l1norm,
- & at_l2norm,
- & at_label,
- & at_lagrange,
- & at_laguerre,
- & at_lapack_limit,
- & at_laplace,
- & at_laplacian,
- & at_latex,
- & at_lcm,
- & at_lcoeff,
- & at_ldegree,
- & at_ldexp,
- & at_left,
- & at_legend,
- & at_legendre,
- & at_legendre_symbol,
- & at_len,
- & at_length,
- & at_leve_crayon,
- & at_lgcd,
- & at_lhs,
- & at_ligne_polygonale,
- & at_ligne_polygonale_pointee,
- & at_limit,
- & at_limite,
- & at_lin,
- & at_line,
- & at_line_inter,
- & at_line_paper,
- & at_line_segments,
- & at_linear_interpolate,
- & at_linear_regression,
- & at_linear_regression_plot,
- & at_lineariser,
- & at_lineariser_trigo,
- & at_LineTan,
- & at_linfnorm,
- & at_link2giac,
- & at_linsolve,
- & at_linspace,
- & at_lis,
- & at_lis_phrase,
- & at_list2exp,
- & at_list2mat,
- & at_listplot,
- & at_lll,
- & at_lll_reduce,
- & at_ln,
- & at_lnGamma_minus,
- & at_lname,
- & at_lncollect,
- & at_lnexpand,
- & at_locus,
- & at_log10,
- & at_logarithmic_regression,
- & at_logarithmic_regression_plot,
- & at_logb,
- & at_logistic_regression,
- & at_logistic_regression_plot,
- & at_lower,
- & at_lsmod,
- & at_lsq,
- & at_lu,
- & at_lvar,
- & at_mRow,
- & at_mRowAdd,
- & at_magenta,
- & at_makelist,
- & at_makemat,
- & at_makemod,
- & at_makesuite,
- & at_makevector,
- & at_mantissa,
- & at_map,
- & at_maple2mupad,
- & at_maple2xcas,
- & at_maple_ifactors,
- & at_maple_mode,
- & at_markov,
- & at_mat2list,
- & at_mathml,
- & at_matpow,
- & at_matrix,
- & at_matrix_norm,
- & at_max,
- & at_max_algext,
- & at_maxnorm,
- & at_mean,
- & at_median,
- & at_median_line,
- & at_member,
- & at_mgf,
- & at_mid,
- & at_midpoint,
- & at_min,
- & at_min_proba_time,
- & at_mkisom,
- & at_mksa,
- & at_modgcd,
- & at_modgcd_cachesize,
- & at_modp,
- & at_mods,
- & at_monotonic,
- & at_montre_tortue,
- & at_moustache,
- & at_moyal,
- & at_moyenne,
- & at_mpzclass_allowed,
- & at_mul,
- & at_mult_c_conjugate,
- & at_mult_conjugate,
- & at_multcrement,
- & at_multinomial,
- & at_multiplier_conjugue,
- & at_multiplier_conjugue_complexe,
- & at_multiply,
- & at_mupad2maple,
- & at_mupad2xcas,
- & at_nCr,
- & at_nDeriv,
- & at_nInt,
- & at_nPr,
- & at_nSolve,
- & at_ncols,
- & at_negbinomial,
- & at_negbinomial_cdf,
- & at_negbinomial_icdf,
- & at_newList,
- & at_newMat,
- & at_newton,
- & at_nextperm,
- & at_nextprime,
- & at_nodisp,
- & at_non,
- & at_non_recursive_normal,
- & at_nop,
- & at_nops,
- & at_norm,
- & at_normal,
- & at_normal_cdf,
- & at_normal_icdf,
- & at_normald,
- & at_normald_cdf,
- & at_normald_icdf,
- & at_normalize,
- & at_normalt,
- & at_nprimes,
- & at_nrows,
- & at_nuage_points,
- & at_nullspace,
- & at_numer,
- & at_octahedron,
- & at_octprint,
- & at_odd,
- & at_odeplot,
- & at_odesolve,
- & at_op,
- & at_open,
- & at_open_polygon,
- & at_or,
- & at_ord,
- & at_order_size,
- & at_ordinate,
- & at_ordinate,
- & at_orthocenter,
- & at_orthogonal,
- & at_os_version,
- & at_osculating_circle,
- & at_ou,
- & at_output,
- & at_p1oc2,
- & at_p1op2,
- & at_pa2b2,
- & at_pade,
- & at_padic_linsolve,
- & at_parabola,
- & at_parabolic_interpolate,
- & at_parallel,
- & at_parallelepiped,
- & at_parallelogram,
- & at_parameq,
- & at_parameter,
- & at_paramplot,
- & at_pari,
- & at_pari_unlock,
- & at_part,
- & at_partfrac,
- & at_pas,
- & at_pas_de_cote,
- & at_pcar,
- & at_pcar_hessenberg,
- & at_pcoeff,
- & at_baisse_crayon,
- & at_pencolor,
- & at_baisse_crayon,
- & at_slope,
- & at_penup,
- & at_perimeter,
- & at_perimeterat,
- & at_perimeteratraw,
- & at_perm,
- & at_perminv,
- & at_permu2cycles,
- & at_permu2mat,
- & at_permuorder,
- & at_perpen_bisector,
- & at_perpendicular,
- & at_peval,
- & at_piecewise,
- & at_pivot,
- & at_pixoff,
- & at_pixon,
- & at_plane,
- & at_plot,
- & at_plot3d,
- & at_plot_style,
- & at_plotarea,
- & at_plotcdf,
- & at_plotcontour,
- & at_plotdensity,
- & at_plotfield,
- & at_plotfunc,
- & at_plotimplicit,
- & at_plotinequation,
- & at_plotlist,
- & at_plotmatrix,
- & at_plotode,
- & at_plotparam,
- & at_plotpolar,
- & at_plotseq,
- & at_pmin,
- & at_pnt,
- & at_point,
- & at_point2d,
- & at_point3d,
- & at_pointer,
- & at_poisson,
- & at_poisson_cdf,
- & at_poisson_icdf,
- & at_polar,
- & at_polar2rectangular,
- & at_polar_coordinates,
- & at_polar_point,
- & at_polarplot,
- & at_pole,
- & at_poly2symb,
- & at_polyEval,
- & at_polygamma,
- & at_polygon,
- & at_polygone_rempli,
- & at_polygonplot,
- & at_polygonscatterplot,
- & at_polyhedron,
- & at_polynomial_regression,
- & at_polynomial_regression_plot,
- & at_pop,
- & at_position,
- & at_poslbdLMQ,
- & at_posubLMQ,
- & at_potential,
- & at_for,
- & at_pow2exp,
- & at_power_regression,
- & at_power_regression_plot,
- & at_powermod,
- & at_powerpc,
- & at_powexpand,
- & at_powmod,
- & at_prediction,
- & at_prediction95,
- & at_prepend,
- & at_preval,
- & at_prevperm,
- & at_prevprime,
- & at_primpart,
- & at_print,
- & at_printf,
- & at_printpow,
- & at_prism,
- & at_product,
- & at_prog_eval_level,
- & at_projection,
- & at_proot,
- & at_propFrac,
- & at_propfrac,
- & at_psrgcd,
- & at_ptayl,
- & at_leve_crayon,
- & at_pwd,
- & at_pyramid,
- & at_python,
- & at_python_compat,
- & at_python_list,
- & at_q2a,
- & at_qr,
- & at_quadric,
- & at_quadrilateral,
- & at_quantile,
- & at_quartile1,
- & at_quartile3,
- & at_quartiles,
- & at_quaternion,
- & at_quest,
- & at_quo,
- & at_quorem,
- & at_quote,
- & at_r2e,
- & at_radical_axis,
- & at_radius,
- & at_ramene,
- & at_rand,
- & at_randMat,
- & at_randNorm,
- & at_randPoly,
- & at_randbinomial,
- & at_randchisquare,
- & at_randchisquared,
- & at_randexp,
- & at_randfisher,
- & at_randfisherd,
- & at_randgeometric,
- & at_randint,
- & at_randmarkov,
- & at_randmatrix,
- & at_randmultinomial,
- & at_randnormald,
- & at_random,
- & at_randperm,
- & at_randpoisson,
- & at_randpoly,
- & at_randrange,
- & at_randstudent,
- & at_randstudentd,
- & at_randvector,
- & at_range,
- & at_rank,
- & at_ranm,
- & at_ranv,
- & at_rassembler_trigo,
- & at_rat_jordan,
- & at_rat_jordan_block,
- & at_rationalroot,
- & at_ratnormal,
- & at_radius,
- & at_rdiv,
- & at_re,
- & at_read,
- & at_read16,
- & at_read32,
- & at_readrgb,
- & at_readwav,
- & at_real,
- & at_realproot,
- & at_realroot,
- & at_reciprocation,
- & at_rectangle,
- & at_rectangle_plein,
- & at_rectangular2polar,
- & at_rectangular2spherical,
- & at_rectangular_coordinates,
- & at_recule,
- & at_red,
- & at_redim,
- & at_reduced_conic,
- & at_reduced_quadric,
- & at_ref,
- & at_reflection,
- & at_regrouper,
- & at_rem,
- & at_remain,
- & at_remove,
- & at_remove_language,
- & at_reorder,
- & at_repete,
- & at_replace,
- & at_efface,
- & at_reset_solve_counter,
- & at_residue,
- & at_resoudre,
- & at_resoudre_dans_C,
- & at_resoudre_systeme_lineaire,
- & at_restart,
- & at_restart_modes,
- & at_restart_vars,
- & at_resultant,
- & at_reverse,
- & at_reverse_rsolve,
- & at_reverse,
- & at_revert,
- & at_revlist,
- & at_rgb,
- & at_rhombus,
- & at_rhs,
- & at_right,
- & at_right_triangle,
- & at_rm_a_z,
- & at_rm_all_vars,
- & at_rmbreakpoint,
- & at_rmmod,
- & at_rmwatch,
- & at_romberg,
- & at_rond,
- & at_rootof,
- & at_roots,
- & at_rotate,
- & at_rotation,
- & at_round,
- & at_row,
- & at_rowAdd,
- & at_rowDim,
- & at_rowNorm,
- & at_rowSwap,
- & at_rowdim,
- & at_rownorm,
- & at_rowspace,
- & at_rowswap,
- & at_rpn,
- & at_rref,
- & at_rsolve,
- & at_input,
- & at_saute,
- & at_sauve,
- & at_save_history,
- & at_scalarProduct,
- & at_scalar_product,
- & at_scale,
- & at_scaleadd,
- & at_scatterplot,
- & at_schur,
- & at_sec,
- & at_sech,
- & at_segment,
- & at_select,
- & at_semi_augment,
- & at_seq,
- & at_seqplot,
- & at_seqsolve,
- & at_series,
- & at_set_language,
- & at_set_pixel,
- & at_shift,
- & at_shift_phase,
- & at_show,
- & at_show_language,
- & at_showturtle,
- & at_shuffle,
- & at_ifte,
- & at_sialorssinon,
- & at_sign,
- & at_signature,
- & at_signe,
- & at_similarity,
- & at_simp2,
- & at_simplex_reduce,
- & at_simplifier,
- & at_simplify,
- & at_simult,
- & at_sin,
- & at_sin2costan,
- & at_sin_regression,
- & at_sin_regression_plot,
- & at_sincos,
- & at_single_inter,
- & at_singular,
- & at_sinh,
- & at_sinon,
- & at_size,
- & at_sizes,
- & at_skip,
- & at_sleep,
- & at_slope,
- & at_slopeat,
- & at_slopeatraw,
- & at_smith,
- & at_smod,
- & at_snedecor,
- & at_snedecor_cdf,
- & at_snedecor_icdf,
- & at_snedecord,
- & at_snedecord_cdf,
- & at_snedecord_icdf,
- & at_solve,
- & at_solve_zero_extremum,
- & at_somme,
- & at_sommet,
- & at_sort,
- & at_sorta,
- & at_sortd,
- & at_sorted,
- & at_soundsec,
- & at_speed,
- & at_sphere,
- & at_spherical2rectangular,
- & at_spline,
- & at_split,
- & at_spread2mathml,
- & at_spreadsheet,
- & at_sq,
- & at_sqrfree,
- & at_sqrt,
- & at_square,
- & at_srand,
- & at_sst,
- & at_sst_in,
- & at_stdDev,
- & at_stddev,
- & at_stddevp,
- & at_step_infolevel,
- & at_sto,
- & at_str,
- & at_strassen_limit,
- & at_string,
- & at_strip,
- & at_student,
- & at_student_cdf,
- & at_student_icdf,
- & at_studentd,
- & at_studentd_cdf,
- & at_studentd_icdf,
- & at_studentt,
- & at_sturm,
- & at_sturmab,
- & at_sturmseq,
- & at_subMat,
- & at_submatrix,
- & at_subst,
- & at_substituer,
- & at_subtype,
- & at_sum,
- & at_sum_riemann,
- & at_suppress,
- & at_surd,
- & at_svd,
- & at_svl,
- & at_swapcol,
- & at_swaprow,
- & at_switch_axes,
- & at_sylvester,
- & at_symb2poly,
- & at_syst2mat,
- & at_tCollect,
- & at_tExpand,
- & at_table,
- & at_tablefunc,
- & at_tableseq,
- & at_tabvar,
- & at_tail,
- & at_tan,
- & at_tan2cossin2,
- & at_tan2sincos,
- & at_tan2sincos2,
- & at_tangent,
- & at_tangente,
- & at_tanh,
- & at_for,
- & at_taux_accroissement,
- & at_taylor,
- & at_tchebyshev1,
- & at_tchebyshev2,
- & at_tcoeff,
- & at_tcollect,
- & at_tcollectsin,
- & at_testfunc,
- & at_tests,
- & at_tetrahedron,
- & at_texpand,
- & at_textinput,
- & at_threads_allowed,
- & at_throw,
- & at_time,
- & at_tlin,
- & at_total_degree,
- & at_tourne_droite,
- & at_tourne_gauche,
- & at_trace,
- & at_tran,
- & at_translation,
- & at_transpose,
- & at_triangle,
- & at_triangle_paper,
- & at_triangle_plein,
- & at_trig2exp,
- & at_trigcos,
- & at_trigexpand,
- & at_trigsin,
- & at_trigtan,
- & at_trn,
- & at_trunc,
- & at_truncate,
- & at_tsimplify,
- & at_turtle_stack,
- & at_type,
- & at_ufactor,
- & at_unapply,
- & at_unarchive,
- & at_unarchive_ti,
- & at_uniform,
- & at_uniform_cdf,
- & at_uniform_icdf,
- & at_uniformd,
- & at_uniformd_cdf,
- & at_uniformd_icdf,
- & at_unitV,
- & at_unquote,
- & at_leve_crayon,
- & at_upper,
- & at_usimplify,
- & at_valuation,
- & at_vandermonde,
- & at_variance,
- & at_vector,
- & at_vers,
- & at_version,
- & at_vertices,
- & at_vertices_abc,
- & at_vertices_abca,
- & at_speed,
- & at_vpotential,
- & at_warn_equal_in_prog,
- & at_watch,
- & at_weibull,
- & at_weibull_cdf,
- & at_weibull_icdf,
- & at_weibulld,
- & at_weibulld_cdf,
- & at_weibulld_icdf,
- & at_whattype,
- & at_when,
- & at_white,
- & at_widget_size,
- & at_wilcoxonp,
- & at_wilcoxons,
- & at_wilcoxont,
- & at_with_sqrt,
- & at_write,
- & at_write16,
- & at_write32,
- & at_writergb,
- & at_writewav,
- & at_wz_certificate,
- & at_xcas,
- & at_xcas_mode,
- & at_xyztrange,
- & at_yellow,
- & at_zeros,
- & at_zip,
- & at_ztrans,
- & at_DELTALIST,
- & at_PILIST,
- & at_SIGMALIST,
- & at_HPDIFF,
- & at_HPSUM,
- & at_HPINT,
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/static_lexer_numworks.h~ b/apps/KhiCAS/src/giac-1.6.0/src/static_lexer_numworks.h~
deleted file mode 100755
index 3552da523..000000000
--- a/apps/KhiCAS/src/giac-1.6.0/src/static_lexer_numworks.h~
+++ /dev/null
@@ -1,1519 +0,0 @@
-{"%",13,-124,0,0},
-{"%CHANGE",13,-124,0,0},
-{"%TOTAL",13,-124,0,0},
-{".",13,9,0,0},
-{"ABS",13,-124,0,0},
-{"ACOS",13,-124,0,0},
-{"ACOSH",13,-124,0,0},
-{"ACOT",13,-124,0,0},
-{"ACSC",13,-124,0,0},
-{"ADDCOL",13,-124,0,0| 1},
-{"ADDROW",13,-124,0,0| 1},
-{"ALOG",13,-124,0,0},
-{"ARC",13,-124,0,0},
-{"ARG",13,-124,0,0},
-{"ASEC",13,-124,0,0},
-{"ASIN",13,-124,0,0},
-{"ASINH",13,-124,0,0},
-{"ATAN",13,-124,0,0},
-{"ATANH",13,-124,0,0},
-{"Airy_Ai",13,9,0,0},
-{"Airy_Bi",13,9,0,0},
-{"Ans",13,4,0,0},
-{"Archive",13,77,0,0| 1},
-{"BINOMIAL",13,9,0,0},
-{"BesselI",13,9,0,0},
-{"BesselJ",13,9,0,0},
-{"BesselK",13,9,0,0},
-{"BesselY",13,9,0,0},
-{"Beta",13,9,0,0},
-{"Bezier",13,9,0,0},
-{"BlockDiagonal",13,9,0,0},
-{"CEILING",13,-124,0,0},
-{"CHOOSE",13,-124,0,0| 1},
-{"COLNORM",13,-124,0,0},
-{"COMB",13,-124,0,0},
-{"CONCAT",13,-124,0,0},
-{"COND",13,-124,0,0},
-{"CONJ",13,-124,0,0},
-{"COS",13,-124,0,0},
-{"COSH",13,-124,0,0},
-{"COT",13,-124,0,0},
-{"CROSS",13,-124,0,0},
-{"CSC",13,-124,0,0},
-{"Celsius2Fahrenheit",13,9,0,0},
-{"Ci",13,9,0,0},
-{"Ci0",13,9,0,0},
-{"Circle",13,77,0,0},
-{"ClrDraw",13,8,0,0},
-{"ClrGraph",13,8,0,0},
-{"ClrIO",13,8,0,0},
-{"CopyVar",13,77,0,0| 1},
-{"CyclePic",13,77,0,0},
-{"DEGXRAD",13,-124,0,0},
-{"DELCOL",13,-124,0,0| 1},
-{"DELROW",13,-124,0,0| 1},
-{"DET",13,-124,0,0},
-{"DISP",13,-124,0,0| 1},
-{"DOT",13,-124,0,0},
-{"DROP",13,85,0,0},
-{"DUP",13,85,0,0},
-{"DelFold",13,77,0,0| 1},
-{"DelVar",13,77,0,0| 1},
-{"Det",13,9,0,0},
-{"Dirac",13,9,0,0},
-{"DispG",13,8,0,0},
-{"DispHome",13,8,0,0},
-{"DrawFunc",13,77,0,0},
-{"DrawInv",13,77,0,0},
-{"DrawParm",13,77,0,0},
-{"DrawPol",13,77,0,0},
-{"DrawSlp",13,77,0,0},
-{"DrwCtour",13,77,0,0},
-{"EDITMAT",13,-124,0,0| 1},
-{"EIGENVAL",13,-124,0,0},
-{"EIGENVV",13,-124,0,0},
-{"EXP",13,-124,0,0},
-{"EXPM1",13,-124,0,0},
-{"EXPORT",13,77,0,0| 1},
-{"Ei",13,9,0,0},
-{"Ei0",13,9,0,0},
-{"Ei_f",13,9,0,0},
-{"Eta",13,9,0,0},
-{"Exec",13,77,0,0},
-{"FLOOR",13,-124,0,0},
-{"FNROOT",13,-124,0,0| 1},
-{"Factor",13,9,0,0},
-{"Fahrenheit2Celsius",13,-124,0,0},
-{"Fill",13,77,0,0| 1},
-{"GETKEY",13,-124,0,0},
-#ifndef NO_RTTI
-{"GF",13,9,0,0},
-#endif
-{"Gamma",13,9,0,0},
-{"Gcd",13,9,0,0},
-{"Gcdex",13,9,0,0},
-{"Get",13,77,0,0| 1},
-{"GetCalc",13,77,0,0| 1},
-{"GetFold",13,8,0,0},
-{"Graph",13,77,0,0},
-{"HMSX",13,-124,0,0},
-{"Heaviside",13,9,0,0},
-{"IDENMAT",13,-124,0,0},
-{"IFTE",13,85,0,0},
-{"IM",13,-124,0,0},
-{"INPUT",13,-124,0,0| 1},
-{"INVERSE",13,-124,0,0},
-{"ISOLATE",13,-124,0,0| 1},
-{"ITERATE",13,-124,0,0| 1},
-{"Input",13,77,0,0| 1},
-{"InputStr",13,77,0,0| 1},
-{"Int",13,9,0,0},
-{"Inverse",13,9,0,0},
-{"JordanBlock",13,9,0,0},
-{"Kronecker",13,9,0,0},
-{"LINE",13,-124,0,0},
-{"LINEAR?",13,-124,0,0},
-{"LN",13,-124,0,0},
-{"LNP1",13,-124,0,0},
-{"LOG",13,-124,0,0},
-{"LQ",13,-124,0,0},
-{"LSQ",13,-124,0,0},
-{"LU",13,9,0,0| 1},
-{"Line",13,77,0,0},
-{"LineHorz",13,77,0,0},
-{"LineTan",13,77,0,0},
-{"LineVert",13,77,0,0},
-{"MAKELIST",13,-124,0,0| 1},
-{"MAKEMAT",13,-124,0,0| 1},
-{"MANT",13,-124,0,0},
-{"MAX",13,-124,0,0},
-{"MAXREAL",13,2,0,0},
-{"MIN",13,-124,0,0},
-{"MINREAL",13,2,0,0},
-{"MINUS",13,-124,0,0},
-{"MOD",13,21,0,0},
-{"MSGBOX",13,-124,0,0},
-{"NOP",13,85,0,0},
-{"NORMALD",13,9,0,0},
-{"NTHROOT",13,23,0,0},
-{"NewFold",13,77,0,0| 1},
-{"NewPic",13,77,0,0},
-{"Nop",13,9,0,0},
-{"Nullspace",13,9,0,0},
-{"OVER",13,85,0,0},
-{"Output",13,77,0,0},
-{"Ox_2d_unit_vector",13,9,0,0},
-{"Ox_3d_unit_vector",13,9,0,0},
-{"Oy_2d_unit_vector",13,9,0,0},
-{"Oy_3d_unit_vector",13,9,0,0},
-{"Oz_3d_unit_vector",13,9,0,0},
-{"PERM",13,-124,0,0},
-{"PICK",13,85,0,0},
-{"PIECEWISE",13,9,0,0| 1},
-{"PIXOFF",13,-124,0,0},
-{"PIXON",13,-124,0,0},
-{"POISSON",13,9,0,0},
-{"POLYCOEF",13,9,0,0| 1},
-{"POLYEVAL",13,-124,0,0},
-{"POLYFORM",13,-124,0,0| 1},
-{"POLYROOT",13,-124,0,0| 1},
-{"POS",13,-124,0,0},
-{"PRINT",13,-124,0,0| 1},
-{"Pause",13,77,0,0},
-{"Phi",13,9,0,0},
-{"Pictsize",13,9,0,0},
-{"PopUp",13,77,0,0| 1},
-{"Prompt",13,77,0,0| 1},
-{"Psi",13,9,0,0},
-{"Psi_minus_ln",13,9,0,0},
-{"PtOff",13,77,0,0},
-{"PtOn",13,77,0,0},
-{"PtText",13,77,0,0},
-{"PxlOff",13,77,0,0},
-{"PxlOn",13,77,0,0},
-{"QR",13,9,0,0| 1},
-{"QUAD",13,-124,0,0| 1},
-{"QUOTE",13,-124,0,0| 1},
-{"Quo",13,9,0,0},
-{"RADXDEG",13,-124,0,0},
-{"RANDMAT",13,-124,0,0| 1},
-{"RANDOM",13,77,0,0},
-{"RANDSEED",13,77,0,0},
-{"RANK",13,-124,0,0},
-{"RCL",13,85,0,0},
-{"RE",13,-124,0,0},
-{"RECT",13,-124,0,0},
-{"RECURSE",13,-124,0,0| 1},
-{"REDIM",13,-124,0,0| 1},
-{"REPLACE",13,-124,0,0| 1},
-{"REVERSE",13,-124,0,0},
-{"ROUND",13,-124,0,0},
-{"ROWNORM",13,-124,0,0},
-{"RREF",13,-124,0,0},
-{"RandSeed",13,77,0,0},
-{"Rank",13,9,0,0},
-{"RclPic",13,77,0,0| 1},
-{"Rem",13,9,0,0},
-{"Resultant",13,9,0,0},
-{"RplcPic",13,77,0,0| 1},
-{"Rref",13,9,0,0},
-{"SCALE",13,-124,0,0| 1},
-{"SCALEADD",13,-124,0,0| 1},
-{"SCHUR",13,-124,0,0},
-{"SEC",13,-124,0,0},
-{"SIGN",13,-124,0,0},
-{"SIN",13,-124,0,0},
-{"SINH",13,-124,0,0},
-{"SIZE",13,-124,0,0},
-{"SORT",13,-124,0,0},
-{"SPECNORM",13,-124,0,0},
-{"SPECRAD",13,-124,0,0},
-{"SUB",13,-124,0,0| 1},
-{"SVD",13,-124,0,0},
-{"SVL",13,-124,0,0},
-{"SWAP",13,85,0,0},
-{"SWAPCOL",13,-124,0,0| 1},
-{"SWAPROW",13,-124,0,0| 1},
-{"SetFold",13,77,0,0| 1},
-{"Si",13,9,0,0},
-{"SiCi_f",13,9,0,0},
-{"SiCi_g",13,9,0,0},
-{"SortA",13,77,0,0| 1},
-{"SortD",13,77,0,0| 1},
-{"StoPic",13,77,0,0| 1},
-{"Store",13,9,0,0| 1},
-{"Sum",13,9,0,0| 1},
-{"TAN",13,-124,0,0},
-{"TANH",13,-124,0,0},
-{"TAYLOR",13,-124,0,0| 1},
-{"TRACE",13,-124,0,0},
-{"TRN",13,-124,0,0},
-{"TRUNCATE",13,-124,0,0},
-{"TeX",13,9,0,0},
-{"UTPC",13,9,0,0},
-{"UTPF",13,9,0,0},
-{"UTPN",13,9,0,0},
-{"UTPT",13,9,0,0},
-{"Unarchiv",13,77,0,0| 1},
-{"VAS",13,9,0,0},
-{"VAS_positive",13,9,0,0},
-{"VIEWS",13,77,0,0| 1},
-{"WAIT",13,-124,0,0},
-{"XHMS",13,-124,0,0},
-{"XPON",13,-124,0,0},
-{"Zeta",13,9,0,0},
-{"ZoomRcl",13,77,0,0},
-{"ZoomSto",13,77,0,0},
-{"a2q",13,9,0,0},
-{"abcuv",13,9,0,0},
-{"about",13,9,0,0},
-{"abs",13,9,0,0},
-{"abscissa",13,9,0,0},
-{"accumulate_head_tail",13,9,0,0},
-{"acos",13,9,0,0},
-{"acos2asin",13,9,0,0},
-{"acos2atan",13,9,0,0},
-{"acosh",13,9,0,0},
-{"acot",13,9,0,0},
-{"acoth",13,9,0,0},
-{"acsc",13,9,0,0},
-{"add",13,9,0,0| 1},
-{"add_autosimplify",13,9,0,0},
-{"add_language",13,9,0,0},
-{"additionally",13,9,0,0| 1},
-{"adjoint_matrix",13,9,0,0},
-{"affichage",13,9,0,0},
-{"affix",13,9,0,0},
-{"alg",13,9,0,0},
-{"algsubs",13,9,0,0},
-{"algvar",13,9,0,0},
-{"alog10",13,9,0,0},
-{"alors",13,49,0,0| 1},
-{"altitude",13,9,0,0},
-{"and",13,33,0,0| 1},
-{"angle",13,9,0,0},
-{"angleat",13,9,0,0| 1},
-{"angleatraw",13,9,0,0},
-{"animate",13,9,0,0},
-{"animate3d",13,9,0,0},
-{"animation",13,9,0,0},
-{"ans",13,9,0,0},
-{"append",13,9,0,0},
-{"apply",13,9,0,0},
-{"approx",13,9,0,0},
-{"arc",13,9,0,0| 1},
-{"arcLen",13,9,0,0},
-{"archive",13,9,0,0},
-{"arclen",13,9,0,0},
-{"area",13,9,0,0},
-{"areaat",13,9,0,0| 1},
-{"areaatraw",13,9,0,0},
-{"areaplot",13,9,0,0},
-{"arg",13,9,0,0},
-{"array",13,9,0,0},
-{"array_sto",13,9,0,0| 1},
-{"as_function_of",13,9,0,0| 1},
-{"asc",13,9,0,0},
-{"asec",13,9,0,0},
-{"asin",13,9,0,0},
-{"asin2acos",13,9,0,0},
-{"asin2atan",13,9,0,0},
-{"asinh",13,9,0,0},
-{"assert",13,77,0,0},
-{"assign",13,9,0,0},
-{"assume",13,9,0,0| 1},
-{"atan",13,9,0,0},
-{"atan2",13,9,0,0},
-{"atan2acos",13,9,0,0},
-{"atan2asin",13,9,0,0},
-{"atanh",13,9,0,0},
-{"atrig2ln",13,9,0,0},
-{"augment",13,9,0,0},
-{"autosimplify",13,9,0,0},
-{"avance",13,126,0,0},
-{"avgRC",13,9,0,0},
-{"axis",13,9,0,0},
-{"back",13,9,0,0},
-{"background",13,9,0,0| 1},
-{"backward",13,9,0,0},
-{"baisse_crayon",13,126,0,0},
-{"bar_plot",13,9,0,0},
-{"barplot",13,9,0,0},
-{"barycenter",13,9,0,0},
-{"basis",13,9,0,0},
-{"batons",13,9,0,0},
-{"bernoulli",13,9,0,0},
-{"besselI",13,9,0,0},
-{"besselJ",13,9,0,0},
-{"besselK",13,9,0,0},
-{"besselY",13,9,0,0},
-{"betad",13,9,0,0},
-{"betad_cdf",13,9,0,0},
-{"betad_icdf",13,9,0,0},
-{"bezier",13,9,0,0},
-{"bezout_entiers",13,9,0,0},
-{"binomial",13,9,0,0},
-{"binomial_cdf",13,9,0,0},
-{"binomial_icdf",13,9,0,0},
-{"binprint",13,9,0,0},
-{"bisector",13,9,0,0},
-{"bitand",13,9,0,0},
-{"bitmap",13,9,0,0},
-{"bitor",13,9,0,0},
-{"bitxor",13,9,0,0},
-{"black",13,2,0,0},
-{"blockmatrix",13,9,0,0},
-{"blockmatrix_mult_size",13,9,0,0},
-{"blue",13,2,0,0},
-{"border",13,9,0,0},
-{"bounded_function",13,9,0,0},
-{"boxwhisker",13,9,0,0},
-{"break",13,68,0,0},
-{"breakpoint",13,9,0,0| 1},
-{"c1oc2",13,9,0,0},
-{"c1op2",13,9,0,0},
-{"cFactor",13,9,0,0},
-{"cSolve",13,9,0,0| 1},
-{"cZeros",13,9,0,0| 1},
-{"cache_tortue",13,126,0,0},
-{"calc_mode",13,9,0,0},
-{"camembert",13,9,0,0},
-{"canonical_form",13,9,0,0},
-{"cap",13,126,0,0},
-{"cas_setup",13,9,0,0},
-{"caseval",13,9,0,0},
-{"cat",13,9,0,0},
-{"cauchy",13,9,0,0},
-{"cauchy_cdf",13,9,0,0},
-{"cauchy_icdf",13,9,0,0},
-{"cauchyd",13,9,0,0},
-{"cauchyd_cdf",13,9,0,0},
-{"cauchyd_icdf",13,9,0,0},
-{"cd",13,9,0,0},
-{"cdf",13,9,0,0},
-{"cdfplot",13,9,0,0},
-{"ceil",13,9,0,0},
-{"ceiling",13,9,0,0},
-{"cell",13,9,0,0},
-{"center",13,9,0,0},
-{"center2interval",13,9,0,0},
-{"centered_cube",13,9,0,0},
-{"centered_tetrahedron",13,9,0,0},
-{"centre",13,9,0,0},
-{"cercle",13,9,0,0| 1},
-{"cfactor",13,9,0,0},
-{"cfsolve",13,9,0,0},
-{"changebase",13,9,0,0},
-{"char",13,9,0,0},
-{"charpoly",13,9,0,0},
-{"chinrem",13,9,0,0},
-{"chisquare",13,9,0,0},
-{"chisquare_cdf",13,9,0,0},
-{"chisquare_icdf",13,9,0,0},
-{"chisquared",13,9,0,0},
-{"chisquared_cdf",13,9,0,0},
-{"chisquared_icdf",13,9,0,0},
-{"chisquaret",13,9,0,0},
-{"choice",13,9,0,0},
-{"cholesky",13,9,0,0},
-{"choosebox",13,9,0,0| 1},
-{"chr",13,9,0,0},
-{"chrem",13,9,0,0},
-{"circle",13,9,0,0| 1},
-{"circumcircle",13,9,0,0},
-{"classes",13,9,0,0},
-{"clear",13,9,0,0},
-{"clearscreen",13,126,0,0},
-{"click",13,9,0,0| 1},
-{"close",13,9,0,0| 1},
-{"coeff",13,9,0,0},
-{"coeffs",13,9,0,0},
-{"col",13,9,0,0},
-{"colDim",13,9,0,0},
-{"colNorm",13,9,0,0},
-{"colSwap",13,9,0,0},
-{"coldim",13,9,0,0},
-{"collect",13,9,0,0},
-{"colnorm",13,9,0,0},
-{"color",13,9,0,0},
-{"colspace",13,9,0,0},
-{"colswap",13,9,0,0},
-{"comDenom",13,9,0,0},
-{"comb",13,9,0,0},
-{"combine",13,9,0,0},
-{"comment",13,9,0,0},
-{"common_perpendicular",13,9,0,0},
-{"companion",13,9,0,0},
-{"compare",13,9,0,0},
-{"complex",13,9,0,0},
-{"complexroot",13,9,0,0},
-{"concat",13,9,0,0},
-{"cond",13,9,0,0},
-{"cone",13,9,0,0},
-{"confidence",13,9,0,0},
-{"conic",13,9,0,0},
-{"conj",13,9,0,0},
-{"conjugate_gradient",13,9,0,0},
-{"cont",13,9,0,0| 1},
-{"contains",13,9,0,0},
-{"content",13,9,0,0},
-{"contourplot",13,9,0,0| 1},
-{"convert",13,9,0,0},
-{"convert3d",13,9,0,0},
-{"convertir",13,9,0,0},
-{"convexhull",13,9,0,0},
-{"coordinates",13,9,0,0},
-{"coordonnees",13,9,0,0},
-{"copy",13,9,0,0},
-{"correlation",13,9,0,0},
-{"cos",13,9,0,0},
-{"cos2sintan",13,9,0,0},
-{"cosh",13,9,0,0},
-{"cot",13,9,0,0},
-{"cote",13,9,0,0},
-{"coth",13,9,0,0},
-{"count",13,9,0,0},
-{"count_eq",13,9,0,0},
-{"count_inf",13,9,0,0},
-{"count_sup",13,9,0,0},
-{"courbe_parametrique",13,9,0,0| 1},
-{"courbe_polaire",13,9,0,0| 1},
-{"covariance",13,9,0,0},
-{"covariance_correlation",13,9,0,0},
-{"cpartfrac",13,9,0,0},
-{"crationalroot",13,9,0,0},
-{"crayon",13,126,0,0},
-{"critical",13,9,0,0},
-{"cross",13,9,0,0},
-{"crossP",13,9,0,0},
-{"cross_ratio",13,9,0,0},
-{"crossproduct",13,9,0,0},
-{"csc",13,9,0,0},
-{"csch",13,9,0,0},
-{"csolve",13,9,0,0| 1},
-{"csv2gen",13,9,0,0},
-{"cube",13,9,0,0},
-{"cumSum",13,9,0,0},
-{"cumsum",13,9,0,0},
-{"cumulated_frequencies",13,9,0,0},
-{"curl",13,9,0,0| 1},
-{"current_sheet",13,9,0,0| 1},
-{"curvature",13,9,0,0},
-{"curve",13,9,0,0},
-{"cyan",13,2,0,0},
-{"cycle2perm",13,9,0,0},
-{"cycleinv",13,9,0,0},
-{"cycles2permu",13,9,0,0},
-{"cyclotomic",13,9,0,0},
-{"cylinder",13,9,0,0},
-{"czeros",13,9,0,0},
-{"dayofweek",13,9,0,0},
-{"de",13,57,0,0| 1},
-{"deSolve",13,77,0,0| 1},
-{"debug",13,9,0,0| 1},
-{"debug_infolevel",13,5,0,0},
-{"debut_enregistrement",13,126,0,0},
-{"decrement",13,9,0,0| 1},
-{"degree",13,9,0,0},
-{"del",13,77,0,0},
-{"delcols",13,9,0,0},
-{"delrows",13,9,0,0},
-{"deltalist",13,9,0,0},
-{"denom",13,9,0,0},
-{"densityplot",13,9,0,0| 1},
-{"deriver",13,9,0,0},
-{"desolve",13,9,0,0| 1},
-{"dessine_tortue",13,126,0,0},
-{"det",13,9,0,0},
-{"det_minor",13,9,0,0},
-{"developper",13,9,0,0},
-{"developper_transcendant",13,9,0,0},
-{"dfc",13,9,0,0},
-{"dfc2f",13,9,0,0},
-{"diag",13,9,0,0},
-{"diff",13,9,0,0| 1},
-{"dim",13,9,0,0},
-{"display",13,9,0,0},
-{"disque",13,126,0,0},
-{"disque_centre",13,126,0,0},
-{"distance",13,9,0,0},
-{"distance2",13,9,0,0},
-{"distanceat",13,9,0,0| 1},
-{"distanceatraw",13,9,0,0},
-{"div",13,22,0,0},
-{"divcrement",13,9,0,0| 1},
-{"divergence",13,9,0,0| 1},
-{"divide",13,9,0,0},
-{"divis",13,9,0,0},
-{"division_point",13,9,0,0},
-{"divisors",13,9,0,0},
-{"divmod",13,9,0,0},
-{"divpc",13,9,0,0},
-{"dodecahedron",13,9,0,0},
-{"domain",13,9,0,0},
-{"dot",13,9,0,0},
-{"dotP",13,9,0,0},
-{"dotprod",13,9,0,0},
-{"down",13,126,0,0},
-{"draw_arc",13,9,0,0},
-{"draw_circle",13,9,0,0},
-{"draw_line",13,9,0,0},
-{"draw_pixel",13,9,0,0},
-{"draw_polygon",13,9,0,0},
-{"draw_rectangle",13,9,0,0},
-{"draw_string",13,9,0,0},
-{"droit",13,9,0,0},
-{"droite",13,9,0,0| 1},
-{"droite_tangente",13,9,0,0},
-{"dsolve",13,9,0,0| 1},
-{"dtype",13,9,0,0},
-{"e2r",13,9,0,0},
-{"ecart_type",13,9,0,0},
-{"ecart_type_population",13,9,0,0},
-{"ecris",13,126,0,0},
-{"efface",13,126,0,0},
-{"egcd",13,9,0,0},
-{"egv",13,9,0,0},
-{"egvl",13,9,0,0},
-{"eigVc",13,9,0,0},
-{"eigVl",13,9,0,0},
-{"eigenvals",13,9,0,0},
-{"eigenvalues",13,9,0,0},
-{"eigenvectors",13,9,0,0},
-{"eigenvects",13,9,0,0},
-{"element",13,9,0,0},
-{"eliminate",13,9,0,0},
-{"ellipse",13,9,0,0},
-{"entry",13,9,0,0},
-{"envelope",13,9,0,0},
-{"epsilon2zero",13,9,0,0| 1},
-{"equal2diff",13,9,0,0},
-{"equal2list",13,9,0,0},
-{"equation",13,9,0,0},
-{"equilateral_triangle",13,9,0,0| 1},
-{"erase3d",13,9,0,0},
-{"erf",13,9,0,0},
-{"erfc",13,9,0,0},
-{"erfs",13,9,0,0},
-{"et",13,33,0,0| 1},
-{"euler",13,9,0,0},
-{"euler_mac_laurin",13,9,0,0},
-{"eval",13,9,0,0| 1},
-{"eval_level",13,9,0,0},
-{"evala",13,9,0,0},
-{"evalb",13,9,0,0| 1},
-{"evalc",13,9,0,0},
-{"evalf",13,9,0,0},
-{"evalfa",13,9,0,0},
-{"evalm",13,9,0,0},
-{"even",13,9,0,0},
-{"evolute",13,9,0,0},
-{"exact",13,9,0,0},
-{"exbisector",13,9,0,0},
-{"excircle",13,9,0,0},
-{"execute",13,9,0,0},
-{"exp",13,9,0,0},
-{"exp2list",13,9,0,0| 1},
-{"exp2pow",13,9,0,0},
-{"exp2trig",13,9,0,0},
-{"expexpand",13,9,0,0},
-{"expln2trig",13,9,0,0},
-{"exponential",13,9,0,0},
-{"exponential_cdf",13,9,0,0},
-{"exponential_icdf",13,9,0,0},
-{"exponential_regression",13,9,0,0},
-{"exponential_regression_plot",13,9,0,0},
-{"exponentiald",13,9,0,0},
-{"exponentiald_cdf",13,9,0,0},
-{"exponentiald_icdf",13,9,0,0},
-{"expr",13,9,0,0},
-{"extend",13,9,0,0},
-{"extract_measure",13,9,0,0},
-{"ezgcd",13,9,0,0},
-{"f2nd",13,9,0,0},
-{"fMax",13,9,0,0},
-{"fMin",13,9,0,0},
-{"fPart",13,9,0,0},
-{"faces",13,9,0,0},
-{"facteurs_premiers",13,9,0,0},
-{"factor",13,9,0,0},
-{"factor_xn",13,9,0,0},
-{"factorial",13,9,0,0},
-{"factoriser",13,9,0,0},
-{"factoriser_entier",13,9,0,0},
-{"factoriser_sur_C",13,9,0,0},
-{"factoriser_xn",13,9,0,0},
-{"factors",13,9,0,0},
-{"faire",13,59,0,0| 1},
-{"fclose",13,9,0,0| 1},
-{"fcoeff",13,9,0,0},
-{"fft",13,9,0,0},
-{"fft_mult_size",13,9,0,0},
-{"fieldplot",13,9,0,0},
-{"fill_rect",13,9,0,0},
-{"filled",13,2,0,0},
-{"filter",13,9,0,0},
-{"fin_enregistrement",13,126,0,0},
-{"find",13,9,0,0},
-{"findhelp",13,9,0,0| 1},
-{"fisher",13,9,0,0},
-{"fisher_cdf",13,9,0,0},
-{"fisher_icdf",13,9,0,0},
-{"fisherd",13,9,0,0},
-{"fisherd_cdf",13,9,0,0},
-{"fisherd_icdf",13,9,0,0},
-{"flatten",13,9,0,0},
-{"flatten1",13,9,0,0},
-{"float",13,9,0,0},
-{"float2rational",13,9,0,0},
-{"floor",13,9,0,0},
-{"fmod",13,9,0,0},
-{"fonction",13,73,0,0| 1},
-{"fonction_derivee",13,9,0,0},
-{"fopen",13,9,0,0},
-{"format",13,9,0,0},
-{"forward",13,9,0,0},
-{"fourier_an",13,9,0,0},
-{"fourier_bn",13,9,0,0},
-{"fourier_cn",13,9,0,0},
-{"fprint",13,9,0,0},
-{"frac",13,9,0,0},
-{"fracmod",13,9,0,0},
-{"frame_2d",13,9,0,0},
-{"frame_3d",13,9,0,0},
-{"frenet",13,9,0,0},
-{"frequencies",13,9,0,0},
-{"frexp",13,9,0,0},
-{"frobenius_norm",13,9,0,0},
-{"froot",13,9,0,0},
-{"fsolve",13,9,0,0| 1},
-{"funcplot",13,9,0,0| 1},
-{"function_diff",13,9,0,0},
-{"fxnd",13,9,0,0},
-{"galoisconj",13,9,0,0},
-{"gammad",13,9,0,0},
-{"gammad_cdf",13,9,0,0},
-{"gammad_icdf",13,9,0,0},
-{"gauche",13,9,0,0},
-{"gauss",13,9,0,0},
-{"gauss_seidel_linsolve",13,9,0,0},
-{"gaussjord",13,9,0,0},
-{"gaussquad",13,9,0,0},
-{"gbasis",13,9,0,0},
-{"gcd",13,9,0,0},
-{"gcdex",13,9,0,0},
-{"genpoly",13,9,0,0},
-{"geo2d",13,9,0,0},
-{"geo3d",13,9,0,0},
-{"geometric",13,9,0,0},
-{"geometric_cdf",13,9,0,0},
-{"geometric_icdf",13,9,0,0},
-{"getDenom",13,9,0,0},
-{"getKey",13,9,0,0},
-{"getNum",13,9,0,0},
-{"getType",13,9,0,0},
-{"get_key",13,9,0,0},
-{"get_pixel",13,9,0,0},
-{"ggb_ang",13,9,0,0},
-{"ggbalt",13,9,0,0},
-{"ggbsort",13,9,0,0},
-{"giac",13,9,0,0},
-{"goto",13,77,0,0},
-{"grad",13,9,0,0| 1},
-{"gramschmidt",13,9,0,0},
-{"graph2tex",13,9,0,0},
-{"graph3d2tex",13,9,0,0},
-{"graph_scc",13,9,0,0},
-{"graphe",13,9,0,0| 1},
-{"graphe3d",13,9,0,0},
-{"graphe_suite",13,9,0,0},
-{"greduce",13,9,0,0},
-{"green",13,2,0,0},
-{"grid_paper",13,9,0,0},
-{"groupermu",13,9,0,0},
-{"hadamard",13,9,0,0},
-{"half_cone",13,9,0,0},
-{"half_line",13,9,0,0},
-{"halftan",13,9,0,0},
-{"halftan_hyp2exp",13,9,0,0},
-{"halt",13,9,0,0| 1},
-{"hamdist",13,9,0,0},
-{"harmonic",13,9,0,0},
-{"harmonic_conjugate",13,9,0,0},
-{"harmonic_division",13,9,0,0| 1},
-{"has",13,9,0,0},
-{"hasard",13,77,0,0},
-{"head",13,9,0,0},
-{"heading",13,9,0,0},
-{"heap_mult",13,9,0,0},
-{"heapify",13,9,0,0},
-{"heappop",13,9,0,0},
-{"heappush",13,9,0,0},
-{"help",13,9,0,0},
-{"hermite",13,9,0,0},
-{"hessenberg",13,9,0,0},
-{"hessian",13,9,0,0| 1},
-{"heugcd",13,9,0,0},
-{"hexagon",13,9,0,0| 1},
-{"hexprint",13,9,0,0},
-{"hidden_name",13,2,0,0},
-{"hideturtle",13,9,0,0},
-{"hilbert",13,9,0,0},
-{"histogram",13,9,0,0},
-{"hold",13,9,0,0| 1},
-{"homothety",13,9,0,0},
-{"horner",13,9,0,0},
-{"hp38",13,9,0,0},
-{"hyp2exp",13,9,0,0},
-{"hyperbola",13,9,0,0},
-{"hyperplan",13,9,0,0},
-{"hypersphere",13,9,0,0},
-{"hypersurface",13,9,0,0},
-{"iPart",13,9,0,0},
-{"iabcuv",13,9,0,0},
-{"ibasis",13,9,0,0},
-{"ibpdv",13,9,0,0},
-{"ibpu",13,9,0,0},
-{"icdf",13,9,0,0},
-{"ichinrem",13,9,0,0},
-{"ichrem",13,9,0,0},
-{"icontent",13,9,0,0},
-{"icosahedron",13,9,0,0},
-{"id",13,9,0,0},
-{"identity",13,9,0,0},
-{"idivis",13,9,0,0},
-{"idn",13,9,0,0},
-{"iegcd",13,9,0,0},
-{"ifactor",13,9,0,0},
-{"ifactors",13,9,0,0},
-{"ifft",13,9,0,0},
-{"igamma_exp",13,9,0,0},
-{"igcd",13,9,0,0},
-{"igcdex",13,9,0,0},
-{"ihermite",13,9,0,0},
-{"ilaplace",13,9,0,0},
-{"im",13,9,0,0},
-{"imag",13,9,0,0},
-{"image",13,9,0,0},
-{"implicit_diff",13,9,0,0},
-{"implicitplot",13,9,0,0},
-{"implicitplot3d",13,9,0,0},
-{"inString",13,9,0,0},
-{"in_ideal",13,9,0,0},
-{"incircle",13,9,0,0},
-{"increment",13,9,0,0| 1},
-{"indets",13,9,0,0},
-{"index",13,9,0,0},
-{"inequationplot",13,9,0,0| 1},
-{"inferieur_strict_sort",13,9,0,0},
-{"innertln",13,9,0,0},
-{"input",13,9,0,0| 1},
-{"inputform",13,9,0,0| 1},
-{"insert",13,9,0,0},
-{"insmod",13,9,0,0},
-{"int",13,9,0,0},
-{"intDiv",13,9,0,0},
-{"integer_format",13,9,0,0},
-{"integrate",13,9,0,0| 1},
-{"integrer",13,9,0,0},
-{"inter",13,9,0,0},
-{"interactive",13,9,0,0| 1},
-{"interactive_odeplot",13,9,0,0},
-{"interactive_plotode",13,9,0,0},
-{"interp",13,9,0,0},
-{"interval2center",13,9,0,0},
-{"inv",13,9,0,0},
-{"invd_blocksize",13,9,0,0},
-{"inverse",13,9,0,0},
-{"inversion",13,9,0,0},
-{"invlaplace",13,9,0,0},
-{"invztrans",13,9,0,0},
-{"iquo",13,9,0,0},
-{"iquorem",13,9,0,0},
-{"iquosto",13,9,0,0},
-{"iratrecon",13,9,0,0},
-{"irem",13,9,0,0},
-{"iremsto",13,9,0,0},
-{"isPrime",13,9,0,0},
-{"is_3dpoint",13,9,0,0},
-{"is_collinear",13,9,0,0},
-{"is_concyclic",13,9,0,0},
-{"is_conjugate",13,9,0,0},
-{"is_coplanar",13,9,0,0},
-{"is_cospherical",13,9,0,0},
-{"is_cycle",13,9,0,0},
-{"is_element",13,9,0,0},
-{"is_equilateral",13,9,0,0},
-{"is_harmonic",13,9,0,0},
-{"is_harmonic_circle_bundle",13,9,0,0},
-{"is_harmonic_line_bundle",13,9,0,0},
-{"is_included",13,9,0,0},
-{"is_isosceles",13,9,0,0},
-{"is_orthogonal",13,9,0,0},
-{"is_parallel",13,9,0,0},
-{"is_parallelogram",13,9,0,0},
-{"is_permu",13,9,0,0},
-{"is_perpendicular",13,9,0,0},
-{"is_polynomial",13,9,0,0},
-{"is_prime",13,9,0,0},
-{"is_pseudoprime",13,9,0,0},
-{"is_rectangle",13,9,0,0},
-{"is_rhombus",13,9,0,0},
-{"is_square",13,9,0,0},
-{"isfinite",13,9,0,0},
-{"isinf",13,9,0,0},
-{"ismith",13,9,0,0},
-{"isnan",13,9,0,0},
-{"isobarycenter",13,9,0,0},
-{"isom",13,9,0,0},
-{"isopolygon",13,9,0,0},
-{"isosceles_triangle",13,9,0,0},
-{"isprime",13,9,0,0},
-{"ithprime",13,9,0,0},
-{"jacobi_linsolve",13,9,0,0},
-{"jacobi_symbol",13,9,0,0},
-{"javascript",13,9,0,0},
-{"join",13,9,0,0},
-{"jordan",13,9,0,0},
-{"jump",13,126,0,0},
-{"ker",13,9,0,0},
-{"kernel",13,9,0,0},
-{"keydown",13,9,0,0},
-{"kill",13,9,0,0},
-{"kolmogorovd",13,9,0,0},
-{"kolmogorovt",13,9,0,0},
-{"l1norm",13,9,0,0},
-{"l2norm",13,9,0,0},
-{"label",13,77,0,0},
-{"lagrange",13,9,0,0},
-{"laguerre",13,9,0,0},
-{"lapack_limit",13,9,0,0},
-{"laplace",13,9,0,0},
-{"laplacian",13,9,0,0| 1},
-{"latex",13,9,0,0},
-{"lcm",13,9,0,0},
-{"lcoeff",13,9,0,0},
-{"ldegree",13,9,0,0},
-{"ldexp",13,9,0,0},
-{"left",13,9,0,0},
-{"legend",13,9,0,0| 1},
-{"legendre",13,9,0,0},
-{"legendre_symbol",13,9,0,0},
-{"len",13,9,0,0},
-{"length",13,9,0,0},
-{"leve_crayon",13,126,0,0},
-{"lgcd",13,9,0,0},
-{"lhs",13,9,0,0},
-{"ligne_polygonale",13,9,0,0},
-{"ligne_polygonale_pointee",13,9,0,0},
-{"limit",13,9,0,0| 1},
-{"limite",13,9,0,0},
-{"lin",13,9,0,0},
-{"line",13,9,0,0| 1},
-{"line_inter",13,9,0,0},
-{"line_paper",13,9,0,0},
-{"line_segments",13,9,0,0},
-{"linear_interpolate",13,9,0,0},
-{"linear_regression",13,9,0,0},
-{"linear_regression_plot",13,9,0,0},
-{"lineariser",13,9,0,0},
-{"lineariser_trigo",13,9,0,0},
-{"linetan",13,9,0,0},
-{"linfnorm",13,9,0,0},
-{"link2giac",13,9,0,0},
-{"linsolve",13,9,0,0| 1},
-{"linspace",13,9,0,0},
-{"lis",13,77,0,0| 1},
-{"lis_phrase",13,77,0,0| 1},
-{"list2exp",13,9,0,0},
-{"list2mat",13,9,0,0},
-{"listplot",13,9,0,0},
-{"lll",13,9,0,0},
-{"lll_reduce",13,9,0,0},
-{"ln",13,9,0,0},
-{"lnGamma_minus",13,9,0,0},
-{"lname",13,9,0,0},
-{"lncollect",13,9,0,0},
-{"lnexpand",13,9,0,0},
-{"locus",13,9,0,0| 1},
-{"log10",13,9,0,0},
-{"logarithmic_regression",13,9,0,0},
-{"logarithmic_regression_plot",13,9,0,0},
-{"logb",13,9,0,0},
-{"logistic_regression",13,9,0,0},
-{"logistic_regression_plot",13,9,0,0},
-{"lower",13,9,0,0},
-{"lsmod",13,9,0,0},
-{"lsq",13,9,0,0},
-{"lu",13,9,0,0},
-{"lvar",13,9,0,0},
-{"mRow",13,9,0,0},
-{"mRowAdd",13,9,0,0},
-{"magenta",13,2,0,0},
-{"makelist",13,9,0,0},
-{"makemat",13,9,0,0},
-{"makemod",13,9,0,0},
-{"makesuite",13,9,0,0},
-{"makevector",13,9,0,0},
-{"mantissa",13,9,0,0},
-{"map",13,9,0,0},
-{"maple2mupad",13,9,0,0| 1},
-{"maple2xcas",13,9,0,0| 1},
-{"maple_ifactors",13,9,0,0},
-{"maple_mode",13,9,0,0},
-{"markov",13,9,0,0},
-{"mat2list",13,9,0,0},
-{"mathml",13,9,0,0},
-{"matpow",13,9,0,0},
-{"matrix",13,9,0,0},
-{"matrix_norm",13,9,0,0},
-{"max",13,9,0,0},
-{"max_algext",13,9,0,0},
-{"maxnorm",13,9,0,0},
-{"mean",13,9,0,0},
-{"median",13,9,0,0},
-{"median_line",13,9,0,0},
-{"member",13,9,0,0| 1},
-{"mgf",13,9,0,0},
-{"mid",13,9,0,0},
-{"midpoint",13,9,0,0},
-{"min",13,9,0,0},
-{"min_proba_time",13,9,0,0},
-{"mkisom",13,9,0,0},
-{"mksa",13,9,0,0},
-{"modgcd",13,9,0,0},
-{"modgcd_cachesize",13,9,0,0},
-{"modp",13,9,0,0},
-{"mods",13,9,0,0},
-{"monotonic",13,9,0,0},
-{"montre_tortue",13,126,0,0},
-{"moustache",13,9,0,0},
-{"moyal",13,9,0,0},
-{"moyenne",13,9,0,0},
-{"mpzclass_allowed",13,9,0,0},
-{"mul",13,9,0,0},
-{"mult_c_conjugate",13,9,0,0| 1},
-{"mult_conjugate",13,9,0,0},
-{"multcrement",13,9,0,0| 1},
-{"multinomial",13,9,0,0},
-{"multiplier_conjugue",13,9,0,0},
-{"multiplier_conjugue_complexe",13,9,0,0},
-{"multiply",13,9,0,0},
-{"mupad2maple",13,9,0,0| 1},
-{"mupad2xcas",13,9,0,0| 1},
-{"nCr",13,9,0,0},
-{"nDeriv",13,9,0,0},
-{"nInt",13,9,0,0},
-{"nPr",13,9,0,0},
-{"nSolve",13,9,0,0},
-{"ncols",13,9,0,0},
-{"negbinomial",13,9,0,0},
-{"negbinomial_cdf",13,9,0,0},
-{"negbinomial_icdf",13,9,0,0},
-{"newList",13,9,0,0},
-{"newMat",13,9,0,0},
-{"newton",13,9,0,0},
-{"nextperm",13,9,0,0},
-{"nextprime",13,9,0,0},
-{"nodisp",13,9,0,0},
-{"non",13,11,0,0},
-{"non_recursive_normal",13,9,0,0},
-{"nop",13,9,0,0},
-{"nops",13,9,0,0},
-{"norm",13,9,0,0},
-{"normal",13,9,0,0},
-{"normal_cdf",13,9,0,0},
-{"normal_icdf",13,9,0,0},
-{"normald",13,9,0,0},
-{"normald_cdf",13,9,0,0},
-{"normald_icdf",13,9,0,0},
-{"normalize",13,9,0,0},
-{"normalt",13,9,0,0},
-{"nprimes",13,9,0,0},
-{"nrows",13,9,0,0},
-{"nuage_points",13,9,0,0},
-{"nullspace",13,9,0,0},
-{"numer",13,9,0,0},
-{"octahedron",13,9,0,0},
-{"octprint",13,9,0,0},
-{"odd",13,9,0,0},
-{"odeplot",13,9,0,0},
-{"odesolve",13,9,0,0},
-{"op",13,9,0,0},
-{"open",13,9,0,0},
-{"open_polygon",13,9,0,0},
-{"or",13,33,0,0| 1},
-{"ord",13,9,0,0},
-{"order_size",13,9,0,0},
-{"ordinate",13,9,0,0},
-{"ordonnee",13,9,0,0},
-{"orthocenter",13,9,0,0},
-{"orthogonal",13,9,0,0},
-{"os_version",13,9,0,0},
-{"osculating_circle",13,9,0,0},
-{"ou",13,33,0,0| 1},
-{"output",13,9,0,0| 1},
-{"p1oc2",13,9,0,0},
-{"p1op2",13,9,0,0},
-{"pa2b2",13,9,0,0},
-{"pade",13,9,0,0},
-{"padic_linsolve",13,9,0,0},
-{"parabola",13,9,0,0},
-{"parabolic_interpolate",13,9,0,0},
-{"parallel",13,9,0,0},
-{"parallelepiped",13,9,0,0},
-{"parallelogram",13,9,0,0| 1},
-{"parameq",13,9,0,0},
-{"parameter",13,9,0,0},
-{"paramplot",13,9,0,0| 1},
-{"pari",13,9,0,0| 1},
-{"pari_unlock",13,9,0,0| 1},
-{"part",13,9,0,0},
-{"partfrac",13,9,0,0},
-{"pas",13,60,0,0| 1},
-{"pas_de_cote",13,126,0,0},
-{"pcar",13,9,0,0},
-{"pcar_hessenberg",13,9,0,0},
-{"pcoeff",13,9,0,0},
-{"pd",13,126,0,0},
-{"pencolor",13,126,0,0},
-{"pendown",13,126,0,0},
-{"pente",13,9,0,0},
-{"penup",13,126,0,0},
-{"perimeter",13,9,0,0},
-{"perimeterat",13,9,0,0| 1},
-{"perimeteratraw",13,9,0,0},
-{"perm",13,9,0,0},
-{"perminv",13,9,0,0},
-{"permu2cycles",13,9,0,0},
-{"permu2mat",13,9,0,0},
-{"permuorder",13,9,0,0},
-{"perpen_bisector",13,9,0,0},
-{"perpendicular",13,9,0,0},
-{"peval",13,9,0,0},
-{"piecewise",13,9,0,0| 1},
-{"pivot",13,9,0,0},
-{"pixoff",13,9,0,0},
-{"pixon",13,9,0,0},
-{"plane",13,9,0,0},
-{"plot",13,9,0,0| 1},
-{"plot3d",13,9,0,0},
-{"plot_style",13,9,0,0},
-{"plotarea",13,9,0,0},
-{"plotcdf",13,9,0,0},
-{"plotcontour",13,9,0,0| 1},
-{"plotdensity",13,9,0,0| 1},
-{"plotfield",13,9,0,0},
-{"plotfunc",13,9,0,0| 1},
-{"plotimplicit",13,9,0,0},
-{"plotinequation",13,9,0,0| 1},
-{"plotlist",13,9,0,0},
-{"plotmatrix",13,9,0,0},
-{"plotode",13,9,0,0},
-{"plotparam",13,9,0,0| 1},
-{"plotpolar",13,9,0,0| 1},
-{"plotseq",13,9,0,0},
-{"pmin",13,9,0,0},
-{"pnt",13,9,0,0},
-{"point",13,9,0,0},
-{"point2d",13,9,0,0| 1},
-{"point3d",13,9,0,0| 1},
-{"pointer",13,9,0,0},
-{"poisson",13,9,0,0},
-{"poisson_cdf",13,9,0,0},
-{"poisson_icdf",13,9,0,0},
-{"polar",13,9,0,0},
-{"polar2rectangular",13,9,0,0},
-{"polar_coordinates",13,9,0,0},
-{"polar_point",13,9,0,0},
-{"polarplot",13,9,0,0| 1},
-{"pole",13,9,0,0},
-{"poly2symb",13,9,0,0},
-{"polyEval",13,9,0,0},
-{"polygamma",13,9,0,0},
-{"polygon",13,9,0,0},
-{"polygone_rempli",13,126,0,0},
-{"polygonplot",13,9,0,0},
-{"polygonscatterplot",13,9,0,0},
-{"polyhedron",13,9,0,0},
-{"polynomial_regression",13,9,0,0},
-{"polynomial_regression_plot",13,9,0,0},
-{"pop",13,9,0,0},
-{"position",13,126,0,0},
-{"poslbdLMQ",13,9,0,0},
-{"posubLMQ",13,9,0,0},
-{"potential",13,9,0,0| 1},
-{"pour",13,56,0,0| 1},
-{"pow2exp",13,9,0,0},
-{"power_regression",13,9,0,0},
-{"power_regression_plot",13,9,0,0},
-{"powermod",13,9,0,0},
-{"powerpc",13,9,0,0},
-{"powexpand",13,9,0,0},
-{"powmod",13,9,0,0},
-{"prediction",13,9,0,0},
-{"prediction95",13,9,0,0},
-{"prepend",13,9,0,0},
-{"preval",13,9,0,0},
-{"prevperm",13,9,0,0},
-{"prevprime",13,9,0,0},
-{"primpart",13,9,0,0},
-{"print",13,9,0,0| 1},
-{"printf",13,9,0,0},
-{"printpow",13,9,0,0},
-{"prism",13,9,0,0},
-{"product",13,9,0,0| 1},
-{"prog_eval_level",13,9,0,0},
-{"projection",13,9,0,0},
-{"proot",13,9,0,0},
-{"propFrac",13,9,0,0},
-{"propfrac",13,9,0,0},
-{"psrgcd",13,9,0,0},
-{"ptayl",13,9,0,0},
-{"pu",13,126,0,0},
-{"pwd",13,9,0,0},
-{"pyramid",13,9,0,0},
-{"python",13,9,0,0},
-{"python_compat",13,9,0,0},
-{"python_list",13,9,0,0},
-{"q2a",13,9,0,0},
-{"qr",13,9,0,0},
-{"quadric",13,9,0,0},
-{"quadrilateral",13,9,0,0},
-{"quantile",13,9,0,0},
-{"quartile1",13,9,0,0},
-{"quartile3",13,9,0,0},
-{"quartiles",13,9,0,0},
-{"quaternion",13,9,0,0},
-{"quest",13,9,0,0},
-{"quo",13,9,0,0},
-{"quorem",13,9,0,0},
-{"quote",13,9,0,0| 1},
-{"r2e",13,9,0,0},
-{"radical_axis",13,9,0,0},
-{"radius",13,9,0,0},
-{"ramene",13,126,0,0},
-{"rand",13,9,0,0},
-{"randMat",13,9,0,0},
-{"randNorm",13,9,0,0},
-{"randPoly",13,9,0,0},
-{"randbinomial",13,9,0,0},
-{"randchisquare",13,9,0,0},
-{"randchisquared",13,9,0,0},
-{"randexp",13,9,0,0},
-{"randfisher",13,9,0,0},
-{"randfisherd",13,9,0,0},
-{"randgeometric",13,9,0,0},
-{"randint",13,9,0,0},
-{"randmarkov",13,9,0,0},
-{"randmatrix",13,9,0,0},
-{"randmultinomial",13,9,0,0},
-{"randnormald",13,9,0,0},
-{"random",13,9,0,0},
-{"randperm",13,9,0,0},
-{"randpoisson",13,9,0,0},
-{"randpoly",13,9,0,0},
-{"randrange",13,9,0,0},
-{"randstudent",13,9,0,0},
-{"randstudentd",13,9,0,0},
-{"randvector",13,9,0,0},
-{"range",13,9,0,0},
-{"rank",13,9,0,0},
-{"ranm",13,9,0,0},
-{"ranv",13,9,0,0},
-{"rassembler_trigo",13,9,0,0},
-{"rat_jordan",13,9,0,0},
-{"rat_jordan_block",13,9,0,0},
-{"rationalroot",13,9,0,0},
-{"ratnormal",13,9,0,0},
-{"rayon",13,9,0,0},
-{"rdiv",13,9,0,0},
-{"re",13,9,0,0},
-{"read",13,77,0,0},
-{"read16",13,9,0,0},
-{"read32",13,9,0,0},
-{"readrgb",13,9,0,0},
-{"readwav",13,9,0,0},
-{"real",13,9,0,0},
-{"realproot",13,9,0,0},
-{"realroot",13,9,0,0},
-{"reciprocation",13,9,0,0},
-{"rectangle",13,9,0,0| 1},
-{"rectangle_plein",13,126,0,0},
-{"rectangular2polar",13,9,0,0},
-{"rectangular2spherical",13,9,0,0},
-{"rectangular_coordinates",13,9,0,0},
-{"recule",13,126,0,0},
-{"red",13,2,0,0},
-{"redim",13,9,0,0},
-{"reduced_conic",13,9,0,0},
-{"reduced_quadric",13,9,0,0},
-{"ref",13,9,0,0},
-{"reflection",13,9,0,0},
-{"regroup",13,9,0,0},
-{"rem",13,9,0,0},
-{"remain",13,9,0,0},
-{"remove",13,9,0,0},
-{"remove_language",13,9,0,0},
-{"reorder",13,9,0,0},
-{"repete",13,77,0,0| 1},
-{"replace",13,9,0,0},
-{"reset",13,126,0,0},
-{"reset_solve_counter",13,9,0,0},
-{"residue",13,9,0,0},
-{"resoudre",13,9,0,0| 1},
-{"resoudre_dans_C",13,9,0,0| 1},
-{"resoudre_systeme_lineaire",13,9,0,0| 1},
-{"restart",13,77,0,0},
-{"restart_modes",13,77,0,0},
-{"restart_vars",13,77,0,0},
-{"resultant",13,9,0,0},
-{"reverse",13,9,0,0},
-{"reverse_rsolve",13,9,0,0},
-{"reverse",13,9,0,0},
-{"revert",13,9,0,0},
-{"revlist",13,9,0,0},
-{"rgb",13,9,0,0},
-{"rhombus",13,9,0,0| 1},
-{"rhs",13,9,0,0},
-{"right",13,9,0,0},
-{"right_triangle",13,9,0,0| 1},
-{"rm_a_z",13,9,0,0},
-{"rm_all_vars",13,9,0,0},
-{"rmbreakpoint",13,9,0,0| 1},
-{"rmmod",13,9,0,0},
-{"rmwatch",13,9,0,0| 1},
-{"romberg",13,9,0,0},
-{"rond",13,126,0,0},
-{"rootof",13,9,0,0},
-{"roots",13,9,0,0},
-{"rotate",13,9,0,0},
-{"rotation",13,9,0,0},
-{"round",13,9,0,0},
-{"row",13,9,0,0},
-{"rowAdd",13,9,0,0},
-{"rowDim",13,9,0,0},
-{"rowNorm",13,9,0,0},
-{"rowSwap",13,9,0,0},
-{"rowdim",13,9,0,0},
-{"rownorm",13,9,0,0},
-{"rowspace",13,9,0,0},
-{"rowswap",13,9,0,0},
-{"rpn",13,9,0,0},
-{"rref",13,9,0,0},
-{"rsolve",13,9,0,0| 1},
-{"saisir",13,9,0,0| 1},
-{"saute",13,126,0,0},
-{"sauve",13,126,0,0| 1},
-{"save_history",13,9,0,0},
-{"scalarProduct",13,9,0,0},
-{"scalar_product",13,9,0,0},
-{"scale",13,9,0,0},
-{"scaleadd",13,9,0,0},
-{"scatterplot",13,9,0,0},
-{"schur",13,9,0,0},
-{"sec",13,9,0,0},
-{"sech",13,9,0,0},
-{"segment",13,9,0,0},
-{"select",13,9,0,0},
-{"semi_augment",13,9,0,0},
-{"seq",13,9,0,0| 1},
-{"seqplot",13,9,0,0},
-{"seqsolve",13,9,0,0| 1},
-{"series",13,9,0,0},
-{"set_language",13,9,0,0},
-{"set_pixel",13,9,0,0},
-{"shift",13,9,0,0},
-{"shift_phase",13,9,0,0},
-{"show",13,9,0,0},
-{"show_language",13,9,0,0},
-{"showturtle",13,9,0,0},
-{"shuffle",13,9,0,0},
-{"si",13,46,0,0| 1},
-{"sialorssinon",13,51,0,0| 1},
-{"sign",13,9,0,0},
-{"signature",13,9,0,0},
-{"signe",13,126,0,0},
-{"similarity",13,9,0,0},
-{"simp2",13,9,0,0},
-{"simplex_reduce",13,9,0,0},
-{"simplifier",13,9,0,0},
-{"simplify",13,9,0,0},
-{"simult",13,9,0,0},
-{"sin",13,9,0,0},
-{"sin2costan",13,9,0,0},
-{"sin_regression",13,9,0,0},
-{"sin_regression_plot",13,9,0,0},
-{"sincos",13,9,0,0},
-{"single_inter",13,9,0,0},
-{"singular",13,9,0,0},
-{"sinh",13,9,0,0},
-{"sinon",13,50,0,0| 1},
-{"size",13,9,0,0},
-{"sizes",13,9,0,0},
-{"skip",13,126,0,0},
-{"sleep",13,9,0,0},
-{"slope",13,9,0,0},
-{"slopeat",13,9,0,0| 1},
-{"slopeatraw",13,9,0,0},
-{"smith",13,9,0,0},
-{"smod",13,9,0,0},
-{"snedecor",13,9,0,0},
-{"snedecor_cdf",13,9,0,0},
-{"snedecor_icdf",13,9,0,0},
-{"snedecord",13,9,0,0},
-{"snedecord_cdf",13,9,0,0},
-{"snedecord_icdf",13,9,0,0},
-{"solve",13,9,0,0| 1},
-{"solve_zero_extremum",13,9,0,0| 1},
-{"somme",13,9,0,0| 1},
-{"sommet",13,9,0,0},
-{"sort",13,9,0,0},
-{"sorta",13,9,0,0},
-{"sortd",13,9,0,0},
-{"sorted",13,9,0,0},
-{"soundsec",13,9,0,0},
-{"speed",13,126,0,0},
-{"sphere",13,9,0,0},
-{"spherical2rectangular",13,9,0,0},
-{"spline",13,9,0,0},
-{"split",13,9,0,0},
-{"spread2mathml",13,9,0,0},
-{"spreadsheet",13,9,0,0},
-{"sq",13,9,0,0},
-{"sqrfree",13,9,0,0},
-{"sqrt",13,9,0,0},
-{"square",13,9,0,0| 1},
-{"srand",13,77,0,0},
-{"sst",13,9,0,0| 1},
-{"sst_in",13,9,0,0| 1},
-{"stdDev",13,9,0,0},
-{"stddev",13,9,0,0},
-{"stddevp",13,9,0,0},
-{"step_infolevel",13,9,0,0},
-{"sto",13,9,0,0},
-{"str",13,9,0,0},
-{"strassen_limit",13,9,0,0},
-{"string",13,9,0,0},
-{"strip",13,9,0,0},
-{"student",13,9,0,0},
-{"student_cdf",13,9,0,0},
-{"student_icdf",13,9,0,0},
-{"studentd",13,9,0,0},
-{"studentd_cdf",13,9,0,0},
-{"studentd_icdf",13,9,0,0},
-{"studentt",13,9,0,0},
-{"sturm",13,9,0,0},
-{"sturmab",13,9,0,0},
-{"sturmseq",13,9,0,0},
-{"subMat",13,9,0,0},
-{"submatrix",13,9,0,0},
-{"subst",13,9,0,0},
-{"substituer",13,9,0,0},
-{"subtype",13,9,0,0},
-{"sum",13,9,0,0| 1},
-{"sum_riemann",13,9,0,0},
-{"suppress",13,9,0,0},
-{"surd",13,9,0,0},
-{"svd",13,9,0,0},
-{"svl",13,9,0,0},
-{"swapcol",13,9,0,0},
-{"swaprow",13,9,0,0},
-{"switch_axes",13,9,0,0},
-{"sylvester",13,9,0,0},
-{"symb2poly",13,9,0,0},
-{"syst2mat",13,9,0,0},
-{"tCollect",13,9,0,0},
-{"tExpand",13,9,0,0},
-{"table",13,9,0,0},
-{"tablefunc",13,9,0,0},
-{"tableseq",13,9,0,0| 1},
-{"tabvar",13,9,0,0},
-{"tail",13,9,0,0},
-{"tan",13,9,0,0},
-{"tan2cossin2",13,9,0,0},
-{"tan2sincos",13,9,0,0},
-{"tan2sincos2",13,9,0,0},
-{"tangent",13,9,0,0},
-{"tangente",13,9,0,0},
-{"tanh",13,9,0,0},
-{"tantque",13,62,0,0| 1},
-{"taux_accroissement",13,9,0,0},
-{"taylor",13,9,0,0},
-{"tchebyshev1",13,9,0,0},
-{"tchebyshev2",13,9,0,0},
-{"tcoeff",13,9,0,0},
-{"tcollect",13,9,0,0},
-{"tcollectsin",13,9,0,0},
-{"testfunc",13,9,0,0},
-{"tests",13,9,0,0},
-{"tetrahedron",13,9,0,0},
-{"texpand",13,9,0,0},
-{"textinput",13,9,0,0| 1},
-{"threads_allowed",13,9,0,0},
-{"throw",13,77,0,0},
-{"time",13,9,0,0| 1},
-{"tlin",13,9,0,0},
-{"total_degree",13,9,0,0},
-{"tourne_droite",13,126,0,0},
-{"tourne_gauche",13,126,0,0},
-{"trace",13,9,0,0},
-{"tran",13,9,0,0},
-{"translation",13,9,0,0},
-{"transpose",13,9,0,0},
-{"triangle",13,9,0,0},
-{"triangle_paper",13,9,0,0},
-{"triangle_plein",13,126,0,0},
-{"trig2exp",13,9,0,0},
-{"trigcos",13,9,0,0},
-{"trigexpand",13,9,0,0},
-{"trigsin",13,9,0,0},
-{"trigtan",13,9,0,0},
-{"trn",13,9,0,0},
-{"trunc",13,9,0,0},
-{"truncate",13,9,0,0},
-{"tsimplify",13,9,0,0},
-{"turtle_stack",13,126,0,0},
-{"type",13,9,0,0},
-{"ufactor",13,9,0,0},
-{"unapply",13,9,0,0| 1},
-{"unarchive",13,9,0,0},
-{"unarchive_ti",13,9,0,0},
-{"uniform",13,9,0,0},
-{"uniform_cdf",13,9,0,0},
-{"uniform_icdf",13,9,0,0},
-{"uniformd",13,9,0,0},
-{"uniformd_cdf",13,9,0,0},
-{"uniformd_icdf",13,9,0,0},
-{"unitV",13,9,0,0},
-{"unquote",13,9,0,0},
-{"up",13,126,0,0},
-{"upper",13,9,0,0},
-{"usimplify",13,9,0,0},
-{"valuation",13,9,0,0},
-{"vandermonde",13,9,0,0},
-{"variance",13,9,0,0},
-{"vector",13,9,0,0},
-{"vers",13,126,0,0},
-{"version",13,9,0,0},
-{"vertices",13,9,0,0},
-{"vertices_abc",13,9,0,0},
-{"vertices_abca",13,9,0,0},
-{"vitesse_tortue",13,126,0,0},
-{"vpotential",13,9,0,0| 1},
-{"warn_equal_in_prog",13,9,0,0},
-{"watch",13,9,0,0| 1},
-{"weibull",13,9,0,0},
-{"weibull_cdf",13,9,0,0},
-{"weibull_icdf",13,9,0,0},
-{"weibulld",13,9,0,0},
-{"weibulld_cdf",13,9,0,0},
-{"weibulld_icdf",13,9,0,0},
-{"whattype",13,9,0,0},
-{"when",13,9,0,0| 1},
-{"white",13,2,0,0},
-{"widget_size",13,9,0,0},
-{"wilcoxonp",13,9,0,0},
-{"wilcoxons",13,9,0,0},
-{"wilcoxont",13,9,0,0},
-{"with_sqrt",13,9,0,0},
-{"write",13,9,0,0| 1},
-{"write16",13,9,0,0},
-{"write32",13,9,0,0},
-{"writergb",13,9,0,0},
-{"writewav",13,9,0,0},
-{"wz_certificate",13,9,0,0},
-{"xcas",13,9,0,0},
-{"xcas_mode",13,9,0,0},
-{"xyztrange",13,9,0,0},
-{"yellow",13,2,0,0},
-{"zeros",13,9,0,0| 1},
-{"zip",13,9,0,0},
-{"ztrans",13,9,0,0},
-{"ΔLIST",13,-124,0,0},
-{"ΠLIST",13,-124,0,0},
-{"ΣLIST",13,-124,0,0},
-{"∂",13,-124,0,0| 1},
-{"Σ",13,-124,0,0| 1},
-{"∫",13,-124,0,0| 1}
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/subst.cc b/apps/KhiCAS/src/giac-1.6.0/src/subst.cc
index 3622cbdaf..d27fa7c8e 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/subst.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/subst.cc
@@ -1768,10 +1768,13 @@ namespace giac {
     if (e._SYMBptr->feuille.type==_VECT){
       vecteur & v=*e._SYMBptr->feuille._VECTptr;
       if (e._SYMBptr->sommet==at_pow  && v[1].type!=_INT_ && !(v[1].type==_FRAC && is_integer(v[0]))){
-	gen g=pow2expln(v[0],contextptr);
-	if (g.is_symb_of_sommet(at_exp))
-	  return symb_exp(g._SYMBptr->feuille*pow2expln(v[1],contextptr));
-	return symb_exp(pow2expln(v[1],contextptr)*symb_ln(g));
+	gen v0;
+	if (1 || !has_evalf(v[0],v0,1,contextptr)){
+	  gen g=pow2expln(v[0],contextptr);
+	  if (g.is_symb_of_sommet(at_exp))
+	    return symb_exp(g._SYMBptr->feuille*pow2expln(v[1],contextptr));
+	  return symb_exp(pow2expln(v[1],contextptr)*symb_ln(g));
+	}
       }
     }
     return e._SYMBptr->sommet(pow2expln(e._SYMBptr->feuille,contextptr),contextptr); 
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/sym2poly.cc b/apps/KhiCAS/src/giac-1.6.0/src/sym2poly.cc
index 5cf3d97fc..a87e04aaa 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/sym2poly.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/sym2poly.cc
@@ -2364,6 +2364,11 @@ namespace giac {
 	f=min_pol(*(pp._EXTptr+1)); // f is a _VECT
       if (is_undef(f))
 	return f;
+      if (keep_algext(contextptr)){
+	gen value=r2sym(*pp._EXTptr,lt,ltend,contextptr);
+	f=r2sym(f,lt,ltend,contextptr);
+	return algebraic_EXTension(value,f);
+      }
       if (f._VECTptr->size()==3){
 	gen value;
 	if (!has_rootof_value(f,value,contextptr))
@@ -2735,6 +2740,22 @@ namespace giac {
     return symbolic(at_prod,gen(res,_SEQ__VECT));
   }
 
+  gen rewrite_exp_integer(const gen & e,GIAC_CONTEXT){
+    vecteur v(lop(e,at_exp));
+    if (v.size()<2)
+      return e;
+    gen g;
+    for (unsigned i=0;i<v.size();++i)
+      g=gcd(g,v[i]._SYMBptr->feuille); // gcd of arg of exp
+    vecteur w(v);
+    for (unsigned i=0;i<v.size();++i){
+      gen r=ratnormal(v[i]._SYMBptr->feuille/g,contextptr);
+      if (r.type==_INT_ && r.val!=1)
+	w[i]=symbolic(at_pow,makesequence(symb_exp(g),r));
+    }
+    return v==w?e:subst(e,v,w,false,contextptr);
+  }
+
   static gen in_normalize_sqrt(const gen & e,vecteur & L,bool keep_abs,GIAC_CONTEXT){
     if (complex_mode(contextptr) || has_i(e)) 
       return e;
@@ -2857,7 +2878,7 @@ namespace giac {
 
   gen normalize_sqrt(const gen & e,GIAC_CONTEXT,bool keep_abs){
     vecteur L;
-    return in_normalize_sqrt(e,L,keep_abs,contextptr);
+    return in_normalize_sqrt(rewrite_exp_integer(e,contextptr),L,keep_abs,contextptr);
   }
 
   static bool has_embedded_fractions(const gen & g){
@@ -2935,7 +2956,7 @@ namespace giac {
     }
   }
 
-  gen normal(const gen & e,bool distribute_div,GIAC_CONTEXT){
+  gen normal(const gen & e,bool distribute_div,bool allow_embeded_recursion,GIAC_CONTEXT){
     if (has_num_coeff(e))
       return ratnormal(e,contextptr);
     // COUT << e << "\n";
@@ -3060,7 +3081,7 @@ namespace giac {
     if (has_embedded_fractions(f.num) || has_embedded_fractions(f.den)){
       gen res=r2sym(f,l,contextptr);
       purgeassumelist(L,contextptr);
-      return normal(res,distribute_div,contextptr);
+      return allow_embeded_recursion?normal(res,distribute_div,false,contextptr):res;
     }
     if (distribute_div && f.num.type==_POLY && f.num._POLYptr->dim && f.den.type<_POLY){
       gen res=r2sym(gen(*f.num._POLYptr/f.den),l,contextptr);
@@ -3088,6 +3109,10 @@ namespace giac {
     return ee; // ratnormal(ee,contextptr); // for sqrt(1-a^2)/sqrt(1-a)
   }
 
+  gen normal(const gen & e,bool distribute_div,GIAC_CONTEXT){
+    return normal(e,distribute_div,true,contextptr);
+  }
+
   gen normal(const gen & e,GIAC_CONTEXT){
     return normal(e,true,contextptr);
   }
@@ -3106,6 +3131,8 @@ namespace giac {
     if (g.type==_FUNC)
       return 1;
     if (g.type==_VECT){
+      if (g.subtype==_PNT__VECT)
+	return 0;
       const_iterateur it=g._VECTptr->begin(),itend=g._VECTptr->end();
       for (;it!=itend;++it){
 	if (it->type==_STRNG)
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/tex.cc b/apps/KhiCAS/src/giac-1.6.0/src/tex.cc
index d3b39a582..ad2b6c6e1 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/tex.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/tex.cc
@@ -975,16 +975,26 @@ namespace giac {
       }
     }
     if (g.type==_VECT ){
-      if (!curve && g.subtype==_GROUP__VECT && !has_i(g) && !g._VECTptr->empty() && g._VECTptr->front().type!=_VECT){ // "compressed" hypersurface
+      if (!curve && g.subtype==_GROUP__VECT && !g._VECTptr->empty() && g._VECTptr->front().type!=_VECT){ // "compressed" hypersurface?
 	vecteur v=*evalf_double(g,1,contextptr)._VECTptr;
 	int s=v.size();
 	if (s%3==0){
-	  for (int i=0;i<s;i+=3){
-	    vx.push_back(v[i]._DOUBLE_val);
-	    vy.push_back(v[i+1]._DOUBLE_val);
-	    vz.push_back(v[i+2]._DOUBLE_val);
+	  int i;
+	  for (i=0;i<s;i+=3){
+	    if (v[i].type!=_DOUBLE_ || v[i+1].type!=_DOUBLE_)
+	      break;
+	  }
+	  if (i==s){
+	    for (int i=0;i<s;i+=3){
+	      vx.push_back(v[i]._DOUBLE_val);
+	      vy.push_back(v[i+1]._DOUBLE_val);
+	      if (v[i+2].type==_CPLX)
+		vz.push_back(abs(v[i+2],contextptr)._DOUBLE_val);
+	      else 
+		vz.push_back(v[i+2]._DOUBLE_val);
+	    }
+	    return false;
 	  }
-	  return false;
 	}
       }
       bool ortho=false;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/threaded.cc b/apps/KhiCAS/src/giac-1.6.0/src/threaded.cc
index e92039777..fe761f2b3 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/threaded.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/threaded.cc
@@ -388,7 +388,8 @@ mpz_class smod(const mpz_class & a,int reduce){
     pcontxn.reserve(256); current.reserve(256); tmp.reserve(256); reste.reserve(256);
     for (;it!=itend;){
       current.clear();
-      current.push_back(it->g);
+      if (!is_zero(it->g))
+	current.push_back(it->g);
       curu=it->u;
       ++it;
       for (;it!=itend;++it){
@@ -396,12 +397,13 @@ mpz_class smod(const mpz_class & a,int reduce){
 	if ( newu < u ){
 	  break;
 	}
-	if (curu>newu+var2)
+	if (curu>newu+var2 && !current.empty())
 	  current.insert(current.end(),(curu-newu)/var2-1,T(0));
-	current.push_back(it->g);
+	if (!is_zero(it->g) || !current.empty())
+	  current.push_back(it->g);
 	curu=newu;
       }
-      if (curu>u)
+      if (curu>u && !current.empty())
 	current.insert(current.end(),(curu-u)/var2,T(0));
 #ifdef TIMEOUT
       control_c();
@@ -418,7 +420,8 @@ mpz_class smod(const mpz_class & a,int reduce){
     u=(p.front().u/var)*var;
     for (;it!=itend;){
       current.clear();
-      current.push_back(it->g);
+      if (!is_zero(it->g))
+	current.push_back(it->g);
       curu=it->u;
       ++it;
       for (;it!=itend;++it){
@@ -426,12 +429,13 @@ mpz_class smod(const mpz_class & a,int reduce){
 	if ( newu < u ){
 	  break;
 	}
-	if (curu>newu+var2)
+	if (curu>newu+var2 && !current.empty())
 	  current.insert(current.end(),(curu-newu)/var2-1,T(0));
-	current.push_back(it->g);
+	if (!is_zero(it->g) || !current.empty())
+	  current.push_back(it->g);
 	curu=newu;
       }
-      if (curu>u)
+      if (curu>u && !current.empty())
 	current.insert(current.end(),(curu-u)/var2,T(0));
 #ifdef TIMEOUT
       control_c();
@@ -3039,7 +3043,7 @@ mpz_class smod(const mpz_class & a,int reduce){
 	}
       } // end for (int thread=0;thread<nthreads;++thread)
 #if 1
-      gcd_call_param<int> * gcd_call_param_v=(gcd_call_param<int> *)alloca(nthreads*sizeof(gcd_call_param<int>));
+      ALLOCA(gcd_call_param<int>,gcd_call_param_v,nthreads*sizeof(gcd_call_param<int>)); // gcd_call_param<int> * gcd_call_param_v=(gcd_call_param<int> *)alloca(nthreads*sizeof(gcd_call_param<int>));
       for (int i=0;i<nthreads;++i)
 	gcd_call_param_v[i]=gcd_par;
 #else
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/ti89.cc b/apps/KhiCAS/src/giac-1.6.0/src/ti89.cc
index beba9a0b1..955761498 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/ti89.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/ti89.cc
@@ -1771,6 +1771,8 @@ namespace giac {
       gen g_=eval(g,1,contextptr);
       if (g_.type==_STRNG)
 	g_=gen(*g_._STRNGptr,contextptr);
+      if (is_integer(g_))
+	return g_;
       return _floor(evalf(g_,1,contextptr),contextptr);
     }
     else
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/usual.cc b/apps/KhiCAS/src/giac-1.6.0/src/usual.cc
index 7f5f711da..073554a44 100755
--- a/apps/KhiCAS/src/giac-1.6.0/src/usual.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/usual.cc
@@ -6452,8 +6452,8 @@ namespace giac {
 
   static symbolic symb_quorem(const gen & a,const gen & b){    return symbolic(at_quorem,makevecteur(a,b));  }
   gen quorem(const gen & a,const gen & b){
-    if ((a.type!=_VECT) || (b.type!=_VECT))
-      return symb_quorem(a,b);
+    if (a.type!=_VECT || b.type!=_VECT)
+      return quorem(gen2vecteur(a),gen2vecteur(b));
     if (b._VECTptr->empty())
       return gensizeerr(gettext("Division by 0"));
     vecteur q,r;
@@ -6472,7 +6472,8 @@ namespace giac {
       return _revlist(_greduce(gen(v,_SEQ__VECT),contextptr),contextptr);
     }
     vecteur & a =*args._VECTptr;
-    if ( (a.front().type==_VECT) && (a[1].type==_VECT))
+    if ( // a.front().type==_VECT && 
+	a[1].type==_VECT )
       return quorem(a.front(),a[1]);
     if ( (a.front().type==_POLY) && (a[1].type==_POLY)){
       int dim=a.front()._POLYptr->dim;
@@ -9163,10 +9164,12 @@ namespace giac {
 	// by series expansion at x=0
 	// x*sum( (-1)^n*(x^2)^n/n!/(2*n+1),n=0..inf)
 	complex_long_double z2=z*z,res=0,pi=1;
+	//*logptr(contextptr) << "erf z " << z << '\n';
 	for (long_double n=0;;){
 	  res += pi/(2*n+1);
 	  ++n;
 	  pi = -pi*z2/n;
+	  // if (n<10) *logptr(contextptr) << "res " << res << "\n pi " << pi << '\n';
 	  if (complex_long_abs(pi)<1e-17)
 	    break;
 	}
@@ -9211,6 +9214,7 @@ namespace giac {
 	erfc=2-erfc;
 	return -e;
       }
+#ifndef HAVE_LIBMPFR
       else { 
 	// continued fraction
 	// 2*exp(z^2)*int(exp(-t^2),t=z..inf)=1/(z+1/2/(z+1/(z+3/2/(z+...))))
@@ -9225,12 +9229,17 @@ namespace giac {
 #endif
 	res=std::exp(-z*z)*res/complex_long_double(std::sqrt(M_PI));
 	erfc=gen(double(res.real()),double(res.imag()));
+	if (std::abs(z.real())<=1e-2*std::abs(z.imag())){
+	  *logptr(contextptr) << "Low accuracy\n";
+	  return -erfc;
+	}
 	gen e=1-erfc;
 	if (!neg)
 	  return e;
 	erfc=2-erfc;
 	return -e;
       }
+#endif // HAVE_LIBMPFR
     } // end low precision
     // take account of loss of accuracy
     int prec=decimal_digits(contextptr);
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/vecteur.cc b/apps/KhiCAS/src/giac-1.6.0/src/vecteur.cc
index 290833c76..29d42e485 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/vecteur.cc
+++ b/apps/KhiCAS/src/giac-1.6.0/src/vecteur.cc
@@ -7867,6 +7867,29 @@ namespace giac {
       y.push_back(x[permutation[i]]);
   }
 
+  /* Addition by L. Marohnić.
+   * This function permutes the vector V according to the permutation P.
+   * if COPY_P=true then P is copied first, so that the original is
+   * unchanged in the end. Otherwise, P is used as a workspace so its
+   * original content is destroyed. */
+  void apply_permutation(vecteur &v,vector<int> &p,bool keep_p) {
+    vector<int> pc;
+    if (keep_p) pc=p;
+    vector<int> &P=keep_p?pc:p;
+    int n=v.size(),i,curr,next;
+    for (i=0;i<n;++i) {
+      curr=i;
+      next=P[curr];
+      while (next!=i) {
+        swapgen(v[curr],v[next]);
+        P[curr]=curr;
+        curr=next;
+        next=P[next];
+      }
+      P[curr]=curr;
+    }
+  }
+  
   /*
   vector<int> perminv(const vector<int> & p);
   // solve LU x= b (permutation P)
@@ -11493,7 +11516,7 @@ namespace giac {
 	  A[i + j * rows].i=0;
 	  continue;
 	}
-	if (g.type==_CPLX && g._CPLXptr->type==_DOUBLE_ && (*g._CPLXptr+1).type==_DOUBLE_){
+	if (g.type==_CPLX && g._CPLXptr->type==_DOUBLE_ && (g._CPLXptr+1)->type==_DOUBLE_){  // FIX by L. Marohnić
 	  A[i + j * rows].r = g._CPLXptr->_DOUBLE_val;
 	  A[i + j * rows].i = (g._CPLXptr+1)->_DOUBLE_val;
 	}
@@ -15349,7 +15372,7 @@ namespace giac {
     gen g;
     int res=GSL_SUCCESS;
     for (int i = 0; it!=itend; ++i,++it){
-      g=it->evalf(1,contextptr);
+      g=it->evalf_double(1,contextptr);
       if (g.type==_DOUBLE_)
 	gsl_vector_set (w, i, g._DOUBLE_val);
       else {
@@ -15383,6 +15406,32 @@ namespace giac {
     return res;
   }
 
+  // Added by L. Marohnić
+  // Copies the submatrix of m starting at (i0,j0) with n1 rows and n2 columns to GSL matrix w.
+  // If transp=true, then w contains the transposed submatrix.
+  int matrice2gsl_matrix(const matrice & m,int i0,int j0,int n1,int n2,bool transp,gsl_matrix * w,GIAC_CONTEXT) {
+    gen g;
+    const_iterateur it=m.begin()+i0,jt;
+    int res=GSL_SUCCESS,i,j,rc=n1>0?n1:(mrows(m)-i0),cc=n2>0?n2:(mcols(m)-j0);
+    if (w->size1<(transp?cc:rc) || w->size2<(transp?rc:cc))
+      return !GSL_SUCCESS;
+    for (i=0; i<rc; ++i,++it){
+      if (it->type!=_VECT)
+	return !GSL_SUCCESS;
+      vecteur & v =*it->_VECTptr;
+      for (j=0,jt=v.begin()+j0;j<cc;++j,++jt){
+	g=evalf_double(*jt,1,contextptr);
+	if (g.type==_DOUBLE_)
+	  gsl_matrix_set(w,transp?j:i,transp?i:j,g._DOUBLE_val);
+	else {
+	  res=!GSL_SUCCESS;
+	  gsl_matrix_set(w,transp?j:i,transp?i:j,nan());	  
+	}
+      }
+    }
+    return res;
+  }
+
   int matrice2gsl_matrix(const matrice & m,gsl_matrix * w,GIAC_CONTEXT){
     int s1=w->size1,s2=w->size2;
 #ifdef DEBUG_SUPPORT
@@ -15390,6 +15439,7 @@ namespace giac {
     if (mrows(m)!=s1 || mcols(m)!=s2)
       setdimerr();
 #endif
+    return matrice2gsl_matrix(m,0,0,0,0,false,w,contextptr); // change by L. Marohnić
     gen g;
     const_iterateur it=m.begin(),itend=m.end();
     int res=GSL_SUCCESS;
@@ -15421,7 +15471,8 @@ namespace giac {
   
   // this function does not deallocate the gsl vector
   // call gsl_matrix_free(v) for this
-  matrice gsl_matrix2matrice(const gsl_matrix * v){
+  // Addition by L. Marohnić: if transp=true, then the result is transposed (sub)matrix v.
+  matrice gsl_matrix2matrice(const gsl_matrix * v,bool transp){
     matrice res;
     int s1=v->size1,s2=v->size2;
     res.reserve(s1);
@@ -15429,7 +15480,7 @@ namespace giac {
       vecteur tmp;
       tmp.reserve(s2);
       for (int j=0;j<s2;++j){
-	tmp.push_back(gsl_matrix_get(v,i,j));
+	tmp.push_back(gsl_matrix_get(v,transp?j:i,transp?i:j));
       }
       res.push_back(tmp);
     }
@@ -15668,6 +15719,583 @@ namespace giac {
   static define_unary_function_eval (__lu,&lu,_lu_s);
   define_unary_function_ptr5( at_lu ,alias_at_lu,&__lu,0,true);
 
+  /* Solve indefinite system A*x=b, x in R^N (b!=NULL), or determine
+   * the inertia (p,n,z) of real and symmetric matrix A (b==NULL) */
+#ifdef HAVE_LIBLAPACK
+  bool solve_indef(double *A,double **WORK,int *IPIV,double *b,int N,int NRHS,int *p,int *n,int *z) {
+    char UPLO='L';
+    int INFO,LWORK=-1,LDA=N,LDB=N,i;
+    if (b!=NULL) { // solve A*x=b, A must be factorized
+      dsytrs_(&UPLO,&N,&NRHS,A,&LDA,IPIV,b,&LDB,&INFO);
+    } else { // factorize A and compute inertia
+      if (*WORK==NULL) {
+        double TMP_WORK;
+        dsytrf_(&UPLO,&N,A,&LDA,IPIV,&TMP_WORK,&LWORK,&INFO);
+        if (INFO!=0)
+          return false;
+        LWORK=(int)TMP_WORK;
+        *WORK=new double[LWORK+1];
+        **WORK=TMP_WORK;
+      } else LWORK=(int)**WORK;
+      dsytrf_(&UPLO,&N,A,&LDA,IPIV,*WORK+1,&LWORK,&INFO);
+      *p=*n=*z=0;
+      if (INFO>=0) for (i=0;i<N;++i) {
+        if (IPIV[i]>0) {
+          if (A[i+i*N]==0) ++(*z);
+          else if (A[i+i*N]>0) ++(*p);
+          else ++(*n);
+        } else {
+          ++(*p);
+          ++(*n);
+          ++i;
+        }
+      }
+    }
+    return INFO>=0;
+  }
+#endif
+  bool solve_indef(matrice &A,const vecteur *b,vecteur &x,int *p,int *n,int *z,GIAC_CONTEXT) {
+    int N=A.size(),i,j;
+    if (b!=NULL) { // solve A*x=b, A must be factorized, X contains the permutation
+      if (int(x.size())!=N || !ckmatrix(*b) || mcols(*b)!=N)
+        return false;
+      if (N==1) {
+        x=divvecteur(*b,A[0][0]);
+        return true;
+      }
+      vector<int> perm=vecteur_2_vector_int(x);
+      x.clear();
+      x.reserve(b->size());
+      vecteur z(N),u(N),y(N),xi(N);
+      for (const_iterateur it=b->begin();it!=b->end();++it) {
+        const vecteur &bi=*it->_VECTptr,&dlow=*A[0]._VECTptr;
+        for (i=0;i<N;++i) {
+          z[i]=bi[perm[i]];
+          const vecteur &ri=*A[i]._VECTptr;
+          for (j=0;j<i;++j)
+            z[i]-=ri[j]*z[j];
+        }
+        for (i=0;i<N;++i) {
+          if (i==N-1 || is_zero(dlow[i+1],contextptr)) {
+            u[i]=z[i]/A[i][i];
+          } else {
+            const gen &A11=A[i][i],&A22=A[i+1][i+1],&A21=dlow[i+1];
+            gen d=A11*A22-pow(A21,2);
+            u[i]=(z[i]*A22-z[i+1]*A21)/d;
+            u[i+1]=(z[i+1]*A11-z[i]*A21)/d;
+            ++i;
+          }
+        }
+        for (i=N;i-->0;) {
+          y[i]=u[i];
+          for (j=i+1;j<N;++j) y[i]-=A[j][i]*y[j];
+        }
+        for (i=0;i<N;++i)
+          xi[perm[i]]=y[i];
+        x.push_back(xi);
+      }
+    } else { // factorize A and compute intertia, store the permutation in X
+      *p=*n=*z=0;
+      if (N==1) {
+        if (A[0][0]>0) ++(*p);
+        else if (A[0][0]<0) ++(*n);
+        else ++(*z);
+        return true;
+      }
+      vector<int> perm;
+      bool sing;
+      if (!ldl(A,perm,0,sing,0,contextptr) || sing)
+        return false;
+      x=vector_int_2_vecteur(perm);
+      const vecteur &dlow=*A[0]._VECTptr;
+      for (i=0;i<N;++i) {
+        const gen &Aii=A[i][i];
+        if (i==N-1 || is_zero(dlow[i+1],contextptr)) { // 1x1 block
+          if (is_zero(Aii,contextptr))
+            ++(*z);
+          else if (is_positive(Aii,contextptr))
+            ++(*p);
+          else if (is_positive(-Aii,contextptr))
+            ++(*n);
+          else return false; // unable to compare
+        } else { // 2x2 block
+          ++(*p);
+          ++(*n);
+          ++i;
+        }
+      }
+    }
+    return true;
+  }
+
+  /* Swap rows/columns k and l in symmetric/Hermitian matrix A
+  * and elements k and l in vector P. Set H to true for Hermitian
+  * matrix A and to false otherwise. */
+  void ldl_swap_rc(matrice &a,int k,int l,vector<int> &p,bool h,GIAC_CONTEXT) {
+    int I=k<l?k:l,J=k<l?l:k,i,n=a.size();
+    vecteur &rI=*a[I]._VECTptr,&rJ=*a[J]._VECTptr;
+    gen tmp;
+    if (h) for (i=I+1;i<J;++i) {
+      tmp=rJ[i];
+      rJ[i]=conj(a[i][I],contextptr);
+      a[i]._VECTptr->at(I)=conj(tmp,contextptr);
+    } else for (i=I+1;i<J;++i) swapgen(rJ[i],a[i]._VECTptr->at(I));
+    for (i=0;i<I;++i) swapgen(rI[i],rJ[i]);
+    for (i=J+1;i<n;++i) swapgen(a[i]._VECTptr->at(I),a[i]._VECTptr->at(J));
+    if (h) rJ[I]=conj(rJ[I],contextptr);
+    swapgen(rI[I],rJ[J]);
+    std::swap(p[k],p[l]);
+  }
+
+  /* Bunch & Kaufman LDL factorization of an indefinite symmetric/Hermitian matrix A.
+  * Factorization is performed in-place. PERM defines the permutation matrix.
+  * The lower sub-diagonal is stored to A[0,1:N-1]. SING is true iff A is singular.
+  * MAT_TYPE should be set to 1 for real numeric, 2 for complex numeric, 3 for
+  * complex Hermitian and 0 for general (symbolic) matrix A. */
+  bool ldl(matrice &a,vector<int> &perm,int mat_type,bool &sing,double time_limit,GIAC_CONTEXT) {
+    int N=a.size(),i,j,k,p,r,s,ip;
+    if (int(perm.size())!=N) perm.resize(N);
+    for (vector<int>::iterator it=perm.begin();it!=perm.end();++it)
+      *it=int(it-perm.begin());
+    sing=false;
+  #ifdef HAVE_LIBLAPACK
+    /*
+    * DSYTRF/ZSYTRF computes the factorization of a real/complex
+    * symmetric/Hermitian matrix A using Bunch-Kaufman diagonal
+    * pivoting method.  The form of the factorization is
+    * 
+    * A = L*D*L**T
+    * 
+    * where L is a product of permutation and unit lower triangular
+    * matrices, and D is symmetric and block diagonal with 1-by-1 and
+    * 2-by-2 diagonal blocks.
+    * 
+    * This is the blocked version of the algorithm, calling Level 3 BLAS.
+    */
+    if (mat_type>1 && N>1) { // numeric matrix, use LAPACK
+      char UPLO='L'; // operate on the lower triangle of A
+      int LDA=N,INFO,*IPIV=new int[N],LWORK=-1;
+      gen elem;
+      double *A_DBL=NULL,*WORK_DBL=NULL;
+      doublef2c_complex *A_CPLX=NULL,*WORK_CPLX=NULL;
+      if (mat_type==2) A_DBL=new double[N*N];
+      else A_CPLX=new doublef2c_complex[N*N];
+      iterateur it=a.begin(),itend=a.end(),jt,jtend,rt1,rt2,rtend;
+      for (i=0;it!=itend;++it,++i) {
+        if (it->type!=_VECT)
+          return false; // A is not a matrix
+        jt=it->_VECTptr->begin();
+        jtend=jt+i+1;
+        for (j=0;jt!=jtend;++jt,++j) {
+          elem=evalf_double(*jt,1,contextptr);
+          if (elem.type==_DOUBLE_) {
+            if (mat_type==2) A_DBL[i+j*N]=elem._DOUBLE_val;
+            else {
+              A_CPLX[i+j*N].r=elem._DOUBLE_val;
+              A_CPLX[i+j*N].i=0;
+            }
+          } else if (mat_type>2 && elem.type==_CPLX && elem._CPLXptr->type==_DOUBLE_ && (elem._CPLXptr+1)->type==_DOUBLE_) {
+            A_CPLX[i+j*N].r=elem._CPLXptr->_DOUBLE_val;
+            A_CPLX[i+j*N].i=(elem._CPLXptr+1)->_DOUBLE_val;
+          } else return false;
+        }
+      }
+      if (LWORK==-1) { // get WORK array size
+        if (mat_type==2) {
+          double TMP_WORK;
+          dsytrf_(&UPLO,&N,A_DBL,&LDA,IPIV,&TMP_WORK,&LWORK,&INFO);
+          if (INFO!=0)
+            return false;
+          LWORK=(int)TMP_WORK;
+        } else {
+          doublef2c_complex TMP_WORK;
+          if (mat_type==3)
+            zsytrf_(&UPLO,&N,A_CPLX,&LDA,IPIV,&TMP_WORK,&LWORK,&INFO);
+          else
+            zhetrf_(&UPLO,&N,A_CPLX,&LDA,IPIV,&TMP_WORK,&LWORK,&INFO);
+          if (INFO!=0)
+            return false;
+          LWORK=(int)TMP_WORK.r;
+        }
+      }
+      if (LWORK>0) {
+        if (mat_type==2) WORK_DBL=new double[LWORK];
+        else WORK_CPLX=new doublef2c_complex[LWORK];
+      }
+      if (mat_type==2)
+        dsytrf_(&UPLO,&N,A_DBL,&LDA,IPIV,WORK_DBL,&LWORK,&INFO);
+      else if (mat_type==3)
+        zsytrf_(&UPLO,&N,A_CPLX,&LDA,IPIV,WORK_CPLX,&LWORK,&INFO);
+      else
+        zhetrf_(&UPLO,&N,A_CPLX,&LDA,IPIV,WORK_CPLX,&LWORK,&INFO);
+      if (INFO<0) { // illegal argument value
+        delete[] IPIV;
+        if (mat_type==2) {
+          delete[] A_DBL;
+          if (WORK_DBL!=NULL) delete[] WORK_DBL;
+        } else {
+          delete[] A_CPLX;
+          if (WORK_CPLX!=NULL) delete[] WORK_CPLX;
+        }
+        return false; // LAPACK error
+      }
+      if (INFO>0)
+        sing=true; // there is at least one zero at the diagonal of D
+      vecteur &dlow=*a[0]._VECTptr; // the lower sub-diagonal
+      std::fill(dlow.begin()+1,dlow.end(),0);
+      vector<int> base_perm(perm),col_perm(N);
+      for (j=0;j<N;++j) {
+        ip=IPIV[j];
+        if (ip>0) {
+          k=j+j*N;
+          a[j]._VECTptr->at(j)=mat_type==2?gen(A_DBL[k]):gen(A_CPLX[k].r,A_CPLX[k].i);
+          if (--ip!=j) std::swap(perm[j],perm[ip]);
+          std::copy(base_perm.begin(),base_perm.end(),col_perm.begin());
+          bool skip=false;
+          for (i=j+1;i<N;++i) {
+            if (!skip) {
+              ip=IPIV[i];
+              if (ip>0) {
+                if (--ip!=i) std::swap(col_perm[i],col_perm[ip]);
+              } else {
+                if (++ip!=-i-1) std::swap(col_perm[i+1],col_perm[-ip]);
+                skip=true;
+              }
+            } else skip=false;
+            k=col_perm[i]+j*N;
+            a[i]._VECTptr->at(j)=mat_type==2?gen(A_DBL[k]):gen(A_CPLX[k].r,A_CPLX[k].i);
+          }
+        } else {
+          k=j+j*N;
+          a[j]._VECTptr->at(j)=mat_type==2?gen(A_DBL[k]):gen(A_CPLX[k].r,A_CPLX[k].i);
+          k+=N+1;
+          a[j+1]._VECTptr->at(j+1)=mat_type==2?gen(A_DBL[k]):gen(A_CPLX[k].r,A_CPLX[k].i);
+          if (++ip!=-j-1) std::swap(perm[j+1],perm[-ip]);
+          k-=N;
+          dlow[j+1]=mat_type==2?gen(A_DBL[k]):gen(A_CPLX[k].r,A_CPLX[k].i);
+          a[j+1]._VECTptr->at(j)=0;
+          std::copy(base_perm.begin(),base_perm.end(),col_perm.begin());
+          bool skip=false;
+          for (i=j+2;i<N;++i) {
+            if (!skip) {
+              ip=IPIV[i];
+              if (ip>0) {
+                if (--ip!=i) std::swap(col_perm[i],col_perm[ip]);
+              } else {
+                if (++ip!=-i-1) std::swap(col_perm[i+1],col_perm[-ip]);
+                skip=true;
+              }
+            } else skip=false;
+            k=col_perm[i]+j*N;
+            a[i]._VECTptr->at(j)=mat_type==2?gen(A_DBL[k]):gen(A_CPLX[k].r,A_CPLX[k].i);
+            k+=N;
+            a[i]._VECTptr->at(j+1)=mat_type==2?gen(A_DBL[k]):gen(A_CPLX[k].r,A_CPLX[k].i);
+          }
+          ++j;
+        }
+      } 
+      delete[] IPIV;
+      if (mat_type==2) {
+        delete[] A_DBL;
+        if (WORK_DBL!=NULL) WORK_DBL;
+      } else {
+        delete[] A_CPLX;
+        if (WORK_CPLX!=NULL) delete[] WORK_CPLX;
+      }
+      return true;
+    }
+  #endif
+    clock_t time0=clock();
+    gen alpha=(1+sqrt(17,contextptr))/8;
+    if (N==1) return true; // nothing to do
+    bool h=mat_type==1 || mat_type==4; // matrix A is Hermitian
+    vecteur &ws1=*a[0]._VECTptr,&ws2=*a[1]._VECTptr; // workspace
+    int t0,t1;
+    for (k=0;k<N;++k) {
+      const gen &akk=a[k][k];
+      gen lambda=0,sigma=0,e,Akk=symb_abs(akk),symc=undef;
+      // determine whether (and how) to pivot
+      t0=rand_max2;
+      for (i=k+1;i<N;++i) {
+        if (time_limit>0 && double(clock()-time0)/CLOCKS_PER_SEC>time_limit) return false;
+        const gen &aik=a[i][k];
+        e=symb_abs(aik);
+        if (aik.type==_SYMB) {
+          if (is_strictly_positive(lambda,contextptr))
+            continue;
+          if ((t1=taille(aik,1000))<t0) {
+            t0=t1;
+            r=i;
+            symc=e;
+          }
+        } else if (is_strictly_greater(e,lambda,contextptr)) {
+          r=i;
+          lambda=_eval(e,contextptr);
+        }
+      }
+      if (is_exactly_zero(lambda)) {
+        if (is_undef(symc)) { // no need for pivoting
+          if (akk.type!=_SYMB && is_zero(akk,contextptr))
+            sing=true;
+          if (k+1<N) ws1[k+1]=0;
+          continue;
+        } else lambda=symc;
+      }
+      if (akk.type!=_SYMB && lambda.type!=_SYMB && is_greater(Akk,alpha*lambda,contextptr)) {
+        r=k;
+        s=1;
+      } else {
+        symc=undef;
+        t0=rand_max2;
+        for (i=k;i<N;++i) {
+          if (i==r) continue;
+          if (time_limit>0 && double(clock()-time0)/CLOCKS_PER_SEC>time_limit) return false;
+          const gen &air=i<r?a[r][i]:a[i][r];
+          e=symb_abs(air);
+          if (air.type==_SYMB) {
+            if (is_strictly_positive(sigma,contextptr))
+              continue;
+            if ((t1=taille(air,1000))<t0) {
+              t0=t1;
+              p=i;
+              symc=e;
+            }
+          } else if (is_strictly_greater(e,sigma,contextptr)) {
+            p=i;
+            sigma=_eval(e,contextptr);
+          }
+        }
+        if (is_exactly_zero(sigma) && !is_undef(symc))
+          sigma=symc;
+        const gen &arr=a[r][r];
+        if (akk.type!=_SYMB && lambda.type!=_SYMB && is_greater(sigma*Akk,alpha*pow(lambda,2),contextptr)) {
+          r=k;
+          s=1;
+        } else if (arr.type!=_SYMB && sigma.type!=_SYMB && is_greater(symb_abs(arr),alpha*sigma,contextptr))
+          s=1;
+        else {
+          if (p>r) {
+            s=r;
+            r=p;
+            p=s;
+          }
+          s=2;
+        }
+      }
+      // pivot
+      iterateur it;
+      if (s==1) { // 1x1 pivot
+        if (r!=k) ldl_swap_rc(a,r,k,perm,h,contextptr);
+        const gen &akk=a[k][k];
+        for (i=k+1;i<N;++i) {
+          if (time_limit>0 && double(clock()-time0)/CLOCKS_PER_SEC>time_limit) return false;
+          it=a[i]._VECTptr->begin()+k;
+          ws1[i]=*it/akk;
+          for (j=k+1;j<=i;++j) {
+            *(++it)-=ws1[i]*(h?conj(a[j][k],contextptr):a[j][k]);
+          }
+        }
+        // update L
+        for (i=k+1;i<N;++i) {
+          a[i]._VECTptr->at(k)=ws1[i];
+        }
+        if (k+1<N) ws1[k+1]=0;
+      } else if (s==2) { // 2x2 pivot
+        if (p==k && r!=k+1) ldl_swap_rc(a,r,k+1,perm,h,contextptr);
+        else if (p==k+1) ldl_swap_rc(a,r,k,perm,h,contextptr);
+        else if (p>k+1) {
+          ldl_swap_rc(a,r,k,perm,h,contextptr);
+          ldl_swap_rc(a,p,k+1,perm,h,contextptr);
+        }
+        const gen &e11=a[k][k],&e21=a[k+1][k],&e22=a[k+1][k+1];
+        gen e12=h?conj(e21,contextptr):e21,D=e11*e22-e12*e21;
+        for (i=k+2;i<N;++i) {
+          it=a[i]._VECTptr->begin()+k;
+          const gen &aik=*it,&aik1=*(++it);
+          ws1[i]=(aik*e22-aik1*e21)/D;
+          ws2[i]=(aik1*e11-aik*e12)/D;
+          for (j=k+2;j<=i;++j) {
+            if (time_limit>0 && double(clock()-time0)/CLOCKS_PER_SEC>time_limit) return false;
+            *(++it)-=(h?conj(a[j][k],contextptr):a[j][k])*ws1[i]+(h?conj(a[j][k+1],contextptr):a[j][k+1])*ws2[i];
+          }
+        }
+        // update L
+        for (i=k+2;i<N;++i) {
+          if (time_limit>0 && double(clock()-time0)/CLOCKS_PER_SEC>time_limit) return false;
+          it=a[i]._VECTptr->begin()+k;
+          *it=ws1[i];
+          *(it+1)=ws2[i];
+        }
+        ws1[k+1]=e21; // store the lower sub-diagonal
+        a[k+1]._VECTptr->at(k)=0;
+        if (k+2<N) ws1[k+2]=0;
+        ++k;
+      }
+    }
+    return true;
+  }
+
+  gen _ldl(const gen &g,GIAC_CONTEXT) {
+    if (g.type==_STRNG && g.subtype==-1) return g;
+    if (g.type!=_VECT)
+      return gentypeerr(contextptr);
+    if (g._VECTptr->empty())
+      return gendimerr(contextptr);
+    bool has_opts=g.subtype==_SEQ__VECT,h=false,packed=false;
+    const gen &first=has_opts?g._VECTptr->front():g;
+    if (!is_squarematrix(first))
+      return gensizeerr(gettext("Expected a square matrix"));
+    if (has_opts) for (const_iterateur opt=g._VECTptr->begin()+1;opt!=g._VECTptr->end();++opt) {
+      if (*opt==at_hermite)
+        h=true;
+      else if (*opt==at_zip)
+        packed=true;
+    }
+    matrice a;
+    vecteur p,d,dlow;
+    int N=first._VECTptr->size(),i,as=array_start(contextptr);
+    a=*_matrix(makesequence(N,N,0),contextptr)._VECTptr;
+    for (i=0;i<N;++i) {
+      const_iterateur rt=first._VECTptr->at(i)._VECTptr->begin();
+      std::copy(rt,rt+i+1,a[i]._VECTptr->begin());
+    }
+    vector<int> perm;
+    int mat_type=h?1:0; // general (symbolic) matrix
+    if (is_fully_numeric(g)) {
+      mat_type=h?4:3; // complex (Hermitian) numeric
+      if (is_zero(im(g,contextptr),contextptr))
+        mat_type=2; // real numeric
+    }
+    bool sing;
+#if !defined KHICAS && !defined GIAC_HAS_STO_38
+    log_output_redirect lor(contextptr);
+#endif
+    if (!ldl(a,perm,mat_type,sing,0,contextptr))
+      return gensizeerr(gettext("LAPACK LDL error"));
+    if (sing)
+      //*logptr(contextptr) << gettext("Warning") << ": " << gettext("matrix is singular") << "\n"
+      ;
+    vecteur &row1=*a[0]._VECTptr;
+    dlow=vecteur(row1.begin()+1,row1.end());
+    std::fill(row1.begin()+1,row1.end(),0);
+    p.resize(N);
+    if (packed) {
+      for (i=0;i<N;++i) {
+        p[i]=perm[i]+as;
+        if (i<N-1) a[i]._VECTptr->at(i+1)=dlow[i];
+      }
+    } else {
+      d.resize(N);
+      iterateur dt=d.begin(),pt=p.begin();
+      for (i=0;i<N;++i,++dt,++pt) {
+        gen &aii=a[i]._VECTptr->at(i);
+        *dt=aii;
+        aii=1;
+        *pt=perm[i]+as;
+      }
+    }
+    if (N>=2) { // clear workspace
+      vecteur &row2=*a[1]._VECTptr;
+      std::fill(row2.begin()+2,row2.end(),0);
+    }
+    if (packed)
+      return makesequence(p,a);
+    return makesequence(p,a,ratnormal(_diag(makesequence(dlow,d,h?conj(dlow,contextptr):dlow),contextptr),contextptr));
+  }
+  static const char _ldl_s []="ldl";
+  static define_unary_function_eval (__ldl,&_ldl,_ldl_s);
+  define_unary_function_ptr5(at_ldl,alias_at_ldl,&__ldl,0,true)
+
+  gen _inertia(const gen &g,GIAC_CONTEXT) {
+    if (g.type==_STRNG && g.subtype==-1) return g;
+    if (g.type!=_VECT)
+      return gentypeerr(contextptr);
+    if (g._VECTptr->empty())
+      return gendimerr(contextptr);
+    bool do_solve=g.subtype==_SEQ__VECT,is_b_matrix=false;
+    int pos=-1;
+    if (do_solve) {
+      if (g._VECTptr->size()<2 || g._VECTptr->size()>3)
+        return gendimerr(contextptr);
+      if (!is_squarematrix(g._VECTptr->front()) || g._VECTptr->at(1).type!=_VECT)
+        return gentypeerr(contextptr);
+      if (g._VECTptr->size()==3) {
+        if (!is_integer(g._VECTptr->back()))
+          return gentypeerr(contextptr);
+        pos=g._VECTptr->back().val;
+        if (pos<0 || pos>int(g._VECTptr->front()._VECTptr->size()))
+          return gensizeerr(contextptr);
+      }
+    } else if (!is_squarematrix(g))
+      return gentypeerr(contextptr);
+    const matrice &mat=do_solve?*g._VECTptr->front()._VECTptr:*g._VECTptr;
+    int N=mat.size(),M,p,n,z,i,j;
+    vecteur sol;
+    matrice bmat;
+    if (do_solve) {
+      if (ckmatrix(g._VECTptr->at(1))) {
+        bmat=*g._VECTptr->at(1)._VECTptr;
+        is_b_matrix=true;
+      } else bmat=vecteur(1,g._VECTptr->at(1));
+      if (mcols(bmat)!=N)
+        return gendimerr(contextptr);
+      M=mrows(bmat);
+    }
+#ifdef HAVE_LIBLAPACK
+    if (is_fully_numeric(mat)) {
+      double *A=new double[N*N],*WORK=NULL;
+      int *IPIV=new int[N];
+      const_iterateur it=mat.begin(),itend=mat.end(),jt,jtend;
+      gen e;
+      bool ok=true;
+      for (i=0;ok&&it!=itend;++it,++i) {
+        for (jt=it->_VECTptr->begin(),jtend=jt+i+1,j=0;jt!=jtend;++jt,++j) {
+          e=evalf_double(*jt,1,contextptr);
+          if (e.type!=_DOUBLE_) {
+            ok=false;
+            break;
+          }
+          A[i+j*N]=e._DOUBLE_val;
+        }
+      }
+      if (ok) {
+        if ((ok=solve_indef(A,&WORK,IPIV,NULL,N,M,&p,&n,&z)) && do_solve && z==0 && (pos<0 || p==pos)) {
+          double *B=new double[N*M];
+          matrice2lapack(mtran(bmat),B,contextptr);
+          if (ok=solve_indef(A,&WORK,IPIV,B,N,M,NULL,NULL,NULL)) {
+            lapack2matrice(B,N,M,sol);
+            sol=mtran(sol);
+          }
+          delete[] B;
+        }
+      }
+      delete[] A;
+      delete[] IPIV;
+      if (WORK!=NULL) delete[] WORK;
+      if (!ok) return gensizeerr(contextptr);
+      vecteur res=makevecteur(p,n,z);
+      return do_solve?makesequence(res,!is_b_matrix&&sol.size()==1?sol[0]:sol):res;
+    }
+#endif
+    matrice A=*_matrix(makesequence(N,N),contextptr)._VECTptr;
+    const_iterateur rt=mat.begin(),rtend=mat.end(),ct,ctend;
+    for (i=0;rt!=rtend;++rt,++i) {
+      for (j=0,ct=rt->_VECTptr->begin(),ctend=rt->_VECTptr->end();ct!=ctend;++ct,++j)
+        A[i]._VECTptr->at(j)=*ct;
+    }
+    if (!solve_indef(A,NULL,sol,&p,&n,&z,contextptr))
+      return gensizeerr(contextptr);
+    if (do_solve && z==0 && (pos<0 || p==pos)) {
+      if (!solve_indef(A,&bmat,sol,NULL,NULL,NULL,contextptr))
+        return gensizeerr(contextptr);
+    } else sol.clear();
+    vecteur res=makevecteur(p,n,z);
+    return do_solve?makesequence(res,!is_b_matrix&&sol.size()==1?sol[0]:sol):res;
+  }
+  static const char _inertia_s []="inertia";
+  static define_unary_function_eval (__inertia,&_inertia,_inertia_s);
+  define_unary_function_ptr5(at_inertia,alias_at_inertia,&__inertia,0,true)
+  
   bool matrice2lapack(const matrice & m,double * A,GIAC_CONTEXT){
     const_iterateur it=m.begin(),itend=m.end();
     gen g;
diff --git a/apps/KhiCAS/src/giac-1.6.0/src/vecteur.h b/apps/KhiCAS/src/giac-1.6.0/src/vecteur.h
index 1f2ed8bec..b82a8a901 100644
--- a/apps/KhiCAS/src/giac-1.6.0/src/vecteur.h
+++ b/apps/KhiCAS/src/giac-1.6.0/src/vecteur.h
@@ -260,6 +260,7 @@ namespace giac {
   bool multvectvector_int_vector_int(const std::vector< std::vector<int> > & M,const std::vector<int> & v,int modulo,std::vector<int> & Mv);
   void tran_vect_vector_int(const std::vector< std::vector<int> > & N,std::vector< std::vector<int> > & tN);
   void apply_permutation(const std::vector<int> & permutation,const std::vector<int> &x,std::vector<int> & y);
+  void apply_permutation(vecteur &v,std::vector<int> &p,bool keep_p=false); // efficient sorting of v w.r.t. p, added by L. Marohnic
   void vecteur2vector_int(const vecteur & v,int modulo,std::vector<int> & res);
   
   enum matrix_algorithms {
@@ -465,9 +466,10 @@ namespace giac {
   int vecteur2gsl_vector(const vecteur & v,gsl_vector * w,GIAC_CONTEXT); // no alloc
   int vecteur2gsl_vector(const_iterateur it,const_iterateur itend,gsl_vector * w,GIAC_CONTEXT);
   vecteur gsl_vector2vecteur(const gsl_vector * v);
+  int matrice2gsl_matrix(const matrice & m,int i0,int j0,int n1,int n2,bool transp,gsl_matrix * w,GIAC_CONTEXT);
   int matrice2gsl_matrix(const matrice & m,gsl_matrix * w,GIAC_CONTEXT);
   gsl_matrix * matrice2gsl_matrix(const matrice & m,GIAC_CONTEXT);
-  matrice gsl_matrix2matrice(const gsl_matrix * v);
+  matrice gsl_matrix2matrice(const gsl_matrix * v,bool transp=false);
   vecteur gsl_permutation2vecteur(const gsl_permutation * p,GIAC_CONTEXT);
 #endif // HAVE_LIBGSL
   
@@ -483,6 +485,29 @@ namespace giac {
 
   gen _cholesky(const gen & a,GIAC_CONTEXT);
   extern const unary_function_ptr * const  at_cholesky ;
+#if !defined KHICAS && !defined GIAC_HAS_STO_38
+  // additions by L. Marohnić:
+  struct log_output_redirect { // redirecting log output to string
+    log_output_redirect(GIAC_CONTEXT) { old=logptr(ctx=contextptr)->rdbuf(buffer.rdbuf()); }
+    ~log_output_redirect() { logptr(ctx)->rdbuf(old); }
+    std::string get_buffer_string() const { return buffer.str(); }
+  private:
+    const context *ctx;
+    std::stringstream buffer;
+    std::streambuf *old;
+  };
+#endif
+  // LDL decomposition, inertia computation and solve_indef for fast system solving using the factorization
+  bool ldl(matrice & a,std::vector<int> & perm,int mat_type,bool &sing,double time_limit,GIAC_CONTEXT);
+#ifdef HAVE_LIBLAPACK
+  bool solve_indef(double *A,double **WORK,int *IPIV,double *b,int N,int NRHS,int *p,int *n,int *z);
+#endif
+  bool solve_indef(matrice &A,const vecteur *b,vecteur &x,int *p,int *n,int *z,GIAC_CONTEXT);
+  gen _ldl(const gen & a,GIAC_CONTEXT);
+  extern const unary_function_ptr * const  at_ldl ;
+  gen _inertia(const gen & a,GIAC_CONTEXT);
+  extern const unary_function_ptr * const  at_inertia ;
+  // end additions by L. Marohnić
   gen _svd(const gen & a,GIAC_CONTEXT);
   extern const unary_function_ptr * const  at_svd ;
   gen _basis(const gen & a,GIAC_CONTEXT);
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext.c
deleted file mode 120000
index a6a558c00..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/gcdext.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext.c
new file mode 100644
index 000000000..55014807e
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext.c
@@ -0,0 +1,557 @@
+/* mpn_gcdext -- Extended Greatest Common Divisor.
+
+Copyright 1996, 1998, 2000-2005, 2008, 2009, 2012 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Computes (r;b) = (a; b) M. Result is of size n + M->n +/- 1, and
+   the size is returned (if inputs are non-normalized, result may be
+   non-normalized too). Temporary space needed is M->n + n.
+ */
+static size_t
+hgcd_mul_matrix_vector (struct hgcd_matrix *M,
+			mp_ptr rp, mp_srcptr ap, mp_ptr bp, mp_size_t n, mp_ptr tp)
+{
+  mp_limb_t ah, bh;
+
+  /* Compute (r,b) <-- (u00 a + u10 b, u01 a + u11 b) as
+
+     t  = u00 * a
+     r  = u10 * b
+     r += t;
+
+     t  = u11 * b
+     b  = u01 * a
+     b += t;
+  */
+
+  if (M->n >= n)
+    {
+      mpn_mul (tp, M->p[0][0], M->n, ap, n);
+      mpn_mul (rp, M->p[1][0], M->n, bp, n);
+    }
+  else
+    {
+      mpn_mul (tp, ap, n, M->p[0][0], M->n);
+      mpn_mul (rp, bp, n, M->p[1][0], M->n);
+    }
+
+  ah = mpn_add_n (rp, rp, tp, n + M->n);
+
+  if (M->n >= n)
+    {
+      mpn_mul (tp, M->p[1][1], M->n, bp, n);
+      mpn_mul (bp, M->p[0][1], M->n, ap, n);
+    }
+  else
+    {
+      mpn_mul (tp, bp, n, M->p[1][1], M->n);
+      mpn_mul (bp, ap, n, M->p[0][1], M->n);
+    }
+  bh = mpn_add_n (bp, bp, tp, n + M->n);
+
+  n += M->n;
+  if ( (ah | bh) > 0)
+    {
+      rp[n] = ah;
+      bp[n] = bh;
+      n++;
+    }
+  else
+    {
+      /* Normalize */
+      while ( (rp[n-1] | bp[n-1]) == 0)
+	n--;
+    }
+
+  return n;
+}
+
+#define COMPUTE_V_ITCH(n) (2*(n))
+
+/* Computes |v| = |(g - u a)| / b, where u may be positive or
+   negative, and v is of the opposite sign. max(a, b) is of size n, u and
+   v at most size n, and v must have space for n+1 limbs. */
+static mp_size_t
+compute_v (mp_ptr vp,
+	   mp_srcptr ap, mp_srcptr bp, mp_size_t n,
+	   mp_srcptr gp, mp_size_t gn,
+	   mp_srcptr up, mp_size_t usize,
+	   mp_ptr tp)
+{
+  mp_size_t size;
+  mp_size_t an;
+  mp_size_t bn;
+  mp_size_t vn;
+
+  ASSERT (n > 0);
+  ASSERT (gn > 0);
+  ASSERT (usize != 0);
+
+  size = ABS (usize);
+  ASSERT (size <= n);
+  ASSERT (up[size-1] > 0);
+
+  an = n;
+  MPN_NORMALIZE (ap, an);
+  ASSERT (gn <= an);
+
+  if (an >= size)
+    mpn_mul (tp, ap, an, up, size);
+  else
+    mpn_mul (tp, up, size, ap, an);
+
+  size += an;
+
+  if (usize > 0)
+    {
+      /* |v| = -v = (u a - g) / b */
+
+      ASSERT_NOCARRY (mpn_sub (tp, tp, size, gp, gn));
+      MPN_NORMALIZE (tp, size);
+      if (size == 0)
+	return 0;
+    }
+  else
+    { /* |v| = v = (g - u a) / b = (g + |u| a) / b. Since g <= a,
+	 (g + |u| a) always fits in (|usize| + an) limbs. */
+
+      ASSERT_NOCARRY (mpn_add (tp, tp, size, gp, gn));
+      size -= (tp[size - 1] == 0);
+    }
+
+  /* Now divide t / b. There must be no remainder */
+  bn = n;
+  MPN_NORMALIZE (bp, bn);
+  ASSERT (size >= bn);
+
+  vn = size + 1 - bn;
+  ASSERT (vn <= n + 1);
+
+  mpn_divexact (vp, tp, size, bp, bn);
+  vn -= (vp[vn-1] == 0);
+
+  return vn;
+}
+
+/* Temporary storage:
+
+   Initial division: Quotient of at most an - n + 1 <= an limbs.
+
+   Storage for u0 and u1: 2(n+1).
+
+   Storage for hgcd matrix M, with input ceil(n/2): 5 * ceil(n/4)
+
+   Storage for hgcd, input (n + 1)/2: 9 n/4 plus some.
+
+   When hgcd succeeds: 1 + floor(3n/2) for adjusting a and b, and 2(n+1) for the cofactors.
+
+   When hgcd fails: 2n + 1 for mpn_gcdext_subdiv_step, which is less.
+
+   For the lehmer call after the loop, Let T denote
+   GCDEXT_DC_THRESHOLD. For the gcdext_lehmer call, we need T each for
+   u, a and b, and 4T+3 scratch space. Next, for compute_v, we need T
+   for u, T+1 for v and 2T scratch space. In all, 7T + 3 is
+   sufficient for both operations.
+
+*/
+
+/* Optimal choice of p seems difficult. In each iteration the division
+ * of work between hgcd and the updates of u0 and u1 depends on the
+ * current size of the u. It may be desirable to use a different
+ * choice of p in each iteration. Also the input size seems to matter;
+ * choosing p = n / 3 in the first iteration seems to improve
+ * performance slightly for input size just above the threshold, but
+ * degrade performance for larger inputs. */
+#define CHOOSE_P_1(n) ((n) / 2)
+#define CHOOSE_P_2(n) ((n) / 3)
+
+mp_size_t
+mpn_gcdext (mp_ptr gp, mp_ptr up, mp_size_t *usizep,
+	    mp_ptr ap, mp_size_t an, mp_ptr bp, mp_size_t n)
+{
+  mp_size_t talloc;
+  mp_size_t scratch;
+  mp_size_t matrix_scratch;
+  mp_size_t ualloc = n + 1;
+
+  struct gcdext_ctx ctx;
+  mp_size_t un;
+  mp_ptr u0;
+  mp_ptr u1;
+
+  mp_ptr tp;
+
+  TMP_DECL;
+
+  ASSERT (an >= n);
+  ASSERT (n > 0);
+  ASSERT (bp[n-1] > 0);
+
+  TMP_MARK;
+
+  /* FIXME: Check for small sizes first, before setting up temporary
+     storage etc. */
+  talloc = MPN_GCDEXT_LEHMER_N_ITCH(n);
+
+  /* For initial division */
+  scratch = an - n + 1;
+  if (scratch > talloc)
+    talloc = scratch;
+
+  if (ABOVE_THRESHOLD (n, GCDEXT_DC_THRESHOLD))
+    {
+      /* For hgcd loop. */
+      mp_size_t hgcd_scratch;
+      mp_size_t update_scratch;
+      mp_size_t p1 = CHOOSE_P_1 (n);
+      mp_size_t p2 = CHOOSE_P_2 (n);
+      mp_size_t min_p = MIN(p1, p2);
+      mp_size_t max_p = MAX(p1, p2);
+      matrix_scratch = MPN_HGCD_MATRIX_INIT_ITCH (n - min_p);
+      hgcd_scratch = mpn_hgcd_itch (n - min_p);
+      update_scratch = max_p + n - 1;
+
+      scratch = matrix_scratch + MAX(hgcd_scratch, update_scratch);
+      if (scratch > talloc)
+	talloc = scratch;
+
+      /* Final mpn_gcdext_lehmer_n call. Need space for u and for
+	 copies of a and b. */
+      scratch = MPN_GCDEXT_LEHMER_N_ITCH (GCDEXT_DC_THRESHOLD)
+	+ 3*GCDEXT_DC_THRESHOLD;
+
+      if (scratch > talloc)
+	talloc = scratch;
+
+      /* Cofactors u0 and u1 */
+      talloc += 2*(n+1);
+    }
+
+  tp = TMP_ALLOC_LIMBS(talloc);
+
+  if (an > n)
+    {
+      mpn_tdiv_qr (tp, ap, 0, ap, an, bp, n);
+
+      if (mpn_zero_p (ap, n))
+	{
+	  MPN_COPY (gp, bp, n);
+	  *usizep = 0;
+	  TMP_FREE;
+	  return n;
+	}
+    }
+
+  if (BELOW_THRESHOLD (n, GCDEXT_DC_THRESHOLD))
+    {
+      mp_size_t gn = mpn_gcdext_lehmer_n(gp, up, usizep, ap, bp, n, tp);
+
+      TMP_FREE;
+      return gn;
+    }
+
+  MPN_ZERO (tp, 2*ualloc);
+  u0 = tp; tp += ualloc;
+  u1 = tp; tp += ualloc;
+
+  ctx.gp = gp;
+  ctx.up = up;
+  ctx.usize = usizep;
+
+  {
+    /* For the first hgcd call, there are no u updates, and it makes
+       some sense to use a different choice for p. */
+
+    /* FIXME: We could trim use of temporary storage, since u0 and u1
+       are not used yet. For the hgcd call, we could swap in the u0
+       and u1 pointers for the relevant matrix elements. */
+
+    struct hgcd_matrix M;
+    mp_size_t p = CHOOSE_P_1 (n);
+    mp_size_t nn;
+
+    mpn_hgcd_matrix_init (&M, n - p, tp);
+    nn = mpn_hgcd (ap + p, bp + p, n - p, &M, tp + matrix_scratch);
+    if (nn > 0)
+      {
+	ASSERT (M.n <= (n - p - 1)/2);
+	ASSERT (M.n + p <= (p + n - 1) / 2);
+
+	/* Temporary storage 2 (p + M->n) <= p + n - 1 */
+	n = mpn_hgcd_matrix_adjust (&M, p + nn, ap, bp, p, tp + matrix_scratch);
+
+	MPN_COPY (u0, M.p[1][0], M.n);
+	MPN_COPY (u1, M.p[1][1], M.n);
+	un = M.n;
+	while ( (u0[un-1] | u1[un-1] ) == 0)
+	  un--;
+      }
+    else
+      {
+	/* mpn_hgcd has failed. Then either one of a or b is very
+	   small, or the difference is very small. Perform one
+	   subtraction followed by one division. */
+	u1[0] = 1;
+
+	ctx.u0 = u0;
+	ctx.u1 = u1;
+	ctx.tp = tp + n; /* ualloc */
+	ctx.un = 1;
+
+	/* Temporary storage n */
+	n = mpn_gcd_subdiv_step (ap, bp, n, 0, mpn_gcdext_hook, &ctx, tp);
+	if (n == 0)
+	  {
+	    TMP_FREE;
+	    return ctx.gn;
+	  }
+
+	un = ctx.un;
+	ASSERT (un < ualloc);
+      }
+  }
+
+  while (ABOVE_THRESHOLD (n, GCDEXT_DC_THRESHOLD))
+    {
+      struct hgcd_matrix M;
+      mp_size_t p = CHOOSE_P_2 (n);
+      mp_size_t nn;
+
+      mpn_hgcd_matrix_init (&M, n - p, tp);
+      nn = mpn_hgcd (ap + p, bp + p, n - p, &M, tp + matrix_scratch);
+      if (nn > 0)
+	{
+	  mp_ptr t0;
+
+	  t0 = tp + matrix_scratch;
+	  ASSERT (M.n <= (n - p - 1)/2);
+	  ASSERT (M.n + p <= (p + n - 1) / 2);
+
+	  /* Temporary storage 2 (p + M->n) <= p + n - 1 */
+	  n = mpn_hgcd_matrix_adjust (&M, p + nn, ap, bp, p, t0);
+
+	  /* By the same analysis as for mpn_hgcd_matrix_mul */
+	  ASSERT (M.n + un <= ualloc);
+
+	  /* FIXME: This copying could be avoided by some swapping of
+	   * pointers. May need more temporary storage, though. */
+	  MPN_COPY (t0, u0, un);
+
+	  /* Temporary storage ualloc */
+	  un = hgcd_mul_matrix_vector (&M, u0, t0, u1, un, t0 + un);
+
+	  ASSERT (un < ualloc);
+	  ASSERT ( (u0[un-1] | u1[un-1]) > 0);
+	}
+      else
+	{
+	  /* mpn_hgcd has failed. Then either one of a or b is very
+	     small, or the difference is very small. Perform one
+	     subtraction followed by one division. */
+	  ctx.u0 = u0;
+	  ctx.u1 = u1;
+	  ctx.tp = tp + n; /* ualloc */
+	  ctx.un = un;
+
+	  /* Temporary storage n */
+	  n = mpn_gcd_subdiv_step (ap, bp, n, 0, mpn_gcdext_hook, &ctx, tp);
+	  if (n == 0)
+	    {
+	      TMP_FREE;
+	      return ctx.gn;
+	    }
+
+	  un = ctx.un;
+	  ASSERT (un < ualloc);
+	}
+    }
+  /* We have A = ... a + ... b
+	     B =  u0 a +  u1 b
+
+	     a = u1  A + ... B
+	     b = -u0 A + ... B
+
+     with bounds
+
+       |u0|, |u1| <= B / min(a, b)
+
+     We always have u1 > 0, and u0 == 0 is possible only if u1 == 1,
+     in which case the only reduction done so far is a = A - k B for
+     some k.
+
+     Compute g = u a + v b = (u u1 - v u0) A + (...) B
+     Here, u, v are bounded by
+
+       |u| <= b,
+       |v| <= a
+  */
+
+  ASSERT ( (ap[n-1] | bp[n-1]) > 0);
+
+  if (UNLIKELY (mpn_cmp (ap, bp, n) == 0))
+    {
+      /* Must return the smallest cofactor, +u1 or -u0 */
+      int c;
+
+      MPN_COPY (gp, ap, n);
+
+      MPN_CMP (c, u0, u1, un);
+      /* c == 0 can happen only when A = (2k+1) G, B = 2 G. And in
+	 this case we choose the cofactor + 1, corresponding to G = A
+	 - k B, rather than -1, corresponding to G = - A + (k+1) B. */
+      ASSERT (c != 0 || (un == 1 && u0[0] == 1 && u1[0] == 1));
+      if (c < 0)
+	{
+	  MPN_NORMALIZE (u0, un);
+	  MPN_COPY (up, u0, un);
+	  *usizep = -un;
+	}
+      else
+	{
+	  MPN_NORMALIZE_NOT_ZERO (u1, un);
+	  MPN_COPY (up, u1, un);
+	  *usizep = un;
+	}
+
+      TMP_FREE;
+      return n;
+    }
+  else if (UNLIKELY (u0[0] == 0) && un == 1)
+    {
+      mp_size_t gn;
+      ASSERT (u1[0] == 1);
+
+      /* g = u a + v b = (u u1 - v u0) A + (...) B = u A + (...) B */
+      gn = mpn_gcdext_lehmer_n (gp, up, usizep, ap, bp, n, tp);
+
+      TMP_FREE;
+      return gn;
+    }
+  else
+    {
+      mp_size_t u0n;
+      mp_size_t u1n;
+      mp_size_t lehmer_un;
+      mp_size_t lehmer_vn;
+      mp_size_t gn;
+
+      mp_ptr lehmer_up;
+      mp_ptr lehmer_vp;
+      int negate;
+
+      lehmer_up = tp; tp += n;
+
+      /* Call mpn_gcdext_lehmer_n with copies of a and b. */
+      MPN_COPY (tp, ap, n);
+      MPN_COPY (tp + n, bp, n);
+      gn = mpn_gcdext_lehmer_n (gp, lehmer_up, &lehmer_un, tp, tp + n, n, tp + 2*n);
+
+      u0n = un;
+      MPN_NORMALIZE (u0, u0n);
+      ASSERT (u0n > 0);
+
+      if (lehmer_un == 0)
+	{
+	  /* u == 0  ==>  v = g / b == 1  ==> g = - u0 A + (...) B */
+	  MPN_COPY (up, u0, u0n);
+	  *usizep = -u0n;
+
+	  TMP_FREE;
+	  return gn;
+	}
+
+      lehmer_vp = tp;
+      /* Compute v = (g - u a) / b */
+      lehmer_vn = compute_v (lehmer_vp,
+			     ap, bp, n, gp, gn, lehmer_up, lehmer_un, tp + n + 1);
+
+      if (lehmer_un > 0)
+	negate = 0;
+      else
+	{
+	  lehmer_un = -lehmer_un;
+	  negate = 1;
+	}
+
+      u1n = un;
+      MPN_NORMALIZE (u1, u1n);
+      ASSERT (u1n > 0);
+
+      ASSERT (lehmer_un + u1n <= ualloc);
+      ASSERT (lehmer_vn + u0n <= ualloc);
+
+      /* We may still have v == 0 */
+
+      /* Compute u u0 */
+      if (lehmer_un <= u1n)
+	/* Should be the common case */
+	mpn_mul (up, u1, u1n, lehmer_up, lehmer_un);
+      else
+	mpn_mul (up, lehmer_up, lehmer_un, u1, u1n);
+
+      un = u1n + lehmer_un;
+      un -= (up[un - 1] == 0);
+
+      if (lehmer_vn > 0)
+	{
+	  mp_limb_t cy;
+
+	  /* Overwrites old u1 value */
+	  if (lehmer_vn <= u0n)
+	    /* Should be the common case */
+	    mpn_mul (u1, u0, u0n, lehmer_vp, lehmer_vn);
+	  else
+	    mpn_mul (u1, lehmer_vp, lehmer_vn, u0, u0n);
+
+	  u1n = u0n + lehmer_vn;
+	  u1n -= (u1[u1n - 1] == 0);
+
+	  if (u1n <= un)
+	    {
+	      cy = mpn_add (up, up, un, u1, u1n);
+	    }
+	  else
+	    {
+	      cy = mpn_add (up, u1, u1n, up, un);
+	      un = u1n;
+	    }
+	  up[un] = cy;
+	  un += (cy != 0);
+
+	  ASSERT (un < ualloc);
+	}
+      *usizep = negate ? -un : un;
+
+      TMP_FREE;
+      return gn;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_1.c
deleted file mode 120000
index d713bc948..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/gcdext_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_1.c
new file mode 100644
index 000000000..b221a9268
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_1.c
@@ -0,0 +1,275 @@
+/* mpn_gcdext -- Extended Greatest Common Divisor.
+
+Copyright 1996, 1998, 2000-2005, 2008, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#ifndef GCDEXT_1_USE_BINARY
+#define GCDEXT_1_USE_BINARY 0
+#endif
+
+#ifndef GCDEXT_1_BINARY_METHOD
+#define GCDEXT_1_BINARY_METHOD 2
+#endif
+
+#if GCDEXT_1_USE_BINARY
+
+mp_limb_t
+mpn_gcdext_1 (mp_limb_signed_t *sp, mp_limb_signed_t *tp,
+	      mp_limb_t u, mp_limb_t v)
+{
+  /* Maintain
+
+     U = t1 u + t0 v
+     V = s1 u + s0 v
+
+     where U, V are the inputs (without any shared power of two),
+     and the matrix has determinant ± 2^{shift}.
+  */
+  mp_limb_t s0 = 1;
+  mp_limb_t t0 = 0;
+  mp_limb_t s1 = 0;
+  mp_limb_t t1 = 1;
+  mp_limb_t ug;
+  mp_limb_t vg;
+  mp_limb_t ugh;
+  mp_limb_t vgh;
+  unsigned zero_bits;
+  unsigned shift;
+  unsigned i;
+#if GCDEXT_1_BINARY_METHOD == 2
+  mp_limb_t det_sign;
+#endif
+
+  ASSERT (u > 0);
+  ASSERT (v > 0);
+
+  count_trailing_zeros (zero_bits, u | v);
+  u >>= zero_bits;
+  v >>= zero_bits;
+
+  if ((u & 1) == 0)
+    {
+      count_trailing_zeros (shift, u);
+      u >>= shift;
+      t1 <<= shift;
+    }
+  else if ((v & 1) == 0)
+    {
+      count_trailing_zeros (shift, v);
+      v >>= shift;
+      s0 <<= shift;
+    }
+  else
+    shift = 0;
+
+#if GCDEXT_1_BINARY_METHOD == 1
+  while (u != v)
+    {
+      unsigned count;
+      if (u > v)
+	{
+	  u -= v;
+
+	  count_trailing_zeros (count, u);
+	  u >>= count;
+
+	  t0 += t1; t1 <<= count;
+	  s0 += s1; s1 <<= count;
+	}
+      else
+	{
+	  v -= u;
+
+	  count_trailing_zeros (count, v);
+	  v >>= count;
+
+	  t1 += t0; t0 <<= count;
+	  s1 += s0; s0 <<= count;
+	}
+      shift += count;
+    }
+#else
+# if GCDEXT_1_BINARY_METHOD == 2
+  u >>= 1;
+  v >>= 1;
+
+  det_sign = 0;
+
+  while (u != v)
+    {
+      unsigned count;
+      mp_limb_t d =  u - v;
+      mp_limb_t vgtu = LIMB_HIGHBIT_TO_MASK (d);
+      mp_limb_t sx;
+      mp_limb_t tx;
+
+      /* When v <= u (vgtu == 0), the updates are:
+
+	   (u; v)   <-- ( (u - v) >> count; v)    (det = +(1<<count) for corr. M factor)
+	   (t1, t0) <-- (t1 << count, t0 + t1)
+
+	 and when v > 0, the updates are
+
+	   (u; v)   <-- ( (v - u) >> count; u)    (det = -(1<<count))
+	   (t1, t0) <-- (t0 << count, t0 + t1)
+
+	 and similarly for s1, s0
+      */
+
+      /* v <-- min (u, v) */
+      v += (vgtu & d);
+
+      /* u <-- |u - v| */
+      u = (d ^ vgtu) - vgtu;
+
+      /* Number of trailing zeros is the same no matter if we look at
+       * d or u, but using d gives more parallelism. */
+      count_trailing_zeros (count, d);
+
+      det_sign ^= vgtu;
+
+      tx = vgtu & (t0 - t1);
+      sx = vgtu & (s0 - s1);
+      t0 += t1;
+      s0 += s1;
+      t1 += tx;
+      s1 += sx;
+
+      count++;
+      u >>= count;
+      t1 <<= count;
+      s1 <<= count;
+      shift += count;
+    }
+  u = (u << 1) + 1;
+# else /* GCDEXT_1_BINARY_METHOD == 2 */
+#  error Unknown GCDEXT_1_BINARY_METHOD
+# endif
+#endif
+
+  /* Now u = v = g = gcd (u,v). Compute U/g and V/g */
+  ug = t0 + t1;
+  vg = s0 + s1;
+
+  ugh = ug/2 + (ug & 1);
+  vgh = vg/2 + (vg & 1);
+
+  /* Now 2^{shift} g = s0 U - t0 V. Get rid of the power of two, using
+     s0 U - t0 V = (s0 + V/g) U - (t0 + U/g) V. */
+  for (i = 0; i < shift; i++)
+    {
+      mp_limb_t mask = - ( (s0 | t0) & 1);
+
+      s0 /= 2;
+      t0 /= 2;
+      s0 += mask & vgh;
+      t0 += mask & ugh;
+    }
+
+  ASSERT_ALWAYS (s0 <= vg);
+  ASSERT_ALWAYS (t0 <= ug);
+
+  if (s0 > vg - s0)
+    {
+      s0 -= vg;
+      t0 -= ug;
+    }
+#if GCDEXT_1_BINARY_METHOD == 2
+  /* Conditional negation. */
+  s0 = (s0 ^ det_sign) - det_sign;
+  t0 = (t0 ^ det_sign) - det_sign;
+#endif
+  *sp = s0;
+  *tp = -t0;
+
+  return u << zero_bits;
+}
+
+#else /* !GCDEXT_1_USE_BINARY */
+
+
+/* FIXME: Takes two single-word limbs. It could be extended to a
+ * function that accepts a bignum for the first input, and only
+ * returns the first co-factor. */
+
+mp_limb_t
+mpn_gcdext_1 (mp_limb_signed_t *up, mp_limb_signed_t *vp,
+	      mp_limb_t a, mp_limb_t b)
+{
+  /* Maintain
+
+     a =  u0 A + v0 B
+     b =  u1 A + v1 B
+
+     where A, B are the original inputs.
+  */
+  mp_limb_signed_t u0 = 1;
+  mp_limb_signed_t v0 = 0;
+  mp_limb_signed_t u1 = 0;
+  mp_limb_signed_t v1 = 1;
+
+  ASSERT (a > 0);
+  ASSERT (b > 0);
+
+  if (a < b)
+    goto divide_by_b;
+
+  for (;;)
+    {
+      mp_limb_t q;
+
+      q = a / b;
+      a -= q * b;
+
+      if (a == 0)
+	{
+	  *up = u1;
+	  *vp = v1;
+	  return b;
+	}
+      u0 -= q * u1;
+      v0 -= q * v1;
+
+    divide_by_b:
+      q = b / a;
+      b -= q * a;
+
+      if (b == 0)
+	{
+	  *up = u0;
+	  *vp = v0;
+	  return a;
+	}
+      u1 -= q * u0;
+      v1 -= q * v0;
+    }
+}
+#endif /* !GCDEXT_1_USE_BINARY */
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_lehmer.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_lehmer.c
deleted file mode 120000
index fcc85306e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_lehmer.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/gcdext_lehmer.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_lehmer.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_lehmer.c
new file mode 100644
index 000000000..ea4e86d45
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/gcdext_lehmer.c
@@ -0,0 +1,336 @@
+/* mpn_gcdext -- Extended Greatest Common Divisor.
+
+Copyright 1996, 1998, 2000-2005, 2008, 2009, 2012 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Here, d is the index of the cofactor to update. FIXME: Could use qn
+   = 0 for the common case q = 1. */
+void
+mpn_gcdext_hook (void *p, mp_srcptr gp, mp_size_t gn,
+		 mp_srcptr qp, mp_size_t qn, int d)
+{
+  struct gcdext_ctx *ctx = (struct gcdext_ctx *) p;
+  mp_size_t un = ctx->un;
+
+  if (gp)
+    {
+      mp_srcptr up;
+
+      ASSERT (gn > 0);
+      ASSERT (gp[gn-1] > 0);
+
+      MPN_COPY (ctx->gp, gp, gn);
+      ctx->gn = gn;
+
+      if (d < 0)
+	{
+	  int c;
+
+	  /* Must return the smallest cofactor, +u1 or -u0 */
+	  MPN_CMP (c, ctx->u0, ctx->u1, un);
+	  ASSERT (c != 0 || (un == 1 && ctx->u0[0] == 1 && ctx->u1[0] == 1));
+
+	  d = c < 0;
+	}
+
+      up = d ? ctx->u0 : ctx->u1;
+
+      MPN_NORMALIZE (up, un);
+      MPN_COPY (ctx->up, up, un);
+
+      *ctx->usize = d ? -un : un;
+    }
+  else
+    {
+      mp_limb_t cy;
+      mp_ptr u0 = ctx->u0;
+      mp_ptr u1 = ctx->u1;
+
+      ASSERT (d >= 0);
+
+      if (d)
+	MP_PTR_SWAP (u0, u1);
+
+      qn -= (qp[qn-1] == 0);
+
+      /* Update u0 += q  * u1 */
+      if (qn == 1)
+	{
+	  mp_limb_t q = qp[0];
+
+	  if (q == 1)
+	    /* A common case. */
+	    cy = mpn_add_n (u0, u0, u1, un);
+	  else
+	    cy = mpn_addmul_1 (u0, u1, un, q);
+	}
+      else
+	{
+	  mp_size_t u1n;
+	  mp_ptr tp;
+
+	  u1n = un;
+	  MPN_NORMALIZE (u1, u1n);
+
+	  if (u1n == 0)
+	    return;
+
+	  /* Should always have u1n == un here, and u1 >= u0. The
+	     reason is that we alternate adding u0 to u1 and u1 to u0
+	     (corresponding to subtractions a - b and b - a), and we
+	     can get a large quotient only just after a switch, which
+	     means that we'll add (a multiple of) the larger u to the
+	     smaller. */
+
+	  tp = ctx->tp;
+
+	  if (qn > u1n)
+	    mpn_mul (tp, qp, qn, u1, u1n);
+	  else
+	    mpn_mul (tp, u1, u1n, qp, qn);
+
+	  u1n += qn;
+	  u1n -= tp[u1n-1] == 0;
+
+	  if (u1n >= un)
+	    {
+	      cy = mpn_add (u0, tp, u1n, u0, un);
+	      un = u1n;
+	    }
+	  else
+	    /* Note: Unlikely case, maybe never happens? */
+	    cy = mpn_add (u0, u0, un, tp, u1n);
+
+	}
+      u0[un] = cy;
+      ctx->un = un + (cy > 0);
+    }
+}
+
+/* Temporary storage: 3*(n+1) for u. If hgcd2 succeeds, we need n for
+   the matrix-vector multiplication adjusting a, b. If hgcd fails, we
+   need at most n for the quotient and n+1 for the u update (reusing
+   the extra u). In all, 4n + 3. */
+
+mp_size_t
+mpn_gcdext_lehmer_n (mp_ptr gp, mp_ptr up, mp_size_t *usize,
+		     mp_ptr ap, mp_ptr bp, mp_size_t n,
+		     mp_ptr tp)
+{
+  mp_size_t ualloc = n + 1;
+
+  /* Keeps track of the second row of the reduction matrix
+   *
+   *   M = (v0, v1 ; u0, u1)
+   *
+   * which correspond to the first column of the inverse
+   *
+   *   M^{-1} = (u1, -v1; -u0, v0)
+   *
+   * This implies that
+   *
+   *   a =  u1 A (mod B)
+   *   b = -u0 A (mod B)
+   *
+   * where A, B denotes the input values.
+   */
+
+  struct gcdext_ctx ctx;
+  mp_size_t un;
+  mp_ptr u0;
+  mp_ptr u1;
+  mp_ptr u2;
+
+  MPN_ZERO (tp, 3*ualloc);
+  u0 = tp; tp += ualloc;
+  u1 = tp; tp += ualloc;
+  u2 = tp; tp += ualloc;
+
+  u1[0] = 1; un = 1;
+
+  ctx.gp = gp;
+  ctx.up = up;
+  ctx.usize = usize;
+
+  /* FIXME: Handle n == 2 differently, after the loop? */
+  while (n >= 2)
+    {
+      struct hgcd_matrix1 M;
+      mp_limb_t ah, al, bh, bl;
+      mp_limb_t mask;
+
+      mask = ap[n-1] | bp[n-1];
+      ASSERT (mask > 0);
+
+      if (mask & GMP_NUMB_HIGHBIT)
+	{
+	  ah = ap[n-1]; al = ap[n-2];
+	  bh = bp[n-1]; bl = bp[n-2];
+	}
+      else if (n == 2)
+	{
+	  /* We use the full inputs without truncation, so we can
+	     safely shift left. */
+	  int shift;
+
+	  count_leading_zeros (shift, mask);
+	  ah = MPN_EXTRACT_NUMB (shift, ap[1], ap[0]);
+	  al = ap[0] << shift;
+	  bh = MPN_EXTRACT_NUMB (shift, bp[1], bp[0]);
+	  bl = bp[0] << shift;
+	}
+      else
+	{
+	  int shift;
+
+	  count_leading_zeros (shift, mask);
+	  ah = MPN_EXTRACT_NUMB (shift, ap[n-1], ap[n-2]);
+	  al = MPN_EXTRACT_NUMB (shift, ap[n-2], ap[n-3]);
+	  bh = MPN_EXTRACT_NUMB (shift, bp[n-1], bp[n-2]);
+	  bl = MPN_EXTRACT_NUMB (shift, bp[n-2], bp[n-3]);
+	}
+
+      /* Try an mpn_nhgcd2 step */
+      if (mpn_hgcd2 (ah, al, bh, bl, &M))
+	{
+	  n = mpn_matrix22_mul1_inverse_vector (&M, tp, ap, bp, n);
+	  MP_PTR_SWAP (ap, tp);
+	  un = mpn_hgcd_mul_matrix1_vector(&M, u2, u0, u1, un);
+	  MP_PTR_SWAP (u0, u2);
+	}
+      else
+	{
+	  /* mpn_hgcd2 has failed. Then either one of a or b is very
+	     small, or the difference is very small. Perform one
+	     subtraction followed by one division. */
+	  ctx.u0 = u0;
+	  ctx.u1 = u1;
+	  ctx.tp = u2;
+	  ctx.un = un;
+
+	  /* Temporary storage n for the quotient and ualloc for the
+	     new cofactor. */
+	  n = mpn_gcd_subdiv_step (ap, bp, n, 0, mpn_gcdext_hook, &ctx, tp);
+	  if (n == 0)
+	    return ctx.gn;
+
+	  un = ctx.un;
+	}
+    }
+  ASSERT_ALWAYS (ap[0] > 0);
+  ASSERT_ALWAYS (bp[0] > 0);
+
+  if (ap[0] == bp[0])
+    {
+      int c;
+
+      /* Which cofactor to return now? Candidates are +u1 and -u0,
+	 depending on which of a and b was most recently reduced,
+	 which we don't keep track of. So compare and get the smallest
+	 one. */
+
+      gp[0] = ap[0];
+
+      MPN_CMP (c, u0, u1, un);
+      ASSERT (c != 0 || (un == 1 && u0[0] == 1 && u1[0] == 1));
+      if (c < 0)
+	{
+	  MPN_NORMALIZE (u0, un);
+	  MPN_COPY (up, u0, un);
+	  *usize = -un;
+	}
+      else
+	{
+	  MPN_NORMALIZE_NOT_ZERO (u1, un);
+	  MPN_COPY (up, u1, un);
+	  *usize = un;
+	}
+      return 1;
+    }
+  else
+    {
+      mp_limb_t uh, vh;
+      mp_limb_signed_t u;
+      mp_limb_signed_t v;
+      int negate;
+
+      gp[0] = mpn_gcdext_1 (&u, &v, ap[0], bp[0]);
+
+      /* Set up = u u1 - v u0. Keep track of size, un grows by one or
+	 two limbs. */
+
+      if (u == 0)
+	{
+	  ASSERT (v == 1);
+	  MPN_NORMALIZE (u0, un);
+	  MPN_COPY (up, u0, un);
+	  *usize = -un;
+	  return 1;
+	}
+      else if (v == 0)
+	{
+	  ASSERT (u == 1);
+	  MPN_NORMALIZE (u1, un);
+	  MPN_COPY (up, u1, un);
+	  *usize = un;
+	  return 1;
+	}
+      else if (u > 0)
+	{
+	  negate = 0;
+	  ASSERT (v < 0);
+	  v = -v;
+	}
+      else
+	{
+	  negate = 1;
+	  ASSERT (v > 0);
+	  u = -u;
+	}
+
+      uh = mpn_mul_1 (up, u1, un, u);
+      vh = mpn_addmul_1 (up, u0, un, v);
+
+      if ( (uh | vh) > 0)
+	{
+	  uh += vh;
+	  up[un++] = uh;
+	  if (uh < vh)
+	    up[un++] = 1;
+	}
+
+      MPN_NORMALIZE_NOT_ZERO (up, un);
+
+      *usize = negate ? -un : un;
+      return 1;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/get_d.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/get_d.c
deleted file mode 120000
index 5db509edf..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/get_d.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/get_d.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/get_d.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/get_d.c
new file mode 100644
index 000000000..8bef12810
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/get_d.c
@@ -0,0 +1,438 @@
+/* mpn_get_d -- limbs to double conversion.
+
+   THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY.  THEY'RE ALMOST
+   CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
+   FUTURE GNU MP RELEASES.
+
+Copyright 2003, 2004, 2007, 2009, 2010, 2012, 2018 Free Software
+Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "config.h"
+
+#if HAVE_FLOAT_H
+#include <float.h>  /* for DBL_MANT_DIG and FLT_RADIX */
+#endif
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#ifndef _GMP_IEEE_FLOATS
+#define _GMP_IEEE_FLOATS 0
+#endif
+
+/* To force use of the generic C code for testing, put
+   "#define _GMP_IEEE_FLOATS 0" at this point.  */
+
+
+/* In alpha gcc prior to 3.4, signed DI comparisons involving constants are
+   rearranged from "x < n" to "x+(-n) < 0", which is of course hopelessly
+   wrong if that addition overflows.
+
+   The workaround here avoids this bug by ensuring n is not a literal constant.
+   Note that this is alpha specific.  The offending transformation is/was in
+   alpha.c alpha_emit_conditional_branch() under "We want to use cmpcc/bcc".
+
+   Bizarrely, this happens also with Cray cc on alphaev5-cray-unicosmk2.0.6.X,
+   and has the same solution.  Don't know why or how.  */
+
+#if HAVE_HOST_CPU_FAMILY_alpha				\
+  && ((defined (__GNUC__) && ! __GMP_GNUC_PREREQ(3,4))	\
+      || defined (_CRAY))
+static volatile const long CONST_1024 = 1024;
+static volatile const long CONST_NEG_1023 = -1023;
+static volatile const long CONST_NEG_1022_SUB_53 = -1022 - 53;
+#else
+#define CONST_1024	      (1024)
+#define CONST_NEG_1023	      (-1023)
+#define CONST_NEG_1022_SUB_53 (-1022 - 53)
+#endif
+
+
+/* Return the value {ptr,size}*2^exp, and negative if sign<0.  Must have
+   size>=1, and a non-zero high limb ptr[size-1].
+
+   When we know the fp format, the result is truncated towards zero.  This is
+   consistent with other gmp conversions, like mpz_set_f or mpz_set_q, and is
+   easy to implement and test.
+
+   When we do not know the format, such truncation seems much harder.  One
+   would need to defeat any rounding mode, including round-up.
+
+   It's felt that GMP is not primarily concerned with hardware floats, and
+   really isn't enhanced by getting involved with hardware rounding modes
+   (which could even be some weird unknown style), so something unambiguous and
+   straightforward is best.
+
+
+   The IEEE code below is the usual case, it knows either a 32-bit or 64-bit
+   limb and is done with shifts and masks.  The 64-bit case in particular
+   should come out nice and compact.
+
+   The generic code used to work one bit at a time, which was not only slow,
+   but implicitly relied upon denorms for intermediates, since the lowest bits'
+   weight of a perfectly valid fp number underflows in non-denorm.  Therefore,
+   the generic code now works limb-per-limb, initially creating a number x such
+   that 1 <= x <= BASE.  (BASE is reached only as result of rounding.)  Then
+   x's exponent is scaled with explicit code (not ldexp to avoid libm
+   dependency).  It is a tap-dance to avoid underflow or overflow, beware!
+
+
+   Traps:
+
+   Hardware traps for overflow to infinity, underflow to zero, or unsupported
+   denorms may or may not be taken.  The IEEE code works bitwise and so
+   probably won't trigger them, the generic code works by float operations and
+   so probably will.  This difference might be thought less than ideal, but
+   again its felt straightforward code is better than trying to get intimate
+   with hardware exceptions (of perhaps unknown nature).
+
+
+   Not done:
+
+   mpz_get_d in the past handled size==1 with a cast limb->double.  This might
+   still be worthwhile there (for up to the mantissa many bits), but for
+   mpn_get_d here, the cost of applying "exp" to the resulting exponent would
+   probably use up any benefit a cast may have over bit twiddling.  Also, if
+   the exponent is pushed into denorm range then bit twiddling is the only
+   option, to ensure the desired truncation is obtained.
+
+
+   Other:
+
+   For reference, note that HPPA 8000, 8200, 8500 and 8600 trap FCNV,UDW,DBL
+   to the kernel for values >= 2^63.  This makes it slow, and worse the kernel
+   Linux (what versions?) apparently uses untested code in its trap handling
+   routines, and gets the sign wrong.  We don't use such a limb-to-double
+   cast, neither in the IEEE or generic code.  */
+
+
+
+#undef FORMAT_RECOGNIZED
+
+double
+mpn_get_d (mp_srcptr up, mp_size_t size, mp_size_t sign, long exp)
+{
+  int lshift, nbits;
+  mp_limb_t x, mhi, mlo;
+
+  ASSERT (size >= 0);
+  ASSERT_MPN (up, size);
+  ASSERT (size == 0 || up[size-1] != 0);
+
+  if (size == 0)
+    return 0.0;
+
+  /* Adjust exp to a radix point just above {up,size}, guarding against
+     overflow.  After this exp can of course be reduced to anywhere within
+     the {up,size} region without underflow.  */
+  if (UNLIKELY ((unsigned long) (GMP_NUMB_BITS * size)
+		> ((unsigned long) LONG_MAX - exp)))
+    {
+#if _GMP_IEEE_FLOATS
+      goto ieee_infinity;
+#endif
+
+      /* generic */
+      exp = LONG_MAX;
+    }
+  else
+    {
+      exp += GMP_NUMB_BITS * size;
+    }
+
+#if _GMP_IEEE_FLOATS
+    {
+      union ieee_double_extract u;
+
+      up += size;
+
+#if GMP_LIMB_BITS == 64
+      mlo = up[-1];
+      count_leading_zeros (lshift, mlo);
+
+      exp -= (lshift - GMP_NAIL_BITS) + 1;
+      mlo <<= lshift;
+
+      nbits = GMP_LIMB_BITS - lshift;
+
+      if (nbits < 53 && size > 1)
+	{
+	  x = up[-2];
+	  x <<= GMP_NAIL_BITS;
+	  x >>= nbits;
+	  mlo |= x;
+	  nbits += GMP_NUMB_BITS;
+
+	  if (LIMBS_PER_DOUBLE >= 3 && nbits < 53 && size > 2)
+	    {
+	      x = up[-3];
+	      x <<= GMP_NAIL_BITS;
+	      x >>= nbits;
+	      mlo |= x;
+	      nbits += GMP_NUMB_BITS;
+	    }
+	}
+      mhi = mlo >> (32 + 11);
+      mlo = mlo >> 11;		/* later implicitly truncated to 32 bits */
+#endif
+#if GMP_LIMB_BITS == 32
+      x = *--up;
+      count_leading_zeros (lshift, x);
+
+      exp -= (lshift - GMP_NAIL_BITS) + 1;
+      x <<= lshift;
+      mhi = x >> 11;
+
+      if (lshift < 11)		/* FIXME: never true if NUMB < 20 bits */
+	{
+	  /* All 20 bits in mhi */
+	  mlo = x << 21;
+	  /* >= 1 bit in mlo */
+	  nbits = GMP_LIMB_BITS - lshift - 21;
+	}
+      else
+	{
+	  if (size > 1)
+	    {
+	      nbits = GMP_LIMB_BITS - lshift;
+
+	      x = *--up, size--;
+	      x <<= GMP_NAIL_BITS;
+	      mhi |= x >> nbits >> 11;
+
+	      mlo = x << (GMP_LIMB_BITS - nbits - 11);
+	      nbits = nbits + 11 - GMP_NAIL_BITS;
+	    }
+	  else
+	    {
+	      mlo = 0;
+	      goto done;
+	    }
+	}
+
+      /* Now all needed bits in mhi have been accumulated.  Add bits to mlo.  */
+
+      if (LIMBS_PER_DOUBLE >= 2 && nbits < 32 && size > 1)
+	{
+	  x = up[-1];
+	  x <<= GMP_NAIL_BITS;
+	  x >>= nbits;
+	  mlo |= x;
+	  nbits += GMP_NUMB_BITS;
+
+	  if (LIMBS_PER_DOUBLE >= 3 && nbits < 32 && size > 2)
+	    {
+	      x = up[-2];
+	      x <<= GMP_NAIL_BITS;
+	      x >>= nbits;
+	      mlo |= x;
+	      nbits += GMP_NUMB_BITS;
+
+	      if (LIMBS_PER_DOUBLE >= 4 && nbits < 32 && size > 3)
+		{
+		  x = up[-3];
+		  x <<= GMP_NAIL_BITS;
+		  x >>= nbits;
+		  mlo |= x;
+		  nbits += GMP_NUMB_BITS;
+		}
+	    }
+	}
+
+    done:;
+
+#endif
+      if (UNLIKELY (exp >= CONST_1024))
+	{
+	  /* overflow, return infinity */
+	ieee_infinity:
+	  mhi = 0;
+	  mlo = 0;
+	  exp = 1024;
+	}
+      else if (UNLIKELY (exp <= CONST_NEG_1023))
+	{
+	  int rshift;
+
+	  if (LIKELY (exp <= CONST_NEG_1022_SUB_53))
+	    return 0.0;	 /* denorm underflows to zero */
+
+	  rshift = -1022 - exp;
+	  ASSERT (rshift > 0 && rshift < 53);
+#if GMP_LIMB_BITS > 53
+	  mlo >>= rshift;
+	  mhi = mlo >> 32;
+#else
+	  if (rshift >= 32)
+	    {
+	      mlo = mhi;
+	      mhi = 0;
+	      rshift -= 32;
+	    }
+	  lshift = GMP_LIMB_BITS - rshift;
+	  mlo = (mlo >> rshift) | (rshift == 0 ? 0 : mhi << lshift);
+	  mhi >>= rshift;
+#endif
+	  exp = -1023;
+	}
+      u.s.manh = mhi;
+      u.s.manl = mlo;
+      u.s.exp = exp + 1023;
+      u.s.sig = (sign < 0);
+      return u.d;
+    }
+#define FORMAT_RECOGNIZED 1
+#endif
+
+#if HAVE_DOUBLE_VAX_D
+    {
+      union double_extract u;
+
+      up += size;
+
+      mhi = up[-1];
+
+      count_leading_zeros (lshift, mhi);
+      exp -= lshift;
+      mhi <<= lshift;
+
+      mlo = 0;
+      if (size > 1)
+	{
+	  mlo = up[-2];
+	  if (lshift != 0)
+	    mhi += mlo >> (GMP_LIMB_BITS - lshift);
+	  mlo <<= lshift;
+
+	  if (size > 2 && lshift > 8)
+	    {
+	      x = up[-3];
+	      mlo += x >> (GMP_LIMB_BITS - lshift);
+	    }
+	}
+
+      if (UNLIKELY (exp >= 128))
+	{
+	  /* overflow, return maximum number */
+	  mhi = 0xffffffff;
+	  mlo = 0xffffffff;
+	  exp = 127;
+	}
+      else if (UNLIKELY (exp < -128))
+	{
+	  return 0.0;	 /* underflows to zero */
+	}
+
+      u.s.man3 = mhi >> 24;	/* drop msb, since implicit */
+      u.s.man2 = mhi >> 8;
+      u.s.man1 = (mhi << 8) + (mlo >> 24);
+      u.s.man0 = mlo >> 8;
+      u.s.exp = exp + 128;
+      u.s.sig = sign < 0;
+      return u.d;
+    }
+#define FORMAT_RECOGNIZED 1
+#endif
+
+#if ! FORMAT_RECOGNIZED
+
+#if !defined(GMP_DBL_MANT_BITS)
+#if defined(DBL_MANT_DIG) && FLT_RADIX == 2
+#define GMP_DBL_MANT_BITS DBL_MANT_DIG
+#else
+/* FIXME: Chose a smarter default value. */
+#define GMP_DBL_MANT_BITS (16 * sizeof (double))
+#endif
+#endif
+
+    { /* Non-IEEE or strange limb size, generically convert
+	 GMP_DBL_MANT_BITS bits. */
+      mp_limb_t l;
+      int m;
+      mp_size_t i;
+      double d, weight;
+      unsigned long uexp;
+
+      /* First generate an fp number disregarding exp, instead keeping things
+	 within the numb base factor from 1, which should prevent overflow and
+	 underflow even for the most exponent limited fp formats.  */
+      i = size - 1;
+      l = up[i];
+      count_leading_zeros (m, l);
+      m = m + GMP_DBL_MANT_BITS - GMP_LIMB_BITS;
+      if (m < 0)
+	l &= GMP_NUMB_MAX << -m;
+      d = l;
+      for (weight = 1/MP_BASE_AS_DOUBLE; m > 0 && --i >= 0;)
+	{
+	  l = up[i];
+	  m -= GMP_NUMB_BITS;
+	  if (m < 0)
+	    l &= GMP_NUMB_MAX << -m;
+	  d += l * weight;
+	  weight /= MP_BASE_AS_DOUBLE;
+	  if (weight == 0)
+	    break;
+	}
+
+      /* Now apply exp.  */
+      exp -= GMP_NUMB_BITS;
+      if (exp > 0)
+	{
+	  weight = 2.0;
+	  uexp = exp;
+	}
+      else
+	{
+	  weight = 0.5;
+	  uexp = NEG_CAST (unsigned long, exp);
+	}
+#if 1
+      /* Square-and-multiply exponentiation.  */
+      if (uexp & 1)
+	d *= weight;
+      while (uexp >>= 1)
+	{
+	  weight *= weight;
+	  if (uexp & 1)
+	    d *= weight;
+	}
+#else
+      /* Plain exponentiation.  */
+      while (uexp > 0)
+	{
+	  d *= weight;
+	  uexp--;
+	}
+#endif
+
+      return sign >= 0 ? d : -d;
+    }
+#endif
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/get_str.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/get_str.c
deleted file mode 120000
index 3c7d15ec9..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/get_str.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/get_str.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/get_str.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/get_str.c
new file mode 100644
index 000000000..d4d3a132c
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/get_str.c
@@ -0,0 +1,451 @@
+/* mpn_get_str -- Convert {UP,USIZE} to a base BASE string in STR.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTIONS IN THIS FILE, EXCEPT mpn_get_str, ARE INTERNAL WITH MUTABLE
+   INTERFACES.  IT IS ONLY SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.
+   IN FACT, IT IS ALMOST GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A
+   FUTURE GNU MP RELEASE.
+
+Copyright 1991-2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Conversion of U {up,un} to a string in base b.  Internally, we convert to
+   base B = b^m, the largest power of b that fits a limb.  Basic algorithms:
+
+  A) Divide U repeatedly by B, generating a quotient and remainder, until the
+     quotient becomes zero.  The remainders hold the converted digits.  Digits
+     come out from right to left.  (Used in mpn_bc_get_str.)
+
+  B) Divide U by b^g, for g such that 1/b <= U/b^g < 1, generating a fraction.
+     Then develop digits by multiplying the fraction repeatedly by b.  Digits
+     come out from left to right.  (Currently not used herein, except for in
+     code for converting single limbs to individual digits.)
+
+  C) Compute B^1, B^2, B^4, ..., B^s, for s such that B^s is just above
+     sqrt(U).  Then divide U by B^s, generating quotient and remainder.
+     Recursively convert the quotient, then the remainder, using the
+     precomputed powers.  Digits come out from left to right.  (Used in
+     mpn_dc_get_str.)
+
+  When using algorithm C, algorithm B might be suitable for basecase code,
+  since the required b^g power will be readily accessible.
+
+  Optimization ideas:
+  1. The recursive function of (C) could use less temporary memory.  The powtab
+     allocation could be trimmed with some computation, and the tmp area could
+     be reduced, or perhaps eliminated if up is reused for both quotient and
+     remainder (it is currently used just for remainder).
+  2. Store the powers of (C) in normalized form, with the normalization count.
+     Quotients will usually need to be left-shifted before each divide, and
+     remainders will either need to be left-shifted of right-shifted.
+  3. In the code for developing digits from a single limb, we could avoid using
+     a full umul_ppmm except for the first (or first few) digits, provided base
+     is even.  Subsequent digits can be developed using plain multiplication.
+     (This saves on register-starved machines (read x86) and on all machines
+     that generate the upper product half using a separate instruction (alpha,
+     powerpc, IA-64) or lacks such support altogether (sparc64, hppa64).
+  4. Separate mpn_dc_get_str basecase code from code for small conversions. The
+     former code will have the exact right power readily available in the
+     powtab parameter for dividing the current number into a fraction.  Convert
+     that using algorithm B.
+  5. Completely avoid division.  Compute the inverses of the powers now in
+     powtab instead of the actual powers.
+  6. Decrease powtab allocation for even bases.  E.g. for base 10 we could save
+     about 30% (1-log(5)/log(10)).
+
+  Basic structure of (C):
+    mpn_get_str:
+      if POW2_P (n)
+	...
+      else
+	if (un < GET_STR_PRECOMPUTE_THRESHOLD)
+	  mpn_bx_get_str (str, base, up, un);
+	else
+	  precompute_power_tables
+	  mpn_dc_get_str
+
+    mpn_dc_get_str:
+	mpn_tdiv_qr
+	if (qn < GET_STR_DC_THRESHOLD)
+	  mpn_bc_get_str
+	else
+	  mpn_dc_get_str
+	if (rn < GET_STR_DC_THRESHOLD)
+	  mpn_bc_get_str
+	else
+	  mpn_dc_get_str
+
+
+  The reason for the two threshold values is the cost of
+  precompute_power_tables.  GET_STR_PRECOMPUTE_THRESHOLD will be
+  considerably larger than GET_STR_DC_THRESHOLD.  */
+
+
+/* The x86s and m68020 have a quotient and remainder "div" instruction and
+   gcc recognises an adjacent "/" and "%" can be combined using that.
+   Elsewhere "/" and "%" are either separate instructions, or separate
+   libgcc calls (which unfortunately gcc as of version 3.0 doesn't combine).
+   A multiply and subtract should be faster than a "%" in those cases.  */
+#if HAVE_HOST_CPU_FAMILY_x86            \
+  || HAVE_HOST_CPU_m68020               \
+  || HAVE_HOST_CPU_m68030               \
+  || HAVE_HOST_CPU_m68040               \
+  || HAVE_HOST_CPU_m68060               \
+  || HAVE_HOST_CPU_m68360 /* CPU32 */
+#define udiv_qrnd_unnorm(q,r,n,d)       \
+  do {                                  \
+    mp_limb_t  __q = (n) / (d);         \
+    mp_limb_t  __r = (n) % (d);         \
+    (q) = __q;                          \
+    (r) = __r;                          \
+  } while (0)
+#else
+#define udiv_qrnd_unnorm(q,r,n,d)       \
+  do {                                  \
+    mp_limb_t  __q = (n) / (d);         \
+    mp_limb_t  __r = (n) - __q*(d);     \
+    (q) = __q;                          \
+    (r) = __r;                          \
+  } while (0)
+#endif
+
+
+/* Convert {up,un} to a string in base base, and put the result in str.
+   Generate len characters, possibly padding with zeros to the left.  If len is
+   zero, generate as many characters as required.  Return a pointer immediately
+   after the last digit of the result string.  Complexity is O(un^2); intended
+   for small conversions.  */
+static unsigned char *
+mpn_bc_get_str (unsigned char *str, size_t len,
+		mp_ptr up, mp_size_t un, int base)
+{
+  mp_limb_t rl, ul;
+  unsigned char *s;
+  size_t l;
+  /* Allocate memory for largest possible string, given that we only get here
+     for operands with un < GET_STR_PRECOMPUTE_THRESHOLD and that the smallest
+     base is 3.  7/11 is an approximation to 1/log2(3).  */
+#if TUNE_PROGRAM_BUILD
+#define BUF_ALLOC (GET_STR_THRESHOLD_LIMIT * GMP_LIMB_BITS * 7 / 11)
+#else
+#define BUF_ALLOC (GET_STR_PRECOMPUTE_THRESHOLD * GMP_LIMB_BITS * 7 / 11)
+#endif
+  unsigned char buf[BUF_ALLOC];
+#if TUNE_PROGRAM_BUILD
+  mp_limb_t rp[GET_STR_THRESHOLD_LIMIT];
+#else
+  mp_limb_t rp[GET_STR_PRECOMPUTE_THRESHOLD];
+#endif
+
+  if (base == 10)
+    {
+      /* Special case code for base==10 so that the compiler has a chance to
+	 optimize things.  */
+
+      MPN_COPY (rp + 1, up, un);
+
+      s = buf + BUF_ALLOC;
+      while (un > 1)
+	{
+	  int i;
+	  mp_limb_t frac, digit;
+	  MPN_DIVREM_OR_PREINV_DIVREM_1 (rp, (mp_size_t) 1, rp + 1, un,
+					 MP_BASES_BIG_BASE_10,
+					 MP_BASES_BIG_BASE_INVERTED_10,
+					 MP_BASES_NORMALIZATION_STEPS_10);
+	  un -= rp[un] == 0;
+	  frac = (rp[0] + 1) << GMP_NAIL_BITS;
+	  s -= MP_BASES_CHARS_PER_LIMB_10;
+#if HAVE_HOST_CPU_FAMILY_x86
+	  /* The code below turns out to be a bit slower for x86 using gcc.
+	     Use plain code.  */
+	  i = MP_BASES_CHARS_PER_LIMB_10;
+	  do
+	    {
+	      umul_ppmm (digit, frac, frac, 10);
+	      *s++ = digit;
+	    }
+	  while (--i);
+#else
+	  /* Use the fact that 10 in binary is 1010, with the lowest bit 0.
+	     After a few umul_ppmm, we will have accumulated enough low zeros
+	     to use a plain multiply.  */
+	  if (MP_BASES_NORMALIZATION_STEPS_10 == 0)
+	    {
+	      umul_ppmm (digit, frac, frac, 10);
+	      *s++ = digit;
+	    }
+	  if (MP_BASES_NORMALIZATION_STEPS_10 <= 1)
+	    {
+	      umul_ppmm (digit, frac, frac, 10);
+	      *s++ = digit;
+	    }
+	  if (MP_BASES_NORMALIZATION_STEPS_10 <= 2)
+	    {
+	      umul_ppmm (digit, frac, frac, 10);
+	      *s++ = digit;
+	    }
+	  if (MP_BASES_NORMALIZATION_STEPS_10 <= 3)
+	    {
+	      umul_ppmm (digit, frac, frac, 10);
+	      *s++ = digit;
+	    }
+	  i = (MP_BASES_CHARS_PER_LIMB_10 - ((MP_BASES_NORMALIZATION_STEPS_10 < 4)
+					     ? (4-MP_BASES_NORMALIZATION_STEPS_10)
+					     : 0));
+	  frac = (frac + 0xf) >> 4;
+	  do
+	    {
+	      frac *= 10;
+	      digit = frac >> (GMP_LIMB_BITS - 4);
+	      *s++ = digit;
+	      frac &= (~(mp_limb_t) 0) >> 4;
+	    }
+	  while (--i);
+#endif
+	  s -= MP_BASES_CHARS_PER_LIMB_10;
+	}
+
+      ul = rp[1];
+      while (ul != 0)
+	{
+	  udiv_qrnd_unnorm (ul, rl, ul, 10);
+	  *--s = rl;
+	}
+    }
+  else /* not base 10 */
+    {
+      unsigned chars_per_limb;
+      mp_limb_t big_base, big_base_inverted;
+      unsigned normalization_steps;
+
+      chars_per_limb = mp_bases[base].chars_per_limb;
+      big_base = mp_bases[base].big_base;
+      big_base_inverted = mp_bases[base].big_base_inverted;
+      count_leading_zeros (normalization_steps, big_base);
+
+      MPN_COPY (rp + 1, up, un);
+
+      s = buf + BUF_ALLOC;
+      while (un > 1)
+	{
+	  int i;
+	  mp_limb_t frac;
+	  MPN_DIVREM_OR_PREINV_DIVREM_1 (rp, (mp_size_t) 1, rp + 1, un,
+					 big_base, big_base_inverted,
+					 normalization_steps);
+	  un -= rp[un] == 0;
+	  frac = (rp[0] + 1) << GMP_NAIL_BITS;
+	  s -= chars_per_limb;
+	  i = chars_per_limb;
+	  do
+	    {
+	      mp_limb_t digit;
+	      umul_ppmm (digit, frac, frac, base);
+	      *s++ = digit;
+	    }
+	  while (--i);
+	  s -= chars_per_limb;
+	}
+
+      ul = rp[1];
+      while (ul != 0)
+	{
+	  udiv_qrnd_unnorm (ul, rl, ul, base);
+	  *--s = rl;
+	}
+    }
+
+  l = buf + BUF_ALLOC - s;
+  while (l < len)
+    {
+      *str++ = 0;
+      len--;
+    }
+  while (l != 0)
+    {
+      *str++ = *s++;
+      l--;
+    }
+  return str;
+}
+
+
+/* Convert {UP,UN} to a string with a base as represented in POWTAB, and put
+   the string in STR.  Generate LEN characters, possibly padding with zeros to
+   the left.  If LEN is zero, generate as many characters as required.
+   Return a pointer immediately after the last digit of the result string.
+   This uses divide-and-conquer and is intended for large conversions.  */
+static unsigned char *
+mpn_dc_get_str (unsigned char *str, size_t len,
+		mp_ptr up, mp_size_t un,
+		const powers_t *powtab, mp_ptr tmp)
+{
+  if (BELOW_THRESHOLD (un, GET_STR_DC_THRESHOLD))
+    {
+      if (un != 0)
+	str = mpn_bc_get_str (str, len, up, un, powtab->base);
+      else
+	{
+	  while (len != 0)
+	    {
+	      *str++ = 0;
+	      len--;
+	    }
+	}
+    }
+  else
+    {
+      mp_ptr pwp, qp, rp;
+      mp_size_t pwn, qn;
+      mp_size_t sn;
+
+      pwp = powtab->p;
+      pwn = powtab->n;
+      sn = powtab->shift;
+
+      if (un < pwn + sn || (un == pwn + sn && mpn_cmp (up + sn, pwp, un - sn) < 0))
+	{
+	  str = mpn_dc_get_str (str, len, up, un, powtab - 1, tmp);
+	}
+      else
+	{
+	  qp = tmp;		/* (un - pwn + 1) limbs for qp */
+	  rp = up;		/* pwn limbs for rp; overwrite up area */
+
+	  mpn_tdiv_qr (qp, rp + sn, 0L, up + sn, un - sn, pwp, pwn);
+	  qn = un - sn - pwn; qn += qp[qn] != 0;		/* quotient size */
+
+	  ASSERT (qn < pwn + sn || (qn == pwn + sn && mpn_cmp (qp + sn, pwp, pwn) < 0));
+
+	  if (len != 0)
+	    len = len - powtab->digits_in_base;
+
+	  str = mpn_dc_get_str (str, len, qp, qn, powtab - 1, tmp + qn);
+	  str = mpn_dc_get_str (str, powtab->digits_in_base, rp, pwn + sn, powtab - 1, tmp);
+	}
+    }
+  return str;
+}
+
+/* There are no leading zeros on the digits generated at str, but that's not
+   currently a documented feature.  The current mpz_out_str and mpz_get_str
+   rely on it.  */
+
+size_t
+mpn_get_str (unsigned char *str, int base, mp_ptr up, mp_size_t un)
+{
+  mp_ptr powtab_mem;
+  powers_t powtab[GMP_LIMB_BITS];
+  int pi;
+  size_t out_len;
+  mp_ptr tmp;
+  size_t ndig;
+  mp_size_t xn;
+  TMP_DECL;
+
+  /* Special case zero, as the code below doesn't handle it.  */
+  if (un == 0)
+    {
+      str[0] = 0;
+      return 1;
+    }
+
+  if (POW2_P (base))
+    {
+      /* The base is a power of 2.  Convert from most significant end.  */
+      mp_limb_t n1, n0;
+      int bits_per_digit = mp_bases[base].big_base;
+      int cnt;
+      int bit_pos;
+      mp_size_t i;
+      unsigned char *s = str;
+      mp_bitcnt_t bits;
+
+      n1 = up[un - 1];
+      count_leading_zeros (cnt, n1);
+
+      /* BIT_POS should be R when input ends in least significant nibble,
+	 R + bits_per_digit * n when input ends in nth least significant
+	 nibble. */
+
+      bits = (mp_bitcnt_t) GMP_NUMB_BITS * un - cnt + GMP_NAIL_BITS;
+      cnt = bits % bits_per_digit;
+      if (cnt != 0)
+	bits += bits_per_digit - cnt;
+      bit_pos = bits - (mp_bitcnt_t) (un - 1) * GMP_NUMB_BITS;
+
+      /* Fast loop for bit output.  */
+      i = un - 1;
+      for (;;)
+	{
+	  bit_pos -= bits_per_digit;
+	  while (bit_pos >= 0)
+	    {
+	      *s++ = (n1 >> bit_pos) & ((1 << bits_per_digit) - 1);
+	      bit_pos -= bits_per_digit;
+	    }
+	  i--;
+	  if (i < 0)
+	    break;
+	  n0 = (n1 << -bit_pos) & ((1 << bits_per_digit) - 1);
+	  n1 = up[i];
+	  bit_pos += GMP_NUMB_BITS;
+	  *s++ = n0 | (n1 >> bit_pos);
+	}
+
+      return s - str;
+    }
+
+  /* General case.  The base is not a power of 2.  */
+
+  if (BELOW_THRESHOLD (un, GET_STR_PRECOMPUTE_THRESHOLD))
+    return mpn_bc_get_str (str, (size_t) 0, up, un, base) - str;
+
+  TMP_MARK;
+
+  /* Allocate one large block for the powers of big_base.  */
+  powtab_mem = TMP_BALLOC_LIMBS (mpn_str_powtab_alloc (un));
+
+  /* Compute a table of powers, were the largest power is >= sqrt(U).  */
+  DIGITS_IN_BASE_PER_LIMB (ndig, un, base);
+  xn = 1 + ndig / mp_bases[base].chars_per_limb; /* FIXME: scalar integer division */
+
+  pi = 1 + mpn_compute_powtab (powtab, powtab_mem, xn, base);
+
+  /* Using our precomputed powers, now in powtab[], convert our number.  */
+  tmp = TMP_BALLOC_LIMBS (mpn_dc_get_str_itch (un));
+  out_len = mpn_dc_get_str (str, 0, up, un, powtab + (pi - 1), tmp) - str;
+  TMP_FREE;
+
+  return out_len;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hamdist.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hamdist.c
deleted file mode 120000
index 4729a18b9..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hamdist.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/popham.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hamdist.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hamdist.c
new file mode 100644
index 000000000..87974d710
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hamdist.c
@@ -0,0 +1,125 @@
+/* mpn_popcount, mpn_hamdist -- mpn bit population count/hamming distance.
+
+Copyright 1994, 1996, 2000-2002, 2005, 2011, 2012 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if OPERATION_popcount
+#define FNAME mpn_popcount
+#define POPHAM(u,v) u
+#endif
+
+#if OPERATION_hamdist
+#define FNAME mpn_hamdist
+#define POPHAM(u,v) u ^ v
+#endif
+
+mp_bitcnt_t
+FNAME (mp_srcptr up,
+#if OPERATION_hamdist
+       mp_srcptr vp,
+#endif
+       mp_size_t n) __GMP_NOTHROW
+{
+  mp_bitcnt_t result = 0;
+  mp_limb_t p0, p1, p2, p3, x, p01, p23;
+  mp_size_t i;
+
+  ASSERT (n >= 1);		/* Actually, this code handles any n, but some
+				   assembly implementations do not.  */
+
+  for (i = n >> 2; i != 0; i--)
+    {
+      p0 = POPHAM (up[0], vp[0]);
+      p0 -= (p0 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p0 = ((p0 >> 2) & MP_LIMB_T_MAX/5) + (p0 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p1 = POPHAM (up[1], vp[1]);
+      p1 -= (p1 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p1 = ((p1 >> 2) & MP_LIMB_T_MAX/5) + (p1 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p01 = p0 + p1;							/* 8 0-8 */
+      p01 = ((p01 >> 4) & MP_LIMB_T_MAX/17) + (p01 & MP_LIMB_T_MAX/17);	/* 8 0-16 */
+
+      p2 = POPHAM (up[2], vp[2]);
+      p2 -= (p2 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p2 = ((p2 >> 2) & MP_LIMB_T_MAX/5) + (p2 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p3 = POPHAM (up[3], vp[3]);
+      p3 -= (p3 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p3 = ((p3 >> 2) & MP_LIMB_T_MAX/5) + (p3 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p23 = p2 + p3;							/* 8 0-8 */
+      p23 = ((p23 >> 4) & MP_LIMB_T_MAX/17) + (p23 & MP_LIMB_T_MAX/17);	/* 8 0-16 */
+
+      x = p01 + p23;							/* 8 0-32 */
+      x = (x >> 8) + x;							/* 8 0-64 */
+      x = (x >> 16) + x;						/* 8 0-128 */
+#if GMP_LIMB_BITS > 32
+      x = ((x >> 32) & 0xff) + (x & 0xff);				/* 8 0-256 */
+      result += x;
+#else
+      result += x & 0xff;
+#endif
+      up += 4;
+#if OPERATION_hamdist
+      vp += 4;
+#endif
+    }
+
+  n &= 3;
+  if (n != 0)
+    {
+      x = 0;
+      do
+	{
+	  p0 = POPHAM (up[0], vp[0]);
+	  p0 -= (p0 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+	  p0 = ((p0 >> 2) & MP_LIMB_T_MAX/5) + (p0 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+	  p0 = ((p0 >> 4) + p0) & MP_LIMB_T_MAX/17;			/* 8 0-8 */
+
+	  x += p0;
+	  up += 1;
+#if OPERATION_hamdist
+	  vp += 1;
+#endif
+	}
+      while (--n);
+
+      x = (x >> 8) + x;
+      x = (x >> 16) + x;
+#if GMP_LIMB_BITS > 32
+      x = (x >> 32) + x;
+#endif
+      result += x & 0xff;
+    }
+
+  return result;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd.c
deleted file mode 120000
index 575f4591e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd.c
new file mode 100644
index 000000000..e3e9c6695
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd.c
@@ -0,0 +1,182 @@
+/* hgcd.c.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2003-2005, 2008, 2011, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+/* Size analysis for hgcd:
+
+   For the recursive calls, we have n1 <= ceil(n / 2). Then the
+   storage need is determined by the storage for the recursive call
+   computing M1, and hgcd_matrix_adjust and hgcd_matrix_mul calls that use M1
+   (after this, the storage needed for M1 can be recycled).
+
+   Let S(r) denote the required storage. For M1 we need 4 * (ceil(n1/2) + 1)
+   = 4 * (ceil(n/4) + 1), for the hgcd_matrix_adjust call, we need n + 2,
+   and for the hgcd_matrix_mul, we may need 3 ceil(n/2) + 8. In total,
+   4 * ceil(n/4) + 3 ceil(n/2) + 12 <= 10 ceil(n/4) + 12.
+
+   For the recursive call, we need S(n1) = S(ceil(n/2)).
+
+   S(n) <= 10*ceil(n/4) + 12 + S(ceil(n/2))
+	<= 10*(ceil(n/4) + ... + ceil(n/2^(1+k))) + 12k + S(ceil(n/2^k))
+	<= 10*(2 ceil(n/4) + k) + 12k + S(ceil(n/2^k))
+	<= 20 ceil(n/4) + 22k + S(ceil(n/2^k))
+*/
+
+mp_size_t
+mpn_hgcd_itch (mp_size_t n)
+{
+  unsigned k;
+  int count;
+  mp_size_t nscaled;
+
+  if (BELOW_THRESHOLD (n, HGCD_THRESHOLD))
+    return n;
+
+  /* Get the recursion depth. */
+  nscaled = (n - 1) / (HGCD_THRESHOLD - 1);
+  count_leading_zeros (count, nscaled);
+  k = GMP_LIMB_BITS - count;
+
+  return 20 * ((n+3) / 4) + 22 * k + HGCD_THRESHOLD;
+}
+
+/* Reduces a,b until |a-b| fits in n/2 + 1 limbs. Constructs matrix M
+   with elements of size at most (n+1)/2 - 1. Returns new size of a,
+   b, or zero if no reduction is possible. */
+
+mp_size_t
+mpn_hgcd (mp_ptr ap, mp_ptr bp, mp_size_t n,
+	  struct hgcd_matrix *M, mp_ptr tp)
+{
+  mp_size_t s = n/2 + 1;
+
+  mp_size_t nn;
+  int success = 0;
+
+  if (n <= s)
+    /* Happens when n <= 2, a fairly uninteresting case but exercised
+       by the random inputs of the testsuite. */
+    return 0;
+
+  ASSERT ((ap[n-1] | bp[n-1]) > 0);
+
+  ASSERT ((n+1)/2 - 1 < M->alloc);
+
+  if (ABOVE_THRESHOLD (n, HGCD_THRESHOLD))
+    {
+      mp_size_t n2 = (3*n)/4 + 1;
+      mp_size_t p = n/2;
+
+      nn = mpn_hgcd_reduce (M, ap, bp, n, p, tp);
+      if (nn)
+	{
+	  n = nn;
+	  success = 1;
+	}
+
+      /* NOTE: It appears this loop never runs more than once (at
+	 least when not recursing to hgcd_appr). */
+      while (n > n2)
+	{
+	  /* Needs n + 1 storage */
+	  nn = mpn_hgcd_step (n, ap, bp, s, M, tp);
+	  if (!nn)
+	    return success ? n : 0;
+
+	  n = nn;
+	  success = 1;
+	}
+
+      if (n > s + 2)
+	{
+	  struct hgcd_matrix M1;
+	  mp_size_t scratch;
+
+	  p = 2*s - n + 1;
+	  scratch = MPN_HGCD_MATRIX_INIT_ITCH (n-p);
+
+	  mpn_hgcd_matrix_init(&M1, n - p, tp);
+
+	  /* FIXME: Should use hgcd_reduce, but that may require more
+	     scratch space, which requires review. */
+
+	  nn = mpn_hgcd (ap + p, bp + p, n - p, &M1, tp + scratch);
+	  if (nn > 0)
+	    {
+	      /* We always have max(M) > 2^{-(GMP_NUMB_BITS + 1)} max(M1) */
+	      ASSERT (M->n + 2 >= M1.n);
+
+	      /* Furthermore, assume M ends with a quotient (1, q; 0, 1),
+		 then either q or q + 1 is a correct quotient, and M1 will
+		 start with either (1, 0; 1, 1) or (2, 1; 1, 1). This
+		 rules out the case that the size of M * M1 is much
+		 smaller than the expected M->n + M1->n. */
+
+	      ASSERT (M->n + M1.n < M->alloc);
+
+	      /* Needs 2 (p + M->n) <= 2 (2*s - n2 + 1 + n2 - s - 1)
+		 = 2*s <= 2*(floor(n/2) + 1) <= n + 2. */
+	      n = mpn_hgcd_matrix_adjust (&M1, p + nn, ap, bp, p, tp + scratch);
+
+	      /* We need a bound for of M->n + M1.n. Let n be the original
+		 input size. Then
+
+		 ceil(n/2) - 1 >= size of product >= M.n + M1.n - 2
+
+		 and it follows that
+
+		 M.n + M1.n <= ceil(n/2) + 1
+
+		 Then 3*(M.n + M1.n) + 5 <= 3 * ceil(n/2) + 8 is the
+		 amount of needed scratch space. */
+	      mpn_hgcd_matrix_mul (M, &M1, tp + scratch);
+	      success = 1;
+	    }
+	}
+    }
+
+  for (;;)
+    {
+      /* Needs s+3 < n */
+      nn = mpn_hgcd_step (n, ap, bp, s, M, tp);
+      if (!nn)
+	return success ? n : 0;
+
+      n = nn;
+      success = 1;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2.c
deleted file mode 120000
index 02e007e30..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd2.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2.c
new file mode 100644
index 000000000..19214700d
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2.c
@@ -0,0 +1,748 @@
+/* hgcd2.c
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 1996, 1998, 2000-2004, 2008, 2012, 2019 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#ifndef HGCD2_DIV1_METHOD
+#define HGCD2_DIV1_METHOD 3
+#endif
+
+#ifndef HGCD2_DIV2_METHOD
+#define HGCD2_DIV2_METHOD 2
+#endif
+
+#if GMP_NAIL_BITS != 0
+#error Nails not implemented
+#endif
+
+#if HAVE_NATIVE_mpn_div_11
+
+#define div1 mpn_div_11
+/* Single-limb division optimized for small quotients.
+   Returned value holds d0 = r, d1 = q. */
+mp_double_limb_t div1 (mp_limb_t, mp_limb_t);
+
+#elif HGCD2_DIV1_METHOD == 1
+
+static inline mp_double_limb_t
+div1 (mp_limb_t n0, mp_limb_t d0)
+{
+  mp_double_limb_t res;
+  res.d1 = n0 / d0;
+  res.d0 = n0 - res.d1 * d0;
+
+  return res;
+}
+
+#elif HGCD2_DIV1_METHOD == 2
+
+static mp_double_limb_t
+div1 (mp_limb_t n0, mp_limb_t d0)
+{
+  mp_double_limb_t res;
+  int ncnt, dcnt, cnt;
+  mp_limb_t q;
+  mp_limb_t mask;
+
+  ASSERT (n0 >= d0);
+
+  count_leading_zeros (ncnt, n0);
+  count_leading_zeros (dcnt, d0);
+  cnt = dcnt - ncnt;
+
+  d0 <<= cnt;
+
+  q = -(mp_limb_t) (n0 >= d0);
+  n0 -= d0 & q;
+  d0 >>= 1;
+  q = -q;
+
+  while (--cnt >= 0)
+    {
+      mask = -(mp_limb_t) (n0 >= d0);
+      n0 -= d0 & mask;
+      d0 >>= 1;
+      q = (q << 1) - mask;
+    }
+
+  res.d0 = n0;
+  res.d1 = q;
+  return res;
+}
+
+#elif HGCD2_DIV1_METHOD == 3
+
+static inline mp_double_limb_t
+div1 (mp_limb_t n0, mp_limb_t d0)
+{
+  mp_double_limb_t res;
+  if (UNLIKELY ((d0 >> (GMP_LIMB_BITS - 3)) != 0)
+      || UNLIKELY (n0 >= (d0 << 3)))
+    {
+      res.d1 = n0 / d0;
+      res.d0 = n0 - res.d1 * d0;
+    }
+  else
+    {
+      mp_limb_t q, mask;
+
+      d0 <<= 2;
+
+      mask = -(mp_limb_t) (n0 >= d0);
+      n0 -= d0 & mask;
+      q = 4 & mask;
+
+      d0 >>= 1;
+      mask = -(mp_limb_t) (n0 >= d0);
+      n0 -= d0 & mask;
+      q += 2 & mask;
+
+      d0 >>= 1;
+      mask = -(mp_limb_t) (n0 >= d0);
+      n0 -= d0 & mask;
+      q -= mask;
+
+      res.d0 = n0;
+      res.d1 = q;
+    }
+  return res;
+}
+
+#elif HGCD2_DIV1_METHOD == 4
+
+/* Table quotients.  We extract the NBITS most significant bits of the
+   numerator limb, and the corresponding bits from the divisor limb, and use
+   these to form an index into the table.  This method is probably only useful
+   for short pipelines with slow multiplication.
+
+   Possible improvements:
+
+   * Perhaps extract the highest NBITS of the divisor instead of the same bits
+     as from the numerator.  That would require another count_leading_zeros,
+     and a post-multiply shift of the quotient.
+
+   * Compress tables?  Their values are tiny, and there are lots of zero
+     entries (which are never used).
+
+   * Round the table entries more cleverly?
+*/
+
+#ifndef NBITS
+#define NBITS 5
+#endif
+
+#if NBITS == 5
+/* This needs full division about 13.2% of the time. */
+static const unsigned char tab[512] = {
+17, 9, 5,4,3,2,2,2,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+18, 9, 6,4,3,2,2,2,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+19,10, 6,4,3,3,2,2,2,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+20,10, 6,5,3,3,2,2,2,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
+21,11, 7,5,4,3,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,
+22,11, 7,5,4,3,3,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,
+23,12, 7,5,4,3,3,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
+24,12, 8,6,4,3,3,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+25,13, 8,6,5,4,3,3,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,
+26,13, 8,6,5,4,3,3,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,
+27,14, 9,6,5,4,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,
+28,14, 9,7,5,4,3,3,3,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,
+29,15,10,7,5,4,4,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
+30,15,10,7,6,5,4,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,
+31,16,10,7,6,5,4,3,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,
+32,16,11,8,6,5,4,3,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+};
+#elif NBITS == 6
+/* This needs full division about 9.8% of the time. */
+static const unsigned char tab[2048] = {
+33,17,11, 8, 6, 5,4,4,3,3,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 0, 0, 0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+34,17,11, 8, 6, 5,4,4,3,3,3,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 0, 0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+35,18,12, 9, 7, 5,5,4,3,3,3,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+36,18,12, 9, 7, 6,5,4,3,3,3,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+37,19,13, 9, 7, 6,5,4,4,3,3,3,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+38,19,13, 9, 7, 6,5,4,4,3,3,3,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+39,20,13,10, 7, 6,5,4,4,3,3,3,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+40,20,14,10, 8, 6,5,5,4,3,3,3,3,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+41,21,14,10, 8, 6,5,5,4,4,3,3,3,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+42,21,14,10, 8, 7,6,5,4,4,3,3,3,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+43,22,15,11, 8, 7,6,5,4,4,3,3,3,3,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+44,22,15,11, 9, 7,6,5,4,4,3,3,3,3,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+45,23,15,11, 9, 7,6,5,5,4,4,3,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+46,23,16,11, 9, 7,6,5,5,4,4,3,3,3,3,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+47,24,16,12, 9, 7,6,5,5,4,4,3,3,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+48,24,16,12, 9, 8,6,6,5,4,4,3,3,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+49,25,17,12,10, 8,7,6,5,4,4,4,3,3,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+50,25,17,13,10, 8,7,6,5,5,4,4,3,3,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+51,26,18,13,10, 8,7,6,5,5,4,4,3,3,3,3,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+52,26,18,13,10, 8,7,6,5,5,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
+53,27,18,13,10, 9,7,6,5,5,4,4,4,3,3,3,3,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,
+54,27,19,14,11, 9,7,6,6,5,4,4,4,3,3,3,3,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,
+55,28,19,14,11, 9,7,6,6,5,5,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
+56,28,19,14,11, 9,8,7,6,5,5,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,1,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
+57,29,20,14,11, 9,8,7,6,5,5,4,4,4,3,3,3,3,2,2,2,2,2,2,2,2,2,2,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,
+58,29,20,15,11, 9,8,7,6,5,5,4,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,1,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,
+59,30,20,15,12,10,8,7,6,5,5,4,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,
+60,30,21,15,12,10,8,7,6,6,5,5,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,1,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,
+61,31,21,15,12,10,8,7,6,6,5,5,4,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
+62,31,22,16,12,10,9,7,6,6,5,5,4,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,1,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,
+63,32,22,16,13,10,9,7,7,6,5,5,4,4,4,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,
+64,32,22,16,13,10,9,8,7,6,5,5,4,4,4,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,1,
+ 1, 1, 1, 1, 1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+};
+#else
+#error No table for provided NBITS
+#endif
+
+/* Doing tabp with a #define makes compiler warnings about pointing outside an
+   object go away.  We used to define this as a variable.  It is not clear if
+   e.g.  (vector[100] - 10) + 10 is well- defined as per the C standard;
+   (vector[100] + 10) - 10 surely is and there is no sequence point so the
+   expressions should be equivalent.  To make this safe, we might want to
+   define tabp as a macro with the index as an argument.  Depending on the
+   platform, relocs might allow for assembly-time or linker-time resolution to
+   take place. */
+#define tabp (tab - (1 << (NBITS - 1) << NBITS))
+
+static inline mp_double_limb_t
+div1 (mp_limb_t n0, mp_limb_t d0)
+{
+  int ncnt;
+  size_t nbi, dbi;
+  mp_limb_t q0;
+  mp_limb_t r0;
+  mp_limb_t mask;
+  mp_double_limb_t res;
+
+  ASSERT (n0 >= d0);		/* Actually only msb position is critical. */
+
+  count_leading_zeros (ncnt, n0);
+  nbi = n0 << ncnt >> (GMP_LIMB_BITS - NBITS);
+  dbi = d0 << ncnt >> (GMP_LIMB_BITS - NBITS);
+
+  q0 = tabp[(nbi << NBITS) + dbi];
+  r0 = n0 - q0 * d0;
+  mask = -(mp_limb_t) (r0 >= d0);
+  q0 -= mask;
+  r0 -= d0 & mask;
+
+  if (UNLIKELY (r0 >= d0))
+    {
+      q0 = n0 / d0;
+      r0 = n0 - q0 * d0;
+    }
+
+  res.d1 = q0;
+  res.d0 = r0;
+  return res;
+}
+
+#elif HGCD2_DIV1_METHOD == 5
+
+/* Table inverses of divisors.  We don't bother with suppressing the msb from
+   the tables.  We index with the NBITS most significant divisor bits,
+   including the always-set highest bit, but use addressing trickery via tabp
+   to suppress it.
+
+   Possible improvements:
+
+   * Do first multiply using 32-bit operations on 64-bit computers.  At least
+     on most Arm64 cores, that uses 3 times less resources.  It also saves on
+     many x86-64 processors.
+*/
+
+#ifndef NBITS
+#define NBITS 7
+#endif
+
+#if NBITS == 5
+/* This needs full division about 1.63% of the time. */
+static const unsigned char tab[16] = {
+ 63, 59, 55, 52, 50, 47, 45, 43, 41, 39, 38, 36, 35, 34, 33, 32
+};
+#elif NBITS == 6
+/* This needs full division about 0.93% of the time. */
+static const unsigned char tab[32] = {
+127,123,119,116,112,109,106,104,101, 98, 96, 94, 92, 90, 88, 86,
+ 84, 82, 80, 79, 77, 76, 74, 73, 72, 70, 69, 68, 67, 66, 65, 64
+};
+#elif NBITS == 7
+/* This needs full division about 0.49% of the time. */
+static const unsigned char tab[64] = {
+255,251,247,243,239,236,233,229,226,223,220,217,214,211,209,206,
+203,201,198,196,194,191,189,187,185,183,181,179,177,175,173,171,
+169,167,166,164,162,161,159,158,156,155,153,152,150,149,147,146,
+145,143,142,141,140,139,137,136,135,134,133,132,131,130,129,128
+};
+#elif NBITS == 8
+/* This needs full division about 0.26% of the time. */
+static const unsigned short tab[128] = {
+511,507,503,499,495,491,488,484,480,477,473,470,467,463,460,457,
+454,450,447,444,441,438,435,433,430,427,424,421,419,416,413,411,
+408,406,403,401,398,396,393,391,389,386,384,382,380,377,375,373,
+371,369,367,365,363,361,359,357,355,353,351,349,347,345,343,342,
+340,338,336,335,333,331,329,328,326,325,323,321,320,318,317,315,
+314,312,311,309,308,306,305,303,302,301,299,298,296,295,294,292,
+291,290,288,287,286,285,283,282,281,280,279,277,276,275,274,273,
+272,270,269,268,267,266,265,264,263,262,261,260,259,258,257,256
+};
+#else
+#error No table for provided NBITS
+#endif
+
+/* Doing tabp with a #define makes compiler warnings about pointing outside an
+   object go away.  We used to define this as a variable.  It is not clear if
+   e.g.  (vector[100] - 10) + 10 is well- defined as per the C standard;
+   (vector[100] + 10) - 10 surely is and there is no sequence point so the
+   expressions should be equivalent.  To make this safe, we might want to
+   define tabp as a macro with the index as an argument.  Depending on the
+   platform, relocs might allow for assembly-time or linker-time resolution to
+   take place. */
+#define tabp (tab - (1 << (NBITS - 1)))
+
+static inline mp_double_limb_t
+div1 (mp_limb_t n0, mp_limb_t d0)
+{
+  int ncnt, dcnt;
+  size_t dbi;
+  mp_limb_t inv;
+  mp_limb_t q0;
+  mp_limb_t r0;
+  mp_limb_t mask;
+  mp_double_limb_t res;
+
+  count_leading_zeros (ncnt, n0);
+  count_leading_zeros (dcnt, d0);
+
+  dbi = d0 << dcnt >> (GMP_LIMB_BITS - NBITS);
+  inv = tabp[dbi];
+  q0 = ((n0 << ncnt) >> (NBITS + 1)) * inv >> (GMP_LIMB_BITS - 1 + ncnt - dcnt);
+  r0 = n0 - q0 * d0;
+  mask = -(mp_limb_t) (r0 >= d0);
+  q0 -= mask;
+  r0 -= d0 & mask;
+
+  if (UNLIKELY (r0 >= d0))
+    {
+      q0 = n0 / d0;
+      r0 = n0 - q0 * d0;
+    }
+
+  res.d1 = q0;
+  res.d0 = r0;
+  return res;
+}
+
+#else
+#error Unknown HGCD2_DIV1_METHOD
+#endif
+
+#if HAVE_NATIVE_mpn_div_22
+
+#define div2 mpn_div_22
+/* Two-limb division optimized for small quotients.  */
+mp_limb_t div2 (mp_ptr, mp_limb_t, mp_limb_t, mp_limb_t, mp_limb_t);
+
+#elif HGCD2_DIV2_METHOD == 1
+
+static mp_limb_t
+div2 (mp_ptr rp,
+      mp_limb_t n1, mp_limb_t n0,
+      mp_limb_t d1, mp_limb_t d0)
+{
+  mp_double_limb_t rq = div1 (n1, d1);
+  if (UNLIKELY (rq.d1 > d1))
+    {
+      mp_limb_t n2, q, t1, t0;
+      int c;
+
+      /* Normalize */
+      count_leading_zeros (c, d1);
+      ASSERT (c > 0);
+
+      n2 = n1 >> (GMP_LIMB_BITS - c);
+      n1 = (n1 << c) | (n0 >> (GMP_LIMB_BITS - c));
+      n0 <<= c;
+      d1 = (d1 << c) | (d0 >> (GMP_LIMB_BITS - c));
+      d0 <<= c;
+
+      udiv_qrnnd (q, n1, n2, n1, d1);
+      umul_ppmm (t1, t0, q, d0);
+      if (t1 > n1 || (t1 == n1 && t0 > n0))
+	{
+	  ASSERT (q > 0);
+	  q--;
+	  sub_ddmmss (t1, t0, t1, t0, d1, d0);
+	}
+      sub_ddmmss (n1, n0, n1, n0, t1, t0);
+
+      /* Undo normalization */
+      rp[0] = (n0 >> c) | (n1 << (GMP_LIMB_BITS - c));
+      rp[1] = n1 >> c;
+
+      return q;
+    }
+  else
+    {
+      mp_limb_t q, t1, t0;
+      n1 = rq.d0;
+      q = rq.d1;
+      umul_ppmm (t1, t0, q, d0);
+      if (UNLIKELY (t1 >= n1) && (t1 > n1 || t0 > n0))
+	{
+	  ASSERT (q > 0);
+	  q--;
+	  sub_ddmmss (t1, t0, t1, t0, d1, d0);
+	}
+      sub_ddmmss (rp[1], rp[0], n1, n0, t1, t0);
+      return q;
+    }
+}
+
+#elif HGCD2_DIV2_METHOD == 2
+
+/* Bit-wise div2. Relies on fast count_leading_zeros. */
+static mp_limb_t
+div2 (mp_ptr rp,
+      mp_limb_t n1, mp_limb_t n0,
+      mp_limb_t d1, mp_limb_t d0)
+{
+  mp_limb_t q = 0;
+  int ncnt;
+  int dcnt;
+
+  count_leading_zeros (ncnt, n1);
+  count_leading_zeros (dcnt, d1);
+  dcnt -= ncnt;
+
+  d1 = (d1 << dcnt) + (d0 >> 1 >> (GMP_LIMB_BITS - 1 - dcnt));
+  d0 <<= dcnt;
+
+  do
+    {
+      mp_limb_t mask;
+      q <<= 1;
+      if (UNLIKELY (n1 == d1))
+	mask = -(n0 >= d0);
+      else
+	mask = -(n1 > d1);
+
+      q -= mask;
+
+      sub_ddmmss (n1, n0, n1, n0, mask & d1, mask & d0);
+
+      d0 = (d1 << (GMP_LIMB_BITS - 1)) | (d0 >> 1);
+      d1 = d1 >> 1;
+    }
+  while (dcnt--);
+
+  rp[0] = n0;
+  rp[1] = n1;
+
+  return q;
+}
+#else
+#error Unknown HGCD2_DIV2_METHOD
+#endif
+
+/* Reduces a,b until |a-b| (almost) fits in one limb + 1 bit. Constructs
+   matrix M. Returns 1 if we make progress, i.e. can perform at least
+   one subtraction. Otherwise returns zero. */
+
+/* FIXME: Possible optimizations:
+
+   The div2 function starts with checking the most significant bit of
+   the numerator. We can maintained normalized operands here, call
+   hgcd with normalized operands only, which should make the code
+   simpler and possibly faster.
+
+   Experiment with table lookups on the most significant bits.
+
+   This function is also a candidate for assembler implementation.
+*/
+int
+mpn_hgcd2 (mp_limb_t ah, mp_limb_t al, mp_limb_t bh, mp_limb_t bl,
+	   struct hgcd_matrix1 *M)
+{
+  mp_limb_t u00, u01, u10, u11;
+
+  if (ah < 2 || bh < 2)
+    return 0;
+
+  if (ah > bh || (ah == bh && al > bl))
+    {
+      sub_ddmmss (ah, al, ah, al, bh, bl);
+      if (ah < 2)
+	return 0;
+
+      u00 = u01 = u11 = 1;
+      u10 = 0;
+    }
+  else
+    {
+      sub_ddmmss (bh, bl, bh, bl, ah, al);
+      if (bh < 2)
+	return 0;
+
+      u00 = u10 = u11 = 1;
+      u01 = 0;
+    }
+
+  if (ah < bh)
+    goto subtract_a;
+
+  for (;;)
+    {
+      ASSERT (ah >= bh);
+      if (ah == bh)
+	goto done;
+
+      if (ah < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2)))
+	{
+	  ah = (ah << (GMP_LIMB_BITS / 2) ) + (al >> (GMP_LIMB_BITS / 2));
+	  bh = (bh << (GMP_LIMB_BITS / 2) ) + (bl >> (GMP_LIMB_BITS / 2));
+
+	  break;
+	}
+
+      /* Subtract a -= q b, and multiply M from the right by (1 q ; 0
+	 1), affecting the second column of M. */
+      ASSERT (ah > bh);
+      sub_ddmmss (ah, al, ah, al, bh, bl);
+
+      if (ah < 2)
+	goto done;
+
+      if (ah <= bh)
+	{
+	  /* Use q = 1 */
+	  u01 += u00;
+	  u11 += u10;
+	}
+      else
+	{
+	  mp_limb_t r[2];
+	  mp_limb_t q = div2 (r, ah, al, bh, bl);
+	  al = r[0]; ah = r[1];
+	  if (ah < 2)
+	    {
+	      /* A is too small, but q is correct. */
+	      u01 += q * u00;
+	      u11 += q * u10;
+	      goto done;
+	    }
+	  q++;
+	  u01 += q * u00;
+	  u11 += q * u10;
+	}
+    subtract_a:
+      ASSERT (bh >= ah);
+      if (ah == bh)
+	goto done;
+
+      if (bh < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2)))
+	{
+	  ah = (ah << (GMP_LIMB_BITS / 2) ) + (al >> (GMP_LIMB_BITS / 2));
+	  bh = (bh << (GMP_LIMB_BITS / 2) ) + (bl >> (GMP_LIMB_BITS / 2));
+
+	  goto subtract_a1;
+	}
+
+      /* Subtract b -= q a, and multiply M from the right by (1 0 ; q
+	 1), affecting the first column of M. */
+      sub_ddmmss (bh, bl, bh, bl, ah, al);
+
+      if (bh < 2)
+	goto done;
+
+      if (bh <= ah)
+	{
+	  /* Use q = 1 */
+	  u00 += u01;
+	  u10 += u11;
+	}
+      else
+	{
+	  mp_limb_t r[2];
+	  mp_limb_t q = div2 (r, bh, bl, ah, al);
+	  bl = r[0]; bh = r[1];
+	  if (bh < 2)
+	    {
+	      /* B is too small, but q is correct. */
+	      u00 += q * u01;
+	      u10 += q * u11;
+	      goto done;
+	    }
+	  q++;
+	  u00 += q * u01;
+	  u10 += q * u11;
+	}
+    }
+
+  /* NOTE: Since we discard the least significant half limb, we don't get a
+     truly maximal M (corresponding to |a - b| < 2^{GMP_LIMB_BITS +1}). */
+  /* Single precision loop */
+  for (;;)
+    {
+      ASSERT (ah >= bh);
+
+      ah -= bh;
+      if (ah < (CNST_LIMB (1) << (GMP_LIMB_BITS / 2 + 1)))
+	break;
+
+      if (ah <= bh)
+	{
+	  /* Use q = 1 */
+	  u01 += u00;
+	  u11 += u10;
+	}
+      else
+	{
+	  mp_double_limb_t rq = div1 (ah, bh);
+	  mp_limb_t q = rq.d1;
+	  ah = rq.d0;
+
+	  if (ah < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2 + 1)))
+	    {
+	      /* A is too small, but q is correct. */
+	      u01 += q * u00;
+	      u11 += q * u10;
+	      break;
+	    }
+	  q++;
+	  u01 += q * u00;
+	  u11 += q * u10;
+	}
+    subtract_a1:
+      ASSERT (bh >= ah);
+
+      bh -= ah;
+      if (bh < (CNST_LIMB (1) << (GMP_LIMB_BITS / 2 + 1)))
+	break;
+
+      if (bh <= ah)
+	{
+	  /* Use q = 1 */
+	  u00 += u01;
+	  u10 += u11;
+	}
+      else
+	{
+	  mp_double_limb_t rq = div1 (bh, ah);
+	  mp_limb_t q = rq.d1;
+	  bh = rq.d0;
+
+	  if (bh < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2 + 1)))
+	    {
+	      /* B is too small, but q is correct. */
+	      u00 += q * u01;
+	      u10 += q * u11;
+	      break;
+	    }
+	  q++;
+	  u00 += q * u01;
+	  u10 += q * u11;
+	}
+    }
+
+ done:
+  M->u[0][0] = u00; M->u[0][1] = u01;
+  M->u[1][0] = u10; M->u[1][1] = u11;
+
+  return 1;
+}
+
+/* Sets (r;b) = (a;b) M, with M = (u00, u01; u10, u11). Vector must
+ * have space for n + 1 limbs. Uses three buffers to avoid a copy*/
+mp_size_t
+mpn_hgcd_mul_matrix1_vector (const struct hgcd_matrix1 *M,
+			     mp_ptr rp, mp_srcptr ap, mp_ptr bp, mp_size_t n)
+{
+  mp_limb_t ah, bh;
+
+  /* Compute (r,b) <-- (u00 a + u10 b, u01 a + u11 b) as
+
+     r  = u00 * a
+     r += u10 * b
+     b *= u11
+     b += u01 * a
+  */
+
+#if HAVE_NATIVE_mpn_addaddmul_1msb0
+  ah = mpn_addaddmul_1msb0 (rp, ap, bp, n, M->u[0][0], M->u[1][0]);
+  bh = mpn_addaddmul_1msb0 (bp, bp, ap, n, M->u[1][1], M->u[0][1]);
+#else
+  ah =     mpn_mul_1 (rp, ap, n, M->u[0][0]);
+  ah += mpn_addmul_1 (rp, bp, n, M->u[1][0]);
+
+  bh =     mpn_mul_1 (bp, bp, n, M->u[1][1]);
+  bh += mpn_addmul_1 (bp, ap, n, M->u[0][1]);
+#endif
+  rp[n] = ah;
+  bp[n] = bh;
+
+  n += (ah | bh) > 0;
+  return n;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2_jacobi.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2_jacobi.c
deleted file mode 120000
index 4b6dfcab5..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2_jacobi.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd2_jacobi.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2_jacobi.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2_jacobi.c
new file mode 100644
index 000000000..98e079bf1
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd2_jacobi.c
@@ -0,0 +1,365 @@
+/* hgcd2_jacobi.c
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 1996, 1998, 2000-2004, 2008, 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#if GMP_NAIL_BITS > 0
+#error Nails not supported.
+#endif
+
+/* FIXME: Duplicated in hgcd2.c. Should move to gmp-impl.h, and
+   possibly be renamed. */
+static inline mp_limb_t
+div1 (mp_ptr rp,
+      mp_limb_t n0,
+      mp_limb_t d0)
+{
+  mp_limb_t q = 0;
+
+  if ((mp_limb_signed_t) n0 < 0)
+    {
+      int cnt;
+      for (cnt = 1; (mp_limb_signed_t) d0 >= 0; cnt++)
+	{
+	  d0 = d0 << 1;
+	}
+
+      q = 0;
+      while (cnt)
+	{
+	  q <<= 1;
+	  if (n0 >= d0)
+	    {
+	      n0 = n0 - d0;
+	      q |= 1;
+	    }
+	  d0 = d0 >> 1;
+	  cnt--;
+	}
+    }
+  else
+    {
+      int cnt;
+      for (cnt = 0; n0 >= d0; cnt++)
+	{
+	  d0 = d0 << 1;
+	}
+
+      q = 0;
+      while (cnt)
+	{
+	  d0 = d0 >> 1;
+	  q <<= 1;
+	  if (n0 >= d0)
+	    {
+	      n0 = n0 - d0;
+	      q |= 1;
+	    }
+	  cnt--;
+	}
+    }
+  *rp = n0;
+  return q;
+}
+
+/* Two-limb division optimized for small quotients.  */
+static inline mp_limb_t
+div2 (mp_ptr rp,
+      mp_limb_t nh, mp_limb_t nl,
+      mp_limb_t dh, mp_limb_t dl)
+{
+  mp_limb_t q = 0;
+
+  if ((mp_limb_signed_t) nh < 0)
+    {
+      int cnt;
+      for (cnt = 1; (mp_limb_signed_t) dh >= 0; cnt++)
+	{
+	  dh = (dh << 1) | (dl >> (GMP_LIMB_BITS - 1));
+	  dl = dl << 1;
+	}
+
+      while (cnt)
+	{
+	  q <<= 1;
+	  if (nh > dh || (nh == dh && nl >= dl))
+	    {
+	      sub_ddmmss (nh, nl, nh, nl, dh, dl);
+	      q |= 1;
+	    }
+	  dl = (dh << (GMP_LIMB_BITS - 1)) | (dl >> 1);
+	  dh = dh >> 1;
+	  cnt--;
+	}
+    }
+  else
+    {
+      int cnt;
+      for (cnt = 0; nh > dh || (nh == dh && nl >= dl); cnt++)
+	{
+	  dh = (dh << 1) | (dl >> (GMP_LIMB_BITS - 1));
+	  dl = dl << 1;
+	}
+
+      while (cnt)
+	{
+	  dl = (dh << (GMP_LIMB_BITS - 1)) | (dl >> 1);
+	  dh = dh >> 1;
+	  q <<= 1;
+	  if (nh > dh || (nh == dh && nl >= dl))
+	    {
+	      sub_ddmmss (nh, nl, nh, nl, dh, dl);
+	      q |= 1;
+	    }
+	  cnt--;
+	}
+    }
+
+  rp[0] = nl;
+  rp[1] = nh;
+
+  return q;
+}
+
+int
+mpn_hgcd2_jacobi (mp_limb_t ah, mp_limb_t al, mp_limb_t bh, mp_limb_t bl,
+		  struct hgcd_matrix1 *M, unsigned *bitsp)
+{
+  mp_limb_t u00, u01, u10, u11;
+  unsigned bits = *bitsp;
+
+  if (ah < 2 || bh < 2)
+    return 0;
+
+  if (ah > bh || (ah == bh && al > bl))
+    {
+      sub_ddmmss (ah, al, ah, al, bh, bl);
+      if (ah < 2)
+	return 0;
+
+      u00 = u01 = u11 = 1;
+      u10 = 0;
+      bits = mpn_jacobi_update (bits, 1, 1);
+    }
+  else
+    {
+      sub_ddmmss (bh, bl, bh, bl, ah, al);
+      if (bh < 2)
+	return 0;
+
+      u00 = u10 = u11 = 1;
+      u01 = 0;
+      bits = mpn_jacobi_update (bits, 0, 1);
+    }
+
+  if (ah < bh)
+    goto subtract_a;
+
+  for (;;)
+    {
+      ASSERT (ah >= bh);
+      if (ah == bh)
+	goto done;
+
+      if (ah < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2)))
+	{
+	  ah = (ah << (GMP_LIMB_BITS / 2) ) + (al >> (GMP_LIMB_BITS / 2));
+	  bh = (bh << (GMP_LIMB_BITS / 2) ) + (bl >> (GMP_LIMB_BITS / 2));
+
+	  break;
+	}
+
+      /* Subtract a -= q b, and multiply M from the right by (1 q ; 0
+	 1), affecting the second column of M. */
+      ASSERT (ah > bh);
+      sub_ddmmss (ah, al, ah, al, bh, bl);
+
+      if (ah < 2)
+	goto done;
+
+      if (ah <= bh)
+	{
+	  /* Use q = 1 */
+	  u01 += u00;
+	  u11 += u10;
+	  bits = mpn_jacobi_update (bits, 1, 1);
+	}
+      else
+	{
+	  mp_limb_t r[2];
+	  mp_limb_t q = div2 (r, ah, al, bh, bl);
+	  al = r[0]; ah = r[1];
+	  if (ah < 2)
+	    {
+	      /* A is too small, but q is correct. */
+	      u01 += q * u00;
+	      u11 += q * u10;
+	      bits = mpn_jacobi_update (bits, 1, q & 3);
+	      goto done;
+	    }
+	  q++;
+	  u01 += q * u00;
+	  u11 += q * u10;
+	  bits = mpn_jacobi_update (bits, 1, q & 3);
+	}
+    subtract_a:
+      ASSERT (bh >= ah);
+      if (ah == bh)
+	goto done;
+
+      if (bh < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2)))
+	{
+	  ah = (ah << (GMP_LIMB_BITS / 2) ) + (al >> (GMP_LIMB_BITS / 2));
+	  bh = (bh << (GMP_LIMB_BITS / 2) ) + (bl >> (GMP_LIMB_BITS / 2));
+
+	  goto subtract_a1;
+	}
+
+      /* Subtract b -= q a, and multiply M from the right by (1 0 ; q
+	 1), affecting the first column of M. */
+      sub_ddmmss (bh, bl, bh, bl, ah, al);
+
+      if (bh < 2)
+	goto done;
+
+      if (bh <= ah)
+	{
+	  /* Use q = 1 */
+	  u00 += u01;
+	  u10 += u11;
+	  bits = mpn_jacobi_update (bits, 0, 1);
+	}
+      else
+	{
+	  mp_limb_t r[2];
+	  mp_limb_t q = div2 (r, bh, bl, ah, al);
+	  bl = r[0]; bh = r[1];
+	  if (bh < 2)
+	    {
+	      /* B is too small, but q is correct. */
+	      u00 += q * u01;
+	      u10 += q * u11;
+	      bits = mpn_jacobi_update (bits, 0, q & 3);
+	      goto done;
+	    }
+	  q++;
+	  u00 += q * u01;
+	  u10 += q * u11;
+	  bits = mpn_jacobi_update (bits, 0, q & 3);
+	}
+    }
+
+  /* NOTE: Since we discard the least significant half limb, we don't
+     get a truly maximal M (corresponding to |a - b| <
+     2^{GMP_LIMB_BITS +1}). */
+  /* Single precision loop */
+  for (;;)
+    {
+      ASSERT (ah >= bh);
+      if (ah == bh)
+	break;
+
+      ah -= bh;
+      if (ah < (CNST_LIMB (1) << (GMP_LIMB_BITS / 2 + 1)))
+	break;
+
+      if (ah <= bh)
+	{
+	  /* Use q = 1 */
+	  u01 += u00;
+	  u11 += u10;
+	  bits = mpn_jacobi_update (bits, 1, 1);
+	}
+      else
+	{
+	  mp_limb_t r;
+	  mp_limb_t q = div1 (&r, ah, bh);
+	  ah = r;
+	  if (ah < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2 + 1)))
+	    {
+	      /* A is too small, but q is correct. */
+	      u01 += q * u00;
+	      u11 += q * u10;
+	      bits = mpn_jacobi_update (bits, 1, q & 3);
+	      break;
+	    }
+	  q++;
+	  u01 += q * u00;
+	  u11 += q * u10;
+	  bits = mpn_jacobi_update (bits, 1, q & 3);
+	}
+    subtract_a1:
+      ASSERT (bh >= ah);
+      if (ah == bh)
+	break;
+
+      bh -= ah;
+      if (bh < (CNST_LIMB (1) << (GMP_LIMB_BITS / 2 + 1)))
+	break;
+
+      if (bh <= ah)
+	{
+	  /* Use q = 1 */
+	  u00 += u01;
+	  u10 += u11;
+	  bits = mpn_jacobi_update (bits, 0, 1);
+	}
+      else
+	{
+	  mp_limb_t r;
+	  mp_limb_t q = div1 (&r, bh, ah);
+	  bh = r;
+	  if (bh < (CNST_LIMB(1) << (GMP_LIMB_BITS / 2 + 1)))
+	    {
+	      /* B is too small, but q is correct. */
+	      u00 += q * u01;
+	      u10 += q * u11;
+	      bits = mpn_jacobi_update (bits, 0, q & 3);
+	      break;
+	    }
+	  q++;
+	  u00 += q * u01;
+	  u10 += q * u11;
+	  bits = mpn_jacobi_update (bits, 0, q & 3);
+	}
+    }
+
+ done:
+  M->u[0][0] = u00; M->u[0][1] = u01;
+  M->u[1][0] = u10; M->u[1][1] = u11;
+  *bitsp = bits;
+
+  return 1;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_appr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_appr.c
deleted file mode 120000
index 02afc6662..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_appr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd_appr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_appr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_appr.c
new file mode 100644
index 000000000..bb0173825
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_appr.c
@@ -0,0 +1,267 @@
+/* hgcd_appr.c.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Identical to mpn_hgcd_itch. FIXME: Do we really need to add
+   HGCD_THRESHOLD at the end? */
+mp_size_t
+mpn_hgcd_appr_itch (mp_size_t n)
+{
+  if (BELOW_THRESHOLD (n, HGCD_APPR_THRESHOLD))
+    return n;
+  else
+    {
+      unsigned k;
+      int count;
+      mp_size_t nscaled;
+
+      /* Get the recursion depth. */
+      nscaled = (n - 1) / (HGCD_APPR_THRESHOLD - 1);
+      count_leading_zeros (count, nscaled);
+      k = GMP_LIMB_BITS - count;
+
+      return 20 * ((n+3) / 4) + 22 * k + HGCD_THRESHOLD;
+    }
+}
+
+/* Destroys inputs. */
+int
+mpn_hgcd_appr (mp_ptr ap, mp_ptr bp, mp_size_t n,
+	       struct hgcd_matrix *M, mp_ptr tp)
+{
+  mp_size_t s;
+  int success = 0;
+
+  ASSERT (n > 0);
+
+  ASSERT ((ap[n-1] | bp[n-1]) != 0);
+
+  if (n <= 2)
+    /* Implies s = n. A fairly uninteresting case but exercised by the
+       random inputs of the testsuite. */
+    return 0;
+
+  ASSERT ((n+1)/2 - 1 < M->alloc);
+
+  /* We aim for reduction of to GMP_NUMB_BITS * s bits. But each time
+     we discard some of the least significant limbs, we must keep one
+     additional bit to account for the truncation error. We maintain
+     the GMP_NUMB_BITS * s - extra_bits as the current target size. */
+
+  s = n/2 + 1;
+  if (BELOW_THRESHOLD (n, HGCD_APPR_THRESHOLD))
+    {
+      unsigned extra_bits = 0;
+
+      while (n > 2)
+	{
+	  mp_size_t nn;
+
+	  ASSERT (n > s);
+	  ASSERT (n <= 2*s);
+
+	  nn = mpn_hgcd_step (n, ap, bp, s, M, tp);
+	  if (!nn)
+	    break;
+
+	  n = nn;
+	  success = 1;
+
+	  /* We can truncate and discard the lower p bits whenever nbits <=
+	     2*sbits - p. To account for the truncation error, we must
+	     adjust
+
+	     sbits <-- sbits + 1 - p,
+
+	     rather than just sbits <-- sbits - p. This adjustment makes
+	     the produced matrix slightly smaller than it could be. */
+
+	  if (GMP_NUMB_BITS * (n + 1) + 2 * extra_bits <= 2*GMP_NUMB_BITS * s)
+	    {
+	      mp_size_t p = (GMP_NUMB_BITS * (2*s - n) - 2*extra_bits) / GMP_NUMB_BITS;
+
+	      if (extra_bits == 0)
+		{
+		  /* We cross a limb boundary and bump s. We can't do that
+		     if the result is that it makes makes min(U, V)
+		     smaller than 2^{GMP_NUMB_BITS} s. */
+		  if (s + 1 == n
+		      || mpn_zero_p (ap + s + 1, n - s - 1)
+		      || mpn_zero_p (bp + s + 1, n - s - 1))
+		    continue;
+
+		  extra_bits = GMP_NUMB_BITS - 1;
+		  s++;
+		}
+	      else
+		{
+		  extra_bits--;
+		}
+
+	      /* Drop the p least significant limbs */
+	      ap += p; bp += p; n -= p; s -= p;
+	    }
+	}
+
+      ASSERT (s > 0);
+
+      if (extra_bits > 0)
+	{
+	  /* We can get here only of we have dropped at least one of the least
+	     significant bits, so we can decrement ap and bp. We can then shift
+	     left extra bits using mpn_rshift. */
+	  /* NOTE: In the unlikely case that n is large, it would be preferable
+	     to do an initial subdiv step to reduce the size before shifting,
+	     but that would mean duplicating mpn_gcd_subdiv_step with a bit
+	     count rather than a limb count. */
+	  ap--; bp--;
+	  ap[0] = mpn_rshift (ap+1, ap+1, n, GMP_NUMB_BITS - extra_bits);
+	  bp[0] = mpn_rshift (bp+1, bp+1, n, GMP_NUMB_BITS - extra_bits);
+	  n += (ap[n] | bp[n]) > 0;
+
+	  ASSERT (success);
+
+	  while (n > 2)
+	    {
+	      mp_size_t nn;
+
+	      ASSERT (n > s);
+	      ASSERT (n <= 2*s);
+
+	      nn = mpn_hgcd_step (n, ap, bp, s, M, tp);
+
+	      if (!nn)
+		return 1;
+
+	      n = nn;
+	    }
+	}
+
+      if (n == 2)
+	{
+	  struct hgcd_matrix1 M1;
+	  ASSERT (s == 1);
+
+	  if (mpn_hgcd2 (ap[1], ap[0], bp[1], bp[0], &M1))
+	    {
+	      /* Multiply M <- M * M1 */
+	      mpn_hgcd_matrix_mul_1 (M, &M1, tp);
+	      success = 1;
+	    }
+	}
+      return success;
+    }
+  else
+    {
+      mp_size_t n2 = (3*n)/4 + 1;
+      mp_size_t p = n/2;
+      mp_size_t nn;
+
+      nn = mpn_hgcd_reduce (M, ap, bp, n, p, tp);
+      if (nn)
+	{
+	  n = nn;
+	  /* FIXME: Discard some of the low limbs immediately? */
+	  success = 1;
+	}
+
+      while (n > n2)
+	{
+	  mp_size_t nn;
+
+	  /* Needs n + 1 storage */
+	  nn = mpn_hgcd_step (n, ap, bp, s, M, tp);
+	  if (!nn)
+	    return success;
+
+	  n = nn;
+	  success = 1;
+	}
+      if (n > s + 2)
+	{
+	  struct hgcd_matrix M1;
+	  mp_size_t scratch;
+
+	  p = 2*s - n + 1;
+	  scratch = MPN_HGCD_MATRIX_INIT_ITCH (n-p);
+
+	  mpn_hgcd_matrix_init(&M1, n - p, tp);
+	  if (mpn_hgcd_appr (ap + p, bp + p, n - p, &M1, tp + scratch))
+	    {
+	      /* We always have max(M) > 2^{-(GMP_NUMB_BITS + 1)} max(M1) */
+	      ASSERT (M->n + 2 >= M1.n);
+
+	      /* Furthermore, assume M ends with a quotient (1, q; 0, 1),
+		 then either q or q + 1 is a correct quotient, and M1 will
+		 start with either (1, 0; 1, 1) or (2, 1; 1, 1). This
+		 rules out the case that the size of M * M1 is much
+		 smaller than the expected M->n + M1->n. */
+
+	      ASSERT (M->n + M1.n < M->alloc);
+
+	      /* We need a bound for of M->n + M1.n. Let n be the original
+		 input size. Then
+
+		 ceil(n/2) - 1 >= size of product >= M.n + M1.n - 2
+
+		 and it follows that
+
+		 M.n + M1.n <= ceil(n/2) + 1
+
+		 Then 3*(M.n + M1.n) + 5 <= 3 * ceil(n/2) + 8 is the
+		 amount of needed scratch space. */
+	      mpn_hgcd_matrix_mul (M, &M1, tp + scratch);
+	      return 1;
+	    }
+	}
+
+      for(;;)
+	{
+	  mp_size_t nn;
+
+	  ASSERT (n > s);
+	  ASSERT (n <= 2*s);
+
+	  nn = mpn_hgcd_step (n, ap, bp, s, M, tp);
+
+	  if (!nn)
+	    return success;
+
+	  n = nn;
+	  success = 1;
+	}
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_jacobi.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_jacobi.c
deleted file mode 120000
index c9dadcffa..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_jacobi.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd_jacobi.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_jacobi.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_jacobi.c
new file mode 100644
index 000000000..24014cefb
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_jacobi.c
@@ -0,0 +1,243 @@
+/* hgcd_jacobi.c.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2003-2005, 2008, 2011, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* This file is almost a copy of hgcd.c, with some added calls to
+   mpn_jacobi_update */
+
+struct hgcd_jacobi_ctx
+{
+  struct hgcd_matrix *M;
+  unsigned *bitsp;
+};
+
+static void
+hgcd_jacobi_hook (void *p, mp_srcptr gp, mp_size_t gn,
+		  mp_srcptr qp, mp_size_t qn, int d)
+{
+  ASSERT (!gp);
+  ASSERT (d >= 0);
+
+  MPN_NORMALIZE (qp, qn);
+  if (qn > 0)
+    {
+      struct hgcd_jacobi_ctx *ctx = (struct hgcd_jacobi_ctx *) p;
+      /* NOTES: This is a bit ugly. A tp area is passed to
+	 gcd_subdiv_step, which stores q at the start of that area. We
+	 now use the rest. */
+      mp_ptr tp = (mp_ptr) qp + qn;
+
+      mpn_hgcd_matrix_update_q (ctx->M, qp, qn, d, tp);
+      *ctx->bitsp = mpn_jacobi_update (*ctx->bitsp, d, qp[0] & 3);
+    }
+}
+
+/* Perform a few steps, using some of mpn_hgcd2, subtraction and
+   division. Reduces the size by almost one limb or more, but never
+   below the given size s. Return new size for a and b, or 0 if no
+   more steps are possible.
+
+   If hgcd2 succeeds, needs temporary space for hgcd_matrix_mul_1, M->n
+   limbs, and hgcd_mul_matrix1_inverse_vector, n limbs. If hgcd2
+   fails, needs space for the quotient, qn <= n - s + 1 limbs, for and
+   hgcd_matrix_update_q, qn + (size of the appropriate column of M) <=
+   resulting size of M.
+
+   If N is the input size to the calling hgcd, then s = floor(N/2) +
+   1, M->n < N, qn + matrix size <= n - s + 1 + n - s = 2 (n - s) + 1
+   < N, so N is sufficient.
+*/
+
+static mp_size_t
+hgcd_jacobi_step (mp_size_t n, mp_ptr ap, mp_ptr bp, mp_size_t s,
+		  struct hgcd_matrix *M, unsigned *bitsp, mp_ptr tp)
+{
+  struct hgcd_matrix1 M1;
+  mp_limb_t mask;
+  mp_limb_t ah, al, bh, bl;
+
+  ASSERT (n > s);
+
+  mask = ap[n-1] | bp[n-1];
+  ASSERT (mask > 0);
+
+  if (n == s + 1)
+    {
+      if (mask < 4)
+	goto subtract;
+
+      ah = ap[n-1]; al = ap[n-2];
+      bh = bp[n-1]; bl = bp[n-2];
+    }
+  else if (mask & GMP_NUMB_HIGHBIT)
+    {
+      ah = ap[n-1]; al = ap[n-2];
+      bh = bp[n-1]; bl = bp[n-2];
+    }
+  else
+    {
+      int shift;
+
+      count_leading_zeros (shift, mask);
+      ah = MPN_EXTRACT_NUMB (shift, ap[n-1], ap[n-2]);
+      al = MPN_EXTRACT_NUMB (shift, ap[n-2], ap[n-3]);
+      bh = MPN_EXTRACT_NUMB (shift, bp[n-1], bp[n-2]);
+      bl = MPN_EXTRACT_NUMB (shift, bp[n-2], bp[n-3]);
+    }
+
+  /* Try an mpn_hgcd2 step */
+  if (mpn_hgcd2_jacobi (ah, al, bh, bl, &M1, bitsp))
+    {
+      /* Multiply M <- M * M1 */
+      mpn_hgcd_matrix_mul_1 (M, &M1, tp);
+
+      /* Can't swap inputs, so we need to copy. */
+      MPN_COPY (tp, ap, n);
+      /* Multiply M1^{-1} (a;b) */
+      return mpn_matrix22_mul1_inverse_vector (&M1, ap, tp, bp, n);
+    }
+
+ subtract:
+  {
+    struct hgcd_jacobi_ctx ctx;
+    ctx.M = M;
+    ctx.bitsp = bitsp;
+
+    return mpn_gcd_subdiv_step (ap, bp, n, s, hgcd_jacobi_hook, &ctx, tp);
+  }
+}
+
+/* Reduces a,b until |a-b| fits in n/2 + 1 limbs. Constructs matrix M
+   with elements of size at most (n+1)/2 - 1. Returns new size of a,
+   b, or zero if no reduction is possible. */
+
+/* Same scratch requirements as for mpn_hgcd. */
+mp_size_t
+mpn_hgcd_jacobi (mp_ptr ap, mp_ptr bp, mp_size_t n,
+		 struct hgcd_matrix *M, unsigned *bitsp, mp_ptr tp)
+{
+  mp_size_t s = n/2 + 1;
+
+  mp_size_t nn;
+  int success = 0;
+
+  if (n <= s)
+    /* Happens when n <= 2, a fairly uninteresting case but exercised
+       by the random inputs of the testsuite. */
+    return 0;
+
+  ASSERT ((ap[n-1] | bp[n-1]) > 0);
+
+  ASSERT ((n+1)/2 - 1 < M->alloc);
+
+  if (ABOVE_THRESHOLD (n, HGCD_THRESHOLD))
+    {
+      mp_size_t n2 = (3*n)/4 + 1;
+      mp_size_t p = n/2;
+
+      nn = mpn_hgcd_jacobi (ap + p, bp + p, n - p, M, bitsp, tp);
+      if (nn > 0)
+	{
+	  /* Needs 2*(p + M->n) <= 2*(floor(n/2) + ceil(n/2) - 1)
+	     = 2 (n - 1) */
+	  n = mpn_hgcd_matrix_adjust (M, p + nn, ap, bp, p, tp);
+	  success = 1;
+	}
+      while (n > n2)
+	{
+	  /* Needs n + 1 storage */
+	  nn = hgcd_jacobi_step (n, ap, bp, s, M, bitsp, tp);
+	  if (!nn)
+	    return success ? n : 0;
+	  n = nn;
+	  success = 1;
+	}
+
+      if (n > s + 2)
+	{
+	  struct hgcd_matrix M1;
+	  mp_size_t scratch;
+
+	  p = 2*s - n + 1;
+	  scratch = MPN_HGCD_MATRIX_INIT_ITCH (n-p);
+
+	  mpn_hgcd_matrix_init(&M1, n - p, tp);
+	  nn = mpn_hgcd_jacobi (ap + p, bp + p, n - p, &M1, bitsp, tp + scratch);
+	  if (nn > 0)
+	    {
+	      /* We always have max(M) > 2^{-(GMP_NUMB_BITS + 1)} max(M1) */
+	      ASSERT (M->n + 2 >= M1.n);
+
+	      /* Furthermore, assume M ends with a quotient (1, q; 0, 1),
+		 then either q or q + 1 is a correct quotient, and M1 will
+		 start with either (1, 0; 1, 1) or (2, 1; 1, 1). This
+		 rules out the case that the size of M * M1 is much
+		 smaller than the expected M->n + M1->n. */
+
+	      ASSERT (M->n + M1.n < M->alloc);
+
+	      /* Needs 2 (p + M->n) <= 2 (2*s - n2 + 1 + n2 - s - 1)
+		 = 2*s <= 2*(floor(n/2) + 1) <= n + 2. */
+	      n = mpn_hgcd_matrix_adjust (&M1, p + nn, ap, bp, p, tp + scratch);
+
+	      /* We need a bound for of M->n + M1.n. Let n be the original
+		 input size. Then
+
+		 ceil(n/2) - 1 >= size of product >= M.n + M1.n - 2
+
+		 and it follows that
+
+		 M.n + M1.n <= ceil(n/2) + 1
+
+		 Then 3*(M.n + M1.n) + 5 <= 3 * ceil(n/2) + 8 is the
+		 amount of needed scratch space. */
+	      mpn_hgcd_matrix_mul (M, &M1, tp + scratch);
+	      success = 1;
+	    }
+	}
+    }
+
+  for (;;)
+    {
+      /* Needs s+3 < n */
+      nn = hgcd_jacobi_step (n, ap, bp, s, M, bitsp, tp);
+      if (!nn)
+	return success ? n : 0;
+
+      n = nn;
+      success = 1;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_matrix.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_matrix.c
deleted file mode 120000
index 2e422f1f7..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_matrix.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd_matrix.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_matrix.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_matrix.c
new file mode 100644
index 000000000..54c795d36
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_matrix.c
@@ -0,0 +1,265 @@
+/* hgcd_matrix.c.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2003-2005, 2008, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* For input of size n, matrix elements are of size at most ceil(n/2)
+   - 1, but we need two limbs extra. */
+void
+mpn_hgcd_matrix_init (struct hgcd_matrix *M, mp_size_t n, mp_ptr p)
+{
+  mp_size_t s = (n+1)/2 + 1;
+  M->alloc = s;
+  M->n = 1;
+  MPN_ZERO (p, 4 * s);
+  M->p[0][0] = p;
+  M->p[0][1] = p + s;
+  M->p[1][0] = p + 2 * s;
+  M->p[1][1] = p + 3 * s;
+
+  M->p[0][0][0] = M->p[1][1][0] = 1;
+}
+
+/* Update column COL, adding in Q * column (1-COL). Temporary storage:
+ * qn + n <= M->alloc, where n is the size of the largest element in
+ * column 1 - COL. */
+void
+mpn_hgcd_matrix_update_q (struct hgcd_matrix *M, mp_srcptr qp, mp_size_t qn,
+			  unsigned col, mp_ptr tp)
+{
+  ASSERT (col < 2);
+
+  if (qn == 1)
+    {
+      mp_limb_t q = qp[0];
+      mp_limb_t c0, c1;
+
+      c0 = mpn_addmul_1 (M->p[0][col], M->p[0][1-col], M->n, q);
+      c1 = mpn_addmul_1 (M->p[1][col], M->p[1][1-col], M->n, q);
+
+      M->p[0][col][M->n] = c0;
+      M->p[1][col][M->n] = c1;
+
+      M->n += (c0 | c1) != 0;
+    }
+  else
+    {
+      unsigned row;
+
+      /* Carries for the unlikely case that we get both high words
+	 from the multiplication and carries from the addition. */
+      mp_limb_t c[2];
+      mp_size_t n;
+
+      /* The matrix will not necessarily grow in size by qn, so we
+	 need normalization in order not to overflow M. */
+
+      for (n = M->n; n + qn > M->n; n--)
+	{
+	  ASSERT (n > 0);
+	  if (M->p[0][1-col][n-1] > 0 || M->p[1][1-col][n-1] > 0)
+	    break;
+	}
+
+      ASSERT (qn + n <= M->alloc);
+
+      for (row = 0; row < 2; row++)
+	{
+	  if (qn <= n)
+	    mpn_mul (tp, M->p[row][1-col], n, qp, qn);
+	  else
+	    mpn_mul (tp, qp, qn, M->p[row][1-col], n);
+
+	  ASSERT (n + qn >= M->n);
+	  c[row] = mpn_add (M->p[row][col], tp, n + qn, M->p[row][col], M->n);
+	}
+
+      n += qn;
+
+      if (c[0] | c[1])
+	{
+	  M->p[0][col][n] = c[0];
+	  M->p[1][col][n] = c[1];
+	  n++;
+	}
+      else
+	{
+	  n -= (M->p[0][col][n-1] | M->p[1][col][n-1]) == 0;
+	  ASSERT (n >= M->n);
+	}
+      M->n = n;
+    }
+
+  ASSERT (M->n < M->alloc);
+}
+
+/* Multiply M by M1 from the right. Since the M1 elements fit in
+   GMP_NUMB_BITS - 1 bits, M grows by at most one limb. Needs
+   temporary space M->n */
+void
+mpn_hgcd_matrix_mul_1 (struct hgcd_matrix *M, const struct hgcd_matrix1 *M1,
+		       mp_ptr tp)
+{
+  mp_size_t n0, n1;
+
+  /* Could avoid copy by some swapping of pointers. */
+  MPN_COPY (tp, M->p[0][0], M->n);
+  n0 = mpn_hgcd_mul_matrix1_vector (M1, M->p[0][0], tp, M->p[0][1], M->n);
+  MPN_COPY (tp, M->p[1][0], M->n);
+  n1 = mpn_hgcd_mul_matrix1_vector (M1, M->p[1][0], tp, M->p[1][1], M->n);
+
+  /* Depends on zero initialization */
+  M->n = MAX(n0, n1);
+  ASSERT (M->n < M->alloc);
+}
+
+/* Multiply M by M1 from the right. Needs 3*(M->n + M1->n) + 5 limbs
+   of temporary storage (see mpn_matrix22_mul_itch). */
+void
+mpn_hgcd_matrix_mul (struct hgcd_matrix *M, const struct hgcd_matrix *M1,
+		     mp_ptr tp)
+{
+  mp_size_t n;
+
+  /* About the new size of M:s elements. Since M1's diagonal elements
+     are > 0, no element can decrease. The new elements are of size
+     M->n + M1->n, one limb more or less. The computation of the
+     matrix product produces elements of size M->n + M1->n + 1. But
+     the true size, after normalization, may be three limbs smaller.
+
+     The reason that the product has normalized size >= M->n + M1->n -
+     2 is subtle. It depends on the fact that M and M1 can be factored
+     as products of (1,1; 0,1) and (1,0; 1,1), and that we can't have
+     M ending with a large power and M1 starting with a large power of
+     the same matrix. */
+
+  /* FIXME: Strassen multiplication gives only a small speedup. In FFT
+     multiplication range, this function could be sped up quite a lot
+     using invariance. */
+  ASSERT (M->n + M1->n < M->alloc);
+
+  ASSERT ((M->p[0][0][M->n-1] | M->p[0][1][M->n-1]
+	   | M->p[1][0][M->n-1] | M->p[1][1][M->n-1]) > 0);
+
+  ASSERT ((M1->p[0][0][M1->n-1] | M1->p[0][1][M1->n-1]
+	   | M1->p[1][0][M1->n-1] | M1->p[1][1][M1->n-1]) > 0);
+
+  mpn_matrix22_mul (M->p[0][0], M->p[0][1],
+		    M->p[1][0], M->p[1][1], M->n,
+		    M1->p[0][0], M1->p[0][1],
+		    M1->p[1][0], M1->p[1][1], M1->n, tp);
+
+  /* Index of last potentially non-zero limb, size is one greater. */
+  n = M->n + M1->n;
+
+  n -= ((M->p[0][0][n] | M->p[0][1][n] | M->p[1][0][n] | M->p[1][1][n]) == 0);
+  n -= ((M->p[0][0][n] | M->p[0][1][n] | M->p[1][0][n] | M->p[1][1][n]) == 0);
+  n -= ((M->p[0][0][n] | M->p[0][1][n] | M->p[1][0][n] | M->p[1][1][n]) == 0);
+
+  ASSERT ((M->p[0][0][n] | M->p[0][1][n] | M->p[1][0][n] | M->p[1][1][n]) > 0);
+
+  M->n = n + 1;
+}
+
+/* Multiplies the least significant p limbs of (a;b) by M^-1.
+   Temporary space needed: 2 * (p + M->n)*/
+mp_size_t
+mpn_hgcd_matrix_adjust (const struct hgcd_matrix *M,
+			mp_size_t n, mp_ptr ap, mp_ptr bp,
+			mp_size_t p, mp_ptr tp)
+{
+  /* M^-1 (a;b) = (r11, -r01; -r10, r00) (a ; b)
+     = (r11 a - r01 b; - r10 a + r00 b */
+
+  mp_ptr t0 = tp;
+  mp_ptr t1 = tp + p + M->n;
+  mp_limb_t ah, bh;
+  mp_limb_t cy;
+
+  ASSERT (p + M->n  < n);
+
+  /* First compute the two values depending on a, before overwriting a */
+
+  if (M->n >= p)
+    {
+      mpn_mul (t0, M->p[1][1], M->n, ap, p);
+      mpn_mul (t1, M->p[1][0], M->n, ap, p);
+    }
+  else
+    {
+      mpn_mul (t0, ap, p, M->p[1][1], M->n);
+      mpn_mul (t1, ap, p, M->p[1][0], M->n);
+    }
+
+  /* Update a */
+  MPN_COPY (ap, t0, p);
+  ah = mpn_add (ap + p, ap + p, n - p, t0 + p, M->n);
+
+  if (M->n >= p)
+    mpn_mul (t0, M->p[0][1], M->n, bp, p);
+  else
+    mpn_mul (t0, bp, p, M->p[0][1], M->n);
+
+  cy = mpn_sub (ap, ap, n, t0, p + M->n);
+  ASSERT (cy <= ah);
+  ah -= cy;
+
+  /* Update b */
+  if (M->n >= p)
+    mpn_mul (t0, M->p[0][0], M->n, bp, p);
+  else
+    mpn_mul (t0, bp, p, M->p[0][0], M->n);
+
+  MPN_COPY (bp, t0, p);
+  bh = mpn_add (bp + p, bp + p, n - p, t0 + p, M->n);
+  cy = mpn_sub (bp, bp, n, t1, p + M->n);
+  ASSERT (cy <= bh);
+  bh -= cy;
+
+  if (ah > 0 || bh > 0)
+    {
+      ap[n] = ah;
+      bp[n] = bh;
+      n++;
+    }
+  else
+    {
+      /* The subtraction can reduce the size by at most one limb. */
+      if (ap[n-1] == 0 && bp[n-1] == 0)
+	n--;
+    }
+  ASSERT (ap[n-1] > 0 || bp[n-1] > 0);
+  return n;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_reduce.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_reduce.c
deleted file mode 120000
index 3a34d2997..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_reduce.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd_reduce.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_reduce.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_reduce.c
new file mode 100644
index 000000000..3aee77d47
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_reduce.c
@@ -0,0 +1,242 @@
+/* hgcd_reduce.c.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Computes R -= A * B. Result must be non-negative. Normalized down
+   to size an, and resulting size is returned. */
+static mp_size_t
+submul (mp_ptr rp, mp_size_t rn,
+	mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn)
+{
+  mp_ptr tp;
+  TMP_DECL;
+
+  ASSERT (bn > 0);
+  ASSERT (an >= bn);
+  ASSERT (rn >= an);
+  ASSERT (an + bn <= rn + 1);
+
+  TMP_MARK;
+  tp = TMP_ALLOC_LIMBS (an + bn);
+
+  mpn_mul (tp, ap, an, bp, bn);
+  ASSERT ((an + bn <= rn) || (tp[rn] == 0));
+  ASSERT_NOCARRY (mpn_sub (rp, rp, rn, tp, an + bn - (an + bn > rn)));
+  TMP_FREE;
+
+  while (rn > an && (rp[rn-1] == 0))
+    rn--;
+
+  return rn;
+}
+
+/* Computes (a, b)  <--  M^{-1} (a; b) */
+/* FIXME:
+    x Take scratch parameter, and figure out scratch need.
+
+    x Use some fallback for small M->n?
+*/
+static mp_size_t
+hgcd_matrix_apply (const struct hgcd_matrix *M,
+		   mp_ptr ap, mp_ptr bp,
+		   mp_size_t n)
+{
+  mp_size_t an, bn, un, vn, nn;
+  mp_size_t mn[2][2];
+  mp_size_t modn;
+  mp_ptr tp, sp, scratch;
+  mp_limb_t cy;
+  unsigned i, j;
+
+  TMP_DECL;
+
+  ASSERT ( (ap[n-1] | bp[n-1]) > 0);
+
+  an = n;
+  MPN_NORMALIZE (ap, an);
+  bn = n;
+  MPN_NORMALIZE (bp, bn);
+
+  for (i = 0; i < 2; i++)
+    for (j = 0; j < 2; j++)
+      {
+	mp_size_t k;
+	k = M->n;
+	MPN_NORMALIZE (M->p[i][j], k);
+	mn[i][j] = k;
+      }
+
+  ASSERT (mn[0][0] > 0);
+  ASSERT (mn[1][1] > 0);
+  ASSERT ( (mn[0][1] | mn[1][0]) > 0);
+
+  TMP_MARK;
+
+  if (mn[0][1] == 0)
+    {
+      /* A unchanged, M = (1, 0; q, 1) */
+      ASSERT (mn[0][0] == 1);
+      ASSERT (M->p[0][0][0] == 1);
+      ASSERT (mn[1][1] == 1);
+      ASSERT (M->p[1][1][0] == 1);
+
+      /* Put B <-- B - q A */
+      nn = submul (bp, bn, ap, an, M->p[1][0], mn[1][0]);
+    }
+  else if (mn[1][0] == 0)
+    {
+      /* B unchanged, M = (1, q; 0, 1) */
+      ASSERT (mn[0][0] == 1);
+      ASSERT (M->p[0][0][0] == 1);
+      ASSERT (mn[1][1] == 1);
+      ASSERT (M->p[1][1][0] == 1);
+
+      /* Put A  <-- A - q * B */
+      nn = submul (ap, an, bp, bn, M->p[0][1], mn[0][1]);
+    }
+  else
+    {
+      /* A = m00 a + m01 b  ==> a <= A / m00, b <= A / m01.
+	 B = m10 a + m11 b  ==> a <= B / m10, b <= B / m11. */
+      un = MIN (an - mn[0][0], bn - mn[1][0]) + 1;
+      vn = MIN (an - mn[0][1], bn - mn[1][1]) + 1;
+
+      nn = MAX (un, vn);
+      /* In the range of interest, mulmod_bnm1 should always beat mullo. */
+      modn = mpn_mulmod_bnm1_next_size (nn + 1);
+
+      TMP_ALLOC_LIMBS_3 (tp, modn,
+			 sp, modn,
+			 scratch, mpn_mulmod_bnm1_itch (modn, modn, M->n));
+
+      ASSERT (n <= 2*modn);
+
+      if (n > modn)
+	{
+	  cy = mpn_add (ap, ap, modn, ap + modn, n - modn);
+	  MPN_INCR_U (ap, modn, cy);
+
+	  cy = mpn_add (bp, bp, modn, bp + modn, n - modn);
+	  MPN_INCR_U (bp, modn, cy);
+
+	  n = modn;
+	}
+
+      mpn_mulmod_bnm1 (tp, modn, ap, n, M->p[1][1], mn[1][1], scratch);
+      mpn_mulmod_bnm1 (sp, modn, bp, n, M->p[0][1], mn[0][1], scratch);
+
+      /* FIXME: Handle the small n case in some better way. */
+      if (n + mn[1][1] < modn)
+	MPN_ZERO (tp + n + mn[1][1], modn - n - mn[1][1]);
+      if (n + mn[0][1] < modn)
+	MPN_ZERO (sp + n + mn[0][1], modn - n - mn[0][1]);
+
+      cy = mpn_sub_n (tp, tp, sp, modn);
+      MPN_DECR_U (tp, modn, cy);
+
+      ASSERT (mpn_zero_p (tp + nn, modn - nn));
+
+      mpn_mulmod_bnm1 (sp, modn, ap, n, M->p[1][0], mn[1][0], scratch);
+      MPN_COPY (ap, tp, nn);
+      mpn_mulmod_bnm1 (tp, modn, bp, n, M->p[0][0], mn[0][0], scratch);
+
+      if (n + mn[1][0] < modn)
+	MPN_ZERO (sp + n + mn[1][0], modn - n - mn[1][0]);
+      if (n + mn[0][0] < modn)
+	MPN_ZERO (tp + n + mn[0][0], modn - n - mn[0][0]);
+
+      cy = mpn_sub_n (tp, tp, sp, modn);
+      MPN_DECR_U (tp, modn, cy);
+
+      ASSERT (mpn_zero_p (tp + nn, modn - nn));
+      MPN_COPY (bp, tp, nn);
+
+      while ( (ap[nn-1] | bp[nn-1]) == 0)
+	{
+	  nn--;
+	  ASSERT (nn > 0);
+	}
+    }
+  TMP_FREE;
+
+  return nn;
+}
+
+mp_size_t
+mpn_hgcd_reduce_itch (mp_size_t n, mp_size_t p)
+{
+  mp_size_t itch;
+  if (BELOW_THRESHOLD (n, HGCD_REDUCE_THRESHOLD))
+    {
+      itch = mpn_hgcd_itch (n-p);
+
+      /* For arbitrary p, the storage for _adjust is 2*(p + M->n) = 2 *
+	 (p + ceil((n-p)/2) - 1 <= n + p - 1 */
+      if (itch < n + p - 1)
+	itch = n + p - 1;
+    }
+  else
+    {
+      itch = 2*(n-p) + mpn_hgcd_itch (n-p);
+      /* Currently, hgcd_matrix_apply allocates its own storage. */
+    }
+  return itch;
+}
+
+/* FIXME: Document storage need. */
+mp_size_t
+mpn_hgcd_reduce (struct hgcd_matrix *M,
+		 mp_ptr ap, mp_ptr bp, mp_size_t n, mp_size_t p,
+		 mp_ptr tp)
+{
+  mp_size_t nn;
+  if (BELOW_THRESHOLD (n, HGCD_REDUCE_THRESHOLD))
+    {
+      nn = mpn_hgcd (ap + p, bp + p, n - p, M, tp);
+      if (nn > 0)
+	/* Needs 2*(p + M->n) <= 2*(floor(n/2) + ceil(n/2) - 1)
+	   = 2 (n - 1) */
+	return mpn_hgcd_matrix_adjust (M, p + nn, ap, bp, p, tp);
+    }
+  else
+    {
+      MPN_COPY (tp, ap + p, n - p);
+      MPN_COPY (tp + n - p, bp + p, n - p);
+      if (mpn_hgcd_appr (tp, tp + n - p, n - p, M, tp + 2*(n-p)))
+	return hgcd_matrix_apply (M, ap, bp, n);
+    }
+  return 0;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_step.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_step.c
deleted file mode 120000
index 36b9af36c..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_step.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/hgcd_step.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_step.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_step.c
new file mode 100644
index 000000000..a978a8802
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/hgcd_step.c
@@ -0,0 +1,127 @@
+/* hgcd_step.c.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2003-2005, 2008, 2011, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+static void
+hgcd_hook (void *p, mp_srcptr gp, mp_size_t gn,
+	   mp_srcptr qp, mp_size_t qn, int d)
+{
+  ASSERT (!gp);
+  ASSERT (d >= 0);
+  ASSERT (d <= 1);
+
+  MPN_NORMALIZE (qp, qn);
+  if (qn > 0)
+    {
+      struct hgcd_matrix *M = (struct hgcd_matrix *) p;
+      /* NOTES: This is a bit ugly. A tp area is passed to
+	 gcd_subdiv_step, which stores q at the start of that area. We
+	 now use the rest. */
+      mp_ptr tp = (mp_ptr) qp + qn;
+      mpn_hgcd_matrix_update_q (M, qp, qn, d, tp);
+    }
+}
+
+/* Perform a few steps, using some of mpn_hgcd2, subtraction and
+   division. Reduces the size by almost one limb or more, but never
+   below the given size s. Return new size for a and b, or 0 if no
+   more steps are possible.
+
+   If hgcd2 succeeds, needs temporary space for hgcd_matrix_mul_1, M->n
+   limbs, and hgcd_mul_matrix1_inverse_vector, n limbs. If hgcd2
+   fails, needs space for the quotient, qn <= n - s limbs, for and
+   hgcd_matrix_update_q, qn + (size of the appropriate column of M) <=
+   (resulting size of M) + 1.
+
+   If N is the input size to the calling hgcd, then s = floor(N/2) +
+   1, M->n < N, qn + product size <= n - s + n - s + 1 = 2 (n - s) + 1
+   <= N.
+*/
+
+mp_size_t
+mpn_hgcd_step (mp_size_t n, mp_ptr ap, mp_ptr bp, mp_size_t s,
+	       struct hgcd_matrix *M, mp_ptr tp)
+{
+  struct hgcd_matrix1 M1;
+  mp_limb_t mask;
+  mp_limb_t ah, al, bh, bl;
+
+  ASSERT (n > s);
+
+  mask = ap[n-1] | bp[n-1];
+  ASSERT (mask > 0);
+
+  if (n == s + 1)
+    {
+      if (mask < 4)
+	goto subtract;
+
+      ah = ap[n-1]; al = ap[n-2];
+      bh = bp[n-1]; bl = bp[n-2];
+    }
+  else if (mask & GMP_NUMB_HIGHBIT)
+    {
+      ah = ap[n-1]; al = ap[n-2];
+      bh = bp[n-1]; bl = bp[n-2];
+    }
+  else
+    {
+      int shift;
+
+      count_leading_zeros (shift, mask);
+      ah = MPN_EXTRACT_NUMB (shift, ap[n-1], ap[n-2]);
+      al = MPN_EXTRACT_NUMB (shift, ap[n-2], ap[n-3]);
+      bh = MPN_EXTRACT_NUMB (shift, bp[n-1], bp[n-2]);
+      bl = MPN_EXTRACT_NUMB (shift, bp[n-2], bp[n-3]);
+    }
+
+  /* Try an mpn_hgcd2 step */
+  if (mpn_hgcd2 (ah, al, bh, bl, &M1))
+    {
+      /* Multiply M <- M * M1 */
+      mpn_hgcd_matrix_mul_1 (M, &M1, tp);
+
+      /* Can't swap inputs, so we need to copy. */
+      MPN_COPY (tp, ap, n);
+      /* Multiply M1^{-1} (a;b) */
+      return mpn_matrix22_mul1_inverse_vector (&M1, ap, tp, bp, n);
+    }
+
+ subtract:
+
+  return mpn_gcd_subdiv_step (ap, bp, n, s, hgcd_hook, M, tp);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/invert.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/invert.c
deleted file mode 120000
index c3c7bc428..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/invert.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/invert.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/invert.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/invert.c
new file mode 100644
index 000000000..157ff2bea
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/invert.c
@@ -0,0 +1,86 @@
+/* invert.c -- Compute floor((B^{2n}-1)/U) - B^n.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright (C) 2007, 2009, 2010, 2012, 2014-2016 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+void
+mpn_invert (mp_ptr ip, mp_srcptr dp, mp_size_t n, mp_ptr scratch)
+{
+  ASSERT (n > 0);
+  ASSERT (dp[n-1] & GMP_NUMB_HIGHBIT);
+  ASSERT (! MPN_OVERLAP_P (ip, n, dp, n));
+  ASSERT (! MPN_OVERLAP_P (ip, n, scratch, mpn_invertappr_itch(n)));
+  ASSERT (! MPN_OVERLAP_P (dp, n, scratch, mpn_invertappr_itch(n)));
+
+  if (n == 1)
+    invert_limb (*ip, *dp);
+  else if (BELOW_THRESHOLD (n, INV_APPR_THRESHOLD))
+    {
+	/* Maximum scratch needed by this branch: 2*n */
+	mp_ptr xp;
+
+	xp = scratch;				/* 2 * n limbs */
+	/* n > 1 here */
+	MPN_FILL (xp, n, GMP_NUMB_MAX);
+	mpn_com (xp + n, dp, n);
+	if (n == 2) {
+	  mpn_divrem_2 (ip, 0, xp, 4, dp);
+	} else {
+	  gmp_pi1_t inv;
+	  invert_pi1 (inv, dp[n-1], dp[n-2]);
+	  /* FIXME: should we use dcpi1_div_q, for big sizes? */
+	  mpn_sbpi1_div_q (ip, xp, 2 * n, dp, n, inv.inv32);
+	}
+    }
+  else { /* Use approximated inverse; correct the result if needed. */
+      mp_limb_t e; /* The possible error in the approximate inverse */
+
+      ASSERT ( mpn_invert_itch (n) >= mpn_invertappr_itch (n) );
+      e = mpn_ni_invertappr (ip, dp, n, scratch);
+
+      if (UNLIKELY (e)) { /* Assume the error can only be "0" (no error) or "1". */
+	/* Code to detect and correct the "off by one" approximation. */
+	mpn_mul_n (scratch, ip, dp, n);
+	e = mpn_add_n (scratch, scratch, dp, n); /* FIXME: we only need e.*/
+	if (LIKELY(e)) /* The high part can not give a carry by itself. */
+	  e = mpn_add_nc (scratch + n, scratch + n, dp, n, e); /* FIXME:e */
+	/* If the value was wrong (no carry), correct it (increment). */
+	e ^= CNST_LIMB (1);
+	MPN_INCR_U (ip, n, e);
+      }
+  }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/invertappr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/invertappr.c
deleted file mode 120000
index baebc1b17..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/invertappr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/invertappr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/invertappr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/invertappr.c
new file mode 100644
index 000000000..3be5596bf
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/invertappr.c
@@ -0,0 +1,300 @@
+/* mpn_invertappr and helper functions.  Compute I such that
+   floor((B^{2n}-1)/U - 1 <= I + B^n <= floor((B^{2n}-1)/U.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   The algorithm used here was inspired by ApproximateReciprocal from "Modern
+   Computer Arithmetic", by Richard P. Brent and Paul Zimmermann.  Special
+   thanks to Paul Zimmermann for his very valuable suggestions on all the
+   theoretical aspects during the work on this code.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright (C) 2007, 2009, 2010, 2012, 2015, 2016 Free Software
+Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* FIXME: The iterative version splits the operand in two slightly unbalanced
+   parts, the use of log_2 (or counting the bits) underestimate the maximum
+   number of iterations.  */
+
+#if TUNE_PROGRAM_BUILD
+#define NPOWS \
+ ((sizeof(mp_size_t) > 6 ? 48 : 8*sizeof(mp_size_t)))
+#define MAYBE_dcpi1_divappr   1
+#else
+#define NPOWS \
+ ((sizeof(mp_size_t) > 6 ? 48 : 8*sizeof(mp_size_t)) - LOG2C (INV_NEWTON_THRESHOLD))
+#define MAYBE_dcpi1_divappr \
+  (INV_NEWTON_THRESHOLD < DC_DIVAPPR_Q_THRESHOLD)
+#if (INV_NEWTON_THRESHOLD > INV_MULMOD_BNM1_THRESHOLD) && \
+    (INV_APPR_THRESHOLD > INV_MULMOD_BNM1_THRESHOLD)
+#undef  INV_MULMOD_BNM1_THRESHOLD
+#define INV_MULMOD_BNM1_THRESHOLD 0 /* always when Newton */
+#endif
+#endif
+
+/* All the three functions mpn{,_bc,_ni}_invertappr (ip, dp, n, scratch), take
+   the strictly normalised value {dp,n} (i.e., most significant bit must be set)
+   as an input, and compute {ip,n}: the approximate reciprocal of {dp,n}.
+
+   Let e = mpn*_invertappr (ip, dp, n, scratch) be the returned value; the
+   following conditions are satisfied by the output:
+     0 <= e <= 1;
+     {dp,n}*(B^n+{ip,n}) < B^{2n} <= {dp,n}*(B^n+{ip,n}+1+e) .
+   I.e. e=0 means that the result {ip,n} equals the one given by mpn_invert.
+	e=1 means that the result _may_ be one less than expected.
+
+   The _bc version returns e=1 most of the time.
+   The _ni version should return e=0 most of the time; only about 1% of
+   possible random input should give e=1.
+
+   When the strict result is needed, i.e., e=0 in the relation above:
+     {dp,n}*(B^n+{ip,n}) < B^{2n} <= {dp,n}*(B^n+{ip,n}+1) ;
+   the function mpn_invert (ip, dp, n, scratch) should be used instead.  */
+
+/* Maximum scratch needed by this branch (at xp): 2*n */
+static mp_limb_t
+mpn_bc_invertappr (mp_ptr ip, mp_srcptr dp, mp_size_t n, mp_ptr xp)
+{
+  ASSERT (n > 0);
+  ASSERT (dp[n-1] & GMP_NUMB_HIGHBIT);
+  ASSERT (! MPN_OVERLAP_P (ip, n, dp, n));
+  ASSERT (! MPN_OVERLAP_P (ip, n, xp, mpn_invertappr_itch(n)));
+  ASSERT (! MPN_OVERLAP_P (dp, n, xp, mpn_invertappr_itch(n)));
+
+  /* Compute a base value of r limbs. */
+  if (n == 1)
+    invert_limb (*ip, *dp);
+  else {
+    /* n > 1 here */
+    MPN_FILL (xp, n, GMP_NUMB_MAX);
+    mpn_com (xp + n, dp, n);
+
+    /* Now xp contains B^2n - {dp,n}*B^n - 1 */
+
+    /* FIXME: if mpn_*pi1_divappr_q handles n==2, use it! */
+    if (n == 2) {
+      mpn_divrem_2 (ip, 0, xp, 4, dp);
+    } else {
+      gmp_pi1_t inv;
+      invert_pi1 (inv, dp[n-1], dp[n-2]);
+      if (! MAYBE_dcpi1_divappr
+	  || BELOW_THRESHOLD (n, DC_DIVAPPR_Q_THRESHOLD))
+	mpn_sbpi1_divappr_q (ip, xp, 2 * n, dp, n, inv.inv32);
+      else
+	mpn_dcpi1_divappr_q (ip, xp, 2 * n, dp, n, &inv);
+      MPN_DECR_U(ip, n, CNST_LIMB (1));
+      return 1;
+    }
+  }
+  return 0;
+}
+
+/* mpn_ni_invertappr: computes the approximate reciprocal using Newton's
+   iterations (at least one).
+
+   Inspired by Algorithm "ApproximateReciprocal", published in "Modern Computer
+   Arithmetic" by Richard P. Brent and Paul Zimmermann, algorithm 3.5, page 121
+   in version 0.4 of the book.
+
+   Some adaptations were introduced, to allow product mod B^m-1 and return the
+   value e.
+
+   We introduced a correction in such a way that "the value of
+   B^{n+h}-T computed at step 8 cannot exceed B^n-1" (the book reads
+   "2B^n-1").
+
+   Maximum scratch needed by this branch <= 2*n, but have to fit 3*rn
+   in the scratch, i.e. 3*rn <= 2*n: we require n>4.
+
+   We use a wrapped product modulo B^m-1.  NOTE: is there any normalisation
+   problem for the [0] class?  It shouldn't: we compute 2*|A*X_h - B^{n+h}| <
+   B^m-1.  We may get [0] if and only if we get AX_h = B^{n+h}.  This can
+   happen only if A=B^{n}/2, but this implies X_h = B^{h}*2-1 i.e., AX_h =
+   B^{n+h} - A, then we get into the "negative" branch, where X_h is not
+   incremented (because A < B^n).
+
+   FIXME: the scratch for mulmod_bnm1 does not currently fit in the scratch, it
+   is allocated apart.
+ */
+
+mp_limb_t
+mpn_ni_invertappr (mp_ptr ip, mp_srcptr dp, mp_size_t n, mp_ptr scratch)
+{
+  mp_limb_t cy;
+  mp_size_t rn, mn;
+  mp_size_t sizes[NPOWS], *sizp;
+  mp_ptr tp;
+  TMP_DECL;
+#define xp scratch
+
+  ASSERT (n > 4);
+  ASSERT (dp[n-1] & GMP_NUMB_HIGHBIT);
+  ASSERT (! MPN_OVERLAP_P (ip, n, dp, n));
+  ASSERT (! MPN_OVERLAP_P (ip, n, scratch, mpn_invertappr_itch(n)));
+  ASSERT (! MPN_OVERLAP_P (dp, n, scratch, mpn_invertappr_itch(n)));
+
+  /* Compute the computation precisions from highest to lowest, leaving the
+     base case size in 'rn'.  */
+  sizp = sizes;
+  rn = n;
+  do {
+    *sizp = rn;
+    rn = (rn >> 1) + 1;
+    ++sizp;
+  } while (ABOVE_THRESHOLD (rn, INV_NEWTON_THRESHOLD));
+
+  /* We search the inverse of 0.{dp,n}, we compute it as 1.{ip,n} */
+  dp += n;
+  ip += n;
+
+  /* Compute a base value of rn limbs. */
+  mpn_bc_invertappr (ip - rn, dp - rn, rn, scratch);
+
+  TMP_MARK;
+
+  if (ABOVE_THRESHOLD (n, INV_MULMOD_BNM1_THRESHOLD))
+    {
+      mn = mpn_mulmod_bnm1_next_size (n + 1);
+      tp = TMP_ALLOC_LIMBS (mpn_mulmod_bnm1_itch (mn, n, (n >> 1) + 1));
+    }
+  /* Use Newton's iterations to get the desired precision.*/
+
+  while (1) {
+    n = *--sizp;
+    /*
+      v    n  v
+      +----+--+
+      ^ rn ^
+    */
+
+    /* Compute i_jd . */
+    if (BELOW_THRESHOLD (n, INV_MULMOD_BNM1_THRESHOLD)
+	|| ((mn = mpn_mulmod_bnm1_next_size (n + 1)) > (n + rn))) {
+      /* FIXME: We do only need {xp,n+1}*/
+      mpn_mul (xp, dp - n, n, ip - rn, rn);
+      mpn_add_n (xp + rn, xp + rn, dp - n, n - rn + 1);
+      cy = CNST_LIMB(1); /* Remember we truncated, Mod B^(n+1) */
+      /* We computed (truncated) {xp,n+1} <- 1.{ip,rn} * 0.{dp,n} */
+    } else { /* Use B^mn-1 wraparound */
+      mpn_mulmod_bnm1 (xp, mn, dp - n, n, ip - rn, rn, tp);
+      /* We computed {xp,mn} <- {ip,rn} * {dp,n} mod (B^mn-1) */
+      /* We know that 2*|ip*dp + dp*B^rn - B^{rn+n}| < B^mn-1 */
+      /* Add dp*B^rn mod (B^mn-1) */
+      ASSERT (n >= mn - rn);
+      cy = mpn_add_n (xp + rn, xp + rn, dp - n, mn - rn);
+      cy = mpn_add_nc (xp, xp, dp - (n - (mn - rn)), n - (mn - rn), cy);
+      /* Subtract B^{rn+n}, maybe only compensate the carry*/
+      xp[mn] = CNST_LIMB (1); /* set a limit for DECR_U */
+      MPN_DECR_U (xp + rn + n - mn, 2 * mn + 1 - rn - n, CNST_LIMB (1) - cy);
+      MPN_DECR_U (xp, mn, CNST_LIMB (1) - xp[mn]); /* if DECR_U eroded xp[mn] */
+      cy = CNST_LIMB(0); /* Remember we are working Mod B^mn-1 */
+    }
+
+    if (xp[n] < CNST_LIMB (2)) { /* "positive" residue class */
+      cy = xp[n]; /* 0 <= cy <= 1 here. */
+#if HAVE_NATIVE_mpn_sublsh1_n
+      if (cy++) {
+	if (mpn_cmp (xp, dp - n, n) > 0) {
+	  mp_limb_t chk;
+	  chk = mpn_sublsh1_n (xp, xp, dp - n, n);
+	  ASSERT (chk == xp[n]);
+	  ++ cy;
+	} else
+	  ASSERT_CARRY (mpn_sub_n (xp, xp, dp - n, n));
+      }
+#else /* no mpn_sublsh1_n*/
+      if (cy++ && !mpn_sub_n (xp, xp, dp - n, n)) {
+	ASSERT_CARRY (mpn_sub_n (xp, xp, dp - n, n));
+	++cy;
+      }
+#endif
+      /* 1 <= cy <= 3 here. */
+#if HAVE_NATIVE_mpn_rsblsh1_n
+      if (mpn_cmp (xp, dp - n, n) > 0) {
+	ASSERT_NOCARRY (mpn_rsblsh1_n (xp + n, xp, dp - n, n));
+	++cy;
+      } else
+	ASSERT_NOCARRY (mpn_sub_nc (xp + 2 * n - rn, dp - rn, xp + n - rn, rn, mpn_cmp (xp, dp - n, n - rn) > 0));
+#else /* no mpn_rsblsh1_n*/
+      if (mpn_cmp (xp, dp - n, n) > 0) {
+	ASSERT_NOCARRY (mpn_sub_n (xp, xp, dp - n, n));
+	++cy;
+      }
+      ASSERT_NOCARRY (mpn_sub_nc (xp + 2 * n - rn, dp - rn, xp + n - rn, rn, mpn_cmp (xp, dp - n, n - rn) > 0));
+#endif
+      MPN_DECR_U(ip - rn, rn, cy); /* 1 <= cy <= 4 here. */
+    } else { /* "negative" residue class */
+      ASSERT (xp[n] >= GMP_NUMB_MAX - CNST_LIMB(1));
+      MPN_DECR_U(xp, n + 1, cy);
+      if (xp[n] != GMP_NUMB_MAX) {
+	MPN_INCR_U(ip - rn, rn, CNST_LIMB (1));
+	ASSERT_CARRY (mpn_add_n (xp, xp, dp - n, n));
+      }
+      mpn_com (xp + 2 * n - rn, xp + n - rn, rn);
+    }
+
+    /* Compute x_ju_j. FIXME:We need {xp+rn,rn}, mulhi? */
+    mpn_mul_n (xp, xp + 2 * n - rn, ip - rn, rn);
+    cy = mpn_add_n (xp + rn, xp + rn, xp + 2 * n - rn, 2 * rn - n);
+    cy = mpn_add_nc (ip - n, xp + 3 * rn - n, xp + n + rn, n - rn, cy);
+    MPN_INCR_U (ip - rn, rn, cy);
+    if (sizp == sizes) { /* Get out of the cycle */
+      /* Check for possible carry propagation from below. */
+      cy = xp[3 * rn - n - 1] > GMP_NUMB_MAX - CNST_LIMB (7); /* Be conservative. */
+      /*    cy = mpn_add_1 (xp + rn, xp + rn, 2*rn - n, 4); */
+      break;
+    }
+    rn = n;
+  }
+  TMP_FREE;
+
+  return cy;
+#undef xp
+}
+
+mp_limb_t
+mpn_invertappr (mp_ptr ip, mp_srcptr dp, mp_size_t n, mp_ptr scratch)
+{
+  ASSERT (n > 0);
+  ASSERT (dp[n-1] & GMP_NUMB_HIGHBIT);
+  ASSERT (! MPN_OVERLAP_P (ip, n, dp, n));
+  ASSERT (! MPN_OVERLAP_P (ip, n, scratch, mpn_invertappr_itch(n)));
+  ASSERT (! MPN_OVERLAP_P (dp, n, scratch, mpn_invertappr_itch(n)));
+
+  if (BELOW_THRESHOLD (n, INV_NEWTON_THRESHOLD))
+    return mpn_bc_invertappr (ip, dp, n, scratch);
+  else
+    return mpn_ni_invertappr (ip, dp, n, scratch);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/ior_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/ior_n.c
deleted file mode 120000
index 0a553d94d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/ior_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/logops_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/ior_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/ior_n.c
new file mode 100644
index 000000000..3adba2cdc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/ior_n.c
@@ -0,0 +1,77 @@
+/* mpn_and_n, mpn_ior_n, etc -- mpn logical operations.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#ifdef OPERATION_and_n
+#define func __MPN(and_n)
+#define call mpn_and_n
+#endif
+
+#ifdef OPERATION_andn_n
+#define func __MPN(andn_n)
+#define call mpn_andn_n
+#endif
+
+#ifdef OPERATION_nand_n
+#define func __MPN(nand_n)
+#define call mpn_nand_n
+#endif
+
+#ifdef OPERATION_ior_n
+#define func __MPN(ior_n)
+#define call mpn_ior_n
+#endif
+
+#ifdef OPERATION_iorn_n
+#define func __MPN(iorn_n)
+#define call mpn_iorn_n
+#endif
+
+#ifdef OPERATION_nior_n
+#define func __MPN(nior_n)
+#define call mpn_nior_n
+#endif
+
+#ifdef OPERATION_xor_n
+#define func __MPN(xor_n)
+#define call mpn_xor_n
+#endif
+
+#ifdef OPERATION_xnor_n
+#define func __MPN(xnor_n)
+#define call mpn_xnor_n
+#endif
+
+void
+func (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  call (rp, up, vp, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/iorn_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/iorn_n.c
deleted file mode 120000
index 0a553d94d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/iorn_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/logops_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/iorn_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/iorn_n.c
new file mode 100644
index 000000000..3adba2cdc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/iorn_n.c
@@ -0,0 +1,77 @@
+/* mpn_and_n, mpn_ior_n, etc -- mpn logical operations.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#ifdef OPERATION_and_n
+#define func __MPN(and_n)
+#define call mpn_and_n
+#endif
+
+#ifdef OPERATION_andn_n
+#define func __MPN(andn_n)
+#define call mpn_andn_n
+#endif
+
+#ifdef OPERATION_nand_n
+#define func __MPN(nand_n)
+#define call mpn_nand_n
+#endif
+
+#ifdef OPERATION_ior_n
+#define func __MPN(ior_n)
+#define call mpn_ior_n
+#endif
+
+#ifdef OPERATION_iorn_n
+#define func __MPN(iorn_n)
+#define call mpn_iorn_n
+#endif
+
+#ifdef OPERATION_nior_n
+#define func __MPN(nior_n)
+#define call mpn_nior_n
+#endif
+
+#ifdef OPERATION_xor_n
+#define func __MPN(xor_n)
+#define call mpn_xor_n
+#endif
+
+#ifdef OPERATION_xnor_n
+#define func __MPN(xnor_n)
+#define call mpn_xnor_n
+#endif
+
+void
+func (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  call (rp, up, vp, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacbase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacbase.c
deleted file mode 120000
index e05b9eadc..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacbase.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/jacbase.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacbase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacbase.c
new file mode 100644
index 000000000..735ad7a0b
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacbase.c
@@ -0,0 +1,242 @@
+/* mpn_jacobi_base -- limb/limb Jacobi symbol with restricted arguments.
+
+   THIS INTERFACE IS PRELIMINARY AND MIGHT DISAPPEAR OR BE SUBJECT TO
+   INCOMPATIBLE CHANGES IN A FUTURE RELEASE OF GMP.
+
+Copyright 1999-2002, 2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+/* Use the simple loop by default.  The generic count_trailing_zeros is not
+   very fast, and the extra trickery of method 3 has proven to be less use
+   than might have been though.  */
+#ifndef JACOBI_BASE_METHOD
+#define JACOBI_BASE_METHOD  2
+#endif
+
+
+/* Use count_trailing_zeros.  */
+#if JACOBI_BASE_METHOD == 1
+#define PROCESS_TWOS_ANY                                \
+  {                                                     \
+    mp_limb_t  twos;                                    \
+    count_trailing_zeros (twos, a);                     \
+    result_bit1 ^= JACOBI_TWOS_U_BIT1 (twos, b);        \
+    a >>= twos;                                         \
+  }
+#define PROCESS_TWOS_EVEN  PROCESS_TWOS_ANY
+#endif
+
+/* Use a simple loop.  A disadvantage of this is that there's a branch on a
+   50/50 chance of a 0 or 1 low bit.  */
+#if JACOBI_BASE_METHOD == 2
+#define PROCESS_TWOS_EVEN               \
+  {                                     \
+    int  two;                           \
+    two = JACOBI_TWO_U_BIT1 (b);        \
+    do                                  \
+      {                                 \
+	a >>= 1;                        \
+	result_bit1 ^= two;             \
+	ASSERT (a != 0);                \
+      }                                 \
+    while ((a & 1) == 0);               \
+  }
+#define PROCESS_TWOS_ANY        \
+  if ((a & 1) == 0)             \
+    PROCESS_TWOS_EVEN;
+#endif
+
+/* Process one bit arithmetically, then a simple loop.  This cuts the loop
+   condition down to a 25/75 chance, which should branch predict better.
+   The CPU will need a reasonable variable left shift.  */
+#if JACOBI_BASE_METHOD == 3
+#define PROCESS_TWOS_EVEN               \
+  {                                     \
+    int  two, mask, shift;              \
+					\
+    two = JACOBI_TWO_U_BIT1 (b);        \
+    mask = (~a & 2);                    \
+    a >>= 1;                            \
+					\
+    shift = (~a & 1);                   \
+    a >>= shift;                        \
+    result_bit1 ^= two ^ (two & mask);  \
+					\
+    while ((a & 1) == 0)                \
+      {                                 \
+	a >>= 1;                        \
+	result_bit1 ^= two;             \
+	ASSERT (a != 0);                \
+      }                                 \
+  }
+#define PROCESS_TWOS_ANY                \
+  {                                     \
+    int  two, mask, shift;              \
+					\
+    two = JACOBI_TWO_U_BIT1 (b);        \
+    shift = (~a & 1);                   \
+    a >>= shift;                        \
+					\
+    mask = shift << 1;                  \
+    result_bit1 ^= (two & mask);        \
+					\
+    while ((a & 1) == 0)                \
+      {                                 \
+	a >>= 1;                        \
+	result_bit1 ^= two;             \
+	ASSERT (a != 0);                \
+      }                                 \
+  }
+#endif
+
+#if JACOBI_BASE_METHOD < 4
+/* Calculate the value of the Jacobi symbol (a/b) of two mp_limb_t's, but
+   with a restricted range of inputs accepted, namely b>1, b odd.
+
+   The initial result_bit1 is taken as a parameter for the convenience of
+   mpz_kronecker_ui() et al.  The sign changes both here and in those
+   routines accumulate nicely in bit 1, see the JACOBI macros.
+
+   The return value here is the normal +1, 0, or -1.  Note that +1 and -1
+   have bit 1 in the "BIT1" sense, which could be useful if the caller is
+   accumulating it into some extended calculation.
+
+   Duplicating the loop body to avoid the MP_LIMB_T_SWAP(a,b) would be
+   possible, but a couple of tests suggest it's not a significant speedup,
+   and may even be a slowdown, so what's here is good enough for now. */
+
+int
+mpn_jacobi_base (mp_limb_t a, mp_limb_t b, int result_bit1)
+{
+  ASSERT (b & 1);  /* b odd */
+  ASSERT (b != 1);
+
+  if (a == 0)
+    return 0;
+
+  PROCESS_TWOS_ANY;
+  if (a == 1)
+    goto done;
+
+  if (a >= b)
+    goto a_gt_b;
+
+  for (;;)
+    {
+      result_bit1 ^= JACOBI_RECIP_UU_BIT1 (a, b);
+      MP_LIMB_T_SWAP (a, b);
+
+    a_gt_b:
+      do
+	{
+	  /* working on (a/b), a,b odd, a>=b */
+	  ASSERT (a & 1);
+	  ASSERT (b & 1);
+	  ASSERT (a >= b);
+
+	  if ((a -= b) == 0)
+	    return 0;
+
+	  PROCESS_TWOS_EVEN;
+	  if (a == 1)
+	    goto done;
+	}
+      while (a >= b);
+    }
+
+ done:
+  return JACOBI_BIT1_TO_PN (result_bit1);
+}
+#endif
+
+#if JACOBI_BASE_METHOD == 4
+/* Computes (a/b) for odd b > 1 and any a. The initial bit is taken as a
+ * parameter. We have no need for the convention that the sign is in
+ * bit 1, internally we use bit 0. */
+
+/* FIXME: Could try table-based count_trailing_zeros. */
+int
+mpn_jacobi_base (mp_limb_t a, mp_limb_t b, int bit)
+{
+  int c;
+
+  ASSERT (b & 1);
+  ASSERT (b > 1);
+
+  if (a == 0)
+    /* This is the only line which depends on b > 1 */
+    return 0;
+
+  bit >>= 1;
+
+  /* Below, we represent a and b shifted right so that the least
+     significant one bit is implicit. */
+
+  b >>= 1;
+
+  count_trailing_zeros (c, a);
+  bit ^= c & (b ^ (b >> 1));
+
+  /* We may have c==GMP_LIMB_BITS-1, so we can't use a>>c+1. */
+  a >>= c;
+  a >>= 1;
+
+  do
+    {
+      mp_limb_t t = a - b;
+      mp_limb_t bgta = LIMB_HIGHBIT_TO_MASK (t);
+
+      if (t == 0)
+	return 0;
+
+      /* If b > a, invoke reciprocity */
+      bit ^= (bgta & a & b);
+
+      /* b <-- min (a, b) */
+      b += (bgta & t);
+
+      /* a <-- |a - b| */
+      a = (t ^ bgta) - bgta;
+
+      /* Number of trailing zeros is the same no matter if we look at
+       * t or a, but using t gives more parallelism. */
+      count_trailing_zeros (c, t);
+      c ++;
+      /* (2/b) = -1 if b = 3 or 5 mod 8 */
+      bit ^= c & (b ^ (b >> 1));
+      a >>= c;
+    }
+  while (b > 0);
+
+  return 1-2*(bit & 1);
+}
+#endif /* JACOBI_BASE_METHOD == 4 */
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi.c
deleted file mode 120000
index 293d08ae4..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/jacobi.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi.c
new file mode 100644
index 000000000..d98b12604
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi.c
@@ -0,0 +1,294 @@
+/* jacobi.c
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 1996, 1998, 2000-2004, 2008, 2010, 2011 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#ifndef JACOBI_DC_THRESHOLD
+#define JACOBI_DC_THRESHOLD GCD_DC_THRESHOLD
+#endif
+
+/* Schönhage's rules:
+ *
+ * Assume r0 = r1 q1 + r2, with r0 odd, and r1 = q2 r2 + r3
+ *
+ * If r1 is odd, then
+ *
+ *   (r1 | r0) = s(r1, r0) (r0 | r1) = s(r1, r0) (r2, r1)
+ *
+ * where s(x,y) = (-1)^{(x-1)(y-1)/4} = (-1)^[x = y = 3 (mod 4)].
+ *
+ * If r1 is even, r2 must be odd. We have
+ *
+ *   (r1 | r0) = (r1 - r0 | r0) = (-1)^(r0-1)/2 (r0 - r1 | r0)
+ *             = (-1)^(r0-1)/2 s(r0, r0 - r1) (r0 | r0 - r1)
+ *             = (-1)^(r0-1)/2 s(r0, r0 - r1) (r1 | r0 - r1)
+ *
+ * Now, if r1 = 0 (mod 4), then the sign factor is +1, and repeating
+ * q1 times gives
+ *
+ *   (r1 | r0) = (r1 | r2) = (r3 | r2)
+ *
+ * On the other hand, if r1 = 2 (mod 4), the sign factor is
+ * (-1)^{(r0-1)/2}, and repeating q1 times gives the exponent
+ *
+ *   (r0-1)/2 + (r0-r1-1)/2 + ... + (r0 - (q1-1) r1)/2
+ *   = q1 (r0-1)/2 + q1 (q1-1)/2
+ *
+ * and we can summarize the even case as
+ *
+ *   (r1 | r0) = t(r1, r0, q1) (r3 | r2)
+ *
+ * where t(x,y,q) = (-1)^{[x = 2 (mod 4)] (q(y-1)/2 + y(q-1)/2)}
+ *
+ * What about termination? The remainder sequence ends with (0|1) = 1
+ * (or (0 | r) = 0 if r != 1). What are the possible cases? If r1 is
+ * odd, r2 may be zero. If r1 is even, then r2 = r0 - q1 r1 is odd and
+ * hence non-zero. We may have r3 = r1 - q2 r2 = 0.
+ *
+ * Examples: (11|15) = - (15|11) = - (4|11)
+ *            (4|11) =    (4| 3) =   (1| 3)
+ *            (1| 3) = (3|1) = (0|1) = 1
+ *
+ *             (2|7) = (2|1) = (0|1) = 1
+ *
+ * Detail:     (2|7) = (2-7|7) = (-1|7)(5|7) = -(7|5) = -(2|5)
+ *             (2|5) = (2-5|5) = (-1|5)(3|5) =  (5|3) =  (2|3)
+ *             (2|3) = (2-3|3) = (-1|3)(1|3) = -(3|1) = -(2|1)
+ *
+ */
+
+/* In principle, the state consists of four variables: e (one bit), a,
+   b (two bits each), d (one bit). Collected factors are (-1)^e. a and
+   b are the least significant bits of the current remainders. d
+   (denominator) is 0 if we're currently subtracting multiplies of a
+   from b, and 1 if we're subtracting b from a.
+
+   e is stored in the least significant bit, while a, b and d are
+   coded as only 13 distinct values in bits 1-4, according to the
+   following table. For rows not mentioning d, the value is either
+   implied, or it doesn't matter. */
+
+#if WANT_ASSERT
+static const struct
+{
+  unsigned char a;
+  unsigned char b;
+} decode_table[13] = {
+  /*  0 */ { 0, 1 },
+  /*  1 */ { 0, 3 },
+  /*  2 */ { 1, 1 },
+  /*  3 */ { 1, 3 },
+  /*  4 */ { 2, 1 },
+  /*  5 */ { 2, 3 },
+  /*  6 */ { 3, 1 },
+  /*  7 */ { 3, 3 }, /* d = 1 */
+  /*  8 */ { 1, 0 },
+  /*  9 */ { 1, 2 },
+  /* 10 */ { 3, 0 },
+  /* 11 */ { 3, 2 },
+  /* 12 */ { 3, 3 }, /* d = 0 */
+};
+#define JACOBI_A(bits) (decode_table[(bits)>>1].a)
+#define JACOBI_B(bits) (decode_table[(bits)>>1].b)
+#endif /* WANT_ASSERT */
+
+const unsigned char jacobi_table[208] = {
+#include "jacobitab.h"
+};
+
+#define BITS_FAIL 31
+
+static void
+jacobi_hook (void *p, mp_srcptr gp, mp_size_t gn,
+	     mp_srcptr qp, mp_size_t qn, int d)
+{
+  unsigned *bitsp = (unsigned *) p;
+
+  if (gp)
+    {
+      ASSERT (gn > 0);
+      if (gn != 1 || gp[0] != 1)
+	{
+	  *bitsp = BITS_FAIL;
+	  return;
+	}
+    }
+
+  if (qp)
+    {
+      ASSERT (qn > 0);
+      ASSERT (d >= 0);
+      *bitsp = mpn_jacobi_update (*bitsp, d, qp[0] & 3);
+    }
+}
+
+#define CHOOSE_P(n) (2*(n) / 3)
+
+int
+mpn_jacobi_n (mp_ptr ap, mp_ptr bp, mp_size_t n, unsigned bits)
+{
+  mp_size_t scratch;
+  mp_size_t matrix_scratch;
+  mp_ptr tp;
+
+  TMP_DECL;
+
+  ASSERT (n > 0);
+  ASSERT ( (ap[n-1] | bp[n-1]) > 0);
+  ASSERT ( (bp[0] | ap[0]) & 1);
+
+  /* FIXME: Check for small sizes first, before setting up temporary
+     storage etc. */
+  scratch = MPN_GCD_SUBDIV_STEP_ITCH(n);
+
+  if (ABOVE_THRESHOLD (n, JACOBI_DC_THRESHOLD))
+    {
+      mp_size_t hgcd_scratch;
+      mp_size_t update_scratch;
+      mp_size_t p = CHOOSE_P (n);
+      mp_size_t dc_scratch;
+
+      matrix_scratch = MPN_HGCD_MATRIX_INIT_ITCH (n - p);
+      hgcd_scratch = mpn_hgcd_itch (n - p);
+      update_scratch = p + n - 1;
+
+      dc_scratch = matrix_scratch + MAX(hgcd_scratch, update_scratch);
+      if (dc_scratch > scratch)
+	scratch = dc_scratch;
+    }
+
+  TMP_MARK;
+  tp = TMP_ALLOC_LIMBS(scratch);
+
+  while (ABOVE_THRESHOLD (n, JACOBI_DC_THRESHOLD))
+    {
+      struct hgcd_matrix M;
+      mp_size_t p = 2*n/3;
+      mp_size_t matrix_scratch = MPN_HGCD_MATRIX_INIT_ITCH (n - p);
+      mp_size_t nn;
+      mpn_hgcd_matrix_init (&M, n - p, tp);
+
+      nn = mpn_hgcd_jacobi (ap + p, bp + p, n - p, &M, &bits,
+			    tp + matrix_scratch);
+      if (nn > 0)
+	{
+	  ASSERT (M.n <= (n - p - 1)/2);
+	  ASSERT (M.n + p <= (p + n - 1) / 2);
+	  /* Temporary storage 2 (p + M->n) <= p + n - 1. */
+	  n = mpn_hgcd_matrix_adjust (&M, p + nn, ap, bp, p, tp + matrix_scratch);
+	}
+      else
+	{
+	  /* Temporary storage n */
+	  n = mpn_gcd_subdiv_step (ap, bp, n, 0, jacobi_hook, &bits, tp);
+	  if (!n)
+	    {
+	      TMP_FREE;
+	      return bits == BITS_FAIL ? 0 : mpn_jacobi_finish (bits);
+	    }
+	}
+    }
+
+  while (n > 2)
+    {
+      struct hgcd_matrix1 M;
+      mp_limb_t ah, al, bh, bl;
+      mp_limb_t mask;
+
+      mask = ap[n-1] | bp[n-1];
+      ASSERT (mask > 0);
+
+      if (mask & GMP_NUMB_HIGHBIT)
+	{
+	  ah = ap[n-1]; al = ap[n-2];
+	  bh = bp[n-1]; bl = bp[n-2];
+	}
+      else
+	{
+	  int shift;
+
+	  count_leading_zeros (shift, mask);
+	  ah = MPN_EXTRACT_NUMB (shift, ap[n-1], ap[n-2]);
+	  al = MPN_EXTRACT_NUMB (shift, ap[n-2], ap[n-3]);
+	  bh = MPN_EXTRACT_NUMB (shift, bp[n-1], bp[n-2]);
+	  bl = MPN_EXTRACT_NUMB (shift, bp[n-2], bp[n-3]);
+	}
+
+      /* Try an mpn_nhgcd2 step */
+      if (mpn_hgcd2_jacobi (ah, al, bh, bl, &M, &bits))
+	{
+	  n = mpn_matrix22_mul1_inverse_vector (&M, tp, ap, bp, n);
+	  MP_PTR_SWAP (ap, tp);
+	}
+      else
+	{
+	  /* mpn_hgcd2 has failed. Then either one of a or b is very
+	     small, or the difference is very small. Perform one
+	     subtraction followed by one division. */
+	  n = mpn_gcd_subdiv_step (ap, bp, n, 0, &jacobi_hook, &bits, tp);
+	  if (!n)
+	    {
+	      TMP_FREE;
+	      return bits == BITS_FAIL ? 0 : mpn_jacobi_finish (bits);
+	    }
+	}
+    }
+
+  if (bits >= 16)
+    MP_PTR_SWAP (ap, bp);
+
+  ASSERT (bp[0] & 1);
+
+  if (n == 1)
+    {
+      mp_limb_t al, bl;
+      al = ap[0];
+      bl = bp[0];
+
+      TMP_FREE;
+      if (bl == 1)
+	return 1 - 2*(bits & 1);
+      else
+	return mpn_jacobi_base (al, bl, bits << 1);
+    }
+
+  else
+    {
+      int res = mpn_jacobi_2 (ap, bp, bits & 1);
+      TMP_FREE;
+      return res;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi_2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi_2.c
deleted file mode 120000
index 5a39ad84f..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi_2.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/jacobi_2.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi_2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi_2.c
new file mode 100644
index 000000000..028b8a414
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/jacobi_2.c
@@ -0,0 +1,351 @@
+/* jacobi_2.c
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 1996, 1998, 2000-2004, 2008, 2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#ifndef JACOBI_2_METHOD
+#define JACOBI_2_METHOD 2
+#endif
+
+/* Computes (a / b) where b is odd, and a and b are otherwise arbitrary
+   two-limb numbers. */
+#if JACOBI_2_METHOD == 1
+int
+mpn_jacobi_2 (mp_srcptr ap, mp_srcptr bp, unsigned bit)
+{
+  mp_limb_t ah, al, bh, bl;
+  int c;
+
+  al = ap[0];
+  ah = ap[1];
+  bl = bp[0];
+  bh = bp[1];
+
+  ASSERT (bl & 1);
+
+  bl = ((bh << (GMP_NUMB_BITS - 1)) & GMP_NUMB_MASK) | (bl >> 1);
+  bh >>= 1;
+
+  if ( (bh | bl) == 0)
+    return 1 - 2*(bit & 1);
+
+  if ( (ah | al) == 0)
+    return 0;
+
+  if (al == 0)
+    {
+      al = ah;
+      ah = 0;
+      bit ^= GMP_NUMB_BITS & (bl ^ (bl >> 1));
+    }
+  count_trailing_zeros (c, al);
+  bit ^= c & (bl ^ (bl >> 1));
+
+  c++;
+  if (UNLIKELY (c == GMP_NUMB_BITS))
+    {
+      al = ah;
+      ah = 0;
+    }
+  else
+    {
+      al = ((ah << (GMP_NUMB_BITS - c)) & GMP_NUMB_MASK) | (al >> c);
+      ah >>= c;
+    }
+  while ( (ah | bh) > 0)
+    {
+      mp_limb_t th, tl;
+      mp_limb_t bgta;
+
+      sub_ddmmss (th, tl, ah, al, bh, bl);
+      if ( (tl | th) == 0)
+	return 0;
+
+      bgta = LIMB_HIGHBIT_TO_MASK (th);
+
+      /* If b > a, invoke reciprocity */
+      bit ^= (bgta & al & bl);
+
+      /* b <-- min (a, b) */
+      add_ssaaaa (bh, bl, bh, bl, th & bgta, tl & bgta);
+
+      if ( (bh | bl) == 0)
+	return 1 - 2*(bit & 1);
+
+      /* a <-- |a - b| */
+      al = (bgta ^ tl) - bgta;
+      ah = (bgta ^ th);
+
+      if (UNLIKELY (al == 0))
+	{
+	  /* If b > a, al == 0 implies that we have a carry to
+	     propagate. */
+	  al = ah - bgta;
+	  ah = 0;
+	  bit ^= GMP_NUMB_BITS & (bl ^ (bl >> 1));
+	}
+      count_trailing_zeros (c, al);
+      c++;
+      bit ^= c & (bl ^ (bl >> 1));
+
+      if (UNLIKELY (c == GMP_NUMB_BITS))
+	{
+	  al = ah;
+	  ah = 0;
+	}
+      else
+	{
+	  al = ((ah << (GMP_NUMB_BITS - c)) & GMP_NUMB_MASK) | (al >> c);
+	  ah >>= c;
+	}
+    }
+
+  ASSERT (bl > 0);
+
+  while ( (al | bl) & GMP_LIMB_HIGHBIT)
+    {
+      /* Need an extra comparison to get the mask. */
+      mp_limb_t t = al - bl;
+      mp_limb_t bgta = - (bl > al);
+
+      if (t == 0)
+	return 0;
+
+      /* If b > a, invoke reciprocity */
+      bit ^= (bgta & al & bl);
+
+      /* b <-- min (a, b) */
+      bl += (bgta & t);
+
+      /* a <-- |a - b| */
+      al = (t ^ bgta) - bgta;
+
+      /* Number of trailing zeros is the same no matter if we look at
+       * t or a, but using t gives more parallelism. */
+      count_trailing_zeros (c, t);
+      c ++;
+      /* (2/b) = -1 if b = 3 or 5 mod 8 */
+      bit ^= c & (bl ^ (bl >> 1));
+
+      if (UNLIKELY (c == GMP_NUMB_BITS))
+	return 1 - 2*(bit & 1);
+
+      al >>= c;
+    }
+
+  /* Here we have a little impedance mismatch. Better to inline it? */
+  return mpn_jacobi_base (2*al+1, 2*bl+1, bit << 1);
+}
+#elif JACOBI_2_METHOD == 2
+int
+mpn_jacobi_2 (mp_srcptr ap, mp_srcptr bp, unsigned bit)
+{
+  mp_limb_t ah, al, bh, bl;
+  int c;
+
+  al = ap[0];
+  ah = ap[1];
+  bl = bp[0];
+  bh = bp[1];
+
+  ASSERT (bl & 1);
+
+  /* Use bit 1. */
+  bit <<= 1;
+
+  if (bh == 0 && bl == 1)
+    /* (a|1) = 1 */
+    return 1 - (bit & 2);
+
+  if (al == 0)
+    {
+      if (ah == 0)
+	/* (0|b) = 0, b > 1 */
+	return 0;
+
+      count_trailing_zeros (c, ah);
+      bit ^= ((GMP_NUMB_BITS + c) << 1) & (bl ^ (bl >> 1));
+
+      al = bl;
+      bl = ah >> c;
+
+      if (bl == 1)
+	/* (1|b) = 1 */
+	return 1 - (bit & 2);
+
+      ah = bh;
+
+      bit ^= al & bl;
+
+      goto b_reduced;
+    }
+  if ( (al & 1) == 0)
+    {
+      count_trailing_zeros (c, al);
+
+      al = ((ah << (GMP_NUMB_BITS - c)) & GMP_NUMB_MASK) | (al >> c);
+      ah >>= c;
+      bit ^= (c << 1) & (bl ^ (bl >> 1));
+    }
+  if (ah == 0)
+    {
+      if (bh > 0)
+	{
+	  bit ^= al & bl;
+	  MP_LIMB_T_SWAP (al, bl);
+	  ah = bh;
+	  goto b_reduced;
+	}
+      goto ab_reduced;
+    }
+
+  while (bh > 0)
+    {
+      /* Compute (a|b) */
+      while (ah > bh)
+	{
+	  sub_ddmmss (ah, al, ah, al, bh, bl);
+	  if (al == 0)
+	    {
+	      count_trailing_zeros (c, ah);
+	      bit ^= ((GMP_NUMB_BITS + c) << 1) & (bl ^ (bl >> 1));
+
+	      al = bl;
+	      bl = ah >> c;
+	      ah = bh;
+
+	      bit ^= al & bl;
+	      goto b_reduced;
+	    }
+	  count_trailing_zeros (c, al);
+	  bit ^= (c << 1) & (bl ^ (bl >> 1));
+	  al = ((ah << (GMP_NUMB_BITS - c)) & GMP_NUMB_MASK) | (al >> c);
+	  ah >>= c;
+	}
+      if (ah == bh)
+	goto cancel_hi;
+
+      if (ah == 0)
+	{
+	  bit ^= al & bl;
+	  MP_LIMB_T_SWAP (al, bl);
+	  ah = bh;
+	  break;
+	}
+
+      bit ^= al & bl;
+
+      /* Compute (b|a) */
+      while (bh > ah)
+	{
+	  sub_ddmmss (bh, bl, bh, bl, ah, al);
+	  if (bl == 0)
+	    {
+	      count_trailing_zeros (c, bh);
+	      bit ^= ((GMP_NUMB_BITS + c) << 1) & (al ^ (al >> 1));
+
+	      bl = bh >> c;
+	      bit ^= al & bl;
+	      goto b_reduced;
+	    }
+	  count_trailing_zeros (c, bl);
+	  bit ^= (c << 1) & (al ^ (al >> 1));
+	  bl = ((bh << (GMP_NUMB_BITS - c)) & GMP_NUMB_MASK) | (bl >> c);
+	  bh >>= c;
+	}
+      bit ^= al & bl;
+
+      /* Compute (a|b) */
+      if (ah == bh)
+	{
+	cancel_hi:
+	  if (al < bl)
+	    {
+	      MP_LIMB_T_SWAP (al, bl);
+	      bit ^= al & bl;
+	    }
+	  al -= bl;
+	  if (al == 0)
+	    return 0;
+
+	  count_trailing_zeros (c, al);
+	  bit ^= (c << 1) & (bl ^ (bl >> 1));
+	  al >>= c;
+
+	  if (al == 1)
+	    return 1 - (bit & 2);
+
+	  MP_LIMB_T_SWAP (al, bl);
+	  bit ^= al & bl;
+	  break;
+	}
+    }
+
+ b_reduced:
+  /* Compute (a|b), with b a single limb. */
+  ASSERT (bl & 1);
+
+  if (bl == 1)
+    /* (a|1) = 1 */
+    return 1 - (bit & 2);
+
+  while (ah > 0)
+    {
+      ah -= (al < bl);
+      al -= bl;
+      if (al == 0)
+	{
+	  if (ah == 0)
+	    return 0;
+	  count_trailing_zeros (c, ah);
+	  bit ^= ((GMP_NUMB_BITS + c) << 1) & (bl ^ (bl >> 1));
+	  al = ah >> c;
+	  goto ab_reduced;
+	}
+      count_trailing_zeros (c, al);
+
+      al = ((ah << (GMP_NUMB_BITS - c)) & GMP_NUMB_MASK) | (al >> c);
+      ah >>= c;
+      bit ^= (c << 1) & (bl ^ (bl >> 1));
+    }
+ ab_reduced:
+  ASSERT (bl & 1);
+  ASSERT (bl > 1);
+
+  return mpn_jacobi_base (al, bl, bit);
+}
+#else
+#error Unsupported value for JACOBI_2_METHOD
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/lshift.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/lshift.c
deleted file mode 120000
index 555b621ed..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/lshift.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/lshift.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/lshift.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/lshift.c
new file mode 100644
index 000000000..7e1fdefcc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/lshift.c
@@ -0,0 +1,72 @@
+/* mpn_lshift -- Shift left low level.
+
+Copyright 1991, 1993, 1994, 1996, 2000-2002 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/* Shift U (pointed to by up and n limbs long) cnt bits to the left
+   and store the n least significant limbs of the result at rp.
+   Return the bits shifted out from the most significant limb.
+
+   Argument constraints:
+   1. 0 < cnt < GMP_NUMB_BITS.
+   2. If the result is to be written over the input, rp must be >= up.
+*/
+
+mp_limb_t
+mpn_lshift (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
+{
+  mp_limb_t high_limb, low_limb;
+  unsigned int tnc;
+  mp_size_t i;
+  mp_limb_t retval;
+
+  ASSERT (n >= 1);
+  ASSERT (cnt >= 1);
+  ASSERT (cnt < GMP_NUMB_BITS);
+  ASSERT (MPN_SAME_OR_DECR_P (rp, up, n));
+
+  up += n;
+  rp += n;
+
+  tnc = GMP_NUMB_BITS - cnt;
+  low_limb = *--up;
+  retval = low_limb >> tnc;
+  high_limb = (low_limb << cnt) & GMP_NUMB_MASK;
+
+  for (i = n - 1; i != 0; i--)
+    {
+      low_limb = *--up;
+      *--rp = high_limb | (low_limb >> tnc);
+      high_limb = (low_limb << cnt) & GMP_NUMB_MASK;
+    }
+  *--rp = high_limb;
+
+  return retval;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/lshiftc.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/lshiftc.c
deleted file mode 120000
index 8ed4a6dfe..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/lshiftc.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/lshiftc.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/lshiftc.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/lshiftc.c
new file mode 100644
index 000000000..a583602ff
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/lshiftc.c
@@ -0,0 +1,73 @@
+/* mpn_lshiftc -- Shift left low level with complement.
+
+Copyright 1991, 1993, 1994, 1996, 2000-2002, 2009 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/* Shift U (pointed to by up and n limbs long) cnt bits to the left
+   and store the n least significant limbs of the result at rp.
+   Return the bits shifted out from the most significant limb.
+
+   Argument constraints:
+   1. 0 < cnt < GMP_NUMB_BITS.
+   2. If the result is to be written over the input, rp must be >= up.
+*/
+
+mp_limb_t
+mpn_lshiftc (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
+{
+  mp_limb_t high_limb, low_limb;
+  unsigned int tnc;
+  mp_size_t i;
+  mp_limb_t retval;
+
+  ASSERT (n >= 1);
+  ASSERT (cnt >= 1);
+  ASSERT (cnt < GMP_NUMB_BITS);
+  ASSERT (MPN_SAME_OR_DECR_P (rp, up, n));
+
+  up += n;
+  rp += n;
+
+  tnc = GMP_NUMB_BITS - cnt;
+  low_limb = *--up;
+  retval = low_limb >> tnc;
+  high_limb = (low_limb << cnt);
+
+  for (i = n - 1; i != 0; i--)
+    {
+      low_limb = *--up;
+      *--rp = (~(high_limb | (low_limb >> tnc))) & GMP_NUMB_MASK;
+      high_limb = low_limb << cnt;
+    }
+  *--rp = (~high_limb) & GMP_NUMB_MASK;
+
+  return retval;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul.c
deleted file mode 120000
index df363039e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/matrix22_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul.c
new file mode 100644
index 000000000..6a1299ad0
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul.c
@@ -0,0 +1,321 @@
+/* matrix22_mul.c.
+
+   Contributed by Niels Möller and Marco Bodrato.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2003-2005, 2008, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#define MUL(rp, ap, an, bp, bn) do {		\
+  if (an >= bn)					\
+    mpn_mul (rp, ap, an, bp, bn);		\
+  else						\
+    mpn_mul (rp, bp, bn, ap, an);		\
+} while (0)
+
+/* Inputs are unsigned. */
+static int
+abs_sub_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n)
+{
+  int c;
+  MPN_CMP (c, ap, bp, n);
+  if (c >= 0)
+    {
+      mpn_sub_n (rp, ap, bp, n);
+      return 0;
+    }
+  else
+    {
+      mpn_sub_n (rp, bp, ap, n);
+      return 1;
+    }
+}
+
+static int
+add_signed_n (mp_ptr rp,
+	      mp_srcptr ap, int as, mp_srcptr bp, int bs, mp_size_t n)
+{
+  if (as != bs)
+    return as ^ abs_sub_n (rp, ap, bp, n);
+  else
+    {
+      ASSERT_NOCARRY (mpn_add_n (rp, ap, bp, n));
+      return as;
+    }
+}
+
+mp_size_t
+mpn_matrix22_mul_itch (mp_size_t rn, mp_size_t mn)
+{
+  if (BELOW_THRESHOLD (rn, MATRIX22_STRASSEN_THRESHOLD)
+      || BELOW_THRESHOLD (mn, MATRIX22_STRASSEN_THRESHOLD))
+    return 3*rn + 2*mn;
+  else
+    return 3*(rn + mn) + 5;
+}
+
+/* Algorithm:
+
+    / s0 \   /  1  0  0  0 \ / r0 \
+    | s1 |   |  0  1  0  1 | | r1 |
+    | s2 |   |  0  0 -1  1 | | r2 |
+    | s3 | = |  0  1 -1  1 | \ r3 /
+    | s4 |   | -1  1 -1  1 |
+    | s5 |   |  0  1  0  0 |
+    \ s6 /   \  0  0  1  0 /
+
+    / t0 \   /  1  0  0  0 \ / m0 \
+    | t1 |   |  0  1  0  1 | | m1 |
+    | t2 |   |  0  0 -1  1 | | m2 |
+    | t3 | = |  0  1 -1  1 | \ m3 /
+    | t4 |   | -1  1 -1  1 |
+    | t5 |   |  0  1  0  0 |
+    \ t6 /   \  0  0  1  0 /
+
+  Note: the two matrices above are the same, but s_i and t_i are used
+  in the same product, only for i<4, see "A Strassen-like Matrix
+  Multiplication suited for squaring and higher power computation" by
+  M. Bodrato, in Proceedings of ISSAC 2010.
+
+    / r0 \   / 1 0  0  0  0  1  0 \ / s0*t0 \
+    | r1 | = | 0 0 -1  1 -1  1  0 | | s1*t1 |
+    | r2 |   | 0 1  0 -1  0 -1 -1 | | s2*t2 |
+    \ r3 /   \ 0 1  1 -1  0 -1  0 / | s3*t3 |
+				    | s4*t5 |
+				    | s5*t6 |
+				    \ s6*t4 /
+
+  The scheduling uses two temporaries U0 and U1 to store products, and
+  two, S0 and T0, to store combinations of entries of the two
+  operands.
+*/
+
+/* Computes R = R * M. Elements are numbers R = (r0, r1; r2, r3).
+ *
+ * Resulting elements are of size up to rn + mn + 1.
+ *
+ * Temporary storage: 3 rn + 3 mn + 5. */
+static void
+mpn_matrix22_mul_strassen (mp_ptr r0, mp_ptr r1, mp_ptr r2, mp_ptr r3, mp_size_t rn,
+			   mp_srcptr m0, mp_srcptr m1, mp_srcptr m2, mp_srcptr m3, mp_size_t mn,
+			   mp_ptr tp)
+{
+  mp_ptr s0, t0, u0, u1;
+  int r1s, r3s, s0s, t0s, u1s;
+  s0 = tp; tp += rn + 1;
+  t0 = tp; tp += mn + 1;
+  u0 = tp; tp += rn + mn + 1;
+  u1 = tp; /* rn + mn + 2 */
+
+  MUL (u0, r1, rn, m2, mn);		/* u5 = s5 * t6 */
+  r3s = abs_sub_n (r3, r3, r2, rn);	/* r3 - r2 */
+  if (r3s)
+    {
+      r1s = abs_sub_n (r1, r1, r3, rn);
+      r1[rn] = 0;
+    }
+  else
+    {
+      r1[rn] = mpn_add_n (r1, r1, r3, rn);
+      r1s = 0;				/* r1 - r2 + r3  */
+    }
+  if (r1s)
+    {
+      s0[rn] = mpn_add_n (s0, r1, r0, rn);
+      s0s = 0;
+    }
+  else if (r1[rn] != 0)
+    {
+      s0[rn] = r1[rn] - mpn_sub_n (s0, r1, r0, rn);
+      s0s = 1;				/* s4 = -r0 + r1 - r2 + r3 */
+					/* Reverse sign! */
+    }
+  else
+    {
+      s0s = abs_sub_n (s0, r0, r1, rn);
+      s0[rn] = 0;
+    }
+  MUL (u1, r0, rn, m0, mn);		/* u0 = s0 * t0 */
+  r0[rn+mn] = mpn_add_n (r0, u0, u1, rn + mn);
+  ASSERT (r0[rn+mn] < 2);		/* u0 + u5 */
+
+  t0s = abs_sub_n (t0, m3, m2, mn);
+  u1s = r3s^t0s^1;			/* Reverse sign! */
+  MUL (u1, r3, rn, t0, mn);		/* u2 = s2 * t2 */
+  u1[rn+mn] = 0;
+  if (t0s)
+    {
+      t0s = abs_sub_n (t0, m1, t0, mn);
+      t0[mn] = 0;
+    }
+  else
+    {
+      t0[mn] = mpn_add_n (t0, t0, m1, mn);
+    }
+
+  /* FIXME: Could be simplified if we had space for rn + mn + 2 limbs
+     at r3. I'd expect that for matrices of random size, the high
+     words t0[mn] and r1[rn] are non-zero with a pretty small
+     probability. If that can be confirmed this should be done as an
+     unconditional rn x (mn+1) followed by an if (UNLIKELY (r1[rn]))
+     add_n. */
+  if (t0[mn] != 0)
+    {
+      MUL (r3, r1, rn, t0, mn + 1);	/* u3 = s3 * t3 */
+      ASSERT (r1[rn] < 2);
+      if (r1[rn] != 0)
+	mpn_add_n (r3 + rn, r3 + rn, t0, mn + 1);
+    }
+  else
+    {
+      MUL (r3, r1, rn + 1, t0, mn);
+    }
+
+  ASSERT (r3[rn+mn] < 4);
+
+  u0[rn+mn] = 0;
+  if (r1s^t0s)
+    {
+      r3s = abs_sub_n (r3, u0, r3, rn + mn + 1);
+    }
+  else
+    {
+      ASSERT_NOCARRY (mpn_add_n (r3, r3, u0, rn + mn + 1));
+      r3s = 0;				/* u3 + u5 */
+    }
+
+  if (t0s)
+    {
+      t0[mn] = mpn_add_n (t0, t0, m0, mn);
+    }
+  else if (t0[mn] != 0)
+    {
+      t0[mn] -= mpn_sub_n (t0, t0, m0, mn);
+    }
+  else
+    {
+      t0s = abs_sub_n (t0, t0, m0, mn);
+    }
+  MUL (u0, r2, rn, t0, mn + 1);		/* u6 = s6 * t4 */
+  ASSERT (u0[rn+mn] < 2);
+  if (r1s)
+    {
+      ASSERT_NOCARRY (mpn_sub_n (r1, r2, r1, rn));
+    }
+  else
+    {
+      r1[rn] += mpn_add_n (r1, r1, r2, rn);
+    }
+  rn++;
+  t0s = add_signed_n (r2, r3, r3s, u0, t0s, rn + mn);
+					/* u3 + u5 + u6 */
+  ASSERT (r2[rn+mn-1] < 4);
+  r3s = add_signed_n (r3, r3, r3s, u1, u1s, rn + mn);
+					/* -u2 + u3 + u5  */
+  ASSERT (r3[rn+mn-1] < 3);
+  MUL (u0, s0, rn, m1, mn);		/* u4 = s4 * t5 */
+  ASSERT (u0[rn+mn-1] < 2);
+  t0[mn] = mpn_add_n (t0, m3, m1, mn);
+  MUL (u1, r1, rn, t0, mn + 1);		/* u1 = s1 * t1 */
+  mn += rn;
+  ASSERT (u1[mn-1] < 4);
+  ASSERT (u1[mn] == 0);
+  ASSERT_NOCARRY (add_signed_n (r1, r3, r3s, u0, s0s, mn));
+					/* -u2 + u3 - u4 + u5  */
+  ASSERT (r1[mn-1] < 2);
+  if (r3s)
+    {
+      ASSERT_NOCARRY (mpn_add_n (r3, u1, r3, mn));
+    }
+  else
+    {
+      ASSERT_NOCARRY (mpn_sub_n (r3, u1, r3, mn));
+					/* u1 + u2 - u3 - u5  */
+    }
+  ASSERT (r3[mn-1] < 2);
+  if (t0s)
+    {
+      ASSERT_NOCARRY (mpn_add_n (r2, u1, r2, mn));
+    }
+  else
+    {
+      ASSERT_NOCARRY (mpn_sub_n (r2, u1, r2, mn));
+					/* u1 - u3 - u5 - u6  */
+    }
+  ASSERT (r2[mn-1] < 2);
+}
+
+void
+mpn_matrix22_mul (mp_ptr r0, mp_ptr r1, mp_ptr r2, mp_ptr r3, mp_size_t rn,
+		  mp_srcptr m0, mp_srcptr m1, mp_srcptr m2, mp_srcptr m3, mp_size_t mn,
+		  mp_ptr tp)
+{
+  if (BELOW_THRESHOLD (rn, MATRIX22_STRASSEN_THRESHOLD)
+      || BELOW_THRESHOLD (mn, MATRIX22_STRASSEN_THRESHOLD))
+    {
+      mp_ptr p0, p1;
+      unsigned i;
+
+      /* Temporary storage: 3 rn + 2 mn */
+      p0 = tp + rn;
+      p1 = p0 + rn + mn;
+
+      for (i = 0; i < 2; i++)
+	{
+	  MPN_COPY (tp, r0, rn);
+
+	  if (rn >= mn)
+	    {
+	      mpn_mul (p0, r0, rn, m0, mn);
+	      mpn_mul (p1, r1, rn, m3, mn);
+	      mpn_mul (r0, r1, rn, m2, mn);
+	      mpn_mul (r1, tp, rn, m1, mn);
+	    }
+	  else
+	    {
+	      mpn_mul (p0, m0, mn, r0, rn);
+	      mpn_mul (p1, m3, mn, r1, rn);
+	      mpn_mul (r0, m2, mn, r1, rn);
+	      mpn_mul (r1, m1, mn, tp, rn);
+	    }
+	  r0[rn+mn] = mpn_add_n (r0, r0, p0, rn + mn);
+	  r1[rn+mn] = mpn_add_n (r1, r1, p1, rn + mn);
+
+	  r0 = r2; r1 = r3;
+	}
+    }
+  else
+    mpn_matrix22_mul_strassen (r0, r1, r2, r3, rn,
+			       m0, m1, m2, m3, mn, tp);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul1_inverse_vector.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul1_inverse_vector.c
deleted file mode 120000
index 225610be5..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul1_inverse_vector.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/matrix22_mul1_inverse_vector.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul1_inverse_vector.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul1_inverse_vector.c
new file mode 100644
index 000000000..68d50b778
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/matrix22_mul1_inverse_vector.c
@@ -0,0 +1,64 @@
+/* matrix22_mul1_inverse_vector.c
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2008, 2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Sets (r;b) = M^{-1}(a;b), with M^{-1} = (u11, -u01; -u10, u00) from
+   the left. Uses three buffers, to avoid a copy. */
+mp_size_t
+mpn_matrix22_mul1_inverse_vector (const struct hgcd_matrix1 *M,
+				  mp_ptr rp, mp_srcptr ap, mp_ptr bp, mp_size_t n)
+{
+  mp_limb_t h0, h1;
+
+  /* Compute (r;b) <-- (u11 a - u01 b; -u10 a + u00 b) as
+
+     r  = u11 * a
+     r -= u01 * b
+     b *= u00
+     b -= u10 * a
+  */
+
+  h0 =    mpn_mul_1 (rp, ap, n, M->u[1][1]);
+  h1 = mpn_submul_1 (rp, bp, n, M->u[0][1]);
+  ASSERT (h0 == h1);
+
+  h0 =    mpn_mul_1 (bp, bp, n, M->u[0][0]);
+  h1 = mpn_submul_1 (bp, ap, n, M->u[1][0]);
+  ASSERT (h0 == h1);
+
+  n -= (rp[n-1] | bp[n-1]) == 0;
+  return n;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1.c
deleted file mode 120000
index de3e5a1a4..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mod_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1.c
new file mode 100644
index 000000000..8e415df33
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1.c
@@ -0,0 +1,280 @@
+/* mpn_mod_1(dividend_ptr, dividend_size, divisor_limb) --
+   Divide (DIVIDEND_PTR,,DIVIDEND_SIZE) by DIVISOR_LIMB.
+   Return the single-limb remainder.
+   There are no constraints on the value of the divisor.
+
+Copyright 1991, 1993, 1994, 1999, 2000, 2002, 2007-2009, 2012 Free Software
+Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+/* The size where udiv_qrnnd_preinv should be used rather than udiv_qrnnd,
+   meaning the quotient size where that should happen, the quotient size
+   being how many udiv divisions will be done.
+
+   The default is to use preinv always, CPUs where this doesn't suit have
+   tuned thresholds.  Note in particular that preinv should certainly be
+   used if that's the only division available (USE_PREINV_ALWAYS).  */
+
+#ifndef MOD_1_NORM_THRESHOLD
+#define MOD_1_NORM_THRESHOLD  0
+#endif
+
+#ifndef MOD_1_UNNORM_THRESHOLD
+#define MOD_1_UNNORM_THRESHOLD  0
+#endif
+
+#ifndef MOD_1U_TO_MOD_1_1_THRESHOLD
+#define MOD_1U_TO_MOD_1_1_THRESHOLD  MP_SIZE_T_MAX /* default is not to use mpn_mod_1s */
+#endif
+
+#ifndef MOD_1N_TO_MOD_1_1_THRESHOLD
+#define MOD_1N_TO_MOD_1_1_THRESHOLD  MP_SIZE_T_MAX /* default is not to use mpn_mod_1s */
+#endif
+
+#ifndef MOD_1_1_TO_MOD_1_2_THRESHOLD
+#define MOD_1_1_TO_MOD_1_2_THRESHOLD  10
+#endif
+
+#ifndef MOD_1_2_TO_MOD_1_4_THRESHOLD
+#define MOD_1_2_TO_MOD_1_4_THRESHOLD  20
+#endif
+
+#if TUNE_PROGRAM_BUILD && !HAVE_NATIVE_mpn_mod_1_1p
+/* Duplicates declarations in tune/speed.h */
+mp_limb_t mpn_mod_1_1p_1 (mp_srcptr, mp_size_t, mp_limb_t, mp_limb_t [4]);
+mp_limb_t mpn_mod_1_1p_2 (mp_srcptr, mp_size_t, mp_limb_t, mp_limb_t [4]);
+
+void mpn_mod_1_1p_cps_1 (mp_limb_t [4], mp_limb_t);
+void mpn_mod_1_1p_cps_2 (mp_limb_t [4], mp_limb_t);
+
+#undef mpn_mod_1_1p
+#define mpn_mod_1_1p(ap, n, b, pre)			     \
+  (mod_1_1p_method == 1 ? mpn_mod_1_1p_1 (ap, n, b, pre)     \
+   : (mod_1_1p_method == 2 ? mpn_mod_1_1p_2 (ap, n, b, pre)  \
+      : __gmpn_mod_1_1p (ap, n, b, pre)))
+
+#undef mpn_mod_1_1p_cps
+#define mpn_mod_1_1p_cps(pre, b)				\
+  (mod_1_1p_method == 1 ? mpn_mod_1_1p_cps_1 (pre, b)		\
+   : (mod_1_1p_method == 2 ? mpn_mod_1_1p_cps_2 (pre, b)	\
+      : __gmpn_mod_1_1p_cps (pre, b)))
+#endif /* TUNE_PROGRAM_BUILD && !HAVE_NATIVE_mpn_mod_1_1p */
+
+
+/* The comments in mpn/generic/divrem_1.c apply here too.
+
+   As noted in the algorithms section of the manual, the shifts in the loop
+   for the unnorm case can be avoided by calculating r = a%(d*2^n), followed
+   by a final (r*2^n)%(d*2^n).  In fact if it happens that a%(d*2^n) can
+   skip a division where (a*2^n)%(d*2^n) can't then there's the same number
+   of divide steps, though how often that happens depends on the assumed
+   distributions of dividend and divisor.  In any case this idea is left to
+   CPU specific implementations to consider.  */
+
+static mp_limb_t
+mpn_mod_1_unnorm (mp_srcptr up, mp_size_t un, mp_limb_t d)
+{
+  mp_size_t  i;
+  mp_limb_t  n1, n0, r;
+  mp_limb_t  dummy;
+  int cnt;
+
+  ASSERT (un > 0);
+  ASSERT (d != 0);
+
+  d <<= GMP_NAIL_BITS;
+
+  /* Skip a division if high < divisor.  Having the test here before
+     normalizing will still skip as often as possible.  */
+  r = up[un - 1] << GMP_NAIL_BITS;
+  if (r < d)
+    {
+      r >>= GMP_NAIL_BITS;
+      un--;
+      if (un == 0)
+	return r;
+    }
+  else
+    r = 0;
+
+  /* If udiv_qrnnd doesn't need a normalized divisor, can use the simple
+     code above. */
+  if (! UDIV_NEEDS_NORMALIZATION
+      && BELOW_THRESHOLD (un, MOD_1_UNNORM_THRESHOLD))
+    {
+      for (i = un - 1; i >= 0; i--)
+	{
+	  n0 = up[i] << GMP_NAIL_BITS;
+	  udiv_qrnnd (dummy, r, r, n0, d);
+	  r >>= GMP_NAIL_BITS;
+	}
+      return r;
+    }
+
+  count_leading_zeros (cnt, d);
+  d <<= cnt;
+
+  n1 = up[un - 1] << GMP_NAIL_BITS;
+  r = (r << cnt) | (n1 >> (GMP_LIMB_BITS - cnt));
+
+  if (UDIV_NEEDS_NORMALIZATION
+      && BELOW_THRESHOLD (un, MOD_1_UNNORM_THRESHOLD))
+    {
+      mp_limb_t nshift;
+      for (i = un - 2; i >= 0; i--)
+	{
+	  n0 = up[i] << GMP_NAIL_BITS;
+	  nshift = (n1 << cnt) | (n0 >> (GMP_NUMB_BITS - cnt));
+	  udiv_qrnnd (dummy, r, r, nshift, d);
+	  r >>= GMP_NAIL_BITS;
+	  n1 = n0;
+	}
+      udiv_qrnnd (dummy, r, r, n1 << cnt, d);
+      r >>= GMP_NAIL_BITS;
+      return r >> cnt;
+    }
+  else
+    {
+      mp_limb_t inv, nshift;
+      invert_limb (inv, d);
+
+      for (i = un - 2; i >= 0; i--)
+	{
+	  n0 = up[i] << GMP_NAIL_BITS;
+	  nshift = (n1 << cnt) | (n0 >> (GMP_NUMB_BITS - cnt));
+	  udiv_rnnd_preinv (r, r, nshift, d, inv);
+	  r >>= GMP_NAIL_BITS;
+	  n1 = n0;
+	}
+      udiv_rnnd_preinv (r, r, n1 << cnt, d, inv);
+      r >>= GMP_NAIL_BITS;
+      return r >> cnt;
+    }
+}
+
+static mp_limb_t
+mpn_mod_1_norm (mp_srcptr up, mp_size_t un, mp_limb_t d)
+{
+  mp_size_t  i;
+  mp_limb_t  n0, r;
+  mp_limb_t  dummy;
+
+  ASSERT (un > 0);
+
+  d <<= GMP_NAIL_BITS;
+
+  ASSERT (d & GMP_LIMB_HIGHBIT);
+
+  /* High limb is initial remainder, possibly with one subtract of
+     d to get r<d.  */
+  r = up[un - 1] << GMP_NAIL_BITS;
+  if (r >= d)
+    r -= d;
+  r >>= GMP_NAIL_BITS;
+  un--;
+  if (un == 0)
+    return r;
+
+  if (BELOW_THRESHOLD (un, MOD_1_NORM_THRESHOLD))
+    {
+      for (i = un - 1; i >= 0; i--)
+	{
+	  n0 = up[i] << GMP_NAIL_BITS;
+	  udiv_qrnnd (dummy, r, r, n0, d);
+	  r >>= GMP_NAIL_BITS;
+	}
+      return r;
+    }
+  else
+    {
+      mp_limb_t  inv;
+      invert_limb (inv, d);
+      for (i = un - 1; i >= 0; i--)
+	{
+	  n0 = up[i] << GMP_NAIL_BITS;
+	  udiv_rnnd_preinv (r, r, n0, d, inv);
+	  r >>= GMP_NAIL_BITS;
+	}
+      return r;
+    }
+}
+
+mp_limb_t
+mpn_mod_1 (mp_srcptr ap, mp_size_t n, mp_limb_t b)
+{
+  ASSERT (n >= 0);
+  ASSERT (b != 0);
+
+  /* Should this be handled at all?  Rely on callers?  Note un==0 is currently
+     required by mpz/fdiv_r_ui.c and possibly other places.  */
+  if (n == 0)
+    return 0;
+
+  if (UNLIKELY ((b & GMP_NUMB_HIGHBIT) != 0))
+    {
+      if (BELOW_THRESHOLD (n, MOD_1N_TO_MOD_1_1_THRESHOLD))
+	{
+	  return mpn_mod_1_norm (ap, n, b);
+	}
+      else
+	{
+	  mp_limb_t pre[4];
+	  mpn_mod_1_1p_cps (pre, b);
+	  return mpn_mod_1_1p (ap, n, b, pre);
+	}
+    }
+  else
+    {
+      if (BELOW_THRESHOLD (n, MOD_1U_TO_MOD_1_1_THRESHOLD))
+	{
+	  return mpn_mod_1_unnorm (ap, n, b);
+	}
+      else if (BELOW_THRESHOLD (n, MOD_1_1_TO_MOD_1_2_THRESHOLD))
+	{
+	  mp_limb_t pre[4];
+	  mpn_mod_1_1p_cps (pre, b);
+	  return mpn_mod_1_1p (ap, n, b << pre[1], pre);
+	}
+      else if (BELOW_THRESHOLD (n, MOD_1_2_TO_MOD_1_4_THRESHOLD) || UNLIKELY (b > GMP_NUMB_MASK / 4))
+	{
+	  mp_limb_t pre[5];
+	  mpn_mod_1s_2p_cps (pre, b);
+	  return mpn_mod_1s_2p (ap, n, b << pre[1], pre);
+	}
+      else
+	{
+	  mp_limb_t pre[7];
+	  mpn_mod_1s_4p_cps (pre, b);
+	  return mpn_mod_1s_4p (ap, n, b << pre[1], pre);
+	}
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_1.c
deleted file mode 120000
index 79427766d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mod_1_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_1.c
new file mode 100644
index 000000000..1fada117f
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_1.c
@@ -0,0 +1,332 @@
+/* mpn_mod_1_1p (ap, n, b, cps)
+   Divide (ap,,n) by b.  Return the single-limb remainder.
+
+   Contributed to the GNU project by Torbjorn Granlund and Niels Möller.
+   Based on a suggestion by Peter L. Montgomery.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2008-2011, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#ifndef MOD_1_1P_METHOD
+# define MOD_1_1P_METHOD 1    /* need to make sure this is 2 for asm testing */
+#endif
+
+/* Define some longlong.h-style macros, but for wider operations.
+ * add_mssaaaa is like longlong.h's add_ssaaaa, but also generates
+ * carry out, in the form of a mask. */
+
+#if defined (__GNUC__) && ! defined (NO_ASM)
+
+#if HAVE_HOST_CPU_FAMILY_x86 && W_TYPE_SIZE == 32
+#define add_mssaaaa(m, s1, s0, a1, a0, b1, b0)				\
+  __asm__ (  "add	%6, %k2\n\t"					\
+	     "adc	%4, %k1\n\t"					\
+	     "sbb	%k0, %k0"					\
+	   : "=r" (m), "=r" (s1), "=&r" (s0)				\
+	   : "1"  ((USItype)(a1)), "g" ((USItype)(b1)),			\
+	     "%2" ((USItype)(a0)), "g" ((USItype)(b0)))
+#endif
+
+#if HAVE_HOST_CPU_FAMILY_x86_64 && W_TYPE_SIZE == 64
+#define add_mssaaaa(m, s1, s0, a1, a0, b1, b0)				\
+  __asm__ (  "add	%6, %q2\n\t"					\
+	     "adc	%4, %q1\n\t"					\
+	     "sbb	%q0, %q0"					\
+	   : "=r" (m), "=r" (s1), "=&r" (s0)				\
+	   : "1"  ((UDItype)(a1)), "rme" ((UDItype)(b1)),		\
+	     "%2" ((UDItype)(a0)), "rme" ((UDItype)(b0)))
+#endif
+
+#if defined (__sparc__) && W_TYPE_SIZE == 32
+#define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
+  __asm__ (  "addcc	%r5, %6, %2\n\t"				\
+	     "addxcc	%r3, %4, %1\n\t"				\
+	     "subx	%%g0, %%g0, %0"					\
+	   : "=r" (m), "=r" (sh), "=&r" (sl)				\
+	   : "rJ" (ah), "rI" (bh), "%rJ" (al), "rI" (bl)		\
+	 __CLOBBER_CC)
+#endif
+
+#if defined (__sparc__) && W_TYPE_SIZE == 64
+#define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
+  __asm__ (  "addcc	%r5, %6, %2\n\t"				\
+	     "addccc	%r7, %8, %%g0\n\t"				\
+	     "addccc	%r3, %4, %1\n\t"				\
+	     "clr	%0\n\t"						\
+	     "movcs	%%xcc, -1, %0"					\
+	   : "=r" (m), "=r" (sh), "=&r" (sl)				\
+	   : "rJ" (ah), "rI" (bh), "%rJ" (al), "rI" (bl),		\
+	     "rJ" ((al) >> 32), "rI" ((bl) >> 32)			\
+	 __CLOBBER_CC)
+#if __VIS__ >= 0x300
+#undef add_mssaaaa
+#define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
+  __asm__ (  "addcc	%r5, %6, %2\n\t"				\
+	     "addxccc	%r3, %4, %1\n\t"				\
+	     "clr	%0\n\t"						\
+	     "movcs	%%xcc, -1, %0"					\
+	   : "=r" (m), "=r" (sh), "=&r" (sl)				\
+	   : "rJ" (ah), "rI" (bh), "%rJ" (al), "rI" (bl)		\
+	 __CLOBBER_CC)
+#endif
+#endif
+
+#if HAVE_HOST_CPU_FAMILY_powerpc && !defined (_LONG_LONG_LIMB)
+/* This works fine for 32-bit and 64-bit limbs, except for 64-bit limbs with a
+   processor running in 32-bit mode, since the carry flag then gets the 32-bit
+   carry.  */
+#define add_mssaaaa(m, s1, s0, a1, a0, b1, b0)				\
+  __asm__ (  "add%I6c	%2, %5, %6\n\t"					\
+	     "adde	%1, %3, %4\n\t"					\
+	     "subfe	%0, %0, %0\n\t"					\
+	     "nor	%0, %0, %0"					\
+	   : "=r" (m), "=r" (s1), "=&r" (s0)				\
+	   : "r"  (a1), "r" (b1), "%r" (a0), "rI" (b0)			\
+	     __CLOBBER_CC)
+#endif
+
+#if defined (__s390x__) && W_TYPE_SIZE == 64
+#define add_mssaaaa(m, s1, s0, a1, a0, b1, b0)				\
+  __asm__ (  "algr	%2, %6\n\t"					\
+	     "alcgr	%1, %4\n\t"					\
+	     "lghi	%0, 0\n\t"					\
+	     "alcgr	%0, %0\n\t"					\
+	     "lcgr	%0, %0"						\
+	   : "=r" (m), "=r" (s1), "=&r" (s0)				\
+	   : "1"  ((UDItype)(a1)), "r" ((UDItype)(b1)),			\
+	     "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
+#endif
+
+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
+#define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
+  __asm__ (  "adds	%2, %5, %6\n\t"					\
+	     "adcs	%1, %3, %4\n\t"					\
+	     "movcc	%0, #0\n\t"					\
+	     "movcs	%0, #-1"					\
+	   : "=r" (m), "=r" (sh), "=&r" (sl)				\
+	   : "r" (ah), "rI" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
+#endif
+#endif /* defined (__GNUC__) */
+
+#ifndef add_mssaaaa
+#define add_mssaaaa(m, s1, s0, a1, a0, b1, b0)				\
+  do {									\
+    UWtype __s0, __s1, __c0, __c1;					\
+    __s0 = (a0) + (b0);							\
+    __s1 = (a1) + (b1);							\
+    __c0 = __s0 < (a0);							\
+    __c1 = __s1 < (a1);							\
+    (s0) = __s0;							\
+    __s1 = __s1 + __c0;							\
+    (s1) = __s1;							\
+    (m) = - (__c1 + (__s1 < __c0));					\
+  } while (0)
+#endif
+
+#if MOD_1_1P_METHOD == 1
+void
+mpn_mod_1_1p_cps (mp_limb_t cps[4], mp_limb_t b)
+{
+  mp_limb_t bi;
+  mp_limb_t B1modb, B2modb;
+  int cnt;
+
+  count_leading_zeros (cnt, b);
+
+  b <<= cnt;
+  invert_limb (bi, b);
+
+  cps[0] = bi;
+  cps[1] = cnt;
+
+  B1modb = -b;
+  if (LIKELY (cnt != 0))
+    B1modb *= ((bi >> (GMP_LIMB_BITS-cnt)) | (CNST_LIMB(1) << cnt));
+  ASSERT (B1modb <= b);		/* NB: not fully reduced mod b */
+  cps[2] = B1modb >> cnt;
+
+  /* In the normalized case, this can be simplified to
+   *
+   *   B2modb = - b * bi;
+   *   ASSERT (B2modb <= b);    // NB: equality iff b = B/2
+   */
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
+  cps[3] = B2modb >> cnt;
+}
+
+mp_limb_t
+mpn_mod_1_1p (mp_srcptr ap, mp_size_t n, mp_limb_t b, const mp_limb_t bmodb[4])
+{
+  mp_limb_t rh, rl, bi, ph, pl, r;
+  mp_limb_t B1modb, B2modb;
+  mp_size_t i;
+  int cnt;
+  mp_limb_t mask;
+
+  ASSERT (n >= 2);		/* fix tuneup.c if this is changed */
+
+  B1modb = bmodb[2];
+  B2modb = bmodb[3];
+
+  rl = ap[n - 1];
+  umul_ppmm (ph, pl, rl, B1modb);
+  add_ssaaaa (rh, rl, ph, pl, CNST_LIMB(0), ap[n - 2]);
+
+  for (i = n - 3; i >= 0; i -= 1)
+    {
+      /* rr = ap[i]				< B
+	    + LO(rr)  * (B mod b)		<= (B-1)(b-1)
+	    + HI(rr)  * (B^2 mod b)		<= (B-1)(b-1)
+      */
+      umul_ppmm (ph, pl, rl, B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[i]);
+
+      umul_ppmm (rh, rl, rh, B2modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+    }
+
+  cnt = bmodb[1];
+  bi = bmodb[0];
+
+  if (LIKELY (cnt != 0))
+    rh = (rh << cnt) | (rl >> (GMP_LIMB_BITS - cnt));
+
+  mask = -(mp_limb_t) (rh >= b);
+  rh -= mask & b;
+
+  udiv_rnnd_preinv (r, rh, rl << cnt, b, bi);
+
+  return r >> cnt;
+}
+#endif /* MOD_1_1P_METHOD == 1 */
+
+#if MOD_1_1P_METHOD == 2
+void
+mpn_mod_1_1p_cps (mp_limb_t cps[4], mp_limb_t b)
+{
+  mp_limb_t bi;
+  mp_limb_t B2modb;
+  int cnt;
+
+  count_leading_zeros (cnt, b);
+
+  b <<= cnt;
+  invert_limb (bi, b);
+
+  cps[0] = bi;
+  cps[1] = cnt;
+
+  if (LIKELY (cnt != 0))
+    {
+      mp_limb_t B1modb = -b;
+      B1modb *= ((bi >> (GMP_LIMB_BITS-cnt)) | (CNST_LIMB(1) << cnt));
+      ASSERT (B1modb <= b);		/* NB: not fully reduced mod b */
+      cps[2] = B1modb >> cnt;
+    }
+  B2modb = - b * bi;
+  ASSERT (B2modb <= b);    /* NB: equality iff b = B/2 */
+  cps[3] = B2modb;
+}
+
+mp_limb_t
+mpn_mod_1_1p (mp_srcptr ap, mp_size_t n, mp_limb_t b, const mp_limb_t bmodb[4])
+{
+  int cnt;
+  mp_limb_t bi, B1modb;
+  mp_limb_t r0, r1;
+  mp_limb_t r;
+
+  ASSERT (n >= 2);		/* fix tuneup.c if this is changed */
+
+  r0 = ap[n-2];
+  r1 = ap[n-1];
+
+  if (n > 2)
+    {
+      mp_limb_t B2modb, B2mb;
+      mp_limb_t p0, p1;
+      mp_limb_t r2;
+      mp_size_t j;
+
+      B2modb = bmodb[3];
+      B2mb = B2modb - b;
+
+      umul_ppmm (p1, p0, r1, B2modb);
+      add_mssaaaa (r2, r1, r0, r0, ap[n-3], p1, p0);
+
+      for (j = n-4; j >= 0; j--)
+	{
+	  mp_limb_t cy;
+	  /* mp_limb_t t = r0 + B2mb; */
+	  umul_ppmm (p1, p0, r1, B2modb);
+
+	  ADDC_LIMB (cy, r0, r0, r2 & B2modb);
+	  /* Alternative, for cmov: if (cy) r0 = t; */
+	  r0 -= (-cy) & b;
+	  add_mssaaaa (r2, r1, r0, r0, ap[j], p1, p0);
+	}
+
+      r1 -= (r2 & b);
+    }
+
+  cnt = bmodb[1];
+
+  if (LIKELY (cnt != 0))
+    {
+      mp_limb_t t;
+      mp_limb_t B1modb = bmodb[2];
+
+      umul_ppmm (r1, t, r1, B1modb);
+      r0 += t;
+      r1 += (r0 < t);
+
+      /* Normalize */
+      r1 = (r1 << cnt) | (r0 >> (GMP_LIMB_BITS - cnt));
+      r0 <<= cnt;
+
+      /* NOTE: Might get r1 == b here, but udiv_rnnd_preinv allows that. */
+    }
+  else
+    {
+      mp_limb_t mask = -(mp_limb_t) (r1 >= b);
+      r1 -= mask & b;
+    }
+
+  bi = bmodb[0];
+
+  udiv_rnnd_preinv (r, r1, r0, b, bi);
+  return r >> cnt;
+}
+#endif /* MOD_1_1P_METHOD == 2 */
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_2.c
deleted file mode 120000
index 2c5b8c4fa..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_2.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mod_1_2.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_2.c
new file mode 100644
index 000000000..b00d19eb0
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_2.c
@@ -0,0 +1,148 @@
+/* mpn_mod_1s_2p (ap, n, b, cps)
+   Divide (ap,,n) by b.  Return the single-limb remainder.
+   Requires that b < B / 2.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+   Based on a suggestion by Peter L. Montgomery.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2008-2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+void
+mpn_mod_1s_2p_cps (mp_limb_t cps[5], mp_limb_t b)
+{
+  mp_limb_t bi;
+  mp_limb_t B1modb, B2modb, B3modb;
+  int cnt;
+
+  ASSERT (b <= (~(mp_limb_t) 0) / 2);
+
+  count_leading_zeros (cnt, b);
+
+  b <<= cnt;
+  invert_limb (bi, b);
+
+  cps[0] = bi;
+  cps[1] = cnt;
+
+  B1modb = -b * ((bi >> (GMP_LIMB_BITS-cnt)) | (CNST_LIMB(1) << cnt));
+  ASSERT (B1modb <= b);		/* NB: not fully reduced mod b */
+  cps[2] = B1modb >> cnt;
+
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
+  cps[3] = B2modb >> cnt;
+
+  udiv_rnnd_preinv (B3modb, B2modb, CNST_LIMB(0), b, bi);
+  cps[4] = B3modb >> cnt;
+
+#if WANT_ASSERT
+  {
+    int i;
+    b = cps[2];
+    for (i = 3; i <= 4; i++)
+      {
+	b += cps[i];
+	ASSERT (b >= cps[i]);
+      }
+  }
+#endif
+}
+
+mp_limb_t
+mpn_mod_1s_2p (mp_srcptr ap, mp_size_t n, mp_limb_t b, const mp_limb_t cps[5])
+{
+  mp_limb_t rh, rl, bi, ph, pl, ch, cl, r;
+  mp_limb_t B1modb, B2modb, B3modb;
+  mp_size_t i;
+  int cnt;
+
+  ASSERT (n >= 1);
+
+  B1modb = cps[2];
+  B2modb = cps[3];
+  B3modb = cps[4];
+
+  if ((n & 1) != 0)
+    {
+      if (n == 1)
+	{
+	  rl = ap[n - 1];
+	  bi = cps[0];
+	  cnt = cps[1];
+	  udiv_rnnd_preinv (r, rl >> (GMP_LIMB_BITS - cnt),
+			     rl << cnt, b, bi);
+	  return r >> cnt;
+	}
+
+      umul_ppmm (ph, pl, ap[n - 2], B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[n - 3]);
+      umul_ppmm (rh, rl, ap[n - 1], B2modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+      n--;
+    }
+  else
+    {
+      rh = ap[n - 1];
+      rl = ap[n - 2];
+    }
+
+  for (i = n - 4; i >= 0; i -= 2)
+    {
+      /* rr = ap[i]				< B
+	    + ap[i+1] * (B mod b)		<= (B-1)(b-1)
+	    + LO(rr)  * (B^2 mod b)		<= (B-1)(b-1)
+	    + HI(rr)  * (B^3 mod b)		<= (B-1)(b-1)
+      */
+      umul_ppmm (ph, pl, ap[i + 1], B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[i + 0]);
+
+      umul_ppmm (ch, cl, rl, B2modb);
+      add_ssaaaa (ph, pl, ph, pl, ch, cl);
+
+      umul_ppmm (rh, rl, rh, B3modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+    }
+
+  umul_ppmm (rh, cl, rh, B1modb);
+  add_ssaaaa (rh, rl, rh, rl, CNST_LIMB(0), cl);
+
+  cnt = cps[1];
+  bi = cps[0];
+
+  r = (rh << cnt) | (rl >> (GMP_LIMB_BITS - cnt));
+  udiv_rnnd_preinv (r, r, rl << cnt, b, bi);
+
+  return r >> cnt;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_3.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_3.c
deleted file mode 120000
index c742d14bc..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_3.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mod_1_3.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_3.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_3.c
new file mode 100644
index 000000000..4d4be5d24
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_3.c
@@ -0,0 +1,156 @@
+/* mpn_mod_1s_3p (ap, n, b, cps)
+   Divide (ap,,n) by b.  Return the single-limb remainder.
+   Requires that b < B / 3.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+   Based on a suggestion by Peter L. Montgomery.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2008-2010, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+void
+mpn_mod_1s_3p_cps (mp_limb_t cps[6], mp_limb_t b)
+{
+  mp_limb_t bi;
+  mp_limb_t B1modb, B2modb, B3modb, B4modb;
+  int cnt;
+
+  ASSERT (b <= (~(mp_limb_t) 0) / 3);
+
+  count_leading_zeros (cnt, b);
+
+  b <<= cnt;
+  invert_limb (bi, b);
+
+  cps[0] = bi;
+  cps[1] = cnt;
+
+  B1modb = -b * ((bi >> (GMP_LIMB_BITS-cnt)) | (CNST_LIMB(1) << cnt));
+  ASSERT (B1modb <= b);		/* NB: not fully reduced mod b */
+  cps[2] = B1modb >> cnt;
+
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
+  cps[3] = B2modb >> cnt;
+
+  udiv_rnnd_preinv (B3modb, B2modb, CNST_LIMB(0), b, bi);
+  cps[4] = B3modb >> cnt;
+
+  udiv_rnnd_preinv (B4modb, B3modb, CNST_LIMB(0), b, bi);
+  cps[5] = B4modb >> cnt;
+
+#if WANT_ASSERT
+  {
+    int i;
+    b = cps[2];
+    for (i = 3; i <= 5; i++)
+      {
+	b += cps[i];
+	ASSERT (b >= cps[i]);
+      }
+  }
+#endif
+}
+
+mp_limb_t
+mpn_mod_1s_3p (mp_srcptr ap, mp_size_t n, mp_limb_t b, const mp_limb_t cps[6])
+{
+  mp_limb_t rh, rl, bi, ph, pl, ch, cl, r;
+  mp_limb_t B1modb, B2modb, B3modb, B4modb;
+  mp_size_t i;
+  int cnt;
+
+  ASSERT (n >= 1);
+
+  B1modb = cps[2];
+  B2modb = cps[3];
+  B3modb = cps[4];
+  B4modb = cps[5];
+
+  /* We compute n mod 3 in a tricky way, which works except for when n is so
+     close to the maximum size that we don't need to support it.  The final
+     cast to int is a workaround for HP cc.  */
+  switch ((int) ((mp_limb_t) n * MODLIMB_INVERSE_3 >> (GMP_NUMB_BITS - 2)))
+    {
+    case 0:
+      umul_ppmm (ph, pl, ap[n - 2], B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[n - 3]);
+      umul_ppmm (rh, rl, ap[n - 1], B2modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+      n -= 3;
+      break;
+    case 2:	/* n mod 3 = 1 */
+      rh = 0;
+      rl = ap[n - 1];
+      n -= 1;
+      break;
+    case 1:	/* n mod 3 = 2 */
+      rh = ap[n - 1];
+      rl = ap[n - 2];
+      n -= 2;
+      break;
+    }
+
+  for (i = n - 3; i >= 0; i -= 3)
+    {
+      /* rr = ap[i]				< B
+	    + ap[i+1] * (B mod b)		<= (B-1)(b-1)
+	    + ap[i+2] * (B^2 mod b)		<= (B-1)(b-1)
+	    + LO(rr)  * (B^3 mod b)		<= (B-1)(b-1)
+	    + HI(rr)  * (B^4 mod b)		<= (B-1)(b-1)
+      */
+      umul_ppmm (ph, pl, ap[i + 1], B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[i + 0]);
+
+      umul_ppmm (ch, cl, ap[i + 2], B2modb);
+      add_ssaaaa (ph, pl, ph, pl, ch, cl);
+
+      umul_ppmm (ch, cl, rl, B3modb);
+      add_ssaaaa (ph, pl, ph, pl, ch, cl);
+
+      umul_ppmm (rh, rl, rh, B4modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+    }
+
+  umul_ppmm (rh, cl, rh, B1modb);
+  add_ssaaaa (rh, rl, rh, rl, CNST_LIMB(0), cl);
+
+  cnt = cps[1];
+  bi = cps[0];
+
+  r = (rh << cnt) | (rl >> (GMP_LIMB_BITS - cnt));
+  udiv_rnnd_preinv (r, r, rl << cnt, b, bi);
+
+  return r >> cnt;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_4.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_4.c
deleted file mode 120000
index 2ded97371..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_4.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mod_1_4.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_4.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_4.c
new file mode 100644
index 000000000..80b42ba1e
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_1_4.c
@@ -0,0 +1,170 @@
+/* mpn_mod_1s_4p (ap, n, b, cps)
+   Divide (ap,,n) by b.  Return the single-limb remainder.
+   Requires that b < B / 4.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+   Based on a suggestion by Peter L. Montgomery.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2008-2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+void
+mpn_mod_1s_4p_cps (mp_limb_t cps[7], mp_limb_t b)
+{
+  mp_limb_t bi;
+  mp_limb_t B1modb, B2modb, B3modb, B4modb, B5modb;
+  int cnt;
+
+  ASSERT (b <= (~(mp_limb_t) 0) / 4);
+
+  count_leading_zeros (cnt, b);
+
+  b <<= cnt;
+  invert_limb (bi, b);
+
+  cps[0] = bi;
+  cps[1] = cnt;
+
+  B1modb = -b * ((bi >> (GMP_LIMB_BITS-cnt)) | (CNST_LIMB(1) << cnt));
+  ASSERT (B1modb <= b);		/* NB: not fully reduced mod b */
+  cps[2] = B1modb >> cnt;
+
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
+  cps[3] = B2modb >> cnt;
+
+  udiv_rnnd_preinv (B3modb, B2modb, CNST_LIMB(0), b, bi);
+  cps[4] = B3modb >> cnt;
+
+  udiv_rnnd_preinv (B4modb, B3modb, CNST_LIMB(0), b, bi);
+  cps[5] = B4modb >> cnt;
+
+  udiv_rnnd_preinv (B5modb, B4modb, CNST_LIMB(0), b, bi);
+  cps[6] = B5modb >> cnt;
+
+#if WANT_ASSERT
+  {
+    int i;
+    b = cps[2];
+    for (i = 3; i <= 6; i++)
+      {
+	b += cps[i];
+	ASSERT (b >= cps[i]);
+      }
+  }
+#endif
+}
+
+mp_limb_t
+mpn_mod_1s_4p (mp_srcptr ap, mp_size_t n, mp_limb_t b, const mp_limb_t cps[7])
+{
+  mp_limb_t rh, rl, bi, ph, pl, ch, cl, r;
+  mp_limb_t B1modb, B2modb, B3modb, B4modb, B5modb;
+  mp_size_t i;
+  int cnt;
+
+  ASSERT (n >= 1);
+
+  B1modb = cps[2];
+  B2modb = cps[3];
+  B3modb = cps[4];
+  B4modb = cps[5];
+  B5modb = cps[6];
+
+  switch (n & 3)
+    {
+    case 0:
+      umul_ppmm (ph, pl, ap[n - 3], B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[n - 4]);
+      umul_ppmm (ch, cl, ap[n - 2], B2modb);
+      add_ssaaaa (ph, pl, ph, pl, ch, cl);
+      umul_ppmm (rh, rl, ap[n - 1], B3modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+      n -= 4;
+      break;
+    case 1:
+      rh = 0;
+      rl = ap[n - 1];
+      n -= 1;
+      break;
+    case 2:
+      rh = ap[n - 1];
+      rl = ap[n - 2];
+      n -= 2;
+      break;
+    case 3:
+      umul_ppmm (ph, pl, ap[n - 2], B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[n - 3]);
+      umul_ppmm (rh, rl, ap[n - 1], B2modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+      n -= 3;
+      break;
+    }
+
+  for (i = n - 4; i >= 0; i -= 4)
+    {
+      /* rr = ap[i]				< B
+	    + ap[i+1] * (B mod b)		<= (B-1)(b-1)
+	    + ap[i+2] * (B^2 mod b)		<= (B-1)(b-1)
+	    + ap[i+3] * (B^3 mod b)		<= (B-1)(b-1)
+	    + LO(rr)  * (B^4 mod b)		<= (B-1)(b-1)
+	    + HI(rr)  * (B^5 mod b)		<= (B-1)(b-1)
+      */
+      umul_ppmm (ph, pl, ap[i + 1], B1modb);
+      add_ssaaaa (ph, pl, ph, pl, CNST_LIMB(0), ap[i + 0]);
+
+      umul_ppmm (ch, cl, ap[i + 2], B2modb);
+      add_ssaaaa (ph, pl, ph, pl, ch, cl);
+
+      umul_ppmm (ch, cl, ap[i + 3], B3modb);
+      add_ssaaaa (ph, pl, ph, pl, ch, cl);
+
+      umul_ppmm (ch, cl, rl, B4modb);
+      add_ssaaaa (ph, pl, ph, pl, ch, cl);
+
+      umul_ppmm (rh, rl, rh, B5modb);
+      add_ssaaaa (rh, rl, rh, rl, ph, pl);
+    }
+
+  umul_ppmm (rh, cl, rh, B1modb);
+  add_ssaaaa (rh, rl, rh, rl, CNST_LIMB(0), cl);
+
+  cnt = cps[1];
+  bi = cps[0];
+
+  r = (rh << cnt) | (rl >> (GMP_LIMB_BITS - cnt));
+  udiv_rnnd_preinv (r, r, rl << cnt, b, bi);
+
+  return r >> cnt;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_34lsub1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_34lsub1.c
deleted file mode 120000
index 8d5eecb6b..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_34lsub1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mod_34lsub1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_34lsub1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_34lsub1.c
new file mode 100644
index 000000000..af9c6c63b
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mod_34lsub1.c
@@ -0,0 +1,128 @@
+/* mpn_mod_34lsub1 -- remainder modulo 2^(GMP_NUMB_BITS*3/4)-1.
+
+   THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY.  THEY'RE ALMOST
+   CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
+   FUTURE GNU MP RELEASES.
+
+Copyright 2000-2002 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+/* Calculate a remainder from {p,n} divided by 2^(GMP_NUMB_BITS*3/4)-1.
+   The remainder is not fully reduced, it's any limb value congruent to
+   {p,n} modulo that divisor.
+
+   This implementation is only correct when GMP_NUMB_BITS is a multiple of
+   4.
+
+   FIXME: If GMP_NAIL_BITS is some silly big value during development then
+   it's possible the carry accumulators c0,c1,c2 could overflow.
+
+   General notes:
+
+   The basic idea is to use a set of N accumulators (N=3 in this case) to
+   effectively get a remainder mod 2^(GMP_NUMB_BITS*N)-1 followed at the end
+   by a reduction to GMP_NUMB_BITS*N/M bits (M=4 in this case) for a
+   remainder mod 2^(GMP_NUMB_BITS*N/M)-1.  N and M are chosen to give a good
+   set of small prime factors in 2^(GMP_NUMB_BITS*N/M)-1.
+
+   N=3 M=4 suits GMP_NUMB_BITS==32 and GMP_NUMB_BITS==64 quite well, giving
+   a few more primes than a single accumulator N=1 does, and for no extra
+   cost (assuming the processor has a decent number of registers).
+
+   For strange nailified values of GMP_NUMB_BITS the idea would be to look
+   for what N and M give good primes.  With GMP_NUMB_BITS not a power of 2
+   the choices for M may be opened up a bit.  But such things are probably
+   best done in separate code, not grafted on here.  */
+
+#if GMP_NUMB_BITS % 4 == 0
+
+#define B1  (GMP_NUMB_BITS / 4)
+#define B2  (B1 * 2)
+#define B3  (B1 * 3)
+
+#define M1  ((CNST_LIMB(1) << B1) - 1)
+#define M2  ((CNST_LIMB(1) << B2) - 1)
+#define M3  ((CNST_LIMB(1) << B3) - 1)
+
+#define LOW0(n)      ((n) & M3)
+#define HIGH0(n)     ((n) >> B3)
+
+#define LOW1(n)      (((n) & M2) << B1)
+#define HIGH1(n)     ((n) >> B2)
+
+#define LOW2(n)      (((n) & M1) << B2)
+#define HIGH2(n)     ((n) >> B1)
+
+#define PARTS0(n)    (LOW0(n) + HIGH0(n))
+#define PARTS1(n)    (LOW1(n) + HIGH1(n))
+#define PARTS2(n)    (LOW2(n) + HIGH2(n))
+
+#define ADD(c,a,val)                    \
+  do {                                  \
+    mp_limb_t  new_c;                   \
+    ADDC_LIMB (new_c, a, a, val);       \
+    (c) += new_c;                       \
+  } while (0)
+
+mp_limb_t
+mpn_mod_34lsub1 (mp_srcptr p, mp_size_t n)
+{
+  mp_limb_t  c0, c1, c2;
+  mp_limb_t  a0, a1, a2;
+
+  ASSERT (n >= 1);
+  ASSERT (n/3 < GMP_NUMB_MAX);
+
+  a0 = a1 = a2 = 0;
+  c0 = c1 = c2 = 0;
+
+  while ((n -= 3) >= 0)
+    {
+      ADD (c0, a0, p[0]);
+      ADD (c1, a1, p[1]);
+      ADD (c2, a2, p[2]);
+      p += 3;
+    }
+
+  if (n != -3)
+    {
+      ADD (c0, a0, p[0]);
+      if (n != -2)
+	ADD (c1, a1, p[1]);
+    }
+
+  return
+    PARTS0 (a0) + PARTS1 (a1) + PARTS2 (a2)
+    + PARTS1 (c0) + PARTS2 (c1) + PARTS0 (c2);
+}
+
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mode1o.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mode1o.c
deleted file mode 120000
index b7b75c5e7..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mode1o.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mode1o.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mode1o.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mode1o.c
new file mode 100644
index 000000000..9ba0ae1cc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mode1o.c
@@ -0,0 +1,235 @@
+/* mpn_modexact_1c_odd -- mpn by limb exact division style remainder.
+
+   THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY.  THEY'RE ALMOST
+   CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
+   FUTURE GNU MP RELEASES.
+
+Copyright 2000-2004 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+/* Calculate an r satisfying
+
+           r*B^k + a - c == q*d
+
+   where B=2^GMP_LIMB_BITS, a is {src,size}, k is either size or size-1
+   (the caller won't know which), and q is the quotient (discarded).  d must
+   be odd, c can be any limb value.
+
+   If c<d then r will be in the range 0<=r<d, or if c>=d then 0<=r<=d.
+
+   This slightly strange function suits the initial Nx1 reduction for GCDs
+   or Jacobi symbols since the factors of 2 in B^k can be ignored, leaving
+   -r == a mod d (by passing c=0).  For a GCD the factor of -1 on r can be
+   ignored, or for the Jacobi symbol it can be accounted for.  The function
+   also suits divisibility and congruence testing since if r=0 (or r=d) is
+   obtained then a==c mod d.
+
+
+   r is a bit like the remainder returned by mpn_divexact_by3c, and is the
+   sort of remainder mpn_divexact_1 might return.  Like mpn_divexact_by3c, r
+   represents a borrow, since effectively quotient limbs are chosen so that
+   subtracting that multiple of d from src at each step will produce a zero
+   limb.
+
+   A long calculation can be done piece by piece from low to high by passing
+   the return value from one part as the carry parameter to the next part.
+   The effective final k becomes anything between size and size-n, if n
+   pieces are used.
+
+
+   A similar sort of routine could be constructed based on adding multiples
+   of d at each limb, much like redc in mpz_powm does.  Subtracting however
+   has a small advantage that when subtracting to cancel out l there's never
+   a borrow into h, whereas using an addition would put a carry into h
+   depending whether l==0 or l!=0.
+
+
+   In terms of efficiency, this function is similar to a mul-by-inverse
+   mpn_mod_1.  Both are essentially two multiplies and are best suited to
+   CPUs with low latency multipliers (in comparison to a divide instruction
+   at least.)  But modexact has a few less supplementary operations, only
+   needs low part and high part multiplies, and has fewer working quantities
+   (helping CPUs with few registers).
+
+
+   In the main loop it will be noted that the new carry (call it r) is the
+   sum of the high product h and any borrow from l=s-c.  If c<d then we will
+   have r<d too, for the following reasons.  Let q=l*inverse be the quotient
+   limb, so that q*d = B*h + l, where B=2^GMP_NUMB_BITS.  Now if h=d-1 then
+
+       l = q*d - B*(d-1) <= (B-1)*d - B*(d-1) = B-d
+
+   But if l=s-c produces a borrow when c<d, then l>=B-d+1 and hence will
+   never have h=d-1 and so r=h+borrow <= d-1.
+
+   When c>=d, on the other hand, h=d-1 can certainly occur together with a
+   borrow, thereby giving only r<=d, as per the function definition above.
+
+   As a design decision it's left to the caller to check for r=d if it might
+   be passing c>=d.  Several applications have c<d initially so the extra
+   test is often unnecessary, for example the GCDs or a plain divisibility
+   d|a test will pass c=0.
+
+
+   The special case for size==1 is so that it can be assumed c<=d in the
+   high<=divisor test at the end.  c<=d is only guaranteed after at least
+   one iteration of the main loop.  There's also a decent chance one % is
+   faster than a binvert_limb, though that will depend on the processor.
+
+   A CPU specific implementation might want to omit the size==1 code or the
+   high<divisor test.  mpn/x86/k6/mode1o.asm for instance finds neither
+   useful.  */
+
+
+mp_limb_t
+mpn_modexact_1c_odd (mp_srcptr src, mp_size_t size, mp_limb_t d,
+                     mp_limb_t orig_c)
+{
+  mp_limb_t  s, h, l, inverse, dummy, dmul, ret;
+  mp_limb_t  c = orig_c;
+  mp_size_t  i;
+
+  ASSERT (size >= 1);
+  ASSERT (d & 1);
+  ASSERT_MPN (src, size);
+  ASSERT_LIMB (d);
+  ASSERT_LIMB (c);
+
+  if (size == 1)
+    {
+      s = src[0];
+      if (s > c)
+	{
+	  l = s-c;
+	  h = l % d;
+	  if (h != 0)
+	    h = d - h;
+	}
+      else
+	{
+	  l = c-s;
+	  h = l % d;
+	}
+      return h;
+    }
+
+
+  binvert_limb (inverse, d);
+  dmul = d << GMP_NAIL_BITS;
+
+  i = 0;
+  do
+    {
+      s = src[i];
+      SUBC_LIMB (c, l, s, c);
+      l = (l * inverse) & GMP_NUMB_MASK;
+      umul_ppmm (h, dummy, l, dmul);
+      c += h;
+    }
+  while (++i < size-1);
+
+
+  s = src[i];
+  if (s <= d)
+    {
+      /* With high<=d the final step can be a subtract and addback.  If c==0
+	 then the addback will restore to l>=0.  If c==d then will get l==d
+	 if s==0, but that's ok per the function definition.  */
+
+      l = c - s;
+      if (c < s)
+	l += d;
+
+      ret = l;
+    }
+  else
+    {
+      /* Can't skip a divide, just do the loop code once more. */
+
+      SUBC_LIMB (c, l, s, c);
+      l = (l * inverse) & GMP_NUMB_MASK;
+      umul_ppmm (h, dummy, l, dmul);
+      c += h;
+      ret = c;
+    }
+
+  ASSERT (orig_c < d ? ret < d : ret <= d);
+  return ret;
+}
+
+
+
+#if 0
+
+/* The following is an alternate form that might shave one cycle on a
+   superscalar processor since it takes c+=h off the dependent chain,
+   leaving just a low product, high product, and a subtract.
+
+   This is for CPU specific implementations to consider.  A special case for
+   high<divisor and/or size==1 can be added if desired.
+
+   Notice that c is only ever 0 or 1, since if s-c produces a borrow then
+   x=0xFF..FF and x-h cannot produce a borrow.  The c=(x>s) could become
+   c=(x==0xFF..FF) too, if that helped.  */
+
+mp_limb_t
+mpn_modexact_1c_odd (mp_srcptr src, mp_size_t size, mp_limb_t d, mp_limb_t h)
+{
+  mp_limb_t  s, x, y, inverse, dummy, dmul, c1, c2;
+  mp_limb_t  c = 0;
+  mp_size_t  i;
+
+  ASSERT (size >= 1);
+  ASSERT (d & 1);
+
+  binvert_limb (inverse, d);
+  dmul = d << GMP_NAIL_BITS;
+
+  for (i = 0; i < size; i++)
+    {
+      ASSERT (c==0 || c==1);
+
+      s = src[i];
+      SUBC_LIMB (c1, x, s, c);
+
+      SUBC_LIMB (c2, y, x, h);
+      c = c1 + c2;
+
+      y = (y * inverse) & GMP_NUMB_MASK;
+      umul_ppmm (h, dummy, y, dmul);
+    }
+
+  h += c;
+  return h;
+}
+
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_q.c
deleted file mode 120000
index 9b04f38a9..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_q.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mu_bdiv_q.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_q.c
new file mode 100644
index 000000000..0ef3bd818
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_q.c
@@ -0,0 +1,281 @@
+/* mpn_mu_bdiv_q(qp,np,nn,dp,dn,tp) -- Compute {np,nn} / {dp,dn} mod B^nn.
+   storing the result in {qp,nn}.  Overlap allowed between Q and N; all other
+   overlap disallowed.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2005-2007, 2009, 2010, 2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/*
+   The idea of the algorithm used herein is to compute a smaller inverted value
+   than used in the standard Barrett algorithm, and thus save time in the
+   Newton iterations, and pay just a small price when using the inverted value
+   for developing quotient bits.  This algorithm was presented at ICMS 2006.
+*/
+
+#include "gmp-impl.h"
+
+
+/* N = {np,nn}
+   D = {dp,dn}
+
+   Requirements: N >= D
+		 D >= 1
+		 D odd
+		 dn >= 2
+		 nn >= 2
+		 scratch space as determined by mpn_mu_bdiv_q_itch(nn,dn).
+
+   Write quotient to Q = {qp,nn}.
+
+   FIXME: When iterating, perhaps do the small step before loop, not after.
+   FIXME: Try to avoid the scalar divisions when computing inverse size.
+   FIXME: Trim allocation for (qn > dn) case, 3*dn might be possible.  In
+	  particular, when dn==in, tp and rp could use the same space.
+   FIXME: Trim final quotient calculation to qn limbs of precision.
+*/
+static void
+mpn_mu_bdiv_q_old (mp_ptr qp,
+	       mp_srcptr np, mp_size_t nn,
+	       mp_srcptr dp, mp_size_t dn,
+	       mp_ptr scratch)
+{
+  mp_size_t qn;
+  mp_size_t in;
+  int cy, c0;
+  mp_size_t tn, wn;
+
+  qn = nn;
+
+  ASSERT (dn >= 2);
+  ASSERT (qn >= 2);
+
+  if (qn > dn)
+    {
+      mp_size_t b;
+
+      /* |_______________________|   dividend
+			|________|   divisor  */
+
+#define ip           scratch			/* in */
+#define rp           (scratch + in)		/* dn or rest >= binvert_itch(in) */
+#define tp           (scratch + in + dn)	/* dn+in or next_size(dn) */
+#define scratch_out  (scratch + in + dn + tn)	/* mulmod_bnm1_itch(next_size(dn)) */
+
+      /* Compute an inverse size that is a nice partition of the quotient.  */
+      b = (qn - 1) / dn + 1;	/* ceil(qn/dn), number of blocks */
+      in = (qn - 1) / b + 1;	/* ceil(qn/b) = ceil(qn / ceil(qn/dn)) */
+
+      /* Some notes on allocation:
+
+	 When in = dn, R dies when mpn_mullo returns, if in < dn the low in
+	 limbs of R dies at that point.  We could save memory by letting T live
+	 just under R, and let the upper part of T expand into R. These changes
+	 should reduce itch to perhaps 3dn.
+       */
+
+      mpn_binvert (ip, dp, in, rp);
+
+      cy = 0;
+
+      MPN_COPY (rp, np, dn);
+      np += dn;
+      mpn_mullo_n (qp, rp, ip, in);
+      qn -= in;
+
+      while (qn > in)
+	{
+	  if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	    mpn_mul (tp, dp, dn, qp, in);	/* mulhi, need tp[dn+in-1...in] */
+	  else
+	    {
+	      tn = mpn_mulmod_bnm1_next_size (dn);
+	      mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, in, scratch_out);
+	      wn = dn + in - tn;		/* number of wrapped limbs */
+	      if (wn > 0)
+		{
+		  c0 = mpn_sub_n (tp + tn, tp, rp, wn);
+		  mpn_decr_u (tp + wn, c0);
+		}
+	    }
+
+	  qp += in;
+	  if (dn != in)
+	    {
+	      /* Subtract tp[dn-1...in] from partial remainder.  */
+	      cy += mpn_sub_n (rp, rp + in, tp + in, dn - in);
+	      if (cy == 2)
+		{
+		  mpn_incr_u (tp + dn, 1);
+		  cy = 1;
+		}
+	    }
+	  /* Subtract tp[dn+in-1...dn] from dividend.  */
+	  cy = mpn_sub_nc (rp + dn - in, np, tp + dn, in, cy);
+	  np += in;
+	  mpn_mullo_n (qp, rp, ip, in);
+	  qn -= in;
+	}
+
+      /* Generate last qn limbs.
+	 FIXME: It should be possible to limit precision here, since qn is
+	 typically somewhat smaller than dn.  No big gains expected.  */
+
+      if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	mpn_mul (tp, dp, dn, qp, in);		/* mulhi, need tp[qn+in-1...in] */
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (dn);
+	  mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, in, scratch_out);
+	  wn = dn + in - tn;			/* number of wrapped limbs */
+	  if (wn > 0)
+	    {
+	      c0 = mpn_sub_n (tp + tn, tp, rp, wn);
+	      mpn_decr_u (tp + wn, c0);
+	    }
+	}
+
+      qp += in;
+      if (dn != in)
+	{
+	  cy += mpn_sub_n (rp, rp + in, tp + in, dn - in);
+	  if (cy == 2)
+	    {
+	      mpn_incr_u (tp + dn, 1);
+	      cy = 1;
+	    }
+	}
+
+      mpn_sub_nc (rp + dn - in, np, tp + dn, qn - (dn - in), cy);
+      mpn_mullo_n (qp, rp, ip, qn);
+
+#undef ip
+#undef rp
+#undef tp
+#undef scratch_out
+   }
+  else
+    {
+      /* |_______________________|   dividend
+		|________________|   divisor  */
+
+#define ip           scratch		/* in */
+#define tp           (scratch + in)	/* qn+in or next_size(qn) or rest >= binvert_itch(in) */
+#define scratch_out  (scratch + in + tn)/* mulmod_bnm1_itch(next_size(qn)) */
+
+      /* Compute half-sized inverse.  */
+      in = qn - (qn >> 1);
+
+      mpn_binvert (ip, dp, in, tp);
+
+      mpn_mullo_n (qp, np, ip, in);		/* low `in' quotient limbs */
+
+      if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	mpn_mul (tp, dp, qn, qp, in);		/* mulhigh */
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (qn);
+	  mpn_mulmod_bnm1 (tp, tn, dp, qn, qp, in, scratch_out);
+	  wn = qn + in - tn;			/* number of wrapped limbs */
+	  if (wn > 0)
+	    {
+	      c0 = mpn_cmp (tp, np, wn) < 0;
+	      mpn_decr_u (tp + wn, c0);
+	    }
+	}
+
+      mpn_sub_n (tp, np + in, tp + in, qn - in);
+      mpn_mullo_n (qp + in, tp, ip, qn - in);	/* high qn-in quotient limbs */
+
+#undef ip
+#undef tp
+#undef scratch_out
+    }
+}
+
+void
+mpn_mu_bdiv_q (mp_ptr qp,
+	       mp_srcptr np, mp_size_t nn,
+	       mp_srcptr dp, mp_size_t dn,
+	       mp_ptr scratch)
+{
+  mpn_mu_bdiv_q_old (qp, np, nn, dp, dn, scratch);
+  mpn_neg (qp, qp, nn);
+}
+
+mp_size_t
+mpn_mu_bdiv_q_itch (mp_size_t nn, mp_size_t dn)
+{
+  mp_size_t qn, in, tn, itch_binvert, itch_out, itches;
+  mp_size_t b;
+
+  ASSERT_ALWAYS (DC_BDIV_Q_THRESHOLD < MU_BDIV_Q_THRESHOLD);
+
+  qn = nn;
+
+  if (qn > dn)
+    {
+      b = (qn - 1) / dn + 1;	/* ceil(qn/dn), number of blocks */
+      in = (qn - 1) / b + 1;	/* ceil(qn/b) = ceil(qn / ceil(qn/dn)) */
+      if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	{
+	  tn = dn + in;
+	  itch_out = 0;
+	}
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (dn);
+	  itch_out = mpn_mulmod_bnm1_itch (tn, dn, in);
+	}
+      itches = dn + tn + itch_out;
+    }
+  else
+    {
+      in = qn - (qn >> 1);
+      if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	{
+	  tn = qn + in;
+	  itch_out = 0;
+	}
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (qn);
+	  itch_out = mpn_mulmod_bnm1_itch (tn, qn, in);
+	}
+      itches = tn + itch_out;
+    }
+
+  itch_binvert = mpn_binvert_itch (in);
+  return in + MAX (itches, itch_binvert);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_qr.c
deleted file mode 120000
index e6f2ed39d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_qr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mu_bdiv_qr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_qr.c
new file mode 100644
index 000000000..540ad73cc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_bdiv_qr.c
@@ -0,0 +1,312 @@
+/* mpn_mu_bdiv_qr(qp,rp,np,nn,dp,dn,tp) -- Compute {np,nn} / {dp,dn} mod B^qn,
+   where qn = nn-dn, storing the result in {qp,qn}.  Overlap allowed between Q
+   and N; all other overlap disallowed.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2005-2007, 2009, 2010, 2012, 2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/*
+   The idea of the algorithm used herein is to compute a smaller inverted value
+   than used in the standard Barrett algorithm, and thus save time in the
+   Newton iterations, and pay just a small price when using the inverted value
+   for developing quotient bits.  This algorithm was presented at ICMS 2006.
+*/
+
+#include "gmp-impl.h"
+
+
+/* N = {np,nn}
+   D = {dp,dn}
+
+   Requirements: N >= D
+		 D >= 1
+		 D odd
+		 dn >= 2
+		 nn >= 2
+		 scratch space as determined by mpn_mu_bdiv_qr_itch(nn,dn).
+
+   Write quotient to Q = {qp,nn-dn}.
+
+   FIXME: When iterating, perhaps do the small step before loop, not after.
+   FIXME: Try to avoid the scalar divisions when computing inverse size.
+   FIXME: Trim allocation for (qn > dn) case, 3*dn might be possible.  In
+	  particular, when dn==in, tp and rp could use the same space.
+*/
+static mp_limb_t
+mpn_mu_bdiv_qr_old (mp_ptr qp,
+		    mp_ptr rp,
+		    mp_srcptr np, mp_size_t nn,
+		    mp_srcptr dp, mp_size_t dn,
+		    mp_ptr scratch)
+{
+  mp_size_t qn;
+  mp_size_t in;
+  mp_limb_t cy, c0;
+  mp_size_t tn, wn;
+
+  qn = nn - dn;
+
+  ASSERT (dn >= 2);
+  ASSERT (qn >= 2);
+
+  if (qn > dn)
+    {
+      mp_size_t b;
+
+      /* |_______________________|   dividend
+			|________|   divisor  */
+
+#define ip           scratch		/* in */
+#define tp           (scratch + in)	/* dn+in or next_size(dn) or rest >= binvert_itch(in) */
+#define scratch_out  (scratch + in + tn)/* mulmod_bnm1_itch(next_size(dn)) */
+
+      /* Compute an inverse size that is a nice partition of the quotient.  */
+      b = (qn - 1) / dn + 1;	/* ceil(qn/dn), number of blocks */
+      in = (qn - 1) / b + 1;	/* ceil(qn/b) = ceil(qn / ceil(qn/dn)) */
+
+      /* Some notes on allocation:
+
+	 When in = dn, R dies when mpn_mullo returns, if in < dn the low in
+	 limbs of R dies at that point.  We could save memory by letting T live
+	 just under R, and let the upper part of T expand into R. These changes
+	 should reduce itch to perhaps 3dn.
+       */
+
+      mpn_binvert (ip, dp, in, tp);
+
+      MPN_COPY (rp, np, dn);
+      np += dn;
+      cy = 0;
+
+      while (qn > in)
+	{
+	  mpn_mullo_n (qp, rp, ip, in);
+
+	  if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	    mpn_mul (tp, dp, dn, qp, in);	/* mulhi, need tp[dn+in-1...in] */
+	  else
+	    {
+	      tn = mpn_mulmod_bnm1_next_size (dn);
+	      mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, in, scratch_out);
+	      wn = dn + in - tn;		/* number of wrapped limbs */
+	      if (wn > 0)
+		{
+		  c0 = mpn_sub_n (tp + tn, tp, rp, wn);
+		  mpn_decr_u (tp + wn, c0);
+		}
+	    }
+
+	  qp += in;
+	  qn -= in;
+
+	  if (dn != in)
+	    {
+	      /* Subtract tp[dn-1...in] from partial remainder.  */
+	      cy += mpn_sub_n (rp, rp + in, tp + in, dn - in);
+	      if (cy == 2)
+		{
+		  mpn_incr_u (tp + dn, 1);
+		  cy = 1;
+		}
+	    }
+	  /* Subtract tp[dn+in-1...dn] from dividend.  */
+	  cy = mpn_sub_nc (rp + dn - in, np, tp + dn, in, cy);
+	  np += in;
+	}
+
+      /* Generate last qn limbs.  */
+      mpn_mullo_n (qp, rp, ip, qn);
+
+      if (BELOW_THRESHOLD (qn, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	mpn_mul (tp, dp, dn, qp, qn);		/* mulhi, need tp[qn+in-1...in] */
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (dn);
+	  mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, qn, scratch_out);
+	  wn = dn + qn - tn;			/* number of wrapped limbs */
+	  if (wn > 0)
+	    {
+	      c0 = mpn_sub_n (tp + tn, tp, rp, wn);
+	      mpn_decr_u (tp + wn, c0);
+	    }
+	}
+
+      if (dn != qn)
+	{
+	  cy += mpn_sub_n (rp, rp + qn, tp + qn, dn - qn);
+	  if (cy == 2)
+	    {
+	      mpn_incr_u (tp + dn, 1);
+	      cy = 1;
+	    }
+	}
+      return mpn_sub_nc (rp + dn - qn, np, tp + dn, qn, cy);
+
+#undef ip
+#undef tp
+#undef scratch_out
+    }
+  else
+    {
+      /* |_______________________|   dividend
+		|________________|   divisor  */
+
+#define ip           scratch		/* in */
+#define tp           (scratch + in)	/* dn+in or next_size(dn) or rest >= binvert_itch(in) */
+#define scratch_out  (scratch + in + tn)/* mulmod_bnm1_itch(next_size(dn)) */
+
+      /* Compute half-sized inverse.  */
+      in = qn - (qn >> 1);
+
+      mpn_binvert (ip, dp, in, tp);
+
+      mpn_mullo_n (qp, np, ip, in);		/* low `in' quotient limbs */
+
+      if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	mpn_mul (tp, dp, dn, qp, in);		/* mulhigh */
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (dn);
+	  mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, in, scratch_out);
+	  wn = dn + in - tn;			/* number of wrapped limbs */
+	  if (wn > 0)
+	    {
+	      c0 = mpn_sub_n (tp + tn, tp, np, wn);
+	      mpn_decr_u (tp + wn, c0);
+	    }
+	}
+
+      qp += in;
+      qn -= in;
+
+      cy = mpn_sub_n (rp, np + in, tp + in, dn);
+      mpn_mullo_n (qp, rp, ip, qn);		/* high qn quotient limbs */
+
+      if (BELOW_THRESHOLD (qn, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	mpn_mul (tp, dp, dn, qp, qn);		/* mulhigh */
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (dn);
+	  mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, qn, scratch_out);
+	  wn = dn + qn - tn;			/* number of wrapped limbs */
+	  if (wn > 0)
+	    {
+	      c0 = mpn_sub_n (tp + tn, tp, rp, wn);
+	      mpn_decr_u (tp + wn, c0);
+	    }
+	}
+
+      cy += mpn_sub_n (rp, rp + qn, tp + qn, dn - qn);
+      if (cy == 2)
+	{
+	  mpn_incr_u (tp + dn, 1);
+	  cy = 1;
+	}
+      return mpn_sub_nc (rp + dn - qn, np + dn + in, tp + dn, qn, cy);
+
+#undef ip
+#undef tp
+#undef scratch_out
+    }
+}
+
+mp_limb_t
+mpn_mu_bdiv_qr (mp_ptr qp,
+		mp_ptr rp,
+		mp_srcptr np, mp_size_t nn,
+		mp_srcptr dp, mp_size_t dn,
+		mp_ptr scratch)
+{
+  mp_limb_t cy = mpn_mu_bdiv_qr_old (qp, rp, np, nn, dp, dn, scratch);
+
+  /* R' B^{qn} = U - Q' D
+   *
+   * Q = B^{qn} - Q' (assuming Q' != 0)
+   *
+   * R B^{qn} = U + Q D = U + B^{qn} D - Q' D
+   *          = B^{qn} D + R'
+   */
+
+  if (UNLIKELY (!mpn_neg (qp, qp, nn - dn)))
+    {
+      /* Zero quotient. */
+      ASSERT (cy == 0);
+      return 0;
+    }
+  else
+    {
+      mp_limb_t cy2 = mpn_add_n (rp, rp, dp, dn);
+      ASSERT (cy2 >= cy);
+
+      return cy2 - cy;
+    }
+}
+
+
+mp_size_t
+mpn_mu_bdiv_qr_itch (mp_size_t nn, mp_size_t dn)
+{
+  mp_size_t qn, in, tn, itch_binvert, itch_out, itches;
+  mp_size_t b;
+
+  ASSERT_ALWAYS (DC_BDIV_Q_THRESHOLD < MU_BDIV_Q_THRESHOLD);
+
+  qn = nn - dn;
+
+  if (qn > dn)
+    {
+      b = (qn - 1) / dn + 1;	/* ceil(qn/dn), number of blocks */
+      in = (qn - 1) / b + 1;	/* ceil(qn/b) = ceil(qn / ceil(qn/dn)) */
+    }
+  else
+    {
+      in = qn - (qn >> 1);
+    }
+
+  if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+    {
+      tn = dn + in;
+      itch_out = 0;
+    }
+  else
+    {
+      tn = mpn_mulmod_bnm1_next_size (dn);
+      itch_out = mpn_mulmod_bnm1_itch (tn, dn, in);
+    }
+
+  itch_binvert = mpn_binvert_itch (in);
+  itches = tn + itch_out;
+  return in + MAX (itches, itch_binvert);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_q.c
deleted file mode 120000
index 470e70584..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_q.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mu_div_q.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_q.c
new file mode 100644
index 000000000..44cfb4066
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_q.c
@@ -0,0 +1,184 @@
+/* mpn_mu_div_q.
+
+   Contributed to the GNU project by Torbjorn Granlund and Marco Bodrato.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2005-2007, 2009, 2010, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/*
+   The idea of the algorithm used herein is to compute a smaller inverted value
+   than used in the standard Barrett algorithm, and thus save time in the
+   Newton iterations, and pay just a small price when using the inverted value
+   for developing quotient bits.  This algorithm was presented at ICMS 2006.
+*/
+
+/*
+  Things to work on:
+
+  1. This is a rudimentary implementation of mpn_mu_div_q.  The algorithm is
+     probably close to optimal, except when mpn_mu_divappr_q fails.
+
+  2. We used to fall back to mpn_mu_div_qr when we detect a possible
+     mpn_mu_divappr_q rounding problem, now we multiply and compare.
+     Unfortunately, since mpn_mu_divappr_q does not return the partial
+     remainder, this also doesn't become optimal.  A mpn_mu_divappr_qr could
+     solve that.
+
+  3. The allocations done here should be made from the scratch area, which
+     then would need to be amended.
+*/
+
+#include <stdlib.h>		/* for NULL */
+#include "gmp-impl.h"
+
+
+mp_limb_t
+mpn_mu_div_q (mp_ptr qp,
+	      mp_srcptr np, mp_size_t nn,
+	      mp_srcptr dp, mp_size_t dn,
+	      mp_ptr scratch)
+{
+  mp_ptr tp, rp;
+  mp_size_t qn;
+  mp_limb_t cy, qh;
+  TMP_DECL;
+
+  TMP_MARK;
+
+  qn = nn - dn;
+
+  tp = TMP_BALLOC_LIMBS (qn + 1);
+
+  if (qn >= dn)			/* nn >= 2*dn + 1 */
+    {
+       /* |_______________________|   dividend
+			 |________|   divisor  */
+
+      rp = TMP_BALLOC_LIMBS (nn + 1);
+      MPN_COPY (rp + 1, np, nn);
+      rp[0] = 0;
+
+      qh = mpn_cmp (rp + 1 + nn - dn, dp, dn) >= 0;
+      if (qh != 0)
+	mpn_sub_n (rp + 1 + nn - dn, rp + 1 + nn - dn, dp, dn);
+
+      cy = mpn_mu_divappr_q (tp, rp, nn + 1, dp, dn, scratch);
+
+      if (UNLIKELY (cy != 0))
+	{
+	  /* Since the partial remainder fed to mpn_preinv_mu_divappr_q was
+	     canonically reduced, replace the returned value of B^(qn-dn)+eps
+	     by the largest possible value.  */
+	  mp_size_t i;
+	  for (i = 0; i < qn + 1; i++)
+	    tp[i] = GMP_NUMB_MAX;
+	}
+
+      /* The max error of mpn_mu_divappr_q is +4.  If the low quotient limb is
+	 smaller than the max error, we cannot trust the quotient.  */
+      if (tp[0] > 4)
+	{
+	  MPN_COPY (qp, tp + 1, qn);
+	}
+      else
+	{
+	  mp_limb_t cy;
+	  mp_ptr pp;
+
+	  pp = rp;
+	  mpn_mul (pp, tp + 1, qn, dp, dn);
+
+	  cy = (qh != 0) ? mpn_add_n (pp + qn, pp + qn, dp, dn) : 0;
+
+	  if (cy || mpn_cmp (pp, np, nn) > 0) /* At most is wrong by one, no cycle. */
+	    qh -= mpn_sub_1 (qp, tp + 1, qn, 1);
+	  else /* Same as above */
+	    MPN_COPY (qp, tp + 1, qn);
+	}
+    }
+  else
+    {
+       /* |_______________________|   dividend
+		 |________________|   divisor  */
+
+      /* FIXME: When nn = 2dn-1, qn becomes dn-1, and the numerator size passed
+	 here becomes 2dn, i.e., more than nn.  This shouldn't hurt, since only
+	 the most significant dn-1 limbs will actually be read, but it is not
+	 pretty.  */
+
+      qh = mpn_mu_divappr_q (tp, np + nn - (2 * qn + 2), 2 * qn + 2,
+			     dp + dn - (qn + 1), qn + 1, scratch);
+
+      /* The max error of mpn_mu_divappr_q is +4, but we get an additional
+         error from the divisor truncation.  */
+      if (tp[0] > 6)
+	{
+	  MPN_COPY (qp, tp + 1, qn);
+	}
+      else
+	{
+	  mp_limb_t cy;
+
+	  /* FIXME: a shorter product should be enough; we may use already
+	     allocated space... */
+	  rp = TMP_BALLOC_LIMBS (nn);
+	  mpn_mul (rp, dp, dn, tp + 1, qn);
+
+	  cy = (qh != 0) ? mpn_add_n (rp + qn, rp + qn, dp, dn) : 0;
+
+	  if (cy || mpn_cmp (rp, np, nn) > 0) /* At most is wrong by one, no cycle. */
+	    qh -= mpn_sub_1 (qp, tp + 1, qn, 1);
+	  else /* Same as above */
+	    MPN_COPY (qp, tp + 1, qn);
+	}
+    }
+
+  TMP_FREE;
+  return qh;
+}
+
+mp_size_t
+mpn_mu_div_q_itch (mp_size_t nn, mp_size_t dn, int mua_k)
+{
+  mp_size_t qn;
+
+  qn = nn - dn;
+  if (qn >= dn)
+    {
+      return mpn_mu_divappr_q_itch (nn + 1, dn, mua_k);
+    }
+  else
+    {
+      return mpn_mu_divappr_q_itch (2 * qn + 2, qn + 1, mua_k);
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_qr.c
deleted file mode 120000
index 456619627..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_qr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mu_div_qr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_qr.c
new file mode 100644
index 000000000..8b9c702b9
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_div_qr.c
@@ -0,0 +1,417 @@
+/* mpn_mu_div_qr, mpn_preinv_mu_div_qr.
+
+   Compute Q = floor(N / D) and R = N-QD.  N is nn limbs and D is dn limbs and
+   must be normalized, and Q must be nn-dn limbs.  The requirement that Q is
+   nn-dn limbs (and not nn-dn+1 limbs) was put in place in order to allow us to
+   let N be unmodified during the operation.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2005-2007, 2009, 2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/*
+   The idea of the algorithm used herein is to compute a smaller inverted value
+   than used in the standard Barrett algorithm, and thus save time in the
+   Newton iterations, and pay just a small price when using the inverted value
+   for developing quotient bits.  This algorithm was presented at ICMS 2006.
+*/
+
+/* CAUTION: This code and the code in mu_divappr_q.c should be edited in sync.
+
+ Things to work on:
+
+  * This isn't optimal when the quotient isn't needed, as it might take a lot
+    of space.  The computation is always needed, though, so there is no time to
+    save with special code.
+
+  * The itch/scratch scheme isn't perhaps such a good idea as it once seemed,
+    demonstrated by the fact that the mpn_invertappr function's scratch needs
+    mean that we need to keep a large allocation long after it is needed.
+    Things are worse as mpn_mul_fft does not accept any scratch parameter,
+    which means we'll have a large memory hole while in mpn_mul_fft.  In
+    general, a peak scratch need in the beginning of a function isn't
+    well-handled by the itch/scratch scheme.
+*/
+
+#ifdef STAT
+#undef STAT
+#define STAT(x) x
+#else
+#define STAT(x)
+#endif
+
+#include <stdlib.h>		/* for NULL */
+#include "gmp-impl.h"
+
+
+/* FIXME: The MU_DIV_QR_SKEW_THRESHOLD was not analysed properly.  It gives a
+   speedup according to old measurements, but does the decision mechanism
+   really make sense?  It seem like the quotient between dn and qn might be
+   what we really should be checking.  */
+#ifndef MU_DIV_QR_SKEW_THRESHOLD
+#define MU_DIV_QR_SKEW_THRESHOLD 100
+#endif
+
+#ifdef CHECK				/* FIXME: Enable in minithres */
+#undef  MU_DIV_QR_SKEW_THRESHOLD
+#define MU_DIV_QR_SKEW_THRESHOLD 1
+#endif
+
+
+static mp_limb_t mpn_mu_div_qr2 (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
+static mp_size_t mpn_mu_div_qr_choose_in (mp_size_t, mp_size_t, int);
+
+
+mp_limb_t
+mpn_mu_div_qr (mp_ptr qp,
+	       mp_ptr rp,
+	       mp_srcptr np,
+	       mp_size_t nn,
+	       mp_srcptr dp,
+	       mp_size_t dn,
+	       mp_ptr scratch)
+{
+  mp_size_t qn;
+  mp_limb_t cy, qh;
+
+  qn = nn - dn;
+  if (qn + MU_DIV_QR_SKEW_THRESHOLD < dn)
+    {
+      /* |______________|_ign_first__|   dividend			  nn
+		|_______|_ign_first__|   divisor			  dn
+
+		|______|	     quotient (prel)			  qn
+
+		 |___________________|   quotient * ignored-divisor-part  dn-1
+      */
+
+      /* Compute a preliminary quotient and a partial remainder by dividing the
+	 most significant limbs of each operand.  */
+      qh = mpn_mu_div_qr2 (qp, rp + nn - (2 * qn + 1),
+			   np + nn - (2 * qn + 1), 2 * qn + 1,
+			   dp + dn - (qn + 1), qn + 1,
+			   scratch);
+
+      /* Multiply the quotient by the divisor limbs ignored above.  */
+      if (dn - (qn + 1) > qn)
+	mpn_mul (scratch, dp, dn - (qn + 1), qp, qn);  /* prod is dn-1 limbs */
+      else
+	mpn_mul (scratch, qp, qn, dp, dn - (qn + 1));  /* prod is dn-1 limbs */
+
+      if (qh)
+	cy = mpn_add_n (scratch + qn, scratch + qn, dp, dn - (qn + 1));
+      else
+	cy = 0;
+      scratch[dn - 1] = cy;
+
+      cy = mpn_sub_n (rp, np, scratch, nn - (2 * qn + 1));
+      cy = mpn_sub_nc (rp + nn - (2 * qn + 1),
+		       rp + nn - (2 * qn + 1),
+		       scratch + nn - (2 * qn + 1),
+		       qn + 1, cy);
+      if (cy)
+	{
+	  qh -= mpn_sub_1 (qp, qp, qn, 1);
+	  mpn_add_n (rp, rp, dp, dn);
+	}
+    }
+  else
+    {
+      qh = mpn_mu_div_qr2 (qp, rp, np, nn, dp, dn, scratch);
+    }
+
+  return qh;
+}
+
+static mp_limb_t
+mpn_mu_div_qr2 (mp_ptr qp,
+		mp_ptr rp,
+		mp_srcptr np,
+		mp_size_t nn,
+		mp_srcptr dp,
+		mp_size_t dn,
+		mp_ptr scratch)
+{
+  mp_size_t qn, in;
+  mp_limb_t cy, qh;
+  mp_ptr ip, tp;
+
+  ASSERT (dn > 1);
+
+  qn = nn - dn;
+
+  /* Compute the inverse size.  */
+  in = mpn_mu_div_qr_choose_in (qn, dn, 0);
+  ASSERT (in <= dn);
+
+#if 1
+  /* This alternative inverse computation method gets slightly more accurate
+     results.  FIXMEs: (1) Temp allocation needs not analysed (2) itch function
+     not adapted (3) mpn_invertappr scratch needs not met.  */
+  ip = scratch;
+  tp = scratch + in + 1;
+
+  /* compute an approximate inverse on (in+1) limbs */
+  if (dn == in)
+    {
+      MPN_COPY (tp + 1, dp, in);
+      tp[0] = 1;
+      mpn_invertappr (ip, tp, in + 1, tp + in + 1);
+      MPN_COPY_INCR (ip, ip + 1, in);
+    }
+  else
+    {
+      cy = mpn_add_1 (tp, dp + dn - (in + 1), in + 1, 1);
+      if (UNLIKELY (cy != 0))
+	MPN_ZERO (ip, in);
+      else
+	{
+	  mpn_invertappr (ip, tp, in + 1, tp + in + 1);
+	  MPN_COPY_INCR (ip, ip + 1, in);
+	}
+    }
+#else
+  /* This older inverse computation method gets slightly worse results than the
+     one above.  */
+  ip = scratch;
+  tp = scratch + in;
+
+  /* Compute inverse of D to in+1 limbs, then round to 'in' limbs.  Ideally the
+     inversion function should do this automatically.  */
+  if (dn == in)
+    {
+      tp[in + 1] = 0;
+      MPN_COPY (tp + in + 2, dp, in);
+      mpn_invertappr (tp, tp + in + 1, in + 1, NULL);
+    }
+  else
+    {
+      mpn_invertappr (tp, dp + dn - (in + 1), in + 1, NULL);
+    }
+  cy = mpn_sub_1 (tp, tp, in + 1, GMP_NUMB_HIGHBIT);
+  if (UNLIKELY (cy != 0))
+    MPN_ZERO (tp + 1, in);
+  MPN_COPY (ip, tp + 1, in);
+#endif
+
+  qh = mpn_preinv_mu_div_qr (qp, rp, np, nn, dp, dn, ip, in, scratch + in);
+
+  return qh;
+}
+
+mp_limb_t
+mpn_preinv_mu_div_qr (mp_ptr qp,
+		      mp_ptr rp,
+		      mp_srcptr np,
+		      mp_size_t nn,
+		      mp_srcptr dp,
+		      mp_size_t dn,
+		      mp_srcptr ip,
+		      mp_size_t in,
+		      mp_ptr scratch)
+{
+  mp_size_t qn;
+  mp_limb_t cy, cx, qh;
+  mp_limb_t r;
+  mp_size_t tn, wn;
+
+#define tp           scratch
+#define scratch_out  (scratch + tn)
+
+  qn = nn - dn;
+
+  np += qn;
+  qp += qn;
+
+  qh = mpn_cmp (np, dp, dn) >= 0;
+  if (qh != 0)
+    mpn_sub_n (rp, np, dp, dn);
+  else
+    MPN_COPY_INCR (rp, np, dn);
+
+  /* if (qn == 0) */			/* The while below handles this case */
+  /*   return qh; */			/* Degenerate use.  Should we allow this? */
+
+  while (qn > 0)
+    {
+      if (qn < in)
+	{
+	  ip += in - qn;
+	  in = qn;
+	}
+      np -= in;
+      qp -= in;
+
+      /* Compute the next block of quotient limbs by multiplying the inverse I
+	 by the upper part of the partial remainder R.  */
+      mpn_mul_n (tp, rp + dn - in, ip, in);		/* mulhi  */
+      cy = mpn_add_n (qp, tp + in, rp + dn - in, in);	/* I's msb implicit */
+      ASSERT_ALWAYS (cy == 0);
+
+      qn -= in;
+
+      /* Compute the product of the quotient block and the divisor D, to be
+	 subtracted from the partial remainder combined with new limbs from the
+	 dividend N.  We only really need the low dn+1 limbs.  */
+
+      if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	mpn_mul (tp, dp, dn, qp, in);		/* dn+in limbs, high 'in' cancels */
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (dn + 1);
+	  mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, in, scratch_out);
+	  wn = dn + in - tn;			/* number of wrapped limbs */
+	  if (wn > 0)
+	    {
+	      cy = mpn_sub_n (tp, tp, rp + dn - wn, wn);
+	      cy = mpn_sub_1 (tp + wn, tp + wn, tn - wn, cy);
+	      cx = mpn_cmp (rp + dn - in, tp + dn, tn - dn) < 0;
+	      ASSERT_ALWAYS (cx >= cy);
+	      mpn_incr_u (tp, cx - cy);
+	    }
+	}
+
+      r = rp[dn - in] - tp[dn];
+
+      /* Subtract the product from the partial remainder combined with new
+	 limbs from the dividend N, generating a new partial remainder R.  */
+      if (dn != in)
+	{
+	  cy = mpn_sub_n (tp, np, tp, in);	/* get next 'in' limbs from N */
+	  cy = mpn_sub_nc (tp + in, rp, tp + in, dn - in, cy);
+	  MPN_COPY (rp, tp, dn);		/* FIXME: try to avoid this */
+	}
+      else
+	{
+	  cy = mpn_sub_n (rp, np, tp, in);	/* get next 'in' limbs from N */
+	}
+
+      STAT (int i; int err = 0;
+	    static int errarr[5]; static int err_rec; static int tot);
+
+      /* Check the remainder R and adjust the quotient as needed.  */
+      r -= cy;
+      while (r != 0)
+	{
+	  /* We loop 0 times with about 69% probability, 1 time with about 31%
+	     probability, 2 times with about 0.6% probability, if inverse is
+	     computed as recommended.  */
+	  mpn_incr_u (qp, 1);
+	  cy = mpn_sub_n (rp, rp, dp, dn);
+	  r -= cy;
+	  STAT (err++);
+	}
+      if (mpn_cmp (rp, dp, dn) >= 0)
+	{
+	  /* This is executed with about 76% probability.  */
+	  mpn_incr_u (qp, 1);
+	  cy = mpn_sub_n (rp, rp, dp, dn);
+	  STAT (err++);
+	}
+
+      STAT (
+	    tot++;
+	    errarr[err]++;
+	    if (err > err_rec)
+	      err_rec = err;
+	    if (tot % 0x10000 == 0)
+	      {
+		for (i = 0; i <= err_rec; i++)
+		  printf ("  %d(%.1f%%)", errarr[i], 100.0*errarr[i]/tot);
+		printf ("\n");
+	      }
+	    );
+    }
+
+  return qh;
+}
+
+/* In case k=0 (automatic choice), we distinguish 3 cases:
+   (a) dn < qn:         in = ceil(qn / ceil(qn/dn))
+   (b) dn/3 < qn <= dn: in = ceil(qn / 2)
+   (c) qn < dn/3:       in = qn
+   In all cases we have in <= dn.
+ */
+static mp_size_t
+mpn_mu_div_qr_choose_in (mp_size_t qn, mp_size_t dn, int k)
+{
+  mp_size_t in;
+
+  if (k == 0)
+    {
+      mp_size_t b;
+      if (qn > dn)
+	{
+	  /* Compute an inverse size that is a nice partition of the quotient.  */
+	  b = (qn - 1) / dn + 1;	/* ceil(qn/dn), number of blocks */
+	  in = (qn - 1) / b + 1;	/* ceil(qn/b) = ceil(qn / ceil(qn/dn)) */
+	}
+      else if (3 * qn > dn)
+	{
+	  in = (qn - 1) / 2 + 1;	/* b = 2 */
+	}
+      else
+	{
+	  in = (qn - 1) / 1 + 1;	/* b = 1 */
+	}
+    }
+  else
+    {
+      mp_size_t xn;
+      xn = MIN (dn, qn);
+      in = (xn - 1) / k + 1;
+    }
+
+  return in;
+}
+
+mp_size_t
+mpn_mu_div_qr_itch (mp_size_t nn, mp_size_t dn, int mua_k)
+{
+  mp_size_t in = mpn_mu_div_qr_choose_in (nn - dn, dn, mua_k);
+  mp_size_t itch_preinv = mpn_preinv_mu_div_qr_itch (nn, dn, in);
+  mp_size_t itch_invapp = mpn_invertappr_itch (in + 1) + in + 2; /* 3in + 4 */
+
+  ASSERT (itch_preinv >= itch_invapp);
+  return in + MAX (itch_invapp, itch_preinv);
+}
+
+mp_size_t
+mpn_preinv_mu_div_qr_itch (mp_size_t nn, mp_size_t dn, mp_size_t in)
+{
+  mp_size_t itch_local = mpn_mulmod_bnm1_next_size (dn + 1);
+  mp_size_t itch_out = mpn_mulmod_bnm1_itch (itch_local, dn, in);
+
+  return itch_local + itch_out;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_divappr_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_divappr_q.c
deleted file mode 120000
index a06e1cd7b..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_divappr_q.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mu_divappr_q.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_divappr_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_divappr_q.c
new file mode 100644
index 000000000..c022b4f10
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mu_divappr_q.c
@@ -0,0 +1,368 @@
+/* mpn_mu_divappr_q, mpn_preinv_mu_divappr_q.
+
+   Compute Q = floor(N / D) + e.  N is nn limbs, D is dn limbs and must be
+   normalized, and Q must be nn-dn limbs, 0 <= e <= 4.  The requirement that Q
+   is nn-dn limbs (and not nn-dn+1 limbs) was put in place in order to allow us
+   to let N be unmodified during the operation.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2005-2007, 2009, 2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/*
+   The idea of the algorithm used herein is to compute a smaller inverted value
+   than used in the standard Barrett algorithm, and thus save time in the
+   Newton iterations, and pay just a small price when using the inverted value
+   for developing quotient bits.  This algorithm was presented at ICMS 2006.
+*/
+
+/* CAUTION: This code and the code in mu_div_qr.c should be edited in sync.
+
+ Things to work on:
+
+  * The itch/scratch scheme isn't perhaps such a good idea as it once seemed,
+    demonstrated by the fact that the mpn_invertappr function's scratch needs
+    mean that we need to keep a large allocation long after it is needed.
+    Things are worse as mpn_mul_fft does not accept any scratch parameter,
+    which means we'll have a large memory hole while in mpn_mul_fft.  In
+    general, a peak scratch need in the beginning of a function isn't
+    well-handled by the itch/scratch scheme.
+*/
+
+#ifdef STAT
+#undef STAT
+#define STAT(x) x
+#else
+#define STAT(x)
+#endif
+
+#include <stdlib.h>		/* for NULL */
+#include "gmp-impl.h"
+
+static mp_limb_t mpn_preinv_mu_divappr_q (mp_ptr, mp_srcptr, mp_size_t,
+			 mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
+static mp_size_t mpn_mu_divappr_q_choose_in (mp_size_t, mp_size_t, int);
+
+mp_limb_t
+mpn_mu_divappr_q (mp_ptr qp,
+		  mp_srcptr np,
+		  mp_size_t nn,
+		  mp_srcptr dp,
+		  mp_size_t dn,
+		  mp_ptr scratch)
+{
+  mp_size_t qn, in;
+  mp_limb_t cy, qh;
+  mp_ptr ip, tp;
+
+  ASSERT (dn > 1);
+
+  qn = nn - dn;
+
+  /* If Q is smaller than D, truncate operands. */
+  if (qn + 1 < dn)
+    {
+      np += dn - (qn + 1);
+      nn -= dn - (qn + 1);
+      dp += dn - (qn + 1);
+      dn = qn + 1;
+    }
+
+  /* Compute the inverse size.  */
+  in = mpn_mu_divappr_q_choose_in (qn, dn, 0);
+  ASSERT (in <= dn);
+
+#if 1
+  /* This alternative inverse computation method gets slightly more accurate
+     results.  FIXMEs: (1) Temp allocation needs not analysed (2) itch function
+     not adapted (3) mpn_invertappr scratch needs not met.  */
+  ip = scratch;
+  tp = scratch + in + 1;
+
+  /* compute an approximate inverse on (in+1) limbs */
+  if (dn == in)
+    {
+      MPN_COPY (tp + 1, dp, in);
+      tp[0] = 1;
+      mpn_invertappr (ip, tp, in + 1, tp + in + 1);
+      MPN_COPY_INCR (ip, ip + 1, in);
+    }
+  else
+    {
+      cy = mpn_add_1 (tp, dp + dn - (in + 1), in + 1, 1);
+      if (UNLIKELY (cy != 0))
+	MPN_ZERO (ip, in);
+      else
+	{
+	  mpn_invertappr (ip, tp, in + 1, tp + in + 1);
+	  MPN_COPY_INCR (ip, ip + 1, in);
+	}
+    }
+#else
+  /* This older inverse computation method gets slightly worse results than the
+     one above.  */
+  ip = scratch;
+  tp = scratch + in;
+
+  /* Compute inverse of D to in+1 limbs, then round to 'in' limbs.  Ideally the
+     inversion function should do this automatically.  */
+  if (dn == in)
+    {
+      tp[in + 1] = 0;
+      MPN_COPY (tp + in + 2, dp, in);
+      mpn_invertappr (tp, tp + in + 1, in + 1, NULL);
+    }
+  else
+    {
+      mpn_invertappr (tp, dp + dn - (in + 1), in + 1, NULL);
+    }
+  cy = mpn_sub_1 (tp, tp, in + 1, GMP_NUMB_HIGHBIT);
+  if (UNLIKELY (cy != 0))
+    MPN_ZERO (tp + 1, in);
+  MPN_COPY (ip, tp + 1, in);
+#endif
+
+  qh = mpn_preinv_mu_divappr_q (qp, np, nn, dp, dn, ip, in, scratch + in);
+
+  return qh;
+}
+
+static mp_limb_t
+mpn_preinv_mu_divappr_q (mp_ptr qp,
+			 mp_srcptr np,
+			 mp_size_t nn,
+			 mp_srcptr dp,
+			 mp_size_t dn,
+			 mp_srcptr ip,
+			 mp_size_t in,
+			 mp_ptr scratch)
+{
+  mp_size_t qn;
+  mp_limb_t cy, cx, qh;
+  mp_limb_t r;
+  mp_size_t tn, wn;
+
+#define rp           scratch
+#define tp           (scratch + dn)
+#define scratch_out  (scratch + dn + tn)
+
+  qn = nn - dn;
+
+  np += qn;
+  qp += qn;
+
+  qh = mpn_cmp (np, dp, dn) >= 0;
+  if (qh != 0)
+    mpn_sub_n (rp, np, dp, dn);
+  else
+    MPN_COPY (rp, np, dn);
+
+  if (qn == 0)
+    return qh;			/* Degenerate use.  Should we allow this? */
+
+  while (qn > 0)
+    {
+      if (qn < in)
+	{
+	  ip += in - qn;
+	  in = qn;
+	}
+      np -= in;
+      qp -= in;
+
+      /* Compute the next block of quotient limbs by multiplying the inverse I
+	 by the upper part of the partial remainder R.  */
+      mpn_mul_n (tp, rp + dn - in, ip, in);		/* mulhi  */
+      cy = mpn_add_n (qp, tp + in, rp + dn - in, in);	/* I's msb implicit */
+      ASSERT_ALWAYS (cy == 0);
+
+      qn -= in;
+      if (qn == 0)
+	break;
+
+      /* Compute the product of the quotient block and the divisor D, to be
+	 subtracted from the partial remainder combined with new limbs from the
+	 dividend N.  We only really need the low dn limbs.  */
+
+      if (BELOW_THRESHOLD (in, MUL_TO_MULMOD_BNM1_FOR_2NXN_THRESHOLD))
+	mpn_mul (tp, dp, dn, qp, in);		/* dn+in limbs, high 'in' cancels */
+      else
+	{
+	  tn = mpn_mulmod_bnm1_next_size (dn + 1);
+	  mpn_mulmod_bnm1 (tp, tn, dp, dn, qp, in, scratch_out);
+	  wn = dn + in - tn;			/* number of wrapped limbs */
+	  if (wn > 0)
+	    {
+	      cy = mpn_sub_n (tp, tp, rp + dn - wn, wn);
+	      cy = mpn_sub_1 (tp + wn, tp + wn, tn - wn, cy);
+	      cx = mpn_cmp (rp + dn - in, tp + dn, tn - dn) < 0;
+	      ASSERT_ALWAYS (cx >= cy);
+	      mpn_incr_u (tp, cx - cy);
+	    }
+	}
+
+      r = rp[dn - in] - tp[dn];
+
+      /* Subtract the product from the partial remainder combined with new
+	 limbs from the dividend N, generating a new partial remainder R.  */
+      if (dn != in)
+	{
+	  cy = mpn_sub_n (tp, np, tp, in);	/* get next 'in' limbs from N */
+	  cy = mpn_sub_nc (tp + in, rp, tp + in, dn - in, cy);
+	  MPN_COPY (rp, tp, dn);		/* FIXME: try to avoid this */
+	}
+      else
+	{
+	  cy = mpn_sub_n (rp, np, tp, in);	/* get next 'in' limbs from N */
+	}
+
+      STAT (int i; int err = 0;
+	    static int errarr[5]; static int err_rec; static int tot);
+
+      /* Check the remainder R and adjust the quotient as needed.  */
+      r -= cy;
+      while (r != 0)
+	{
+	  /* We loop 0 times with about 69% probability, 1 time with about 31%
+	     probability, 2 times with about 0.6% probability, if inverse is
+	     computed as recommended.  */
+	  mpn_incr_u (qp, 1);
+	  cy = mpn_sub_n (rp, rp, dp, dn);
+	  r -= cy;
+	  STAT (err++);
+	}
+      if (mpn_cmp (rp, dp, dn) >= 0)
+	{
+	  /* This is executed with about 76% probability.  */
+	  mpn_incr_u (qp, 1);
+	  cy = mpn_sub_n (rp, rp, dp, dn);
+	  STAT (err++);
+	}
+
+      STAT (
+	    tot++;
+	    errarr[err]++;
+	    if (err > err_rec)
+	      err_rec = err;
+	    if (tot % 0x10000 == 0)
+	      {
+		for (i = 0; i <= err_rec; i++)
+		  printf ("  %d(%.1f%%)", errarr[i], 100.0*errarr[i]/tot);
+		printf ("\n");
+	      }
+	    );
+    }
+
+  /* FIXME: We should perhaps be somewhat more elegant in our rounding of the
+     quotient.  For now, just make sure the returned quotient is >= the real
+     quotient; add 3 with saturating arithmetic.  */
+  qn = nn - dn;
+  cy += mpn_add_1 (qp, qp, qn, 3);
+  if (cy != 0)
+    {
+      if (qh != 0)
+	{
+	  /* Return a quotient of just 1-bits, with qh set.  */
+	  mp_size_t i;
+	  for (i = 0; i < qn; i++)
+	    qp[i] = GMP_NUMB_MAX;
+	}
+      else
+	{
+	  /* Propagate carry into qh.  */
+	  qh = 1;
+	}
+    }
+
+  return qh;
+}
+
+/* In case k=0 (automatic choice), we distinguish 3 cases:
+   (a) dn < qn:         in = ceil(qn / ceil(qn/dn))
+   (b) dn/3 < qn <= dn: in = ceil(qn / 2)
+   (c) qn < dn/3:       in = qn
+   In all cases we have in <= dn.
+ */
+static mp_size_t
+mpn_mu_divappr_q_choose_in (mp_size_t qn, mp_size_t dn, int k)
+{
+  mp_size_t in;
+
+  if (k == 0)
+    {
+      mp_size_t b;
+      if (qn > dn)
+	{
+	  /* Compute an inverse size that is a nice partition of the quotient.  */
+	  b = (qn - 1) / dn + 1;	/* ceil(qn/dn), number of blocks */
+	  in = (qn - 1) / b + 1;	/* ceil(qn/b) = ceil(qn / ceil(qn/dn)) */
+	}
+      else if (3 * qn > dn)
+	{
+	  in = (qn - 1) / 2 + 1;	/* b = 2 */
+	}
+      else
+	{
+	  in = (qn - 1) / 1 + 1;	/* b = 1 */
+	}
+    }
+  else
+    {
+      mp_size_t xn;
+      xn = MIN (dn, qn);
+      in = (xn - 1) / k + 1;
+    }
+
+  return in;
+}
+
+mp_size_t
+mpn_mu_divappr_q_itch (mp_size_t nn, mp_size_t dn, int mua_k)
+{
+  mp_size_t qn, in, itch_local, itch_out, itch_invapp;
+
+  qn = nn - dn;
+  if (qn + 1 < dn)
+    {
+      dn = qn + 1;
+    }
+  in = mpn_mu_divappr_q_choose_in (qn, dn, mua_k);
+
+  itch_local = mpn_mulmod_bnm1_next_size (dn + 1);
+  itch_out = mpn_mulmod_bnm1_itch (itch_local, dn, in);
+  itch_invapp = mpn_invertappr_itch (in + 1) + in + 2; /* 3in + 4 */
+
+  ASSERT (dn + itch_local + itch_out >= itch_invapp);
+  return in + MAX (dn + itch_local + itch_out, itch_invapp);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul.c
deleted file mode 120000
index f7ede4fb9..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul.c
new file mode 100644
index 000000000..37444e91b
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul.c
@@ -0,0 +1,441 @@
+/* mpn_mul -- Multiply two natural numbers.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+Copyright 1991, 1993, 1994, 1996, 1997, 1999-2003, 2005-2007, 2009, 2010, 2012,
+2014, 2019 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+#ifndef MUL_BASECASE_MAX_UN
+#define MUL_BASECASE_MAX_UN 500
+#endif
+
+/* Areas where the different toom algorithms can be called (extracted
+   from the t-toom*.c files, and ignoring small constant offsets):
+
+   1/6  1/5 1/4 4/13 1/3 3/8 2/5 5/11 1/2 3/5 2/3 3/4 4/5   1 vn/un
+                                        4/7              6/7
+				       6/11
+                                       |--------------------| toom22 (small)
+                                                           || toom22 (large)
+                                                       |xxxx| toom22 called
+                      |-------------------------------------| toom32
+                                         |xxxxxxxxxxxxxxxx| | toom32 called
+                                               |------------| toom33
+                                                          |x| toom33 called
+             |---------------------------------|            | toom42
+	              |xxxxxxxxxxxxxxxxxxxxxxxx|            | toom42 called
+                                       |--------------------| toom43
+                                               |xxxxxxxxxx|   toom43 called
+         |-----------------------------|                      toom52 (unused)
+                                                   |--------| toom44
+						   |xxxxxxxx| toom44 called
+                              |--------------------|        | toom53
+                                        |xxxxxx|              toom53 called
+    |-------------------------|                               toom62 (unused)
+                                           |----------------| toom54 (unused)
+                      |--------------------|                  toom63
+	                      |xxxxxxxxx|                   | toom63 called
+                          |---------------------------------| toom6h
+						   |xxxxxxxx| toom6h called
+                                  |-------------------------| toom8h (32 bit)
+                 |------------------------------------------| toom8h (64 bit)
+						   |xxxxxxxx| toom8h called
+*/
+
+#define TOOM33_OK(an,bn) (6 + 2 * an < 3 * bn)
+#define TOOM44_OK(an,bn) (12 + 3 * an < 4 * bn)
+
+/* Multiply the natural numbers u (pointed to by UP, with UN limbs) and v
+   (pointed to by VP, with VN limbs), and store the result at PRODP.  The
+   result is UN + VN limbs.  Return the most significant limb of the result.
+
+   NOTE: The space pointed to by PRODP is overwritten before finished with U
+   and V, so overlap is an error.
+
+   Argument constraints:
+   1. UN >= VN.
+   2. PRODP != UP and PRODP != VP, i.e. the destination must be distinct from
+      the multiplier and the multiplicand.  */
+
+/*
+  * The cutoff lines in the toomX2 and toomX3 code are now exactly between the
+    ideal lines of the surrounding algorithms.  Is that optimal?
+
+  * The toomX3 code now uses a structure similar to the one of toomX2, except
+    that it loops longer in the unbalanced case.  The result is that the
+    remaining area might have un < vn.  Should we fix the toomX2 code in a
+    similar way?
+
+  * The toomX3 code is used for the largest non-FFT unbalanced operands.  It
+    therefore calls mpn_mul recursively for certain cases.
+
+  * Allocate static temp space using THRESHOLD variables (except for toom44
+    when !WANT_FFT).  That way, we can typically have no TMP_ALLOC at all.
+
+  * We sort ToomX2 algorithms together, assuming the toom22, toom32, toom42
+    have the same vn threshold.  This is not true, we should actually use
+    mul_basecase for slightly larger operands for toom32 than for toom22, and
+    even larger for toom42.
+
+  * That problem is even more prevalent for toomX3.  We therefore use special
+    THRESHOLD variables there.
+*/
+
+mp_limb_t
+mpn_mul (mp_ptr prodp,
+	 mp_srcptr up, mp_size_t un,
+	 mp_srcptr vp, mp_size_t vn)
+{
+  ASSERT (un >= vn);
+  ASSERT (vn >= 1);
+  ASSERT (! MPN_OVERLAP_P (prodp, un+vn, up, un));
+  ASSERT (! MPN_OVERLAP_P (prodp, un+vn, vp, vn));
+
+  if (BELOW_THRESHOLD (un, MUL_TOOM22_THRESHOLD))
+    {
+      /* When un (and thus vn) is below the toom22 range, do mul_basecase.
+	 Test un and not vn here not to thwart the un >> vn code below.
+	 This special case is not necessary, but cuts the overhead for the
+	 smallest operands. */
+      mpn_mul_basecase (prodp, up, un, vp, vn);
+    }
+  else if (un == vn)
+    {
+      mpn_mul_n (prodp, up, vp, un);
+    }
+  else if (vn < MUL_TOOM22_THRESHOLD)
+    { /* plain schoolbook multiplication */
+
+      /* Unless un is very large, or else if have an applicable mpn_mul_N,
+	 perform basecase multiply directly.  */
+      if (un <= MUL_BASECASE_MAX_UN
+#if HAVE_NATIVE_mpn_mul_2
+	  || vn <= 2
+#else
+	  || vn == 1
+#endif
+	  )
+	mpn_mul_basecase (prodp, up, un, vp, vn);
+      else
+	{
+	  /* We have un >> MUL_BASECASE_MAX_UN > vn.  For better memory
+	     locality, split up[] into MUL_BASECASE_MAX_UN pieces and multiply
+	     these pieces with the vp[] operand.  After each such partial
+	     multiplication (but the last) we copy the most significant vn
+	     limbs into a temporary buffer since that part would otherwise be
+	     overwritten by the next multiplication.  After the next
+	     multiplication, we add it back.  This illustrates the situation:
+
+                                                    -->vn<--
+                                                      |  |<------- un ------->|
+                                                         _____________________|
+                                                        X                    /|
+                                                      /XX__________________/  |
+                                    _____________________                     |
+                                   X                    /                     |
+                                 /XX__________________/                       |
+               _____________________                                          |
+              /                    /                                          |
+            /____________________/                                            |
+	    ==================================================================
+
+	    The parts marked with X are the parts whose sums are copied into
+	    the temporary buffer.  */
+
+	  mp_limb_t tp[MUL_TOOM22_THRESHOLD_LIMIT];
+	  mp_limb_t cy;
+	  ASSERT (MUL_TOOM22_THRESHOLD <= MUL_TOOM22_THRESHOLD_LIMIT);
+
+	  mpn_mul_basecase (prodp, up, MUL_BASECASE_MAX_UN, vp, vn);
+	  prodp += MUL_BASECASE_MAX_UN;
+	  MPN_COPY (tp, prodp, vn);		/* preserve high triangle */
+	  up += MUL_BASECASE_MAX_UN;
+	  un -= MUL_BASECASE_MAX_UN;
+	  while (un > MUL_BASECASE_MAX_UN)
+	    {
+	      mpn_mul_basecase (prodp, up, MUL_BASECASE_MAX_UN, vp, vn);
+	      cy = mpn_add_n (prodp, prodp, tp, vn); /* add back preserved triangle */
+	      mpn_incr_u (prodp + vn, cy);
+	      prodp += MUL_BASECASE_MAX_UN;
+	      MPN_COPY (tp, prodp, vn);		/* preserve high triangle */
+	      up += MUL_BASECASE_MAX_UN;
+	      un -= MUL_BASECASE_MAX_UN;
+	    }
+	  if (un > vn)
+	    {
+	      mpn_mul_basecase (prodp, up, un, vp, vn);
+	    }
+	  else
+	    {
+	      ASSERT (un > 0);
+	      mpn_mul_basecase (prodp, vp, vn, up, un);
+	    }
+	  cy = mpn_add_n (prodp, prodp, tp, vn); /* add back preserved triangle */
+	  mpn_incr_u (prodp + vn, cy);
+	}
+    }
+  else if (BELOW_THRESHOLD (vn, MUL_TOOM33_THRESHOLD))
+    {
+      /* Use ToomX2 variants */
+      mp_ptr scratch;
+      TMP_SDECL; TMP_SMARK;
+
+#define ITCH_TOOMX2 (9 * vn / 2 + GMP_NUMB_BITS * 2)
+      scratch = TMP_SALLOC_LIMBS (ITCH_TOOMX2);
+      ASSERT (mpn_toom22_mul_itch ((5*vn-1)/4, vn) <= ITCH_TOOMX2); /* 5vn/2+ */
+      ASSERT (mpn_toom32_mul_itch ((7*vn-1)/4, vn) <= ITCH_TOOMX2); /* 7vn/6+ */
+      ASSERT (mpn_toom42_mul_itch (3 * vn - 1, vn) <= ITCH_TOOMX2); /* 9vn/2+ */
+#undef ITCH_TOOMX2
+
+      /* FIXME: This condition (repeated in the loop below) leaves from a vn*vn
+	 square to a (3vn-1)*vn rectangle.  Leaving such a rectangle is hardly
+	 wise; we would get better balance by slightly moving the bound.  We
+	 will sometimes end up with un < vn, like in the X3 arm below.  */
+      if (un >= 3 * vn)
+	{
+	  mp_limb_t cy;
+	  mp_ptr ws;
+
+	  /* The maximum ws usage is for the mpn_mul result.  */
+	  ws = TMP_SALLOC_LIMBS (4 * vn);
+
+	  mpn_toom42_mul (prodp, up, 2 * vn, vp, vn, scratch);
+	  un -= 2 * vn;
+	  up += 2 * vn;
+	  prodp += 2 * vn;
+
+	  while (un >= 3 * vn)
+	    {
+	      mpn_toom42_mul (ws, up, 2 * vn, vp, vn, scratch);
+	      un -= 2 * vn;
+	      up += 2 * vn;
+	      cy = mpn_add_n (prodp, prodp, ws, vn);
+	      MPN_COPY (prodp + vn, ws + vn, 2 * vn);
+	      mpn_incr_u (prodp + vn, cy);
+	      prodp += 2 * vn;
+	    }
+
+	  /* vn <= un < 3vn */
+
+	  if (4 * un < 5 * vn)
+	    mpn_toom22_mul (ws, up, un, vp, vn, scratch);
+	  else if (4 * un < 7 * vn)
+	    mpn_toom32_mul (ws, up, un, vp, vn, scratch);
+	  else
+	    mpn_toom42_mul (ws, up, un, vp, vn, scratch);
+
+	  cy = mpn_add_n (prodp, prodp, ws, vn);
+	  MPN_COPY (prodp + vn, ws + vn, un);
+	  mpn_incr_u (prodp + vn, cy);
+	}
+      else
+	{
+	  if (4 * un < 5 * vn)
+	    mpn_toom22_mul (prodp, up, un, vp, vn, scratch);
+	  else if (4 * un < 7 * vn)
+	    mpn_toom32_mul (prodp, up, un, vp, vn, scratch);
+	  else
+	    mpn_toom42_mul (prodp, up, un, vp, vn, scratch);
+	}
+      TMP_SFREE;
+    }
+  else if (BELOW_THRESHOLD ((un + vn) >> 1, MUL_FFT_THRESHOLD) ||
+	   BELOW_THRESHOLD (3 * vn, MUL_FFT_THRESHOLD))
+    {
+      /* Handle the largest operands that are not in the FFT range.  The 2nd
+	 condition makes very unbalanced operands avoid the FFT code (except
+	 perhaps as coefficient products of the Toom code.  */
+
+      if (BELOW_THRESHOLD (vn, MUL_TOOM44_THRESHOLD) || !TOOM44_OK (un, vn))
+	{
+	  /* Use ToomX3 variants */
+	  mp_ptr scratch;
+	  TMP_DECL; TMP_MARK;
+
+#define ITCH_TOOMX3 (4 * vn + GMP_NUMB_BITS)
+	  scratch = TMP_ALLOC_LIMBS (ITCH_TOOMX3);
+	  ASSERT (mpn_toom33_mul_itch ((7*vn-1)/6, vn) <= ITCH_TOOMX3); /* 7vn/2+ */
+	  ASSERT (mpn_toom43_mul_itch ((3*vn-1)/2, vn) <= ITCH_TOOMX3); /* 9vn/4+ */
+	  ASSERT (mpn_toom32_mul_itch ((7*vn-1)/4, vn) <= ITCH_TOOMX3); /* 7vn/6+ */
+	  ASSERT (mpn_toom53_mul_itch ((11*vn-1)/6, vn) <= ITCH_TOOMX3); /* 11vn/3+ */
+	  ASSERT (mpn_toom42_mul_itch ((5*vn-1)/2, vn) <= ITCH_TOOMX3); /* 15vn/4+ */
+	  ASSERT (mpn_toom63_mul_itch ((5*vn-1)/2, vn) <= ITCH_TOOMX3); /* 15vn/4+ */
+#undef ITCH_TOOMX3
+
+	  if (2 * un >= 5 * vn)
+	    {
+	      mp_limb_t cy;
+	      mp_ptr ws;
+
+	      /* The maximum ws usage is for the mpn_mul result.  */
+	      ws = TMP_ALLOC_LIMBS (7 * vn >> 1);
+
+	      if (BELOW_THRESHOLD (vn, MUL_TOOM42_TO_TOOM63_THRESHOLD))
+		mpn_toom42_mul (prodp, up, 2 * vn, vp, vn, scratch);
+	      else
+		mpn_toom63_mul (prodp, up, 2 * vn, vp, vn, scratch);
+	      un -= 2 * vn;
+	      up += 2 * vn;
+	      prodp += 2 * vn;
+
+	      while (2 * un >= 5 * vn)	/* un >= 2.5vn */
+		{
+		  if (BELOW_THRESHOLD (vn, MUL_TOOM42_TO_TOOM63_THRESHOLD))
+		    mpn_toom42_mul (ws, up, 2 * vn, vp, vn, scratch);
+		  else
+		    mpn_toom63_mul (ws, up, 2 * vn, vp, vn, scratch);
+		  un -= 2 * vn;
+		  up += 2 * vn;
+		  cy = mpn_add_n (prodp, prodp, ws, vn);
+		  MPN_COPY (prodp + vn, ws + vn, 2 * vn);
+		  mpn_incr_u (prodp + vn, cy);
+		  prodp += 2 * vn;
+		}
+
+	      /* vn / 2 <= un < 2.5vn */
+
+	      if (un < vn)
+		mpn_mul (ws, vp, vn, up, un);
+	      else
+		mpn_mul (ws, up, un, vp, vn);
+
+	      cy = mpn_add_n (prodp, prodp, ws, vn);
+	      MPN_COPY (prodp + vn, ws + vn, un);
+	      mpn_incr_u (prodp + vn, cy);
+	    }
+	  else
+	    {
+	      if (6 * un < 7 * vn)
+		mpn_toom33_mul (prodp, up, un, vp, vn, scratch);
+	      else if (2 * un < 3 * vn)
+		{
+		  if (BELOW_THRESHOLD (vn, MUL_TOOM32_TO_TOOM43_THRESHOLD))
+		    mpn_toom32_mul (prodp, up, un, vp, vn, scratch);
+		  else
+		    mpn_toom43_mul (prodp, up, un, vp, vn, scratch);
+		}
+	      else if (6 * un < 11 * vn)
+		{
+		  if (4 * un < 7 * vn)
+		    {
+		      if (BELOW_THRESHOLD (vn, MUL_TOOM32_TO_TOOM53_THRESHOLD))
+			mpn_toom32_mul (prodp, up, un, vp, vn, scratch);
+		      else
+			mpn_toom53_mul (prodp, up, un, vp, vn, scratch);
+		    }
+		  else
+		    {
+		      if (BELOW_THRESHOLD (vn, MUL_TOOM42_TO_TOOM53_THRESHOLD))
+			mpn_toom42_mul (prodp, up, un, vp, vn, scratch);
+		      else
+			mpn_toom53_mul (prodp, up, un, vp, vn, scratch);
+		    }
+		}
+	      else
+		{
+		  if (BELOW_THRESHOLD (vn, MUL_TOOM42_TO_TOOM63_THRESHOLD))
+		    mpn_toom42_mul (prodp, up, un, vp, vn, scratch);
+		  else
+		    mpn_toom63_mul (prodp, up, un, vp, vn, scratch);
+		}
+	    }
+	  TMP_FREE;
+	}
+      else
+	{
+	  mp_ptr scratch;
+	  TMP_DECL; TMP_MARK;
+
+	  if (BELOW_THRESHOLD (vn, MUL_TOOM6H_THRESHOLD))
+	    {
+	      scratch = TMP_SALLOC_LIMBS (mpn_toom44_mul_itch (un, vn));
+	      mpn_toom44_mul (prodp, up, un, vp, vn, scratch);
+	    }
+	  else if (BELOW_THRESHOLD (vn, MUL_TOOM8H_THRESHOLD))
+	    {
+	      scratch = TMP_SALLOC_LIMBS (mpn_toom6h_mul_itch (un, vn));
+	      mpn_toom6h_mul (prodp, up, un, vp, vn, scratch);
+	    }
+	  else
+	    {
+	      scratch = TMP_ALLOC_LIMBS (mpn_toom8h_mul_itch (un, vn));
+	      mpn_toom8h_mul (prodp, up, un, vp, vn, scratch);
+	    }
+	  TMP_FREE;
+	}
+    }
+  else
+    {
+      if (un >= 8 * vn)
+	{
+	  mp_limb_t cy;
+	  mp_ptr ws;
+	  TMP_DECL; TMP_MARK;
+
+	  /* The maximum ws usage is for the mpn_mul result.  */
+	  ws = TMP_BALLOC_LIMBS (9 * vn >> 1);
+
+	  mpn_fft_mul (prodp, up, 3 * vn, vp, vn);
+	  un -= 3 * vn;
+	  up += 3 * vn;
+	  prodp += 3 * vn;
+
+	  while (2 * un >= 7 * vn)	/* un >= 3.5vn  */
+	    {
+	      mpn_fft_mul (ws, up, 3 * vn, vp, vn);
+	      un -= 3 * vn;
+	      up += 3 * vn;
+	      cy = mpn_add_n (prodp, prodp, ws, vn);
+	      MPN_COPY (prodp + vn, ws + vn, 3 * vn);
+	      mpn_incr_u (prodp + vn, cy);
+	      prodp += 3 * vn;
+	    }
+
+	  /* vn / 2 <= un < 3.5vn */
+
+	  if (un < vn)
+	    mpn_mul (ws, vp, vn, up, un);
+	  else
+	    mpn_mul (ws, up, un, vp, vn);
+
+	  cy = mpn_add_n (prodp, prodp, ws, vn);
+	  MPN_COPY (prodp + vn, ws + vn, un);
+	  mpn_incr_u (prodp + vn, cy);
+
+	  TMP_FREE;
+	}
+      else
+	mpn_fft_mul (prodp, up, un, vp, vn);
+    }
+
+  return prodp[un + vn - 1];	/* historic */
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_1.c
deleted file mode 120000
index 580ced6fa..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mul_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_1.c
new file mode 100644
index 000000000..52d46da0a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_1.c
@@ -0,0 +1,96 @@
+/* mpn_mul_1 -- Multiply a limb vector with a single limb and store the
+   product in a second limb vector.
+
+Copyright 1991-1994, 1996, 2000-2002 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+#if GMP_NAIL_BITS == 0
+
+mp_limb_t
+mpn_mul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t vl)
+{
+  mp_limb_t ul, cl, hpl, lpl;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_INCR_P (rp, up, n));
+
+  cl = 0;
+  do
+    {
+      ul = *up++;
+      umul_ppmm (hpl, lpl, ul, vl);
+
+      lpl += cl;
+      cl = (lpl < cl) + hpl;
+
+      *rp++ = lpl;
+    }
+  while (--n != 0);
+
+  return cl;
+}
+
+#endif
+
+#if GMP_NAIL_BITS >= 1
+
+mp_limb_t
+mpn_mul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t vl)
+{
+  mp_limb_t shifted_vl, ul, lpl, hpl, prev_hpl, xw, cl, xl;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_INCR_P (rp, up, n));
+  ASSERT_MPN (up, n);
+  ASSERT_LIMB (vl);
+
+  shifted_vl = vl << GMP_NAIL_BITS;
+  cl = 0;
+  prev_hpl = 0;
+  do
+    {
+      ul = *up++;
+
+      umul_ppmm (hpl, lpl, ul, shifted_vl);
+      lpl >>= GMP_NAIL_BITS;
+      xw = prev_hpl + lpl + cl;
+      cl = xw >> GMP_NUMB_BITS;
+      xl = xw & GMP_NUMB_MASK;
+      *rp++ = xl;
+      prev_hpl = hpl;
+    }
+  while (--n != 0);
+
+  return prev_hpl + cl;
+}
+
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_basecase.c
deleted file mode 120000
index 0ee2c4b1e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_basecase.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mul_basecase.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_basecase.c
new file mode 100644
index 000000000..2487fbac7
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_basecase.c
@@ -0,0 +1,165 @@
+/* mpn_mul_basecase -- Internal routine to multiply two natural numbers
+   of length m and n.
+
+   THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
+
+Copyright 1991-1994, 1996, 1997, 2000-2002 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+/* Multiply {up,usize} by {vp,vsize} and write the result to
+   {prodp,usize+vsize}.  Must have usize>=vsize.
+
+   Note that prodp gets usize+vsize limbs stored, even if the actual result
+   only needs usize+vsize-1.
+
+   There's no good reason to call here with vsize>=MUL_TOOM22_THRESHOLD.
+   Currently this is allowed, but it might not be in the future.
+
+   This is the most critical code for multiplication.  All multiplies rely
+   on this, both small and huge.  Small ones arrive here immediately, huge
+   ones arrive here as this is the base case for Karatsuba's recursive
+   algorithm.  */
+
+void
+mpn_mul_basecase (mp_ptr rp,
+		  mp_srcptr up, mp_size_t un,
+		  mp_srcptr vp, mp_size_t vn)
+{
+  ASSERT (un >= vn);
+  ASSERT (vn >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, un+vn, up, un));
+  ASSERT (! MPN_OVERLAP_P (rp, un+vn, vp, vn));
+
+  /* We first multiply by the low order limb (or depending on optional function
+     availability, limbs).  This result can be stored, not added, to rp.  We
+     also avoid a loop for zeroing this way.  */
+
+#if HAVE_NATIVE_mpn_mul_2
+  if (vn >= 2)
+    {
+      rp[un + 1] = mpn_mul_2 (rp, up, un, vp);
+      rp += 2, vp += 2, vn -= 2;
+    }
+  else
+    {
+      rp[un] = mpn_mul_1 (rp, up, un, vp[0]);
+      return;
+    }
+#else
+  rp[un] = mpn_mul_1 (rp, up, un, vp[0]);
+  rp += 1, vp += 1, vn -= 1;
+#endif
+
+  /* Now accumulate the product of up[] and the next higher limb (or depending
+     on optional function availability, limbs) from vp[].  */
+
+#define MAX_LEFT MP_SIZE_T_MAX	/* Used to simplify loops into if statements */
+
+
+#if HAVE_NATIVE_mpn_addmul_6
+  while (vn >= 6)
+    {
+      rp[un + 6 - 1] = mpn_addmul_6 (rp, up, un, vp);
+      if (MAX_LEFT == 6)
+	return;
+      rp += 6, vp += 6, vn -= 6;
+      if (MAX_LEFT < 2 * 6)
+	break;
+    }
+#undef MAX_LEFT
+#define MAX_LEFT (6 - 1)
+#endif
+
+#if HAVE_NATIVE_mpn_addmul_5
+  while (vn >= 5)
+    {
+      rp[un + 5 - 1] = mpn_addmul_5 (rp, up, un, vp);
+      if (MAX_LEFT == 5)
+	return;
+      rp += 5, vp += 5, vn -= 5;
+      if (MAX_LEFT < 2 * 5)
+	break;
+    }
+#undef MAX_LEFT
+#define MAX_LEFT (5 - 1)
+#endif
+
+#if HAVE_NATIVE_mpn_addmul_4
+  while (vn >= 4)
+    {
+      rp[un + 4 - 1] = mpn_addmul_4 (rp, up, un, vp);
+      if (MAX_LEFT == 4)
+	return;
+      rp += 4, vp += 4, vn -= 4;
+      if (MAX_LEFT < 2 * 4)
+	break;
+    }
+#undef MAX_LEFT
+#define MAX_LEFT (4 - 1)
+#endif
+
+#if HAVE_NATIVE_mpn_addmul_3
+  while (vn >= 3)
+    {
+      rp[un + 3 - 1] = mpn_addmul_3 (rp, up, un, vp);
+      if (MAX_LEFT == 3)
+	return;
+      rp += 3, vp += 3, vn -= 3;
+      if (MAX_LEFT < 2 * 3)
+	break;
+    }
+#undef MAX_LEFT
+#define MAX_LEFT (3 - 1)
+#endif
+
+#if HAVE_NATIVE_mpn_addmul_2
+  while (vn >= 2)
+    {
+      rp[un + 2 - 1] = mpn_addmul_2 (rp, up, un, vp);
+      if (MAX_LEFT == 2)
+	return;
+      rp += 2, vp += 2, vn -= 2;
+      if (MAX_LEFT < 2 * 2)
+	break;
+    }
+#undef MAX_LEFT
+#define MAX_LEFT (2 - 1)
+#endif
+
+  while (vn >= 1)
+    {
+      rp[un] = mpn_addmul_1 (rp, up, un, vp[0]);
+      if (MAX_LEFT == 1)
+	return;
+      rp += 1, vp += 1, vn -= 1;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_fft.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_fft.c
deleted file mode 120000
index b064cd252..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_fft.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mul_fft.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_fft.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_fft.c
new file mode 100644
index 000000000..a896ff19f
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_fft.c
@@ -0,0 +1,1044 @@
+/* Schoenhage's fast multiplication modulo 2^N+1.
+
+   Contributed by Paul Zimmermann.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 1998-2010, 2012, 2013, 2018, 2020 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/* References:
+
+   Schnelle Multiplikation grosser Zahlen, by Arnold Schoenhage and Volker
+   Strassen, Computing 7, p. 281-292, 1971.
+
+   Asymptotically fast algorithms for the numerical multiplication and division
+   of polynomials with complex coefficients, by Arnold Schoenhage, Computer
+   Algebra, EUROCAM'82, LNCS 144, p. 3-15, 1982.
+
+   Tapes versus Pointers, a study in implementing fast algorithms, by Arnold
+   Schoenhage, Bulletin of the EATCS, 30, p. 23-32, 1986.
+
+   TODO:
+
+   Implement some of the tricks published at ISSAC'2007 by Gaudry, Kruppa, and
+   Zimmermann.
+
+   It might be possible to avoid a small number of MPN_COPYs by using a
+   rotating temporary or two.
+
+   Cleanup and simplify the code!
+*/
+
+#ifdef TRACE
+#undef TRACE
+#define TRACE(x) x
+#include <stdio.h>
+#else
+#define TRACE(x)
+#endif
+
+#include "gmp-impl.h"
+
+#ifdef WANT_ADDSUB
+#include "generic/add_n_sub_n.c"
+#define HAVE_NATIVE_mpn_add_n_sub_n 1
+#endif
+
+static mp_limb_t mpn_mul_fft_internal (mp_ptr, mp_size_t, int, mp_ptr *,
+				       mp_ptr *, mp_ptr, mp_ptr, mp_size_t,
+				       mp_size_t, mp_size_t, int **, mp_ptr, int);
+static void mpn_mul_fft_decompose (mp_ptr, mp_ptr *, mp_size_t, mp_size_t, mp_srcptr,
+				   mp_size_t, mp_size_t, mp_size_t, mp_ptr);
+
+
+/* Find the best k to use for a mod 2^(m*GMP_NUMB_BITS)+1 FFT for m >= n.
+   We have sqr=0 if for a multiply, sqr=1 for a square.
+   There are three generations of this code; we keep the old ones as long as
+   some gmp-mparam.h is not updated.  */
+
+
+/*****************************************************************************/
+
+#if TUNE_PROGRAM_BUILD || (defined (MUL_FFT_TABLE3) && defined (SQR_FFT_TABLE3))
+
+#ifndef FFT_TABLE3_SIZE		/* When tuning this is defined in gmp-impl.h */
+#if defined (MUL_FFT_TABLE3_SIZE) && defined (SQR_FFT_TABLE3_SIZE)
+#if MUL_FFT_TABLE3_SIZE > SQR_FFT_TABLE3_SIZE
+#define FFT_TABLE3_SIZE MUL_FFT_TABLE3_SIZE
+#else
+#define FFT_TABLE3_SIZE SQR_FFT_TABLE3_SIZE
+#endif
+#endif
+#endif
+
+#ifndef FFT_TABLE3_SIZE
+#define FFT_TABLE3_SIZE 200
+#endif
+
+FFT_TABLE_ATTRS struct fft_table_nk mpn_fft_table3[2][FFT_TABLE3_SIZE] =
+{
+  MUL_FFT_TABLE3,
+  SQR_FFT_TABLE3
+};
+
+int
+mpn_fft_best_k (mp_size_t n, int sqr)
+{
+  const struct fft_table_nk *fft_tab, *tab;
+  mp_size_t tab_n, thres;
+  int last_k;
+
+  fft_tab = mpn_fft_table3[sqr];
+  last_k = fft_tab->k;
+  for (tab = fft_tab + 1; ; tab++)
+    {
+      tab_n = tab->n;
+      thres = tab_n << last_k;
+      if (n <= thres)
+	break;
+      last_k = tab->k;
+    }
+  return last_k;
+}
+
+#define MPN_FFT_BEST_READY 1
+#endif
+
+/*****************************************************************************/
+
+#if ! defined (MPN_FFT_BEST_READY)
+FFT_TABLE_ATTRS mp_size_t mpn_fft_table[2][MPN_FFT_TABLE_SIZE] =
+{
+  MUL_FFT_TABLE,
+  SQR_FFT_TABLE
+};
+
+int
+mpn_fft_best_k (mp_size_t n, int sqr)
+{
+  int i;
+
+  for (i = 0; mpn_fft_table[sqr][i] != 0; i++)
+    if (n < mpn_fft_table[sqr][i])
+      return i + FFT_FIRST_K;
+
+  /* treat 4*last as one further entry */
+  if (i == 0 || n < 4 * mpn_fft_table[sqr][i - 1])
+    return i + FFT_FIRST_K;
+  else
+    return i + FFT_FIRST_K + 1;
+}
+#endif
+
+/*****************************************************************************/
+
+
+/* Returns smallest possible number of limbs >= pl for a fft of size 2^k,
+   i.e. smallest multiple of 2^k >= pl.
+
+   Don't declare static: needed by tuneup.
+*/
+
+mp_size_t
+mpn_fft_next_size (mp_size_t pl, int k)
+{
+  pl = 1 + ((pl - 1) >> k); /* ceil (pl/2^k) */
+  return pl << k;
+}
+
+
+/* Initialize l[i][j] with bitrev(j) */
+static void
+mpn_fft_initl (int **l, int k)
+{
+  int i, j, K;
+  int *li;
+
+  l[0][0] = 0;
+  for (i = 1, K = 1; i <= k; i++, K *= 2)
+    {
+      li = l[i];
+      for (j = 0; j < K; j++)
+	{
+	  li[j] = 2 * l[i - 1][j];
+	  li[K + j] = 1 + li[j];
+	}
+    }
+}
+
+
+/* r <- a*2^d mod 2^(n*GMP_NUMB_BITS)+1 with a = {a, n+1}
+   Assumes a is semi-normalized, i.e. a[n] <= 1.
+   r and a must have n+1 limbs, and not overlap.
+*/
+static void
+mpn_fft_mul_2exp_modF (mp_ptr r, mp_srcptr a, mp_bitcnt_t d, mp_size_t n)
+{
+  unsigned int sh;
+  mp_size_t m;
+  mp_limb_t cc, rd;
+
+  sh = d % GMP_NUMB_BITS;
+  m = d / GMP_NUMB_BITS;
+
+  if (m >= n)			/* negate */
+    {
+      /* r[0..m-1]  <-- lshift(a[n-m]..a[n-1], sh)
+	 r[m..n-1]  <-- -lshift(a[0]..a[n-m-1],  sh) */
+
+      m -= n;
+      if (sh != 0)
+	{
+	  /* no out shift below since a[n] <= 1 */
+	  mpn_lshift (r, a + n - m, m + 1, sh);
+	  rd = r[m];
+	  cc = mpn_lshiftc (r + m, a, n - m, sh);
+	}
+      else
+	{
+	  MPN_COPY (r, a + n - m, m);
+	  rd = a[n];
+	  mpn_com (r + m, a, n - m);
+	  cc = 0;
+	}
+
+      /* add cc to r[0], and add rd to r[m] */
+
+      /* now add 1 in r[m], subtract 1 in r[n], i.e. add 1 in r[0] */
+
+      r[n] = 0;
+      /* cc < 2^sh <= 2^(GMP_NUMB_BITS-1) thus no overflow here */
+      cc++;
+      mpn_incr_u (r, cc);
+
+      rd++;
+      /* rd might overflow when sh=GMP_NUMB_BITS-1 */
+      cc = (rd == 0) ? 1 : rd;
+      r = r + m + (rd == 0);
+      mpn_incr_u (r, cc);
+    }
+  else
+    {
+      /* r[0..m-1]  <-- -lshift(a[n-m]..a[n-1], sh)
+	 r[m..n-1]  <-- lshift(a[0]..a[n-m-1],  sh)  */
+      if (sh != 0)
+	{
+	  /* no out bits below since a[n] <= 1 */
+	  mpn_lshiftc (r, a + n - m, m + 1, sh);
+	  rd = ~r[m];
+	  /* {r, m+1} = {a+n-m, m+1} << sh */
+	  cc = mpn_lshift (r + m, a, n - m, sh); /* {r+m, n-m} = {a, n-m}<<sh */
+	}
+      else
+	{
+	  /* r[m] is not used below, but we save a test for m=0 */
+	  mpn_com (r, a + n - m, m + 1);
+	  rd = a[n];
+	  MPN_COPY (r + m, a, n - m);
+	  cc = 0;
+	}
+
+      /* now complement {r, m}, subtract cc from r[0], subtract rd from r[m] */
+
+      /* if m=0 we just have r[0]=a[n] << sh */
+      if (m != 0)
+	{
+	  /* now add 1 in r[0], subtract 1 in r[m] */
+	  if (cc-- == 0) /* then add 1 to r[0] */
+	    cc = mpn_add_1 (r, r, n, CNST_LIMB(1));
+	  cc = mpn_sub_1 (r, r, m, cc) + 1;
+	  /* add 1 to cc instead of rd since rd might overflow */
+	}
+
+      /* now subtract cc and rd from r[m..n] */
+
+      r[n] = -mpn_sub_1 (r + m, r + m, n - m, cc);
+      r[n] -= mpn_sub_1 (r + m, r + m, n - m, rd);
+      if (r[n] & GMP_LIMB_HIGHBIT)
+	r[n] = mpn_add_1 (r, r, n, CNST_LIMB(1));
+    }
+}
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+static inline void
+mpn_fft_add_sub_modF (mp_ptr A0, mp_ptr Ai, mp_srcptr tp, mp_size_t n)
+{
+  mp_limb_t cyas, c, x;
+
+  cyas = mpn_add_n_sub_n (A0, Ai, A0, tp, n);
+
+  c = A0[n] - tp[n] - (cyas & 1);
+  x = (-c) & -((c & GMP_LIMB_HIGHBIT) != 0);
+  Ai[n] = x + c;
+  MPN_INCR_U (Ai, n + 1, x);
+
+  c = A0[n] + tp[n] + (cyas >> 1);
+  x = (c - 1) & -(c != 0);
+  A0[n] = c - x;
+  MPN_DECR_U (A0, n + 1, x);
+}
+
+#else /* ! HAVE_NATIVE_mpn_add_n_sub_n  */
+
+/* r <- a+b mod 2^(n*GMP_NUMB_BITS)+1.
+   Assumes a and b are semi-normalized.
+*/
+static inline void
+mpn_fft_add_modF (mp_ptr r, mp_srcptr a, mp_srcptr b, mp_size_t n)
+{
+  mp_limb_t c, x;
+
+  c = a[n] + b[n] + mpn_add_n (r, a, b, n);
+  /* 0 <= c <= 3 */
+
+#if 1
+  /* GCC 4.1 outsmarts most expressions here, and generates a 50% branch.  The
+     result is slower code, of course.  But the following outsmarts GCC.  */
+  x = (c - 1) & -(c != 0);
+  r[n] = c - x;
+  MPN_DECR_U (r, n + 1, x);
+#endif
+#if 0
+  if (c > 1)
+    {
+      r[n] = 1;                       /* r[n] - c = 1 */
+      MPN_DECR_U (r, n + 1, c - 1);
+    }
+  else
+    {
+      r[n] = c;
+    }
+#endif
+}
+
+/* r <- a-b mod 2^(n*GMP_NUMB_BITS)+1.
+   Assumes a and b are semi-normalized.
+*/
+static inline void
+mpn_fft_sub_modF (mp_ptr r, mp_srcptr a, mp_srcptr b, mp_size_t n)
+{
+  mp_limb_t c, x;
+
+  c = a[n] - b[n] - mpn_sub_n (r, a, b, n);
+  /* -2 <= c <= 1 */
+
+#if 1
+  /* GCC 4.1 outsmarts most expressions here, and generates a 50% branch.  The
+     result is slower code, of course.  But the following outsmarts GCC.  */
+  x = (-c) & -((c & GMP_LIMB_HIGHBIT) != 0);
+  r[n] = x + c;
+  MPN_INCR_U (r, n + 1, x);
+#endif
+#if 0
+  if ((c & GMP_LIMB_HIGHBIT) != 0)
+    {
+      r[n] = 0;
+      MPN_INCR_U (r, n + 1, -c);
+    }
+  else
+    {
+      r[n] = c;
+    }
+#endif
+}
+#endif /* HAVE_NATIVE_mpn_add_n_sub_n */
+
+/* input: A[0] ... A[inc*(K-1)] are residues mod 2^N+1 where
+	  N=n*GMP_NUMB_BITS, and 2^omega is a primitive root mod 2^N+1
+   output: A[inc*l[k][i]] <- \sum (2^omega)^(ij) A[inc*j] mod 2^N+1 */
+
+static void
+mpn_fft_fft (mp_ptr *Ap, mp_size_t K, int **ll,
+	     mp_size_t omega, mp_size_t n, mp_size_t inc, mp_ptr tp)
+{
+  if (K == 2)
+    {
+      mp_limb_t cy;
+#if HAVE_NATIVE_mpn_add_n_sub_n
+      cy = mpn_add_n_sub_n (Ap[0], Ap[inc], Ap[0], Ap[inc], n + 1) & 1;
+#else
+      MPN_COPY (tp, Ap[0], n + 1);
+      mpn_add_n (Ap[0], Ap[0], Ap[inc], n + 1);
+      cy = mpn_sub_n (Ap[inc], tp, Ap[inc], n + 1);
+#endif
+      if (Ap[0][n] > 1) /* can be 2 or 3 */
+	Ap[0][n] = 1 - mpn_sub_1 (Ap[0], Ap[0], n, Ap[0][n] - 1);
+      if (cy) /* Ap[inc][n] can be -1 or -2 */
+	Ap[inc][n] = mpn_add_1 (Ap[inc], Ap[inc], n, ~Ap[inc][n] + 1);
+    }
+  else
+    {
+      mp_size_t j, K2 = K >> 1;
+      int *lk = *ll;
+
+      mpn_fft_fft (Ap,     K2, ll-1, 2 * omega, n, inc * 2, tp);
+      mpn_fft_fft (Ap+inc, K2, ll-1, 2 * omega, n, inc * 2, tp);
+      /* A[2*j*inc]   <- A[2*j*inc] + omega^l[k][2*j*inc] A[(2j+1)inc]
+	 A[(2j+1)inc] <- A[2*j*inc] + omega^l[k][(2j+1)inc] A[(2j+1)inc] */
+      for (j = 0; j < K2; j++, lk += 2, Ap += 2 * inc)
+	{
+	  /* Ap[inc] <- Ap[0] + Ap[inc] * 2^(lk[1] * omega)
+	     Ap[0]   <- Ap[0] + Ap[inc] * 2^(lk[0] * omega) */
+	  mpn_fft_mul_2exp_modF (tp, Ap[inc], lk[0] * omega, n);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+	  mpn_fft_add_sub_modF (Ap[0], Ap[inc], tp, n);
+#else
+	  mpn_fft_sub_modF (Ap[inc], Ap[0], tp, n);
+	  mpn_fft_add_modF (Ap[0],   Ap[0], tp, n);
+#endif
+	}
+    }
+}
+
+/* input: A[0] ... A[inc*(K-1)] are residues mod 2^N+1 where
+	  N=n*GMP_NUMB_BITS, and 2^omega is a primitive root mod 2^N+1
+   output: A[inc*l[k][i]] <- \sum (2^omega)^(ij) A[inc*j] mod 2^N+1
+   tp must have space for 2*(n+1) limbs.
+*/
+
+
+/* Given ap[0..n] with ap[n]<=1, reduce it modulo 2^(n*GMP_NUMB_BITS)+1,
+   by subtracting that modulus if necessary.
+
+   If ap[0..n] is exactly 2^(n*GMP_NUMB_BITS) then mpn_sub_1 produces a
+   borrow and the limbs must be zeroed out again.  This will occur very
+   infrequently.  */
+
+static inline void
+mpn_fft_normalize (mp_ptr ap, mp_size_t n)
+{
+  if (ap[n] != 0)
+    {
+      MPN_DECR_U (ap, n + 1, CNST_LIMB(1));
+      if (ap[n] == 0)
+	{
+	  /* This happens with very low probability; we have yet to trigger it,
+	     and thereby make sure this code is correct.  */
+	  MPN_ZERO (ap, n);
+	  ap[n] = 1;
+	}
+      else
+	ap[n] = 0;
+    }
+}
+
+/* a[i] <- a[i]*b[i] mod 2^(n*GMP_NUMB_BITS)+1 for 0 <= i < K */
+static void
+mpn_fft_mul_modF_K (mp_ptr *ap, mp_ptr *bp, mp_size_t n, mp_size_t K)
+{
+  int i;
+  int sqr = (ap == bp);
+  TMP_DECL;
+
+  TMP_MARK;
+
+  if (n >= (sqr ? SQR_FFT_MODF_THRESHOLD : MUL_FFT_MODF_THRESHOLD))
+    {
+      mp_size_t K2, nprime2, Nprime2, M2, maxLK, l, Mp2;
+      int k;
+      int **fft_l, *tmp;
+      mp_ptr *Ap, *Bp, A, B, T;
+
+      k = mpn_fft_best_k (n, sqr);
+      K2 = (mp_size_t) 1 << k;
+      ASSERT_ALWAYS((n & (K2 - 1)) == 0);
+      maxLK = (K2 > GMP_NUMB_BITS) ? K2 : GMP_NUMB_BITS;
+      M2 = n * GMP_NUMB_BITS >> k;
+      l = n >> k;
+      Nprime2 = ((2 * M2 + k + 2 + maxLK) / maxLK) * maxLK;
+      /* Nprime2 = ceil((2*M2+k+3)/maxLK)*maxLK*/
+      nprime2 = Nprime2 / GMP_NUMB_BITS;
+
+      /* we should ensure that nprime2 is a multiple of the next K */
+      if (nprime2 >= (sqr ? SQR_FFT_MODF_THRESHOLD : MUL_FFT_MODF_THRESHOLD))
+	{
+	  mp_size_t K3;
+	  for (;;)
+	    {
+	      K3 = (mp_size_t) 1 << mpn_fft_best_k (nprime2, sqr);
+	      if ((nprime2 & (K3 - 1)) == 0)
+		break;
+	      nprime2 = (nprime2 + K3 - 1) & -K3;
+	      Nprime2 = nprime2 * GMP_LIMB_BITS;
+	      /* warning: since nprime2 changed, K3 may change too! */
+	    }
+	}
+      ASSERT_ALWAYS(nprime2 < n); /* otherwise we'll loop */
+
+      Mp2 = Nprime2 >> k;
+
+      Ap = TMP_BALLOC_MP_PTRS (K2);
+      Bp = TMP_BALLOC_MP_PTRS (K2);
+      A = TMP_BALLOC_LIMBS (2 * (nprime2 + 1) << k);
+      T = TMP_BALLOC_LIMBS (2 * (nprime2 + 1));
+      B = A + ((nprime2 + 1) << k);
+      fft_l = TMP_BALLOC_TYPE (k + 1, int *);
+      tmp = TMP_BALLOC_TYPE ((size_t) 2 << k, int);
+      for (i = 0; i <= k; i++)
+	{
+	  fft_l[i] = tmp;
+	  tmp += (mp_size_t) 1 << i;
+	}
+
+      mpn_fft_initl (fft_l, k);
+
+      TRACE (printf ("recurse: %ldx%ld limbs -> %ld times %ldx%ld (%1.2f)\n", n,
+		    n, K2, nprime2, nprime2, 2.0*(double)n/nprime2/K2));
+      for (i = 0; i < K; i++, ap++, bp++)
+	{
+	  mp_limb_t cy;
+	  mpn_fft_normalize (*ap, n);
+	  if (!sqr)
+	    mpn_fft_normalize (*bp, n);
+
+	  mpn_mul_fft_decompose (A, Ap, K2, nprime2, *ap, (l << k) + 1, l, Mp2, T);
+	  if (!sqr)
+	    mpn_mul_fft_decompose (B, Bp, K2, nprime2, *bp, (l << k) + 1, l, Mp2, T);
+
+	  cy = mpn_mul_fft_internal (*ap, n, k, Ap, Bp, A, B, nprime2,
+				     l, Mp2, fft_l, T, sqr);
+	  (*ap)[n] = cy;
+	}
+    }
+  else
+    {
+      mp_ptr a, b, tp, tpn;
+      mp_limb_t cc;
+      mp_size_t n2 = 2 * n;
+      tp = TMP_BALLOC_LIMBS (n2);
+      tpn = tp + n;
+      TRACE (printf ("  mpn_mul_n %ld of %ld limbs\n", K, n));
+      for (i = 0; i < K; i++)
+	{
+	  a = *ap++;
+	  b = *bp++;
+	  if (sqr)
+	    mpn_sqr (tp, a, n);
+	  else
+	    mpn_mul_n (tp, b, a, n);
+	  if (a[n] != 0)
+	    cc = mpn_add_n (tpn, tpn, b, n);
+	  else
+	    cc = 0;
+	  if (b[n] != 0)
+	    cc += mpn_add_n (tpn, tpn, a, n) + a[n];
+	  if (cc != 0)
+	    {
+	      cc = mpn_add_1 (tp, tp, n2, cc);
+	      /* If mpn_add_1 give a carry (cc != 0),
+		 the result (tp) is at most GMP_NUMB_MAX - 1,
+		 so the following addition can't overflow.
+	      */
+	      tp[0] += cc;
+	    }
+	  a[n] = mpn_sub_n (a, tp, tpn, n) && mpn_add_1 (a, a, n, CNST_LIMB(1));
+	}
+    }
+  TMP_FREE;
+}
+
+
+/* input: A^[l[k][0]] A^[l[k][1]] ... A^[l[k][K-1]]
+   output: K*A[0] K*A[K-1] ... K*A[1].
+   Assumes the Ap[] are pseudo-normalized, i.e. 0 <= Ap[][n] <= 1.
+   This condition is also fulfilled at exit.
+*/
+static void
+mpn_fft_fftinv (mp_ptr *Ap, mp_size_t K, mp_size_t omega, mp_size_t n, mp_ptr tp)
+{
+  if (K == 2)
+    {
+      mp_limb_t cy;
+#if HAVE_NATIVE_mpn_add_n_sub_n
+      cy = mpn_add_n_sub_n (Ap[0], Ap[1], Ap[0], Ap[1], n + 1) & 1;
+#else
+      MPN_COPY (tp, Ap[0], n + 1);
+      mpn_add_n (Ap[0], Ap[0], Ap[1], n + 1);
+      cy = mpn_sub_n (Ap[1], tp, Ap[1], n + 1);
+#endif
+      if (Ap[0][n] > 1) /* can be 2 or 3 */
+	Ap[0][n] = 1 - mpn_sub_1 (Ap[0], Ap[0], n, Ap[0][n] - 1);
+      if (cy) /* Ap[1][n] can be -1 or -2 */
+	Ap[1][n] = mpn_add_1 (Ap[1], Ap[1], n, ~Ap[1][n] + 1);
+    }
+  else
+    {
+      mp_size_t j, K2 = K >> 1;
+
+      mpn_fft_fftinv (Ap,      K2, 2 * omega, n, tp);
+      mpn_fft_fftinv (Ap + K2, K2, 2 * omega, n, tp);
+      /* A[j]     <- A[j] + omega^j A[j+K/2]
+	 A[j+K/2] <- A[j] + omega^(j+K/2) A[j+K/2] */
+      for (j = 0; j < K2; j++, Ap++)
+	{
+	  /* Ap[K2] <- Ap[0] + Ap[K2] * 2^((j + K2) * omega)
+	     Ap[0]  <- Ap[0] + Ap[K2] * 2^(j * omega) */
+	  mpn_fft_mul_2exp_modF (tp, Ap[K2], j * omega, n);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+	  mpn_fft_add_sub_modF (Ap[0], Ap[K2], tp, n);
+#else
+	  mpn_fft_sub_modF (Ap[K2], Ap[0], tp, n);
+	  mpn_fft_add_modF (Ap[0],  Ap[0], tp, n);
+#endif
+	}
+    }
+}
+
+
+/* R <- A/2^k mod 2^(n*GMP_NUMB_BITS)+1 */
+static void
+mpn_fft_div_2exp_modF (mp_ptr r, mp_srcptr a, mp_bitcnt_t k, mp_size_t n)
+{
+  mp_bitcnt_t i;
+
+  ASSERT (r != a);
+  i = (mp_bitcnt_t) 2 * n * GMP_NUMB_BITS - k;
+  mpn_fft_mul_2exp_modF (r, a, i, n);
+  /* 1/2^k = 2^(2nL-k) mod 2^(n*GMP_NUMB_BITS)+1 */
+  /* normalize so that R < 2^(n*GMP_NUMB_BITS)+1 */
+  mpn_fft_normalize (r, n);
+}
+
+
+/* {rp,n} <- {ap,an} mod 2^(n*GMP_NUMB_BITS)+1, n <= an <= 3*n.
+   Returns carry out, i.e. 1 iff {ap,an} = -1 mod 2^(n*GMP_NUMB_BITS)+1,
+   then {rp,n}=0.
+*/
+static mp_size_t
+mpn_fft_norm_modF (mp_ptr rp, mp_size_t n, mp_ptr ap, mp_size_t an)
+{
+  mp_size_t l, m, rpn;
+  mp_limb_t cc;
+
+  ASSERT ((n <= an) && (an <= 3 * n));
+  m = an - 2 * n;
+  if (m > 0)
+    {
+      l = n;
+      /* add {ap, m} and {ap+2n, m} in {rp, m} */
+      cc = mpn_add_n (rp, ap, ap + 2 * n, m);
+      /* copy {ap+m, n-m} to {rp+m, n-m} */
+      rpn = mpn_add_1 (rp + m, ap + m, n - m, cc);
+    }
+  else
+    {
+      l = an - n; /* l <= n */
+      MPN_COPY (rp, ap, n);
+      rpn = 0;
+    }
+
+  /* remains to subtract {ap+n, l} from {rp, n+1} */
+  cc = mpn_sub_n (rp, rp, ap + n, l);
+  rpn -= mpn_sub_1 (rp + l, rp + l, n - l, cc);
+  if (rpn < 0) /* necessarily rpn = -1 */
+    rpn = mpn_add_1 (rp, rp, n, CNST_LIMB(1));
+  return rpn;
+}
+
+/* store in A[0..nprime] the first M bits from {n, nl},
+   in A[nprime+1..] the following M bits, ...
+   Assumes M is a multiple of GMP_NUMB_BITS (M = l * GMP_NUMB_BITS).
+   T must have space for at least (nprime + 1) limbs.
+   We must have nl <= 2*K*l.
+*/
+static void
+mpn_mul_fft_decompose (mp_ptr A, mp_ptr *Ap, mp_size_t K, mp_size_t nprime,
+		       mp_srcptr n, mp_size_t nl, mp_size_t l, mp_size_t Mp,
+		       mp_ptr T)
+{
+  mp_size_t i, j;
+  mp_ptr tmp;
+  mp_size_t Kl = K * l;
+  TMP_DECL;
+  TMP_MARK;
+
+  if (nl > Kl) /* normalize {n, nl} mod 2^(Kl*GMP_NUMB_BITS)+1 */
+    {
+      mp_size_t dif = nl - Kl;
+      mp_limb_signed_t cy;
+
+      tmp = TMP_BALLOC_LIMBS(Kl + 1);
+
+      if (dif > Kl)
+	{
+	  int subp = 0;
+
+	  cy = mpn_sub_n (tmp, n, n + Kl, Kl);
+	  n += 2 * Kl;
+	  dif -= Kl;
+
+	  /* now dif > 0 */
+	  while (dif > Kl)
+	    {
+	      if (subp)
+		cy += mpn_sub_n (tmp, tmp, n, Kl);
+	      else
+		cy -= mpn_add_n (tmp, tmp, n, Kl);
+	      subp ^= 1;
+	      n += Kl;
+	      dif -= Kl;
+	    }
+	  /* now dif <= Kl */
+	  if (subp)
+	    cy += mpn_sub (tmp, tmp, Kl, n, dif);
+	  else
+	    cy -= mpn_add (tmp, tmp, Kl, n, dif);
+	  if (cy >= 0)
+	    cy = mpn_add_1 (tmp, tmp, Kl, cy);
+	  else
+	    cy = mpn_sub_1 (tmp, tmp, Kl, -cy);
+	}
+      else /* dif <= Kl, i.e. nl <= 2 * Kl */
+	{
+	  cy = mpn_sub (tmp, n, Kl, n + Kl, dif);
+	  cy = mpn_add_1 (tmp, tmp, Kl, cy);
+	}
+      tmp[Kl] = cy;
+      nl = Kl + 1;
+      n = tmp;
+    }
+  for (i = 0; i < K; i++)
+    {
+      Ap[i] = A;
+      /* store the next M bits of n into A[0..nprime] */
+      if (nl > 0) /* nl is the number of remaining limbs */
+	{
+	  j = (l <= nl && i < K - 1) ? l : nl; /* store j next limbs */
+	  nl -= j;
+	  MPN_COPY (T, n, j);
+	  MPN_ZERO (T + j, nprime + 1 - j);
+	  n += l;
+	  mpn_fft_mul_2exp_modF (A, T, i * Mp, nprime);
+	}
+      else
+	MPN_ZERO (A, nprime + 1);
+      A += nprime + 1;
+    }
+  ASSERT_ALWAYS (nl == 0);
+  TMP_FREE;
+}
+
+/* op <- n*m mod 2^N+1 with fft of size 2^k where N=pl*GMP_NUMB_BITS
+   op is pl limbs, its high bit is returned.
+   One must have pl = mpn_fft_next_size (pl, k).
+   T must have space for 2 * (nprime + 1) limbs.
+*/
+
+static mp_limb_t
+mpn_mul_fft_internal (mp_ptr op, mp_size_t pl, int k,
+		      mp_ptr *Ap, mp_ptr *Bp, mp_ptr A, mp_ptr B,
+		      mp_size_t nprime, mp_size_t l, mp_size_t Mp,
+		      int **fft_l, mp_ptr T, int sqr)
+{
+  mp_size_t K, i, pla, lo, sh, j;
+  mp_ptr p;
+  mp_limb_t cc;
+
+  K = (mp_size_t) 1 << k;
+
+  /* direct fft's */
+  mpn_fft_fft (Ap, K, fft_l + k, 2 * Mp, nprime, 1, T);
+  if (!sqr)
+    mpn_fft_fft (Bp, K, fft_l + k, 2 * Mp, nprime, 1, T);
+
+  /* term to term multiplications */
+  mpn_fft_mul_modF_K (Ap, sqr ? Ap : Bp, nprime, K);
+
+  /* inverse fft's */
+  mpn_fft_fftinv (Ap, K, 2 * Mp, nprime, T);
+
+  /* division of terms after inverse fft */
+  Bp[0] = T + nprime + 1;
+  mpn_fft_div_2exp_modF (Bp[0], Ap[0], k, nprime);
+  for (i = 1; i < K; i++)
+    {
+      Bp[i] = Ap[i - 1];
+      mpn_fft_div_2exp_modF (Bp[i], Ap[i], k + (K - i) * Mp, nprime);
+    }
+
+  /* addition of terms in result p */
+  MPN_ZERO (T, nprime + 1);
+  pla = l * (K - 1) + nprime + 1; /* number of required limbs for p */
+  p = B; /* B has K*(n' + 1) limbs, which is >= pla, i.e. enough */
+  MPN_ZERO (p, pla);
+  cc = 0; /* will accumulate the (signed) carry at p[pla] */
+  for (i = K - 1, lo = l * i + nprime,sh = l * i; i >= 0; i--,lo -= l,sh -= l)
+    {
+      mp_ptr n = p + sh;
+
+      j = (K - i) & (K - 1);
+
+      if (mpn_add_n (n, n, Bp[j], nprime + 1))
+	cc += mpn_add_1 (n + nprime + 1, n + nprime + 1,
+			  pla - sh - nprime - 1, CNST_LIMB(1));
+      T[2 * l] = i + 1; /* T = (i + 1)*2^(2*M) */
+      if (mpn_cmp (Bp[j], T, nprime + 1) > 0)
+	{ /* subtract 2^N'+1 */
+	  cc -= mpn_sub_1 (n, n, pla - sh, CNST_LIMB(1));
+	  cc -= mpn_sub_1 (p + lo, p + lo, pla - lo, CNST_LIMB(1));
+	}
+    }
+  if (cc == -CNST_LIMB(1))
+    {
+      if ((cc = mpn_add_1 (p + pla - pl, p + pla - pl, pl, CNST_LIMB(1))))
+	{
+	  /* p[pla-pl]...p[pla-1] are all zero */
+	  mpn_sub_1 (p + pla - pl - 1, p + pla - pl - 1, pl + 1, CNST_LIMB(1));
+	  mpn_sub_1 (p + pla - 1, p + pla - 1, 1, CNST_LIMB(1));
+	}
+    }
+  else if (cc == 1)
+    {
+      if (pla >= 2 * pl)
+	{
+	  while ((cc = mpn_add_1 (p + pla - 2 * pl, p + pla - 2 * pl, 2 * pl, cc)))
+	    ;
+	}
+      else
+	{
+	  cc = mpn_sub_1 (p + pla - pl, p + pla - pl, pl, cc);
+	  ASSERT (cc == 0);
+	}
+    }
+  else
+    ASSERT (cc == 0);
+
+  /* here p < 2^(2M) [K 2^(M(K-1)) + (K-1) 2^(M(K-2)) + ... ]
+     < K 2^(2M) [2^(M(K-1)) + 2^(M(K-2)) + ... ]
+     < K 2^(2M) 2^(M(K-1))*2 = 2^(M*K+M+k+1) */
+  return mpn_fft_norm_modF (op, pl, p, pla);
+}
+
+/* return the lcm of a and 2^k */
+static mp_bitcnt_t
+mpn_mul_fft_lcm (mp_bitcnt_t a, int k)
+{
+  mp_bitcnt_t l = k;
+
+  while (a % 2 == 0 && k > 0)
+    {
+      a >>= 1;
+      k --;
+    }
+  return a << l;
+}
+
+
+mp_limb_t
+mpn_mul_fft (mp_ptr op, mp_size_t pl,
+	     mp_srcptr n, mp_size_t nl,
+	     mp_srcptr m, mp_size_t ml,
+	     int k)
+{
+  int i;
+  mp_size_t K, maxLK;
+  mp_size_t N, Nprime, nprime, M, Mp, l;
+  mp_ptr *Ap, *Bp, A, T, B;
+  int **fft_l, *tmp;
+  int sqr = (n == m && nl == ml);
+  mp_limb_t h;
+  TMP_DECL;
+
+  TRACE (printf ("\nmpn_mul_fft pl=%ld nl=%ld ml=%ld k=%d\n", pl, nl, ml, k));
+  ASSERT_ALWAYS (mpn_fft_next_size (pl, k) == pl);
+
+  TMP_MARK;
+  N = pl * GMP_NUMB_BITS;
+  fft_l = TMP_BALLOC_TYPE (k + 1, int *);
+  tmp = TMP_BALLOC_TYPE ((size_t) 2 << k, int);
+  for (i = 0; i <= k; i++)
+    {
+      fft_l[i] = tmp;
+      tmp += (mp_size_t) 1 << i;
+    }
+
+  mpn_fft_initl (fft_l, k);
+  K = (mp_size_t) 1 << k;
+  M = N >> k;	/* N = 2^k M */
+  l = 1 + (M - 1) / GMP_NUMB_BITS;
+  maxLK = mpn_mul_fft_lcm (GMP_NUMB_BITS, k); /* lcm (GMP_NUMB_BITS, 2^k) */
+
+  Nprime = (1 + (2 * M + k + 2) / maxLK) * maxLK;
+  /* Nprime = ceil((2*M+k+3)/maxLK)*maxLK; */
+  nprime = Nprime / GMP_NUMB_BITS;
+  TRACE (printf ("N=%ld K=%ld, M=%ld, l=%ld, maxLK=%ld, Np=%ld, np=%ld\n",
+		 N, K, M, l, maxLK, Nprime, nprime));
+  /* we should ensure that recursively, nprime is a multiple of the next K */
+  if (nprime >= (sqr ? SQR_FFT_MODF_THRESHOLD : MUL_FFT_MODF_THRESHOLD))
+    {
+      mp_size_t K2;
+      for (;;)
+	{
+	  K2 = (mp_size_t) 1 << mpn_fft_best_k (nprime, sqr);
+	  if ((nprime & (K2 - 1)) == 0)
+	    break;
+	  nprime = (nprime + K2 - 1) & -K2;
+	  Nprime = nprime * GMP_LIMB_BITS;
+	  /* warning: since nprime changed, K2 may change too! */
+	}
+      TRACE (printf ("new maxLK=%ld, Np=%ld, np=%ld\n", maxLK, Nprime, nprime));
+    }
+  ASSERT_ALWAYS (nprime < pl); /* otherwise we'll loop */
+
+  T = TMP_BALLOC_LIMBS (2 * (nprime + 1));
+  Mp = Nprime >> k;
+
+  TRACE (printf ("%ldx%ld limbs -> %ld times %ldx%ld limbs (%1.2f)\n",
+		pl, pl, K, nprime, nprime, 2.0 * (double) N / Nprime / K);
+	 printf ("   temp space %ld\n", 2 * K * (nprime + 1)));
+
+  A = TMP_BALLOC_LIMBS (K * (nprime + 1));
+  Ap = TMP_BALLOC_MP_PTRS (K);
+  mpn_mul_fft_decompose (A, Ap, K, nprime, n, nl, l, Mp, T);
+  if (sqr)
+    {
+      mp_size_t pla;
+      pla = l * (K - 1) + nprime + 1; /* number of required limbs for p */
+      B = TMP_BALLOC_LIMBS (pla);
+      Bp = TMP_BALLOC_MP_PTRS (K);
+    }
+  else
+    {
+      B = TMP_BALLOC_LIMBS (K * (nprime + 1));
+      Bp = TMP_BALLOC_MP_PTRS (K);
+      mpn_mul_fft_decompose (B, Bp, K, nprime, m, ml, l, Mp, T);
+    }
+  h = mpn_mul_fft_internal (op, pl, k, Ap, Bp, A, B, nprime, l, Mp, fft_l, T, sqr);
+
+  TMP_FREE;
+  return h;
+}
+
+#if WANT_OLD_FFT_FULL
+/* multiply {n, nl} by {m, ml}, and put the result in {op, nl+ml} */
+void
+mpn_mul_fft_full (mp_ptr op,
+		  mp_srcptr n, mp_size_t nl,
+		  mp_srcptr m, mp_size_t ml)
+{
+  mp_ptr pad_op;
+  mp_size_t pl, pl2, pl3, l;
+  mp_size_t cc, c2, oldcc;
+  int k2, k3;
+  int sqr = (n == m && nl == ml);
+
+  pl = nl + ml; /* total number of limbs of the result */
+
+  /* perform a fft mod 2^(2N)+1 and one mod 2^(3N)+1.
+     We must have pl3 = 3/2 * pl2, with pl2 a multiple of 2^k2, and
+     pl3 a multiple of 2^k3. Since k3 >= k2, both are multiples of 2^k2,
+     and pl2 must be an even multiple of 2^k2. Thus (pl2,pl3) =
+     (2*j*2^k2,3*j*2^k2), which works for 3*j <= pl/2^k2 <= 5*j.
+     We need that consecutive intervals overlap, i.e. 5*j >= 3*(j+1),
+     which requires j>=2. Thus this scheme requires pl >= 6 * 2^FFT_FIRST_K. */
+
+  /*  ASSERT_ALWAYS(pl >= 6 * (1 << FFT_FIRST_K)); */
+
+  pl2 = (2 * pl - 1) / 5; /* ceil (2pl/5) - 1 */
+  do
+    {
+      pl2++;
+      k2 = mpn_fft_best_k (pl2, sqr); /* best fft size for pl2 limbs */
+      pl2 = mpn_fft_next_size (pl2, k2);
+      pl3 = 3 * pl2 / 2; /* since k>=FFT_FIRST_K=4, pl2 is a multiple of 2^4,
+			    thus pl2 / 2 is exact */
+      k3 = mpn_fft_best_k (pl3, sqr);
+    }
+  while (mpn_fft_next_size (pl3, k3) != pl3);
+
+  TRACE (printf ("mpn_mul_fft_full nl=%ld ml=%ld -> pl2=%ld pl3=%ld k=%d\n",
+		 nl, ml, pl2, pl3, k2));
+
+  ASSERT_ALWAYS(pl3 <= pl);
+  cc = mpn_mul_fft (op, pl3, n, nl, m, ml, k3);     /* mu */
+  ASSERT(cc == 0);
+  pad_op = __GMP_ALLOCATE_FUNC_LIMBS (pl2);
+  cc = mpn_mul_fft (pad_op, pl2, n, nl, m, ml, k2); /* lambda */
+  cc = -cc + mpn_sub_n (pad_op, pad_op, op, pl2);    /* lambda - low(mu) */
+  /* 0 <= cc <= 1 */
+  ASSERT(0 <= cc && cc <= 1);
+  l = pl3 - pl2; /* l = pl2 / 2 since pl3 = 3/2 * pl2 */
+  c2 = mpn_add_n (pad_op, pad_op, op + pl2, l);
+  cc = mpn_add_1 (pad_op + l, pad_op + l, l, (mp_limb_t) c2) - cc;
+  ASSERT(-1 <= cc && cc <= 1);
+  if (cc < 0)
+    cc = mpn_add_1 (pad_op, pad_op, pl2, (mp_limb_t) -cc);
+  ASSERT(0 <= cc && cc <= 1);
+  /* now lambda-mu = {pad_op, pl2} - cc mod 2^(pl2*GMP_NUMB_BITS)+1 */
+  oldcc = cc;
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  c2 = mpn_add_n_sub_n (pad_op + l, pad_op, pad_op, pad_op + l, l);
+  cc += c2 >> 1; /* carry out from high <- low + high */
+  c2 = c2 & 1; /* borrow out from low <- low - high */
+#else
+  {
+    mp_ptr tmp;
+    TMP_DECL;
+
+    TMP_MARK;
+    tmp = TMP_BALLOC_LIMBS (l);
+    MPN_COPY (tmp, pad_op, l);
+    c2 = mpn_sub_n (pad_op,      pad_op, pad_op + l, l);
+    cc += mpn_add_n (pad_op + l, tmp,    pad_op + l, l);
+    TMP_FREE;
+  }
+#endif
+  c2 += oldcc;
+  /* first normalize {pad_op, pl2} before dividing by 2: c2 is the borrow
+     at pad_op + l, cc is the carry at pad_op + pl2 */
+  /* 0 <= cc <= 2 */
+  cc -= mpn_sub_1 (pad_op + l, pad_op + l, l, (mp_limb_t) c2);
+  /* -1 <= cc <= 2 */
+  if (cc > 0)
+    cc = -mpn_sub_1 (pad_op, pad_op, pl2, (mp_limb_t) cc);
+  /* now -1 <= cc <= 0 */
+  if (cc < 0)
+    cc = mpn_add_1 (pad_op, pad_op, pl2, (mp_limb_t) -cc);
+  /* now {pad_op, pl2} is normalized, with 0 <= cc <= 1 */
+  if (pad_op[0] & 1) /* if odd, add 2^(pl2*GMP_NUMB_BITS)+1 */
+    cc += 1 + mpn_add_1 (pad_op, pad_op, pl2, CNST_LIMB(1));
+  /* now 0 <= cc <= 2, but cc=2 cannot occur since it would give a carry
+     out below */
+  mpn_rshift (pad_op, pad_op, pl2, 1); /* divide by two */
+  if (cc) /* then cc=1 */
+    pad_op [pl2 - 1] |= (mp_limb_t) 1 << (GMP_NUMB_BITS - 1);
+  /* now {pad_op,pl2}-cc = (lambda-mu)/(1-2^(l*GMP_NUMB_BITS))
+     mod 2^(pl2*GMP_NUMB_BITS) + 1 */
+  c2 = mpn_add_n (op, op, pad_op, pl2); /* no need to add cc (is 0) */
+  /* since pl2+pl3 >= pl, necessary the extra limbs (including cc) are zero */
+  MPN_COPY (op + pl3, pad_op, pl - pl3);
+  ASSERT_MPN_ZERO_P (pad_op + pl - pl3, pl2 + pl3 - pl);
+  __GMP_FREE_FUNC_LIMBS (pad_op, pl2);
+  /* since the final result has at most pl limbs, no carry out below */
+  mpn_add_1 (op + pl2, op + pl2, pl - pl2, (mp_limb_t) c2);
+}
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_n.c
deleted file mode 120000
index de41b2e08..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mul_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_n.c
new file mode 100644
index 000000000..36bd923de
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mul_n.c
@@ -0,0 +1,96 @@
+/* mpn_mul_n -- multiply natural numbers.
+
+Copyright 1991, 1993, 1994, 1996-2003, 2005, 2008, 2009 Free Software
+Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+void
+mpn_mul_n (mp_ptr p, mp_srcptr a, mp_srcptr b, mp_size_t n)
+{
+  ASSERT (n >= 1);
+  ASSERT (! MPN_OVERLAP_P (p, 2 * n, a, n));
+  ASSERT (! MPN_OVERLAP_P (p, 2 * n, b, n));
+
+  if (BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))
+    {
+      mpn_mul_basecase (p, a, n, b, n);
+    }
+  else if (BELOW_THRESHOLD (n, MUL_TOOM33_THRESHOLD))
+    {
+      /* Allocate workspace of fixed size on stack: fast! */
+      mp_limb_t ws[mpn_toom22_mul_itch (MUL_TOOM33_THRESHOLD_LIMIT-1,
+					MUL_TOOM33_THRESHOLD_LIMIT-1)];
+      ASSERT (MUL_TOOM33_THRESHOLD <= MUL_TOOM33_THRESHOLD_LIMIT);
+      mpn_toom22_mul (p, a, n, b, n, ws);
+    }
+  else if (BELOW_THRESHOLD (n, MUL_TOOM44_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_SDECL;
+      TMP_SMARK;
+      ws = TMP_SALLOC_LIMBS (mpn_toom33_mul_itch (n, n));
+      mpn_toom33_mul (p, a, n, b, n, ws);
+      TMP_SFREE;
+    }
+  else if (BELOW_THRESHOLD (n, MUL_TOOM6H_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_SDECL;
+      TMP_SMARK;
+      ws = TMP_SALLOC_LIMBS (mpn_toom44_mul_itch (n, n));
+      mpn_toom44_mul (p, a, n, b, n, ws);
+      TMP_SFREE;
+    }
+  else if (BELOW_THRESHOLD (n, MUL_TOOM8H_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_SDECL;
+      TMP_SMARK;
+      ws = TMP_SALLOC_LIMBS (mpn_toom6_mul_n_itch (n));
+      mpn_toom6h_mul (p, a, n, b, n, ws);
+      TMP_SFREE;
+    }
+  else if (BELOW_THRESHOLD (n, MUL_FFT_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_DECL;
+      TMP_MARK;
+      ws = TMP_ALLOC_LIMBS (mpn_toom8_mul_n_itch (n));
+      mpn_toom8h_mul (p, a, n, b, n, ws);
+      TMP_FREE;
+    }
+  else
+    {
+      /* The current FFT code allocates its own space.  That should probably
+	 change.  */
+      mpn_fft_mul (p, a, n, b, n);
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_basecase.c
deleted file mode 120000
index 948d1f3a8..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_basecase.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mullo_basecase.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_basecase.c
new file mode 100644
index 000000000..9a4cd3d82
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_basecase.c
@@ -0,0 +1,90 @@
+/* mpn_mullo_basecase -- Internal routine to multiply two natural
+   numbers of length n and return the low part.
+
+   THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
+
+
+Copyright (C) 2000, 2002, 2004, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/* FIXME: Should optionally use mpn_mul_2/mpn_addmul_2.  */
+
+#ifndef MULLO_VARIANT
+#define MULLO_VARIANT 2
+#endif
+
+
+#if MULLO_VARIANT == 1
+void
+mpn_mullo_basecase (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  mp_size_t i;
+
+  mpn_mul_1 (rp, up, n, vp[0]);
+
+  for (i = n - 1; i > 0; i--)
+    {
+      vp++;
+      rp++;
+      mpn_addmul_1 (rp, up, i, vp[0]);
+    }
+}
+#endif
+
+
+#if MULLO_VARIANT == 2
+void
+mpn_mullo_basecase (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  mp_limb_t h;
+
+  h = up[0] * vp[n - 1];
+
+  if (n != 1)
+    {
+      mp_size_t i;
+      mp_limb_t v0;
+
+      v0 = *vp++;
+      h += up[n - 1] * v0 + mpn_mul_1 (rp, up, n - 1, v0);
+      rp++;
+
+      for (i = n - 2; i > 0; i--)
+	{
+	  v0 = *vp++;
+	  h += up[i] * v0 + mpn_addmul_1 (rp, up, i, v0);
+	  rp++;
+	}
+    }
+
+  rp[0] = h;
+}
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_n.c
deleted file mode 120000
index 010baa87a..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mullo_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_n.c
new file mode 100644
index 000000000..6f4e7ae0f
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mullo_n.c
@@ -0,0 +1,243 @@
+/* mpn_mullo_n -- multiply two n-limb numbers and return the low n limbs
+   of their products.
+
+   Contributed to the GNU project by Torbjorn Granlund and Marco Bodrato.
+
+   THIS IS (FOR NOW) AN INTERNAL FUNCTION.  IT IS ONLY SAFE TO REACH THIS
+   FUNCTION THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST GUARANTEED
+   THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2004, 2005, 2009, 2010, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+#if TUNE_PROGRAM_BUILD || WANT_FAT_BINARY
+#define MAYBE_range_basecase 1
+#define MAYBE_range_toom22   1
+#else
+#define MAYBE_range_basecase                                           \
+  ((MULLO_DC_THRESHOLD == 0 ? MULLO_BASECASE_THRESHOLD : MULLO_DC_THRESHOLD) < MUL_TOOM22_THRESHOLD*36/(36-11))
+#define MAYBE_range_toom22                                             \
+  ((MULLO_DC_THRESHOLD == 0 ? MULLO_BASECASE_THRESHOLD : MULLO_DC_THRESHOLD) < MUL_TOOM33_THRESHOLD*36/(36-11) )
+#endif
+
+/*  THINK: The DC strategy uses different constants in different Toom's
+	 ranges. Something smoother?
+*/
+
+/*
+  Compute the least significant half of the product {xy,n}*{yp,n}, or
+  formally {rp,n} = {xy,n}*{yp,n} Mod (B^n).
+
+  Above the given threshold, the Divide and Conquer strategy is used.
+  The operands are split in two, and a full product plus two mullo
+  are used to obtain the final result. The more natural strategy is to
+  split in two halves, but this is far from optimal when a
+  sub-quadratic multiplication is used.
+
+  Mulders suggests an unbalanced split in favour of the full product,
+  split n = n1 + n2, where an = n1 <= n2 = (1-a)n; i.e. 0 < a <= 1/2.
+
+  To compute the value of a, we assume that the cost of mullo for a
+  given size ML(n) is a fraction of the cost of a full product with
+  same size M(n), and the cost M(n)=n^e for some exponent 1 < e <= 2;
+  then we can write:
+
+  ML(n) = 2*ML(an) + M((1-a)n) => k*M(n) = 2*k*M(n)*a^e + M(n)*(1-a)^e
+
+  Given a value for e, want to minimise the value of k, i.e. the
+  function k=(1-a)^e/(1-2*a^e).
+
+  With e=2, the exponent for schoolbook multiplication, the minimum is
+  given by the values a=1-a=1/2.
+
+  With e=log(3)/log(2), the exponent for Karatsuba (aka toom22),
+  Mulders compute (1-a) = 0.694... and we approximate a with 11/36.
+
+  Other possible approximations follow:
+  e=log(5)/log(3) [Toom-3] -> a ~= 9/40
+  e=log(7)/log(4) [Toom-4] -> a ~= 7/39
+  e=log(11)/log(6) [Toom-6] -> a ~= 1/8
+  e=log(15)/log(8) [Toom-8] -> a ~= 1/10
+
+  The values above where obtained with the following trivial commands
+  in the gp-pari shell:
+
+fun(e,a)=(1-a)^e/(1-2*a^e)
+mul(a,b,c)={local(m,x,p);if(b-c<1/10000,(b+c)/2,m=1;x=b;forstep(p=c,b,(b-c)/8,if(fun(a,p)<m,m=fun(a,p);x=p));mul(a,(b+x)/2,(c+x)/2))}
+contfracpnqn(contfrac(mul(log(2*2-1)/log(2),1/2,0),5))
+contfracpnqn(contfrac(mul(log(3*2-1)/log(3),1/2,0),5))
+contfracpnqn(contfrac(mul(log(4*2-1)/log(4),1/2,0),5))
+contfracpnqn(contfrac(mul(log(6*2-1)/log(6),1/2,0),3))
+contfracpnqn(contfrac(mul(log(8*2-1)/log(8),1/2,0),3))
+
+  ,
+  |\
+  | \
+  +----,
+  |    |
+  |    |
+  |    |\
+  |    | \
+  +----+--`
+  ^ n2 ^n1^
+
+  For an actual implementation, the assumption that M(n)=n^e is
+  incorrect, as a consequence also the assumption that ML(n)=k*M(n)
+  with a constant k is wrong.
+
+  But theory suggest us two things:
+  - the best the multiplication product is (lower e), the more k
+    approaches 1, and a approaches 0.
+
+  - A value for a smaller than optimal is probably less bad than a
+    bigger one: e.g. let e=log(3)/log(2), a=0.3058_ the optimal
+    value, and k(a)=0.808_ the mul/mullo speed ratio. We get
+    k(a+1/6)=0.929_ but k(a-1/6)=0.865_.
+*/
+
+static mp_size_t
+mpn_mullo_n_itch (mp_size_t n)
+{
+  return 2*n;
+}
+
+/*
+    mpn_dc_mullo_n requires a scratch space of 2*n limbs at tp.
+    It accepts tp == rp.
+*/
+static void
+mpn_dc_mullo_n (mp_ptr rp, mp_srcptr xp, mp_srcptr yp, mp_size_t n, mp_ptr tp)
+{
+  mp_size_t n2, n1;
+  ASSERT (n >= 2);
+  ASSERT (! MPN_OVERLAP_P (rp, n, xp, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp, n));
+  ASSERT (MPN_SAME_OR_SEPARATE2_P(rp, n, tp, 2*n));
+
+  /* Divide-and-conquer */
+
+  /* We need fractional approximation of the value 0 < a <= 1/2
+     giving the minimum in the function k=(1-a)^e/(1-2*a^e).
+  */
+  if (MAYBE_range_basecase && BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD*36/(36-11)))
+    n1 = n >> 1;
+  else if (MAYBE_range_toom22 && BELOW_THRESHOLD (n, MUL_TOOM33_THRESHOLD*36/(36-11)))
+    n1 = n * 11 / (size_t) 36;	/* n1 ~= n*(1-.694...) */
+  else if (BELOW_THRESHOLD (n, MUL_TOOM44_THRESHOLD*40/(40-9)))
+    n1 = n * 9 / (size_t) 40;	/* n1 ~= n*(1-.775...) */
+  else if (BELOW_THRESHOLD (n, MUL_TOOM8H_THRESHOLD*10/9))
+    n1 = n * 7 / (size_t) 39;	/* n1 ~= n*(1-.821...) */
+  /* n1 = n * 4 / (size_t) 31;	// n1 ~= n*(1-.871...) [TOOM66] */
+  else
+    n1 = n / (size_t) 10;		/* n1 ~= n*(1-.899...) [TOOM88] */
+
+  n2 = n - n1;
+
+  /* Split as x = x1 2^(n2 GMP_NUMB_BITS) + x0,
+	      y = y1 2^(n2 GMP_NUMB_BITS) + y0 */
+
+  /* x0 * y0 */
+  mpn_mul_n (tp, xp, yp, n2);
+  MPN_COPY (rp, tp, n2);
+
+  /* x1 * y0 * 2^(n2 GMP_NUMB_BITS) */
+  if (BELOW_THRESHOLD (n1, MULLO_BASECASE_THRESHOLD))
+    mpn_mul_basecase (tp + n, xp + n2, n1, yp, n1);
+  else if (BELOW_THRESHOLD (n1, MULLO_DC_THRESHOLD))
+    mpn_mullo_basecase (tp + n, xp + n2, yp, n1);
+  else
+    mpn_dc_mullo_n (tp + n, xp + n2, yp, n1, tp + n);
+  mpn_add_n (rp + n2, tp + n2, tp + n, n1);
+
+  /* x0 * y1 * 2^(n2 GMP_NUMB_BITS) */
+  if (BELOW_THRESHOLD (n1, MULLO_BASECASE_THRESHOLD))
+    mpn_mul_basecase (tp + n, xp, n1, yp + n2, n1);
+  else if (BELOW_THRESHOLD (n1, MULLO_DC_THRESHOLD))
+    mpn_mullo_basecase (tp + n, xp, yp + n2, n1);
+  else
+    mpn_dc_mullo_n (tp + n, xp, yp + n2, n1, tp + n);
+  mpn_add_n (rp + n2, rp + n2, tp + n, n1);
+}
+
+/* Avoid zero allocations when MULLO_BASECASE_THRESHOLD is 0.  */
+#define MUL_BASECASE_ALLOC \
+ (MULLO_BASECASE_THRESHOLD_LIMIT == 0 ? 1 : 2*MULLO_BASECASE_THRESHOLD_LIMIT)
+
+/* FIXME: This function should accept a temporary area; dc_mullow_n
+   accepts a pointer tp, and handle the case tp == rp, do the same here.
+   Maybe recombine the two functions.
+   THINK: If mpn_mul_basecase is always faster than mpn_mullo_basecase
+	  (typically thanks to mpn_addmul_2) should we unconditionally use
+	  mpn_mul_n?
+*/
+
+void
+mpn_mullo_n (mp_ptr rp, mp_srcptr xp, mp_srcptr yp, mp_size_t n)
+{
+  ASSERT (n >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, n, xp, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp, n));
+
+  if (BELOW_THRESHOLD (n, MULLO_BASECASE_THRESHOLD))
+    {
+      /* Allocate workspace of fixed size on stack: fast! */
+      mp_limb_t tp[MUL_BASECASE_ALLOC];
+      mpn_mul_basecase (tp, xp, n, yp, n);
+      MPN_COPY (rp, tp, n);
+    }
+  else if (BELOW_THRESHOLD (n, MULLO_DC_THRESHOLD))
+    {
+      mpn_mullo_basecase (rp, xp, yp, n);
+    }
+  else
+    {
+      mp_ptr tp;
+      TMP_DECL;
+      TMP_MARK;
+      tp = TMP_ALLOC_LIMBS (mpn_mullo_n_itch (n));
+      if (BELOW_THRESHOLD (n, MULLO_MUL_N_THRESHOLD))
+	{
+	  mpn_dc_mullo_n (rp, xp, yp, n, tp);
+	}
+      else
+	{
+	  /* For really large operands, use plain mpn_mul_n but throw away upper n
+	     limbs of result.  */
+#if !TUNE_PROGRAM_BUILD && (MULLO_MUL_N_THRESHOLD > MUL_FFT_THRESHOLD)
+	  mpn_fft_mul (tp, xp, n, yp, n);
+#else
+	  mpn_mul_n (tp, xp, yp, n);
+#endif
+	  MPN_COPY (rp, tp, n);
+	}
+      TMP_FREE;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid.c
deleted file mode 120000
index d90ce25d3..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mulmid.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid.c
new file mode 100644
index 000000000..f35c5fb5d
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid.c
@@ -0,0 +1,255 @@
+/* mpn_mulmid -- middle product
+
+   Contributed by David Harvey.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+#define CHUNK (200 + MULMID_TOOM42_THRESHOLD)
+
+
+void
+mpn_mulmid (mp_ptr rp,
+            mp_srcptr ap, mp_size_t an,
+            mp_srcptr bp, mp_size_t bn)
+{
+  mp_size_t rn, k;
+  mp_ptr scratch, temp;
+
+  ASSERT (an >= bn);
+  ASSERT (bn >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, an - bn + 3, ap, an));
+  ASSERT (! MPN_OVERLAP_P (rp, an - bn + 3, bp, bn));
+
+  if (bn < MULMID_TOOM42_THRESHOLD)
+    {
+      /* region not tall enough to make toom42 worthwhile for any portion */
+
+      if (an < CHUNK)
+	{
+	  /* region not too wide either, just call basecase directly */
+	  mpn_mulmid_basecase (rp, ap, an, bp, bn);
+	  return;
+	}
+
+      /* Region quite wide. For better locality, use basecase on chunks:
+
+	 AAABBBCC..
+	 .AAABBBCC.
+	 ..AAABBBCC
+      */
+
+      k = CHUNK - bn + 1;    /* number of diagonals per chunk */
+
+      /* first chunk (marked A in the above diagram) */
+      mpn_mulmid_basecase (rp, ap, CHUNK, bp, bn);
+
+      /* remaining chunks (B, C, etc) */
+      an -= k;
+
+      while (an >= CHUNK)
+	{
+	  mp_limb_t t0, t1, cy;
+	  ap += k, rp += k;
+	  t0 = rp[0], t1 = rp[1];
+	  mpn_mulmid_basecase (rp, ap, CHUNK, bp, bn);
+	  ADDC_LIMB (cy, rp[0], rp[0], t0);    /* add back saved limbs */
+	  MPN_INCR_U (rp + 1, k + 1, t1 + cy);
+	  an -= k;
+	}
+
+      if (an >= bn)
+	{
+	  /* last remaining chunk */
+	  mp_limb_t t0, t1, cy;
+	  ap += k, rp += k;
+	  t0 = rp[0], t1 = rp[1];
+	  mpn_mulmid_basecase (rp, ap, an, bp, bn);
+	  ADDC_LIMB (cy, rp[0], rp[0], t0);
+	  MPN_INCR_U (rp + 1, an - bn + 2, t1 + cy);
+	}
+
+      return;
+    }
+
+  /* region is tall enough for toom42 */
+
+  rn = an - bn + 1;
+
+  if (rn < MULMID_TOOM42_THRESHOLD)
+    {
+      /* region not wide enough to make toom42 worthwhile for any portion */
+
+      TMP_DECL;
+
+      if (bn < CHUNK)
+	{
+	  /* region not too tall either, just call basecase directly */
+	  mpn_mulmid_basecase (rp, ap, an, bp, bn);
+	  return;
+	}
+
+      /* Region quite tall. For better locality, use basecase on chunks:
+
+	 AAAAA....
+	 .AAAAA...
+	 ..BBBBB..
+	 ...BBBBB.
+	 ....CCCCC
+      */
+
+      TMP_MARK;
+
+      temp = TMP_ALLOC_LIMBS (rn + 2);
+
+      /* first chunk (marked A in the above diagram) */
+      bp += bn - CHUNK, an -= bn - CHUNK;
+      mpn_mulmid_basecase (rp, ap, an, bp, CHUNK);
+
+      /* remaining chunks (B, C, etc) */
+      bn -= CHUNK;
+
+      while (bn >= CHUNK)
+	{
+	  ap += CHUNK, bp -= CHUNK;
+	  mpn_mulmid_basecase (temp, ap, an, bp, CHUNK);
+	  mpn_add_n (rp, rp, temp, rn + 2);
+	  bn -= CHUNK;
+	}
+
+      if (bn)
+	{
+	  /* last remaining chunk */
+	  ap += CHUNK, bp -= bn;
+	  mpn_mulmid_basecase (temp, ap, rn + bn - 1, bp, bn);
+	  mpn_add_n (rp, rp, temp, rn + 2);
+	}
+
+      TMP_FREE;
+      return;
+    }
+
+  /* we're definitely going to use toom42 somewhere */
+
+  if (bn > rn)
+    {
+      /* slice region into chunks, use toom42 on all chunks except possibly
+	 the last:
+
+         AA....
+         .AA...
+         ..BB..
+         ...BB.
+         ....CC
+      */
+
+      TMP_DECL;
+      TMP_MARK;
+
+      temp = TMP_ALLOC_LIMBS (rn + 2 + mpn_toom42_mulmid_itch (rn));
+      scratch = temp + rn + 2;
+
+      /* first chunk (marked A in the above diagram) */
+      bp += bn - rn;
+      mpn_toom42_mulmid (rp, ap, bp, rn, scratch);
+
+      /* remaining chunks (B, C, etc) */
+      bn -= rn;
+
+      while (bn >= rn)
+        {
+          ap += rn, bp -= rn;
+	  mpn_toom42_mulmid (temp, ap, bp, rn, scratch);
+          mpn_add_n (rp, rp, temp, rn + 2);
+          bn -= rn;
+        }
+
+      if (bn)
+        {
+          /* last remaining chunk */
+          ap += rn, bp -= bn;
+	  mpn_mulmid (temp, ap, rn + bn - 1, bp, bn);
+          mpn_add_n (rp, rp, temp, rn + 2);
+        }
+
+      TMP_FREE;
+    }
+  else
+    {
+      /* slice region into chunks, use toom42 on all chunks except possibly
+	 the last:
+
+         AAABBBCC..
+         .AAABBBCC.
+         ..AAABBBCC
+      */
+
+      TMP_DECL;
+      TMP_MARK;
+
+      scratch = TMP_ALLOC_LIMBS (mpn_toom42_mulmid_itch (bn));
+
+      /* first chunk (marked A in the above diagram) */
+      mpn_toom42_mulmid (rp, ap, bp, bn, scratch);
+
+      /* remaining chunks (B, C, etc) */
+      rn -= bn;
+
+      while (rn >= bn)
+        {
+	  mp_limb_t t0, t1, cy;
+          ap += bn, rp += bn;
+          t0 = rp[0], t1 = rp[1];
+          mpn_toom42_mulmid (rp, ap, bp, bn, scratch);
+	  ADDC_LIMB (cy, rp[0], rp[0], t0);     /* add back saved limbs */
+	  MPN_INCR_U (rp + 1, bn + 1, t1 + cy);
+	  rn -= bn;
+        }
+
+      TMP_FREE;
+
+      if (rn)
+        {
+          /* last remaining chunk */
+	  mp_limb_t t0, t1, cy;
+          ap += bn, rp += bn;
+          t0 = rp[0], t1 = rp[1];
+          mpn_mulmid (rp, ap, rn + bn - 1, bp, bn);
+	  ADDC_LIMB (cy, rp[0], rp[0], t0);
+	  MPN_INCR_U (rp + 1, rn + 1, t1 + cy);
+        }
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_basecase.c
deleted file mode 120000
index eb3bc955f..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_basecase.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mulmid_basecase.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_basecase.c
new file mode 100644
index 000000000..d5434ea8b
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_basecase.c
@@ -0,0 +1,82 @@
+/* mpn_mulmid_basecase -- classical middle product algorithm
+
+   Contributed by David Harvey.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Middle product of {up,un} and {vp,vn}, write result to {rp,un-vn+3}.
+   Must have un >= vn >= 1.
+
+   Neither input buffer may overlap with the output buffer. */
+
+void
+mpn_mulmid_basecase (mp_ptr rp,
+                     mp_srcptr up, mp_size_t un,
+                     mp_srcptr vp, mp_size_t vn)
+{
+  mp_limb_t lo, hi;  /* last two limbs of output */
+  mp_limb_t cy;
+
+  ASSERT (un >= vn);
+  ASSERT (vn >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, un - vn + 3, up, un));
+  ASSERT (! MPN_OVERLAP_P (rp, un - vn + 3, vp, vn));
+
+  up += vn - 1;
+  un -= vn - 1;
+
+  /* multiply by first limb, store result */
+  lo = mpn_mul_1 (rp, up, un, vp[0]);
+  hi = 0;
+
+  /* accumulate remaining rows */
+  for (vn--; vn; vn--)
+    {
+      up--, vp++;
+      cy = mpn_addmul_1 (rp, up, un, vp[0]);
+      add_ssaaaa (hi, lo, hi, lo, CNST_LIMB(0), cy);
+    }
+
+  /* store final limbs */
+#if GMP_NAIL_BITS != 0
+  hi = (hi << GMP_NAIL_BITS) + (lo >> GMP_NUMB_BITS);
+  lo &= GMP_NUMB_MASK;
+#endif
+
+  rp[un] = lo;
+  rp[un + 1] = hi;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_n.c
deleted file mode 120000
index 546526470..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mulmid_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_n.c
new file mode 100644
index 000000000..ac7e8f12f
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmid_n.c
@@ -0,0 +1,61 @@
+/* mpn_mulmid_n -- balanced middle product
+
+   Contributed by David Harvey.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+void
+mpn_mulmid_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n)
+{
+  ASSERT (n >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, n + 2, ap, 2*n - 1));
+  ASSERT (! MPN_OVERLAP_P (rp, n + 2, bp, n));
+
+  if (n < MULMID_TOOM42_THRESHOLD)
+    {
+      mpn_mulmid_basecase (rp, ap, 2*n - 1, bp, n);
+    }
+  else
+    {
+      mp_ptr scratch;
+      TMP_DECL;
+      TMP_MARK;
+      scratch = TMP_ALLOC_LIMBS (mpn_toom42_mulmid_itch (n));
+      mpn_toom42_mulmid (rp, ap, bp, n, scratch);
+      TMP_FREE;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmod_bnm1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmod_bnm1.c
deleted file mode 120000
index 397e0ef97..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmod_bnm1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/mulmod_bnm1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmod_bnm1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmod_bnm1.c
new file mode 100644
index 000000000..769bdbc30
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/mulmod_bnm1.c
@@ -0,0 +1,354 @@
+/* mulmod_bnm1.c -- multiplication mod B^n-1.
+
+   Contributed to the GNU project by Niels Möller, Torbjorn Granlund and
+   Marco Bodrato.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010, 2012, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Inputs are {ap,rn} and {bp,rn}; output is {rp,rn}, computation is
+   mod B^rn - 1, and values are semi-normalised; zero is represented
+   as either 0 or B^n - 1.  Needs a scratch of 2rn limbs at tp.
+   tp==rp is allowed. */
+void
+mpn_bc_mulmod_bnm1 (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t rn,
+		    mp_ptr tp)
+{
+  mp_limb_t cy;
+
+  ASSERT (0 < rn);
+
+  mpn_mul_n (tp, ap, bp, rn);
+  cy = mpn_add_n (rp, tp, tp + rn, rn);
+  /* If cy == 1, then the value of rp is at most B^rn - 2, so there can
+   * be no overflow when adding in the carry. */
+  MPN_INCR_U (rp, rn, cy);
+}
+
+
+/* Inputs are {ap,rn+1} and {bp,rn+1}; output is {rp,rn+1}, in
+   semi-normalised representation, computation is mod B^rn + 1. Needs
+   a scratch area of 2rn + 2 limbs at tp; tp == rp is allowed.
+   Output is normalised. */
+static void
+mpn_bc_mulmod_bnp1 (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t rn,
+		    mp_ptr tp)
+{
+  mp_limb_t cy;
+
+  ASSERT (0 < rn);
+
+  mpn_mul_n (tp, ap, bp, rn + 1);
+  ASSERT (tp[2*rn+1] == 0);
+  ASSERT (tp[2*rn] < GMP_NUMB_MAX);
+  cy = tp[2*rn] + mpn_sub_n (rp, tp, tp+rn, rn);
+  rp[rn] = 0;
+  MPN_INCR_U (rp, rn+1, cy);
+}
+
+
+/* Computes {rp,MIN(rn,an+bn)} <- {ap,an}*{bp,bn} Mod(B^rn-1)
+ *
+ * The result is expected to be ZERO if and only if one of the operand
+ * already is. Otherwise the class [0] Mod(B^rn-1) is represented by
+ * B^rn-1. This should not be a problem if mulmod_bnm1 is used to
+ * combine results and obtain a natural number when one knows in
+ * advance that the final value is less than (B^rn-1).
+ * Moreover it should not be a problem if mulmod_bnm1 is used to
+ * compute the full product with an+bn <= rn, because this condition
+ * implies (B^an-1)(B^bn-1) < (B^rn-1) .
+ *
+ * Requires 0 < bn <= an <= rn and an + bn > rn/2
+ * Scratch need: rn + (need for recursive call OR rn + 4). This gives
+ *
+ * S(n) <= rn + MAX (rn + 4, S(n/2)) <= 2rn + 4
+ */
+void
+mpn_mulmod_bnm1 (mp_ptr rp, mp_size_t rn, mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn, mp_ptr tp)
+{
+  ASSERT (0 < bn);
+  ASSERT (bn <= an);
+  ASSERT (an <= rn);
+
+  if ((rn & 1) != 0 || BELOW_THRESHOLD (rn, MULMOD_BNM1_THRESHOLD))
+    {
+      if (UNLIKELY (bn < rn))
+	{
+	  if (UNLIKELY (an + bn <= rn))
+	    {
+	      mpn_mul (rp, ap, an, bp, bn);
+	    }
+	  else
+	    {
+	      mp_limb_t cy;
+	      mpn_mul (tp, ap, an, bp, bn);
+	      cy = mpn_add (rp, tp, rn, tp + rn, an + bn - rn);
+	      MPN_INCR_U (rp, rn, cy);
+	    }
+	}
+      else
+	mpn_bc_mulmod_bnm1 (rp, ap, bp, rn, tp);
+    }
+  else
+    {
+      mp_size_t n;
+      mp_limb_t cy;
+      mp_limb_t hi;
+
+      n = rn >> 1;
+
+      /* We need at least an + bn >= n, to be able to fit one of the
+	 recursive products at rp. Requiring strict inequality makes
+	 the code slightly simpler. If desired, we could avoid this
+	 restriction by initially halving rn as long as rn is even and
+	 an + bn <= rn/2. */
+
+      ASSERT (an + bn > n);
+
+      /* Compute xm = a*b mod (B^n - 1), xp = a*b mod (B^n + 1)
+	 and crt together as
+
+	 x = -xp * B^n + (B^n + 1) * [ (xp + xm)/2 mod (B^n-1)]
+      */
+
+#define a0 ap
+#define a1 (ap + n)
+#define b0 bp
+#define b1 (bp + n)
+
+#define xp  tp	/* 2n + 2 */
+      /* am1  maybe in {xp, n} */
+      /* bm1  maybe in {xp + n, n} */
+#define sp1 (tp + 2*n + 2)
+      /* ap1  maybe in {sp1, n + 1} */
+      /* bp1  maybe in {sp1 + n + 1, n + 1} */
+
+      {
+	mp_srcptr am1, bm1;
+	mp_size_t anm, bnm;
+	mp_ptr so;
+
+	bm1 = b0;
+	bnm = bn;
+	if (LIKELY (an > n))
+	  {
+	    am1 = xp;
+	    cy = mpn_add (xp, a0, n, a1, an - n);
+	    MPN_INCR_U (xp, n, cy);
+	    anm = n;
+	    so = xp + n;
+	    if (LIKELY (bn > n))
+	      {
+		bm1 = so;
+		cy = mpn_add (so, b0, n, b1, bn - n);
+		MPN_INCR_U (so, n, cy);
+		bnm = n;
+		so += n;
+	      }
+	  }
+	else
+	  {
+	    so = xp;
+	    am1 = a0;
+	    anm = an;
+	  }
+
+	mpn_mulmod_bnm1 (rp, n, am1, anm, bm1, bnm, so);
+      }
+
+      {
+	int       k;
+	mp_srcptr ap1, bp1;
+	mp_size_t anp, bnp;
+
+	bp1 = b0;
+	bnp = bn;
+	if (LIKELY (an > n)) {
+	  ap1 = sp1;
+	  cy = mpn_sub (sp1, a0, n, a1, an - n);
+	  sp1[n] = 0;
+	  MPN_INCR_U (sp1, n + 1, cy);
+	  anp = n + ap1[n];
+	  if (LIKELY (bn > n)) {
+	    bp1 = sp1 + n + 1;
+	    cy = mpn_sub (sp1 + n + 1, b0, n, b1, bn - n);
+	    sp1[2*n+1] = 0;
+	    MPN_INCR_U (sp1 + n + 1, n + 1, cy);
+	    bnp = n + bp1[n];
+	  }
+	} else {
+	  ap1 = a0;
+	  anp = an;
+	}
+
+	if (BELOW_THRESHOLD (n, MUL_FFT_MODF_THRESHOLD))
+	  k=0;
+	else
+	  {
+	    int mask;
+	    k = mpn_fft_best_k (n, 0);
+	    mask = (1<<k) - 1;
+	    while (n & mask) {k--; mask >>=1;};
+	  }
+	if (k >= FFT_FIRST_K)
+	  xp[n] = mpn_mul_fft (xp, n, ap1, anp, bp1, bnp, k);
+	else if (UNLIKELY (bp1 == b0))
+	  {
+	    ASSERT (anp + bnp <= 2*n+1);
+	    ASSERT (anp + bnp > n);
+	    ASSERT (anp >= bnp);
+	    mpn_mul (xp, ap1, anp, bp1, bnp);
+	    anp = anp + bnp - n;
+	    ASSERT (anp <= n || xp[2*n]==0);
+	    anp-= anp > n;
+	    cy = mpn_sub (xp, xp, n, xp + n, anp);
+	    xp[n] = 0;
+	    MPN_INCR_U (xp, n+1, cy);
+	  }
+	else
+	  mpn_bc_mulmod_bnp1 (xp, ap1, bp1, n, xp);
+      }
+
+      /* Here the CRT recomposition begins.
+
+	 xm <- (xp + xm)/2 = (xp + xm)B^n/2 mod (B^n-1)
+	 Division by 2 is a bitwise rotation.
+
+	 Assumes xp normalised mod (B^n+1).
+
+	 The residue class [0] is represented by [B^n-1]; except when
+	 both input are ZERO.
+      */
+
+#if HAVE_NATIVE_mpn_rsh1add_n || HAVE_NATIVE_mpn_rsh1add_nc
+#if HAVE_NATIVE_mpn_rsh1add_nc
+      cy = mpn_rsh1add_nc(rp, rp, xp, n, xp[n]); /* B^n = 1 */
+      hi = cy << (GMP_NUMB_BITS - 1);
+      cy = 0;
+      /* next update of rp[n-1] will set cy = 1 only if rp[n-1]+=hi
+	 overflows, i.e. a further increment will not overflow again. */
+#else /* ! _nc */
+      cy = xp[n] + mpn_rsh1add_n(rp, rp, xp, n); /* B^n = 1 */
+      hi = (cy<<(GMP_NUMB_BITS-1))&GMP_NUMB_MASK; /* (cy&1) << ... */
+      cy >>= 1;
+      /* cy = 1 only if xp[n] = 1 i.e. {xp,n} = ZERO, this implies that
+	 the rsh1add was a simple rshift: the top bit is 0. cy=1 => hi=0. */
+#endif
+#if GMP_NAIL_BITS == 0
+      add_ssaaaa(cy, rp[n-1], cy, rp[n-1], 0, hi);
+#else
+      cy += (hi & rp[n-1]) >> (GMP_NUMB_BITS-1);
+      rp[n-1] ^= hi;
+#endif
+#else /* ! HAVE_NATIVE_mpn_rsh1add_n */
+#if HAVE_NATIVE_mpn_add_nc
+      cy = mpn_add_nc(rp, rp, xp, n, xp[n]);
+#else /* ! _nc */
+      cy = xp[n] + mpn_add_n(rp, rp, xp, n); /* xp[n] == 1 implies {xp,n} == ZERO */
+#endif
+      cy += (rp[0]&1);
+      mpn_rshift(rp, rp, n, 1);
+      ASSERT (cy <= 2);
+      hi = (cy<<(GMP_NUMB_BITS-1))&GMP_NUMB_MASK; /* (cy&1) << ... */
+      cy >>= 1;
+      /* We can have cy != 0 only if hi = 0... */
+      ASSERT ((rp[n-1] & GMP_NUMB_HIGHBIT) == 0);
+      rp[n-1] |= hi;
+      /* ... rp[n-1] + cy can not overflow, the following INCR is correct. */
+#endif
+      ASSERT (cy <= 1);
+      /* Next increment can not overflow, read the previous comments about cy. */
+      ASSERT ((cy == 0) || ((rp[n-1] & GMP_NUMB_HIGHBIT) == 0));
+      MPN_INCR_U(rp, n, cy);
+
+      /* Compute the highest half:
+	 ([(xp + xm)/2 mod (B^n-1)] - xp ) * B^n
+       */
+      if (UNLIKELY (an + bn < rn))
+	{
+	  /* Note that in this case, the only way the result can equal
+	     zero mod B^{rn} - 1 is if one of the inputs is zero, and
+	     then the output of both the recursive calls and this CRT
+	     reconstruction is zero, not B^{rn} - 1. Which is good,
+	     since the latter representation doesn't fit in the output
+	     area.*/
+	  cy = mpn_sub_n (rp + n, rp, xp, an + bn - n);
+
+	  /* FIXME: This subtraction of the high parts is not really
+	     necessary, we do it to get the carry out, and for sanity
+	     checking. */
+	  cy = xp[n] + mpn_sub_nc (xp + an + bn - n, rp + an + bn - n,
+				   xp + an + bn - n, rn - (an + bn), cy);
+	  ASSERT (an + bn == rn - 1 ||
+		  mpn_zero_p (xp + an + bn - n + 1, rn - 1 - (an + bn)));
+	  cy = mpn_sub_1 (rp, rp, an + bn, cy);
+	  ASSERT (cy == (xp + an + bn - n)[0]);
+	}
+      else
+	{
+	  cy = xp[n] + mpn_sub_n (rp + n, rp, xp, n);
+	  /* cy = 1 only if {xp,n+1} is not ZERO, i.e. {rp,n} is not ZERO.
+	     DECR will affect _at most_ the lowest n limbs. */
+	  MPN_DECR_U (rp, 2*n, cy);
+	}
+#undef a0
+#undef a1
+#undef b0
+#undef b1
+#undef xp
+#undef sp1
+    }
+}
+
+mp_size_t
+mpn_mulmod_bnm1_next_size (mp_size_t n)
+{
+  mp_size_t nh;
+
+  if (BELOW_THRESHOLD (n,     MULMOD_BNM1_THRESHOLD))
+    return n;
+  if (BELOW_THRESHOLD (n, 4 * (MULMOD_BNM1_THRESHOLD - 1) + 1))
+    return (n + (2-1)) & (-2);
+  if (BELOW_THRESHOLD (n, 8 * (MULMOD_BNM1_THRESHOLD - 1) + 1))
+    return (n + (4-1)) & (-4);
+
+  nh = (n + 1) >> 1;
+
+  if (BELOW_THRESHOLD (nh, MUL_FFT_MODF_THRESHOLD))
+    return (n + (8-1)) & (-8);
+
+  return 2 * mpn_fft_next_size (nh, mpn_fft_best_k (nh, 0));
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/nand_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/nand_n.c
deleted file mode 120000
index 0a553d94d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/nand_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/logops_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/nand_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/nand_n.c
new file mode 100644
index 000000000..3adba2cdc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/nand_n.c
@@ -0,0 +1,77 @@
+/* mpn_and_n, mpn_ior_n, etc -- mpn logical operations.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#ifdef OPERATION_and_n
+#define func __MPN(and_n)
+#define call mpn_and_n
+#endif
+
+#ifdef OPERATION_andn_n
+#define func __MPN(andn_n)
+#define call mpn_andn_n
+#endif
+
+#ifdef OPERATION_nand_n
+#define func __MPN(nand_n)
+#define call mpn_nand_n
+#endif
+
+#ifdef OPERATION_ior_n
+#define func __MPN(ior_n)
+#define call mpn_ior_n
+#endif
+
+#ifdef OPERATION_iorn_n
+#define func __MPN(iorn_n)
+#define call mpn_iorn_n
+#endif
+
+#ifdef OPERATION_nior_n
+#define func __MPN(nior_n)
+#define call mpn_nior_n
+#endif
+
+#ifdef OPERATION_xor_n
+#define func __MPN(xor_n)
+#define call mpn_xor_n
+#endif
+
+#ifdef OPERATION_xnor_n
+#define func __MPN(xnor_n)
+#define call mpn_xnor_n
+#endif
+
+void
+func (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  call (rp, up, vp, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/neg.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/neg.c
deleted file mode 120000
index 8774bf54f..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/neg.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/neg.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/neg.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/neg.c
new file mode 100644
index 000000000..bec2a32ed
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/neg.c
@@ -0,0 +1,33 @@
+/* mpn_neg - negate an mpn.
+
+Copyright 2001, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#define __GMP_FORCE_mpn_neg 1
+
+#include "gmp-impl.h"
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/nior_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/nior_n.c
deleted file mode 120000
index 0a553d94d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/nior_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/logops_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/nior_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/nior_n.c
new file mode 100644
index 000000000..3adba2cdc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/nior_n.c
@@ -0,0 +1,77 @@
+/* mpn_and_n, mpn_ior_n, etc -- mpn logical operations.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#ifdef OPERATION_and_n
+#define func __MPN(and_n)
+#define call mpn_and_n
+#endif
+
+#ifdef OPERATION_andn_n
+#define func __MPN(andn_n)
+#define call mpn_andn_n
+#endif
+
+#ifdef OPERATION_nand_n
+#define func __MPN(nand_n)
+#define call mpn_nand_n
+#endif
+
+#ifdef OPERATION_ior_n
+#define func __MPN(ior_n)
+#define call mpn_ior_n
+#endif
+
+#ifdef OPERATION_iorn_n
+#define func __MPN(iorn_n)
+#define call mpn_iorn_n
+#endif
+
+#ifdef OPERATION_nior_n
+#define func __MPN(nior_n)
+#define call mpn_nior_n
+#endif
+
+#ifdef OPERATION_xor_n
+#define func __MPN(xor_n)
+#define call mpn_xor_n
+#endif
+
+#ifdef OPERATION_xnor_n
+#define func __MPN(xnor_n)
+#define call mpn_xnor_n
+#endif
+
+void
+func (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  call (rp, up, vp, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/nussbaumer_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/nussbaumer_mul.c
deleted file mode 120000
index 519e30cc4..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/nussbaumer_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/nussbaumer_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/nussbaumer_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/nussbaumer_mul.c
new file mode 100644
index 000000000..3e0cf279a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/nussbaumer_mul.c
@@ -0,0 +1,70 @@
+/* mpn_nussbaumer_mul -- Multiply {ap,an} and {bp,bn} using
+   Nussbaumer's negacyclic convolution.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Multiply {ap,an} by {bp,bn}, and put the result in {pp, an+bn} */
+void
+mpn_nussbaumer_mul (mp_ptr pp,
+		    mp_srcptr ap, mp_size_t an,
+		    mp_srcptr bp, mp_size_t bn)
+{
+  mp_size_t rn;
+  mp_ptr tp;
+  TMP_DECL;
+
+  ASSERT (an >= bn);
+  ASSERT (bn > 0);
+
+  TMP_MARK;
+
+  if ((ap == bp) && (an == bn))
+    {
+      rn = mpn_sqrmod_bnm1_next_size (2*an);
+      tp = TMP_ALLOC_LIMBS (mpn_sqrmod_bnm1_itch (rn, an));
+      mpn_sqrmod_bnm1 (pp, rn, ap, an, tp);
+    }
+  else
+    {
+      rn = mpn_mulmod_bnm1_next_size (an + bn);
+      tp = TMP_ALLOC_LIMBS (mpn_mulmod_bnm1_itch (rn, an, bn));
+      mpn_mulmod_bnm1 (pp, rn, ap, an, bp, bn, tp);
+    }
+
+  TMP_FREE;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/perfpow.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/perfpow.c
deleted file mode 120000
index c89604392..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/perfpow.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/perfpow.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/perfpow.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/perfpow.c
new file mode 100644
index 000000000..9d4647778
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/perfpow.c
@@ -0,0 +1,342 @@
+/* mpn_perfect_power_p -- mpn perfect power detection.
+
+   Contributed to the GNU project by Martin Boij.
+
+Copyright 2009, 2010, 2012, 2014 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#define SMALL 20
+#define MEDIUM 100
+
+/* Return non-zero if {np,nn} == {xp,xn} ^ k.
+   Algorithm:
+       For s = 1, 2, 4, ..., s_max, compute the s least significant limbs of
+       {xp,xn}^k. Stop if they don't match the s least significant limbs of
+       {np,nn}.
+
+   FIXME: Low xn limbs can be expected to always match, if computed as a mod
+   B^{xn} root. So instead of using mpn_powlo, compute an approximation of the
+   most significant (normalized) limb of {xp,xn} ^ k (and an error bound), and
+   compare to {np, nn}. Or use an even cruder approximation based on fix-point
+   base 2 logarithm.  */
+static int
+pow_equals (mp_srcptr np, mp_size_t n,
+	    mp_srcptr xp,mp_size_t xn,
+	    mp_limb_t k, mp_bitcnt_t f,
+	    mp_ptr tp)
+{
+  mp_bitcnt_t y, z;
+  mp_size_t bn;
+  mp_limb_t h, l;
+
+  ASSERT (n > 1 || (n == 1 && np[0] > 1));
+  ASSERT (np[n - 1] > 0);
+  ASSERT (xn > 0);
+
+  if (xn == 1 && xp[0] == 1)
+    return 0;
+
+  z = 1 + (n >> 1);
+  for (bn = 1; bn < z; bn <<= 1)
+    {
+      mpn_powlo (tp, xp, &k, 1, bn, tp + bn);
+      if (mpn_cmp (tp, np, bn) != 0)
+	return 0;
+    }
+
+  /* Final check. Estimate the size of {xp,xn}^k before computing the power
+     with full precision.  Optimization: It might pay off to make a more
+     accurate estimation of the logarithm of {xp,xn}, rather than using the
+     index of the MSB.  */
+
+  MPN_SIZEINBASE_2EXP(y, xp, xn, 1);
+  y -= 1;  /* msb_index (xp, xn) */
+
+  umul_ppmm (h, l, k, y);
+  h -= l == 0;  --l;	/* two-limb decrement */
+
+  z = f - 1; /* msb_index (np, n) */
+  if (h == 0 && l <= z)
+    {
+      mp_limb_t *tp2;
+      mp_size_t i;
+      int ans;
+      mp_limb_t size;
+      TMP_DECL;
+
+      size = l + k;
+      ASSERT_ALWAYS (size >= k);
+
+      TMP_MARK;
+      y = 2 + size / GMP_LIMB_BITS;
+      tp2 = TMP_ALLOC_LIMBS (y);
+
+      i = mpn_pow_1 (tp, xp, xn, k, tp2);
+      if (i == n && mpn_cmp (tp, np, n) == 0)
+	ans = 1;
+      else
+	ans = 0;
+      TMP_FREE;
+      return ans;
+    }
+
+  return 0;
+}
+
+
+/* Return non-zero if N = {np,n} is a kth power.
+   I = {ip,n} = N^(-1) mod B^n.  */
+static int
+is_kth_power (mp_ptr rp, mp_srcptr np,
+	      mp_limb_t k, mp_srcptr ip,
+	      mp_size_t n, mp_bitcnt_t f,
+	      mp_ptr tp)
+{
+  mp_bitcnt_t b;
+  mp_size_t rn, xn;
+
+  ASSERT (n > 0);
+  ASSERT ((k & 1) != 0 || k == 2);
+  ASSERT ((np[0] & 1) != 0);
+
+  if (k == 2)
+    {
+      b = (f + 1) >> 1;
+      rn = 1 + b / GMP_LIMB_BITS;
+      if (mpn_bsqrtinv (rp, ip, b, tp) != 0)
+	{
+	  rp[rn - 1] &= (CNST_LIMB(1) << (b % GMP_LIMB_BITS)) - 1;
+	  xn = rn;
+	  MPN_NORMALIZE (rp, xn);
+	  if (pow_equals (np, n, rp, xn, k, f, tp) != 0)
+	    return 1;
+
+	  /* Check if (2^b - r)^2 == n */
+	  mpn_neg (rp, rp, rn);
+	  rp[rn - 1] &= (CNST_LIMB(1) << (b % GMP_LIMB_BITS)) - 1;
+	  MPN_NORMALIZE (rp, rn);
+	  if (pow_equals (np, n, rp, rn, k, f, tp) != 0)
+	    return 1;
+	}
+    }
+  else
+    {
+      b = 1 + (f - 1) / k;
+      rn = 1 + (b - 1) / GMP_LIMB_BITS;
+      mpn_brootinv (rp, ip, rn, k, tp);
+      if ((b % GMP_LIMB_BITS) != 0)
+	rp[rn - 1] &= (CNST_LIMB(1) << (b % GMP_LIMB_BITS)) - 1;
+      MPN_NORMALIZE (rp, rn);
+      if (pow_equals (np, n, rp, rn, k, f, tp) != 0)
+	return 1;
+    }
+  MPN_ZERO (rp, rn); /* Untrash rp */
+  return 0;
+}
+
+static int
+perfpow (mp_srcptr np, mp_size_t n,
+	 mp_limb_t ub, mp_limb_t g,
+	 mp_bitcnt_t f, int neg)
+{
+  mp_ptr ip, tp, rp;
+  mp_limb_t k;
+  int ans;
+  mp_bitcnt_t b;
+  gmp_primesieve_t ps;
+  TMP_DECL;
+
+  ASSERT (n > 0);
+  ASSERT ((np[0] & 1) != 0);
+  ASSERT (ub > 0);
+
+  TMP_MARK;
+  gmp_init_primesieve (&ps);
+  b = (f + 3) >> 1;
+
+  TMP_ALLOC_LIMBS_3 (ip, n, rp, n, tp, 5 * n);
+
+  MPN_ZERO (rp, n);
+
+  /* FIXME: It seems the inverse in ninv is needed only to get non-inverted
+     roots. I.e., is_kth_power computes n^{1/2} as (n^{-1})^{-1/2} and
+     similarly for nth roots. It should be more efficient to compute n^{1/2} as
+     n * n^{-1/2}, with a mullo instead of a binvert. And we can do something
+     similar for kth roots if we switch to an iteration converging to n^{1/k -
+     1}, and we can then eliminate this binvert call. */
+  mpn_binvert (ip, np, 1 + (b - 1) / GMP_LIMB_BITS, tp);
+  if (b % GMP_LIMB_BITS)
+    ip[(b - 1) / GMP_LIMB_BITS] &= (CNST_LIMB(1) << (b % GMP_LIMB_BITS)) - 1;
+
+  if (neg)
+    gmp_nextprime (&ps);
+
+  ans = 0;
+  if (g > 0)
+    {
+      ub = MIN (ub, g + 1);
+      while ((k = gmp_nextprime (&ps)) < ub)
+	{
+	  if ((g % k) == 0)
+	    {
+	      if (is_kth_power (rp, np, k, ip, n, f, tp) != 0)
+		{
+		  ans = 1;
+		  goto ret;
+		}
+	    }
+	}
+    }
+  else
+    {
+      while ((k = gmp_nextprime (&ps)) < ub)
+	{
+	  if (is_kth_power (rp, np, k, ip, n, f, tp) != 0)
+	    {
+	      ans = 1;
+	      goto ret;
+	    }
+	}
+    }
+ ret:
+  TMP_FREE;
+  return ans;
+}
+
+static const unsigned short nrtrial[] = { 100, 500, 1000 };
+
+/* Table of (log_{p_i} 2) values, where p_i is the (nrtrial[i] + 1)'th prime
+   number.  */
+static const double logs[] =
+  { 0.1099457228193620, 0.0847016403115322, 0.0772048195144415 };
+
+int
+mpn_perfect_power_p (mp_srcptr np, mp_size_t n)
+{
+  mp_limb_t *nc, factor, g;
+  mp_limb_t exp, d;
+  mp_bitcnt_t twos, count;
+  int ans, where, neg, trial;
+  TMP_DECL;
+
+  neg = n < 0;
+  if (neg)
+    {
+      n = -n;
+    }
+
+  if (n == 0 || (n == 1 && np[0] == 1)) /* Valgrind doesn't like
+					   (n <= (np[0] == 1)) */
+    return 1;
+
+  TMP_MARK;
+
+  count = 0;
+
+  twos = mpn_scan1 (np, 0);
+  if (twos != 0)
+    {
+      mp_size_t s;
+      if (twos == 1)
+	{
+	  return 0;
+	}
+      s = twos / GMP_LIMB_BITS;
+      if (s + 1 == n && POW2_P (np[s]))
+	{
+	  return ! (neg && POW2_P (twos));
+	}
+      count = twos % GMP_LIMB_BITS;
+      n -= s;
+      np += s;
+      if (count > 0)
+	{
+	  nc = TMP_ALLOC_LIMBS (n);
+	  mpn_rshift (nc, np, n, count);
+	  n -= (nc[n - 1] == 0);
+	  np = nc;
+	}
+    }
+  g = twos;
+
+  trial = (n > SMALL) + (n > MEDIUM);
+
+  where = 0;
+  factor = mpn_trialdiv (np, n, nrtrial[trial], &where);
+
+  if (factor != 0)
+    {
+      if (count == 0) /* We did not allocate nc yet. */
+	{
+	  nc = TMP_ALLOC_LIMBS (n);
+	}
+
+      /* Remove factors found by trialdiv.  Optimization: If remove
+	 define _itch, we can allocate its scratch just once */
+
+      do
+	{
+	  binvert_limb (d, factor);
+
+	  /* After the first round we always have nc == np */
+	  exp = mpn_remove (nc, &n, np, n, &d, 1, ~(mp_bitcnt_t)0);
+
+	  if (g == 0)
+	    g = exp;
+	  else
+	    g = mpn_gcd_1 (&g, 1, exp);
+
+	  if (g == 1)
+	    {
+	      ans = 0;
+	      goto ret;
+	    }
+
+	  if ((n == 1) & (nc[0] == 1))
+	    {
+	      ans = ! (neg && POW2_P (g));
+	      goto ret;
+	    }
+
+	  np = nc;
+	  factor = mpn_trialdiv (np, n, nrtrial[trial], &where);
+	}
+      while (factor != 0);
+    }
+
+  MPN_SIZEINBASE_2EXP(count, np, n, 1);   /* log (np) + 1 */
+  d = (mp_limb_t) (count * logs[trial] + 1e-9) + 1;
+  ans = perfpow (np, n, d, g, count, neg);
+
+ ret:
+  TMP_FREE;
+  return ans;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/perfsqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/perfsqr.c
deleted file mode 120000
index 447874916..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/perfsqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/perfsqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/perfsqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/perfsqr.c
new file mode 100644
index 000000000..38a1a91ed
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/perfsqr.c
@@ -0,0 +1,239 @@
+/* mpn_perfect_square_p(u,usize) -- Return non-zero if U is a perfect square,
+   zero otherwise.
+
+Copyright 1991, 1993, 1994, 1996, 1997, 2000-2002, 2005, 2012 Free Software
+Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include <stdio.h> /* for NULL */
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#include "perfsqr.h"
+
+
+/* change this to "#define TRACE(x) x" for diagnostics */
+#define TRACE(x)
+
+
+
+/* PERFSQR_MOD_* detects non-squares using residue tests.
+
+   A macro PERFSQR_MOD_TEST is setup by gen-psqr.c in perfsqr.h.  It takes
+   {up,usize} modulo a selected modulus to get a remainder r.  For 32-bit or
+   64-bit limbs this modulus will be 2^24-1 or 2^48-1 using PERFSQR_MOD_34,
+   or for other limb or nail sizes a PERFSQR_PP is chosen and PERFSQR_MOD_PP
+   used.  PERFSQR_PP_NORM and PERFSQR_PP_INVERTED are pre-calculated in this
+   case too.
+
+   PERFSQR_MOD_TEST then makes various calls to PERFSQR_MOD_1 or
+   PERFSQR_MOD_2 with divisors d which are factors of the modulus, and table
+   data indicating residues and non-residues modulo those divisors.  The
+   table data is in 1 or 2 limbs worth of bits respectively, per the size of
+   each d.
+
+   A "modexact" style remainder is taken to reduce r modulo d.
+   PERFSQR_MOD_IDX implements this, producing an index "idx" for use with
+   the table data.  Notice there's just one multiplication by a constant
+   "inv", for each d.
+
+   The modexact doesn't produce a true r%d remainder, instead idx satisfies
+   "-(idx<<PERFSQR_MOD_BITS) == r mod d".  Because d is odd, this factor
+   -2^PERFSQR_MOD_BITS is a one-to-one mapping between r and idx, and is
+   accounted for by having the table data suitably permuted.
+
+   The remainder r fits within PERFSQR_MOD_BITS which is less than a limb.
+   In fact the GMP_LIMB_BITS - PERFSQR_MOD_BITS spare bits are enough to fit
+   each divisor d meaning the modexact multiply can take place entirely
+   within one limb, giving the compiler the chance to optimize it, in a way
+   that say umul_ppmm would not give.
+
+   There's no need for the divisors d to be prime, in fact gen-psqr.c makes
+   a deliberate effort to combine factors so as to reduce the number of
+   separate tests done on r.  But such combining is limited to d <=
+   2*GMP_LIMB_BITS so that the table data fits in at most 2 limbs.
+
+   Alternatives:
+
+   It'd be possible to use bigger divisors d, and more than 2 limbs of table
+   data, but this doesn't look like it would be of much help to the prime
+   factors in the usual moduli 2^24-1 or 2^48-1.
+
+   The moduli 2^24-1 or 2^48-1 are nothing particularly special, they're
+   just easy to calculate (see mpn_mod_34lsub1) and have a nice set of prime
+   factors.  2^32-1 and 2^64-1 would be equally easy to calculate, but have
+   fewer prime factors.
+
+   The nails case usually ends up using mpn_mod_1, which is a lot slower
+   than mpn_mod_34lsub1.  Perhaps other such special moduli could be found
+   for the nails case.  Two-term things like 2^30-2^15-1 might be
+   candidates.  Or at worst some on-the-fly de-nailing would allow the plain
+   2^24-1 to be used.  Currently nails are too preliminary to be worried
+   about.
+
+*/
+
+#define PERFSQR_MOD_MASK       ((CNST_LIMB(1) << PERFSQR_MOD_BITS) - 1)
+
+#define MOD34_BITS  (GMP_NUMB_BITS / 4 * 3)
+#define MOD34_MASK  ((CNST_LIMB(1) << MOD34_BITS) - 1)
+
+#define PERFSQR_MOD_34(r, up, usize)				\
+  do {								\
+    (r) = mpn_mod_34lsub1 (up, usize);				\
+    (r) = ((r) & MOD34_MASK) + ((r) >> MOD34_BITS);		\
+  } while (0)
+
+/* FIXME: The %= here isn't good, and might destroy any savings from keeping
+   the PERFSQR_MOD_IDX stuff within a limb (rather than needing umul_ppmm).
+   Maybe a new sort of mpn_preinv_mod_1 could accept an unnormalized divisor
+   and a shift count, like mpn_preinv_divrem_1.  But mod_34lsub1 is our
+   normal case, so lets not worry too much about mod_1.  */
+#define PERFSQR_MOD_PP(r, up, usize)					\
+  do {									\
+    if (BELOW_THRESHOLD (usize, PREINV_MOD_1_TO_MOD_1_THRESHOLD))	\
+      {									\
+	(r) = mpn_preinv_mod_1 (up, usize, PERFSQR_PP_NORM,		\
+				PERFSQR_PP_INVERTED);			\
+	(r) %= PERFSQR_PP;						\
+      }									\
+    else								\
+      {									\
+	(r) = mpn_mod_1 (up, usize, PERFSQR_PP);			\
+      }									\
+  } while (0)
+
+#define PERFSQR_MOD_IDX(idx, r, d, inv)				\
+  do {								\
+    mp_limb_t  q;						\
+    ASSERT ((r) <= PERFSQR_MOD_MASK);				\
+    ASSERT ((((inv) * (d)) & PERFSQR_MOD_MASK) == 1);		\
+    ASSERT (MP_LIMB_T_MAX / (d) >= PERFSQR_MOD_MASK);		\
+								\
+    q = ((r) * (inv)) & PERFSQR_MOD_MASK;			\
+    ASSERT (r == ((q * (d)) & PERFSQR_MOD_MASK));		\
+    (idx) = (q * (d)) >> PERFSQR_MOD_BITS;			\
+  } while (0)
+
+#define PERFSQR_MOD_1(r, d, inv, mask)				\
+  do {								\
+    unsigned   idx;						\
+    ASSERT ((d) <= GMP_LIMB_BITS);				\
+    PERFSQR_MOD_IDX(idx, r, d, inv);				\
+    TRACE (printf ("  PERFSQR_MOD_1 d=%u r=%lu idx=%u\n",	\
+		   d, r%d, idx));				\
+    if ((((mask) >> idx) & 1) == 0)				\
+      {								\
+	TRACE (printf ("  non-square\n"));			\
+	return 0;						\
+      }								\
+  } while (0)
+
+/* The expression "(int) idx - GMP_LIMB_BITS < 0" lets the compiler use the
+   sign bit from "idx-GMP_LIMB_BITS", which might help avoid a branch.  */
+#define PERFSQR_MOD_2(r, d, inv, mhi, mlo)			\
+  do {								\
+    mp_limb_t  m;						\
+    unsigned   idx;						\
+    ASSERT ((d) <= 2*GMP_LIMB_BITS);				\
+								\
+    PERFSQR_MOD_IDX (idx, r, d, inv);				\
+    TRACE (printf ("  PERFSQR_MOD_2 d=%u r=%lu idx=%u\n",	\
+		   d, r%d, idx));				\
+    m = ((int) idx - GMP_LIMB_BITS < 0 ? (mlo) : (mhi));	\
+    idx %= GMP_LIMB_BITS;					\
+    if (((m >> idx) & 1) == 0)					\
+      {								\
+	TRACE (printf ("  non-square\n"));			\
+	return 0;						\
+      }								\
+  } while (0)
+
+
+int
+mpn_perfect_square_p (mp_srcptr up, mp_size_t usize)
+{
+  ASSERT (usize >= 1);
+
+  TRACE (gmp_printf ("mpn_perfect_square_p %Nd\n", up, usize));
+
+  /* The first test excludes 212/256 (82.8%) of the perfect square candidates
+     in O(1) time.  */
+  {
+    unsigned  idx = up[0] % 0x100;
+    if (((sq_res_0x100[idx / GMP_LIMB_BITS]
+	  >> (idx % GMP_LIMB_BITS)) & 1) == 0)
+      return 0;
+  }
+
+#if 0
+  /* Check that we have even multiplicity of 2, and then check that the rest is
+     a possible perfect square.  Leave disabled until we can determine this
+     really is an improvement.  It it is, it could completely replace the
+     simple probe above, since this should throw out more non-squares, but at
+     the expense of somewhat more cycles.  */
+  {
+    mp_limb_t lo;
+    int cnt;
+    lo = up[0];
+    while (lo == 0)
+      up++, lo = up[0], usize--;
+    count_trailing_zeros (cnt, lo);
+    if ((cnt & 1) != 0)
+      return 0;			/* return of not even multiplicity of 2 */
+    lo >>= cnt;			/* shift down to align lowest non-zero bit */
+    lo >>= 1;			/* shift away lowest non-zero bit */
+    if ((lo & 3) != 0)
+      return 0;
+  }
+#endif
+
+
+  /* The second test uses mpn_mod_34lsub1 or mpn_mod_1 to detect non-squares
+     according to their residues modulo small primes (or powers of
+     primes).  See perfsqr.h.  */
+  PERFSQR_MOD_TEST (up, usize);
+
+
+  /* For the third and last test, we finally compute the square root,
+     to make sure we've really got a perfect square.  */
+  {
+    mp_ptr root_ptr;
+    int res;
+    TMP_DECL;
+
+    TMP_MARK;
+    root_ptr = TMP_ALLOC_LIMBS ((usize + 1) / 2);
+
+    /* Iff mpn_sqrtrem returns zero, the square is perfect.  */
+    res = ! mpn_sqrtrem (root_ptr, NULL, up, usize);
+    TMP_FREE;
+
+    return res;
+  }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/popcount.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/popcount.c
deleted file mode 120000
index 4729a18b9..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/popcount.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/popham.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/popcount.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/popcount.c
new file mode 100644
index 000000000..87974d710
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/popcount.c
@@ -0,0 +1,125 @@
+/* mpn_popcount, mpn_hamdist -- mpn bit population count/hamming distance.
+
+Copyright 1994, 1996, 2000-2002, 2005, 2011, 2012 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if OPERATION_popcount
+#define FNAME mpn_popcount
+#define POPHAM(u,v) u
+#endif
+
+#if OPERATION_hamdist
+#define FNAME mpn_hamdist
+#define POPHAM(u,v) u ^ v
+#endif
+
+mp_bitcnt_t
+FNAME (mp_srcptr up,
+#if OPERATION_hamdist
+       mp_srcptr vp,
+#endif
+       mp_size_t n) __GMP_NOTHROW
+{
+  mp_bitcnt_t result = 0;
+  mp_limb_t p0, p1, p2, p3, x, p01, p23;
+  mp_size_t i;
+
+  ASSERT (n >= 1);		/* Actually, this code handles any n, but some
+				   assembly implementations do not.  */
+
+  for (i = n >> 2; i != 0; i--)
+    {
+      p0 = POPHAM (up[0], vp[0]);
+      p0 -= (p0 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p0 = ((p0 >> 2) & MP_LIMB_T_MAX/5) + (p0 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p1 = POPHAM (up[1], vp[1]);
+      p1 -= (p1 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p1 = ((p1 >> 2) & MP_LIMB_T_MAX/5) + (p1 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p01 = p0 + p1;							/* 8 0-8 */
+      p01 = ((p01 >> 4) & MP_LIMB_T_MAX/17) + (p01 & MP_LIMB_T_MAX/17);	/* 8 0-16 */
+
+      p2 = POPHAM (up[2], vp[2]);
+      p2 -= (p2 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p2 = ((p2 >> 2) & MP_LIMB_T_MAX/5) + (p2 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p3 = POPHAM (up[3], vp[3]);
+      p3 -= (p3 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+      p3 = ((p3 >> 2) & MP_LIMB_T_MAX/5) + (p3 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+
+      p23 = p2 + p3;							/* 8 0-8 */
+      p23 = ((p23 >> 4) & MP_LIMB_T_MAX/17) + (p23 & MP_LIMB_T_MAX/17);	/* 8 0-16 */
+
+      x = p01 + p23;							/* 8 0-32 */
+      x = (x >> 8) + x;							/* 8 0-64 */
+      x = (x >> 16) + x;						/* 8 0-128 */
+#if GMP_LIMB_BITS > 32
+      x = ((x >> 32) & 0xff) + (x & 0xff);				/* 8 0-256 */
+      result += x;
+#else
+      result += x & 0xff;
+#endif
+      up += 4;
+#if OPERATION_hamdist
+      vp += 4;
+#endif
+    }
+
+  n &= 3;
+  if (n != 0)
+    {
+      x = 0;
+      do
+	{
+	  p0 = POPHAM (up[0], vp[0]);
+	  p0 -= (p0 >> 1) & MP_LIMB_T_MAX/3;				/* 2 0-2 */
+	  p0 = ((p0 >> 2) & MP_LIMB_T_MAX/5) + (p0 & MP_LIMB_T_MAX/5);	/* 4 0-4 */
+	  p0 = ((p0 >> 4) + p0) & MP_LIMB_T_MAX/17;			/* 8 0-8 */
+
+	  x += p0;
+	  up += 1;
+#if OPERATION_hamdist
+	  vp += 1;
+#endif
+	}
+      while (--n);
+
+      x = (x >> 8) + x;
+      x = (x >> 16) + x;
+#if GMP_LIMB_BITS > 32
+      x = (x >> 32) + x;
+#endif
+      result += x & 0xff;
+    }
+
+  return result;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/pow_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/pow_1.c
deleted file mode 120000
index 55ffecf16..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/pow_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/pow_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/pow_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/pow_1.c
new file mode 100644
index 000000000..de11cd2c5
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/pow_1.c
@@ -0,0 +1,135 @@
+/* mpn_pow_1 -- Compute powers R = U^exp.
+
+   THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY.  THEY'RE ALMOST
+   CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
+   FUTURE GNU MP RELEASES.
+
+Copyright 2002, 2014 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+mp_size_t
+mpn_pow_1 (mp_ptr rp, mp_srcptr bp, mp_size_t bn, mp_limb_t exp, mp_ptr tp)
+{
+  mp_limb_t x;
+  int cnt, i;
+  mp_size_t rn;
+  int par;
+
+  ASSERT (bn >= 1);
+  /* FIXME: Add operand overlap criteria */
+
+  if (exp <= 1)
+    {
+      if (exp == 0)
+	{
+	  rp[0] = 1;
+	  return 1;
+	}
+      else
+	{
+	  MPN_COPY (rp, bp, bn);
+	  return bn;
+	}
+    }
+
+  /* Count number of bits in exp, and compute where to put initial square in
+     order to magically get results in the entry rp.  Use simple code,
+     optimized for small exp.  For large exp, the bignum operations will take
+     so much time that the slowness of this code will be negligible.  */
+  par = 0;
+  cnt = GMP_LIMB_BITS;
+  x = exp;
+  do
+    {
+      par ^= x;
+      cnt--;
+      x >>= 1;
+    } while (x != 0);
+  exp <<= cnt;
+
+  if (bn == 1)
+    {
+      mp_limb_t rl, rh, bl = bp[0];
+
+      if ((cnt & 1) != 0)
+	MP_PTR_SWAP (rp, tp);
+
+      umul_ppmm (rh, rl, bl, bl << GMP_NAIL_BITS);
+      rp[0] = rl >> GMP_NAIL_BITS;
+      rp[1] = rh;
+      rn = 1 + (rh != 0);
+
+      for (i = GMP_LIMB_BITS - cnt - 1;;)
+	{
+	  exp <<= 1;
+	  if ((exp & GMP_LIMB_HIGHBIT) != 0)
+	    {
+	      rp[rn] = rh = mpn_mul_1 (rp, rp, rn, bl);
+	      rn += rh != 0;
+	    }
+
+	  if (--i == 0)
+	    break;
+
+	  mpn_sqr (tp, rp, rn);
+	  rn = 2 * rn; rn -= tp[rn - 1] == 0;
+	  MP_PTR_SWAP (rp, tp);
+	}
+    }
+  else
+    {
+      if (((par ^ cnt) & 1) == 0)
+	MP_PTR_SWAP (rp, tp);
+
+      mpn_sqr (rp, bp, bn);
+      rn = 2 * bn; rn -= rp[rn - 1] == 0;
+
+      for (i = GMP_LIMB_BITS - cnt - 1;;)
+	{
+	  exp <<= 1;
+	  if ((exp & GMP_LIMB_HIGHBIT) != 0)
+	    {
+	      rn = rn + bn - (mpn_mul (tp, rp, rn, bp, bn) == 0);
+	      MP_PTR_SWAP (rp, tp);
+	    }
+
+	  if (--i == 0)
+	    break;
+
+	  mpn_sqr (tp, rp, rn);
+	  rn = 2 * rn; rn -= tp[rn - 1] == 0;
+	  MP_PTR_SWAP (rp, tp);
+	}
+    }
+
+  return rn;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/powm.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/powm.c
deleted file mode 120000
index b1d874487..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/powm.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/powm.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/powm.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/powm.c
new file mode 100644
index 000000000..28281030b
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/powm.c
@@ -0,0 +1,635 @@
+/* mpn_powm -- Compute R = U^E mod M.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2007-2012, 2019 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/*
+  BASIC ALGORITHM, Compute U^E mod M, where M < B^n is odd.
+
+  1. W <- U
+
+  2. T <- (B^n * U) mod M                Convert to REDC form
+
+  3. Compute table U^1, U^3, U^5... of E-dependent size
+
+  4. While there are more bits in E
+       W <- power left-to-right base-k
+
+
+  TODO:
+
+   * Make getbits a macro, thereby allowing it to update the index operand.
+     That will simplify the code using getbits.  (Perhaps make getbits' sibling
+     getbit then have similar form, for symmetry.)
+
+   * Write an itch function.  Or perhaps get rid of tp parameter since the huge
+     pp area is allocated locally anyway?
+
+   * Choose window size without looping.  (Superoptimize or think(tm).)
+
+   * Handle small bases with initial, reduction-free exponentiation.
+
+   * Call new division functions, not mpn_tdiv_qr.
+
+   * Consider special code for one-limb M.
+
+   * How should we handle the redc1/redc2/redc_n choice?
+     - redc1:  T(binvert_1limb)  + e * (n)   * (T(mullo-1x1) + n*T(addmul_1))
+     - redc2:  T(binvert_2limbs) + e * (n/2) * (T(mullo-2x2) + n*T(addmul_2))
+     - redc_n: T(binvert_nlimbs) + e * (T(mullo-nxn) + T(M(n)))
+     This disregards the addmul_N constant term, but we could think of
+     that as part of the respective mullo.
+
+   * When U (the base) is small, we should start the exponentiation with plain
+     operations, then convert that partial result to REDC form.
+
+   * When U is just one limb, should it be handled without the k-ary tricks?
+     We could keep a factor of B^n in W, but use U' = BU as base.  After
+     multiplying by this (pseudo two-limb) number, we need to multiply by 1/B
+     mod M.
+*/
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#undef MPN_REDC_0
+#define MPN_REDC_0(rp, up, mp, invm)					\
+  do {									\
+    mp_limb_t p1, r0, u0, _dummy;					\
+    u0 = *(up);								\
+    umul_ppmm (p1, _dummy, *(mp), (u0 * (invm)) & GMP_NUMB_MASK);	\
+    ASSERT (((u0 + _dummy) & GMP_NUMB_MASK) == 0);			\
+    p1 += (u0 != 0);							\
+    r0 = (up)[1] + p1;							\
+    if (p1 > r0)							\
+      r0 -= *(mp);							\
+    *(rp) = r0;								\
+  } while (0)
+
+#undef MPN_REDC_1
+#if HAVE_NATIVE_mpn_sbpi1_bdiv_r
+#define MPN_REDC_1(rp, up, mp, n, invm)					\
+  do {									\
+    mp_limb_t cy;							\
+    cy = mpn_sbpi1_bdiv_r (up, 2 * n, mp, n, invm);			\
+    if (cy != 0)							\
+      mpn_sub_n (rp, up + n, mp, n);					\
+    else								\
+      MPN_COPY (rp, up + n, n);						\
+  } while (0)
+#else
+#define MPN_REDC_1(rp, up, mp, n, invm)					\
+  do {									\
+    mp_limb_t cy;							\
+    cy = mpn_redc_1 (rp, up, mp, n, invm);				\
+    if (cy != 0)							\
+      mpn_sub_n (rp, rp, mp, n);					\
+  } while (0)
+#endif
+
+#undef MPN_REDC_2
+#define MPN_REDC_2(rp, up, mp, n, mip)					\
+  do {									\
+    mp_limb_t cy;							\
+    cy = mpn_redc_2 (rp, up, mp, n, mip);				\
+    if (cy != 0)							\
+      mpn_sub_n (rp, rp, mp, n);					\
+  } while (0)
+
+#if HAVE_NATIVE_mpn_addmul_2 || HAVE_NATIVE_mpn_redc_2
+#define WANT_REDC_2 1
+#endif
+
+#define getbit(p,bi) \
+  ((p[(bi - 1) / GMP_LIMB_BITS] >> (bi - 1) % GMP_LIMB_BITS) & 1)
+
+static inline mp_limb_t
+getbits (const mp_limb_t *p, mp_bitcnt_t bi, int nbits)
+{
+  int nbits_in_r;
+  mp_limb_t r;
+  mp_size_t i;
+
+  if (bi < nbits)
+    {
+      return p[0] & (((mp_limb_t) 1 << bi) - 1);
+    }
+  else
+    {
+      bi -= nbits;			/* bit index of low bit to extract */
+      i = bi / GMP_NUMB_BITS;		/* word index of low bit to extract */
+      bi %= GMP_NUMB_BITS;		/* bit index in low word */
+      r = p[i] >> bi;			/* extract (low) bits */
+      nbits_in_r = GMP_NUMB_BITS - bi;	/* number of bits now in r */
+      if (nbits_in_r < nbits)		/* did we get enough bits? */
+	r += p[i + 1] << nbits_in_r;	/* prepend bits from higher word */
+      return r & (((mp_limb_t) 1 << nbits) - 1);
+    }
+}
+
+static inline int
+win_size (mp_bitcnt_t eb)
+{
+  int k;
+  static mp_bitcnt_t x[] = {0,7,25,81,241,673,1793,4609,11521,28161,~(mp_bitcnt_t)0};
+  for (k = 1; eb > x[k]; k++)
+    ;
+  return k;
+}
+
+/* Convert U to REDC form, U_r = B^n * U mod M */
+static void
+redcify (mp_ptr rp, mp_srcptr up, mp_size_t un, mp_srcptr mp, mp_size_t n)
+{
+  mp_ptr tp, qp;
+  TMP_DECL;
+  TMP_MARK;
+
+  TMP_ALLOC_LIMBS_2 (tp, un + n, qp, un + 1);
+
+  MPN_ZERO (tp, n);
+  MPN_COPY (tp + n, up, un);
+  mpn_tdiv_qr (qp, rp, 0L, tp, un + n, mp, n);
+  TMP_FREE;
+}
+
+/* rp[n-1..0] = bp[bn-1..0] ^ ep[en-1..0] mod mp[n-1..0]
+   Requires that mp[n-1..0] is odd.
+   Requires that ep[en-1..0] is > 1.
+   Uses scratch space at tp of MAX(mpn_binvert_itch(n),2n) limbs.  */
+void
+mpn_powm (mp_ptr rp, mp_srcptr bp, mp_size_t bn,
+	  mp_srcptr ep, mp_size_t en,
+	  mp_srcptr mp, mp_size_t n, mp_ptr tp)
+{
+  mp_limb_t ip[2], *mip;
+  int cnt;
+  mp_bitcnt_t ebi;
+  int windowsize, this_windowsize;
+  mp_limb_t expbits;
+  mp_ptr pp, this_pp;
+  long i;
+  TMP_DECL;
+
+  ASSERT (en > 1 || (en == 1 && ep[0] > 1));
+  ASSERT (n >= 1 && ((mp[0] & 1) != 0));
+
+  TMP_MARK;
+
+  MPN_SIZEINBASE_2EXP(ebi, ep, en, 1);
+
+#if 0
+  if (bn < n)
+    {
+      /* Do the first few exponent bits without mod reductions,
+	 until the result is greater than the mod argument.  */
+      for (;;)
+	{
+	  mpn_sqr (tp, this_pp, tn);
+	  tn = tn * 2 - 1,  tn += tp[tn] != 0;
+	  if (getbit (ep, ebi) != 0)
+	    mpn_mul (..., tp, tn, bp, bn);
+	  ebi--;
+	}
+    }
+#endif
+
+  windowsize = win_size (ebi);
+
+#if WANT_REDC_2
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+    {
+      mip = ip;
+      binvert_limb (mip[0], mp[0]);
+      mip[0] = -mip[0];
+    }
+  else if (BELOW_THRESHOLD (n, REDC_2_TO_REDC_N_THRESHOLD))
+    {
+      mip = ip;
+      mpn_binvert (mip, mp, 2, tp);
+      mip[0] = -mip[0]; mip[1] = ~mip[1];
+    }
+#else
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_N_THRESHOLD))
+    {
+      mip = ip;
+      binvert_limb (mip[0], mp[0]);
+      mip[0] = -mip[0];
+    }
+#endif
+  else
+    {
+      mip = TMP_ALLOC_LIMBS (n);
+      mpn_binvert (mip, mp, n, tp);
+    }
+
+  pp = TMP_ALLOC_LIMBS (n << (windowsize - 1));
+
+  this_pp = pp;
+  redcify (this_pp, bp, bn, mp, n);
+
+  /* Store b^2 at rp.  */
+  mpn_sqr (tp, this_pp, n);
+#if 0
+  if (n == 1) {
+    MPN_REDC_0 (rp, tp, mp, mip[0]);
+  } else
+#endif
+#if WANT_REDC_2
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+    MPN_REDC_1 (rp, tp, mp, n, mip[0]);
+  else if (BELOW_THRESHOLD (n, REDC_2_TO_REDC_N_THRESHOLD))
+    MPN_REDC_2 (rp, tp, mp, n, mip);
+#else
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_N_THRESHOLD))
+    MPN_REDC_1 (rp, tp, mp, n, mip[0]);
+#endif
+  else
+    mpn_redc_n (rp, tp, mp, n, mip);
+
+  /* Precompute odd powers of b and put them in the temporary area at pp.  */
+  for (i = (1 << (windowsize - 1)) - 1; i > 0; i--)
+#if 1
+    if (n == 1) {
+      umul_ppmm((tp)[1], *(tp), *(this_pp), *(rp));
+      ++this_pp ;
+      MPN_REDC_0 (this_pp, tp, mp, mip[0]);
+    } else
+#endif
+    {
+      mpn_mul_n (tp, this_pp, rp, n);
+      this_pp += n;
+#if WANT_REDC_2
+      if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+	MPN_REDC_1 (this_pp, tp, mp, n, mip[0]);
+      else if (BELOW_THRESHOLD (n, REDC_2_TO_REDC_N_THRESHOLD))
+	MPN_REDC_2 (this_pp, tp, mp, n, mip);
+#else
+      if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_N_THRESHOLD))
+	MPN_REDC_1 (this_pp, tp, mp, n, mip[0]);
+#endif
+      else
+	mpn_redc_n (this_pp, tp, mp, n, mip);
+    }
+
+  expbits = getbits (ep, ebi, windowsize);
+  if (ebi < windowsize)
+    ebi = 0;
+  else
+    ebi -= windowsize;
+
+  count_trailing_zeros (cnt, expbits);
+  ebi += cnt;
+  expbits >>= cnt;
+
+  MPN_COPY (rp, pp + n * (expbits >> 1), n);
+
+#define INNERLOOP							\
+  while (ebi != 0)							\
+    {									\
+      while (getbit (ep, ebi) == 0)					\
+	{								\
+	  MPN_SQR (tp, rp, n);						\
+	  MPN_REDUCE (rp, tp, mp, n, mip);				\
+	  if (--ebi == 0)						\
+	    goto done;							\
+	}								\
+									\
+      /* The next bit of the exponent is 1.  Now extract the largest	\
+	 block of bits <= windowsize, and such that the least		\
+	 significant bit is 1.  */					\
+									\
+      expbits = getbits (ep, ebi, windowsize);				\
+      this_windowsize = windowsize;					\
+      if (ebi < windowsize)						\
+	{								\
+	  this_windowsize -= windowsize - ebi;				\
+	  ebi = 0;							\
+	}								\
+      else								\
+        ebi -= windowsize;						\
+									\
+      count_trailing_zeros (cnt, expbits);				\
+      this_windowsize -= cnt;						\
+      ebi += cnt;							\
+      expbits >>= cnt;							\
+									\
+      do								\
+	{								\
+	  MPN_SQR (tp, rp, n);						\
+	  MPN_REDUCE (rp, tp, mp, n, mip);				\
+	}								\
+      while (--this_windowsize != 0);					\
+									\
+      MPN_MUL_N (tp, rp, pp + n * (expbits >> 1), n);			\
+      MPN_REDUCE (rp, tp, mp, n, mip);					\
+    }
+
+
+  if (n == 1)
+    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		umul_ppmm((r)[1], *(r), *(a), *(b))
+#define MPN_SQR(r,a,n)			umul_ppmm((r)[1], *(r), *(a), *(a))
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_0(rp, tp, mp, mip[0])
+      INNERLOOP;
+    }
+  else
+#if WANT_REDC_2
+  if (REDC_1_TO_REDC_2_THRESHOLD < MUL_TOOM22_THRESHOLD)
+    {
+      if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+	{
+	  if (REDC_1_TO_REDC_2_THRESHOLD < SQR_BASECASE_THRESHOLD
+	      || BELOW_THRESHOLD (n, SQR_BASECASE_THRESHOLD))
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_mul_basecase (r,a,n,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	  else
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr_basecase (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	}
+      else if (BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))
+	{
+	  if (MUL_TOOM22_THRESHOLD < SQR_BASECASE_THRESHOLD
+	      || BELOW_THRESHOLD (n, SQR_BASECASE_THRESHOLD))
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_mul_basecase (r,a,n,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_2 (rp, tp, mp, n, mip)
+	      INNERLOOP;
+	    }
+	  else
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr_basecase (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_2 (rp, tp, mp, n, mip)
+	      INNERLOOP;
+	    }
+	}
+      else if (BELOW_THRESHOLD (n, REDC_2_TO_REDC_N_THRESHOLD))
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_2 (rp, tp, mp, n, mip)
+	  INNERLOOP;
+	}
+      else
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	mpn_redc_n (rp, tp, mp, n, mip)
+	  INNERLOOP;
+	}
+    }
+  else
+    {
+      if (BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))
+	{
+	  if (MUL_TOOM22_THRESHOLD < SQR_BASECASE_THRESHOLD
+	      || BELOW_THRESHOLD (n, SQR_BASECASE_THRESHOLD))
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_mul_basecase (r,a,n,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	  else
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr_basecase (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	}
+      else if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	  INNERLOOP;
+	}
+      else if (BELOW_THRESHOLD (n, REDC_2_TO_REDC_N_THRESHOLD))
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_2 (rp, tp, mp, n, mip)
+	  INNERLOOP;
+	}
+      else
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	mpn_redc_n (rp, tp, mp, n, mip)
+	  INNERLOOP;
+	}
+    }
+
+#else  /* WANT_REDC_2 */
+
+  if (REDC_1_TO_REDC_N_THRESHOLD < MUL_TOOM22_THRESHOLD)
+    {
+      if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_N_THRESHOLD))
+	{
+	  if (REDC_1_TO_REDC_N_THRESHOLD < SQR_BASECASE_THRESHOLD
+	      || BELOW_THRESHOLD (n, SQR_BASECASE_THRESHOLD))
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_mul_basecase (r,a,n,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	  else
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr_basecase (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	}
+      else if (BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))
+	{
+	  if (MUL_TOOM22_THRESHOLD < SQR_BASECASE_THRESHOLD
+	      || BELOW_THRESHOLD (n, SQR_BASECASE_THRESHOLD))
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_mul_basecase (r,a,n,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	mpn_redc_n (rp, tp, mp, n, mip)
+	      INNERLOOP;
+	    }
+	  else
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr_basecase (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	mpn_redc_n (rp, tp, mp, n, mip)
+	      INNERLOOP;
+	    }
+	}
+      else
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	mpn_redc_n (rp, tp, mp, n, mip)
+	  INNERLOOP;
+	}
+    }
+  else
+    {
+      if (BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))
+	{
+	  if (MUL_TOOM22_THRESHOLD < SQR_BASECASE_THRESHOLD
+	      || BELOW_THRESHOLD (n, SQR_BASECASE_THRESHOLD))
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_mul_basecase (r,a,n,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	  else
+	    {
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_basecase (r,a,n,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr_basecase (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	      INNERLOOP;
+	    }
+	}
+      else if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_N_THRESHOLD))
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1 (rp, tp, mp, n, mip[0])
+	  INNERLOOP;
+	}
+      else
+	{
+#undef MPN_MUL_N
+#undef MPN_SQR
+#undef MPN_REDUCE
+#define MPN_MUL_N(r,a,b,n)		mpn_mul_n (r,a,b,n)
+#define MPN_SQR(r,a,n)			mpn_sqr (r,a,n)
+#define MPN_REDUCE(rp,tp,mp,n,mip)	mpn_redc_n (rp, tp, mp, n, mip)
+	  INNERLOOP;
+	}
+    }
+#endif  /* WANT_REDC_2 */
+
+ done:
+
+  MPN_COPY (tp, rp, n);
+  MPN_ZERO (tp + n, n);
+
+#if WANT_REDC_2
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+    MPN_REDC_1 (rp, tp, mp, n, mip[0]);
+  else if (BELOW_THRESHOLD (n, REDC_2_TO_REDC_N_THRESHOLD))
+    MPN_REDC_2 (rp, tp, mp, n, mip);
+#else
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_N_THRESHOLD))
+    MPN_REDC_1 (rp, tp, mp, n, mip[0]);
+#endif
+  else
+    mpn_redc_n (rp, tp, mp, n, mip);
+
+  if (mpn_cmp (rp, mp, n) >= 0)
+    mpn_sub_n (rp, rp, mp, n);
+
+  TMP_FREE;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_divrem_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_divrem_1.c
deleted file mode 120000
index 6b2349f4e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_divrem_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/pre_divrem_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_divrem_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_divrem_1.c
new file mode 100644
index 000000000..3b29d7720
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_divrem_1.c
@@ -0,0 +1,145 @@
+/* mpn_preinv_divrem_1 -- mpn by limb division with pre-inverted divisor.
+
+   THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY.  THEY'RE ALMOST
+   CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
+   FUTURE GNU MP RELEASES.
+
+Copyright 2000-2003 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+/* Don't bloat a shared library with unused code. */
+#if USE_PREINV_DIVREM_1
+
+/* Same test here for skipping one divide step as in mpn_divrem_1.
+
+   The main reason for a separate shift==0 case is that not all CPUs give
+   zero for "n0 >> GMP_LIMB_BITS" which would arise in the general case
+   code used on shift==0.  shift==0 is also reasonably common in mp_bases
+   big_base, for instance base==10 on a 64-bit limb.
+
+   Under shift!=0 it would be possible to call mpn_lshift to adjust the
+   dividend all in one go (into the quotient space say), rather than
+   limb-by-limb in the loop.  This might help if mpn_lshift is a lot faster
+   than what the compiler can generate for EXTRACT.  But this is left to CPU
+   specific implementations to consider, especially since EXTRACT isn't on
+   the dependent chain.
+
+   If size==0 then the result is simply xsize limbs of zeros, but nothing
+   special is done for that, since it wouldn't be a usual call, and
+   certainly never arises from mpn_get_str which is our main caller.  */
+
+mp_limb_t
+mpn_preinv_divrem_1 (mp_ptr qp, mp_size_t xsize,
+		     mp_srcptr ap, mp_size_t size, mp_limb_t d_unnorm,
+		     mp_limb_t dinv, int shift)
+{
+  mp_limb_t  ahigh, qhigh, r;
+  mp_size_t  i;
+  mp_limb_t  n1, n0;
+  mp_limb_t  d;
+
+  ASSERT (xsize >= 0);
+  ASSERT (size >= 1);
+  ASSERT (d_unnorm != 0);
+#if WANT_ASSERT
+  {
+    int        want_shift;
+    mp_limb_t  want_dinv;
+    count_leading_zeros (want_shift, d_unnorm);
+    ASSERT (shift == want_shift);
+    invert_limb (want_dinv, d_unnorm << shift);
+    ASSERT (dinv == want_dinv);
+  }
+#endif
+  /* FIXME: What's the correct overlap rule when xsize!=0? */
+  ASSERT (MPN_SAME_OR_SEPARATE_P (qp+xsize, ap, size));
+
+  ahigh = ap[size-1];
+  d = d_unnorm << shift;
+  qp += (size + xsize - 1);   /* dest high limb */
+
+  if (shift == 0)
+    {
+      /* High quotient limb is 0 or 1, and skip a divide step. */
+      r = ahigh;
+      qhigh = (r >= d);
+      r = (qhigh ? r-d : r);
+      *qp-- = qhigh;
+      size--;
+
+      for (i = size-1; i >= 0; i--)
+	{
+	  n0 = ap[i];
+	  udiv_qrnnd_preinv (*qp, r, r, n0, d, dinv);
+	  qp--;
+	}
+    }
+  else
+    {
+      r = 0;
+      if (ahigh < d_unnorm)
+	{
+	  r = ahigh << shift;
+	  *qp-- = 0;
+	  size--;
+	  if (size == 0)
+	    goto done_integer;
+	}
+
+      n1 = ap[size-1];
+      r |= n1 >> (GMP_LIMB_BITS - shift);
+
+      for (i = size-2; i >= 0; i--)
+	{
+	  ASSERT (r < d);
+	  n0 = ap[i];
+	  udiv_qrnnd_preinv (*qp, r, r,
+			     ((n1 << shift) | (n0 >> (GMP_LIMB_BITS - shift))),
+			     d, dinv);
+	  qp--;
+	  n1 = n0;
+	}
+      udiv_qrnnd_preinv (*qp, r, r, n1 << shift, d, dinv);
+      qp--;
+    }
+
+ done_integer:
+  for (i = 0; i < xsize; i++)
+    {
+      udiv_qrnnd_preinv (*qp, r, r, CNST_LIMB(0), d, dinv);
+      qp--;
+    }
+
+  return r >> shift;
+}
+
+#endif /* USE_PREINV_DIVREM_1 */
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_mod_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_mod_1.c
deleted file mode 120000
index ed1e6e2f0..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_mod_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/pre_mod_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_mod_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_mod_1.c
new file mode 100644
index 000000000..78ae3084e
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/pre_mod_1.c
@@ -0,0 +1,61 @@
+/* mpn_preinv_mod_1 (up, un, d, dinv) -- Divide (UP,,UN) by the normalized D.
+   DINV should be 2^(2*GMP_LIMB_BITS) / D - 2^GMP_LIMB_BITS.
+   Return the single-limb remainder.
+
+Copyright 1991, 1993, 1994, 2000-2002, 2004, 2005 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+/* This function used to be documented, but is now considered obsolete.  It
+   continues to exist for binary compatibility, even when not required
+   internally.  */
+
+mp_limb_t
+mpn_preinv_mod_1 (mp_srcptr up, mp_size_t un, mp_limb_t d, mp_limb_t dinv)
+{
+  mp_size_t i;
+  mp_limb_t n0, r;
+
+  ASSERT (un >= 1);
+  ASSERT (d & GMP_LIMB_HIGHBIT);
+
+  r = up[un - 1];
+  if (r >= d)
+    r -= d;
+
+  for (i = un - 2; i >= 0; i--)
+    {
+      n0 = up[i];
+      udiv_rnnd_preinv (r, r, n0, d, dinv);
+    }
+  return r;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/random.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/random.c
deleted file mode 120000
index b84c7c691..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/random.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/random.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/random.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/random.c
new file mode 100644
index 000000000..485f9ebce
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/random.c
@@ -0,0 +1,50 @@
+/* mpn_random -- Generate random numbers.
+
+Copyright 2001, 2002 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+void
+mpn_random (mp_ptr ptr, mp_size_t size)
+{
+  gmp_randstate_ptr  rands;
+
+  /* FIXME: Is size==0 supposed to be allowed? */
+  ASSERT (size >= 0);
+
+  if (size == 0)
+    return;
+
+  rands = RANDS;
+  _gmp_rand (ptr, rands, size * GMP_NUMB_BITS);
+
+  /* Make sure the most significant limb is non-zero.  */
+  while (ptr[size-1] == 0)
+    _gmp_rand (&ptr[size-1], rands, GMP_NUMB_BITS);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/random2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/random2.c
deleted file mode 120000
index e9bd5b1db..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/random2.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/random2.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/random2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/random2.c
new file mode 100644
index 000000000..1eede6710
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/random2.c
@@ -0,0 +1,105 @@
+/* mpn_random2 -- Generate random numbers with relatively long strings
+   of ones and zeroes.  Suitable for border testing.
+
+Copyright 1992-1994, 1996, 2000-2002, 2004, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+static void gmp_rrandomb (mp_ptr, gmp_randstate_t, mp_bitcnt_t);
+
+/* Ask _gmp_rand for 32 bits per call unless that's more than a limb can hold.
+   Thus, we get the same random number sequence in the common cases.
+   FIXME: We should always generate the same random number sequence!  */
+#if GMP_NUMB_BITS < 32
+#define BITS_PER_RANDCALL GMP_NUMB_BITS
+#else
+#define BITS_PER_RANDCALL 32
+#endif
+
+void
+mpn_random2 (mp_ptr rp, mp_size_t n)
+{
+  gmp_randstate_ptr rstate = RANDS;
+  int bit_pos;			/* bit number of least significant bit where
+				   next bit field to be inserted */
+  mp_limb_t ran, ranm;		/* buffer for random bits */
+
+  /* FIXME: Is n==0 supposed to be allowed? */
+  ASSERT (n >= 0);
+
+  _gmp_rand (&ranm, rstate, BITS_PER_RANDCALL);
+  ran = ranm;
+
+  /* Start off at a random bit position in the most significant limb.  */
+  bit_pos = ran % GMP_NUMB_BITS;
+
+  gmp_rrandomb (rp, rstate, n * GMP_NUMB_BITS - bit_pos);
+}
+
+static void
+gmp_rrandomb (mp_ptr rp, gmp_randstate_t rstate, mp_bitcnt_t nbits)
+{
+  mp_bitcnt_t bi;
+  mp_limb_t ranm;		/* buffer for random bits */
+  unsigned cap_chunksize, chunksize;
+  mp_size_t i;
+
+  /* Set entire result to 111..1  */
+  i = BITS_TO_LIMBS (nbits) - 1;
+  rp[i] = GMP_NUMB_MAX >> (GMP_NUMB_BITS - (nbits % GMP_NUMB_BITS)) % GMP_NUMB_BITS;
+  for (i = i - 1; i >= 0; i--)
+    rp[i] = GMP_NUMB_MAX;
+
+  _gmp_rand (&ranm, rstate, BITS_PER_RANDCALL);
+  cap_chunksize = nbits / (ranm % 4 + 1);
+  cap_chunksize += cap_chunksize == 0; /* make it at least 1 */
+
+  bi = nbits;
+
+  for (;;)
+    {
+      _gmp_rand (&ranm, rstate, BITS_PER_RANDCALL);
+      chunksize = 1 + ranm % cap_chunksize;
+      bi = (bi < chunksize) ? 0 : bi - chunksize;
+
+      if (bi == 0)
+	break;			/* low chunk is ...1 */
+
+      rp[bi / GMP_NUMB_BITS] ^= CNST_LIMB (1) << bi % GMP_NUMB_BITS;
+
+      _gmp_rand (&ranm, rstate, BITS_PER_RANDCALL);
+      chunksize = 1 + ranm % cap_chunksize;
+      bi = (bi < chunksize) ? 0 : bi - chunksize;
+
+      mpn_incr_u (rp + bi / GMP_NUMB_BITS, CNST_LIMB (1) << bi % GMP_NUMB_BITS);
+
+      if (bi == 0)
+	break;			/* low chunk is ...0 */
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_1.c
deleted file mode 120000
index 61d4a17a7..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/redc_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_1.c
new file mode 100644
index 000000000..eab128f96
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_1.c
@@ -0,0 +1,56 @@
+/* mpn_redc_1.  Set rp[] <- up[]/R^n mod mp[].  Clobber up[].
+   mp[] is n limbs; up[] is 2n limbs.
+
+   THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
+
+Copyright (C) 2000-2002, 2004, 2008, 2009, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+mp_limb_t
+mpn_redc_1 (mp_ptr rp, mp_ptr up, mp_srcptr mp, mp_size_t n, mp_limb_t invm)
+{
+  mp_size_t j;
+  mp_limb_t cy;
+
+  ASSERT (n > 0);
+  ASSERT_MPN (up, 2*n);
+
+  for (j = n - 1; j >= 0; j--)
+    {
+      cy = mpn_addmul_1 (up, mp, n, (up[0] * invm) & GMP_NUMB_MASK);
+      ASSERT (up[0] == 0);
+      up[0] = cy;
+      up++;
+    }
+
+  cy = mpn_add_n (rp, up, up - n, n);
+  return cy;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_2.c
deleted file mode 120000
index b2ede580d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_2.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/redc_2.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_2.c
new file mode 100644
index 000000000..8d155899a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_2.c
@@ -0,0 +1,110 @@
+/* mpn_redc_2.  Set rp[] <- up[]/R^n mod mp[].  Clobber up[].
+   mp[] is n limbs; up[] is 2n limbs.
+
+   THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
+
+Copyright (C) 2000-2002, 2004, 2008, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+#if GMP_NAIL_BITS != 0
+you lose
+#endif
+
+/* For testing purposes, define our own mpn_addmul_2 if there is none already
+   available.  */
+#ifndef HAVE_NATIVE_mpn_addmul_2
+#undef mpn_addmul_2
+static mp_limb_t
+mpn_addmul_2 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_srcptr vp)
+{
+  rp[n] = mpn_addmul_1 (rp, up, n, vp[0]);
+  return mpn_addmul_1 (rp + 1, up, n, vp[1]);
+}
+#endif
+
+#if defined (__GNUC__) && ! defined (NO_ASM) \
+  && defined (__ia64) && W_TYPE_SIZE == 64
+#define umul2low(ph, pl, uh, ul, vh, vl) \
+  do {									\
+    mp_limb_t _ph, _pl;							\
+    __asm__ ("xma.hu %0 = %3, %5, f0\n\t"				\
+	     "xma.l %1 = %3, %5, f0\n\t"				\
+	     ";;\n\t"							\
+	     "xma.l %0 = %3, %4, %0\n\t"				\
+	     ";;\n\t"							\
+	     "xma.l %0 = %2, %5, %0"					\
+	     : "=&f" (ph), "=&f" (pl)					\
+	     : "f" (uh), "f" (ul), "f" (vh), "f" (vl));			\
+  } while (0)
+#endif
+
+#ifndef umul2low
+#define umul2low(ph, pl, uh, ul, vh, vl) \
+  do {									\
+    mp_limb_t _ph, _pl;							\
+    umul_ppmm (_ph, _pl, ul, vl);					\
+    (ph) = _ph + (ul) * (vh) + (uh) * (vl);				\
+    (pl) = _pl;								\
+  } while (0)
+#endif
+
+mp_limb_t
+mpn_redc_2 (mp_ptr rp, mp_ptr up, mp_srcptr mp, mp_size_t n, mp_srcptr mip)
+{
+  mp_limb_t q[2];
+  mp_size_t j;
+  mp_limb_t upn;
+  mp_limb_t cy;
+
+  ASSERT (n > 0);
+  ASSERT_MPN (up, 2*n);
+
+  if ((n & 1) != 0)
+    {
+      up[0] = mpn_addmul_1 (up, mp, n, (up[0] * mip[0]) & GMP_NUMB_MASK);
+      up++;
+    }
+
+  for (j = n - 2; j >= 0; j -= 2)
+    {
+      umul2low (q[1], q[0], mip[1], mip[0], up[1], up[0]);
+      upn = up[n];		/* mpn_addmul_2 overwrites this */
+      up[1] = mpn_addmul_2 (up, mp, n, q);
+      up[0] = up[n];
+      up[n] = upn;
+      up += 2;
+    }
+
+  cy = mpn_add_n (rp, up, up - n, n);
+  return cy;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_n.c
deleted file mode 120000
index e9c260f51..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/redc_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_n.c
new file mode 100644
index 000000000..0c94b7c3a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/redc_n.c
@@ -0,0 +1,80 @@
+/* mpn_redc_n.  Set rp[] <- up[]/R^n mod mp[].  Clobber up[].
+   mp[] is n limbs; up[] is 2n limbs, the inverse ip[] is n limbs.
+
+   THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
+
+Copyright 2009, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/*
+  TODO
+
+  * We assume mpn_mulmod_bnm1 is always faster than plain mpn_mul_n (or a
+    future mpn_mulhi) for the range we will be called.  Follow up that
+    assumption.
+
+  * Decrease scratch usage.
+
+  * Consider removing the residue canonicalisation.
+*/
+
+void
+mpn_redc_n (mp_ptr rp, mp_ptr up, mp_srcptr mp, mp_size_t n, mp_srcptr ip)
+{
+  mp_ptr xp, yp, scratch;
+  mp_limb_t cy;
+  mp_size_t rn;
+  TMP_DECL;
+  TMP_MARK;
+
+  ASSERT (n > 8);
+
+  rn = mpn_mulmod_bnm1_next_size (n);
+
+  scratch = TMP_ALLOC_LIMBS (n + rn + mpn_mulmod_bnm1_itch (rn, n, n));
+
+  xp = scratch;
+  mpn_mullo_n (xp, up, ip, n);
+
+  yp = scratch + n;
+  mpn_mulmod_bnm1 (yp, rn, xp, n, mp, n, scratch + n + rn);
+
+  ASSERT_ALWAYS (2 * n > rn);				/* could handle this */
+
+  cy = mpn_sub_n (yp + rn, yp, up, 2*n - rn);		/* undo wrap around */
+  MPN_DECR_U (yp + 2*n - rn, rn, cy);
+
+  cy = mpn_sub_n (rp, up + n, yp + n, n);
+  if (cy != 0)
+    mpn_add_n (rp, rp, mp, n);
+
+  TMP_FREE;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/remove.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/remove.c
deleted file mode 120000
index 057e2caa6..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/remove.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/remove.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/remove.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/remove.c
new file mode 100644
index 000000000..cbb0742f2
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/remove.c
@@ -0,0 +1,182 @@
+/* mpn_remove -- divide out all multiples of odd mpn number from another mpn
+   number.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2009, 2012-2014, 2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if GMP_LIMB_BITS > 50
+#define LOG 50
+#else
+#define LOG GMP_LIMB_BITS
+#endif
+
+
+/* Input: U = {up,un}, V = {vp,vn} must be odd, cap
+   Ouput  W = {wp,*wn} allocation need is exactly *wn
+
+   Set W = U / V^k, where k is the largest integer <= cap such that the
+   division yields an integer.
+
+   FIXME: We currently allow any operand overlap.  This is quite non mpn-ish
+   and might be changed, since it cost significant temporary space.
+   * If we require W to have space for un + 1 limbs, we could save qp or qp2
+     (but we will still need to copy things into wp 50% of the time).
+   * If we allow ourselves to clobber U, we could save the other of qp and qp2,
+     and the initial COPY (but also here we would need un + 1 limbs).
+*/
+
+/* FIXME: We need to wrap mpn_bdiv_qr due to the itch interface.  This need
+   indicates a flaw in the current itch mechanism: Which operands not greater
+   than un,un will incur the worst itch?  We need a parallel foo_maxitch set
+   of functions.  */
+static void
+mpn_bdiv_qr_wrap (mp_ptr qp, mp_ptr rp,
+		  mp_srcptr np, mp_size_t nn,
+		  mp_srcptr dp, mp_size_t dn)
+{
+  mp_ptr scratch_out;
+  TMP_DECL;
+
+  TMP_MARK;
+  scratch_out = TMP_ALLOC_LIMBS (mpn_bdiv_qr_itch (nn, dn));
+  mpn_bdiv_qr (qp, rp, np, nn, dp, dn, scratch_out);
+
+  TMP_FREE;
+}
+
+mp_bitcnt_t
+mpn_remove (mp_ptr wp, mp_size_t *wn,
+	    mp_srcptr up, mp_size_t un, mp_srcptr vp, mp_size_t vn,
+	    mp_bitcnt_t cap)
+{
+  mp_srcptr pwpsp[LOG];
+  mp_size_t pwpsn[LOG];
+  mp_size_t npowers;
+  mp_ptr tp, qp, np, qp2;
+  mp_srcptr pp;
+  mp_size_t pn, nn, qn, i;
+  mp_bitcnt_t pwr;
+  TMP_DECL;
+
+  ASSERT (un > 0);
+  ASSERT (vn > 0);
+  ASSERT (vp[0] % 2 != 0);	/* 2-adic division wants odd numbers */
+  ASSERT (vn > 1 || vp[0] > 1);	/* else we would loop indefinitely */
+
+  TMP_MARK;
+
+  TMP_ALLOC_LIMBS_3 (qp, un + 1,	/* quotient, alternating */
+		     qp2, un + 1,	/* quotient, alternating */
+		     tp, (un + 1 + vn) / 2); /* remainder */
+  pp = vp;
+  pn = vn;
+
+  MPN_COPY (qp, up, un);
+  qn = un;
+
+  npowers = 0;
+  while (qn >= pn)
+    {
+      qp[qn] = 0;
+      mpn_bdiv_qr_wrap (qp2, tp, qp, qn + 1, pp, pn);
+      if (!mpn_zero_p (tp, pn))
+	{
+	  if (mpn_cmp (tp, pp, pn) != 0)
+	    break;		/* could not divide by V^npowers */
+	}
+
+      MP_PTR_SWAP (qp, qp2);
+      qn = qn - pn;
+      mpn_neg (qp, qp, qn+1);
+
+      qn += qp[qn] != 0;
+
+      pwpsp[npowers] = pp;
+      pwpsn[npowers] = pn;
+      ++npowers;
+
+      if (((mp_bitcnt_t) 2 << npowers) - 1 > cap)
+	break;
+
+      nn = 2 * pn - 1;		/* next power will be at least this large */
+      if (nn > qn)
+	break;			/* next power would be overlarge */
+
+      if (npowers == 1)		/* Alloc once, but only if it's needed */
+	np = TMP_ALLOC_LIMBS (qn + LOG);	/* powers of V */
+      else
+	np += pn;
+
+      mpn_sqr (np, pp, pn);
+      pn = nn + (np[nn] != 0);
+      pp = np;
+    }
+
+  pwr = ((mp_bitcnt_t) 1 << npowers) - 1;
+
+  for (i = npowers; --i >= 0;)
+    {
+      pn = pwpsn[i];
+      if (qn < pn)
+	continue;
+
+      if (pwr + ((mp_bitcnt_t) 1 << i) > cap)
+	continue;		/* V^i would bring us past cap */
+
+      qp[qn] = 0;
+      mpn_bdiv_qr_wrap (qp2, tp, qp, qn + 1, pwpsp[i], pn);
+      if (!mpn_zero_p (tp, pn))
+	{
+	  if (mpn_cmp (tp, pwpsp[i], pn) != 0)
+	    continue;		/* could not divide by V^i */
+	}
+
+      MP_PTR_SWAP (qp, qp2);
+      qn = qn - pn;
+      mpn_neg (qp, qp, qn+1);
+
+      qn += qp[qn] != 0;
+
+      pwr += (mp_bitcnt_t) 1 << i;
+    }
+
+  MPN_COPY (wp, qp, qn);
+  *wn = qn;
+
+  TMP_FREE;
+
+  return pwr;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/rootrem.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/rootrem.c
deleted file mode 120000
index ac052e8d3..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/rootrem.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/rootrem.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/rootrem.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/rootrem.c
new file mode 100644
index 000000000..a79099e13
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/rootrem.c
@@ -0,0 +1,515 @@
+/* mpn_rootrem(rootp,remp,ap,an,nth) -- Compute the nth root of {ap,an}, and
+   store the truncated integer part at rootp and the remainder at remp.
+
+   Contributed by Paul Zimmermann (algorithm) and
+   Paul Zimmermann and Torbjorn Granlund (implementation).
+   Marco Bodrato wrote logbased_root to seed the loop.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL, AND HAVE MUTABLE INTERFACES.  IT'S
+   ONLY SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT'S ALMOST
+   GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2002, 2005, 2009-2012, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+/* FIXME:
+     This implementation is not optimal when remp == NULL, since the complexity
+     is M(n), whereas it should be M(n/k) on average.
+*/
+
+#include <stdio.h>		/* for NULL */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+static mp_size_t mpn_rootrem_internal (mp_ptr, mp_ptr, mp_srcptr, mp_size_t,
+				       mp_limb_t, int);
+
+#define MPN_RSHIFT(rp,up,un,cnt) \
+  do {									\
+    if ((cnt) != 0)							\
+      mpn_rshift (rp, up, un, cnt);					\
+    else								\
+      {									\
+	MPN_COPY_INCR (rp, up, un);					\
+      }									\
+  } while (0)
+
+#define MPN_LSHIFT(cy,rp,up,un,cnt) \
+  do {									\
+    if ((cnt) != 0)							\
+      cy = mpn_lshift (rp, up, un, cnt);				\
+    else								\
+      {									\
+	MPN_COPY_DECR (rp, up, un);					\
+	cy = 0;								\
+      }									\
+  } while (0)
+
+
+/* Put in {rootp, ceil(un/k)} the kth root of {up, un}, rounded toward zero.
+   If remp <> NULL, put in {remp, un} the remainder.
+   Return the size (in limbs) of the remainder if remp <> NULL,
+	  or a non-zero value iff the remainder is non-zero when remp = NULL.
+   Assumes:
+   (a) up[un-1] is not zero
+   (b) rootp has at least space for ceil(un/k) limbs
+   (c) remp has at least space for un limbs (in case remp <> NULL)
+   (d) the operands do not overlap.
+
+   The auxiliary memory usage is 3*un+2 if remp = NULL,
+   and 2*un+2 if remp <> NULL.  FIXME: This is an incorrect comment.
+*/
+mp_size_t
+mpn_rootrem (mp_ptr rootp, mp_ptr remp,
+	     mp_srcptr up, mp_size_t un, mp_limb_t k)
+{
+  ASSERT (un > 0);
+  ASSERT (up[un - 1] != 0);
+  ASSERT (k > 1);
+
+  if (UNLIKELY (k == 2))
+    return mpn_sqrtrem (rootp, remp, up, un);
+  /* (un-1)/k > 2 <=> un > 3k <=> (un + 2)/3 > k */
+  if (remp == NULL && (un + 2) / 3 > k)
+    /* Pad {up,un} with k zero limbs.  This will produce an approximate root
+       with one more limb, allowing us to compute the exact integral result. */
+    {
+      mp_ptr sp, wp;
+      mp_size_t rn, sn, wn;
+      TMP_DECL;
+      TMP_MARK;
+      wn = un + k;
+      sn = (un - 1) / k + 2; /* ceil(un/k) + 1 */
+      TMP_ALLOC_LIMBS_2 (wp, wn, /* will contain the padded input */
+			 sp, sn); /* approximate root of padded input */
+      MPN_COPY (wp + k, up, un);
+      MPN_FILL (wp, k, 0);
+      rn = mpn_rootrem_internal (sp, NULL, wp, wn, k, 1);
+      /* The approximate root S = {sp,sn} is either the correct root of
+	 {sp,sn}, or 1 too large.  Thus unless the least significant limb of
+	 S is 0 or 1, we can deduce the root of {up,un} is S truncated by one
+	 limb.  (In case sp[0]=1, we can deduce the root, but not decide
+	 whether it is exact or not.) */
+      MPN_COPY (rootp, sp + 1, sn - 1);
+      TMP_FREE;
+      return rn;
+    }
+  else
+    {
+      return mpn_rootrem_internal (rootp, remp, up, un, k, 0);
+    }
+}
+
+#define LOGROOT_USED_BITS 8
+#define LOGROOT_NEEDS_TWO_CORRECTIONS 1
+#define LOGROOT_RETURNED_BITS (LOGROOT_USED_BITS + LOGROOT_NEEDS_TWO_CORRECTIONS)
+/* Puts in *rootp some bits of the k^nt root of the number
+   2^bitn * 1.op ; where op represents the "fractional" bits.
+
+   The returned value is the number of bits of the root minus one;
+   i.e. an approximation of the root will be
+   (*rootp) * 2^(retval-LOGROOT_RETURNED_BITS+1).
+
+   Currently, only LOGROOT_USED_BITS bits of op are used (the implicit
+   one is not counted).
+ */
+static unsigned
+logbased_root (mp_ptr rootp, mp_limb_t op, mp_bitcnt_t bitn, mp_limb_t k)
+{
+  /* vlog=vector(256,i,floor((log(256+i)/log(2)-8)*256)-(i>255)) */
+  static const
+  unsigned char vlog[] = {1,   2,   4,   5,   7,   8,   9,  11,  12,  14,  15,  16,  18,  19,  21,  22,
+			 23,  25,  26,  27,  29,  30,  31,  33,  34,  35,  37,  38,  39,  40,  42,  43,
+			 44,  46,  47,  48,  49,  51,  52,  53,  54,  56,  57,  58,  59,  61,  62,  63,
+			 64,  65,  67,  68,  69,  70,  71,  73,  74,  75,  76,  77,  78,  80,  81,  82,
+			 83,  84,  85,  87,  88,  89,  90,  91,  92,  93,  94,  96,  97,  98,  99, 100,
+			101, 102, 103, 104, 105, 106, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+			118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 131, 132, 133, 134,
+			135, 136, 137, 138, 139, 140, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+			150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 162, 163, 164,
+			165, 166, 167, 168, 169, 170, 171, 172, 173, 173, 174, 175, 176, 177, 178, 179,
+			180, 181, 181, 182, 183, 184, 185, 186, 187, 188, 188, 189, 190, 191, 192, 193,
+			194, 194, 195, 196, 197, 198, 199, 200, 200, 201, 202, 203, 204, 205, 205, 206,
+			207, 208, 209, 209, 210, 211, 212, 213, 214, 214, 215, 216, 217, 218, 218, 219,
+			220, 221, 222, 222, 223, 224, 225, 225, 226, 227, 228, 229, 229, 230, 231, 232,
+			232, 233, 234, 235, 235, 236, 237, 238, 239, 239, 240, 241, 242, 242, 243, 244,
+			245, 245, 246, 247, 247, 248, 249, 250, 250, 251, 252, 253, 253, 254, 255, 255};
+
+  /* vexp=vector(256,i,floor(2^(8+i/256)-256)-(i>255)) */
+  static const
+  unsigned char vexp[] = {0,   1,   2,   2,   3,   4,   4,   5,   6,   7,   7,   8,   9,   9,  10,  11,
+			 12,  12,  13,  14,  14,  15,  16,  17,  17,  18,  19,  20,  20,  21,  22,  23,
+			 23,  24,  25,  26,  26,  27,  28,  29,  30,  30,  31,  32,  33,  33,  34,  35,
+			 36,  37,  37,  38,  39,  40,  41,  41,  42,  43,  44,  45,  45,  46,  47,  48,
+			 49,  50,  50,  51,  52,  53,  54,  55,  55,  56,  57,  58,  59,  60,  61,  61,
+			 62,  63,  64,  65,  66,  67,  67,  68,  69,  70,  71,  72,  73,  74,  75,  75,
+			 76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  86,  87,  88,  89,  90,
+			 91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106,
+			107, 108, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 119, 120, 121, 122,
+			123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+			139, 140, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 154, 155, 156,
+			157, 158, 159, 160, 161, 163, 164, 165, 166, 167, 168, 169, 171, 172, 173, 174,
+			175, 176, 178, 179, 180, 181, 182, 183, 185, 186, 187, 188, 189, 191, 192, 193,
+			194, 196, 197, 198, 199, 200, 202, 203, 204, 205, 207, 208, 209, 210, 212, 213,
+			214, 216, 217, 218, 219, 221, 222, 223, 225, 226, 227, 229, 230, 231, 232, 234,
+			235, 236, 238, 239, 240, 242, 243, 245, 246, 247, 249, 250, 251, 253, 254, 255};
+  mp_bitcnt_t retval;
+
+  if (UNLIKELY (bitn > (~ (mp_bitcnt_t) 0) >> LOGROOT_USED_BITS))
+    {
+      /* In the unlikely case, we use two divisions and a modulo. */
+      retval = bitn / k;
+      bitn %= k;
+      bitn = (bitn << LOGROOT_USED_BITS |
+	      vlog[op >> (GMP_NUMB_BITS - LOGROOT_USED_BITS)]) / k;
+    }
+  else
+    {
+      bitn = (bitn << LOGROOT_USED_BITS |
+	      vlog[op >> (GMP_NUMB_BITS - LOGROOT_USED_BITS)]) / k;
+      retval = bitn >> LOGROOT_USED_BITS;
+      bitn &= (CNST_LIMB (1) << LOGROOT_USED_BITS) - 1;
+    }
+  ASSERT(bitn < CNST_LIMB (1) << LOGROOT_USED_BITS);
+  *rootp = CNST_LIMB(1) << (LOGROOT_USED_BITS - ! LOGROOT_NEEDS_TWO_CORRECTIONS)
+    | vexp[bitn] >> ! LOGROOT_NEEDS_TWO_CORRECTIONS;
+  return retval;
+}
+
+/* if approx is non-zero, does not compute the final remainder */
+static mp_size_t
+mpn_rootrem_internal (mp_ptr rootp, mp_ptr remp, mp_srcptr up, mp_size_t un,
+		      mp_limb_t k, int approx)
+{
+  mp_ptr qp, rp, sp, wp, scratch;
+  mp_size_t qn, rn, sn, wn, nl, bn;
+  mp_limb_t save, save2, cy, uh;
+  mp_bitcnt_t unb; /* number of significant bits of {up,un} */
+  mp_bitcnt_t xnb; /* number of significant bits of the result */
+  mp_bitcnt_t b, kk;
+  mp_bitcnt_t sizes[GMP_NUMB_BITS + 1];
+  int ni;
+  int perf_pow;
+  unsigned ulz, snb, c, logk;
+  TMP_DECL;
+
+  /* MPN_SIZEINBASE_2EXP(unb, up, un, 1); --unb; */
+  uh = up[un - 1];
+  count_leading_zeros (ulz, uh);
+  ulz = ulz - GMP_NAIL_BITS + 1; /* Ignore the first 1. */
+  unb = (mp_bitcnt_t) un * GMP_NUMB_BITS - ulz;
+  /* unb is the (truncated) logarithm of the input U in base 2*/
+
+  if (unb < k) /* root is 1 */
+    {
+      rootp[0] = 1;
+      if (remp == NULL)
+	un -= (*up == CNST_LIMB (1)); /* Non-zero iif {up,un} > 1 */
+      else
+	{
+	  mpn_sub_1 (remp, up, un, CNST_LIMB (1));
+	  un -= (remp [un - 1] == 0);	/* There should be at most one zero limb,
+				   if we demand u to be normalized  */
+	}
+      return un;
+    }
+  /* if (unb - k < k/2 + k/16) // root is 2 */
+
+  if (ulz == GMP_NUMB_BITS)
+    uh = up[un - 2];
+  else
+    uh = (uh << ulz & GMP_NUMB_MASK) | up[un - 1 - (un != 1)] >> (GMP_NUMB_BITS - ulz);
+  ASSERT (un != 1 || up[un - 1 - (un != 1)] >> (GMP_NUMB_BITS - ulz) == 1);
+
+  xnb = logbased_root (rootp, uh, unb, k);
+  snb = LOGROOT_RETURNED_BITS - 1;
+  /* xnb+1 is the number of bits of the root R */
+  /* snb+1 is the number of bits of the current approximation S */
+
+  kk = k * xnb;		/* number of truncated bits in the input */
+
+  /* FIXME: Should we skip the next two loops when xnb <= snb ? */
+  for (uh = (k - 1) / 2, logk = 3; (uh >>= 1) != 0; ++logk )
+    ;
+  /* logk = ceil(log(k)/log(2)) + 1 */
+
+  /* xnb is the number of remaining bits to determine in the kth root */
+  for (ni = 0; (sizes[ni] = xnb) > snb; ++ni)
+    {
+      /* invariant: here we want xnb+1 total bits for the kth root */
+
+      /* if c is the new value of xnb, this means that we'll go from a
+	 root of c+1 bits (say s') to a root of xnb+1 bits.
+	 It is proved in the book "Modern Computer Arithmetic" by Brent
+	 and Zimmermann, Chapter 1, that
+	 if s' >= k*beta, then at most one correction is necessary.
+	 Here beta = 2^(xnb-c), and s' >= 2^c, thus it suffices that
+	 c >= ceil((xnb + log2(k))/2). */
+      if (xnb > logk)
+	xnb = (xnb + logk) / 2;
+      else
+	--xnb;	/* add just one bit at a time */
+    }
+
+  *rootp >>= snb - xnb;
+  kk -= xnb;
+
+  ASSERT_ALWAYS (ni < GMP_NUMB_BITS + 1);
+  /* We have sizes[0] = b > sizes[1] > ... > sizes[ni] = 0 with
+     sizes[i] <= 2 * sizes[i+1].
+     Newton iteration will first compute sizes[ni-1] extra bits,
+     then sizes[ni-2], ..., then sizes[0] = b. */
+
+  TMP_MARK;
+  /* qp and wp need enough space to store S'^k where S' is an approximate
+     root. Since S' can be as large as S+2, the worst case is when S=2 and
+     S'=4. But then since we know the number of bits of S in advance, S'
+     can only be 3 at most. Similarly for S=4, then S' can be 6 at most.
+     So the worst case is S'/S=3/2, thus S'^k <= (3/2)^k * S^k. Since S^k
+     fits in un limbs, the number of extra limbs needed is bounded by
+     ceil(k*log2(3/2)/GMP_NUMB_BITS). */
+  /* THINK: with the use of logbased_root, maybe the constant is
+     258/256 instead of 3/2 ? log2(258/256) < 1/89 < 1/64 */
+#define EXTRA 2 + (mp_size_t) (0.585 * (double) k / (double) GMP_NUMB_BITS)
+  TMP_ALLOC_LIMBS_3 (scratch, un + 1, /* used by mpn_div_q */
+		     qp, un + EXTRA,  /* will contain quotient and remainder
+					 of R/(k*S^(k-1)), and S^k */
+		     wp, un + EXTRA); /* will contain S^(k-1), k*S^(k-1),
+					 and temporary for mpn_pow_1 */
+
+  if (remp == NULL)
+    rp = scratch;	/* will contain the remainder */
+  else
+    rp = remp;
+  sp = rootp;
+
+  sn = 1;		/* Initial approximation has one limb */
+
+  for (b = xnb; ni != 0; --ni)
+    {
+      /* 1: loop invariant:
+	 {sp, sn} is the current approximation of the root, which has
+		  exactly 1 + sizes[ni] bits.
+	 {rp, rn} is the current remainder
+	 {wp, wn} = {sp, sn}^(k-1)
+	 kk = number of truncated bits of the input
+      */
+
+      /* Since each iteration treats b bits from the root and thus k*b bits
+	 from the input, and we already considered b bits from the input,
+	 we now have to take another (k-1)*b bits from the input. */
+      kk -= (k - 1) * b; /* remaining input bits */
+      /* {rp, rn} = floor({up, un} / 2^kk) */
+      rn = un - kk / GMP_NUMB_BITS;
+      MPN_RSHIFT (rp, up + kk / GMP_NUMB_BITS, rn, kk % GMP_NUMB_BITS);
+      rn -= rp[rn - 1] == 0;
+
+      /* 9: current buffers: {sp,sn}, {rp,rn} */
+
+      for (c = 0;; c++)
+	{
+	  /* Compute S^k in {qp,qn}. */
+	  /* W <- S^(k-1) for the next iteration,
+	     and S^k = W * S. */
+	  wn = mpn_pow_1 (wp, sp, sn, k - 1, qp);
+	  mpn_mul (qp, wp, wn, sp, sn);
+	  qn = wn + sn;
+	  qn -= qp[qn - 1] == 0;
+
+	  perf_pow = 1;
+	  /* if S^k > floor(U/2^kk), the root approximation was too large */
+	  if (qn > rn || (qn == rn && (perf_pow=mpn_cmp (qp, rp, rn)) > 0))
+	    MPN_DECR_U (sp, sn, 1);
+	  else
+	    break;
+	}
+
+      /* 10: current buffers: {sp,sn}, {rp,rn}, {qp,qn}, {wp,wn} */
+
+      /* sometimes two corrections are needed with logbased_root*/
+      ASSERT (c <= 1 + LOGROOT_NEEDS_TWO_CORRECTIONS);
+      ASSERT_ALWAYS (rn >= qn);
+
+      b = sizes[ni - 1] - sizes[ni]; /* number of bits to compute in the
+				      next iteration */
+      bn = b / GMP_NUMB_BITS; /* lowest limb from high part of rp[], after shift */
+
+      kk = kk - b;
+      /* nl is the number of limbs in U which contain bits [kk,kk+b-1] */
+      nl = 1 + (kk + b - 1) / GMP_NUMB_BITS - (kk / GMP_NUMB_BITS);
+      /* nl  = 1 + floor((kk + b - 1) / GMP_NUMB_BITS)
+		 - floor(kk / GMP_NUMB_BITS)
+	     <= 1 + (kk + b - 1) / GMP_NUMB_BITS
+		  - (kk - GMP_NUMB_BITS + 1) / GMP_NUMB_BITS
+	     = 2 + (b - 2) / GMP_NUMB_BITS
+	 thus since nl is an integer:
+	 nl <= 2 + floor(b/GMP_NUMB_BITS) <= 2 + bn. */
+
+      /* 11: current buffers: {sp,sn}, {rp,rn}, {wp,wn} */
+
+      /* R = R - Q = floor(U/2^kk) - S^k */
+      if (perf_pow != 0)
+	{
+	  mpn_sub (rp, rp, rn, qp, qn);
+	  MPN_NORMALIZE_NOT_ZERO (rp, rn);
+
+	  /* first multiply the remainder by 2^b */
+	  MPN_LSHIFT (cy, rp + bn, rp, rn, b % GMP_NUMB_BITS);
+	  rn = rn + bn;
+	  if (cy != 0)
+	    {
+	      rp[rn] = cy;
+	      rn++;
+	    }
+
+	  save = rp[bn];
+	  /* we have to save rp[bn] up to rp[nl-1], i.e. 1 or 2 limbs */
+	  if (nl - 1 > bn)
+	    save2 = rp[bn + 1];
+	}
+      else
+	{
+	  rn = bn;
+	  save2 = save = 0;
+	}
+      /* 2: current buffers: {sp,sn}, {rp,rn}, {wp,wn} */
+
+      /* Now insert bits [kk,kk+b-1] from the input U */
+      MPN_RSHIFT (rp, up + kk / GMP_NUMB_BITS, nl, kk % GMP_NUMB_BITS);
+      /* set to zero high bits of rp[bn] */
+      rp[bn] &= (CNST_LIMB (1) << (b % GMP_NUMB_BITS)) - 1;
+      /* restore corresponding bits */
+      rp[bn] |= save;
+      if (nl - 1 > bn)
+	rp[bn + 1] = save2; /* the low b bits go in rp[0..bn] only, since
+			       they start by bit 0 in rp[0], so they use
+			       at most ceil(b/GMP_NUMB_BITS) limbs */
+      /* FIXME: Should we normalise {rp,rn} here ?*/
+
+      /* 3: current buffers: {sp,sn}, {rp,rn}, {wp,wn} */
+
+      /* compute {wp, wn} = k * {sp, sn}^(k-1) */
+      cy = mpn_mul_1 (wp, wp, wn, k);
+      wp[wn] = cy;
+      wn += cy != 0;
+
+      /* 6: current buffers: {sp,sn}, {qp,qn} */
+
+      /* multiply the root approximation by 2^b */
+      MPN_LSHIFT (cy, sp + b / GMP_NUMB_BITS, sp, sn, b % GMP_NUMB_BITS);
+      sn = sn + b / GMP_NUMB_BITS;
+      if (cy != 0)
+	{
+	  sp[sn] = cy;
+	  sn++;
+	}
+
+      save = sp[b / GMP_NUMB_BITS];
+
+      /* Number of limbs used by b bits, when least significant bit is
+	 aligned to least limb */
+      bn = (b - 1) / GMP_NUMB_BITS + 1;
+
+      /* 4: current buffers: {sp,sn}, {rp,rn}, {wp,wn} */
+
+      /* now divide {rp, rn} by {wp, wn} to get the low part of the root */
+      if (UNLIKELY (rn < wn))
+	{
+	  MPN_FILL (sp, bn, 0);
+	}
+      else
+	{
+	  qn = rn - wn; /* expected quotient size */
+	  if (qn <= bn) { /* Divide only if result is not too big. */
+	    mpn_div_q (qp, rp, rn, wp, wn, scratch);
+	    qn += qp[qn] != 0;
+	  }
+
+      /* 5: current buffers: {sp,sn}, {qp,qn}.
+	 Note: {rp,rn} is not needed any more since we'll compute it from
+	 scratch at the end of the loop.
+       */
+
+      /* the quotient should be smaller than 2^b, since the previous
+	 approximation was correctly rounded toward zero */
+	  if (qn > bn || (qn == bn && (b % GMP_NUMB_BITS != 0) &&
+			  qp[qn - 1] >= (CNST_LIMB (1) << (b % GMP_NUMB_BITS))))
+	    {
+	      for (qn = 1; qn < bn; ++qn)
+		sp[qn - 1] = GMP_NUMB_MAX;
+	      sp[qn - 1] = GMP_NUMB_MAX >> (GMP_NUMB_BITS - 1 - ((b - 1) % GMP_NUMB_BITS));
+	    }
+	  else
+	    {
+      /* 7: current buffers: {sp,sn}, {qp,qn} */
+
+      /* Combine sB and q to form sB + q.  */
+	      MPN_COPY (sp, qp, qn);
+	      MPN_ZERO (sp + qn, bn - qn);
+	    }
+	}
+      sp[b / GMP_NUMB_BITS] |= save;
+
+      /* 8: current buffer: {sp,sn} */
+
+    }
+
+  /* otherwise we have rn > 0, thus the return value is ok */
+  if (!approx || sp[0] <= CNST_LIMB (1))
+    {
+      for (c = 0;; c++)
+	{
+	  /* Compute S^k in {qp,qn}. */
+	  /* Last iteration: we don't need W anymore. */
+	  /* mpn_pow_1 requires that both qp and wp have enough
+	     space to store the result {sp,sn}^k + 1 limb */
+	  qn = mpn_pow_1 (qp, sp, sn, k, wp);
+
+	  perf_pow = 1;
+	  if (qn > un || (qn == un && (perf_pow=mpn_cmp (qp, up, un)) > 0))
+	    MPN_DECR_U (sp, sn, 1);
+	  else
+	    break;
+	};
+
+      /* sometimes two corrections are needed with logbased_root*/
+      ASSERT (c <= 1 + LOGROOT_NEEDS_TWO_CORRECTIONS);
+
+      rn = perf_pow != 0;
+      if (rn != 0 && remp != NULL)
+	{
+	  mpn_sub (remp, up, un, qp, qn);
+	  rn = un;
+	  MPN_NORMALIZE_NOT_ZERO (remp, rn);
+	}
+    }
+
+  TMP_FREE;
+  return rn;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/rshift.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/rshift.c
deleted file mode 120000
index 484e0e5b5..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/rshift.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/rshift.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/rshift.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/rshift.c
new file mode 100644
index 000000000..15d427ddc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/rshift.c
@@ -0,0 +1,69 @@
+/* mpn_rshift -- Shift right low level.
+
+Copyright 1991, 1993, 1994, 1996, 2000-2002 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/* Shift U (pointed to by up and N limbs long) cnt bits to the right
+   and store the n least significant limbs of the result at rp.
+   The bits shifted out to the right are returned.
+
+   Argument constraints:
+   1. 0 < cnt < GMP_NUMB_BITS.
+   2. If the result is to be written over the input, rp must be <= up.
+*/
+
+mp_limb_t
+mpn_rshift (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
+{
+  mp_limb_t high_limb, low_limb;
+  unsigned int tnc;
+  mp_size_t i;
+  mp_limb_t retval;
+
+  ASSERT (n >= 1);
+  ASSERT (cnt >= 1);
+  ASSERT (cnt < GMP_NUMB_BITS);
+  ASSERT (MPN_SAME_OR_INCR_P (rp, up, n));
+
+  tnc = GMP_NUMB_BITS - cnt;
+  high_limb = *up++;
+  retval = (high_limb << tnc) & GMP_NUMB_MASK;
+  low_limb = high_limb >> cnt;
+
+  for (i = n - 1; i != 0; i--)
+    {
+      high_limb = *up++;
+      *rp++ = low_limb | ((high_limb << tnc) & GMP_NUMB_MASK);
+      low_limb = high_limb >> cnt;
+    }
+  *rp = low_limb;
+
+  return retval;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_q.c
deleted file mode 120000
index de362a300..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_q.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sbpi1_bdiv_q.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_q.c
new file mode 100644
index 000000000..850e59377
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_q.c
@@ -0,0 +1,96 @@
+/* mpn_sbpi1_bdiv_q -- schoolbook Hensel division with precomputed inverse,
+   returning quotient only.
+
+   Contributed to the GNU project by Niels Möller and Torbjörn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL FUNCTIONS WITH MUTABLE INTERFACES.
+   IT IS ONLY SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS
+   ALMOST GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2005, 2006, 2009, 2011, 2012, 2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/* Computes Q = - U / D mod B^un, destroys U.
+
+   D must be odd. dinv is (-D)^-1 mod B.
+
+*/
+
+void
+mpn_sbpi1_bdiv_q (mp_ptr qp,
+		  mp_ptr up, mp_size_t un,
+		  mp_srcptr dp, mp_size_t dn,
+		  mp_limb_t dinv)
+{
+  mp_size_t i;
+  mp_limb_t q;
+
+  ASSERT (dn > 0);
+  ASSERT (un >= dn);
+  ASSERT ((dp[0] & 1) != 0);
+  ASSERT (-(dp[0] * dinv) == 1);
+  ASSERT (up == qp || !MPN_OVERLAP_P (up, un, qp, un - dn));
+
+  if (un > dn)
+    {
+      mp_limb_t cy, hi;
+      for (i = un - dn - 1, cy = 0; i > 0; i--)
+	{
+	  q = dinv * up[0];
+	  hi = mpn_addmul_1 (up, dp, dn, q);
+
+	  ASSERT (up[0] == 0);
+	  *qp++ = q;
+	  hi += cy;
+	  cy = hi < cy;
+	  hi += up[dn];
+	  cy += hi < up[dn];
+	  up[dn] = hi;
+	  up++;
+	}
+      q = dinv * up[0];
+      hi = cy + mpn_addmul_1 (up, dp, dn, q);
+      ASSERT (up[0] == 0);
+      *qp++ = q;
+      up[dn] += hi;
+      up++;
+    }
+  for (i = dn; i > 1; i--)
+    {
+      mp_limb_t q = dinv * up[0];
+      mpn_addmul_1 (up, dp, i, q);
+      ASSERT (up[0] == 0);
+      *qp++ = q;
+      up++;
+    }
+
+  /* Final limb */
+  *qp = dinv * up[0];
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_qr.c
deleted file mode 120000
index a0d6b8e34..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_qr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sbpi1_bdiv_qr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_qr.c
new file mode 100644
index 000000000..6146c45ad
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_qr.c
@@ -0,0 +1,82 @@
+/* mpn_sbpi1_bdiv_qr -- schoolbook Hensel division with precomputed inverse,
+   returning quotient and remainder.
+
+   Contributed to the GNU project by Niels Möller and Torbjörn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL FUNCTIONS WITH MUTABLE INTERFACES.
+   IT IS ONLY SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS
+   ALMOST GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2006, 2009, 2011, 2012, 2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+/* Computes a binary quotient of size qn = un - dn.
+   Output:
+
+      Q = -U * D^{-1} mod B^qn,
+
+      R = (U + Q * D) * B^(-qn)
+
+   Stores the dn least significant limbs of R at {up + un - dn, dn},
+   and returns the carry from the addition N + Q*D.
+
+   D must be odd. dinv is (-D)^-1 mod B. */
+
+mp_limb_t
+mpn_sbpi1_bdiv_qr (mp_ptr qp,
+		   mp_ptr up, mp_size_t un,
+		   mp_srcptr dp, mp_size_t dn, mp_limb_t dinv)
+{
+  mp_size_t i;
+  mp_limb_t cy;
+
+  ASSERT (dn > 0);
+  ASSERT (un > dn);
+  ASSERT ((dp[0] & 1) != 0);
+  ASSERT (-(dp[0] * dinv) == 1);
+  ASSERT (up == qp || !MPN_OVERLAP_P (up, un, qp, un - dn));
+
+  for (i = un - dn, cy = 0; i != 0; i--)
+    {
+      mp_limb_t q = dinv * up[0];
+      mp_limb_t hi = mpn_addmul_1 (up, dp, dn, q);
+      *qp++ = q;
+
+      hi += cy;
+      cy = hi < cy;
+      hi += up[dn];
+      cy += hi < up[dn];
+      up[dn] = hi;
+      up++;
+    }
+
+  return cy;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_r.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_r.c
deleted file mode 120000
index 8af23e70b..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_r.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sbpi1_bdiv_r.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_r.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_r.c
new file mode 100644
index 000000000..a609951e4
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_bdiv_r.c
@@ -0,0 +1,79 @@
+/* mpn_sbpi1_bdiv_r -- schoolbook Hensel division with precomputed inverse,
+   returning remainder.
+
+   Contributed to the GNU project by Niels Möller and Torbjörn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL FUNCTIONS WITH MUTABLE INTERFACES.
+   IT IS ONLY SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS
+   ALMOST GUARANTEED THAT THEY'LL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2006, 2009, 2011, 2012, 2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+/* Computes a binary quotient of size qn = un - dn.
+   Output:
+
+      Q = -U * D^{-1} mod B^qn,
+
+      R = (U + Q * D) * B^(-qn)
+
+   Stores the dn least significant limbs of R at {up + un - dn, dn},
+   and returns the carry from the addition N + Q*D.
+
+   D must be odd. dinv is (-D)^-1 mod B. */
+
+mp_limb_t
+mpn_sbpi1_bdiv_r (mp_ptr up, mp_size_t un,
+		  mp_srcptr dp, mp_size_t dn, mp_limb_t dinv)
+{
+  mp_size_t i;
+  mp_limb_t cy;
+
+  ASSERT (dn > 0);
+  ASSERT (un > dn);
+  ASSERT ((dp[0] & 1) != 0);
+  ASSERT (-(dp[0] * dinv) == 1);
+
+  for (i = un - dn, cy = 0; i != 0; i--)
+    {
+      mp_limb_t q = dinv * up[0];
+      mp_limb_t hi = mpn_addmul_1 (up, dp, dn, q);
+
+      hi += cy;
+      cy = hi < cy;
+      hi += up[dn];
+      cy += hi < up[dn];
+      up[dn] = hi;
+      up++;
+    }
+
+  return cy;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_q.c
deleted file mode 120000
index 87ee30422..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_q.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sbpi1_div_q.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_q.c
new file mode 100644
index 000000000..a9975ebc9
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_q.c
@@ -0,0 +1,302 @@
+/* mpn_sbpi1_div_q -- Schoolbook division using the Möller-Granlund 3/2
+   division algorithm.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2007, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+mp_limb_t
+mpn_sbpi1_div_q (mp_ptr qp,
+		 mp_ptr np, mp_size_t nn,
+		 mp_srcptr dp, mp_size_t dn,
+		 mp_limb_t dinv)
+{
+  mp_limb_t qh;
+  mp_size_t qn, i;
+  mp_limb_t n1, n0;
+  mp_limb_t d1, d0;
+  mp_limb_t cy, cy1;
+  mp_limb_t q;
+  mp_limb_t flag;
+
+  mp_size_t dn_orig = dn;
+  mp_srcptr dp_orig = dp;
+  mp_ptr np_orig = np;
+
+  ASSERT (dn > 2);
+  ASSERT (nn >= dn);
+  ASSERT ((dp[dn-1] & GMP_NUMB_HIGHBIT) != 0);
+
+  np += nn;
+
+  qn = nn - dn;
+  if (qn + 1 < dn)
+    {
+      dp += dn - (qn + 1);
+      dn = qn + 1;
+    }
+
+  qh = mpn_cmp (np - dn, dp, dn) >= 0;
+  if (qh != 0)
+    mpn_sub_n (np - dn, np - dn, dp, dn);
+
+  qp += qn;
+
+  dn -= 2;			/* offset dn by 2 for main division loops,
+				   saving two iterations in mpn_submul_1.  */
+  d1 = dp[dn + 1];
+  d0 = dp[dn + 0];
+
+  np -= 2;
+
+  n1 = np[1];
+
+  for (i = qn - (dn + 2); i >= 0; i--)
+    {
+      np--;
+      if (UNLIKELY (n1 == d1) && np[1] == d0)
+	{
+	  q = GMP_NUMB_MASK;
+	  mpn_submul_1 (np - dn, dp, dn + 2, q);
+	  n1 = np[1];		/* update n1, last loop's value will now be invalid */
+	}
+      else
+	{
+	  udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
+
+	  cy = mpn_submul_1 (np - dn, dp, dn, q);
+
+	  cy1 = n0 < cy;
+	  n0 = (n0 - cy) & GMP_NUMB_MASK;
+	  cy = n1 < cy1;
+	  n1 -= cy1;
+	  np[0] = n0;
+
+	  if (UNLIKELY (cy != 0))
+	    {
+	      n1 += d1 + mpn_add_n (np - dn, np - dn, dp, dn + 1);
+	      q--;
+	    }
+	}
+
+      *--qp = q;
+    }
+
+  flag = ~CNST_LIMB(0);
+
+  if (dn >= 0)
+    {
+      for (i = dn; i > 0; i--)
+	{
+	  np--;
+	  if (UNLIKELY (n1 >= (d1 & flag)))
+	    {
+	      q = GMP_NUMB_MASK;
+	      cy = mpn_submul_1 (np - dn, dp, dn + 2, q);
+
+	      if (UNLIKELY (n1 != cy))
+		{
+		  if (n1 < (cy & flag))
+		    {
+		      q--;
+		      mpn_add_n (np - dn, np - dn, dp, dn + 2);
+		    }
+		  else
+		    flag = 0;
+		}
+	      n1 = np[1];
+	    }
+	  else
+	    {
+	      udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
+
+	      cy = mpn_submul_1 (np - dn, dp, dn, q);
+
+	      cy1 = n0 < cy;
+	      n0 = (n0 - cy) & GMP_NUMB_MASK;
+	      cy = n1 < cy1;
+	      n1 -= cy1;
+	      np[0] = n0;
+
+	      if (UNLIKELY (cy != 0))
+		{
+		  n1 += d1 + mpn_add_n (np - dn, np - dn, dp, dn + 1);
+		  q--;
+		}
+	    }
+
+	  *--qp = q;
+
+	  /* Truncate operands.  */
+	  dn--;
+	  dp++;
+	}
+
+      np--;
+      if (UNLIKELY (n1 >= (d1 & flag)))
+	{
+	  q = GMP_NUMB_MASK;
+	  cy = mpn_submul_1 (np, dp, 2, q);
+
+	  if (UNLIKELY (n1 != cy))
+	    {
+	      if (n1 < (cy & flag))
+		{
+		  q--;
+		  add_ssaaaa (np[1], np[0], np[1], np[0], dp[1], dp[0]);
+		}
+	      else
+		flag = 0;
+	    }
+	  n1 = np[1];
+	}
+      else
+	{
+	  udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
+
+	  np[0] = n0;
+	  np[1] = n1;
+	}
+
+      *--qp = q;
+    }
+  ASSERT_ALWAYS (np[1] == n1);
+  np += 2;
+
+
+  dn = dn_orig;
+  if (UNLIKELY (n1 < (dn & flag)))
+    {
+      mp_limb_t q, x;
+
+      /* The quotient may be too large if the remainder is small.  Recompute
+	 for above ignored operand parts, until the remainder spills.
+
+	 FIXME: The quality of this code isn't the same as the code above.
+	 1. We don't compute things in an optimal order, high-to-low, in order
+	    to terminate as quickly as possible.
+	 2. We mess with pointers and sizes, adding and subtracting and
+	    adjusting to get things right.  It surely could be streamlined.
+	 3. The only termination criteria are that we determine that the
+	    quotient needs to be adjusted, or that we have recomputed
+	    everything.  We should stop when the remainder is so large
+	    that no additional subtracting could make it spill.
+	 4. If nothing else, we should not do two loops of submul_1 over the
+	    data, instead handle both the triangularization and chopping at
+	    once.  */
+
+      x = n1;
+
+      if (dn > 2)
+	{
+	  /* Compensate for triangularization.  */
+	  mp_limb_t y;
+
+	  dp = dp_orig;
+	  if (qn + 1 < dn)
+	    {
+	      dp += dn - (qn + 1);
+	      dn = qn + 1;
+	    }
+
+	  y = np[-2];
+
+	  for (i = dn - 3; i >= 0; i--)
+	    {
+	      q = qp[i];
+	      cy = mpn_submul_1 (np - (dn - i), dp, dn - i - 2, q);
+
+	      if (y < cy)
+		{
+		  if (x == 0)
+		    {
+		      cy = mpn_sub_1 (qp, qp, qn, 1);
+		      ASSERT_ALWAYS (cy == 0);
+		      return qh - cy;
+		    }
+		  x--;
+		}
+	      y -= cy;
+	    }
+	  np[-2] = y;
+	}
+
+      dn = dn_orig;
+      if (qn + 1 < dn)
+	{
+	  /* Compensate for ignored dividend and divisor tails.  */
+
+	  dp = dp_orig;
+	  np = np_orig;
+
+	  if (qh != 0)
+	    {
+	      cy = mpn_sub_n (np + qn, np + qn, dp, dn - (qn + 1));
+	      if (cy != 0)
+		{
+		  if (x == 0)
+		    {
+		      if (qn != 0)
+			cy = mpn_sub_1 (qp, qp, qn, 1);
+		      return qh - cy;
+		    }
+		  x--;
+		}
+	    }
+
+	  if (qn == 0)
+	    return qh;
+
+	  for (i = dn - qn - 2; i >= 0; i--)
+	    {
+	      cy = mpn_submul_1 (np + i, qp, qn, dp[i]);
+	      cy = mpn_sub_1 (np + qn + i, np + qn + i, dn - qn - i - 1, cy);
+	      if (cy != 0)
+		{
+		  if (x == 0)
+		    {
+		      cy = mpn_sub_1 (qp, qp, qn, 1);
+		      return qh;
+		    }
+		  x--;
+		}
+	    }
+	}
+    }
+
+  return qh;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_qr.c
deleted file mode 120000
index 0de92a8d1..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_qr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sbpi1_div_qr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_qr.c
new file mode 100644
index 000000000..7330a77fb
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_div_qr.c
@@ -0,0 +1,109 @@
+/* mpn_sbpi1_div_qr -- Schoolbook division using the Möller-Granlund 3/2
+   division algorithm.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2007, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+mp_limb_t
+mpn_sbpi1_div_qr (mp_ptr qp,
+		  mp_ptr np, mp_size_t nn,
+		  mp_srcptr dp, mp_size_t dn,
+		  mp_limb_t dinv)
+{
+  mp_limb_t qh;
+  mp_size_t i;
+  mp_limb_t n1, n0;
+  mp_limb_t d1, d0;
+  mp_limb_t cy, cy1;
+  mp_limb_t q;
+
+  ASSERT (dn > 2);
+  ASSERT (nn >= dn);
+  ASSERT ((dp[dn-1] & GMP_NUMB_HIGHBIT) != 0);
+
+  np += nn;
+
+  qh = mpn_cmp (np - dn, dp, dn) >= 0;
+  if (qh != 0)
+    mpn_sub_n (np - dn, np - dn, dp, dn);
+
+  qp += nn - dn;
+
+  dn -= 2;			/* offset dn by 2 for main division loops,
+				   saving two iterations in mpn_submul_1.  */
+  d1 = dp[dn + 1];
+  d0 = dp[dn + 0];
+
+  np -= 2;
+
+  n1 = np[1];
+
+  for (i = nn - (dn + 2); i > 0; i--)
+    {
+      np--;
+      if (UNLIKELY (n1 == d1) && np[1] == d0)
+	{
+	  q = GMP_NUMB_MASK;
+	  mpn_submul_1 (np - dn, dp, dn + 2, q);
+	  n1 = np[1];		/* update n1, last loop's value will now be invalid */
+	}
+      else
+	{
+	  udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
+
+	  cy = mpn_submul_1 (np - dn, dp, dn, q);
+
+	  cy1 = n0 < cy;
+	  n0 = (n0 - cy) & GMP_NUMB_MASK;
+	  cy = n1 < cy1;
+	  n1 = (n1 - cy1) & GMP_NUMB_MASK;
+	  np[0] = n0;
+
+	  if (UNLIKELY (cy != 0))
+	    {
+	      n1 += d1 + mpn_add_n (np - dn, np - dn, dp, dn + 1);
+	      q--;
+	    }
+	}
+
+      *--qp = q;
+    }
+  np[1] = n1;
+
+  return qh;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_divappr_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_divappr_q.c
deleted file mode 120000
index 49f23463c..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_divappr_q.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sbpi1_divappr_q.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_divappr_q.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_divappr_q.c
new file mode 100644
index 000000000..ef7ca26a1
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sbpi1_divappr_q.c
@@ -0,0 +1,198 @@
+/* mpn_sbpi1_divappr_q -- Schoolbook division using the Möller-Granlund 3/2
+   division algorithm, returning approximate quotient.  The quotient returned
+   is either correct, or one too large.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+
+Copyright 2007, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+mp_limb_t
+mpn_sbpi1_divappr_q (mp_ptr qp,
+		     mp_ptr np, mp_size_t nn,
+		     mp_srcptr dp, mp_size_t dn,
+		     mp_limb_t dinv)
+{
+  mp_limb_t qh;
+  mp_size_t qn, i;
+  mp_limb_t n1, n0;
+  mp_limb_t d1, d0;
+  mp_limb_t cy, cy1;
+  mp_limb_t q;
+  mp_limb_t flag;
+
+  ASSERT (dn > 2);
+  ASSERT (nn >= dn);
+  ASSERT ((dp[dn-1] & GMP_NUMB_HIGHBIT) != 0);
+
+  np += nn;
+
+  qn = nn - dn;
+  if (qn + 1 < dn)
+    {
+      dp += dn - (qn + 1);
+      dn = qn + 1;
+    }
+
+  qh = mpn_cmp (np - dn, dp, dn) >= 0;
+  if (qh != 0)
+    mpn_sub_n (np - dn, np - dn, dp, dn);
+
+  qp += qn;
+
+  dn -= 2;			/* offset dn by 2 for main division loops,
+				   saving two iterations in mpn_submul_1.  */
+  d1 = dp[dn + 1];
+  d0 = dp[dn + 0];
+
+  np -= 2;
+
+  n1 = np[1];
+
+  for (i = qn - (dn + 2); i >= 0; i--)
+    {
+      np--;
+      if (UNLIKELY (n1 == d1) && np[1] == d0)
+	{
+	  q = GMP_NUMB_MASK;
+	  mpn_submul_1 (np - dn, dp, dn + 2, q);
+	  n1 = np[1];		/* update n1, last loop's value will now be invalid */
+	}
+      else
+	{
+	  udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
+
+	  cy = mpn_submul_1 (np - dn, dp, dn, q);
+
+	  cy1 = n0 < cy;
+	  n0 = (n0 - cy) & GMP_NUMB_MASK;
+	  cy = n1 < cy1;
+	  n1 -= cy1;
+	  np[0] = n0;
+
+	  if (UNLIKELY (cy != 0))
+	    {
+	      n1 += d1 + mpn_add_n (np - dn, np - dn, dp, dn + 1);
+	      q--;
+	    }
+	}
+
+      *--qp = q;
+    }
+
+  flag = ~CNST_LIMB(0);
+
+  if (dn >= 0)
+    {
+      for (i = dn; i > 0; i--)
+	{
+	  np--;
+	  if (UNLIKELY (n1 >= (d1 & flag)))
+	    {
+	      q = GMP_NUMB_MASK;
+	      cy = mpn_submul_1 (np - dn, dp, dn + 2, q);
+
+	      if (UNLIKELY (n1 != cy))
+		{
+		  if (n1 < (cy & flag))
+		    {
+		      q--;
+		      mpn_add_n (np - dn, np - dn, dp, dn + 2);
+		    }
+		  else
+		    flag = 0;
+		}
+	      n1 = np[1];
+	    }
+	  else
+	    {
+	      udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
+
+	      cy = mpn_submul_1 (np - dn, dp, dn, q);
+
+	      cy1 = n0 < cy;
+	      n0 = (n0 - cy) & GMP_NUMB_MASK;
+	      cy = n1 < cy1;
+	      n1 -= cy1;
+	      np[0] = n0;
+
+	      if (UNLIKELY (cy != 0))
+		{
+		  n1 += d1 + mpn_add_n (np - dn, np - dn, dp, dn + 1);
+		  q--;
+		}
+	    }
+
+	  *--qp = q;
+
+	  /* Truncate operands.  */
+	  dn--;
+	  dp++;
+	}
+
+      np--;
+      if (UNLIKELY (n1 >= (d1 & flag)))
+	{
+	  q = GMP_NUMB_MASK;
+	  cy = mpn_submul_1 (np, dp, 2, q);
+
+	  if (UNLIKELY (n1 != cy))
+	    {
+	      if (n1 < (cy & flag))
+		{
+		  q--;
+		  add_ssaaaa (np[1], np[0], np[1], np[0], dp[1], dp[0]);
+		}
+	      else
+		flag = 0;
+	    }
+	  n1 = np[1];
+	}
+      else
+	{
+	  udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
+
+	  np[1] = n1;
+	  np[0] = n0;
+	}
+
+      *--qp = q;
+    }
+
+  ASSERT_ALWAYS (np[1] == n1);
+
+  return qh;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/scan0.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/scan0.c
deleted file mode 120000
index 4b2f7b13b..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/scan0.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/scan0.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/scan0.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/scan0.c
new file mode 100644
index 000000000..d71832e64
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/scan0.c
@@ -0,0 +1,59 @@
+/* mpn_scan0 -- Scan from a given bit position for the next clear bit.
+
+Copyright 1994, 1996, 2001, 2002, 2004 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Argument constraints:
+   1. U must sooner or later have a limb with a clear bit.
+ */
+
+mp_bitcnt_t
+mpn_scan0 (mp_srcptr up, mp_bitcnt_t starting_bit)
+{
+  mp_size_t starting_word;
+  mp_limb_t alimb;
+  int cnt;
+  mp_srcptr p;
+
+  /* Start at the word implied by STARTING_BIT.  */
+  starting_word = starting_bit / GMP_NUMB_BITS;
+  p = up + starting_word;
+  alimb = *p++ ^ GMP_NUMB_MASK;
+
+  /* Mask off any bits before STARTING_BIT in the first limb.  */
+  alimb &= - (mp_limb_t) 1 << (starting_bit % GMP_NUMB_BITS);
+
+  while (alimb == 0)
+    alimb = *p++ ^ GMP_NUMB_MASK;
+
+  count_trailing_zeros (cnt, alimb);
+  return (p - up - 1) * GMP_NUMB_BITS + cnt;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/scan1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/scan1.c
deleted file mode 120000
index 3f5189056..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/scan1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/scan1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/scan1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/scan1.c
new file mode 100644
index 000000000..09e8060bf
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/scan1.c
@@ -0,0 +1,59 @@
+/* mpn_scan1 -- Scan from a given bit position for the next set bit.
+
+Copyright 1994, 1996, 2001, 2002, 2004 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* Argument constraints:
+   1. U must sooner or later have a limb != 0.
+ */
+
+mp_bitcnt_t
+mpn_scan1 (mp_srcptr up, mp_bitcnt_t starting_bit)
+{
+  mp_size_t starting_word;
+  mp_limb_t alimb;
+  int cnt;
+  mp_srcptr p;
+
+  /* Start at the word implied by STARTING_BIT.  */
+  starting_word = starting_bit / GMP_NUMB_BITS;
+  p = up + starting_word;
+  alimb = *p++;
+
+  /* Mask off any bits before STARTING_BIT in the first limb.  */
+  alimb &= - (mp_limb_t) 1 << (starting_bit % GMP_NUMB_BITS);
+
+  while (alimb == 0)
+    alimb = *p++;
+
+  count_trailing_zeros (cnt, alimb);
+  return (p - up - 1) * GMP_NUMB_BITS + cnt;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_add_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_add_1.c
deleted file mode 120000
index 5fde85170..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_add_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_aors_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_add_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_add_1.c
new file mode 100644
index 000000000..6480fa1bf
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_add_1.c
@@ -0,0 +1,59 @@
+/* mpn_sec_add_1, mpn_sec_sub_1
+
+   Contributed to the GNU project by Niels Möller
+
+Copyright 2013, 2014 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if OPERATION_sec_add_1
+#define FNAME mpn_sec_add_1
+#define FNAME_itch mpn_sec_add_1_itch
+#define OP_N mpn_add_n
+#endif
+#if OPERATION_sec_sub_1
+#define FNAME mpn_sec_sub_1
+#define FNAME_itch mpn_sec_sub_1_itch
+#define OP_N mpn_sub_n
+#endif
+
+/* It's annoying to that we need scratch space */
+mp_size_t
+FNAME_itch (mp_size_t n)
+{
+  return n;
+}
+
+mp_limb_t
+FNAME (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b, mp_ptr scratch)
+{
+  scratch[0] = b;
+  MPN_ZERO (scratch + 1, n-1);
+  return OP_N (rp, ap, scratch, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_qr.c
deleted file mode 120000
index 7e1f1b28b..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_qr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_div.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_qr.c
new file mode 100644
index 000000000..1f08649c2
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_qr.c
@@ -0,0 +1,131 @@
+/* mpn_sec_div_qr, mpn_sec_div_r -- Compute Q = floor(U / V), U = U mod V.
+   Side-channel silent under the assumption that the used instructions are
+   side-channel silent.
+
+   Contributed to the GNU project by Torbjörn Granlund.
+
+Copyright 2011-2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#if OPERATION_sec_div_qr
+#define FNAME mpn_sec_div_qr
+#define FNAME_itch mpn_sec_div_qr_itch
+#define Q(q) q,
+#define RETTYPE mp_limb_t
+#endif
+#if OPERATION_sec_div_r
+#define FNAME mpn_sec_div_r
+#define FNAME_itch mpn_sec_div_r_itch
+#define Q(q)
+#define RETTYPE void
+#endif
+
+mp_size_t
+FNAME_itch (mp_size_t nn, mp_size_t dn)
+{
+#if OPERATION_sec_div_qr
+/* Needs (nn + dn + 1) + mpn_sec_pi1_div_qr's needs of (2nn' - dn + 1) for a
+   total of 3nn + 4 limbs at tp.  Note that mpn_sec_pi1_div_qr's nn is one
+   greater than ours, therefore +4 and not just +2.  */
+  return 3 * nn + 4;
+#endif
+#if OPERATION_sec_div_r
+/* Needs (nn + dn + 1) + mpn_sec_pi1_div_r's needs of (dn + 1) for a total of
+   nn + 2dn + 2 limbs at tp.  */
+  return nn + 2 * dn + 2;
+#endif
+}
+
+RETTYPE
+FNAME (Q(mp_ptr qp)
+       mp_ptr np, mp_size_t nn,
+       mp_srcptr dp, mp_size_t dn,
+       mp_ptr tp)
+{
+  mp_limb_t d1, d0;
+  unsigned int cnt;
+  mp_limb_t inv32;
+
+  ASSERT (dn >= 1);
+  ASSERT (nn >= dn);
+  ASSERT (dp[dn - 1] != 0);
+
+  d1 = dp[dn - 1];
+  count_leading_zeros (cnt, d1);
+
+  if (cnt != 0)
+    {
+      mp_limb_t qh, cy;
+      mp_ptr np2, dp2;
+      dp2 = tp;					/* dn limbs */
+      mpn_lshift (dp2, dp, dn, cnt);
+
+      np2 = tp + dn;				/* (nn + 1) limbs */
+      cy = mpn_lshift (np2, np, nn, cnt);
+      np2[nn++] = cy;
+
+      d0 = dp2[dn - 1];
+      d0 += (~d0 != 0);
+      invert_limb (inv32, d0);
+
+      /* We add nn + dn to tp here, not nn + 1 + dn, as expected.  This is
+	 since nn here will have been incremented.  */
+#if OPERATION_sec_div_qr
+      qh = mpn_sec_pi1_div_qr (np2 + dn, np2, nn, dp2, dn, inv32, tp + nn + dn);
+      ASSERT (qh == 0);		/* FIXME: this indicates inefficiency! */
+      MPN_COPY (qp, np2 + dn, nn - dn - 1);
+      qh = np2[nn - 1];
+#else
+      mpn_sec_pi1_div_r (np2, nn, dp2, dn, inv32, tp + nn + dn);
+#endif
+
+      mpn_rshift (np, np2, dn, cnt);
+
+#if OPERATION_sec_div_qr
+      return qh;
+#endif
+    }
+  else
+    {
+      /* FIXME: Consider copying np => np2 here, adding a 0-limb at the top.
+	 That would simplify the underlying pi1 function, since then it could
+	 assume nn > dn.  */
+      d0 = dp[dn - 1];
+      d0 += (~d0 != 0);
+      invert_limb (inv32, d0);
+
+#if OPERATION_sec_div_qr
+      return mpn_sec_pi1_div_qr (qp, np, nn, dp, dn, inv32, tp);
+#else
+      mpn_sec_pi1_div_r (np, nn, dp, dn, inv32, tp);
+#endif
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_r.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_r.c
deleted file mode 120000
index 7e1f1b28b..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_r.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_div.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_r.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_r.c
new file mode 100644
index 000000000..1f08649c2
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_div_r.c
@@ -0,0 +1,131 @@
+/* mpn_sec_div_qr, mpn_sec_div_r -- Compute Q = floor(U / V), U = U mod V.
+   Side-channel silent under the assumption that the used instructions are
+   side-channel silent.
+
+   Contributed to the GNU project by Torbjörn Granlund.
+
+Copyright 2011-2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#if OPERATION_sec_div_qr
+#define FNAME mpn_sec_div_qr
+#define FNAME_itch mpn_sec_div_qr_itch
+#define Q(q) q,
+#define RETTYPE mp_limb_t
+#endif
+#if OPERATION_sec_div_r
+#define FNAME mpn_sec_div_r
+#define FNAME_itch mpn_sec_div_r_itch
+#define Q(q)
+#define RETTYPE void
+#endif
+
+mp_size_t
+FNAME_itch (mp_size_t nn, mp_size_t dn)
+{
+#if OPERATION_sec_div_qr
+/* Needs (nn + dn + 1) + mpn_sec_pi1_div_qr's needs of (2nn' - dn + 1) for a
+   total of 3nn + 4 limbs at tp.  Note that mpn_sec_pi1_div_qr's nn is one
+   greater than ours, therefore +4 and not just +2.  */
+  return 3 * nn + 4;
+#endif
+#if OPERATION_sec_div_r
+/* Needs (nn + dn + 1) + mpn_sec_pi1_div_r's needs of (dn + 1) for a total of
+   nn + 2dn + 2 limbs at tp.  */
+  return nn + 2 * dn + 2;
+#endif
+}
+
+RETTYPE
+FNAME (Q(mp_ptr qp)
+       mp_ptr np, mp_size_t nn,
+       mp_srcptr dp, mp_size_t dn,
+       mp_ptr tp)
+{
+  mp_limb_t d1, d0;
+  unsigned int cnt;
+  mp_limb_t inv32;
+
+  ASSERT (dn >= 1);
+  ASSERT (nn >= dn);
+  ASSERT (dp[dn - 1] != 0);
+
+  d1 = dp[dn - 1];
+  count_leading_zeros (cnt, d1);
+
+  if (cnt != 0)
+    {
+      mp_limb_t qh, cy;
+      mp_ptr np2, dp2;
+      dp2 = tp;					/* dn limbs */
+      mpn_lshift (dp2, dp, dn, cnt);
+
+      np2 = tp + dn;				/* (nn + 1) limbs */
+      cy = mpn_lshift (np2, np, nn, cnt);
+      np2[nn++] = cy;
+
+      d0 = dp2[dn - 1];
+      d0 += (~d0 != 0);
+      invert_limb (inv32, d0);
+
+      /* We add nn + dn to tp here, not nn + 1 + dn, as expected.  This is
+	 since nn here will have been incremented.  */
+#if OPERATION_sec_div_qr
+      qh = mpn_sec_pi1_div_qr (np2 + dn, np2, nn, dp2, dn, inv32, tp + nn + dn);
+      ASSERT (qh == 0);		/* FIXME: this indicates inefficiency! */
+      MPN_COPY (qp, np2 + dn, nn - dn - 1);
+      qh = np2[nn - 1];
+#else
+      mpn_sec_pi1_div_r (np2, nn, dp2, dn, inv32, tp + nn + dn);
+#endif
+
+      mpn_rshift (np, np2, dn, cnt);
+
+#if OPERATION_sec_div_qr
+      return qh;
+#endif
+    }
+  else
+    {
+      /* FIXME: Consider copying np => np2 here, adding a 0-limb at the top.
+	 That would simplify the underlying pi1 function, since then it could
+	 assume nn > dn.  */
+      d0 = dp[dn - 1];
+      d0 += (~d0 != 0);
+      invert_limb (inv32, d0);
+
+#if OPERATION_sec_div_qr
+      return mpn_sec_pi1_div_qr (qp, np, nn, dp, dn, inv32, tp);
+#else
+      mpn_sec_pi1_div_r (np, nn, dp, dn, inv32, tp);
+#endif
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_invert.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_invert.c
deleted file mode 120000
index 66841bf41..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_invert.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_invert.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_invert.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_invert.c
new file mode 100644
index 000000000..07665d1b9
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_invert.c
@@ -0,0 +1,177 @@
+/* mpn_sec_invert
+
+   Contributed to the GNU project by Niels Möller
+
+Copyright 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if 0
+/* Currently unused. Should be resurrected once mpn_cnd_neg is
+   advertised. */
+static mp_size_t
+mpn_cnd_neg_itch (mp_size_t n)
+{
+  return n;
+}
+#endif
+
+/* FIXME: Ought to return carry */
+static void
+mpn_cnd_neg (int cnd, mp_limb_t *rp, const mp_limb_t *ap, mp_size_t n,
+	     mp_ptr scratch)
+{
+  mpn_lshift (scratch, ap, n, 1);
+  mpn_cnd_sub_n (cnd, rp, ap, scratch, n);
+}
+
+static int
+mpn_sec_eq_ui (mp_srcptr ap, mp_size_t n, mp_limb_t b)
+{
+  mp_limb_t d;
+  ASSERT (n > 0);
+
+  d = ap[0] ^ b;
+
+  while (--n > 0)
+    d |= ap[n];
+
+  return d == 0;
+}
+
+mp_size_t
+mpn_sec_invert_itch (mp_size_t n)
+{
+  return 4*n;
+}
+
+/* Compute V <-- A^{-1} (mod M), in data-independent time. M must be
+   odd. Returns 1 on success, and 0 on failure (i.e., if gcd (A, m) !=
+   1). Inputs and outputs of size n, and no overlap allowed. The {ap,
+   n} area is destroyed. For arbitrary inputs, bit_size should be
+   2*n*GMP_NUMB_BITS, but if A or M are known to be smaller, e.g., if
+   M = 2^521 - 1 and A < M, bit_size can be any bound on the sum of
+   the bit sizes of A and M. */
+int
+mpn_sec_invert (mp_ptr vp, mp_ptr ap, mp_srcptr mp,
+		mp_size_t n, mp_bitcnt_t bit_size,
+		mp_ptr scratch)
+{
+  ASSERT (n > 0);
+  ASSERT (bit_size > 0);
+  ASSERT (mp[0] & 1);
+  ASSERT (! MPN_OVERLAP_P (ap, n, vp, n));
+#define bp (scratch + n)
+#define up (scratch + 2*n)
+#define m1hp (scratch + 3*n)
+
+  /* Maintain
+
+       a = u * orig_a (mod m)
+       b = v * orig_a (mod m)
+
+     and b odd at all times. Initially,
+
+       a = a_orig, u = 1
+       b = m,      v = 0
+     */
+
+
+  up[0] = 1;
+  mpn_zero (up+1, n - 1);
+  mpn_copyi (bp, mp, n);
+  mpn_zero (vp, n);
+
+  ASSERT_CARRY (mpn_rshift (m1hp, mp, n, 1));
+  ASSERT_NOCARRY (mpn_sec_add_1 (m1hp, m1hp, n, 1, scratch));
+
+  while (bit_size-- > 0)
+    {
+      mp_limb_t odd, swap, cy;
+
+      /* Always maintain b odd. The logic of the iteration is as
+	 follows. For a, b:
+
+	   odd = a & 1
+	   a -= odd * b
+	   if (underflow from a-b)
+	     {
+	       b += a, assigns old a
+	       a = B^n-a
+	     }
+
+	   a /= 2
+
+	 For u, v:
+
+	   if (underflow from a - b)
+	     swap u, v
+	   u -= odd * v
+	   if (underflow from u - v)
+	     u += m
+
+	   u /= 2
+	   if (a one bit was shifted out)
+	     u += (m+1)/2
+
+	 As long as a > 0, the quantity
+
+	   (bitsize of a) + (bitsize of b)
+
+	 is reduced by at least one bit per iteration, hence after (bit_size of
+	 orig_a) + (bit_size of m) - 1 iterations we surely have a = 0. Then b
+	 = gcd(orig_a, m) and if b = 1 then also v = orig_a^{-1} (mod m).
+      */
+
+      ASSERT (bp[0] & 1);
+      odd = ap[0] & 1;
+
+      swap = mpn_cnd_sub_n (odd, ap, ap, bp, n);
+      mpn_cnd_add_n (swap, bp, bp, ap, n);
+      mpn_cnd_neg (swap, ap, ap, n, scratch);
+
+      mpn_cnd_swap (swap, up, vp, n);
+      cy = mpn_cnd_sub_n (odd, up, up, vp, n);
+      cy -= mpn_cnd_add_n (cy, up, up, mp, n);
+      ASSERT (cy == 0);
+
+      cy = mpn_rshift (ap, ap, n, 1);
+      ASSERT (cy == 0);
+      cy = mpn_rshift (up, up, n, 1);
+      cy = mpn_cnd_add_n (cy, up, up, m1hp, n);
+      ASSERT (cy == 0);
+    }
+  /* Should be all zeros, but check only extreme limbs */
+  ASSERT ( (ap[0] | ap[n-1]) == 0);
+  /* Check if indeed gcd == 1. */
+  return mpn_sec_eq_ui (bp, n, 1);
+#undef bp
+#undef up
+#undef m1hp
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_mul.c
deleted file mode 120000
index 9a72c9342..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_mul.c
new file mode 100644
index 000000000..4bbfa61b7
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_mul.c
@@ -0,0 +1,48 @@
+/* mpn_sec_mul.
+
+   Contributed to the GNU project by Torbjörn Granlund.
+
+Copyright 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+void
+mpn_sec_mul (mp_ptr rp,
+	     mp_srcptr ap, mp_size_t an,
+	     mp_srcptr bp, mp_size_t bn,
+	     mp_ptr tp)
+{
+  mpn_mul_basecase (rp, ap, an, bp, bn);
+}
+
+mp_size_t
+mpn_sec_mul_itch (mp_size_t an, mp_size_t bn)
+{
+  return 0;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_qr.c
deleted file mode 120000
index 920657aa8..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_qr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_pi1_div.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_qr.c
new file mode 100644
index 000000000..29d01e757
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_qr.c
@@ -0,0 +1,172 @@
+/* mpn_sec_pi1_div_qr, mpn_sec_pi1_div_r -- Compute Q = floor(U / V), U = U
+   mod V.  Side-channel silent under the assumption that the used instructions
+   are side-channel silent.
+
+   Contributed to the GNU project by Torbjörn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011-2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* This side-channel silent division algorithm reduces the partial remainder by
+   GMP_NUMB_BITS/2 bits at a time, compared to GMP_NUMB_BITS for the main
+   division algorithm.  We actually do not insist on reducing by exactly
+   GMP_NUMB_BITS/2, but may leave a partial remainder that is D*B^i to 3D*B^i
+   too large (B is the limb base, D is the divisor, and i is the induction
+   variable); the subsequent step will handle the extra partial remainder bits.
+
+   With that partial remainder reduction, each step generates a quotient "half
+   limb".  The outer loop generates two quotient half limbs, an upper (q1h) and
+   a lower (q0h) which are stored sparsely in separate limb arrays.  These
+   arrays are added at the end; using separate arrays avoids data-dependent
+   carry propagation which could else pose a side-channel leakage problem.
+
+   The quotient half limbs may be between -3 to 0 from the accurate value
+   ("accurate" being the one which corresponds to a reduction to a principal
+   partial remainder).  Too small quotient half limbs correspond to too large
+   remainders, which we reduce later, as described above.
+
+   In order to keep quotients from getting too big, corresponding to a negative
+   partial remainder, we use an inverse which is slightly smaller than usually.
+*/
+
+#if OPERATION_sec_pi1_div_qr
+/* Needs (dn + 1) + (nn - dn) + (nn - dn) = 2nn - dn + 1 limbs at tp. */
+#define FNAME mpn_sec_pi1_div_qr
+#define Q(q) q,
+#define RETTYPE mp_limb_t
+#endif
+#if OPERATION_sec_pi1_div_r
+/* Needs (dn + 1) limbs at tp.  */
+#define FNAME mpn_sec_pi1_div_r
+#define Q(q)
+#define RETTYPE void
+#endif
+
+RETTYPE
+FNAME (Q(mp_ptr qp)
+       mp_ptr np, mp_size_t nn,
+       mp_srcptr dp, mp_size_t dn,
+       mp_limb_t dinv,
+       mp_ptr tp)
+{
+  mp_limb_t nh, cy, q1h, q0h, dummy, cnd;
+  mp_size_t i;
+  mp_ptr hp;
+#if OPERATION_sec_pi1_div_qr
+  mp_limb_t qh;
+  mp_ptr qlp, qhp;
+#endif
+
+  ASSERT (dn >= 1);
+  ASSERT (nn >= dn);
+  ASSERT ((dp[dn - 1] & GMP_NUMB_HIGHBIT) != 0);
+
+  if (nn == dn)
+    {
+      cy = mpn_sub_n (np, np, dp, dn);
+      mpn_cnd_add_n (cy, np, np, dp, dn);
+#if OPERATION_sec_pi1_div_qr
+      return 1 - cy;
+#else
+      return;
+#endif
+    }
+
+  /* Create a divisor copy shifted half a limb.  */
+  hp = tp;					/* (dn + 1) limbs */
+  hp[dn] = mpn_lshift (hp, dp, dn, GMP_NUMB_BITS / 2);
+
+#if OPERATION_sec_pi1_div_qr
+  qlp = tp + (dn + 1);				/* (nn - dn) limbs */
+  qhp = tp + (nn + 1);				/* (nn - dn) limbs */
+#endif
+
+  np += nn - dn;
+  nh = 0;
+
+  for (i = nn - dn - 1; i >= 0; i--)
+    {
+      np--;
+
+      nh = (nh << GMP_NUMB_BITS/2) + (np[dn] >> GMP_NUMB_BITS/2);
+      umul_ppmm (q1h, dummy, nh, dinv);
+      q1h += nh;
+#if OPERATION_sec_pi1_div_qr
+      qhp[i] = q1h;
+#endif
+      mpn_submul_1 (np, hp, dn + 1, q1h);
+
+      nh = np[dn];
+      umul_ppmm (q0h, dummy, nh, dinv);
+      q0h += nh;
+#if OPERATION_sec_pi1_div_qr
+      qlp[i] = q0h;
+#endif
+      nh -= mpn_submul_1 (np, dp, dn, q0h);
+    }
+
+  /* 1st adjustment depends on extra high remainder limb.  */
+  cnd = nh != 0;				/* FIXME: cmp-to-int */
+#if OPERATION_sec_pi1_div_qr
+  qlp[0] += cnd;
+#endif
+  nh -= mpn_cnd_sub_n (cnd, np, np, dp, dn);
+
+  /* 2nd adjustment depends on remainder/divisor comparison as well as whether
+     extra remainder limb was nullified by previous subtract.  */
+  cy = mpn_sub_n (np, np, dp, dn);
+  cy = cy - nh;
+#if OPERATION_sec_pi1_div_qr
+  qlp[0] += 1 - cy;
+#endif
+  mpn_cnd_add_n (cy, np, np, dp, dn);
+
+  /* 3rd adjustment depends on remainder/divisor comparison.  */
+  cy = mpn_sub_n (np, np, dp, dn);
+#if OPERATION_sec_pi1_div_qr
+  qlp[0] += 1 - cy;
+#endif
+  mpn_cnd_add_n (cy, np, np, dp, dn);
+
+#if OPERATION_sec_pi1_div_qr
+  /* Combine quotient halves into final quotient.  */
+  qh = mpn_lshift (qhp, qhp, nn - dn, GMP_NUMB_BITS/2);
+  qh += mpn_add_n (qp, qhp, qlp, nn - dn);
+
+  return qh;
+#else
+  return;
+#endif
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_r.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_r.c
deleted file mode 120000
index 920657aa8..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_r.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_pi1_div.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_r.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_r.c
new file mode 100644
index 000000000..29d01e757
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_pi1_div_r.c
@@ -0,0 +1,172 @@
+/* mpn_sec_pi1_div_qr, mpn_sec_pi1_div_r -- Compute Q = floor(U / V), U = U
+   mod V.  Side-channel silent under the assumption that the used instructions
+   are side-channel silent.
+
+   Contributed to the GNU project by Torbjörn Granlund.
+
+   THE FUNCTIONS IN THIS FILE ARE INTERNAL WITH MUTABLE INTERFACES.  IT IS ONLY
+   SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011-2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+/* This side-channel silent division algorithm reduces the partial remainder by
+   GMP_NUMB_BITS/2 bits at a time, compared to GMP_NUMB_BITS for the main
+   division algorithm.  We actually do not insist on reducing by exactly
+   GMP_NUMB_BITS/2, but may leave a partial remainder that is D*B^i to 3D*B^i
+   too large (B is the limb base, D is the divisor, and i is the induction
+   variable); the subsequent step will handle the extra partial remainder bits.
+
+   With that partial remainder reduction, each step generates a quotient "half
+   limb".  The outer loop generates two quotient half limbs, an upper (q1h) and
+   a lower (q0h) which are stored sparsely in separate limb arrays.  These
+   arrays are added at the end; using separate arrays avoids data-dependent
+   carry propagation which could else pose a side-channel leakage problem.
+
+   The quotient half limbs may be between -3 to 0 from the accurate value
+   ("accurate" being the one which corresponds to a reduction to a principal
+   partial remainder).  Too small quotient half limbs correspond to too large
+   remainders, which we reduce later, as described above.
+
+   In order to keep quotients from getting too big, corresponding to a negative
+   partial remainder, we use an inverse which is slightly smaller than usually.
+*/
+
+#if OPERATION_sec_pi1_div_qr
+/* Needs (dn + 1) + (nn - dn) + (nn - dn) = 2nn - dn + 1 limbs at tp. */
+#define FNAME mpn_sec_pi1_div_qr
+#define Q(q) q,
+#define RETTYPE mp_limb_t
+#endif
+#if OPERATION_sec_pi1_div_r
+/* Needs (dn + 1) limbs at tp.  */
+#define FNAME mpn_sec_pi1_div_r
+#define Q(q)
+#define RETTYPE void
+#endif
+
+RETTYPE
+FNAME (Q(mp_ptr qp)
+       mp_ptr np, mp_size_t nn,
+       mp_srcptr dp, mp_size_t dn,
+       mp_limb_t dinv,
+       mp_ptr tp)
+{
+  mp_limb_t nh, cy, q1h, q0h, dummy, cnd;
+  mp_size_t i;
+  mp_ptr hp;
+#if OPERATION_sec_pi1_div_qr
+  mp_limb_t qh;
+  mp_ptr qlp, qhp;
+#endif
+
+  ASSERT (dn >= 1);
+  ASSERT (nn >= dn);
+  ASSERT ((dp[dn - 1] & GMP_NUMB_HIGHBIT) != 0);
+
+  if (nn == dn)
+    {
+      cy = mpn_sub_n (np, np, dp, dn);
+      mpn_cnd_add_n (cy, np, np, dp, dn);
+#if OPERATION_sec_pi1_div_qr
+      return 1 - cy;
+#else
+      return;
+#endif
+    }
+
+  /* Create a divisor copy shifted half a limb.  */
+  hp = tp;					/* (dn + 1) limbs */
+  hp[dn] = mpn_lshift (hp, dp, dn, GMP_NUMB_BITS / 2);
+
+#if OPERATION_sec_pi1_div_qr
+  qlp = tp + (dn + 1);				/* (nn - dn) limbs */
+  qhp = tp + (nn + 1);				/* (nn - dn) limbs */
+#endif
+
+  np += nn - dn;
+  nh = 0;
+
+  for (i = nn - dn - 1; i >= 0; i--)
+    {
+      np--;
+
+      nh = (nh << GMP_NUMB_BITS/2) + (np[dn] >> GMP_NUMB_BITS/2);
+      umul_ppmm (q1h, dummy, nh, dinv);
+      q1h += nh;
+#if OPERATION_sec_pi1_div_qr
+      qhp[i] = q1h;
+#endif
+      mpn_submul_1 (np, hp, dn + 1, q1h);
+
+      nh = np[dn];
+      umul_ppmm (q0h, dummy, nh, dinv);
+      q0h += nh;
+#if OPERATION_sec_pi1_div_qr
+      qlp[i] = q0h;
+#endif
+      nh -= mpn_submul_1 (np, dp, dn, q0h);
+    }
+
+  /* 1st adjustment depends on extra high remainder limb.  */
+  cnd = nh != 0;				/* FIXME: cmp-to-int */
+#if OPERATION_sec_pi1_div_qr
+  qlp[0] += cnd;
+#endif
+  nh -= mpn_cnd_sub_n (cnd, np, np, dp, dn);
+
+  /* 2nd adjustment depends on remainder/divisor comparison as well as whether
+     extra remainder limb was nullified by previous subtract.  */
+  cy = mpn_sub_n (np, np, dp, dn);
+  cy = cy - nh;
+#if OPERATION_sec_pi1_div_qr
+  qlp[0] += 1 - cy;
+#endif
+  mpn_cnd_add_n (cy, np, np, dp, dn);
+
+  /* 3rd adjustment depends on remainder/divisor comparison.  */
+  cy = mpn_sub_n (np, np, dp, dn);
+#if OPERATION_sec_pi1_div_qr
+  qlp[0] += 1 - cy;
+#endif
+  mpn_cnd_add_n (cy, np, np, dp, dn);
+
+#if OPERATION_sec_pi1_div_qr
+  /* Combine quotient halves into final quotient.  */
+  qh = mpn_lshift (qhp, qhp, nn - dn, GMP_NUMB_BITS/2);
+  qh += mpn_add_n (qp, qhp, qlp, nn - dn);
+
+  return qh;
+#else
+  return;
+#endif
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_powm.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_powm.c
deleted file mode 120000
index e00403c10..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_powm.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_powm.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_powm.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_powm.c
new file mode 100644
index 000000000..3a78c660b
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_powm.c
@@ -0,0 +1,383 @@
+/* mpn_sec_powm -- Compute R = U^E mod M.  Secure variant, side-channel silent
+   under the assumption that the multiply instruction is side channel silent.
+
+   Contributed to the GNU project by Torbjörn Granlund.
+
+Copyright 2007-2009, 2011-2014, 2018-2019 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/*
+  BASIC ALGORITHM, Compute U^E mod M, where M < B^n is odd.
+
+  1. T <- (B^n * U) mod M; convert to REDC form
+
+  2. Compute table U^0, U^1, U^2... of floor(log(E))-dependent size
+
+  3. While there are more bits in E
+       W <- power left-to-right base-k
+
+  The article "Defeating modexp side-channel attacks with data-independent
+  execution traces", https://gmplib.org/~tege/modexp-silent.pdf, has details.
+
+
+  TODO:
+
+   * Make getbits a macro, thereby allowing it to update the index operand.
+     That will simplify the code using getbits.  (Perhaps make getbits' sibling
+     getbit then have similar form, for symmetry.)
+
+   * Choose window size without looping.  (Superoptimize or think(tm).)
+
+   * REDC_1_TO_REDC_2_THRESHOLD might actually represent the cutoff between
+     redc_1 and redc_n.  On such systems, we will switch to redc_2 causing
+     slowdown.
+*/
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#undef MPN_REDC_1_SEC
+#if HAVE_NATIVE_mpn_sbpi1_bdiv_r
+#define MPN_REDC_1_SEC(rp, up, mp, n, invm)				\
+  do {									\
+    mp_limb_t cy;							\
+    cy = mpn_sbpi1_bdiv_r (up, 2 * n, mp, n, invm);			\
+    mpn_cnd_sub_n (cy, rp, up + n, mp, n);				\
+  } while (0)
+#else
+#define MPN_REDC_1_SEC(rp, up, mp, n, invm)				\
+  do {									\
+    mp_limb_t cy;							\
+    cy = mpn_redc_1 (rp, up, mp, n, invm);				\
+    mpn_cnd_sub_n (cy, rp, rp, mp, n);					\
+  } while (0)
+#endif
+
+#if HAVE_NATIVE_mpn_addmul_2 || HAVE_NATIVE_mpn_redc_2
+#undef MPN_REDC_2_SEC
+#define MPN_REDC_2_SEC(rp, up, mp, n, mip)				\
+  do {									\
+    mp_limb_t cy;							\
+    cy = mpn_redc_2 (rp, up, mp, n, mip);				\
+    mpn_cnd_sub_n (cy, rp, rp, mp, n);					\
+  } while (0)
+#else
+#define MPN_REDC_2_SEC(rp, up, mp, n, mip) /* empty */
+#undef REDC_1_TO_REDC_2_THRESHOLD
+#define REDC_1_TO_REDC_2_THRESHOLD MP_SIZE_T_MAX
+#endif
+
+/* Define our own mpn squaring function.  We do this since we cannot use a
+   native mpn_sqr_basecase over TUNE_SQR_TOOM2_MAX, or a non-native one over
+   SQR_TOOM2_THRESHOLD.  This is so because of fixed size stack allocations
+   made inside mpn_sqr_basecase.  */
+
+#if ! HAVE_NATIVE_mpn_sqr_basecase
+/* The limit of the generic code is SQR_TOOM2_THRESHOLD.  */
+#define SQR_BASECASE_LIM  SQR_TOOM2_THRESHOLD
+#endif
+
+#if HAVE_NATIVE_mpn_sqr_basecase
+#ifdef TUNE_SQR_TOOM2_MAX
+/* We slightly abuse TUNE_SQR_TOOM2_MAX here.  If it is set for an assembly
+   mpn_sqr_basecase, it comes from SQR_TOOM2_THRESHOLD_MAX in the assembly
+   file.  An assembly mpn_sqr_basecase that does not define it should allow
+   any size.  */
+#define SQR_BASECASE_LIM  SQR_TOOM2_THRESHOLD
+#endif
+#endif
+
+#ifdef WANT_FAT_BINARY
+/* For fat builds, we use SQR_TOOM2_THRESHOLD which will expand to a read from
+   __gmpn_cpuvec.  Perhaps any possible sqr_basecase.asm allow any size, and we
+   limit the use unnecessarily.  We cannot tell, so play it safe.  FIXME.  */
+#define SQR_BASECASE_LIM  SQR_TOOM2_THRESHOLD
+#endif
+
+#ifndef SQR_BASECASE_LIM
+/* If SQR_BASECASE_LIM is now not defined, use mpn_sqr_basecase for any operand
+   size.  */
+#define SQR_BASECASE_LIM  MP_SIZE_T_MAX
+#endif
+
+#define mpn_local_sqr(rp,up,n)						\
+  do {									\
+    if (ABOVE_THRESHOLD (n, SQR_BASECASE_THRESHOLD)			\
+	&& BELOW_THRESHOLD (n, SQR_BASECASE_LIM))			\
+      mpn_sqr_basecase (rp, up, n);					\
+    else								\
+      mpn_mul_basecase(rp, up, n, up, n);				\
+  } while (0)
+
+#define getbit(p,bi) \
+  ((p[(bi - 1) / GMP_NUMB_BITS] >> (bi - 1) % GMP_NUMB_BITS) & 1)
+
+/* FIXME: Maybe some things would get simpler if all callers ensure
+   that bi >= nbits. As far as I understand, with the current code bi
+   < nbits can happen only for the final iteration. */
+static inline mp_limb_t
+getbits (const mp_limb_t *p, mp_bitcnt_t bi, int nbits)
+{
+  int nbits_in_r;
+  mp_limb_t r;
+  mp_size_t i;
+
+  if (bi < nbits)
+    {
+      return p[0] & (((mp_limb_t) 1 << bi) - 1);
+    }
+  else
+    {
+      bi -= nbits;			/* bit index of low bit to extract */
+      i = bi / GMP_NUMB_BITS;		/* word index of low bit to extract */
+      bi %= GMP_NUMB_BITS;		/* bit index in low word */
+      r = p[i] >> bi;			/* extract (low) bits */
+      nbits_in_r = GMP_NUMB_BITS - bi;	/* number of bits now in r */
+      if (nbits_in_r < nbits)		/* did we get enough bits? */
+	r += p[i + 1] << nbits_in_r;	/* prepend bits from higher word */
+      return r & (((mp_limb_t ) 1 << nbits) - 1);
+    }
+}
+
+#ifndef POWM_SEC_TABLE
+#if GMP_NUMB_BITS < 50
+#define POWM_SEC_TABLE  2,33,96,780,2741
+#else
+#define POWM_SEC_TABLE  2,130,524,2578
+#endif
+#endif
+
+#if TUNE_PROGRAM_BUILD
+extern int win_size (mp_bitcnt_t);
+#else
+static inline int
+win_size (mp_bitcnt_t enb)
+{
+  int k;
+  /* Find k, such that x[k-1] < enb <= x[k].
+
+     We require that x[k] >= k, then it follows that enb > x[k-1] >=
+     k-1, which implies k <= enb.
+  */
+  static const mp_bitcnt_t x[] = {0,POWM_SEC_TABLE,~(mp_bitcnt_t)0};
+  for (k = 1; enb > x[k]; k++)
+    ;
+  ASSERT (k <= enb);
+  return k;
+}
+#endif
+
+/* Convert U to REDC form, U_r = B^n * U mod M.
+   Uses scratch space at tp of size 2un + n + 1.  */
+static void
+redcify (mp_ptr rp, mp_srcptr up, mp_size_t un, mp_srcptr mp, mp_size_t n, mp_ptr tp)
+{
+  MPN_ZERO (tp, n);
+  MPN_COPY (tp + n, up, un);
+
+  mpn_sec_div_r (tp, un + n, mp, n, tp + un + n);
+  MPN_COPY (rp, tp, n);
+}
+
+/* {rp, n} <-- {bp, bn} ^ {ep, en} mod {mp, n},
+   where en = ceil (enb / GMP_NUMB_BITS)
+   Requires that {mp, n} is odd (and hence also mp[0] odd).
+   Uses scratch space at tp as defined by mpn_sec_powm_itch.  */
+void
+mpn_sec_powm (mp_ptr rp, mp_srcptr bp, mp_size_t bn,
+	      mp_srcptr ep, mp_bitcnt_t enb,
+	      mp_srcptr mp, mp_size_t n, mp_ptr tp)
+{
+  mp_limb_t ip[2], *mip;
+  int windowsize, this_windowsize;
+  mp_limb_t expbits;
+  mp_ptr pp, this_pp, ps;
+  long i;
+  int cnd;
+
+  ASSERT (enb > 0);
+  ASSERT (n > 0);
+  /* The code works for bn = 0, but the defined scratch space is 2 limbs
+     greater than we supply, when converting 1 to redc form .  */
+  ASSERT (bn > 0);
+  ASSERT ((mp[0] & 1) != 0);
+
+  windowsize = win_size (enb);
+
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+    {
+      mip = ip;
+      binvert_limb (mip[0], mp[0]);
+      mip[0] = -mip[0];
+    }
+  else
+    {
+      mip = ip;
+      mpn_binvert (mip, mp, 2, tp);
+      mip[0] = -mip[0]; mip[1] = ~mip[1];
+    }
+
+  pp = tp;
+  tp += (n << windowsize);	/* put tp after power table */
+
+  /* Compute pp[0] table entry */
+  /* scratch: |   n   | 1 |   n+2    |  */
+  /*          | pp[0] | 1 | redcify  |  */
+  this_pp = pp;
+  this_pp[n] = 1;
+  redcify (this_pp, this_pp + n, 1, mp, n, this_pp + n + 1);
+  this_pp += n;
+
+  /* Compute pp[1] table entry.  To avoid excessive scratch usage in the
+     degenerate situation where B >> M, we let redcify use scratch space which
+     will later be used by the pp table (element 2 and up).  */
+  /* scratch: |   n   |   n   |  bn + n + 1  |  */
+  /*          | pp[0] | pp[1] |   redcify    |  */
+  redcify (this_pp, bp, bn, mp, n, this_pp + n);
+
+  /* Precompute powers of b and put them in the temporary area at pp.  */
+  /* scratch: |   n   |   n   | ...  |                    |   2n      |  */
+  /*          | pp[0] | pp[1] | ...  | pp[2^windowsize-1] |  product  |  */
+  ps = pp + n;		/* initially B^1 */
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+    {
+      for (i = (1 << windowsize) - 2; i > 0; i -= 2)
+	{
+	  mpn_local_sqr (tp, ps, n);
+	  ps += n;
+	  this_pp += n;
+	  MPN_REDC_1_SEC (this_pp, tp, mp, n, mip[0]);
+
+	  mpn_mul_basecase (tp, this_pp, n, pp + n, n);
+	  this_pp += n;
+	  MPN_REDC_1_SEC (this_pp, tp, mp, n, mip[0]);
+	}
+    }
+  else
+    {
+      for (i = (1 << windowsize) - 2; i > 0; i -= 2)
+	{
+	  mpn_local_sqr (tp, ps, n);
+	  ps += n;
+	  this_pp += n;
+	  MPN_REDC_2_SEC (this_pp, tp, mp, n, mip);
+
+	  mpn_mul_basecase (tp, this_pp, n, pp + n, n);
+	  this_pp += n;
+	  MPN_REDC_2_SEC (this_pp, tp, mp, n, mip);
+	}
+    }
+
+  expbits = getbits (ep, enb, windowsize);
+  ASSERT_ALWAYS (enb >= windowsize);
+  enb -= windowsize;
+
+  mpn_sec_tabselect (rp, pp, n, 1 << windowsize, expbits);
+
+  /* Main exponentiation loop.  */
+  /* scratch: |   n   |   n   | ...  |                    |     3n-4n     |  */
+  /*          | pp[0] | pp[1] | ...  | pp[2^windowsize-1] |  loop scratch |  */
+
+#define INNERLOOP							\
+  while (enb != 0)							\
+    {									\
+      expbits = getbits (ep, enb, windowsize);				\
+      this_windowsize = windowsize;					\
+      if (enb < windowsize)						\
+	{								\
+	  this_windowsize -= windowsize - enb;				\
+	  enb = 0;							\
+	}								\
+      else								\
+	enb -= windowsize;						\
+									\
+      do								\
+	{								\
+	  mpn_local_sqr (tp, rp, n);					\
+	  MPN_REDUCE (rp, tp, mp, n, mip);				\
+	  this_windowsize--;						\
+	}								\
+      while (this_windowsize != 0);					\
+									\
+      mpn_sec_tabselect (tp + 2*n, pp, n, 1 << windowsize, expbits);	\
+      mpn_mul_basecase (tp, rp, n, tp + 2*n, n);			\
+									\
+      MPN_REDUCE (rp, tp, mp, n, mip);					\
+    }
+
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+    {
+#undef MPN_REDUCE
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_1_SEC (rp, tp, mp, n, mip[0])
+      INNERLOOP;
+    }
+  else
+    {
+#undef MPN_REDUCE
+#define MPN_REDUCE(rp,tp,mp,n,mip)	MPN_REDC_2_SEC (rp, tp, mp, n, mip)
+      INNERLOOP;
+    }
+
+  MPN_COPY (tp, rp, n);
+  MPN_ZERO (tp + n, n);
+
+  if (BELOW_THRESHOLD (n, REDC_1_TO_REDC_2_THRESHOLD))
+    MPN_REDC_1_SEC (rp, tp, mp, n, mip[0]);
+  else
+    MPN_REDC_2_SEC (rp, tp, mp, n, mip);
+
+  cnd = mpn_sub_n (tp, rp, mp, n);	/* we need just retval */
+  mpn_cnd_sub_n (!cnd, rp, rp, mp, n);
+}
+
+mp_size_t
+mpn_sec_powm_itch (mp_size_t bn, mp_bitcnt_t enb, mp_size_t n)
+{
+  int windowsize;
+  mp_size_t redcify_itch, itch;
+
+  /* FIXME: no more _local/_basecase difference. */
+  /* The top scratch usage will either be when reducing B in the 2nd redcify
+     call, or more typically n*2^windowsize + 3n or 4n, in the main loop.  (It
+     is 3n or 4n depending on if we use mpn_local_sqr or a native
+     mpn_sqr_basecase.  We assume 4n always for now.) */
+
+  windowsize = win_size (enb);
+
+  /* The 2n term is due to pp[0] and pp[1] at the time of the 2nd redcify call,
+     the (bn + n) term is due to redcify's own usage, and the rest is due to
+     mpn_sec_div_r's usage when called from redcify.  */
+  redcify_itch = (2 * n) + (bn + n) + ((bn + n) + 2 * n + 2);
+
+  /* The n * 2^windowsize term is due to the power table, the 4n term is due to
+     scratch needs of squaring/multiplication in the exponentiation loop.  */
+  itch = (n << windowsize) + (4 * n);
+
+  return MAX (itch, redcify_itch);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sqr.c
deleted file mode 120000
index 4becde2ea..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_sqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sqr.c
new file mode 100644
index 000000000..83fc7d96a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sqr.c
@@ -0,0 +1,76 @@
+/* mpn_sec_sqr.
+
+   Contributed to the GNU project by Torbjörn Granlund.
+
+Copyright 2013, 2014 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if ! HAVE_NATIVE_mpn_sqr_basecase
+/* The limit of the generic code is SQR_TOOM2_THRESHOLD.  */
+#define SQR_BASECASE_LIM  SQR_TOOM2_THRESHOLD
+#endif
+
+#if HAVE_NATIVE_mpn_sqr_basecase
+#ifdef TUNE_SQR_TOOM2_MAX
+/* We slightly abuse TUNE_SQR_TOOM2_MAX here.  If it is set for an assembly
+   mpn_sqr_basecase, it comes from SQR_TOOM2_THRESHOLD_MAX in the assembly
+   file.  An assembly mpn_sqr_basecase that does not define it should allow
+   any size.  */
+#define SQR_BASECASE_LIM  SQR_TOOM2_THRESHOLD
+#endif
+#endif
+
+#ifdef WANT_FAT_BINARY
+/* For fat builds, we use SQR_TOOM2_THRESHOLD which will expand to a read from
+   __gmpn_cpuvec.  Perhaps any possible sqr_basecase.asm allow any size, and we
+   limit the use unnecessarily.  We cannot tell, so play it safe.  FIXME.  */
+#define SQR_BASECASE_LIM  SQR_TOOM2_THRESHOLD
+#endif
+
+void
+mpn_sec_sqr (mp_ptr rp,
+	     mp_srcptr ap, mp_size_t an,
+	     mp_ptr tp)
+{
+#ifndef SQR_BASECASE_LIM
+/* If SQR_BASECASE_LIM is now not defined, use mpn_sqr_basecase for any operand
+   size.  */
+  mpn_sqr_basecase (rp, ap, an);
+#else
+/* Else use mpn_mul_basecase.  */
+  mpn_mul_basecase (rp, ap, an, ap, an);
+#endif
+}
+
+mp_size_t
+mpn_sec_sqr_itch (mp_size_t an)
+{
+  return 0;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sub_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sub_1.c
deleted file mode 120000
index 5fde85170..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sub_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_aors_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sub_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sub_1.c
new file mode 100644
index 000000000..6480fa1bf
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_sub_1.c
@@ -0,0 +1,59 @@
+/* mpn_sec_add_1, mpn_sec_sub_1
+
+   Contributed to the GNU project by Niels Möller
+
+Copyright 2013, 2014 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if OPERATION_sec_add_1
+#define FNAME mpn_sec_add_1
+#define FNAME_itch mpn_sec_add_1_itch
+#define OP_N mpn_add_n
+#endif
+#if OPERATION_sec_sub_1
+#define FNAME mpn_sec_sub_1
+#define FNAME_itch mpn_sec_sub_1_itch
+#define OP_N mpn_sub_n
+#endif
+
+/* It's annoying to that we need scratch space */
+mp_size_t
+FNAME_itch (mp_size_t n)
+{
+  return n;
+}
+
+mp_limb_t
+FNAME (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b, mp_ptr scratch)
+{
+  scratch[0] = b;
+  MPN_ZERO (scratch + 1, n-1);
+  return OP_N (rp, ap, scratch, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_tabselect.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_tabselect.c
deleted file mode 120000
index fdde7a413..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_tabselect.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sec_tabselect.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_tabselect.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_tabselect.c
new file mode 100644
index 000000000..5767e2735
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sec_tabselect.c
@@ -0,0 +1,54 @@
+/* mpn_sec_tabselect.
+
+Copyright 2007-2009, 2011, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+/* Select entry `which' from table `tab', which has nents entries, each `n'
+   limbs.  Store the selected entry at rp.  Reads entire table to avoid
+   side-channel information leaks.  O(n*nents).  */
+void
+mpn_sec_tabselect (volatile mp_limb_t *rp, volatile const mp_limb_t *tab,
+		   mp_size_t n, mp_size_t nents, mp_size_t which)
+{
+  mp_size_t k, i;
+  mp_limb_t mask;
+  volatile const mp_limb_t *tp;
+
+  for (k = 0; k < nents; k++)
+    {
+      mask = -(mp_limb_t) (which == k);
+      tp = tab + n * k;
+      for (i = 0; i < n; i++)
+	{
+	  rp[i] = (rp[i] & ~mask) | (tp[i] & mask);
+	}
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/set_str.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/set_str.c
deleted file mode 120000
index 93864554d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/set_str.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/set_str.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/set_str.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/set_str.c
new file mode 100644
index 000000000..33fc29cbc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/set_str.c
@@ -0,0 +1,292 @@
+/* mpn_set_str (mp_ptr res_ptr, const char *str, size_t str_len, int base) --
+   Convert a STR_LEN long base BASE byte string pointed to by STR to a limb
+   vector pointed to by RES_PTR.  Return the number of limbs in RES_PTR.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTIONS IN THIS FILE, EXCEPT mpn_set_str, ARE INTERNAL WITH MUTABLE
+   INTERFACES.  IT IS ONLY SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.
+   IN FACT, IT IS ALMOST GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A
+   FUTURE GNU MP RELEASE.
+
+Copyright 1991-2017 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/* TODO:
+
+      Perhaps do not compute the highest power?
+      Instead, multiply twice by the 2nd highest power:
+
+	       _______
+	      |_______|  hp
+	      |_______|  pow
+       _______________
+      |_______________|  final result
+
+
+	       _______
+	      |_______|  hp
+		  |___|  pow[-1]
+	   ___________
+	  |___________|  intermediate result
+		  |___|  pow[-1]
+       _______________
+      |_______________|  final result
+
+      Generalizing that idea, perhaps we should make powtab contain successive
+      cubes, not squares.
+*/
+
+#include "gmp-impl.h"
+
+mp_size_t
+mpn_set_str (mp_ptr rp, const unsigned char *str, size_t str_len, int base)
+{
+  if (POW2_P (base))
+    {
+      /* The base is a power of 2.  Read the input string from least to most
+	 significant character/digit.  */
+
+      const unsigned char *s;
+      int next_bitpos;
+      mp_limb_t res_digit;
+      mp_size_t size;
+      int bits_per_indigit = mp_bases[base].big_base;
+
+      size = 0;
+      res_digit = 0;
+      next_bitpos = 0;
+
+      for (s = str + str_len - 1; s >= str; s--)
+	{
+	  int inp_digit = *s;
+
+	  res_digit |= ((mp_limb_t) inp_digit << next_bitpos) & GMP_NUMB_MASK;
+	  next_bitpos += bits_per_indigit;
+	  if (next_bitpos >= GMP_NUMB_BITS)
+	    {
+	      rp[size++] = res_digit;
+	      next_bitpos -= GMP_NUMB_BITS;
+	      res_digit = inp_digit >> (bits_per_indigit - next_bitpos);
+	    }
+	}
+
+      if (res_digit != 0)
+	rp[size++] = res_digit;
+      return size;
+    }
+
+  if (BELOW_THRESHOLD (str_len, SET_STR_PRECOMPUTE_THRESHOLD))
+    return mpn_bc_set_str (rp, str, str_len, base);
+  else
+    {
+      mp_ptr powtab_mem, tp;
+      powers_t powtab[GMP_LIMB_BITS];
+      int chars_per_limb;
+      powers_t *pt;
+      size_t n_pows;
+      mp_size_t size;
+      mp_size_t un;
+      TMP_DECL;
+
+      TMP_MARK;
+
+      chars_per_limb = mp_bases[base].chars_per_limb;
+
+      un = str_len / chars_per_limb + 1; /* FIXME: scalar integer division */
+
+      /* Allocate one large block for the powers of big_base.  */
+      powtab_mem = TMP_BALLOC_LIMBS (mpn_str_powtab_alloc (un));
+
+      n_pows = mpn_compute_powtab (powtab, powtab_mem, un, base);
+      pt = powtab + n_pows;
+
+      tp = TMP_BALLOC_LIMBS (mpn_dc_set_str_itch (un));
+      size = mpn_dc_set_str (rp, str, str_len, pt, tp);
+
+      TMP_FREE;
+      return size;
+    }
+}
+
+mp_size_t
+mpn_dc_set_str (mp_ptr rp, const unsigned char *str, size_t str_len,
+		const powers_t *powtab, mp_ptr tp)
+{
+  size_t len_lo, len_hi;
+  mp_limb_t cy;
+  mp_size_t ln, hn, n, sn;
+
+  len_lo = powtab->digits_in_base;
+
+  if (str_len <= len_lo)
+    {
+      if (BELOW_THRESHOLD (str_len, SET_STR_DC_THRESHOLD))
+	return mpn_bc_set_str (rp, str, str_len, powtab->base);
+      else
+	return mpn_dc_set_str (rp, str, str_len, powtab - 1, tp);
+    }
+
+  len_hi = str_len - len_lo;
+  ASSERT (len_lo >= len_hi);
+
+  if (BELOW_THRESHOLD (len_hi, SET_STR_DC_THRESHOLD))
+    hn = mpn_bc_set_str (tp, str, len_hi, powtab->base);
+  else
+    hn = mpn_dc_set_str (tp, str, len_hi, powtab - 1, rp);
+
+  sn = powtab->shift;
+
+  if (hn == 0)
+    {
+      /* Zero +1 limb here, to avoid reading an allocated but uninitialised
+	 limb in mpn_incr_u below.  */
+      MPN_ZERO (rp, powtab->n + sn + 1);
+    }
+  else
+    {
+      if (powtab->n > hn)
+	mpn_mul (rp + sn, powtab->p, powtab->n, tp, hn);
+      else
+	mpn_mul (rp + sn, tp, hn, powtab->p, powtab->n);
+      MPN_ZERO (rp, sn);
+    }
+
+  str = str + str_len - len_lo;
+  if (BELOW_THRESHOLD (len_lo, SET_STR_DC_THRESHOLD))
+    ln = mpn_bc_set_str (tp, str, len_lo, powtab->base);
+  else
+    ln = mpn_dc_set_str (tp, str, len_lo, powtab - 1, tp + powtab->n + sn + 1);
+
+  if (ln != 0)
+    {
+      cy = mpn_add_n (rp, rp, tp, ln);
+      mpn_incr_u (rp + ln, cy);
+    }
+  n = hn + powtab->n + sn;
+  return n - (rp[n - 1] == 0);
+}
+
+mp_size_t
+mpn_bc_set_str (mp_ptr rp, const unsigned char *str, size_t str_len, int base)
+{
+  mp_size_t size;
+  size_t i;
+  long j;
+  mp_limb_t cy_limb;
+
+  mp_limb_t big_base;
+  int chars_per_limb;
+  mp_limb_t res_digit;
+
+  ASSERT (base >= 2);
+  ASSERT (base < numberof (mp_bases));
+  ASSERT (str_len >= 1);
+
+  big_base = mp_bases[base].big_base;
+  chars_per_limb = mp_bases[base].chars_per_limb;
+
+  size = 0;
+  for (i = chars_per_limb; i < str_len; i += chars_per_limb)
+    {
+      res_digit = *str++;
+      if (base == 10)
+	{ /* This is a common case.
+	     Help the compiler to avoid multiplication.  */
+	  for (j = MP_BASES_CHARS_PER_LIMB_10 - 1; j != 0; j--)
+	    res_digit = res_digit * 10 + *str++;
+	}
+      else
+	{
+	  for (j = chars_per_limb - 1; j != 0; j--)
+	    res_digit = res_digit * base + *str++;
+	}
+
+      if (size == 0)
+	{
+	  if (res_digit != 0)
+	    {
+	      rp[0] = res_digit;
+	      size = 1;
+	    }
+	}
+      else
+	{
+#if HAVE_NATIVE_mpn_mul_1c
+	  cy_limb = mpn_mul_1c (rp, rp, size, big_base, res_digit);
+#else
+	  cy_limb = mpn_mul_1 (rp, rp, size, big_base);
+	  cy_limb += mpn_add_1 (rp, rp, size, res_digit);
+#endif
+	  if (cy_limb != 0)
+	    rp[size++] = cy_limb;
+	}
+    }
+
+  big_base = base;
+  res_digit = *str++;
+  if (base == 10)
+    { /* This is a common case.
+	 Help the compiler to avoid multiplication.  */
+      for (j = str_len - (i - MP_BASES_CHARS_PER_LIMB_10) - 1; j > 0; j--)
+	{
+	  res_digit = res_digit * 10 + *str++;
+	  big_base *= 10;
+	}
+    }
+  else
+    {
+      for (j = str_len - (i - chars_per_limb) - 1; j > 0; j--)
+	{
+	  res_digit = res_digit * base + *str++;
+	  big_base *= base;
+	}
+    }
+
+  if (size == 0)
+    {
+      if (res_digit != 0)
+	{
+	  rp[0] = res_digit;
+	  size = 1;
+	}
+    }
+  else
+    {
+#if HAVE_NATIVE_mpn_mul_1c
+      cy_limb = mpn_mul_1c (rp, rp, size, big_base, res_digit);
+#else
+      cy_limb = mpn_mul_1 (rp, rp, size, big_base);
+      cy_limb += mpn_add_1 (rp, rp, size, res_digit);
+#endif
+      if (cy_limb != 0)
+	rp[size++] = cy_limb;
+    }
+  return size;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sizeinbase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sizeinbase.c
deleted file mode 120000
index c6a7cd877..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sizeinbase.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sizeinbase.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sizeinbase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sizeinbase.c
new file mode 100644
index 000000000..faee947fd
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sizeinbase.c
@@ -0,0 +1,49 @@
+/* mpn_sizeinbase -- approximation to chars required for an mpn.
+
+   THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY.  THEY'RE ALMOST
+   CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
+   FUTURE GNU MP RELEASES.
+
+Copyright 1991, 1993-1995, 2001, 2002, 2011, 2012 Free Software Foundation,
+Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+/* Same as mpz_sizeinbase, meaning exact for power-of-2 bases, and either
+   exact or 1 too big for other bases.  */
+
+size_t
+mpn_sizeinbase (mp_srcptr xp, mp_size_t xsize, int base)
+{
+  size_t  result;
+  MPN_SIZEINBASE (result, xp, xsize, base);
+  return result;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr.c
deleted file mode 120000
index 5264cae30..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr.c
new file mode 100644
index 000000000..74fbff05c
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr.c
@@ -0,0 +1,98 @@
+/* mpn_sqr -- square natural numbers.
+
+Copyright 1991, 1993, 1994, 1996-2003, 2005, 2008, 2009 Free Software
+Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+void
+mpn_sqr (mp_ptr p, mp_srcptr a, mp_size_t n)
+{
+  ASSERT (n >= 1);
+  ASSERT (! MPN_OVERLAP_P (p, 2 * n, a, n));
+
+  if (BELOW_THRESHOLD (n, SQR_BASECASE_THRESHOLD))
+    { /* mul_basecase is faster than sqr_basecase on small sizes sometimes */
+      mpn_mul_basecase (p, a, n, a, n);
+    }
+  else if (BELOW_THRESHOLD (n, SQR_TOOM2_THRESHOLD))
+    {
+      mpn_sqr_basecase (p, a, n);
+    }
+  else if (BELOW_THRESHOLD (n, SQR_TOOM3_THRESHOLD))
+    {
+      /* Allocate workspace of fixed size on stack: fast! */
+      mp_limb_t ws[mpn_toom2_sqr_itch (SQR_TOOM3_THRESHOLD_LIMIT-1)];
+      ASSERT (SQR_TOOM3_THRESHOLD <= SQR_TOOM3_THRESHOLD_LIMIT);
+      mpn_toom2_sqr (p, a, n, ws);
+    }
+  else if (BELOW_THRESHOLD (n, SQR_TOOM4_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_SDECL;
+      TMP_SMARK;
+      ws = TMP_SALLOC_LIMBS (mpn_toom3_sqr_itch (n));
+      mpn_toom3_sqr (p, a, n, ws);
+      TMP_SFREE;
+    }
+  else if (BELOW_THRESHOLD (n, SQR_TOOM6_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_SDECL;
+      TMP_SMARK;
+      ws = TMP_SALLOC_LIMBS (mpn_toom4_sqr_itch (n));
+      mpn_toom4_sqr (p, a, n, ws);
+      TMP_SFREE;
+    }
+  else if (BELOW_THRESHOLD (n, SQR_TOOM8_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_SDECL;
+      TMP_SMARK;
+      ws = TMP_SALLOC_LIMBS (mpn_toom6_sqr_itch (n));
+      mpn_toom6_sqr (p, a, n, ws);
+      TMP_SFREE;
+    }
+  else if (BELOW_THRESHOLD (n, SQR_FFT_THRESHOLD))
+    {
+      mp_ptr ws;
+      TMP_DECL;
+      TMP_MARK;
+      ws = TMP_ALLOC_LIMBS (mpn_toom8_sqr_itch (n));
+      mpn_toom8_sqr (p, a, n, ws);
+      TMP_FREE;
+    }
+  else
+    {
+      /* The current FFT code allocates its own space.  That should probably
+	 change.  */
+      mpn_fft_mul (p, a, n, a, n);
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr_basecase.c
deleted file mode 120000
index fb8a1f80c..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr_basecase.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sqr_basecase.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr_basecase.c
new file mode 100644
index 000000000..2645badfa
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqr_basecase.c
@@ -0,0 +1,361 @@
+/* mpn_sqr_basecase -- Internal routine to square a natural number
+   of length n.
+
+   THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
+
+
+Copyright 1991-1994, 1996, 1997, 2000-2005, 2008, 2010, 2011, 2017 Free
+Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+#if HAVE_NATIVE_mpn_sqr_diagonal
+#define MPN_SQR_DIAGONAL(rp, up, n)					\
+  mpn_sqr_diagonal (rp, up, n)
+#else
+#define MPN_SQR_DIAGONAL(rp, up, n)					\
+  do {									\
+    mp_size_t _i;							\
+    for (_i = 0; _i < (n); _i++)					\
+      {									\
+	mp_limb_t ul, lpl;						\
+	ul = (up)[_i];							\
+	umul_ppmm ((rp)[2 * _i + 1], lpl, ul, ul << GMP_NAIL_BITS);	\
+	(rp)[2 * _i] = lpl >> GMP_NAIL_BITS;				\
+      }									\
+  } while (0)
+#endif
+
+#if HAVE_NATIVE_mpn_sqr_diag_addlsh1
+#define MPN_SQR_DIAG_ADDLSH1(rp, tp, up, n)				\
+  mpn_sqr_diag_addlsh1 (rp, tp, up, n)
+#else
+#if HAVE_NATIVE_mpn_addlsh1_n
+#define MPN_SQR_DIAG_ADDLSH1(rp, tp, up, n)				\
+  do {									\
+    mp_limb_t cy;							\
+    MPN_SQR_DIAGONAL (rp, up, n);					\
+    cy = mpn_addlsh1_n (rp + 1, rp + 1, tp, 2 * n - 2);			\
+    rp[2 * n - 1] += cy;						\
+  } while (0)
+#else
+#define MPN_SQR_DIAG_ADDLSH1(rp, tp, up, n)				\
+  do {									\
+    mp_limb_t cy;							\
+    MPN_SQR_DIAGONAL (rp, up, n);					\
+    cy = mpn_lshift (tp, tp, 2 * n - 2, 1);				\
+    cy += mpn_add_n (rp + 1, rp + 1, tp, 2 * n - 2);			\
+    rp[2 * n - 1] += cy;						\
+  } while (0)
+#endif
+#endif
+
+
+#undef READY_WITH_mpn_sqr_basecase
+
+
+#if ! defined (READY_WITH_mpn_sqr_basecase) && HAVE_NATIVE_mpn_addmul_2s
+void
+mpn_sqr_basecase (mp_ptr rp, mp_srcptr up, mp_size_t n)
+{
+  mp_size_t i;
+  mp_limb_t tarr[2 * SQR_TOOM2_THRESHOLD];
+  mp_ptr tp = tarr;
+  mp_limb_t cy;
+
+  /* must fit 2*n limbs in tarr */
+  ASSERT (n <= SQR_TOOM2_THRESHOLD);
+
+  if ((n & 1) != 0)
+    {
+      if (n == 1)
+	{
+	  mp_limb_t ul, lpl;
+	  ul = up[0];
+	  umul_ppmm (rp[1], lpl, ul, ul << GMP_NAIL_BITS);
+	  rp[0] = lpl >> GMP_NAIL_BITS;
+	  return;
+	}
+
+      MPN_ZERO (tp, n);
+
+      for (i = 0; i <= n - 2; i += 2)
+	{
+	  cy = mpn_addmul_2s (tp + 2 * i, up + i + 1, n - (i + 1), up + i);
+	  tp[n + i] = cy;
+	}
+    }
+  else
+    {
+      if (n == 2)
+	{
+#if HAVE_NATIVE_mpn_mul_2
+	  rp[3] = mpn_mul_2 (rp, up, 2, up);
+#else
+	  rp[0] = 0;
+	  rp[1] = 0;
+	  rp[3] = mpn_addmul_2 (rp, up, 2, up);
+#endif
+	  return;
+	}
+
+      MPN_ZERO (tp, n);
+
+      for (i = 0; i <= n - 4; i += 2)
+	{
+	  cy = mpn_addmul_2s (tp + 2 * i, up + i + 1, n - (i + 1), up + i);
+	  tp[n + i] = cy;
+	}
+      cy = mpn_addmul_1 (tp + 2 * n - 4, up + n - 1, 1, up[n - 2]);
+      tp[2 * n - 3] = cy;
+    }
+
+  MPN_SQR_DIAG_ADDLSH1 (rp, tp, up, n);
+}
+#define READY_WITH_mpn_sqr_basecase
+#endif
+
+
+#if ! defined (READY_WITH_mpn_sqr_basecase) && HAVE_NATIVE_mpn_addmul_2
+
+/* mpn_sqr_basecase using plain mpn_addmul_2.
+
+   This is tricky, since we have to let mpn_addmul_2 make some undesirable
+   multiplies, u[k]*u[k], that we would like to let mpn_sqr_diagonal handle.
+   This forces us to conditionally add or subtract the mpn_sqr_diagonal
+   results.  Examples of the product we form:
+
+   n = 4              n = 5		n = 6
+   u1u0 * u3u2u1      u1u0 * u4u3u2u1	u1u0 * u5u4u3u2u1
+   u2 * u3	      u3u2 * u4u3	u3u2 * u5u4u3
+					u4 * u5
+   add: u0 u2 u3      add: u0 u2 u4	add: u0 u2 u4 u5
+   sub: u1	      sub: u1 u3	sub: u1 u3
+*/
+
+void
+mpn_sqr_basecase (mp_ptr rp, mp_srcptr up, mp_size_t n)
+{
+  mp_size_t i;
+  mp_limb_t tarr[2 * SQR_TOOM2_THRESHOLD];
+  mp_ptr tp = tarr;
+  mp_limb_t cy;
+
+  /* must fit 2*n limbs in tarr */
+  ASSERT (n <= SQR_TOOM2_THRESHOLD);
+
+  if ((n & 1) != 0)
+    {
+      mp_limb_t x0, x1;
+
+      if (n == 1)
+	{
+	  mp_limb_t ul, lpl;
+	  ul = up[0];
+	  umul_ppmm (rp[1], lpl, ul, ul << GMP_NAIL_BITS);
+	  rp[0] = lpl >> GMP_NAIL_BITS;
+	  return;
+	}
+
+      /* The code below doesn't like unnormalized operands.  Since such
+	 operands are unusual, handle them with a dumb recursion.  */
+      if (up[n - 1] == 0)
+	{
+	  rp[2 * n - 2] = 0;
+	  rp[2 * n - 1] = 0;
+	  mpn_sqr_basecase (rp, up, n - 1);
+	  return;
+	}
+
+      MPN_ZERO (tp, n);
+
+      for (i = 0; i <= n - 2; i += 2)
+	{
+	  cy = mpn_addmul_2 (tp + 2 * i, up + i + 1, n - (i + 1), up + i);
+	  tp[n + i] = cy;
+	}
+
+      MPN_SQR_DIAGONAL (rp, up, n);
+
+      for (i = 2;; i += 4)
+	{
+	  x0 = rp[i + 0];
+	  rp[i + 0] = (-x0) & GMP_NUMB_MASK;
+	  x1 = rp[i + 1];
+	  rp[i + 1] = (-x1 - (x0 != 0)) & GMP_NUMB_MASK;
+	  __GMPN_SUB_1 (cy, rp + i + 2, rp + i + 2, 2, (x1 | x0) != 0);
+	  if (i + 4 >= 2 * n)
+	    break;
+	  mpn_incr_u (rp + i + 4, cy);
+	}
+    }
+  else
+    {
+      mp_limb_t x0, x1;
+
+      if (n == 2)
+	{
+#if HAVE_NATIVE_mpn_mul_2
+	  rp[3] = mpn_mul_2 (rp, up, 2, up);
+#else
+	  rp[0] = 0;
+	  rp[1] = 0;
+	  rp[3] = mpn_addmul_2 (rp, up, 2, up);
+#endif
+	  return;
+	}
+
+      /* The code below doesn't like unnormalized operands.  Since such
+	 operands are unusual, handle them with a dumb recursion.  */
+      if (up[n - 1] == 0)
+	{
+	  rp[2 * n - 2] = 0;
+	  rp[2 * n - 1] = 0;
+	  mpn_sqr_basecase (rp, up, n - 1);
+	  return;
+	}
+
+      MPN_ZERO (tp, n);
+
+      for (i = 0; i <= n - 4; i += 2)
+	{
+	  cy = mpn_addmul_2 (tp + 2 * i, up + i + 1, n - (i + 1), up + i);
+	  tp[n + i] = cy;
+	}
+      cy = mpn_addmul_1 (tp + 2 * n - 4, up + n - 1, 1, up[n - 2]);
+      tp[2 * n - 3] = cy;
+
+      MPN_SQR_DIAGONAL (rp, up, n);
+
+      for (i = 2;; i += 4)
+	{
+	  x0 = rp[i + 0];
+	  rp[i + 0] = (-x0) & GMP_NUMB_MASK;
+	  x1 = rp[i + 1];
+	  rp[i + 1] = (-x1 - (x0 != 0)) & GMP_NUMB_MASK;
+	  if (i + 6 >= 2 * n)
+	    break;
+	  __GMPN_SUB_1 (cy, rp + i + 2, rp + i + 2, 2, (x1 | x0) != 0);
+	  mpn_incr_u (rp + i + 4, cy);
+	}
+      mpn_decr_u (rp + i + 2, (x1 | x0) != 0);
+    }
+
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy = mpn_addlsh1_n (rp + 1, rp + 1, tp, 2 * n - 2);
+#else
+  cy = mpn_lshift (tp, tp, 2 * n - 2, 1);
+  cy += mpn_add_n (rp + 1, rp + 1, tp, 2 * n - 2);
+#endif
+  rp[2 * n - 1] += cy;
+}
+#define READY_WITH_mpn_sqr_basecase
+#endif
+
+
+#if ! defined (READY_WITH_mpn_sqr_basecase) && HAVE_NATIVE_mpn_sqr_diag_addlsh1
+
+/* mpn_sqr_basecase using mpn_addmul_1 and mpn_sqr_diag_addlsh1, avoiding stack
+   allocation.  */
+void
+mpn_sqr_basecase (mp_ptr rp, mp_srcptr up, mp_size_t n)
+{
+  if (n == 1)
+    {
+      mp_limb_t ul, lpl;
+      ul = up[0];
+      umul_ppmm (rp[1], lpl, ul, ul << GMP_NAIL_BITS);
+      rp[0] = lpl >> GMP_NAIL_BITS;
+    }
+  else
+    {
+      mp_size_t i;
+      mp_ptr xp;
+
+      rp += 1;
+      rp[n - 1] = mpn_mul_1 (rp, up + 1, n - 1, up[0]);
+      for (i = n - 2; i != 0; i--)
+	{
+	  up += 1;
+	  rp += 2;
+	  rp[i] = mpn_addmul_1 (rp, up + 1, i, up[0]);
+	}
+
+      xp = rp - 2 * n + 3;
+      mpn_sqr_diag_addlsh1 (xp, xp + 1, up - n + 2, n);
+    }
+}
+#define READY_WITH_mpn_sqr_basecase
+#endif
+
+
+#if ! defined (READY_WITH_mpn_sqr_basecase)
+
+/* Default mpn_sqr_basecase using mpn_addmul_1.  */
+void
+mpn_sqr_basecase (mp_ptr rp, mp_srcptr up, mp_size_t n)
+{
+  mp_size_t i;
+
+  ASSERT (n >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, 2*n, up, n));
+
+  if (n == 1)
+    {
+      mp_limb_t ul, lpl;
+      ul = up[0];
+      umul_ppmm (rp[1], lpl, ul, ul << GMP_NAIL_BITS);
+      rp[0] = lpl >> GMP_NAIL_BITS;
+    }
+  else
+    {
+      mp_limb_t tarr[2 * SQR_TOOM2_THRESHOLD];
+      mp_ptr tp = tarr;
+      mp_limb_t cy;
+
+      /* must fit 2*n limbs in tarr */
+      ASSERT (n <= SQR_TOOM2_THRESHOLD);
+
+      cy = mpn_mul_1 (tp, up + 1, n - 1, up[0]);
+      tp[n - 1] = cy;
+      for (i = 2; i < n; i++)
+	{
+	  mp_limb_t cy;
+	  cy = mpn_addmul_1 (tp + 2 * i - 2, up + i, n - i, up[i - 1]);
+	  tp[n + i - 2] = cy;
+	}
+
+      MPN_SQR_DIAG_ADDLSH1 (rp, tp, up, n);
+    }
+}
+#define READY_WITH_mpn_sqr_basecase
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo.c
deleted file mode 120000
index fd18efe90..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sqrlo.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo.c
new file mode 100644
index 000000000..71530b6d6
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo.c
@@ -0,0 +1,239 @@
+/* mpn_sqrlo -- squares an n-limb number and returns the low n limbs
+   of the result.
+
+   Contributed to the GNU project by Torbjorn Granlund and Marco Bodrato.
+
+   THIS IS (FOR NOW) AN INTERNAL FUNCTION.  IT IS ONLY SAFE TO REACH THIS
+   FUNCTION THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST GUARANTEED
+   THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2004, 2005, 2009, 2010, 2012, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#if TUNE_PROGRAM_BUILD || WANT_FAT_BINARY
+#define MAYBE_range_basecase 1
+#define MAYBE_range_toom22   1
+#else
+#define MAYBE_range_basecase                                           \
+  ((SQRLO_DC_THRESHOLD == 0 ? SQRLO_BASECASE_THRESHOLD : SQRLO_DC_THRESHOLD) < SQR_TOOM2_THRESHOLD*36/(36-11))
+#define MAYBE_range_toom22                                             \
+  ((SQRLO_DC_THRESHOLD == 0 ? SQRLO_BASECASE_THRESHOLD : SQRLO_DC_THRESHOLD) < SQR_TOOM3_THRESHOLD*36/(36-11) )
+#endif
+
+/*  THINK: The DC strategy uses different constants in different Toom's
+	 ranges. Something smoother?
+*/
+
+/*
+  Compute the least significant half of the product {xy,n}*{yp,n}, or
+  formally {rp,n} = {xy,n}*{yp,n} Mod (B^n).
+
+  Above the given threshold, the Divide and Conquer strategy is used.
+  The operand is split in two, and a full square plus a mullo
+  is used to obtain the final result. The more natural strategy is to
+  split in two halves, but this is far from optimal when a
+  sub-quadratic multiplication is used.
+
+  Mulders suggests an unbalanced split in favour of the full product,
+  split n = n1 + n2, where an = n1 <= n2 = (1-a)n; i.e. 0 < a <= 1/2.
+
+  To compute the value of a, we assume that the cost of mullo for a
+  given size ML(n) is a fraction of the cost of a full product with
+  same size M(n), and the cost M(n)=n^e for some exponent 1 < e <= 2;
+  then we can write:
+
+  ML(n) = 2*ML(an) + M((1-a)n) => k*M(n) = 2*k*M(n)*a^e + M(n)*(1-a)^e
+
+  Given a value for e, want to minimise the value of k, i.e. the
+  function k=(1-a)^e/(1-2*a^e).
+
+  With e=2, the exponent for schoolbook multiplication, the minimum is
+  given by the values a=1-a=1/2.
+
+  With e=log(3)/log(2), the exponent for Karatsuba (aka toom22),
+  Mulders compute (1-a) = 0.694... and we approximate a with 11/36.
+
+  Other possible approximations follow:
+  e=log(5)/log(3) [Toom-3] -> a ~= 9/40
+  e=log(7)/log(4) [Toom-4] -> a ~= 7/39
+  e=log(11)/log(6) [Toom-6] -> a ~= 1/8
+  e=log(15)/log(8) [Toom-8] -> a ~= 1/10
+
+  The values above where obtained with the following trivial commands
+  in the gp-pari shell:
+
+fun(e,a)=(1-a)^e/(1-2*a^e)
+mul(a,b,c)={local(m,x,p);if(b-c<1/10000,(b+c)/2,m=1;x=b;forstep(p=c,b,(b-c)/8,if(fun(a,p)<m,m=fun(a,p);x=p));mul(a,(b+x)/2,(c+x)/2))}
+contfracpnqn(contfrac(mul(log(2*2-1)/log(2),1/2,0),5))
+contfracpnqn(contfrac(mul(log(3*2-1)/log(3),1/2,0),5))
+contfracpnqn(contfrac(mul(log(4*2-1)/log(4),1/2,0),5))
+contfracpnqn(contfrac(mul(log(6*2-1)/log(6),1/2,0),3))
+contfracpnqn(contfrac(mul(log(8*2-1)/log(8),1/2,0),3))
+
+  ,
+  |\
+  | \
+  +----,
+  |    |
+  |    |
+  |    |\
+  |    | \
+  +----+--`
+  ^ n2 ^n1^
+
+  For an actual implementation, the assumption that M(n)=n^e is
+  incorrect, as a consequence also the assumption that ML(n)=k*M(n)
+  with a constant k is wrong.
+
+  But theory suggest us two things:
+  - the best the multiplication product is (lower e), the more k
+    approaches 1, and a approaches 0.
+
+  - A value for a smaller than optimal is probably less bad than a
+    bigger one: e.g. let e=log(3)/log(2), a=0.3058_ the optimal
+    value, and k(a)=0.808_ the mul/mullo speed ratio. We get
+    k(a+1/6)=0.929_ but k(a-1/6)=0.865_.
+*/
+
+static mp_size_t
+mpn_sqrlo_itch (mp_size_t n)
+{
+  return 2*n;
+}
+
+/*
+    mpn_dc_sqrlo requires a scratch space of 2*n limbs at tp.
+    It accepts tp == rp.
+*/
+static void
+mpn_dc_sqrlo (mp_ptr rp, mp_srcptr xp, mp_size_t n, mp_ptr tp)
+{
+  mp_size_t n2, n1;
+  ASSERT (n >= 2);
+  ASSERT (! MPN_OVERLAP_P (rp, n, xp, n));
+  ASSERT (MPN_SAME_OR_SEPARATE2_P(rp, n, tp, 2*n));
+
+  /* Divide-and-conquer */
+
+  /* We need fractional approximation of the value 0 < a <= 1/2
+     giving the minimum in the function k=(1-a)^e/(1-2*a^e).
+  */
+  if (MAYBE_range_basecase && BELOW_THRESHOLD (n, SQR_TOOM2_THRESHOLD*36/(36-11)))
+    n1 = n >> 1;
+  else if (MAYBE_range_toom22 && BELOW_THRESHOLD (n, SQR_TOOM3_THRESHOLD*36/(36-11)))
+    n1 = n * 11 / (size_t) 36;	/* n1 ~= n*(1-.694...) */
+  else if (BELOW_THRESHOLD (n, SQR_TOOM4_THRESHOLD*40/(40-9)))
+    n1 = n * 9 / (size_t) 40;	/* n1 ~= n*(1-.775...) */
+  else if (BELOW_THRESHOLD (n, SQR_TOOM8_THRESHOLD*10/9))
+    n1 = n * 7 / (size_t) 39;	/* n1 ~= n*(1-.821...) */
+  /* n1 = n * 4 / (size_t) 31;	// n1 ~= n*(1-.871...) [TOOM66] */
+  else
+    n1 = n / (size_t) 10;		/* n1 ~= n*(1-.899...) [TOOM88] */
+
+  n2 = n - n1;
+
+  /* Split as x = x1 2^(n2 GMP_NUMB_BITS) + x0 */
+
+  /* x0 ^ 2 */
+  mpn_sqr (tp, xp, n2);
+  MPN_COPY (rp, tp, n2);
+
+  /* x1 * x0 * 2^(n2 GMP_NUMB_BITS) */
+  if (BELOW_THRESHOLD (n1, MULLO_BASECASE_THRESHOLD))
+    mpn_mul_basecase (tp + n, xp + n2, n1, xp, n1);
+  else if (BELOW_THRESHOLD (n1, MULLO_DC_THRESHOLD))
+    mpn_mullo_basecase (tp + n, xp + n2, xp, n1);
+  else
+    mpn_mullo_n (tp + n, xp + n2, xp, n1);
+  /* mpn_dc_mullo_n (tp + n, xp + n2, xp, n1, tp + n); */
+#if HAVE_NATIVE_mpn_addlsh1_n
+  mpn_addlsh1_n (rp + n2, tp + n2, tp + n, n1);
+#else
+  mpn_lshift (rp + n2, tp + n, n1, 1);
+  mpn_add_n (rp + n2, rp + n2, tp + n2, n1);
+#endif
+}
+
+/* Avoid zero allocations when MULLO_BASECASE_THRESHOLD is 0.  */
+#define SQR_BASECASE_ALLOC \
+ (SQRLO_BASECASE_THRESHOLD_LIMIT == 0 ? 1 : 2*SQRLO_BASECASE_THRESHOLD_LIMIT)
+
+/* FIXME: This function should accept a temporary area; dc_sqrlo
+   accepts a pointer tp, and handle the case tp == rp, do the same here.
+*/
+
+void
+mpn_sqrlo (mp_ptr rp, mp_srcptr xp, mp_size_t n)
+{
+  ASSERT (n >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, n, xp, n));
+
+  if (BELOW_THRESHOLD (n, SQRLO_BASECASE_THRESHOLD))
+    {
+      /* FIXME: smarter criteria? */
+#if HAVE_NATIVE_mpn_mullo_basecase || ! HAVE_NATIVE_mpn_sqr_basecase
+      /* mullo computes as many products as sqr, but directly writes
+	 on the result area. */
+      mpn_mullo_basecase (rp, xp, xp, n);
+#else
+      /* Allocate workspace of fixed size on stack: fast! */
+      mp_limb_t tp[SQR_BASECASE_ALLOC];
+      mpn_sqr_basecase (tp, xp, n);
+      MPN_COPY (rp, tp, n);
+#endif
+    }
+  else if (BELOW_THRESHOLD (n, SQRLO_DC_THRESHOLD))
+    {
+      mpn_sqrlo_basecase (rp, xp, n);
+    }
+  else
+    {
+      mp_ptr tp;
+      TMP_DECL;
+      TMP_MARK;
+      tp = TMP_ALLOC_LIMBS (mpn_sqrlo_itch (n));
+      if (BELOW_THRESHOLD (n, SQRLO_SQR_THRESHOLD))
+	{
+	  mpn_dc_sqrlo (rp, xp, n, tp);
+	}
+      else
+	{
+	  /* For really large operands, use plain mpn_mul_n but throw away upper n
+	     limbs of result.  */
+#if !TUNE_PROGRAM_BUILD && (SQRLO_SQR_THRESHOLD > SQR_FFT_THRESHOLD)
+	  mpn_fft_mul (tp, xp, n, xp, n);
+#else
+	  mpn_sqr (tp, xp, n);
+#endif
+	  MPN_COPY (rp, tp, n);
+	}
+      TMP_FREE;
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo_basecase.c
deleted file mode 120000
index 39e518bfb..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo_basecase.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sqrlo_basecase.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo_basecase.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo_basecase.c
new file mode 100644
index 000000000..3148609da
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrlo_basecase.c
@@ -0,0 +1,194 @@
+/* mpn_sqrlo_basecase -- Internal routine to square a natural number
+   of length n.
+
+   THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
+
+
+Copyright 1991-1994, 1996, 1997, 2000-2005, 2008, 2010, 2011, 2015,
+2016 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+#ifndef SQRLO_SHORTCUT_MULTIPLICATIONS
+#if HAVE_NATIVE_mpn_addmul_1
+#define SQRLO_SHORTCUT_MULTIPLICATIONS 0
+#else
+#define SQRLO_SHORTCUT_MULTIPLICATIONS 1
+#endif
+#endif
+
+#if HAVE_NATIVE_mpn_sqr_diagonal
+#define MPN_SQR_DIAGONAL(rp, up, n)					\
+  mpn_sqr_diagonal (rp, up, n)
+#else
+#define MPN_SQR_DIAGONAL(rp, up, n)					\
+  do {									\
+    mp_size_t _i;							\
+    for (_i = 0; _i < (n); _i++)					\
+      {									\
+	mp_limb_t ul, lpl;						\
+	ul = (up)[_i];							\
+	umul_ppmm ((rp)[2 * _i + 1], lpl, ul, ul << GMP_NAIL_BITS);	\
+	(rp)[2 * _i] = lpl >> GMP_NAIL_BITS;				\
+      }									\
+  } while (0)
+#endif
+
+#define MPN_SQRLO_DIAGONAL(rp, up, n)					\
+  do {									\
+    mp_size_t nhalf;							\
+    nhalf = (n) >> 1;							\
+    MPN_SQR_DIAGONAL ((rp), (up), nhalf);				\
+    if (((n) & 1) != 0)							\
+      {									\
+	mp_limb_t op;							\
+	op = (up)[nhalf];						\
+	(rp)[(n) - 1] = (op * op) & GMP_NUMB_MASK;			\
+      }									\
+  } while (0)
+
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+#define MPN_SQRLO_DIAG_ADDLSH1(rp, tp, up, n)				\
+  do {									\
+    MPN_SQRLO_DIAGONAL((rp), (up), (n));				\
+    mpn_addlsh1_n_ip1 ((rp) + 1, (tp), (n) - 1);			\
+  } while (0)
+#else
+#define MPN_SQRLO_DIAG_ADDLSH1(rp, tp, up, n)				\
+  do {									\
+    MPN_SQRLO_DIAGONAL((rp), (up), (n));				\
+    mpn_lshift ((tp), (tp), (n) - 1, 1);				\
+    mpn_add_n ((rp) + 1, (rp) + 1, (tp), (n) - 1);			\
+  } while (0)
+#endif
+
+/* Avoid zero allocations when SQRLO_LO_THRESHOLD is 0 (this code not used). */
+#define SQRLO_BASECASE_ALLOC						\
+  (SQRLO_DC_THRESHOLD_LIMIT < 2 ? 1 : SQRLO_DC_THRESHOLD_LIMIT - 1)
+
+/* Default mpn_sqrlo_basecase using mpn_addmul_1.  */
+#ifndef SQRLO_SPECIAL_CASES
+#define SQRLO_SPECIAL_CASES 2
+#endif
+
+#if TUNE_PROGRAM_BUILD || WANT_FAT_BINARY
+#define MAYBE_special_cases 1
+#else
+#define MAYBE_special_cases \
+  ((SQRLO_BASECASE_THRESHOLD <= SQRLO_SPECIAL_CASES) && (SQRLO_DC_THRESHOLD != 0))
+#endif
+
+void
+mpn_sqrlo_basecase (mp_ptr rp, mp_srcptr up, mp_size_t n)
+{
+  mp_limb_t ul;
+
+  ASSERT (n >= 1);
+  ASSERT (! MPN_OVERLAP_P (rp, n, up, n));
+
+  ul = up[0];
+
+  if (MAYBE_special_cases && n <= SQRLO_SPECIAL_CASES)
+    {
+#if SQRLO_SPECIAL_CASES == 1
+      rp[0] = (ul * ul) & GMP_NUMB_MASK;
+#else
+      if (n == 1)
+	rp[0] = (ul * ul) & GMP_NUMB_MASK;
+      else
+	{
+	  mp_limb_t hi, lo, ul1;
+	  umul_ppmm (hi, lo, ul, ul << GMP_NAIL_BITS);
+	  rp[0] = lo >> GMP_NAIL_BITS;
+	  ul1 = up[1];
+#if SQRLO_SPECIAL_CASES == 2
+	  rp[1] = (hi + ul * ul1 * 2) & GMP_NUMB_MASK;
+#else
+	  if (n == 2)
+	    rp[1] = (hi + ul * ul1 * 2) & GMP_NUMB_MASK;
+	  else
+	    {
+	      mp_limb_t hi1;
+#if GMP_NAIL_BITS != 0
+	      ul <<= 1;
+#endif
+	      umul_ppmm (hi1, lo, ul1 << GMP_NAIL_BITS, ul);
+	      hi1 += ul * up[2];
+#if GMP_NAIL_BITS == 0
+	      hi1 = (hi1 << 1) | (lo >> (GMP_LIMB_BITS - 1));
+	      add_ssaaaa(rp[2], rp[1], hi1, lo << 1, ul1 * ul1, hi);
+#else
+	      hi += lo >> GMP_NAIL_BITS;
+	      rp[1] = hi & GMP_NUMB_MASK;
+	      rp[2] = (hi1 + ul1 * ul1 + (hi >> GMP_NUMB_BITS)) & GMP_NUMB_MASK;
+#endif
+	    }
+#endif
+	}
+#endif
+    }
+  else
+    {
+      mp_limb_t tp[SQRLO_BASECASE_ALLOC];
+      mp_size_t i;
+
+      /* must fit n-1 limbs in tp */
+      ASSERT (n <= SQRLO_DC_THRESHOLD_LIMIT);
+
+      --n;
+#if SQRLO_SHORTCUT_MULTIPLICATIONS
+      {
+	mp_limb_t cy;
+
+	cy = ul * up[n] + mpn_mul_1 (tp, up + 1, n - 1, ul);
+	for (i = 1; 2 * i + 1 < n; ++i)
+	  {
+	    ul = up[i];
+	    cy += ul * up[n - i] + mpn_addmul_1 (tp + 2 * i, up + i + 1, n - 2 * i - 1, ul);
+	  }
+	tp [n-1] = (cy + ((n & 1)?up[i] * up[i + 1]:0)) & GMP_NUMB_MASK;
+      }
+#else
+      mpn_mul_1 (tp, up + 1, n, ul);
+      for (i = 1; 2 * i < n; ++i)
+	mpn_addmul_1 (tp + 2 * i, up + i + 1, n - 2 * i, up[i]);
+#endif
+
+      MPN_SQRLO_DIAG_ADDLSH1 (rp, tp, up, n + 1);
+    }
+}
+#undef SQRLO_SPECIAL_CASES
+#undef MAYBE_special_cases
+#undef SQRLO_BASECASE_ALLOC
+#undef SQRLO_SHORTCUT_MULTIPLICATIONS
+#undef MPN_SQR_DIAGONAL
+#undef MPN_SQRLO_DIAGONAL
+#undef MPN_SQRLO_DIAG_ADDLSH1
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrtrem.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrtrem.c
deleted file mode 120000
index 64e752209..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrtrem.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sqrtrem.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrtrem.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrtrem.c
new file mode 100644
index 000000000..cc6dd9c88
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sqrtrem.c
@@ -0,0 +1,555 @@
+/* mpn_sqrtrem -- square root and remainder
+
+   Contributed to the GNU project by Paul Zimmermann (most code),
+   Torbjorn Granlund (mpn_sqrtrem1) and Marco Bodrato (mpn_dc_sqrt).
+
+   THE FUNCTIONS IN THIS FILE EXCEPT mpn_sqrtrem ARE INTERNAL WITH MUTABLE
+   INTERFACES.  IT IS ONLY SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.
+   IN FACT, IT IS ALMOST GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A
+   FUTURE GMP RELEASE.
+
+Copyright 1999-2002, 2004, 2005, 2008, 2010, 2012, 2015, 2017 Free Software
+Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+/* See "Karatsuba Square Root", reference in gmp.texi.  */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "gmp-impl.h"
+#include "longlong.h"
+#define USE_DIVAPPR_Q 1
+#define TRACE(x)
+
+static const unsigned char invsqrttab[384] = /* The common 0x100 was removed */
+{
+  0xff,0xfd,0xfb,0xf9,0xf7,0xf5,0xf3,0xf2, /* sqrt(1/80)..sqrt(1/87) */
+  0xf0,0xee,0xec,0xea,0xe9,0xe7,0xe5,0xe4, /* sqrt(1/88)..sqrt(1/8f) */
+  0xe2,0xe0,0xdf,0xdd,0xdb,0xda,0xd8,0xd7, /* sqrt(1/90)..sqrt(1/97) */
+  0xd5,0xd4,0xd2,0xd1,0xcf,0xce,0xcc,0xcb, /* sqrt(1/98)..sqrt(1/9f) */
+  0xc9,0xc8,0xc6,0xc5,0xc4,0xc2,0xc1,0xc0, /* sqrt(1/a0)..sqrt(1/a7) */
+  0xbe,0xbd,0xbc,0xba,0xb9,0xb8,0xb7,0xb5, /* sqrt(1/a8)..sqrt(1/af) */
+  0xb4,0xb3,0xb2,0xb0,0xaf,0xae,0xad,0xac, /* sqrt(1/b0)..sqrt(1/b7) */
+  0xaa,0xa9,0xa8,0xa7,0xa6,0xa5,0xa4,0xa3, /* sqrt(1/b8)..sqrt(1/bf) */
+  0xa2,0xa0,0x9f,0x9e,0x9d,0x9c,0x9b,0x9a, /* sqrt(1/c0)..sqrt(1/c7) */
+  0x99,0x98,0x97,0x96,0x95,0x94,0x93,0x92, /* sqrt(1/c8)..sqrt(1/cf) */
+  0x91,0x90,0x8f,0x8e,0x8d,0x8c,0x8c,0x8b, /* sqrt(1/d0)..sqrt(1/d7) */
+  0x8a,0x89,0x88,0x87,0x86,0x85,0x84,0x83, /* sqrt(1/d8)..sqrt(1/df) */
+  0x83,0x82,0x81,0x80,0x7f,0x7e,0x7e,0x7d, /* sqrt(1/e0)..sqrt(1/e7) */
+  0x7c,0x7b,0x7a,0x79,0x79,0x78,0x77,0x76, /* sqrt(1/e8)..sqrt(1/ef) */
+  0x76,0x75,0x74,0x73,0x72,0x72,0x71,0x70, /* sqrt(1/f0)..sqrt(1/f7) */
+  0x6f,0x6f,0x6e,0x6d,0x6d,0x6c,0x6b,0x6a, /* sqrt(1/f8)..sqrt(1/ff) */
+  0x6a,0x69,0x68,0x68,0x67,0x66,0x66,0x65, /* sqrt(1/100)..sqrt(1/107) */
+  0x64,0x64,0x63,0x62,0x62,0x61,0x60,0x60, /* sqrt(1/108)..sqrt(1/10f) */
+  0x5f,0x5e,0x5e,0x5d,0x5c,0x5c,0x5b,0x5a, /* sqrt(1/110)..sqrt(1/117) */
+  0x5a,0x59,0x59,0x58,0x57,0x57,0x56,0x56, /* sqrt(1/118)..sqrt(1/11f) */
+  0x55,0x54,0x54,0x53,0x53,0x52,0x52,0x51, /* sqrt(1/120)..sqrt(1/127) */
+  0x50,0x50,0x4f,0x4f,0x4e,0x4e,0x4d,0x4d, /* sqrt(1/128)..sqrt(1/12f) */
+  0x4c,0x4b,0x4b,0x4a,0x4a,0x49,0x49,0x48, /* sqrt(1/130)..sqrt(1/137) */
+  0x48,0x47,0x47,0x46,0x46,0x45,0x45,0x44, /* sqrt(1/138)..sqrt(1/13f) */
+  0x44,0x43,0x43,0x42,0x42,0x41,0x41,0x40, /* sqrt(1/140)..sqrt(1/147) */
+  0x40,0x3f,0x3f,0x3e,0x3e,0x3d,0x3d,0x3c, /* sqrt(1/148)..sqrt(1/14f) */
+  0x3c,0x3b,0x3b,0x3a,0x3a,0x39,0x39,0x39, /* sqrt(1/150)..sqrt(1/157) */
+  0x38,0x38,0x37,0x37,0x36,0x36,0x35,0x35, /* sqrt(1/158)..sqrt(1/15f) */
+  0x35,0x34,0x34,0x33,0x33,0x32,0x32,0x32, /* sqrt(1/160)..sqrt(1/167) */
+  0x31,0x31,0x30,0x30,0x2f,0x2f,0x2f,0x2e, /* sqrt(1/168)..sqrt(1/16f) */
+  0x2e,0x2d,0x2d,0x2d,0x2c,0x2c,0x2b,0x2b, /* sqrt(1/170)..sqrt(1/177) */
+  0x2b,0x2a,0x2a,0x29,0x29,0x29,0x28,0x28, /* sqrt(1/178)..sqrt(1/17f) */
+  0x27,0x27,0x27,0x26,0x26,0x26,0x25,0x25, /* sqrt(1/180)..sqrt(1/187) */
+  0x24,0x24,0x24,0x23,0x23,0x23,0x22,0x22, /* sqrt(1/188)..sqrt(1/18f) */
+  0x21,0x21,0x21,0x20,0x20,0x20,0x1f,0x1f, /* sqrt(1/190)..sqrt(1/197) */
+  0x1f,0x1e,0x1e,0x1e,0x1d,0x1d,0x1d,0x1c, /* sqrt(1/198)..sqrt(1/19f) */
+  0x1c,0x1b,0x1b,0x1b,0x1a,0x1a,0x1a,0x19, /* sqrt(1/1a0)..sqrt(1/1a7) */
+  0x19,0x19,0x18,0x18,0x18,0x18,0x17,0x17, /* sqrt(1/1a8)..sqrt(1/1af) */
+  0x17,0x16,0x16,0x16,0x15,0x15,0x15,0x14, /* sqrt(1/1b0)..sqrt(1/1b7) */
+  0x14,0x14,0x13,0x13,0x13,0x12,0x12,0x12, /* sqrt(1/1b8)..sqrt(1/1bf) */
+  0x12,0x11,0x11,0x11,0x10,0x10,0x10,0x0f, /* sqrt(1/1c0)..sqrt(1/1c7) */
+  0x0f,0x0f,0x0f,0x0e,0x0e,0x0e,0x0d,0x0d, /* sqrt(1/1c8)..sqrt(1/1cf) */
+  0x0d,0x0c,0x0c,0x0c,0x0c,0x0b,0x0b,0x0b, /* sqrt(1/1d0)..sqrt(1/1d7) */
+  0x0a,0x0a,0x0a,0x0a,0x09,0x09,0x09,0x09, /* sqrt(1/1d8)..sqrt(1/1df) */
+  0x08,0x08,0x08,0x07,0x07,0x07,0x07,0x06, /* sqrt(1/1e0)..sqrt(1/1e7) */
+  0x06,0x06,0x06,0x05,0x05,0x05,0x04,0x04, /* sqrt(1/1e8)..sqrt(1/1ef) */
+  0x04,0x04,0x03,0x03,0x03,0x03,0x02,0x02, /* sqrt(1/1f0)..sqrt(1/1f7) */
+  0x02,0x02,0x01,0x01,0x01,0x01,0x00,0x00  /* sqrt(1/1f8)..sqrt(1/1ff) */
+};
+
+/* Compute s = floor(sqrt(a0)), and *rp = a0 - s^2.  */
+
+#if GMP_NUMB_BITS > 32
+#define MAGIC CNST_LIMB(0x10000000000)	/* 0xffe7debbfc < MAGIC < 0x232b1850f410 */
+#else
+#define MAGIC CNST_LIMB(0x100000)		/* 0xfee6f < MAGIC < 0x29cbc8 */
+#endif
+
+static mp_limb_t
+mpn_sqrtrem1 (mp_ptr rp, mp_limb_t a0)
+{
+#if GMP_NUMB_BITS > 32
+  mp_limb_t a1;
+#endif
+  mp_limb_t x0, t2, t, x2;
+  unsigned abits;
+
+  ASSERT_ALWAYS (GMP_NAIL_BITS == 0);
+  ASSERT_ALWAYS (GMP_LIMB_BITS == 32 || GMP_LIMB_BITS == 64);
+  ASSERT (a0 >= GMP_NUMB_HIGHBIT / 2);
+
+  /* Use Newton iterations for approximating 1/sqrt(a) instead of sqrt(a),
+     since we can do the former without division.  As part of the last
+     iteration convert from 1/sqrt(a) to sqrt(a).  */
+
+  abits = a0 >> (GMP_LIMB_BITS - 1 - 8);	/* extract bits for table lookup */
+  x0 = 0x100 | invsqrttab[abits - 0x80];	/* initial 1/sqrt(a) */
+
+  /* x0 is now an 8 bits approximation of 1/sqrt(a0) */
+
+#if GMP_NUMB_BITS > 32
+  a1 = a0 >> (GMP_LIMB_BITS - 1 - 32);
+  t = (mp_limb_signed_t) (CNST_LIMB(0x2000000000000) - 0x30000 - a1 * x0 * x0) >> 16;
+  x0 = (x0 << 16) + ((mp_limb_signed_t) (x0 * t) >> (16+2));
+
+  /* x0 is now a 16 bits approximation of 1/sqrt(a0) */
+
+  t2 = x0 * (a0 >> (32-8));
+  t = t2 >> 25;
+  t = ((mp_limb_signed_t) ((a0 << 14) - t * t - MAGIC) >> (32-8));
+  x0 = t2 + ((mp_limb_signed_t) (x0 * t) >> 15);
+  x0 >>= 32;
+#else
+  t2 = x0 * (a0 >> (16-8));
+  t = t2 >> 13;
+  t = ((mp_limb_signed_t) ((a0 << 6) - t * t - MAGIC) >> (16-8));
+  x0 = t2 + ((mp_limb_signed_t) (x0 * t) >> 7);
+  x0 >>= 16;
+#endif
+
+  /* x0 is now a full limb approximation of sqrt(a0) */
+
+  x2 = x0 * x0;
+  if (x2 + 2*x0 <= a0 - 1)
+    {
+      x2 += 2*x0 + 1;
+      x0++;
+    }
+
+  *rp = a0 - x2;
+  return x0;
+}
+
+
+#define Prec (GMP_NUMB_BITS >> 1)
+#if ! defined(SQRTREM2_INPLACE)
+#define SQRTREM2_INPLACE 0
+#endif
+
+/* same as mpn_sqrtrem, but for size=2 and {np, 2} normalized
+   return cc such that {np, 2} = sp[0]^2 + cc*2^GMP_NUMB_BITS + rp[0] */
+#if SQRTREM2_INPLACE
+#define CALL_SQRTREM2_INPLACE(sp,rp) mpn_sqrtrem2 (sp, rp)
+static mp_limb_t
+mpn_sqrtrem2 (mp_ptr sp, mp_ptr rp)
+{
+  mp_srcptr np = rp;
+#else
+#define CALL_SQRTREM2_INPLACE(sp,rp) mpn_sqrtrem2 (sp, rp, rp)
+static mp_limb_t
+mpn_sqrtrem2 (mp_ptr sp, mp_ptr rp, mp_srcptr np)
+{
+#endif
+  mp_limb_t q, u, np0, sp0, rp0, q2;
+  int cc;
+
+  ASSERT (np[1] >= GMP_NUMB_HIGHBIT / 2);
+
+  np0 = np[0];
+  sp0 = mpn_sqrtrem1 (rp, np[1]);
+  rp0 = rp[0];
+  /* rp0 <= 2*sp0 < 2^(Prec + 1) */
+  rp0 = (rp0 << (Prec - 1)) + (np0 >> (Prec + 1));
+  q = rp0 / sp0;
+  /* q <= 2^Prec, if q = 2^Prec, reduce the overestimate. */
+  q -= q >> Prec;
+  /* now we have q < 2^Prec */
+  u = rp0 - q * sp0;
+  /* now we have (rp[0]<<Prec + np0>>Prec)/2 = q * sp0 + u */
+  sp0 = (sp0 << Prec) | q;
+  cc = u >> (Prec - 1);
+  rp0 = ((u << (Prec + 1)) & GMP_NUMB_MASK) + (np0 & ((CNST_LIMB (1) << (Prec + 1)) - 1));
+  /* subtract q * q from rp */
+  q2 = q * q;
+  cc -= rp0 < q2;
+  rp0 -= q2;
+  if (cc < 0)
+    {
+      rp0 += sp0;
+      cc += rp0 < sp0;
+      --sp0;
+      rp0 += sp0;
+      cc += rp0 < sp0;
+    }
+
+  rp[0] = rp0;
+  sp[0] = sp0;
+  return cc;
+}
+
+/* writes in {sp, n} the square root (rounded towards zero) of {np, 2n},
+   and in {np, n} the low n limbs of the remainder, returns the high
+   limb of the remainder (which is 0 or 1).
+   Assumes {np, 2n} is normalized, i.e. np[2n-1] >= B/4
+   where B=2^GMP_NUMB_BITS.
+   Needs a scratch of n/2+1 limbs. */
+static mp_limb_t
+mpn_dc_sqrtrem (mp_ptr sp, mp_ptr np, mp_size_t n, mp_limb_t approx, mp_ptr scratch)
+{
+  mp_limb_t q;			/* carry out of {sp, n} */
+  int c, b;			/* carry out of remainder */
+  mp_size_t l, h;
+
+  ASSERT (n > 1);
+  ASSERT (np[2 * n - 1] >= GMP_NUMB_HIGHBIT / 2);
+
+  l = n / 2;
+  h = n - l;
+  if (h == 1)
+    q = CALL_SQRTREM2_INPLACE (sp + l, np + 2 * l);
+  else
+    q = mpn_dc_sqrtrem (sp + l, np + 2 * l, h, 0, scratch);
+  if (q != 0)
+    ASSERT_CARRY (mpn_sub_n (np + 2 * l, np + 2 * l, sp + l, h));
+  TRACE(printf("tdiv_qr(,,,,%u,,%u) -> %u\n", (unsigned) n, (unsigned) h, (unsigned) (n - h + 1)));
+  mpn_tdiv_qr (scratch, np + l, 0, np + l, n, sp + l, h);
+  q += scratch[l];
+  c = scratch[0] & 1;
+  mpn_rshift (sp, scratch, l, 1);
+  sp[l - 1] |= (q << (GMP_NUMB_BITS - 1)) & GMP_NUMB_MASK;
+  if (UNLIKELY ((sp[0] & approx) != 0)) /* (sp[0] & mask) > 1 */
+    return 1; /* Remainder is non-zero */
+  q >>= 1;
+  if (c != 0)
+    c = mpn_add_n (np + l, np + l, sp + l, h);
+  TRACE(printf("sqr(,,%u)\n", (unsigned) l));
+  mpn_sqr (np + n, sp, l);
+  b = q + mpn_sub_n (np, np, np + n, 2 * l);
+  c -= (l == h) ? b : mpn_sub_1 (np + 2 * l, np + 2 * l, 1, (mp_limb_t) b);
+
+  if (c < 0)
+    {
+      q = mpn_add_1 (sp + l, sp + l, h, q);
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1 || HAVE_NATIVE_mpn_addlsh1_n
+      c += mpn_addlsh1_n_ip1 (np, sp, n) + 2 * q;
+#else
+      c += mpn_addmul_1 (np, sp, n, CNST_LIMB(2)) + 2 * q;
+#endif
+      c -= mpn_sub_1 (np, np, n, CNST_LIMB(1));
+      q -= mpn_sub_1 (sp, sp, n, CNST_LIMB(1));
+    }
+
+  return c;
+}
+
+#if USE_DIVAPPR_Q
+static void
+mpn_divappr_q (mp_ptr qp, mp_srcptr np, mp_size_t nn, mp_srcptr dp, mp_size_t dn, mp_ptr scratch)
+{
+  gmp_pi1_t inv;
+  mp_limb_t qh;
+  ASSERT (dn > 2);
+  ASSERT (nn >= dn);
+  ASSERT ((dp[dn-1] & GMP_NUMB_HIGHBIT) != 0);
+
+  MPN_COPY (scratch, np, nn);
+  invert_pi1 (inv, dp[dn-1], dp[dn-2]);
+  if (BELOW_THRESHOLD (dn, DC_DIVAPPR_Q_THRESHOLD))
+    qh = mpn_sbpi1_divappr_q (qp, scratch, nn, dp, dn, inv.inv32);
+  else if (BELOW_THRESHOLD (dn, MU_DIVAPPR_Q_THRESHOLD))
+    qh = mpn_dcpi1_divappr_q (qp, scratch, nn, dp, dn, &inv);
+  else
+    {
+      mp_size_t itch = mpn_mu_divappr_q_itch (nn, dn, 0);
+      TMP_DECL;
+      TMP_MARK;
+      /* Sadly, scratch is too small. */
+      qh = mpn_mu_divappr_q (qp, np, nn, dp, dn, TMP_ALLOC_LIMBS (itch));
+      TMP_FREE;
+    }
+  qp [nn - dn] = qh;
+}
+#endif
+
+/* writes in {sp, n} the square root (rounded towards zero) of {np, 2n-odd},
+   returns zero if the operand was a perfect square, one otherwise.
+   Assumes {np, 2n-odd}*4^nsh is normalized, i.e. B > np[2n-1-odd]*4^nsh >= B/4
+   where B=2^GMP_NUMB_BITS.
+   THINK: In the odd case, three more (dummy) limbs are taken into account,
+   when nsh is maximal, two limbs are discarded from the result of the
+   division. Too much? Is a single dummy limb enough? */
+static int
+mpn_dc_sqrt (mp_ptr sp, mp_srcptr np, mp_size_t n, unsigned nsh, unsigned odd)
+{
+  mp_limb_t q;			/* carry out of {sp, n} */
+  int c;			/* carry out of remainder */
+  mp_size_t l, h;
+  mp_ptr qp, tp, scratch;
+  TMP_DECL;
+  TMP_MARK;
+
+  ASSERT (np[2 * n - 1 - odd] != 0);
+  ASSERT (n > 4);
+  ASSERT (nsh < GMP_NUMB_BITS / 2);
+
+  l = (n - 1) / 2;
+  h = n - l;
+  ASSERT (n >= l + 2 && l + 2 >= h && h > l && l >= 1 + odd);
+  scratch = TMP_ALLOC_LIMBS (l + 2 * n + 5 - USE_DIVAPPR_Q); /* n + 2-USE_DIVAPPR_Q */
+  tp = scratch + n + 2 - USE_DIVAPPR_Q; /* n + h + 1, but tp [-1] is writable */
+  if (nsh != 0)
+    {
+      /* o is used to exactly set the lowest bits of the dividend, is it needed? */
+      int o = l > (1 + odd);
+      ASSERT_NOCARRY (mpn_lshift (tp - o, np + l - 1 - o - odd, n + h + 1 + o, 2 * nsh));
+    }
+  else
+    MPN_COPY (tp, np + l - 1 - odd, n + h + 1);
+  q = mpn_dc_sqrtrem (sp + l, tp + l + 1, h, 0, scratch);
+  if (q != 0)
+    ASSERT_CARRY (mpn_sub_n (tp + l + 1, tp + l + 1, sp + l, h));
+  qp = tp + n + 1; /* l + 2 */
+  TRACE(printf("div(appr)_q(,,%u,,%u) -> %u \n", (unsigned) n+1, (unsigned) h, (unsigned) (n + 1 - h + 1)));
+#if USE_DIVAPPR_Q
+  mpn_divappr_q (qp, tp, n + 1, sp + l, h, scratch);
+#else
+  mpn_div_q (qp, tp, n + 1, sp + l, h, scratch);
+#endif
+  q += qp [l + 1];
+  c = 1;
+  if (q > 1)
+    {
+      /* FIXME: if s!=0 we will shift later, a noop on this area. */
+      MPN_FILL (sp, l, GMP_NUMB_MAX);
+    }
+  else
+    {
+      /* FIXME: if s!=0 we will shift again later, shift just once. */
+      mpn_rshift (sp, qp + 1, l, 1);
+      sp[l - 1] |= q << (GMP_NUMB_BITS - 1);
+      if (((qp[0] >> (2 + USE_DIVAPPR_Q)) | /* < 3 + 4*USE_DIVAPPR_Q */
+	   (qp[1] & (GMP_NUMB_MASK >> ((GMP_NUMB_BITS >> odd)- nsh - 1)))) == 0)
+	{
+	  mp_limb_t cy;
+	  /* Approximation is not good enough, the extra limb(+ nsh bits)
+	     is smaller than needed to absorb the possible error. */
+	  /* {qp + 1, l + 1} equals 2*{sp, l} */
+	  /* FIXME: use mullo or wrap-around, or directly evaluate
+	     remainder with a single sqrmod_bnm1. */
+	  TRACE(printf("mul(,,%u,,%u)\n", (unsigned) h, (unsigned) (l+1)));
+	  ASSERT_NOCARRY (mpn_mul (scratch, sp + l, h, qp + 1, l + 1));
+	  /* Compute the remainder of the previous mpn_div(appr)_q. */
+	  cy = mpn_sub_n (tp + 1, tp + 1, scratch, h);
+#if USE_DIVAPPR_Q || WANT_ASSERT
+	  MPN_DECR_U (tp + 1 + h, l, cy);
+#if USE_DIVAPPR_Q
+	  ASSERT (mpn_cmp (tp + 1 + h, scratch + h, l) <= 0);
+	  if (mpn_cmp (tp + 1 + h, scratch + h, l) < 0)
+	    {
+	      /* May happen only if div result was not exact. */
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1 || HAVE_NATIVE_mpn_addlsh1_n
+	      cy = mpn_addlsh1_n_ip1 (tp + 1, sp + l, h);
+#else
+	      cy = mpn_addmul_1 (tp + 1, sp + l, h, CNST_LIMB(2));
+#endif
+	      ASSERT_NOCARRY (mpn_add_1 (tp + 1 + h, tp + 1 + h, l, cy));
+	      MPN_DECR_U (sp, l, 1);
+	    }
+	  /* Can the root be exact when a correction was needed? We
+	     did not find an example, but it depends on divappr
+	     internals, and we can not assume it true in general...*/
+	  /* else */
+#else /* WANT_ASSERT */
+	  ASSERT (mpn_cmp (tp + 1 + h, scratch + h, l) == 0);
+#endif
+#endif
+	  if (mpn_zero_p (tp + l + 1, h - l))
+	    {
+	      TRACE(printf("sqr(,,%u)\n", (unsigned) l));
+	      mpn_sqr (scratch, sp, l);
+	      c = mpn_cmp (tp + 1, scratch + l, l);
+	      if (c == 0)
+		{
+		  if (nsh != 0)
+		    {
+		      mpn_lshift (tp, np, l, 2 * nsh);
+		      np = tp;
+		    }
+		  c = mpn_cmp (np, scratch + odd, l - odd);
+		}
+	      if (c < 0)
+		{
+		  MPN_DECR_U (sp, l, 1);
+		  c = 1;
+		}
+	    }
+	}
+    }
+  TMP_FREE;
+
+  if ((odd | nsh) != 0)
+    mpn_rshift (sp, sp, n, nsh + (odd ? GMP_NUMB_BITS / 2 : 0));
+  return c;
+}
+
+
+mp_size_t
+mpn_sqrtrem (mp_ptr sp, mp_ptr rp, mp_srcptr np, mp_size_t nn)
+{
+  mp_limb_t cc, high, rl;
+  int c;
+  mp_size_t rn, tn;
+  TMP_DECL;
+
+  ASSERT (nn > 0);
+  ASSERT_MPN (np, nn);
+
+  ASSERT (np[nn - 1] != 0);
+  ASSERT (rp == NULL || MPN_SAME_OR_SEPARATE_P (np, rp, nn));
+  ASSERT (rp == NULL || ! MPN_OVERLAP_P (sp, (nn + 1) / 2, rp, nn));
+  ASSERT (! MPN_OVERLAP_P (sp, (nn + 1) / 2, np, nn));
+
+  high = np[nn - 1];
+  if (high & (GMP_NUMB_HIGHBIT | (GMP_NUMB_HIGHBIT / 2)))
+    c = 0;
+  else
+    {
+      count_leading_zeros (c, high);
+      c -= GMP_NAIL_BITS;
+
+      c = c / 2; /* we have to shift left by 2c bits to normalize {np, nn} */
+    }
+  if (nn == 1) {
+    if (c == 0)
+      {
+	sp[0] = mpn_sqrtrem1 (&rl, high);
+	if (rp != NULL)
+	  rp[0] = rl;
+      }
+    else
+      {
+	cc = mpn_sqrtrem1 (&rl, high << (2*c)) >> c;
+	sp[0] = cc;
+	if (rp != NULL)
+	  rp[0] = rl = high - cc*cc;
+      }
+    return rl != 0;
+  }
+  if (nn == 2) {
+    mp_limb_t tp [2];
+    if (rp == NULL) rp = tp;
+    if (c == 0)
+      {
+#if SQRTREM2_INPLACE
+	rp[1] = high;
+	rp[0] = np[0];
+	cc = CALL_SQRTREM2_INPLACE (sp, rp);
+#else
+	cc = mpn_sqrtrem2 (sp, rp, np);
+#endif
+	rp[1] = cc;
+	return ((rp[0] | cc) != 0) + cc;
+      }
+    else
+      {
+	rl = np[0];
+	rp[1] = (high << (2*c)) | (rl >> (GMP_NUMB_BITS - 2*c));
+	rp[0] = rl << (2*c);
+	CALL_SQRTREM2_INPLACE (sp, rp);
+	cc = sp[0] >>= c;	/* c != 0, the highest bit of the root cc is 0. */
+	rp[0] = rl -= cc*cc;	/* Computed modulo 2^GMP_LIMB_BITS, because it's smaller. */
+	return rl != 0;
+      }
+  }
+  tn = (nn + 1) / 2; /* 2*tn is the smallest even integer >= nn */
+
+  if ((rp == NULL) && (nn > 8))
+    return mpn_dc_sqrt (sp, np, tn, c, nn & 1);
+  TMP_MARK;
+  if (((nn & 1) | c) != 0)
+    {
+      mp_limb_t s0[1], mask;
+      mp_ptr tp, scratch;
+      TMP_ALLOC_LIMBS_2 (tp, 2 * tn, scratch, tn / 2 + 1);
+      tp[0] = 0;	     /* needed only when 2*tn > nn, but saves a test */
+      if (c != 0)
+	mpn_lshift (tp + (nn & 1), np, nn, 2 * c);
+      else
+	MPN_COPY (tp + (nn & 1), np, nn);
+      c += (nn & 1) ? GMP_NUMB_BITS / 2 : 0;		/* c now represents k */
+      mask = (CNST_LIMB (1) << c) - 1;
+      rl = mpn_dc_sqrtrem (sp, tp, tn, (rp == NULL) ? mask - 1 : 0, scratch);
+      /* We have 2^(2k)*N = S^2 + R where k = c + (2tn-nn)*GMP_NUMB_BITS/2,
+	 thus 2^(2k)*N = (S-s0)^2 + 2*S*s0 - s0^2 + R where s0=S mod 2^k */
+      s0[0] = sp[0] & mask;	/* S mod 2^k */
+      rl += mpn_addmul_1 (tp, sp, tn, 2 * s0[0]);	/* R = R + 2*s0*S */
+      cc = mpn_submul_1 (tp, s0, 1, s0[0]);
+      rl -= (tn > 1) ? mpn_sub_1 (tp + 1, tp + 1, tn - 1, cc) : cc;
+      mpn_rshift (sp, sp, tn, c);
+      tp[tn] = rl;
+      if (rp == NULL)
+	rp = tp;
+      c = c << 1;
+      if (c < GMP_NUMB_BITS)
+	tn++;
+      else
+	{
+	  tp++;
+	  c -= GMP_NUMB_BITS;
+	}
+      if (c != 0)
+	mpn_rshift (rp, tp, tn, c);
+      else
+	MPN_COPY_INCR (rp, tp, tn);
+      rn = tn;
+    }
+  else
+    {
+      if (rp != np)
+	{
+	  if (rp == NULL) /* nn <= 8 */
+	    rp = TMP_SALLOC_LIMBS (nn);
+	  MPN_COPY (rp, np, nn);
+	}
+      rn = tn + (rp[tn] = mpn_dc_sqrtrem (sp, rp, tn, 0, TMP_ALLOC_LIMBS(tn / 2 + 1)));
+    }
+
+  MPN_NORMALIZE (rp, rn);
+
+  TMP_FREE;
+  return rn;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/strongfibo.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/strongfibo.c
deleted file mode 120000
index 0186e6958..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/strongfibo.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/strongfibo.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/strongfibo.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/strongfibo.c
new file mode 100644
index 000000000..210647b31
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/strongfibo.c
@@ -0,0 +1,220 @@
+/* mpn_fib2m -- calculate Fibonacci numbers, modulo m.
+
+Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY.  THEY'RE ALMOST
+   CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
+   FUTURE GNU MP RELEASES.
+
+Copyright 2001, 2002, 2005, 2009, 2018 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include <stdio.h>
+#include "gmp-impl.h"
+
+
+#if HAVE_NATIVE_mpn_rsblsh1_n || HAVE_NATIVE_mpn_sublsh1_n
+#else
+/* Stores |{ap,n}-{bp,n}| in {rp,n},
+   returns the sign of {ap,n}-{bp,n}. */
+static int
+abs_sub_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n)
+{
+  mp_limb_t  x, y;
+  while (--n >= 0)
+    {
+      x = ap[n];
+      y = bp[n];
+      if (x != y)
+        {
+          ++n;
+          if (x > y)
+            {
+              ASSERT_NOCARRY (mpn_sub_n (rp, ap, bp, n));
+              return 1;
+            }
+          else
+            {
+              ASSERT_NOCARRY (mpn_sub_n (rp, bp, ap, n));
+              return -1;
+            }
+        }
+      rp[n] = 0;
+    }
+  return 0;
+}
+#endif
+
+/* Computes at most count terms of the sequence needed by the
+   Lucas-Lehmer-Riesel test, indexing backward:
+   L_i = L_{i+1}^2 - 2
+
+   The sequence is computed modulo M = {mp, mn}.
+   The starting point is given in L_{count+1} = {lp, mn}.
+   The scratch pointed by sp, needs a space of at least 3 * mn + 1 limbs.
+
+   Returns the index i>0 if L_i = 0 (mod M) is found within the
+   computed count terms of the sequence.  Otherwise it returns zero.
+
+   Note: (+/-2)^2-2=2, (+/-1)^2-2=-1, 0^2-2=-2
+ */
+
+static mp_bitcnt_t
+mpn_llriter (mp_ptr lp, mp_srcptr mp, mp_size_t mn, mp_bitcnt_t count, mp_ptr sp)
+{
+  do
+    {
+      mpn_sqr (sp, lp, mn);
+      mpn_tdiv_qr (sp + 2 * mn, lp, 0, sp, 2 * mn, mp, mn);
+      if (lp[0] < 5)
+	{
+	  /* If L^2 % M < 5, |L^2 % M - 2| <= 2 */
+	  if (mn == 1 || mpn_zero_p (lp + 1, mn - 1))
+	    return (lp[0] == 2) ? count : 0;
+	  else
+	    MPN_DECR_U (lp, mn, 2);
+	}
+      else
+	lp[0] -= 2;
+    } while (--count != 0);
+  return 0;
+}
+
+/* Store the Lucas' number L[n] at lp (maybe), computed modulo m.  lp
+   and scratch should have room for mn*2+1 limbs.
+
+   Returns the size of L[n] normally.
+
+   If F[n] is zero modulo m, or L[n] is, returns 0 and lp is
+   undefined.
+*/
+
+static mp_size_t
+mpn_lucm (mp_ptr lp, mp_srcptr np, mp_size_t nn, mp_srcptr mp, mp_size_t mn, mp_ptr scratch)
+{
+  int		neg;
+  mp_limb_t	cy;
+
+  ASSERT (! MPN_OVERLAP_P (lp, MAX(2*mn+1,5), scratch, MAX(2*mn+1,5)));
+  ASSERT (nn > 0);
+
+  neg = mpn_fib2m (lp, scratch, np, nn, mp, mn);
+
+  /* F[n] = +/-{lp, mn}, F[n-1] = +/-{scratch, mn} */
+  if (mpn_zero_p (lp, mn))
+    return 0;
+
+  if (neg) /* One sign is opposite, use sub instead of add. */
+    {
+#if HAVE_NATIVE_mpn_rsblsh1_n || HAVE_NATIVE_mpn_sublsh1_n
+#if HAVE_NATIVE_mpn_rsblsh1_n
+      cy = mpn_rsblsh1_n (lp, lp, scratch, mn); /* L[n] = +/-(2F[n-1]-(-F[n])) */
+#else
+      cy = mpn_sublsh1_n (lp, lp, scratch, mn); /* L[n] = -/+(F[n]-(-2F[n-1])) */
+      if (cy != 0)
+	cy = mpn_add_n (lp, lp, mp, mn) - cy;
+#endif
+      if (cy > 1)
+	cy += mpn_add_n (lp, lp, mp, mn);
+#else
+      cy = mpn_lshift (scratch, scratch, mn, 1); /* 2F[n-1] */
+      if (UNLIKELY (cy))
+	cy -= mpn_sub_n (lp, scratch, lp, mn); /* L[n] = +/-(2F[n-1]-(-F[n])) */
+      else
+	abs_sub_n (lp, lp, scratch, mn);
+#endif
+      ASSERT (cy <= 1);
+    }
+  else
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n
+      cy = mpn_addlsh1_n (lp, lp, scratch, mn); /* L[n] = +/-(2F[n-1]+F[n])) */
+#else
+      cy = mpn_lshift (scratch, scratch, mn, 1);
+      cy+= mpn_add_n (lp, lp, scratch, mn);
+#endif
+      ASSERT (cy <= 2);
+    }
+  while (cy || mpn_cmp (lp, mp, mn) >= 0)
+    cy -= mpn_sub_n (lp, lp, mp, mn);
+  MPN_NORMALIZE (lp, mn);
+  return mn;
+}
+
+int
+mpn_strongfibo (mp_srcptr mp, mp_size_t mn, mp_ptr scratch)
+{
+  mp_ptr	lp, sp;
+  mp_size_t	en;
+  mp_bitcnt_t	b0;
+  TMP_DECL;
+
+#if GMP_NUMB_BITS % 4 == 0
+  b0 = mpn_scan0 (mp, 0);
+#else
+  {
+    mpz_t m = MPZ_ROINIT_N(mp, mn);
+    b0 = mpz_scan0 (m, 0);
+  }
+  if (UNLIKELY (b0 == mn * GMP_NUMB_BITS))
+    {
+      en = 1;
+      scratch [0] = 1;
+    }
+  else
+#endif
+    {
+      int cnt = b0 % GMP_NUMB_BITS;
+      en = b0 / GMP_NUMB_BITS;
+      if (LIKELY (cnt != 0))
+	mpn_rshift (scratch, mp + en, mn - en, cnt);
+      else
+	MPN_COPY (scratch, mp + en, mn - en);
+      en = mn - en;
+      scratch [0] |= 1;
+      en -= scratch [en - 1] == 0;
+    }
+  TMP_MARK;
+
+  lp = TMP_ALLOC_LIMBS (4 * mn + 6);
+  sp = lp + 2 * mn + 3;
+  en = mpn_lucm (sp, scratch, en, mp, mn, lp);
+  if (en != 0 && LIKELY (--b0 != 0))
+    {
+      mpn_sqr (lp, sp, en);
+      lp [0] |= 2; /* V^2 + 2 */
+      if (LIKELY (2 * en >= mn))
+	mpn_tdiv_qr (sp, lp, 0, lp, 2 * en, mp, mn);
+      else
+	MPN_ZERO (lp + 2 * en, mn - 2 * en);
+      if (! mpn_zero_p (lp, mn) && LIKELY (--b0 != 0))
+	b0 = mpn_llriter (lp, mp, mn, b0, lp + mn + 1);
+    }
+  TMP_FREE;
+  return (b0 != 0);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub.c
deleted file mode 120000
index cf4818438..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sub.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub.c
new file mode 100644
index 000000000..df0afd69d
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub.c
@@ -0,0 +1,33 @@
+/* mpn_sub - subtract mpn from mpn.
+
+Copyright 2001 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#define __GMP_FORCE_mpn_sub 1
+
+#include "gmp-impl.h"
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_1.c
deleted file mode 120000
index 4efdb594a..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sub_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_1.c
new file mode 100644
index 000000000..a20f1916d
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_1.c
@@ -0,0 +1,33 @@
+/* mpn_sub_1 - subtract limb from mpn.
+
+Copyright 2001 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#define __GMP_FORCE_mpn_sub_1 1
+
+#include "gmp-impl.h"
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err1_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err1_n.c
deleted file mode 120000
index dde35ce0c..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err1_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sub_err1_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err1_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err1_n.c
new file mode 100644
index 000000000..beca57ece
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err1_n.c
@@ -0,0 +1,100 @@
+/* mpn_sub_err1_n -- sub_n with one error term
+
+   Contributed by David Harvey.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/*
+  Computes:
+
+  (1) {rp,n} := {up,n} - {vp,n} (just like mpn_sub_n) with incoming borrow cy,
+  return value is borrow out.
+
+  (2) Let c[i+1] = borrow from i-th limb subtraction (c[0] = cy).
+  Computes c[1]*yp[n-1] + ... + c[n]*yp[0], stores two-limb result at ep.
+
+  Requires n >= 1.
+
+  None of the outputs may overlap each other or any of the inputs, except
+  that {rp,n} may be equal to {up,n} or {vp,n}.
+*/
+mp_limb_t
+mpn_sub_err1_n (mp_ptr rp, mp_srcptr up, mp_srcptr vp,
+		mp_ptr ep, mp_srcptr yp,
+                mp_size_t n, mp_limb_t cy)
+{
+  mp_limb_t el, eh, ul, vl, yl, zl, rl, sl, cy1, cy2;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, up, n));
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, vp, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 2, up, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 2, vp, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 2, yp, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 2, rp, n));
+
+  yp += n - 1;
+  el = eh = 0;
+
+  do
+    {
+      yl = *yp--;
+      ul = *up++;
+      vl = *vp++;
+
+      /* ordinary sub_n */
+      SUBC_LIMB (cy1, sl, ul, vl);
+      SUBC_LIMB (cy2, rl, sl, cy);
+      cy = cy1 | cy2;
+      *rp++ = rl;
+
+      /* update (eh:el) */
+      zl = (-cy) & yl;
+      el += zl;
+      eh += el < zl;
+    }
+  while (--n);
+
+#if GMP_NAIL_BITS != 0
+  eh = (eh << GMP_NAIL_BITS) + (el >> GMP_NUMB_BITS);
+  el &= GMP_NUMB_MASK;
+#endif
+
+  ep[0] = el;
+  ep[1] = eh;
+
+  return cy;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err2_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err2_n.c
deleted file mode 120000
index f59bfd667..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err2_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sub_err2_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err2_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err2_n.c
new file mode 100644
index 000000000..1edf8d6d9
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err2_n.c
@@ -0,0 +1,116 @@
+/* mpn_sub_err2_n -- sub_n with two error terms
+
+   Contributed by David Harvey.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/*
+  Computes:
+
+  (1) {rp,n} := {up,n} - {vp,n} (just like mpn_sub_n) with incoming borrow cy,
+  return value is borrow out.
+
+  (2) Let c[i+1] = borrow from i-th limb subtraction (c[0] = cy).
+  Computes c[1]*yp1[n-1] + ... + c[n]*yp1[0],
+           c[1]*yp2[n-1] + ... + c[n]*yp2[0],
+  stores two-limb results at {ep,2} and {ep+2,2} respectively.
+
+  Requires n >= 1.
+
+  None of the outputs may overlap each other or any of the inputs, except
+  that {rp,n} may be equal to {up,n} or {vp,n}.
+*/
+mp_limb_t
+mpn_sub_err2_n (mp_ptr rp, mp_srcptr up, mp_srcptr vp,
+                mp_ptr ep, mp_srcptr yp1, mp_srcptr yp2,
+                mp_size_t n, mp_limb_t cy)
+{
+  mp_limb_t el1, eh1, el2, eh2, ul, vl, yl1, yl2, zl1, zl2, rl, sl, cy1, cy2;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, up, n));
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, vp, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp1, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp2, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 4, up, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 4, vp, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 4, yp1, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 4, yp2, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 4, rp, n));
+
+  yp1 += n - 1;
+  yp2 += n - 1;
+  el1 = eh1 = 0;
+  el2 = eh2 = 0;
+
+  do
+    {
+      yl1 = *yp1--;
+      yl2 = *yp2--;
+      ul = *up++;
+      vl = *vp++;
+
+      /* ordinary sub_n */
+      SUBC_LIMB (cy1, sl, ul, vl);
+      SUBC_LIMB (cy2, rl, sl, cy);
+      cy = cy1 | cy2;
+      *rp++ = rl;
+
+      /* update (eh1:el1) */
+      zl1 = (-cy) & yl1;
+      el1 += zl1;
+      eh1 += el1 < zl1;
+
+      /* update (eh2:el2) */
+      zl2 = (-cy) & yl2;
+      el2 += zl2;
+      eh2 += el2 < zl2;
+    }
+  while (--n);
+
+#if GMP_NAIL_BITS != 0
+  eh1 = (eh1 << GMP_NAIL_BITS) + (el1 >> GMP_NUMB_BITS);
+  el1 &= GMP_NUMB_MASK;
+  eh2 = (eh2 << GMP_NAIL_BITS) + (el2 >> GMP_NUMB_BITS);
+  el2 &= GMP_NUMB_MASK;
+#endif
+
+  ep[0] = el1;
+  ep[1] = eh1;
+  ep[2] = el2;
+  ep[3] = eh2;
+
+  return cy;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err3_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err3_n.c
deleted file mode 120000
index ea03b12e0..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err3_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sub_err3_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err3_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err3_n.c
new file mode 100644
index 000000000..2db3c634f
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_err3_n.c
@@ -0,0 +1,131 @@
+/* mpn_sub_err3_n -- sub_n with three error terms
+
+   Contributed by David Harvey.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/*
+  Computes:
+
+  (1) {rp,n} := {up,n} - {vp,n} (just like mpn_sub_n) with incoming borrow cy,
+  return value is borrow out.
+
+  (2) Let c[i+1] = borrow from i-th limb subtraction (c[0] = cy).
+  Computes c[1]*yp1[n-1] + ... + c[n]*yp1[0],
+           c[1]*yp2[n-1] + ... + c[n]*yp2[0],
+           c[1]*yp3[n-1] + ... + c[n]*yp3[0],
+  stores two-limb results at {ep,2}, {ep+2,2} and {ep+4,2} respectively.
+
+  Requires n >= 1.
+
+  None of the outputs may overlap each other or any of the inputs, except
+  that {rp,n} may be equal to {up,n} or {vp,n}.
+*/
+mp_limb_t
+mpn_sub_err3_n (mp_ptr rp, mp_srcptr up, mp_srcptr vp,
+                mp_ptr ep, mp_srcptr yp1, mp_srcptr yp2, mp_srcptr yp3,
+                mp_size_t n, mp_limb_t cy)
+{
+  mp_limb_t el1, eh1, el2, eh2, el3, eh3, ul, vl, yl1, yl2, yl3, zl1, zl2, zl3, rl, sl, cy1, cy2;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, up, n));
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, vp, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp1, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp2, n));
+  ASSERT (! MPN_OVERLAP_P (rp, n, yp3, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 6, up, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 6, vp, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 6, yp1, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 6, yp2, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 6, yp3, n));
+  ASSERT (! MPN_OVERLAP_P (ep, 6, rp, n));
+
+  yp1 += n - 1;
+  yp2 += n - 1;
+  yp3 += n - 1;
+  el1 = eh1 = 0;
+  el2 = eh2 = 0;
+  el3 = eh3 = 0;
+
+  do
+    {
+      yl1 = *yp1--;
+      yl2 = *yp2--;
+      yl3 = *yp3--;
+      ul = *up++;
+      vl = *vp++;
+
+      /* ordinary sub_n */
+      SUBC_LIMB (cy1, sl, ul, vl);
+      SUBC_LIMB (cy2, rl, sl, cy);
+      cy = cy1 | cy2;
+      *rp++ = rl;
+
+      /* update (eh1:el1) */
+      zl1 = (-cy) & yl1;
+      el1 += zl1;
+      eh1 += el1 < zl1;
+
+      /* update (eh2:el2) */
+      zl2 = (-cy) & yl2;
+      el2 += zl2;
+      eh2 += el2 < zl2;
+
+      /* update (eh3:el3) */
+      zl3 = (-cy) & yl3;
+      el3 += zl3;
+      eh3 += el3 < zl3;
+    }
+  while (--n);
+
+#if GMP_NAIL_BITS != 0
+  eh1 = (eh1 << GMP_NAIL_BITS) + (el1 >> GMP_NUMB_BITS);
+  el1 &= GMP_NUMB_MASK;
+  eh2 = (eh2 << GMP_NAIL_BITS) + (el2 >> GMP_NUMB_BITS);
+  el2 &= GMP_NUMB_MASK;
+  eh3 = (eh3 << GMP_NAIL_BITS) + (el3 >> GMP_NUMB_BITS);
+  el3 &= GMP_NUMB_MASK;
+#endif
+
+  ep[0] = el1;
+  ep[1] = eh1;
+  ep[2] = el2;
+  ep[3] = eh2;
+  ep[4] = el3;
+  ep[5] = eh3;
+
+  return cy;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_n.c
deleted file mode 120000
index 1926b4638..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/sub_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_n.c
new file mode 100644
index 000000000..b192c9655
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/sub_n.c
@@ -0,0 +1,89 @@
+/* mpn_sub_n -- Subtract equal length limb vectors.
+
+Copyright 1992-1994, 1996, 2000, 2002, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+#if GMP_NAIL_BITS == 0
+
+mp_limb_t
+mpn_sub_n (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  mp_limb_t ul, vl, sl, rl, cy, cy1, cy2;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_INCR_P (rp, up, n));
+  ASSERT (MPN_SAME_OR_INCR_P (rp, vp, n));
+
+  cy = 0;
+  do
+    {
+      ul = *up++;
+      vl = *vp++;
+      sl = ul - vl;
+      cy1 = sl > ul;
+      rl = sl - cy;
+      cy2 = rl > sl;
+      cy = cy1 | cy2;
+      *rp++ = rl;
+    }
+  while (--n != 0);
+
+  return cy;
+}
+
+#endif
+
+#if GMP_NAIL_BITS >= 1
+
+mp_limb_t
+mpn_sub_n (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  mp_limb_t ul, vl, rl, cy;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_INCR_P (rp, up, n));
+  ASSERT (MPN_SAME_OR_INCR_P (rp, vp, n));
+
+  cy = 0;
+  do
+    {
+      ul = *up++;
+      vl = *vp++;
+      rl = ul - vl - cy;
+      cy = rl >> (GMP_LIMB_BITS - 1);
+      *rp++ = rl & GMP_NUMB_MASK;
+    }
+  while (--n != 0);
+
+  return cy;
+}
+
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/submul_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/submul_1.c
deleted file mode 120000
index be9f534f5..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/submul_1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/submul_1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/submul_1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/submul_1.c
new file mode 100644
index 000000000..47442746d
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/submul_1.c
@@ -0,0 +1,144 @@
+/* mpn_submul_1 -- multiply the N long limb vector pointed to by UP by VL,
+   subtract the N least significant limbs of the product from the limb
+   vector pointed to by RP.  Return the most significant limb of the
+   product, adjusted for carry-out from the subtraction.
+
+Copyright 1992-1994, 1996, 2000, 2002, 2004 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+#if GMP_NAIL_BITS == 0
+
+mp_limb_t
+mpn_submul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t v0)
+{
+  mp_limb_t u0, crec, c, p1, p0, r0;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, up, n));
+
+  crec = 0;
+  do
+    {
+      u0 = *up++;
+      umul_ppmm (p1, p0, u0, v0);
+
+      r0 = *rp;
+
+      p0 = r0 - p0;
+      c = r0 < p0;
+
+      p1 = p1 + c;
+
+      r0 = p0 - crec;		/* cycle 0, 3, ... */
+      c = p0 < r0;		/* cycle 1, 4, ... */
+
+      crec = p1 + c;		/* cycle 2, 5, ... */
+
+      *rp++ = r0;
+    }
+  while (--n != 0);
+
+  return crec;
+}
+
+#endif
+
+#if GMP_NAIL_BITS == 1
+
+mp_limb_t
+mpn_submul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t v0)
+{
+  mp_limb_t shifted_v0, u0, r0, p0, p1, prev_p1, cl, xl, c1, c2, c3;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, up, n));
+  ASSERT_MPN (rp, n);
+  ASSERT_MPN (up, n);
+  ASSERT_LIMB (v0);
+
+  shifted_v0 = v0 << GMP_NAIL_BITS;
+  cl = 0;
+  prev_p1 = 0;
+  do
+    {
+      u0 = *up++;
+      r0 = *rp;
+      umul_ppmm (p1, p0, u0, shifted_v0);
+      p0 >>= GMP_NAIL_BITS;
+      SUBC_LIMB (c1, xl, r0, prev_p1);
+      SUBC_LIMB (c2, xl, xl, p0);
+      SUBC_LIMB (c3, xl, xl, cl);
+      cl = c1 + c2 + c3;
+      *rp++ = xl;
+      prev_p1 = p1;
+    }
+  while (--n != 0);
+
+  return prev_p1 + cl;
+}
+
+#endif
+
+#if GMP_NAIL_BITS >= 2
+
+mp_limb_t
+mpn_submul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t v0)
+{
+  mp_limb_t shifted_v0, u0, r0, p0, p1, prev_p1, xw, cl, xl;
+
+  ASSERT (n >= 1);
+  ASSERT (MPN_SAME_OR_SEPARATE_P (rp, up, n));
+  ASSERT_MPN (rp, n);
+  ASSERT_MPN (up, n);
+  ASSERT_LIMB (v0);
+
+  shifted_v0 = v0 << GMP_NAIL_BITS;
+  cl = 0;
+  prev_p1 = 0;
+  do
+    {
+      u0 = *up++;
+      r0 = *rp;
+      umul_ppmm (p1, p0, u0, shifted_v0);
+      p0 >>= GMP_NAIL_BITS;
+      xw = r0 - (prev_p1 + p0) + cl;
+      cl = (mp_limb_signed_t) xw >> GMP_NUMB_BITS; /* FIXME: non-portable */
+      xl = xw & GMP_NUMB_MASK;
+      *rp++ = xl;
+      prev_p1 = p1;
+    }
+  while (--n != 0);
+
+  return prev_p1 - cl;
+}
+
+#endif
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/tdiv_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/tdiv_qr.c
deleted file mode 120000
index a5b0b25ee..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/tdiv_qr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/tdiv_qr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/tdiv_qr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/tdiv_qr.c
new file mode 100644
index 000000000..92ff33cff
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/tdiv_qr.c
@@ -0,0 +1,386 @@
+/* mpn_tdiv_qr -- Divide the numerator (np,nn) by the denominator (dp,dn) and
+   write the nn-dn+1 quotient limbs at qp and the dn remainder limbs at rp.  If
+   qxn is non-zero, generate that many fraction limbs and append them after the
+   other quotient limbs, and update the remainder accordingly.  The input
+   operands are unaffected.
+
+   Preconditions:
+   1. The most significant limb of the divisor must be non-zero.
+   2. nn >= dn, even if qxn is non-zero.  (??? relax this ???)
+
+   The time complexity of this is O(qn*qn+M(dn,qn)), where M(m,n) is the time
+   complexity of multiplication.
+
+Copyright 1997, 2000-2002, 2005, 2009, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+#include "longlong.h"
+
+
+void
+mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
+	     mp_srcptr np, mp_size_t nn, mp_srcptr dp, mp_size_t dn)
+{
+  ASSERT_ALWAYS (qxn == 0);
+
+  ASSERT (nn >= 0);
+  ASSERT (dn >= 0);
+  ASSERT (dn == 0 || dp[dn - 1] != 0);
+  ASSERT (! MPN_OVERLAP_P (qp, nn - dn + 1 + qxn, np, nn));
+  ASSERT (! MPN_OVERLAP_P (qp, nn - dn + 1 + qxn, dp, dn));
+
+  switch (dn)
+    {
+    case 0:
+      DIVIDE_BY_ZERO;
+
+    case 1:
+      {
+	rp[0] = mpn_divrem_1 (qp, (mp_size_t) 0, np, nn, dp[0]);
+	return;
+      }
+
+    case 2:
+      {
+	mp_ptr n2p;
+	mp_limb_t qhl, cy;
+	TMP_DECL;
+	TMP_MARK;
+	if ((dp[1] & GMP_NUMB_HIGHBIT) == 0)
+	  {
+	    int cnt;
+	    mp_limb_t d2p[2];
+	    count_leading_zeros (cnt, dp[1]);
+	    cnt -= GMP_NAIL_BITS;
+	    d2p[1] = (dp[1] << cnt) | (dp[0] >> (GMP_NUMB_BITS - cnt));
+	    d2p[0] = (dp[0] << cnt) & GMP_NUMB_MASK;
+	    n2p = TMP_ALLOC_LIMBS (nn + 1);
+	    cy = mpn_lshift (n2p, np, nn, cnt);
+	    n2p[nn] = cy;
+	    qhl = mpn_divrem_2 (qp, 0L, n2p, nn + (cy != 0), d2p);
+	    if (cy == 0)
+	      qp[nn - 2] = qhl;	/* always store nn-2+1 quotient limbs */
+	    rp[0] = (n2p[0] >> cnt)
+	      | ((n2p[1] << (GMP_NUMB_BITS - cnt)) & GMP_NUMB_MASK);
+	    rp[1] = (n2p[1] >> cnt);
+	  }
+	else
+	  {
+	    n2p = TMP_ALLOC_LIMBS (nn);
+	    MPN_COPY (n2p, np, nn);
+	    qhl = mpn_divrem_2 (qp, 0L, n2p, nn, dp);
+	    qp[nn - 2] = qhl;	/* always store nn-2+1 quotient limbs */
+	    rp[0] = n2p[0];
+	    rp[1] = n2p[1];
+	  }
+	TMP_FREE;
+	return;
+      }
+
+    default:
+      {
+	int adjust;
+	gmp_pi1_t dinv;
+	TMP_DECL;
+	TMP_MARK;
+	adjust = np[nn - 1] >= dp[dn - 1];	/* conservative tests for quotient size */
+	if (nn + adjust >= 2 * dn)
+	  {
+	    mp_ptr n2p, d2p;
+	    mp_limb_t cy;
+	    int cnt;
+
+	    qp[nn - dn] = 0;			  /* zero high quotient limb */
+	    if ((dp[dn - 1] & GMP_NUMB_HIGHBIT) == 0) /* normalize divisor */
+	      {
+		count_leading_zeros (cnt, dp[dn - 1]);
+		cnt -= GMP_NAIL_BITS;
+		d2p = TMP_ALLOC_LIMBS (dn);
+		mpn_lshift (d2p, dp, dn, cnt);
+		n2p = TMP_ALLOC_LIMBS (nn + 1);
+		cy = mpn_lshift (n2p, np, nn, cnt);
+		n2p[nn] = cy;
+		nn += adjust;
+	      }
+	    else
+	      {
+		cnt = 0;
+		d2p = (mp_ptr) dp;
+		n2p = TMP_ALLOC_LIMBS (nn + 1);
+		MPN_COPY (n2p, np, nn);
+		n2p[nn] = 0;
+		nn += adjust;
+	      }
+
+	    invert_pi1 (dinv, d2p[dn - 1], d2p[dn - 2]);
+	    if (BELOW_THRESHOLD (dn, DC_DIV_QR_THRESHOLD))
+	      mpn_sbpi1_div_qr (qp, n2p, nn, d2p, dn, dinv.inv32);
+	    else if (BELOW_THRESHOLD (dn, MUPI_DIV_QR_THRESHOLD) ||   /* fast condition */
+		     BELOW_THRESHOLD (nn, 2 * MU_DIV_QR_THRESHOLD) || /* fast condition */
+		     (double) (2 * (MU_DIV_QR_THRESHOLD - MUPI_DIV_QR_THRESHOLD)) * dn /* slow... */
+		     + (double) MUPI_DIV_QR_THRESHOLD * nn > (double) dn * nn)    /* ...condition */
+	      mpn_dcpi1_div_qr (qp, n2p, nn, d2p, dn, &dinv);
+	    else
+	      {
+		mp_size_t itch = mpn_mu_div_qr_itch (nn, dn, 0);
+		mp_ptr scratch = TMP_ALLOC_LIMBS (itch);
+		mpn_mu_div_qr (qp, rp, n2p, nn, d2p, dn, scratch);
+		n2p = rp;
+	      }
+
+	    if (cnt != 0)
+	      mpn_rshift (rp, n2p, dn, cnt);
+	    else
+	      MPN_COPY (rp, n2p, dn);
+	    TMP_FREE;
+	    return;
+	  }
+
+	/* When we come here, the numerator/partial remainder is less
+	   than twice the size of the denominator.  */
+
+	  {
+	    /* Problem:
+
+	       Divide a numerator N with nn limbs by a denominator D with dn
+	       limbs forming a quotient of qn=nn-dn+1 limbs.  When qn is small
+	       compared to dn, conventional division algorithms perform poorly.
+	       We want an algorithm that has an expected running time that is
+	       dependent only on qn.
+
+	       Algorithm (very informally stated):
+
+	       1) Divide the 2 x qn most significant limbs from the numerator
+		  by the qn most significant limbs from the denominator.  Call
+		  the result qest.  This is either the correct quotient, but
+		  might be 1 or 2 too large.  Compute the remainder from the
+		  division.  (This step is implemented by an mpn_divrem call.)
+
+	       2) Is the most significant limb from the remainder < p, where p
+		  is the product of the most significant limb from the quotient
+		  and the next(d)?  (Next(d) denotes the next ignored limb from
+		  the denominator.)  If it is, decrement qest, and adjust the
+		  remainder accordingly.
+
+	       3) Is the remainder >= qest?  If it is, qest is the desired
+		  quotient.  The algorithm terminates.
+
+	       4) Subtract qest x next(d) from the remainder.  If there is
+		  borrow out, decrement qest, and adjust the remainder
+		  accordingly.
+
+	       5) Skip one word from the denominator (i.e., let next(d) denote
+		  the next less significant limb.  */
+
+	    mp_size_t qn;
+	    mp_ptr n2p, d2p;
+	    mp_ptr tp;
+	    mp_limb_t cy;
+	    mp_size_t in, rn;
+	    mp_limb_t quotient_too_large;
+	    unsigned int cnt;
+
+	    qn = nn - dn;
+	    qp[qn] = 0;				/* zero high quotient limb */
+	    qn += adjust;			/* qn cannot become bigger */
+
+	    if (qn == 0)
+	      {
+		MPN_COPY (rp, np, dn);
+		TMP_FREE;
+		return;
+	      }
+
+	    in = dn - qn;		/* (at least partially) ignored # of limbs in ops */
+	    /* Normalize denominator by shifting it to the left such that its
+	       most significant bit is set.  Then shift the numerator the same
+	       amount, to mathematically preserve quotient.  */
+	    if ((dp[dn - 1] & GMP_NUMB_HIGHBIT) == 0)
+	      {
+		count_leading_zeros (cnt, dp[dn - 1]);
+		cnt -= GMP_NAIL_BITS;
+
+		d2p = TMP_ALLOC_LIMBS (qn);
+		mpn_lshift (d2p, dp + in, qn, cnt);
+		d2p[0] |= dp[in - 1] >> (GMP_NUMB_BITS - cnt);
+
+		n2p = TMP_ALLOC_LIMBS (2 * qn + 1);
+		cy = mpn_lshift (n2p, np + nn - 2 * qn, 2 * qn, cnt);
+		if (adjust)
+		  {
+		    n2p[2 * qn] = cy;
+		    n2p++;
+		  }
+		else
+		  {
+		    n2p[0] |= np[nn - 2 * qn - 1] >> (GMP_NUMB_BITS - cnt);
+		  }
+	      }
+	    else
+	      {
+		cnt = 0;
+		d2p = (mp_ptr) dp + in;
+
+		n2p = TMP_ALLOC_LIMBS (2 * qn + 1);
+		MPN_COPY (n2p, np + nn - 2 * qn, 2 * qn);
+		if (adjust)
+		  {
+		    n2p[2 * qn] = 0;
+		    n2p++;
+		  }
+	      }
+
+	    /* Get an approximate quotient using the extracted operands.  */
+	    if (qn == 1)
+	      {
+		mp_limb_t q0, r0;
+		udiv_qrnnd (q0, r0, n2p[1], n2p[0] << GMP_NAIL_BITS, d2p[0] << GMP_NAIL_BITS);
+		n2p[0] = r0 >> GMP_NAIL_BITS;
+		qp[0] = q0;
+	      }
+	    else if (qn == 2)
+	      mpn_divrem_2 (qp, 0L, n2p, 4L, d2p); /* FIXME: obsolete function */
+	    else
+	      {
+		invert_pi1 (dinv, d2p[qn - 1], d2p[qn - 2]);
+		if (BELOW_THRESHOLD (qn, DC_DIV_QR_THRESHOLD))
+		  mpn_sbpi1_div_qr (qp, n2p, 2 * qn, d2p, qn, dinv.inv32);
+		else if (BELOW_THRESHOLD (qn, MU_DIV_QR_THRESHOLD))
+		  mpn_dcpi1_div_qr (qp, n2p, 2 * qn, d2p, qn, &dinv);
+		else
+		  {
+		    mp_size_t itch = mpn_mu_div_qr_itch (2 * qn, qn, 0);
+		    mp_ptr scratch = TMP_ALLOC_LIMBS (itch);
+		    mp_ptr r2p = rp;
+		    if (np == r2p)	/* If N and R share space, put ... */
+		      r2p += nn - qn;	/* intermediate remainder at N's upper end. */
+		    mpn_mu_div_qr (qp, r2p, n2p, 2 * qn, d2p, qn, scratch);
+		    MPN_COPY (n2p, r2p, qn);
+		  }
+	      }
+
+	    rn = qn;
+	    /* Multiply the first ignored divisor limb by the most significant
+	       quotient limb.  If that product is > the partial remainder's
+	       most significant limb, we know the quotient is too large.  This
+	       test quickly catches most cases where the quotient is too large;
+	       it catches all cases where the quotient is 2 too large.  */
+	    {
+	      mp_limb_t dl, x;
+	      mp_limb_t h, dummy;
+
+	      if (in - 2 < 0)
+		dl = 0;
+	      else
+		dl = dp[in - 2];
+
+#if GMP_NAIL_BITS == 0
+	      x = (dp[in - 1] << cnt) | ((dl >> 1) >> ((~cnt) % GMP_LIMB_BITS));
+#else
+	      x = (dp[in - 1] << cnt) & GMP_NUMB_MASK;
+	      if (cnt != 0)
+		x |= dl >> (GMP_NUMB_BITS - cnt);
+#endif
+	      umul_ppmm (h, dummy, x, qp[qn - 1] << GMP_NAIL_BITS);
+
+	      if (n2p[qn - 1] < h)
+		{
+		  mp_limb_t cy;
+
+		  mpn_decr_u (qp, (mp_limb_t) 1);
+		  cy = mpn_add_n (n2p, n2p, d2p, qn);
+		  if (cy)
+		    {
+		      /* The partial remainder is safely large.  */
+		      n2p[qn] = cy;
+		      ++rn;
+		    }
+		}
+	    }
+
+	    quotient_too_large = 0;
+	    if (cnt != 0)
+	      {
+		mp_limb_t cy1, cy2;
+
+		/* Append partially used numerator limb to partial remainder.  */
+		cy1 = mpn_lshift (n2p, n2p, rn, GMP_NUMB_BITS - cnt);
+		n2p[0] |= np[in - 1] & (GMP_NUMB_MASK >> cnt);
+
+		/* Update partial remainder with partially used divisor limb.  */
+		cy2 = mpn_submul_1 (n2p, qp, qn, dp[in - 1] & (GMP_NUMB_MASK >> cnt));
+		if (qn != rn)
+		  {
+		    ASSERT_ALWAYS (n2p[qn] >= cy2);
+		    n2p[qn] -= cy2;
+		  }
+		else
+		  {
+		    n2p[qn] = cy1 - cy2; /* & GMP_NUMB_MASK; */
+
+		    quotient_too_large = (cy1 < cy2);
+		    ++rn;
+		  }
+		--in;
+	      }
+	    /* True: partial remainder now is neutral, i.e., it is not shifted up.  */
+
+	    tp = TMP_ALLOC_LIMBS (dn);
+
+	    if (in < qn)
+	      {
+		if (in == 0)
+		  {
+		    MPN_COPY (rp, n2p, rn);
+		    ASSERT_ALWAYS (rn == dn);
+		    goto foo;
+		  }
+		mpn_mul (tp, qp, qn, dp, in);
+	      }
+	    else
+	      mpn_mul (tp, dp, in, qp, qn);
+
+	    cy = mpn_sub (n2p, n2p, rn, tp + in, qn);
+	    MPN_COPY (rp + in, n2p, dn - in);
+	    quotient_too_large |= cy;
+	    cy = mpn_sub_n (rp, np, tp, in);
+	    cy = mpn_sub_1 (rp + in, rp + in, rn, cy);
+	    quotient_too_large |= cy;
+	  foo:
+	    if (quotient_too_large)
+	      {
+		mpn_decr_u (qp, (mp_limb_t) 1);
+		mpn_add_n (rp, rp, dp, dn);
+	      }
+	  }
+	TMP_FREE;
+	return;
+      }
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom22_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom22_mul.c
deleted file mode 120000
index d9611f34a..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom22_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom22_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom22_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom22_mul.c
new file mode 100644
index 000000000..64f024aac
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom22_mul.c
@@ -0,0 +1,221 @@
+/* mpn_toom22_mul -- Multiply {ap,an} and {bp,bn} where an >= bn.  Or more
+   accurately, bn <= an < 2bn.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2010, 2012, 2014, 2018 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -1, 0, +inf
+
+  <-s--><--n-->
+   ____ ______
+  |_a1_|___a0_|
+   |b1_|___b0_|
+   <-t-><--n-->
+
+  v0  =  a0     * b0       #   A(0)*B(0)
+  vm1 = (a0- a1)*(b0- b1)  #  A(-1)*B(-1)
+  vinf=      a1 *     b1   # A(inf)*B(inf)
+*/
+
+#if TUNE_PROGRAM_BUILD || WANT_FAT_BINARY
+#define MAYBE_mul_toom22   1
+#else
+#define MAYBE_mul_toom22						\
+  (MUL_TOOM33_THRESHOLD >= 2 * MUL_TOOM22_THRESHOLD)
+#endif
+
+#define TOOM22_MUL_N_REC(p, a, b, n, ws)				\
+  do {									\
+    if (! MAYBE_mul_toom22						\
+	|| BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))			\
+      mpn_mul_basecase (p, a, n, b, n);					\
+    else								\
+      mpn_toom22_mul (p, a, n, b, n, ws);				\
+  } while (0)
+
+/* Normally, this calls mul_basecase or toom22_mul.  But when when the fraction
+   MUL_TOOM33_THRESHOLD / MUL_TOOM22_THRESHOLD is large, an initially small
+   relative unbalance will become a larger and larger relative unbalance with
+   each recursion (the difference s-t will be invariant over recursive calls).
+   Therefore, we need to call toom32_mul.  FIXME: Suppress depending on
+   MUL_TOOM33_THRESHOLD / MUL_TOOM22_THRESHOLD and on MUL_TOOM22_THRESHOLD.  */
+#define TOOM22_MUL_REC(p, a, an, b, bn, ws)				\
+  do {									\
+    if (! MAYBE_mul_toom22						\
+	|| BELOW_THRESHOLD (bn, MUL_TOOM22_THRESHOLD))			\
+      mpn_mul_basecase (p, a, an, b, bn);				\
+    else if (4 * an < 5 * bn)						\
+      mpn_toom22_mul (p, a, an, b, bn, ws);				\
+    else								\
+      mpn_toom32_mul (p, a, an, b, bn, ws);				\
+  } while (0)
+
+void
+mpn_toom22_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn,
+		mp_ptr scratch)
+{
+  const int __gmpn_cpuvec_initialized = 1;
+  mp_size_t n, s, t;
+  int vm1_neg;
+  mp_limb_t cy, cy2;
+  mp_ptr asm1;
+  mp_ptr bsm1;
+
+#define a0  ap
+#define a1  (ap + n)
+#define b0  bp
+#define b1  (bp + n)
+
+  s = an >> 1;
+  n = an - s;
+  t = bn - n;
+
+  ASSERT (an >= bn);
+
+  ASSERT (0 < s && s <= n && s >= n - 1);
+  ASSERT (0 < t && t <= s);
+
+  asm1 = pp;
+  bsm1 = pp + n;
+
+  vm1_neg = 0;
+
+  /* Compute asm1.  */
+  if (s == n)
+    {
+      if (mpn_cmp (a0, a1, n) < 0)
+	{
+	  mpn_sub_n (asm1, a1, a0, n);
+	  vm1_neg = 1;
+	}
+      else
+	{
+	  mpn_sub_n (asm1, a0, a1, n);
+	}
+    }
+  else /* n - s == 1 */
+    {
+      if (a0[s] == 0 && mpn_cmp (a0, a1, s) < 0)
+	{
+	  mpn_sub_n (asm1, a1, a0, s);
+	  asm1[s] = 0;
+	  vm1_neg = 1;
+	}
+      else
+	{
+	  asm1[s] = a0[s] - mpn_sub_n (asm1, a0, a1, s);
+	}
+    }
+
+  /* Compute bsm1.  */
+  if (t == n)
+    {
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, n);
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  mpn_sub_n (bsm1, b0, b1, n);
+	}
+    }
+  else
+    {
+      if (mpn_zero_p (b0 + t, n - t) && mpn_cmp (b0, b1, t) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, t);
+	  MPN_ZERO (bsm1 + t, n - t);
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  mpn_sub (bsm1, b0, n, b1, t);
+	}
+    }
+
+#define v0	pp				/* 2n */
+#define vinf	(pp + 2 * n)			/* s+t */
+#define vm1	scratch				/* 2n */
+#define scratch_out	scratch + 2 * n
+
+  /* vm1, 2n limbs */
+  TOOM22_MUL_N_REC (vm1, asm1, bsm1, n, scratch_out);
+
+  if (s > t)  TOOM22_MUL_REC (vinf, a1, s, b1, t, scratch_out);
+  else        TOOM22_MUL_N_REC (vinf, a1, b1, s, scratch_out);
+
+  /* v0, 2n limbs */
+  TOOM22_MUL_N_REC (v0, ap, bp, n, scratch_out);
+
+  /* H(v0) + L(vinf) */
+  cy = mpn_add_n (pp + 2 * n, v0 + n, vinf, n);
+
+  /* L(v0) + H(v0) */
+  cy2 = cy + mpn_add_n (pp + n, pp + 2 * n, v0, n);
+
+  /* L(vinf) + H(vinf) */
+  cy += mpn_add (pp + 2 * n, pp + 2 * n, n, vinf + n, s + t - n);
+
+  if (vm1_neg)
+    cy += mpn_add_n (pp + n, pp + n, vm1, 2 * n);
+  else {
+    cy -= mpn_sub_n (pp + n, pp + n, vm1, 2 * n);
+    if (UNLIKELY (cy + 1 == 0)) { /* cy is negative */
+      /* The total contribution of v0+vinf-vm1 can not be negative. */
+#if WANT_ASSERT
+      /* The borrow in cy stops the propagation of the carry cy2, */
+      ASSERT (cy2 == 1);
+      cy += mpn_add_1 (pp + 2 * n, pp + 2 * n, n, cy2);
+      ASSERT (cy == 0);
+#else
+      /* we simply fill the area with zeros. */
+      MPN_FILL (pp + 2 * n, n, 0);
+#endif
+      return;
+    }
+  }
+
+  ASSERT (cy  <= 2);
+  ASSERT (cy2 <= 2);
+
+  MPN_INCR_U (pp + 2 * n, s + t, cy2);
+  /* if s+t==n, cy is zero, but we should not access pp[3*n] at all. */
+  MPN_INCR_U (pp + 3 * n, s + t - n, cy);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom2_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom2_sqr.c
deleted file mode 120000
index 2f4a7199a..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom2_sqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom2_sqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom2_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom2_sqr.c
new file mode 100644
index 000000000..4eaa1417a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom2_sqr.c
@@ -0,0 +1,155 @@
+/* mpn_toom2_sqr -- Square {ap,an}.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2010, 2012, 2014, 2018 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -1, 0, +inf
+
+  <-s--><--n-->
+   ____ ______
+  |_a1_|___a0_|
+
+  v0  =  a0     ^2  #   A(0)^2
+  vm1 = (a0- a1)^2  #  A(-1)^2
+  vinf=      a1 ^2  # A(inf)^2
+*/
+
+#if TUNE_PROGRAM_BUILD || WANT_FAT_BINARY
+#define MAYBE_sqr_toom2   1
+#else
+#define MAYBE_sqr_toom2							\
+  (SQR_TOOM3_THRESHOLD >= 2 * SQR_TOOM2_THRESHOLD)
+#endif
+
+#define TOOM2_SQR_REC(p, a, n, ws)					\
+  do {									\
+    if (! MAYBE_sqr_toom2						\
+	|| BELOW_THRESHOLD (n, SQR_TOOM2_THRESHOLD))			\
+      mpn_sqr_basecase (p, a, n);					\
+    else								\
+      mpn_toom2_sqr (p, a, n, ws);					\
+  } while (0)
+
+void
+mpn_toom2_sqr (mp_ptr pp,
+	       mp_srcptr ap, mp_size_t an,
+	       mp_ptr scratch)
+{
+  const int __gmpn_cpuvec_initialized = 1;
+  mp_size_t n, s;
+  mp_limb_t cy, cy2;
+  mp_ptr asm1;
+
+#define a0  ap
+#define a1  (ap + n)
+
+  s = an >> 1;
+  n = an - s;
+
+  ASSERT (0 < s && s <= n && s >= n - 1);
+
+  asm1 = pp;
+
+  /* Compute asm1.  */
+  if (s == n)
+    {
+      if (mpn_cmp (a0, a1, n) < 0)
+	{
+	  mpn_sub_n (asm1, a1, a0, n);
+	}
+      else
+	{
+	  mpn_sub_n (asm1, a0, a1, n);
+	}
+    }
+  else /* n - s == 1 */
+    {
+      if (a0[s] == 0 && mpn_cmp (a0, a1, s) < 0)
+	{
+	  mpn_sub_n (asm1, a1, a0, s);
+	  asm1[s] = 0;
+	}
+      else
+	{
+	  asm1[s] = a0[s] - mpn_sub_n (asm1, a0, a1, s);
+	}
+    }
+
+#define v0	pp				/* 2n */
+#define vinf	(pp + 2 * n)			/* s+s */
+#define vm1	scratch				/* 2n */
+#define scratch_out	scratch + 2 * n
+
+  /* vm1, 2n limbs */
+  TOOM2_SQR_REC (vm1, asm1, n, scratch_out);
+
+  /* vinf, s+s limbs */
+  TOOM2_SQR_REC (vinf, a1, s, scratch_out);
+
+  /* v0, 2n limbs */
+  TOOM2_SQR_REC (v0, ap, n, scratch_out);
+
+  /* H(v0) + L(vinf) */
+  cy = mpn_add_n (pp + 2 * n, v0 + n, vinf, n);
+
+  /* L(v0) + H(v0) */
+  cy2 = cy + mpn_add_n (pp + n, pp + 2 * n, v0, n);
+
+  /* L(vinf) + H(vinf) */
+  cy += mpn_add (pp + 2 * n, pp + 2 * n, n, vinf + n, s + s - n);
+
+  cy -= mpn_sub_n (pp + n, pp + n, vm1, 2 * n);
+
+  ASSERT (cy + 1 <= 3);
+  ASSERT (cy2 <= 2);
+
+  if (LIKELY (cy <= 2)) {
+    MPN_INCR_U (pp + 2 * n, s + s, cy2);
+    MPN_INCR_U (pp + 3 * n, s + s - n, cy);
+  } else { /* cy is negative */
+    /* The total contribution of v0+vinf-vm1 can not be negative. */
+#if WANT_ASSERT
+    /* The borrow in cy stops the propagation of the carry cy2, */
+    ASSERT (cy2 == 1);
+    cy += mpn_add_1 (pp + 2 * n, pp + 2 * n, n, cy2);
+    ASSERT (cy == 0);
+#else
+    /* we simply fill the area with zeros. */
+    MPN_FILL (pp + 2 * n, n, 0);
+#endif
+  }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom32_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom32_mul.c
deleted file mode 120000
index 594557b35..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom32_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom32_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom32_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom32_mul.c
new file mode 100644
index 000000000..f03ba568f
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom32_mul.c
@@ -0,0 +1,322 @@
+/* mpn_toom32_mul -- Multiply {ap,an} and {bp,bn} where an is nominally 1.5
+   times as large as bn.  Or more accurately, bn < an < 3bn.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+   Improvements by Marco Bodrato and Niels Möller.
+
+   The idea of applying toom to unbalanced multiplication is due to Marco
+   Bodrato and Alberto Zanoni.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -1, 0, +1, +inf
+
+  <-s-><--n--><--n-->
+   ___ ______ ______
+  |a2_|___a1_|___a0_|
+	|_b1_|___b0_|
+	<-t--><--n-->
+
+  v0  =  a0         * b0      #   A(0)*B(0)
+  v1  = (a0+ a1+ a2)*(b0+ b1) #   A(1)*B(1)      ah  <= 2  bh <= 1
+  vm1 = (a0- a1+ a2)*(b0- b1) #  A(-1)*B(-1)    |ah| <= 1  bh = 0
+  vinf=          a2 *     b1  # A(inf)*B(inf)
+*/
+
+#define TOOM32_MUL_N_REC(p, a, b, n, ws)				\
+  do {									\
+    mpn_mul_n (p, a, b, n);						\
+  } while (0)
+
+void
+mpn_toom32_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn,
+		mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  int vm1_neg;
+  mp_limb_t cy;
+  mp_limb_signed_t hi;
+  mp_limb_t ap1_hi, bp1_hi;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2 * n)
+#define b0  bp
+#define b1  (bp + n)
+
+  /* Required, to ensure that s + t >= n. */
+  ASSERT (bn + 2 <= an && an + 6 <= 3*bn);
+
+  n = 1 + (2 * an >= 3 * bn ? (an - 1) / (size_t) 3 : (bn - 1) >> 1);
+
+  s = an - 2 * n;
+  t = bn - n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+  ASSERT (s + t >= n);
+
+  /* Product area of size an + bn = 3*n + s + t >= 4*n + 2. */
+#define ap1 (pp)		/* n, most significant limb in ap1_hi */
+#define bp1 (pp + n)		/* n, most significant bit in bp1_hi */
+#define am1 (pp + 2*n)		/* n, most significant bit in hi */
+#define bm1 (pp + 3*n)		/* n */
+#define v1 (scratch)		/* 2n + 1 */
+#define vm1 (pp)		/* 2n + 1 */
+#define scratch_out (scratch + 2*n + 1) /* Currently unused. */
+
+  /* Scratch need: 2*n + 1 + scratch for the recursive multiplications. */
+
+  /* FIXME: Keep v1[2*n] and vm1[2*n] in scalar variables? */
+
+  /* Compute ap1 = a0 + a1 + a2, am1 = a0 - a1 + a2 */
+  ap1_hi = mpn_add (ap1, a0, n, a2, s);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (ap1_hi == 0 && mpn_cmp (ap1, a1, n) < 0)
+    {
+      ap1_hi = mpn_add_n_sub_n (ap1, am1, a1, ap1, n) >> 1;
+      hi = 0;
+      vm1_neg = 1;
+    }
+  else
+    {
+      cy = mpn_add_n_sub_n (ap1, am1, ap1, a1, n);
+      hi = ap1_hi - (cy & 1);
+      ap1_hi += (cy >> 1);
+      vm1_neg = 0;
+    }
+#else
+  if (ap1_hi == 0 && mpn_cmp (ap1, a1, n) < 0)
+    {
+      ASSERT_NOCARRY (mpn_sub_n (am1, a1, ap1, n));
+      hi = 0;
+      vm1_neg = 1;
+    }
+  else
+    {
+      hi = ap1_hi - mpn_sub_n (am1, ap1, a1, n);
+      vm1_neg = 0;
+    }
+  ap1_hi += mpn_add_n (ap1, ap1, a1, n);
+#endif
+
+  /* Compute bp1 = b0 + b1 and bm1 = b0 - b1. */
+  if (t == n)
+    {
+#if HAVE_NATIVE_mpn_add_n_sub_n
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  cy = mpn_add_n_sub_n (bp1, bm1, b1, b0, n);
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  cy = mpn_add_n_sub_n (bp1, bm1, b0, b1, n);
+	}
+      bp1_hi = cy >> 1;
+#else
+      bp1_hi = mpn_add_n (bp1, b0, b1, n);
+
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  ASSERT_NOCARRY (mpn_sub_n (bm1, b1, b0, n));
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  ASSERT_NOCARRY (mpn_sub_n (bm1, b0, b1, n));
+	}
+#endif
+    }
+  else
+    {
+      /* FIXME: Should still use mpn_add_n_sub_n for the main part. */
+      bp1_hi = mpn_add (bp1, b0, n, b1, t);
+
+      if (mpn_zero_p (b0 + t, n - t) && mpn_cmp (b0, b1, t) < 0)
+	{
+	  ASSERT_NOCARRY (mpn_sub_n (bm1, b1, b0, t));
+	  MPN_ZERO (bm1 + t, n - t);
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  ASSERT_NOCARRY (mpn_sub (bm1, b0, n, b1, t));
+	}
+    }
+
+  TOOM32_MUL_N_REC (v1, ap1, bp1, n, scratch_out);
+  if (ap1_hi == 1)
+    {
+      cy = bp1_hi + mpn_add_n (v1 + n, v1 + n, bp1, n);
+    }
+  else if (ap1_hi == 2)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n
+      cy = 2 * bp1_hi + mpn_addlsh1_n (v1 + n, v1 + n, bp1, n);
+#else
+      cy = 2 * bp1_hi + mpn_addmul_1 (v1 + n, bp1, n, CNST_LIMB(2));
+#endif
+    }
+  else
+    cy = 0;
+  if (bp1_hi != 0)
+    cy += mpn_add_n (v1 + n, v1 + n, ap1, n);
+  v1[2 * n] = cy;
+
+  TOOM32_MUL_N_REC (vm1, am1, bm1, n, scratch_out);
+  if (hi)
+    hi = mpn_add_n (vm1+n, vm1+n, bm1, n);
+
+  vm1[2*n] = hi;
+
+  /* v1 <-- (v1 + vm1) / 2 = x0 + x2 */
+  if (vm1_neg)
+    {
+#if HAVE_NATIVE_mpn_rsh1sub_n
+      mpn_rsh1sub_n (v1, v1, vm1, 2*n+1);
+#else
+      mpn_sub_n (v1, v1, vm1, 2*n+1);
+      ASSERT_NOCARRY (mpn_rshift (v1, v1, 2*n+1, 1));
+#endif
+    }
+  else
+    {
+#if HAVE_NATIVE_mpn_rsh1add_n
+      mpn_rsh1add_n (v1, v1, vm1, 2*n+1);
+#else
+      mpn_add_n (v1, v1, vm1, 2*n+1);
+      ASSERT_NOCARRY (mpn_rshift (v1, v1, 2*n+1, 1));
+#endif
+    }
+
+  /* We get x1 + x3 = (x0 + x2) - (x0 - x1 + x2 - x3), and hence
+
+     y = x1 + x3 + (x0 + x2) * B
+       = (x0 + x2) * B + (x0 + x2) - vm1.
+
+     y is 3*n + 1 limbs, y = y0 + y1 B + y2 B^2. We store them as
+     follows: y0 at scratch, y1 at pp + 2*n, and y2 at scratch + n
+     (already in place, except for carry propagation).
+
+     We thus add
+
+   B^3  B^2   B    1
+    |    |    |    |
+   +-----+----+
+ + |  x0 + x2 |
+   +----+-----+----+
+ +      |  x0 + x2 |
+	+----------+
+ -      |  vm1     |
+ --+----++----+----+-
+   | y2  | y1 | y0 |
+   +-----+----+----+
+
+  Since we store y0 at the same location as the low half of x0 + x2, we
+  need to do the middle sum first. */
+
+  hi = vm1[2*n];
+  cy = mpn_add_n (pp + 2*n, v1, v1 + n, n);
+  MPN_INCR_U (v1 + n, n + 1, cy + v1[2*n]);
+
+  /* FIXME: Can we get rid of this second vm1_neg conditional by
+     swapping the location of +1 and -1 values? */
+  if (vm1_neg)
+    {
+      cy = mpn_add_n (v1, v1, vm1, n);
+      hi += mpn_add_nc (pp + 2*n, pp + 2*n, vm1 + n, n, cy);
+      MPN_INCR_U (v1 + n, n+1, hi);
+    }
+  else
+    {
+      cy = mpn_sub_n (v1, v1, vm1, n);
+      hi += mpn_sub_nc (pp + 2*n, pp + 2*n, vm1 + n, n, cy);
+      MPN_DECR_U (v1 + n, n+1, hi);
+    }
+
+  TOOM32_MUL_N_REC (pp, a0, b0, n, scratch_out);
+  /* vinf, s+t limbs.  Use mpn_mul for now, to handle unbalanced operands */
+  if (s > t)  mpn_mul (pp+3*n, a2, s, b1, t);
+  else        mpn_mul (pp+3*n, b1, t, a2, s);
+
+  /* Remaining interpolation.
+
+     y * B + x0 + x3 B^3 - x0 B^2 - x3 B
+     = (x1 + x3) B + (x0 + x2) B^2 + x0 + x3 B^3 - x0 B^2 - x3 B
+     = y0 B + y1 B^2 + y3 B^3 + Lx0 + H x0 B
+       + L x3 B^3 + H x3 B^4 - Lx0 B^2 - H x0 B^3 - L x3 B - H x3 B^2
+     = L x0 + (y0 + H x0 - L x3) B + (y1 - L x0 - H x3) B^2
+       + (y2 - (H x0 - L x3)) B^3 + H x3 B^4
+
+	  B^4       B^3       B^2        B         1
+ |         |         |         |         |         |
+   +-------+                   +---------+---------+
+   |  Hx3  |                   | Hx0-Lx3 |    Lx0  |
+   +------+----------+---------+---------+---------+
+	  |    y2    |  y1     |   y0    |
+	  ++---------+---------+---------+
+	  -| Hx0-Lx3 | - Lx0   |
+	   +---------+---------+
+		      | - Hx3  |
+		      +--------+
+
+    We must take into account the carry from Hx0 - Lx3.
+  */
+
+  cy = mpn_sub_n (pp + n, pp + n, pp+3*n, n);
+  hi = scratch[2*n] + cy;
+
+  cy = mpn_sub_nc (pp + 2*n, pp + 2*n, pp, n, cy);
+  hi -= mpn_sub_nc (pp + 3*n, scratch + n, pp + n, n, cy);
+
+  hi += mpn_add (pp + n, pp + n, 3*n, scratch, n);
+
+  /* FIXME: Is support for s + t == n needed? */
+  if (LIKELY (s + t > n))
+    {
+      hi -= mpn_sub (pp + 2*n, pp + 2*n, 2*n, pp + 4*n, s+t-n);
+
+      if (hi < 0)
+	MPN_DECR_U (pp + 4*n, s+t-n, -hi);
+      else
+	MPN_INCR_U (pp + 4*n, s+t-n, hi);
+    }
+  else
+    ASSERT (hi == 0);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom33_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom33_mul.c
deleted file mode 120000
index 35ca5cb21..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom33_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom33_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom33_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom33_mul.c
new file mode 100644
index 000000000..8f49f427c
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom33_mul.c
@@ -0,0 +1,315 @@
+/* mpn_toom33_mul -- Multiply {ap,an} and {p,bn} where an and bn are close in
+   size.  Or more accurately, bn <= an < (3/2)bn.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+   Additional improvements by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2008, 2010, 2012, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -1, 0, +1, +2, +inf
+
+  <-s--><--n--><--n-->
+   ____ ______ ______
+  |_a2_|___a1_|___a0_|
+   |b2_|___b1_|___b0_|
+   <-t-><--n--><--n-->
+
+  v0  =  a0         * b0          #   A(0)*B(0)
+  v1  = (a0+ a1+ a2)*(b0+ b1+ b2) #   A(1)*B(1)      ah  <= 2  bh <= 2
+  vm1 = (a0- a1+ a2)*(b0- b1+ b2) #  A(-1)*B(-1)    |ah| <= 1  bh <= 1
+  v2  = (a0+2a1+4a2)*(b0+2b1+4b2) #   A(2)*B(2)      ah  <= 6  bh <= 6
+  vinf=          a2 *         b2  # A(inf)*B(inf)
+*/
+
+#if TUNE_PROGRAM_BUILD || WANT_FAT_BINARY
+#define MAYBE_mul_basecase 1
+#define MAYBE_mul_toom33   1
+#else
+#define MAYBE_mul_basecase						\
+  (MUL_TOOM33_THRESHOLD < 3 * MUL_TOOM22_THRESHOLD)
+#define MAYBE_mul_toom33						\
+  (MUL_TOOM44_THRESHOLD >= 3 * MUL_TOOM33_THRESHOLD)
+#endif
+
+/* FIXME: TOOM33_MUL_N_REC is not quite right for a balanced
+   multiplication at the infinity point. We may have
+   MAYBE_mul_basecase == 0, and still get s just below
+   MUL_TOOM22_THRESHOLD. If MUL_TOOM33_THRESHOLD == 7, we can even get
+   s == 1 and mpn_toom22_mul will crash.
+*/
+
+#define TOOM33_MUL_N_REC(p, a, b, n, ws)				\
+  do {									\
+    if (MAYBE_mul_basecase						\
+	&& BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))			\
+      mpn_mul_basecase (p, a, n, b, n);					\
+    else if (! MAYBE_mul_toom33						\
+	     || BELOW_THRESHOLD (n, MUL_TOOM33_THRESHOLD))		\
+      mpn_toom22_mul (p, a, n, b, n, ws);				\
+    else								\
+      mpn_toom33_mul (p, a, n, b, n, ws);				\
+  } while (0)
+
+void
+mpn_toom33_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn,
+		mp_ptr scratch)
+{
+  const int __gmpn_cpuvec_initialized = 1;
+  mp_size_t n, s, t;
+  int vm1_neg;
+  mp_limb_t cy, vinf0;
+  mp_ptr gp;
+  mp_ptr as1, asm1, as2;
+  mp_ptr bs1, bsm1, bs2;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2*n)
+#define b0  bp
+#define b1  (bp + n)
+#define b2  (bp + 2*n)
+
+  n = (an + 2) / (size_t) 3;
+
+  s = an - 2 * n;
+  t = bn - 2 * n;
+
+  ASSERT (an >= bn);
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+
+  as1  = scratch + 4 * n + 4;
+  asm1 = scratch + 2 * n + 2;
+  as2 = pp + n + 1;
+
+  bs1 = pp;
+  bsm1 = scratch + 3 * n + 3; /* we need 4n+4 <= 4n+s+t */
+  bs2 = pp + 2 * n + 2;
+
+  gp = scratch;
+
+  vm1_neg = 0;
+
+  /* Compute as1 and asm1.  */
+  cy = mpn_add (gp, a0, n, a2, s);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (cy == 0 && mpn_cmp (gp, a1, n) < 0)
+    {
+      cy = mpn_add_n_sub_n (as1, asm1, a1, gp, n);
+      as1[n] = cy >> 1;
+      asm1[n] = 0;
+      vm1_neg = 1;
+    }
+  else
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_add_n_sub_n (as1, asm1, gp, a1, n);
+      as1[n] = cy + (cy2 >> 1);
+      asm1[n] = cy - (cy2 & 1);
+    }
+#else
+  as1[n] = cy + mpn_add_n (as1, gp, a1, n);
+  if (cy == 0 && mpn_cmp (gp, a1, n) < 0)
+    {
+      mpn_sub_n (asm1, a1, gp, n);
+      asm1[n] = 0;
+      vm1_neg = 1;
+    }
+  else
+    {
+      cy -= mpn_sub_n (asm1, gp, a1, n);
+      asm1[n] = cy;
+    }
+#endif
+
+  /* Compute as2.  */
+#if HAVE_NATIVE_mpn_rsblsh1_n
+  cy = mpn_add_n (as2, a2, as1, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, as1 + s, n - s, cy);
+  cy += as1[n];
+  cy = 2 * cy + mpn_rsblsh1_n (as2, a0, as2, n);
+#else
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy  = mpn_addlsh1_n (as2, a1, a2, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, a1 + s, n - s, cy);
+  cy = 2 * cy + mpn_addlsh1_n (as2, a0, as2, n);
+#else
+  cy = mpn_add_n (as2, a2, as1, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, as1 + s, n - s, cy);
+  cy += as1[n];
+  cy = 2 * cy + mpn_lshift (as2, as2, n, 1);
+  cy -= mpn_sub_n (as2, as2, a0, n);
+#endif
+#endif
+  as2[n] = cy;
+
+  /* Compute bs1 and bsm1.  */
+  cy = mpn_add (gp, b0, n, b2, t);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (cy == 0 && mpn_cmp (gp, b1, n) < 0)
+    {
+      cy = mpn_add_n_sub_n (bs1, bsm1, b1, gp, n);
+      bs1[n] = cy >> 1;
+      bsm1[n] = 0;
+      vm1_neg ^= 1;
+    }
+  else
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_add_n_sub_n (bs1, bsm1, gp, b1, n);
+      bs1[n] = cy + (cy2 >> 1);
+      bsm1[n] = cy - (cy2 & 1);
+    }
+#else
+  bs1[n] = cy + mpn_add_n (bs1, gp, b1, n);
+  if (cy == 0 && mpn_cmp (gp, b1, n) < 0)
+    {
+      mpn_sub_n (bsm1, b1, gp, n);
+      bsm1[n] = 0;
+      vm1_neg ^= 1;
+    }
+  else
+    {
+      cy -= mpn_sub_n (bsm1, gp, b1, n);
+      bsm1[n] = cy;
+    }
+#endif
+
+  /* Compute bs2.  */
+#if HAVE_NATIVE_mpn_rsblsh1_n
+  cy = mpn_add_n (bs2, b2, bs1, t);
+  if (t != n)
+    cy = mpn_add_1 (bs2 + t, bs1 + t, n - t, cy);
+  cy += bs1[n];
+  cy = 2 * cy + mpn_rsblsh1_n (bs2, b0, bs2, n);
+#else
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy  = mpn_addlsh1_n (bs2, b1, b2, t);
+  if (t != n)
+    cy = mpn_add_1 (bs2 + t, b1 + t, n - t, cy);
+  cy = 2 * cy + mpn_addlsh1_n (bs2, b0, bs2, n);
+#else
+  cy  = mpn_add_n (bs2, bs1, b2, t);
+  if (t != n)
+    cy = mpn_add_1 (bs2 + t, bs1 + t, n - t, cy);
+  cy += bs1[n];
+  cy = 2 * cy + mpn_lshift (bs2, bs2, n, 1);
+  cy -= mpn_sub_n (bs2, bs2, b0, n);
+#endif
+#endif
+  bs2[n] = cy;
+
+  ASSERT (as1[n] <= 2);
+  ASSERT (bs1[n] <= 2);
+  ASSERT (asm1[n] <= 1);
+  ASSERT (bsm1[n] <= 1);
+  ASSERT (as2[n] <= 6);
+  ASSERT (bs2[n] <= 6);
+
+#define v0    pp				/* 2n */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vinf  (pp + 4 * n)			/* s+t */
+#define vm1   scratch				/* 2n+1 */
+#define v2    (scratch + 2 * n + 1)		/* 2n+2 */
+#define scratch_out  (scratch + 5 * n + 5)
+
+  /* vm1, 2n+1 limbs */
+#ifdef SMALLER_RECURSION
+  TOOM33_MUL_N_REC (vm1, asm1, bsm1, n, scratch_out);
+  cy = 0;
+  if (asm1[n] != 0)
+    cy = bsm1[n] + mpn_add_n (vm1 + n, vm1 + n, bsm1, n);
+  if (bsm1[n] != 0)
+    cy += mpn_add_n (vm1 + n, vm1 + n, asm1, n);
+  vm1[2 * n] = cy;
+#else
+  TOOM33_MUL_N_REC (vm1, asm1, bsm1, n + 1, scratch_out);
+#endif
+
+  TOOM33_MUL_N_REC (v2, as2, bs2, n + 1, scratch_out);	/* v2, 2n+1 limbs */
+
+  /* vinf, s+t limbs */
+  if (s > t)  mpn_mul (vinf, a2, s, b2, t);
+  else        TOOM33_MUL_N_REC (vinf, a2, b2, s, scratch_out);
+
+  vinf0 = vinf[0];				/* v1 overlaps with this */
+
+#ifdef SMALLER_RECURSION
+  /* v1, 2n+1 limbs */
+  TOOM33_MUL_N_REC (v1, as1, bs1, n, scratch_out);
+  if (as1[n] == 1)
+    {
+      cy = bs1[n] + mpn_add_n (v1 + n, v1 + n, bs1, n);
+    }
+  else if (as1[n] != 0)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+      cy = 2 * bs1[n] + mpn_addlsh1_n_ip1 (v1 + n, bs1, n);
+#else
+      cy = 2 * bs1[n] + mpn_addmul_1 (v1 + n, bs1, n, CNST_LIMB(2));
+#endif
+    }
+  else
+    cy = 0;
+  if (bs1[n] == 1)
+    {
+      cy += mpn_add_n (v1 + n, v1 + n, as1, n);
+    }
+  else if (bs1[n] != 0)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+      cy += mpn_addlsh1_n_ip1 (v1 + n, as1, n);
+#else
+      cy += mpn_addmul_1 (v1 + n, as1, n, CNST_LIMB(2));
+#endif
+    }
+  v1[2 * n] = cy;
+#else
+  cy = vinf[1];
+  TOOM33_MUL_N_REC (v1, as1, bs1, n + 1, scratch_out);
+  vinf[1] = cy;
+#endif
+
+  TOOM33_MUL_N_REC (v0, ap, bp, n, scratch_out);	/* v0, 2n limbs */
+
+  mpn_toom_interpolate_5pts (pp, v2, vm1, n, s + t, vm1_neg, vinf0);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom3_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom3_sqr.c
deleted file mode 120000
index 7a2df4576..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom3_sqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom3_sqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom3_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom3_sqr.c
new file mode 100644
index 000000000..7be15bff3
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom3_sqr.c
@@ -0,0 +1,225 @@
+/* mpn_toom3_sqr -- Square {ap,an}.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+   Additional improvements by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2010, 2012, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -1, 0, +1, +2, +inf
+
+  <-s--><--n--><--n-->
+   ____ ______ ______
+  |_a2_|___a1_|___a0_|
+
+  v0  =  a0         ^2 #   A(0)^2
+  v1  = (a0+ a1+ a2)^2 #   A(1)^2    ah  <= 2
+  vm1 = (a0- a1+ a2)^2 #  A(-1)^2   |ah| <= 1
+  v2  = (a0+2a1+4a2)^2 #   A(2)^2    ah  <= 6
+  vinf=          a2 ^2 # A(inf)^2
+*/
+
+#if TUNE_PROGRAM_BUILD || WANT_FAT_BINARY
+#define MAYBE_sqr_basecase 1
+#define MAYBE_sqr_toom3   1
+#else
+#define MAYBE_sqr_basecase						\
+  (SQR_TOOM3_THRESHOLD < 3 * SQR_TOOM2_THRESHOLD)
+#define MAYBE_sqr_toom3							\
+  (SQR_TOOM4_THRESHOLD >= 3 * SQR_TOOM3_THRESHOLD)
+#endif
+
+#define TOOM3_SQR_REC(p, a, n, ws)					\
+  do {									\
+    if (MAYBE_sqr_basecase						\
+	&& BELOW_THRESHOLD (n, SQR_TOOM2_THRESHOLD))			\
+      mpn_sqr_basecase (p, a, n);					\
+    else if (! MAYBE_sqr_toom3						\
+	     || BELOW_THRESHOLD (n, SQR_TOOM3_THRESHOLD))		\
+      mpn_toom2_sqr (p, a, n, ws);					\
+    else								\
+      mpn_toom3_sqr (p, a, n, ws);					\
+  } while (0)
+
+void
+mpn_toom3_sqr (mp_ptr pp,
+	       mp_srcptr ap, mp_size_t an,
+	       mp_ptr scratch)
+{
+  const int __gmpn_cpuvec_initialized = 1;
+  mp_size_t n, s;
+  mp_limb_t cy, vinf0;
+  mp_ptr gp;
+  mp_ptr as1, asm1, as2;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2*n)
+
+  n = (an + 2) / (size_t) 3;
+
+  s = an - 2 * n;
+
+  ASSERT (0 < s && s <= n);
+
+  as1 = scratch + 4 * n + 4;
+  asm1 = scratch + 2 * n + 2;
+  as2 = pp + n + 1;
+
+  gp = scratch;
+
+  /* Compute as1 and asm1.  */
+  cy = mpn_add (gp, a0, n, a2, s);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (cy == 0 && mpn_cmp (gp, a1, n) < 0)
+    {
+      cy = mpn_add_n_sub_n (as1, asm1, a1, gp, n);
+      as1[n] = cy >> 1;
+      asm1[n] = 0;
+    }
+  else
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_add_n_sub_n (as1, asm1, gp, a1, n);
+      as1[n] = cy + (cy2 >> 1);
+      asm1[n] = cy - (cy2 & 1);
+    }
+#else
+  as1[n] = cy + mpn_add_n (as1, gp, a1, n);
+  if (cy == 0 && mpn_cmp (gp, a1, n) < 0)
+    {
+      mpn_sub_n (asm1, a1, gp, n);
+      asm1[n] = 0;
+    }
+  else
+    {
+      cy -= mpn_sub_n (asm1, gp, a1, n);
+      asm1[n] = cy;
+    }
+#endif
+
+  /* Compute as2.  */
+#if HAVE_NATIVE_mpn_rsblsh1_n
+  cy = mpn_add_n (as2, a2, as1, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, as1 + s, n - s, cy);
+  cy += as1[n];
+  cy = 2 * cy + mpn_rsblsh1_n (as2, a0, as2, n);
+#else
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy  = mpn_addlsh1_n (as2, a1, a2, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, a1 + s, n - s, cy);
+  cy = 2 * cy + mpn_addlsh1_n (as2, a0, as2, n);
+#else
+  cy = mpn_add_n (as2, a2, as1, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, as1 + s, n - s, cy);
+  cy += as1[n];
+  cy = 2 * cy + mpn_lshift (as2, as2, n, 1);
+  cy -= mpn_sub_n (as2, as2, a0, n);
+#endif
+#endif
+  as2[n] = cy;
+
+  ASSERT (as1[n] <= 2);
+  ASSERT (asm1[n] <= 1);
+
+#define v0    pp				/* 2n */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vinf  (pp + 4 * n)			/* s+s */
+#define vm1   scratch				/* 2n+1 */
+#define v2    (scratch + 2 * n + 1)		/* 2n+2 */
+#define scratch_out  (scratch + 5 * n + 5)
+
+  /* vm1, 2n+1 limbs */
+#ifdef SMALLER_RECURSION
+  TOOM3_SQR_REC (vm1, asm1, n, scratch_out);
+  cy = 0;
+  if (asm1[n] != 0)
+    cy = asm1[n] + mpn_add_n (vm1 + n, vm1 + n, asm1, n);
+  if (asm1[n] != 0)
+    cy += mpn_add_n (vm1 + n, vm1 + n, asm1, n);
+  vm1[2 * n] = cy;
+#else
+  TOOM3_SQR_REC (vm1, asm1, n + 1, scratch_out);
+#endif
+
+  TOOM3_SQR_REC (v2, as2, n + 1, scratch_out);	/* v2, 2n+1 limbs */
+
+  TOOM3_SQR_REC (vinf, a2, s, scratch_out);	/* vinf, s+s limbs */
+
+  vinf0 = vinf[0];				/* v1 overlaps with this */
+
+#ifdef SMALLER_RECURSION
+  /* v1, 2n+1 limbs */
+  TOOM3_SQR_REC (v1, as1, n, scratch_out);
+  if (as1[n] == 1)
+    {
+      cy = as1[n] + mpn_add_n (v1 + n, v1 + n, as1, n);
+    }
+  else if (as1[n] != 0)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+      cy = 2 * as1[n] + mpn_addlsh1_n_ip1 (v1 + n, as1, n);
+#else
+      cy = 2 * as1[n] + mpn_addmul_1 (v1 + n, as1, n, CNST_LIMB(2));
+#endif
+    }
+  else
+    cy = 0;
+  if (as1[n] == 1)
+    {
+      cy += mpn_add_n (v1 + n, v1 + n, as1, n);
+    }
+  else if (as1[n] != 0)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+      cy += mpn_addlsh1_n_ip1 (v1 + n, as1, n);
+#else
+      cy += mpn_addmul_1 (v1 + n, as1, n, CNST_LIMB(2));
+#endif
+    }
+  v1[2 * n] = cy;
+#else
+  cy = vinf[1];
+  TOOM3_SQR_REC (v1, as1, n + 1, scratch_out);
+  vinf[1] = cy;
+#endif
+
+  TOOM3_SQR_REC (v0, ap, n, scratch_out);	/* v0, 2n limbs */
+
+  mpn_toom_interpolate_5pts (pp, v2, vm1, n, s + s, 0, vinf0);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mul.c
deleted file mode 120000
index 0e2821b6e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom42_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mul.c
new file mode 100644
index 000000000..2dfba9b2f
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mul.c
@@ -0,0 +1,234 @@
+/* mpn_toom42_mul -- Multiply {ap,an} and {bp,bn} where an is nominally twice
+   as large as bn.  Or more accurately, (3/2)bn < an < 4bn.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+   Additional improvements by Marco Bodrato.
+
+   The idea of applying toom to unbalanced multiplication is due to Marco
+   Bodrato and Alberto Zanoni.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2008, 2012, 2014 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -1, 0, +1, +2, +inf
+
+  <-s-><--n--><--n--><--n-->
+   ___ ______ ______ ______
+  |a3_|___a2_|___a1_|___a0_|
+	       |_b1_|___b0_|
+	       <-t--><--n-->
+
+  v0  =  a0             * b0      #   A(0)*B(0)
+  v1  = (a0+ a1+ a2+ a3)*(b0+ b1) #   A(1)*B(1)      ah  <= 3  bh <= 1
+  vm1 = (a0- a1+ a2- a3)*(b0- b1) #  A(-1)*B(-1)    |ah| <= 1  bh  = 0
+  v2  = (a0+2a1+4a2+8a3)*(b0+2b1) #   A(2)*B(2)      ah  <= 14 bh <= 2
+  vinf=              a3 *     b1  # A(inf)*B(inf)
+*/
+
+#define TOOM42_MUL_N_REC(p, a, b, n, ws)				\
+  do {									\
+    mpn_mul_n (p, a, b, n);						\
+  } while (0)
+
+void
+mpn_toom42_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn,
+		mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  int vm1_neg;
+  mp_limb_t cy, vinf0;
+  mp_ptr a0_a2;
+  mp_ptr as1, asm1, as2;
+  mp_ptr bs1, bsm1, bs2;
+  mp_ptr tmp;
+  TMP_DECL;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2*n)
+#define a3  (ap + 3*n)
+#define b0  bp
+#define b1  (bp + n)
+
+  n = an >= 2 * bn ? (an + 3) >> 2 : (bn + 1) >> 1;
+
+  s = an - 3 * n;
+  t = bn - n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+
+  TMP_MARK;
+
+  tmp = TMP_ALLOC_LIMBS (6 * n + 5);
+  as1  = tmp; tmp += n + 1;
+  asm1 = tmp; tmp += n + 1;
+  as2  = tmp; tmp += n + 1;
+  bs1  = tmp; tmp += n + 1;
+  bsm1 = tmp; tmp += n;
+  bs2  = tmp; tmp += n + 1;
+
+  a0_a2 = pp;
+
+  /* Compute as1 and asm1.  */
+  vm1_neg = mpn_toom_eval_dgr3_pm1 (as1, asm1, ap, n, s, a0_a2) & 1;
+
+  /* Compute as2.  */
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy  = mpn_addlsh1_n (as2, a2, a3, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, a2 + s, n - s, cy);
+  cy = 2 * cy + mpn_addlsh1_n (as2, a1, as2, n);
+  cy = 2 * cy + mpn_addlsh1_n (as2, a0, as2, n);
+#else
+  cy  = mpn_lshift (as2, a3, s, 1);
+  cy += mpn_add_n (as2, a2, as2, s);
+  if (s != n)
+    cy = mpn_add_1 (as2 + s, a2 + s, n - s, cy);
+  cy = 2 * cy + mpn_lshift (as2, as2, n, 1);
+  cy += mpn_add_n (as2, a1, as2, n);
+  cy = 2 * cy + mpn_lshift (as2, as2, n, 1);
+  cy += mpn_add_n (as2, a0, as2, n);
+#endif
+  as2[n] = cy;
+
+  /* Compute bs1 and bsm1.  */
+  if (t == n)
+    {
+#if HAVE_NATIVE_mpn_add_n_sub_n
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  cy = mpn_add_n_sub_n (bs1, bsm1, b1, b0, n);
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  cy = mpn_add_n_sub_n (bs1, bsm1, b0, b1, n);
+	}
+      bs1[n] = cy >> 1;
+#else
+      bs1[n] = mpn_add_n (bs1, b0, b1, n);
+
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, n);
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  mpn_sub_n (bsm1, b0, b1, n);
+	}
+#endif
+    }
+  else
+    {
+      bs1[n] = mpn_add (bs1, b0, n, b1, t);
+
+      if (mpn_zero_p (b0 + t, n - t) && mpn_cmp (b0, b1, t) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, t);
+	  MPN_ZERO (bsm1 + t, n - t);
+	  vm1_neg ^= 1;
+	}
+      else
+	{
+	  mpn_sub (bsm1, b0, n, b1, t);
+	}
+    }
+
+  /* Compute bs2, recycling bs1. bs2=bs1+b1  */
+  mpn_add (bs2, bs1, n + 1, b1, t);
+
+  ASSERT (as1[n] <= 3);
+  ASSERT (bs1[n] <= 1);
+  ASSERT (asm1[n] <= 1);
+/*ASSERT (bsm1[n] == 0);*/
+  ASSERT (as2[n] <= 14);
+  ASSERT (bs2[n] <= 2);
+
+#define v0    pp				/* 2n */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vinf  (pp + 4 * n)			/* s+t */
+#define vm1   scratch				/* 2n+1 */
+#define v2    (scratch + 2 * n + 1)		/* 2n+2 */
+#define scratch_out	scratch + 4 * n + 4	/* Currently unused. */
+
+  /* vm1, 2n+1 limbs */
+  TOOM42_MUL_N_REC (vm1, asm1, bsm1, n, scratch_out);
+  cy = 0;
+  if (asm1[n] != 0)
+    cy = mpn_add_n (vm1 + n, vm1 + n, bsm1, n);
+  vm1[2 * n] = cy;
+
+  TOOM42_MUL_N_REC (v2, as2, bs2, n + 1, scratch_out);	/* v2, 2n+1 limbs */
+
+  /* vinf, s+t limbs */
+  if (s > t)  mpn_mul (vinf, a3, s, b1, t);
+  else        mpn_mul (vinf, b1, t, a3, s);
+
+  vinf0 = vinf[0];				/* v1 overlaps with this */
+
+  /* v1, 2n+1 limbs */
+  TOOM42_MUL_N_REC (v1, as1, bs1, n, scratch_out);
+  if (as1[n] == 1)
+    {
+      cy = bs1[n] + mpn_add_n (v1 + n, v1 + n, bs1, n);
+    }
+  else if (as1[n] == 2)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n
+      cy = 2 * bs1[n] + mpn_addlsh1_n (v1 + n, v1 + n, bs1, n);
+#else
+      cy = 2 * bs1[n] + mpn_addmul_1 (v1 + n, bs1, n, CNST_LIMB(2));
+#endif
+    }
+  else if (as1[n] == 3)
+    {
+      cy = 3 * bs1[n] + mpn_addmul_1 (v1 + n, bs1, n, CNST_LIMB(3));
+    }
+  else
+    cy = 0;
+  if (bs1[n] != 0)
+    cy += mpn_add_n (v1 + n, v1 + n, as1, n);
+  v1[2 * n] = cy;
+
+  TOOM42_MUL_N_REC (v0, ap, bp, n, scratch_out);	/* v0, 2n limbs */
+
+  mpn_toom_interpolate_5pts (pp, v2, vm1, n, s + t, vm1_neg, vinf0);
+
+  TMP_FREE;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mulmid.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mulmid.c
deleted file mode 120000
index d2e26404a..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mulmid.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom42_mulmid.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mulmid.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mulmid.c
new file mode 100644
index 000000000..f581b101a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom42_mulmid.c
@@ -0,0 +1,237 @@
+/* mpn_toom42_mulmid -- toom42 middle product
+
+   Contributed by David Harvey.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT'LL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2011 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+
+/*
+  Middle product of {ap,2n-1} and {bp,n}, output written to {rp,n+2}.
+
+  Neither ap nor bp may overlap rp.
+
+  Must have n >= 4.
+
+  Amount of scratch space required is given by mpn_toom42_mulmid_itch().
+
+  FIXME: this code assumes that n is small compared to GMP_NUMB_MAX. The exact
+  requirements should be clarified.
+*/
+void
+mpn_toom42_mulmid (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n,
+                   mp_ptr scratch)
+{
+  mp_limb_t cy, e[12], zh, zl;
+  mp_size_t m;
+  int neg;
+
+  ASSERT (n >= 4);
+  ASSERT (! MPN_OVERLAP_P (rp, n + 2, ap, 2*n - 1));
+  ASSERT (! MPN_OVERLAP_P (rp, n + 2, bp, n));
+
+  ap += n & 1;   /* handle odd row and diagonal later */
+  m = n / 2;
+
+  /* (e0h:e0l) etc are correction terms, in 2's complement */
+#define e0l (e[0])
+#define e0h (e[1])
+#define e1l (e[2])
+#define e1h (e[3])
+#define e2l (e[4])
+#define e2h (e[5])
+#define e3l (e[6])
+#define e3h (e[7])
+#define e4l (e[8])
+#define e4h (e[9])
+#define e5l (e[10])
+#define e5h (e[11])
+
+#define s (scratch + 2)
+#define t (rp + m + 2)
+#define p0 rp
+#define p1 scratch
+#define p2 (rp + m)
+#define next_scratch (scratch + 3*m + 1)
+
+  /*
+            rp                            scratch
+  |---------|-----------|    |---------|---------|----------|
+  0         m         2m+2   0         m         2m        3m+1
+            <----p2---->       <-------------s------------->
+  <----p0----><---t---->     <----p1---->
+  */
+
+  /* compute {s,3m-1} = {a,3m-1} + {a+m,3m-1} and error terms e0, e1, e2, e3 */
+  cy = mpn_add_err1_n (s, ap, ap + m, &e0l, bp + m, m - 1, 0);
+  cy = mpn_add_err2_n (s + m - 1, ap + m - 1, ap + 2*m - 1, &e1l,
+		       bp + m, bp, m, cy);
+  mpn_add_err1_n (s + 2*m - 1, ap + 2*m - 1, ap + 3*m - 1, &e3l, bp, m, cy);
+
+  /* compute t = (-1)^neg * ({b,m} - {b+m,m}) and error terms e4, e5 */
+  if (mpn_cmp (bp + m, bp, m) < 0)
+    {
+      ASSERT_NOCARRY (mpn_sub_err2_n (t, bp, bp + m, &e4l,
+				      ap + m - 1, ap + 2*m - 1, m, 0));
+      neg = 1;
+    }
+  else
+    {
+      ASSERT_NOCARRY (mpn_sub_err2_n (t, bp + m, bp, &e4l,
+				      ap + m - 1, ap + 2*m - 1, m, 0));
+      neg = 0;
+    }
+
+  /* recursive middle products. The picture is:
+
+      b[2m-1]   A   A   A   B   B   B   -   -   -   -   -
+      ...       -   A   A   A   B   B   B   -   -   -   -
+      b[m]      -   -   A   A   A   B   B   B   -   -   -
+      b[m-1]    -   -   -   C   C   C   D   D   D   -   -
+      ...       -   -   -   -   C   C   C   D   D   D   -
+      b[0]      -   -   -   -   -   C   C   C   D   D   D
+               a[0]   ...  a[m]  ...  a[2m]    ...    a[4m-2]
+  */
+
+  if (m < MULMID_TOOM42_THRESHOLD)
+    {
+      /* A + B */
+      mpn_mulmid_basecase (p0, s, 2*m - 1, bp + m, m);
+      /* accumulate high limbs of p0 into e1 */
+      ADDC_LIMB (cy, e1l, e1l, p0[m]);
+      e1h += p0[m + 1] + cy;
+      /* (-1)^neg * (B - C)   (overwrites first m limbs of s) */
+      mpn_mulmid_basecase (p1, ap + m, 2*m - 1, t, m);
+      /* C + D   (overwrites t) */
+      mpn_mulmid_basecase (p2, s + m, 2*m - 1, bp, m);
+    }
+  else
+    {
+      /* as above, but use toom42 instead */
+      mpn_toom42_mulmid (p0, s, bp + m, m, next_scratch);
+      ADDC_LIMB (cy, e1l, e1l, p0[m]);
+      e1h += p0[m + 1] + cy;
+      mpn_toom42_mulmid (p1, ap + m, t, m, next_scratch);
+      mpn_toom42_mulmid (p2, s + m, bp, m, next_scratch);
+    }
+
+  /* apply error terms */
+
+  /* -e0 at rp[0] */
+  SUBC_LIMB (cy, rp[0], rp[0], e0l);
+  SUBC_LIMB (cy, rp[1], rp[1], e0h + cy);
+  if (UNLIKELY (cy))
+    {
+      cy = (m > 2) ? mpn_sub_1 (rp + 2, rp + 2, m - 2, 1) : 1;
+      SUBC_LIMB (cy, e1l, e1l, cy);
+      e1h -= cy;
+    }
+
+  /* z = e1 - e2 + high(p0) */
+  SUBC_LIMB (cy, zl, e1l, e2l);
+  zh = e1h - e2h - cy;
+
+  /* z at rp[m] */
+  ADDC_LIMB (cy, rp[m], rp[m], zl);
+  zh = (zh + cy) & GMP_NUMB_MASK;
+  ADDC_LIMB (cy, rp[m + 1], rp[m + 1], zh);
+  cy -= (zh >> (GMP_NUMB_BITS - 1));
+  if (UNLIKELY (cy))
+    {
+      if (cy == 1)
+	mpn_add_1 (rp + m + 2, rp + m + 2, m, 1);
+      else /* cy == -1 */
+	mpn_sub_1 (rp + m + 2, rp + m + 2, m, 1);
+    }
+
+  /* e3 at rp[2*m] */
+  ADDC_LIMB (cy, rp[2*m], rp[2*m], e3l);
+  rp[2*m + 1] = (rp[2*m + 1] + e3h + cy) & GMP_NUMB_MASK;
+
+  /* e4 at p1[0] */
+  ADDC_LIMB (cy, p1[0], p1[0], e4l);
+  ADDC_LIMB (cy, p1[1], p1[1], e4h + cy);
+  if (UNLIKELY (cy))
+    mpn_add_1 (p1 + 2, p1 + 2, m, 1);
+
+  /* -e5 at p1[m] */
+  SUBC_LIMB (cy, p1[m], p1[m], e5l);
+  p1[m + 1] = (p1[m + 1] - e5h - cy) & GMP_NUMB_MASK;
+
+  /* adjustment if p1 ends up negative */
+  cy = (p1[m + 1] >> (GMP_NUMB_BITS - 1));
+
+  /* add (-1)^neg * (p1 - B^m * p1) to output */
+  if (neg)
+    {
+      mpn_sub_1 (rp + m + 2, rp + m + 2, m, cy);
+      mpn_add (rp, rp, 2*m + 2, p1, m + 2);             /* A + C */
+      mpn_sub_n (rp + m, rp + m, p1, m + 2);            /* B + D */
+    }
+  else
+    {
+      mpn_add_1 (rp + m + 2, rp + m + 2, m, cy);
+      mpn_sub (rp, rp, 2*m + 2, p1, m + 2);             /* A + C */
+      mpn_add_n (rp + m, rp + m, p1, m + 2);            /* B + D */
+    }
+
+  /* odd row and diagonal */
+  if (n & 1)
+    {
+      /*
+        Products marked E are already done. We need to do products marked O.
+
+        OOOOO----
+        -EEEEO---
+        --EEEEO--
+        ---EEEEO-
+        ----EEEEO
+       */
+
+      /* first row of O's */
+      cy = mpn_addmul_1 (rp, ap - 1, n, bp[n - 1]);
+      ADDC_LIMB (rp[n + 1], rp[n], rp[n], cy);
+
+      /* O's on diagonal */
+      /* FIXME: should probably define an interface "mpn_mulmid_diag_1"
+         that can handle the sum below. Currently we're relying on
+         mulmid_basecase being pretty fast for a diagonal sum like this,
+	 which is true at least for the K8 asm version, but surely false
+	 for the generic version. */
+      mpn_mulmid_basecase (e, ap + n - 1, n - 1, bp, n - 1);
+      mpn_add_n (rp + n - 1, rp + n - 1, e, 3);
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom43_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom43_mul.c
deleted file mode 120000
index 73c999a05..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom43_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom43_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom43_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom43_mul.c
new file mode 100644
index 000000000..065013819
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom43_mul.c
@@ -0,0 +1,233 @@
+/* mpn_toom43_mul -- Multiply {ap,an} and {bp,bn} where an is nominally 4/3
+   times as large as bn.  Or more accurately, bn < an < 2 bn.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   The idea of applying toom to unbalanced multiplication is due to Marco
+   Bodrato and Alberto Zanoni.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -2, -1, 0, +1, +2, +inf
+
+  <-s-><--n--><--n--><--n-->
+   ___ ______ ______ ______
+  |a3_|___a2_|___a1_|___a0_|
+	|_b2_|___b1_|___b0_|
+	<-t--><--n--><--n-->
+
+  v0  =  a0             * b0          #   A(0)*B(0)
+  v1  = (a0+ a1+ a2+ a3)*(b0+ b1+ b2) #   A(1)*B(1)      ah  <= 3  bh <= 2
+  vm1 = (a0- a1+ a2- a3)*(b0- b1+ b2) #  A(-1)*B(-1)    |ah| <= 1 |bh|<= 1
+  v2  = (a0+2a1+4a2+8a3)*(b0+2b1+4b2) #   A(2)*B(2)      ah  <= 14 bh <= 6
+  vm2 = (a0-2a1+4a2-8a3)*(b0-2b1+4b2) #  A(-2)*B(-2)    |ah| <= 9 |bh|<= 4
+  vinf=              a3 *         b2  # A(inf)*B(inf)
+*/
+
+void
+mpn_toom43_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn, mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  enum toom6_flags flags;
+  mp_limb_t cy;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2 * n)
+#define a3  (ap + 3 * n)
+#define b0  bp
+#define b1  (bp + n)
+#define b2  (bp + 2 * n)
+
+  n = 1 + (3 * an >= 4 * bn ? (an - 1) >> 2 : (bn - 1) / (size_t) 3);
+
+  s = an - 3 * n;
+  t = bn - 2 * n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+
+  /* This is true whenever an >= 25 or bn >= 19, I think. It
+     guarantees that we can fit 5 values of size n+1 in the product
+     area. */
+  ASSERT (s+t >= 5);
+
+#define v0    pp				/* 2n */
+#define vm1   (scratch)				/* 2n+1 */
+#define v1    (pp + 2*n)			/* 2n+1 */
+#define vm2   (scratch + 2 * n + 1)		/* 2n+1 */
+#define v2    (scratch + 4 * n + 2)		/* 2n+1 */
+#define vinf  (pp + 5 * n)			/* s+t */
+#define bs1    pp				/* n+1 */
+#define bsm1  (scratch + 2 * n + 2)		/* n+1 */
+#define asm1  (scratch + 3 * n + 3)		/* n+1 */
+#define asm2  (scratch + 4 * n + 4)		/* n+1 */
+#define bsm2  (pp + n + 1)			/* n+1 */
+#define bs2   (pp + 2 * n + 2)			/* n+1 */
+#define as2   (pp + 3 * n + 3)			/* n+1 */
+#define as1   (pp + 4 * n + 4)			/* n+1 */
+
+  /* Total sccratch need is 6 * n + 3 + 1; we allocate one extra
+     limb, because products will overwrite 2n+2 limbs. */
+
+#define a0a2  scratch
+#define b0b2  scratch
+#define a1a3  asm1
+#define b1d   bsm1
+
+  /* Compute as2 and asm2.  */
+  flags = (enum toom6_flags) (toom6_vm2_neg & mpn_toom_eval_dgr3_pm2 (as2, asm2, ap, n, s, a1a3));
+
+  /* Compute bs2 and bsm2.  */
+  b1d[n] = mpn_lshift (b1d, b1, n, 1);			/*       2b1      */
+  cy  = mpn_lshift (b0b2, b2, t, 2);			/*  4b2           */
+  cy += mpn_add_n (b0b2, b0b2, b0, t);			/*  4b2      + b0 */
+  if (t != n)
+    cy = mpn_add_1 (b0b2 + t, b0 + t, n - t, cy);
+  b0b2[n] = cy;
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (mpn_cmp (b0b2, b1d, n+1) < 0)
+    {
+      mpn_add_n_sub_n (bs2, bsm2, b1d, b0b2, n+1);
+      flags = (enum toom6_flags) (flags ^ toom6_vm2_neg);
+    }
+  else
+    {
+      mpn_add_n_sub_n (bs2, bsm2, b0b2, b1d, n+1);
+    }
+#else
+  mpn_add_n (bs2, b0b2, b1d, n+1);
+  if (mpn_cmp (b0b2, b1d, n+1) < 0)
+    {
+      mpn_sub_n (bsm2, b1d, b0b2, n+1);
+      flags = (enum toom6_flags) (flags ^ toom6_vm2_neg);
+    }
+  else
+    {
+      mpn_sub_n (bsm2, b0b2, b1d, n+1);
+    }
+#endif
+
+  /* Compute as1 and asm1.  */
+  flags = (enum toom6_flags) (flags ^ (toom6_vm1_neg & mpn_toom_eval_dgr3_pm1 (as1, asm1, ap, n, s, a0a2)));
+
+  /* Compute bs1 and bsm1.  */
+  bsm1[n] = mpn_add (bsm1, b0, n, b2, t);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (bsm1[n] == 0 && mpn_cmp (bsm1, b1, n) < 0)
+    {
+      cy = mpn_add_n_sub_n (bs1, bsm1, b1, bsm1, n);
+      bs1[n] = cy >> 1;
+      flags = (enum toom6_flags) (flags ^ toom6_vm1_neg);
+    }
+  else
+    {
+      cy = mpn_add_n_sub_n (bs1, bsm1, bsm1, b1, n);
+      bs1[n] = bsm1[n] + (cy >> 1);
+      bsm1[n]-= cy & 1;
+    }
+#else
+  bs1[n] = bsm1[n] + mpn_add_n (bs1, bsm1, b1, n);
+  if (bsm1[n] == 0 && mpn_cmp (bsm1, b1, n) < 0)
+    {
+      mpn_sub_n (bsm1, b1, bsm1, n);
+      flags = (enum toom6_flags) (flags ^ toom6_vm1_neg);
+    }
+  else
+    {
+      bsm1[n] -= mpn_sub_n (bsm1, bsm1, b1, n);
+    }
+#endif
+
+  ASSERT (as1[n] <= 3);
+  ASSERT (bs1[n] <= 2);
+  ASSERT (asm1[n] <= 1);
+  ASSERT (bsm1[n] <= 1);
+  ASSERT (as2[n] <=14);
+  ASSERT (bs2[n] <= 6);
+  ASSERT (asm2[n] <= 9);
+  ASSERT (bsm2[n] <= 4);
+
+  /* vm1, 2n+1 limbs */
+  mpn_mul_n (vm1, asm1, bsm1, n+1);  /* W4 */
+
+  /* vm2, 2n+1 limbs */
+  mpn_mul_n (vm2, asm2, bsm2, n+1);  /* W2 */
+
+  /* v2, 2n+1 limbs */
+  mpn_mul_n (v2, as2, bs2, n+1);  /* W1 */
+
+  /* v1, 2n+1 limbs */
+  mpn_mul_n (v1, as1, bs1, n+1);  /* W3 */
+
+  /* vinf, s+t limbs */   /* W0 */
+  if (s > t)  mpn_mul (vinf, a3, s, b2, t);
+  else        mpn_mul (vinf, b2, t, a3, s);
+
+  /* v0, 2n limbs */
+  mpn_mul_n (v0, ap, bp, n);  /* W5 */
+
+  mpn_toom_interpolate_6pts (pp, n, flags, vm1, vm2, v2, t + s);
+
+#undef v0
+#undef vm1
+#undef v1
+#undef vm2
+#undef v2
+#undef vinf
+#undef bs1
+#undef bs2
+#undef bsm1
+#undef bsm2
+#undef asm1
+#undef asm2
+/* #undef as1 */
+/* #undef as2 */
+#undef a0a2
+#undef b0b2
+#undef a1a3
+#undef b1d
+#undef a0
+#undef a1
+#undef a2
+#undef a3
+#undef b0
+#undef b1
+#undef b2
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom44_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom44_mul.c
deleted file mode 120000
index a470f2976..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom44_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom44_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom44_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom44_mul.c
new file mode 100644
index 000000000..77d5083cf
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom44_mul.c
@@ -0,0 +1,235 @@
+/* mpn_toom44_mul -- Multiply {ap,an} and {bp,bn} where an and bn are close in
+   size.  Or more accurately, bn <= an < (4/3)bn.
+
+   Contributed to the GNU project by Torbjorn Granlund and Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2008, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: 0, +1, -1, +2, -2, 1/2, +inf
+
+  <-s--><--n--><--n--><--n-->
+   ____ ______ ______ ______
+  |_a3_|___a2_|___a1_|___a0_|
+   |b3_|___b2_|___b1_|___b0_|
+   <-t-><--n--><--n--><--n-->
+
+  v0  =   a0             *  b0              #    A(0)*B(0)
+  v1  = ( a0+ a1+ a2+ a3)*( b0+ b1+ b2+ b3) #    A(1)*B(1)      ah  <= 3   bh  <= 3
+  vm1 = ( a0- a1+ a2- a3)*( b0- b1+ b2- b3) #   A(-1)*B(-1)    |ah| <= 1  |bh| <= 1
+  v2  = ( a0+2a1+4a2+8a3)*( b0+2b1+4b2+8b3) #    A(2)*B(2)      ah  <= 14  bh  <= 14
+  vm2 = ( a0-2a1+4a2-8a3)*( b0-2b1+4b2-8b3) #    A(2)*B(2)      ah  <= 9  |bh| <= 9
+  vh  = (8a0+4a1+2a2+ a3)*(8b0+4b1+2b2+ b3) #  A(1/2)*B(1/2)    ah  <= 14  bh  <= 14
+  vinf=               a3 *          b2      #  A(inf)*B(inf)
+*/
+
+#if TUNE_PROGRAM_BUILD
+#define MAYBE_mul_basecase 1
+#define MAYBE_mul_toom22   1
+#define MAYBE_mul_toom44   1
+#else
+#define MAYBE_mul_basecase						\
+  (MUL_TOOM44_THRESHOLD < 4 * MUL_TOOM22_THRESHOLD)
+#define MAYBE_mul_toom22						\
+  (MUL_TOOM44_THRESHOLD < 4 * MUL_TOOM33_THRESHOLD)
+#define MAYBE_mul_toom44						\
+  (MUL_TOOM6H_THRESHOLD >= 4 * MUL_TOOM44_THRESHOLD)
+#endif
+
+#define TOOM44_MUL_N_REC(p, a, b, n, ws)				\
+  do {									\
+    if (MAYBE_mul_basecase						\
+	&& BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD))			\
+      mpn_mul_basecase (p, a, n, b, n);					\
+    else if (MAYBE_mul_toom22						\
+	     && BELOW_THRESHOLD (n, MUL_TOOM33_THRESHOLD))		\
+      mpn_toom22_mul (p, a, n, b, n, ws);				\
+    else if (! MAYBE_mul_toom44						\
+	     || BELOW_THRESHOLD (n, MUL_TOOM44_THRESHOLD))		\
+      mpn_toom33_mul (p, a, n, b, n, ws);				\
+    else								\
+      mpn_toom44_mul (p, a, n, b, n, ws);				\
+  } while (0)
+
+/* Use of scratch space. In the product area, we store
+
+      ___________________
+     |vinf|____|_v1_|_v0_|
+      s+t  2n-1 2n+1  2n
+
+   The other recursive products, vm1, v2, vm2, vh are stored in the
+   scratch area. When computing them, we use the product area for
+   intermediate values.
+
+   Next, we compute v1. We can store the intermediate factors at v0
+   and at vh + 2n + 2.
+
+   Finally, for v0 and vinf, factors are parts of the input operands,
+   and we need scratch space only for the recursive multiplication.
+
+   In all, if S(an) is the scratch need, the needed space is bounded by
+
+     S(an) <= 4 (2*ceil(an/4) + 1) + 1 + S(ceil(an/4) + 1)
+
+   which should give S(n) = 8 n/3 + c log(n) for some constant c.
+*/
+
+void
+mpn_toom44_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn,
+		mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  mp_limb_t cy;
+  enum toom7_flags flags;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2*n)
+#define a3  (ap + 3*n)
+#define b0  bp
+#define b1  (bp + n)
+#define b2  (bp + 2*n)
+#define b3  (bp + 3*n)
+
+  ASSERT (an >= bn);
+
+  n = (an + 3) >> 2;
+
+  s = an - 3 * n;
+  t = bn - 3 * n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+  ASSERT (s >= t);
+
+  /* NOTE: The multiplications to v2, vm2, vh and vm1 overwrites the
+   * following limb, so these must be computed in order, and we need a
+   * one limb gap to tp. */
+#define v0    pp				/* 2n */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vinf  (pp + 6 * n)			/* s+t */
+#define v2    scratch				/* 2n+1 */
+#define vm2   (scratch + 2 * n + 1)		/* 2n+1 */
+#define vh    (scratch + 4 * n + 2)		/* 2n+1 */
+#define vm1   (scratch + 6 * n + 3)		/* 2n+1 */
+#define tp (scratch + 8*n + 5)
+
+  /* apx and bpx must not overlap with v1 */
+#define apx   pp				/* n+1 */
+#define amx   (pp + n + 1)			/* n+1 */
+#define bmx   (pp + 2*n + 2)			/* n+1 */
+#define bpx   (pp + 4*n + 2)			/* n+1 */
+
+  /* Total scratch need: 8*n + 5 + scratch for recursive calls. This
+     gives roughly 32 n/3 + log term. */
+
+  /* Compute apx = a0 + 2 a1 + 4 a2 + 8 a3 and amx = a0 - 2 a1 + 4 a2 - 8 a3.  */
+  flags = (enum toom7_flags) (toom7_w1_neg & mpn_toom_eval_dgr3_pm2 (apx, amx, ap, n, s, tp));
+
+  /* Compute bpx = b0 + 2 b1 + 4 b2 + 8 b3 and bmx = b0 - 2 b1 + 4 b2 - 8 b3.  */
+  flags = (enum toom7_flags) (flags ^ (toom7_w1_neg & mpn_toom_eval_dgr3_pm2 (bpx, bmx, bp, n, t, tp)));
+
+  TOOM44_MUL_N_REC (v2, apx, bpx, n + 1, tp);	/* v2,  2n+1 limbs */
+  TOOM44_MUL_N_REC (vm2, amx, bmx, n + 1, tp);	/* vm2,  2n+1 limbs */
+
+  /* Compute apx = 8 a0 + 4 a1 + 2 a2 + a3 = (((2*a0 + a1) * 2 + a2) * 2 + a3 */
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy = mpn_addlsh1_n (apx, a1, a0, n);
+  cy = 2*cy + mpn_addlsh1_n (apx, a2, apx, n);
+  if (s < n)
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_addlsh1_n (apx, a3, apx, s);
+      apx[n] = 2*cy + mpn_lshift (apx + s, apx + s, n - s, 1);
+      MPN_INCR_U (apx + s, n+1-s, cy2);
+    }
+  else
+    apx[n] = 2*cy + mpn_addlsh1_n (apx, a3, apx, n);
+#else
+  cy = mpn_lshift (apx, a0, n, 1);
+  cy += mpn_add_n (apx, apx, a1, n);
+  cy = 2*cy + mpn_lshift (apx, apx, n, 1);
+  cy += mpn_add_n (apx, apx, a2, n);
+  cy = 2*cy + mpn_lshift (apx, apx, n, 1);
+  apx[n] = cy + mpn_add (apx, apx, n, a3, s);
+#endif
+
+  /* Compute bpx = 8 b0 + 4 b1 + 2 b2 + b3 = (((2*b0 + b1) * 2 + b2) * 2 + b3 */
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy = mpn_addlsh1_n (bpx, b1, b0, n);
+  cy = 2*cy + mpn_addlsh1_n (bpx, b2, bpx, n);
+  if (t < n)
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_addlsh1_n (bpx, b3, bpx, t);
+      bpx[n] = 2*cy + mpn_lshift (bpx + t, bpx + t, n - t, 1);
+      MPN_INCR_U (bpx + t, n+1-t, cy2);
+    }
+  else
+    bpx[n] = 2*cy + mpn_addlsh1_n (bpx, b3, bpx, n);
+#else
+  cy = mpn_lshift (bpx, b0, n, 1);
+  cy += mpn_add_n (bpx, bpx, b1, n);
+  cy = 2*cy + mpn_lshift (bpx, bpx, n, 1);
+  cy += mpn_add_n (bpx, bpx, b2, n);
+  cy = 2*cy + mpn_lshift (bpx, bpx, n, 1);
+  bpx[n] = cy + mpn_add (bpx, bpx, n, b3, t);
+#endif
+
+  ASSERT (apx[n] < 15);
+  ASSERT (bpx[n] < 15);
+
+  TOOM44_MUL_N_REC (vh, apx, bpx, n + 1, tp);	/* vh,  2n+1 limbs */
+
+  /* Compute apx = a0 + a1 + a2 + a3 and amx = a0 - a1 + a2 - a3.  */
+  flags = (enum toom7_flags) (flags | (toom7_w3_neg & mpn_toom_eval_dgr3_pm1 (apx, amx, ap, n, s, tp)));
+
+  /* Compute bpx = b0 + b1 + b2 + b3 and bmx = b0 - b1 + b2 - b3.  */
+  flags = (enum toom7_flags) (flags ^ (toom7_w3_neg & mpn_toom_eval_dgr3_pm1 (bpx, bmx, bp, n, t, tp)));
+
+  TOOM44_MUL_N_REC (vm1, amx, bmx, n + 1, tp);	/* vm1,  2n+1 limbs */
+  /* Clobbers amx, bmx. */
+  TOOM44_MUL_N_REC (v1, apx, bpx, n + 1, tp);	/* v1,  2n+1 limbs */
+
+  TOOM44_MUL_N_REC (v0, a0, b0, n, tp);
+  if (s > t)
+    mpn_mul (vinf, a3, s, b3, t);
+  else
+    TOOM44_MUL_N_REC (vinf, a3, b3, s, tp);	/* vinf, s+t limbs */
+
+  mpn_toom_interpolate_7pts (pp, n, flags, vm2, vm1, v2, vh, s + t, tp);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom4_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom4_sqr.c
deleted file mode 120000
index 59eac76ee..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom4_sqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom4_sqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom4_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom4_sqr.c
new file mode 100644
index 000000000..aec84c183
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom4_sqr.c
@@ -0,0 +1,163 @@
+/* mpn_toom4_sqr -- Square {ap,an}.
+
+   Contributed to the GNU project by Torbjorn Granlund and Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2010, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -1, -1/2, 0, +1/2, +1, +2, +inf
+
+  <-s--><--n--><--n--><--n-->
+   ____ ______ ______ ______
+  |_a3_|___a2_|___a1_|___a0_|
+
+  v0  =   a0             ^2 #    A(0)^2
+  v1  = ( a0+ a1+ a2+ a3)^2 #    A(1)^2   ah  <= 3
+  vm1 = ( a0- a1+ a2- a3)^2 #   A(-1)^2  |ah| <= 1
+  v2  = ( a0+2a1+4a2+8a3)^2 #    A(2)^2   ah  <= 14
+  vh  = (8a0+4a1+2a2+ a3)^2 #  A(1/2)^2   ah  <= 14
+  vmh = (8a0-4a1+2a2- a3)^2 # A(-1/2)^2  -4<=ah<=9
+  vinf=               a3 ^2 #  A(inf)^2
+*/
+
+#if TUNE_PROGRAM_BUILD
+#define MAYBE_sqr_basecase 1
+#define MAYBE_sqr_toom2   1
+#define MAYBE_sqr_toom4   1
+#else
+#define MAYBE_sqr_basecase						\
+  (SQR_TOOM4_THRESHOLD < 4 * SQR_TOOM2_THRESHOLD)
+#define MAYBE_sqr_toom2							\
+  (SQR_TOOM4_THRESHOLD < 4 * SQR_TOOM3_THRESHOLD)
+#define MAYBE_sqr_toom4							\
+  (SQR_TOOM6_THRESHOLD >= 4 * SQR_TOOM4_THRESHOLD)
+#endif
+
+#define TOOM4_SQR_REC(p, a, n, ws)					\
+  do {									\
+    if (MAYBE_sqr_basecase						\
+	&& BELOW_THRESHOLD (n, SQR_TOOM2_THRESHOLD))			\
+      mpn_sqr_basecase (p, a, n);					\
+    else if (MAYBE_sqr_toom2						\
+	     && BELOW_THRESHOLD (n, SQR_TOOM3_THRESHOLD))		\
+      mpn_toom2_sqr (p, a, n, ws);					\
+    else if (! MAYBE_sqr_toom4						\
+	     || BELOW_THRESHOLD (n, SQR_TOOM4_THRESHOLD))		\
+      mpn_toom3_sqr (p, a, n, ws);					\
+    else								\
+      mpn_toom4_sqr (p, a, n, ws);					\
+  } while (0)
+
+void
+mpn_toom4_sqr (mp_ptr pp,
+	       mp_srcptr ap, mp_size_t an,
+	       mp_ptr scratch)
+{
+  mp_size_t n, s;
+  mp_limb_t cy;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2*n)
+#define a3  (ap + 3*n)
+
+  n = (an + 3) >> 2;
+
+  s = an - 3 * n;
+
+  ASSERT (0 < s && s <= n);
+
+  /* NOTE: The multiplications to v2, vm2, vh and vm1 overwrites the
+   * following limb, so these must be computed in order, and we need a
+   * one limb gap to tp. */
+#define v0    pp				/* 2n */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vinf  (pp + 6 * n)			/* s+t */
+#define v2    scratch				/* 2n+1 */
+#define vm2   (scratch + 2 * n + 1)		/* 2n+1 */
+#define vh    (scratch + 4 * n + 2)		/* 2n+1 */
+#define vm1   (scratch + 6 * n + 3)		/* 2n+1 */
+#define tp (scratch + 8*n + 5)
+
+  /* No overlap with v1 */
+#define apx   pp				/* n+1 */
+#define amx   (pp + 4*n + 2)			/* n+1 */
+
+  /* Total scratch need: 8*n + 5 + scratch for recursive calls. This
+     gives roughly 32 n/3 + log term. */
+
+  /* Compute apx = a0 + 2 a1 + 4 a2 + 8 a3 and amx = a0 - 2 a1 + 4 a2 - 8 a3.  */
+  mpn_toom_eval_dgr3_pm2 (apx, amx, ap, n, s, tp);
+
+  TOOM4_SQR_REC (v2, apx, n + 1, tp);	/* v2,  2n+1 limbs */
+  TOOM4_SQR_REC (vm2, amx, n + 1, tp);	/* vm2,  2n+1 limbs */
+
+  /* Compute apx = 8 a0 + 4 a1 + 2 a2 + a3 = (((2*a0 + a1) * 2 + a2) * 2 + a3 */
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy = mpn_addlsh1_n (apx, a1, a0, n);
+  cy = 2*cy + mpn_addlsh1_n (apx, a2, apx, n);
+  if (s < n)
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_addlsh1_n (apx, a3, apx, s);
+      apx[n] = 2*cy + mpn_lshift (apx + s, apx + s, n - s, 1);
+      MPN_INCR_U (apx + s, n+1-s, cy2);
+    }
+  else
+    apx[n] = 2*cy + mpn_addlsh1_n (apx, a3, apx, n);
+#else
+  cy = mpn_lshift (apx, a0, n, 1);
+  cy += mpn_add_n (apx, apx, a1, n);
+  cy = 2*cy + mpn_lshift (apx, apx, n, 1);
+  cy += mpn_add_n (apx, apx, a2, n);
+  cy = 2*cy + mpn_lshift (apx, apx, n, 1);
+  apx[n] = cy + mpn_add (apx, apx, n, a3, s);
+#endif
+
+  ASSERT (apx[n] < 15);
+
+  TOOM4_SQR_REC (vh, apx, n + 1, tp);	/* vh,  2n+1 limbs */
+
+  /* Compute apx = a0 + a1 + a2 + a3 and amx = a0 - a1 + a2 - a3.  */
+  mpn_toom_eval_dgr3_pm1 (apx, amx, ap, n, s, tp);
+
+  TOOM4_SQR_REC (v1, apx, n + 1, tp);	/* v1,  2n+1 limbs */
+  TOOM4_SQR_REC (vm1, amx, n + 1, tp);	/* vm1,  2n+1 limbs */
+
+  TOOM4_SQR_REC (v0, a0, n, tp);
+  TOOM4_SQR_REC (vinf, a3, s, tp);	/* vinf, 2s limbs */
+
+  mpn_toom_interpolate_7pts (pp, n, (enum toom7_flags) 0, vm2, vm1, v2, vh, 2*s, tp);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom52_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom52_mul.c
deleted file mode 120000
index a1621167e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom52_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom52_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom52_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom52_mul.c
new file mode 100644
index 000000000..974059b65
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom52_mul.c
@@ -0,0 +1,256 @@
+/* mpn_toom52_mul -- Multiply {ap,an} and {bp,bn} where an is nominally 4/3
+   times as large as bn.  Or more accurately, bn < an < 2 bn.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   The idea of applying toom to unbalanced multiplication is due to Marco
+   Bodrato and Alberto Zanoni.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: -2, -1, 0, +1, +2, +inf
+
+  <-s-><--n--><--n--><--n--><--n-->
+   ___ ______ ______ ______ ______
+  |a4_|___a3_|___a2_|___a1_|___a0_|
+			|b1|___b0_|
+			<t-><--n-->
+
+  v0  =  a0                  * b0      #   A(0)*B(0)
+  v1  = (a0+ a1+ a2+ a3+  a4)*(b0+ b1) #   A(1)*B(1)      ah  <= 4   bh <= 1
+  vm1 = (a0- a1+ a2- a3+  a4)*(b0- b1) #  A(-1)*B(-1)    |ah| <= 2   bh  = 0
+  v2  = (a0+2a1+4a2+8a3+16a4)*(b0+2b1) #   A(2)*B(2)      ah  <= 30  bh <= 2
+  vm2 = (a0-2a1+4a2-8a3+16a4)*(b0-2b1) #  A(-2)*B(-2)    |ah| <= 20 |bh|<= 1
+  vinf=                   a4 *     b1  # A(inf)*B(inf)
+
+  Some slight optimization in evaluation are taken from the paper:
+  "Towards Optimal Toom-Cook Multiplication for Univariate and
+  Multivariate Polynomials in Characteristic 2 and 0."
+*/
+
+void
+mpn_toom52_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn, mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  enum toom6_flags flags;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2 * n)
+#define a3  (ap + 3 * n)
+#define a4  (ap + 4 * n)
+#define b0  bp
+#define b1  (bp + n)
+
+  n = 1 + (2 * an >= 5 * bn ? (an - 1) / (size_t) 5 : (bn - 1) >> 1);
+
+  s = an - 4 * n;
+  t = bn - n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+
+  /* Ensures that 5 values of n+1 limbs each fits in the product area.
+     Borderline cases are an = 32, bn = 8, n = 7, and an = 36, bn = 9,
+     n = 8. */
+  ASSERT (s+t >= 5);
+
+#define v0    pp				/* 2n */
+#define vm1   (scratch)				/* 2n+1 */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vm2   (scratch + 2 * n + 1)		/* 2n+1 */
+#define v2    (scratch + 4 * n + 2)		/* 2n+1 */
+#define vinf  (pp + 5 * n)			/* s+t */
+#define bs1    pp				/* n+1 */
+#define bsm1  (scratch + 2 * n + 2)		/* n   */
+#define asm1  (scratch + 3 * n + 3)		/* n+1 */
+#define asm2  (scratch + 4 * n + 4)		/* n+1 */
+#define bsm2  (pp + n + 1)			/* n+1 */
+#define bs2   (pp + 2 * n + 2)			/* n+1 */
+#define as2   (pp + 3 * n + 3)			/* n+1 */
+#define as1   (pp + 4 * n + 4)			/* n+1 */
+
+  /* Scratch need is 6 * n + 3 + 1. We need one extra limb, because
+     products will overwrite 2n+2 limbs. */
+
+#define a0a2  scratch
+#define a1a3  asm1
+
+  /* Compute as2 and asm2.  */
+  flags = (enum toom6_flags) (toom6_vm2_neg & mpn_toom_eval_pm2 (as2, asm2, 4, ap, n, s, a1a3));
+
+  /* Compute bs1 and bsm1.  */
+  if (t == n)
+    {
+#if HAVE_NATIVE_mpn_add_n_sub_n
+      mp_limb_t cy;
+
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  cy = mpn_add_n_sub_n (bs1, bsm1, b1, b0, n);
+	  flags = (enum toom6_flags) (flags ^ toom6_vm1_neg);
+	}
+      else
+	{
+	  cy = mpn_add_n_sub_n (bs1, bsm1, b0, b1, n);
+	}
+      bs1[n] = cy >> 1;
+#else
+      bs1[n] = mpn_add_n (bs1, b0, b1, n);
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, n);
+	  flags = (enum toom6_flags) (flags ^ toom6_vm1_neg);
+	}
+      else
+	{
+	  mpn_sub_n (bsm1, b0, b1, n);
+	}
+#endif
+    }
+  else
+    {
+      bs1[n] = mpn_add (bs1, b0, n, b1, t);
+      if (mpn_zero_p (b0 + t, n - t) && mpn_cmp (b0, b1, t) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, t);
+	  MPN_ZERO (bsm1 + t, n - t);
+	  flags = (enum toom6_flags) (flags ^ toom6_vm1_neg);
+	}
+      else
+	{
+	  mpn_sub (bsm1, b0, n, b1, t);
+	}
+    }
+
+  /* Compute bs2 and bsm2, recycling bs1 and bsm1. bs2=bs1+b1; bsm2=bsm1-b1  */
+  mpn_add (bs2, bs1, n+1, b1, t);
+  if (flags & toom6_vm1_neg)
+    {
+      bsm2[n] = mpn_add (bsm2, bsm1, n, b1, t);
+      flags = (enum toom6_flags) (flags ^ toom6_vm2_neg);
+    }
+  else
+    {
+      bsm2[n] = 0;
+      if (t == n)
+	{
+	  if (mpn_cmp (bsm1, b1, n) < 0)
+	    {
+	      mpn_sub_n (bsm2, b1, bsm1, n);
+	      flags = (enum toom6_flags) (flags ^ toom6_vm2_neg);
+	    }
+	  else
+	    {
+	      mpn_sub_n (bsm2, bsm1, b1, n);
+	    }
+	}
+      else
+	{
+	  if (mpn_zero_p (bsm1 + t, n - t) && mpn_cmp (bsm1, b1, t) < 0)
+	    {
+	      mpn_sub_n (bsm2, b1, bsm1, t);
+	      MPN_ZERO (bsm2 + t, n - t);
+	      flags = (enum toom6_flags) (flags ^ toom6_vm2_neg);
+	    }
+	  else
+	    {
+	      mpn_sub (bsm2, bsm1, n, b1, t);
+	    }
+	}
+    }
+
+  /* Compute as1 and asm1.  */
+  flags = (enum toom6_flags) (flags ^ (toom6_vm1_neg & mpn_toom_eval_pm1 (as1, asm1, 4, ap, n, s, a0a2)));
+
+  ASSERT (as1[n] <= 4);
+  ASSERT (bs1[n] <= 1);
+  ASSERT (asm1[n] <= 2);
+/*   ASSERT (bsm1[n] <= 1); */
+  ASSERT (as2[n] <=30);
+  ASSERT (bs2[n] <= 2);
+  ASSERT (asm2[n] <= 20);
+  ASSERT (bsm2[n] <= 1);
+
+  /* vm1, 2n+1 limbs */
+  mpn_mul (vm1, asm1, n+1, bsm1, n);  /* W4 */
+
+  /* vm2, 2n+1 limbs */
+  mpn_mul_n (vm2, asm2, bsm2, n+1);  /* W2 */
+
+  /* v2, 2n+1 limbs */
+  mpn_mul_n (v2, as2, bs2, n+1);  /* W1 */
+
+  /* v1, 2n+1 limbs */
+  mpn_mul_n (v1, as1, bs1, n+1);  /* W3 */
+
+  /* vinf, s+t limbs */   /* W0 */
+  if (s > t)  mpn_mul (vinf, a4, s, b1, t);
+  else        mpn_mul (vinf, b1, t, a4, s);
+
+  /* v0, 2n limbs */
+  mpn_mul_n (v0, ap, bp, n);  /* W5 */
+
+  mpn_toom_interpolate_6pts (pp, n, flags, vm1, vm2, v2, t + s);
+
+#undef v0
+#undef vm1
+#undef v1
+#undef vm2
+#undef v2
+#undef vinf
+#undef bs1
+#undef bs2
+#undef bsm1
+#undef bsm2
+#undef asm1
+#undef asm2
+#undef as1
+#undef as2
+#undef a0a2
+#undef b0b2
+#undef a1a3
+#undef a0
+#undef a1
+#undef a2
+#undef a3
+#undef b0
+#undef b1
+#undef b2
+
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom53_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom53_mul.c
deleted file mode 120000
index 043bd74da..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom53_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom53_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom53_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom53_mul.c
new file mode 100644
index 000000000..c9342972a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom53_mul.c
@@ -0,0 +1,331 @@
+/* mpn_toom53_mul -- Multiply {ap,an} and {bp,bn} where an is nominally 5/3
+   times as large as bn.  Or more accurately, (4/3)bn < an < (5/2)bn.
+
+   Contributed to the GNU project by Torbjorn Granlund and Marco Bodrato.
+
+   The idea of applying toom to unbalanced multiplication is due to Marco
+   Bodrato and Alberto Zanoni.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2008, 2012, 2014, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in: 0, +1, -1, +2, -2, 1/2, +inf
+
+  <-s-><--n--><--n--><--n--><--n-->
+   ___ ______ ______ ______ ______
+  |a4_|___a3_|___a2_|___a1_|___a0_|
+	       |__b2|___b1_|___b0_|
+	       <-t--><--n--><--n-->
+
+  v0  =    a0                  *  b0          #    A(0)*B(0)
+  v1  = (  a0+ a1+ a2+ a3+  a4)*( b0+ b1+ b2) #    A(1)*B(1)      ah  <= 4   bh <= 2
+  vm1 = (  a0- a1+ a2- a3+  a4)*( b0- b1+ b2) #   A(-1)*B(-1)    |ah| <= 2   bh <= 1
+  v2  = (  a0+2a1+4a2+8a3+16a4)*( b0+2b1+4b2) #    A(2)*B(2)      ah  <= 30  bh <= 6
+  vm2 = (  a0-2a1+4a2-8a3+16a4)*( b0-2b1+4b2) #    A(2)*B(2)     -9<=ah<=20 -1<=bh<=4
+  vh  = (16a0+8a1+4a2+2a3+  a4)*(4b0+2b1+ b2) #  A(1/2)*B(1/2)    ah  <= 30  bh <= 6
+  vinf=                     a4 *          b2  #  A(inf)*B(inf)
+*/
+
+void
+mpn_toom53_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn,
+		mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  mp_limb_t cy;
+  mp_ptr gp;
+  mp_ptr as1, asm1, as2, asm2, ash;
+  mp_ptr bs1, bsm1, bs2, bsm2, bsh;
+  mp_ptr tmp;
+  enum toom7_flags flags;
+  TMP_DECL;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2*n)
+#define a3  (ap + 3*n)
+#define a4  (ap + 4*n)
+#define b0  bp
+#define b1  (bp + n)
+#define b2  (bp + 2*n)
+
+  n = 1 + (3 * an >= 5 * bn ? (an - 1) / (size_t) 5 : (bn - 1) / (size_t) 3);
+
+  s = an - 4 * n;
+  t = bn - 2 * n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+
+  TMP_MARK;
+
+  tmp = TMP_ALLOC_LIMBS (10 * (n + 1));
+  as1  = tmp; tmp += n + 1;
+  asm1 = tmp; tmp += n + 1;
+  as2  = tmp; tmp += n + 1;
+  asm2 = tmp; tmp += n + 1;
+  ash  = tmp; tmp += n + 1;
+  bs1  = tmp; tmp += n + 1;
+  bsm1 = tmp; tmp += n + 1;
+  bs2  = tmp; tmp += n + 1;
+  bsm2 = tmp; tmp += n + 1;
+  bsh  = tmp; tmp += n + 1;
+
+  gp = pp;
+
+  /* Compute as1 and asm1.  */
+  flags = (enum toom7_flags) (toom7_w3_neg & mpn_toom_eval_pm1 (as1, asm1, 4, ap, n, s, gp));
+
+  /* Compute as2 and asm2. */
+  flags = (enum toom7_flags) (flags | (toom7_w1_neg & mpn_toom_eval_pm2 (as2, asm2, 4, ap, n, s, gp)));
+
+  /* Compute ash = 16 a0 + 8 a1 + 4 a2 + 2 a3 + a4
+     = 2*(2*(2*(2*a0 + a1) + a2) + a3) + a4  */
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy = mpn_addlsh1_n (ash, a1, a0, n);
+  cy = 2*cy + mpn_addlsh1_n (ash, a2, ash, n);
+  cy = 2*cy + mpn_addlsh1_n (ash, a3, ash, n);
+  if (s < n)
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_addlsh1_n (ash, a4, ash, s);
+      ash[n] = 2*cy + mpn_lshift (ash + s, ash + s, n - s, 1);
+      MPN_INCR_U (ash + s, n+1-s, cy2);
+    }
+  else
+    ash[n] = 2*cy + mpn_addlsh1_n (ash, a4, ash, n);
+#else
+  cy = mpn_lshift (ash, a0, n, 1);
+  cy += mpn_add_n (ash, ash, a1, n);
+  cy = 2*cy + mpn_lshift (ash, ash, n, 1);
+  cy += mpn_add_n (ash, ash, a2, n);
+  cy = 2*cy + mpn_lshift (ash, ash, n, 1);
+  cy += mpn_add_n (ash, ash, a3, n);
+  cy = 2*cy + mpn_lshift (ash, ash, n, 1);
+  ash[n] = cy + mpn_add (ash, ash, n, a4, s);
+#endif
+
+  /* Compute bs1 and bsm1.  */
+  bs1[n] = mpn_add (bs1, b0, n, b2, t);		/* b0 + b2 */
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (bs1[n] == 0 && mpn_cmp (bs1, b1, n) < 0)
+    {
+      bs1[n] = mpn_add_n_sub_n (bs1, bsm1, b1, bs1, n) >> 1;
+      bsm1[n] = 0;
+      flags = (enum toom7_flags) (flags ^ toom7_w3_neg);
+    }
+  else
+    {
+      cy = mpn_add_n_sub_n (bs1, bsm1, bs1, b1, n);
+      bsm1[n] = bs1[n] - (cy & 1);
+      bs1[n] += (cy >> 1);
+    }
+#else
+  if (bs1[n] == 0 && mpn_cmp (bs1, b1, n) < 0)
+    {
+      mpn_sub_n (bsm1, b1, bs1, n);
+      bsm1[n] = 0;
+      flags = (enum toom7_flags) (flags ^ toom7_w3_neg);
+    }
+  else
+    {
+      bsm1[n] = bs1[n] - mpn_sub_n (bsm1, bs1, b1, n);
+    }
+  bs1[n] += mpn_add_n (bs1, bs1, b1, n);  /* b0+b1+b2 */
+#endif
+
+  /* Compute bs2 and bsm2. */
+#if HAVE_NATIVE_mpn_addlsh_n || HAVE_NATIVE_mpn_addlsh2_n
+#if HAVE_NATIVE_mpn_addlsh2_n
+  cy = mpn_addlsh2_n (bs2, b0, b2, t);
+#else /* HAVE_NATIVE_mpn_addlsh_n */
+  cy = mpn_addlsh_n (bs2, b0, b2, t, 2);
+#endif
+  if (t < n)
+    cy = mpn_add_1 (bs2 + t, b0 + t, n - t, cy);
+  bs2[n] = cy;
+#else
+  cy = mpn_lshift (gp, b2, t, 2);
+  bs2[n] = mpn_add (bs2, b0, n, gp, t);
+  MPN_INCR_U (bs2 + t, n+1-t, cy);
+#endif
+
+  gp[n] = mpn_lshift (gp, b1, n, 1);
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (mpn_cmp (bs2, gp, n+1) < 0)
+    {
+      ASSERT_NOCARRY (mpn_add_n_sub_n (bs2, bsm2, gp, bs2, n+1));
+      flags = (enum toom7_flags) (flags ^ toom7_w1_neg);
+    }
+  else
+    {
+      ASSERT_NOCARRY (mpn_add_n_sub_n (bs2, bsm2, bs2, gp, n+1));
+    }
+#else
+  if (mpn_cmp (bs2, gp, n+1) < 0)
+    {
+      ASSERT_NOCARRY (mpn_sub_n (bsm2, gp, bs2, n+1));
+      flags = (enum toom7_flags) (flags ^ toom7_w1_neg);
+    }
+  else
+    {
+      ASSERT_NOCARRY (mpn_sub_n (bsm2, bs2, gp, n+1));
+    }
+  mpn_add_n (bs2, bs2, gp, n+1);
+#endif
+
+  /* Compute bsh = 4 b0 + 2 b1 + b2 = 2*(2*b0 + b1)+b2.  */
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy = mpn_addlsh1_n (bsh, b1, b0, n);
+  if (t < n)
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_addlsh1_n (bsh, b2, bsh, t);
+      bsh[n] = 2*cy + mpn_lshift (bsh + t, bsh + t, n - t, 1);
+      MPN_INCR_U (bsh + t, n+1-t, cy2);
+    }
+  else
+    bsh[n] = 2*cy + mpn_addlsh1_n (bsh, b2, bsh, n);
+#else
+  cy = mpn_lshift (bsh, b0, n, 1);
+  cy += mpn_add_n (bsh, bsh, b1, n);
+  cy = 2*cy + mpn_lshift (bsh, bsh, n, 1);
+  bsh[n] = cy + mpn_add (bsh, bsh, n, b2, t);
+#endif
+
+  ASSERT (as1[n] <= 4);
+  ASSERT (bs1[n] <= 2);
+  ASSERT (asm1[n] <= 2);
+  ASSERT (bsm1[n] <= 1);
+  ASSERT (as2[n] <= 30);
+  ASSERT (bs2[n] <= 6);
+  ASSERT (asm2[n] <= 20);
+  ASSERT (bsm2[n] <= 4);
+  ASSERT (ash[n] <= 30);
+  ASSERT (bsh[n] <= 6);
+
+#define v0    pp				/* 2n */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vinf  (pp + 6 * n)			/* s+t */
+#define v2    scratch				/* 2n+1 */
+#define vm2   (scratch + 2 * n + 1)		/* 2n+1 */
+#define vh    (scratch + 4 * n + 2)		/* 2n+1 */
+#define vm1   (scratch + 6 * n + 3)		/* 2n+1 */
+#define scratch_out (scratch + 8 * n + 4)		/* 2n+1 */
+  /* Total scratch need: 10*n+5 */
+
+  /* Must be in allocation order, as they overwrite one limb beyond
+   * 2n+1. */
+  mpn_mul_n (v2, as2, bs2, n + 1);		/* v2, 2n+1 limbs */
+  mpn_mul_n (vm2, asm2, bsm2, n + 1);		/* vm2, 2n+1 limbs */
+  mpn_mul_n (vh, ash, bsh, n + 1);		/* vh, 2n+1 limbs */
+
+  /* vm1, 2n+1 limbs */
+#ifdef SMALLER_RECURSION
+  mpn_mul_n (vm1, asm1, bsm1, n);
+  if (asm1[n] == 1)
+    {
+      cy = bsm1[n] + mpn_add_n (vm1 + n, vm1 + n, bsm1, n);
+    }
+  else if (asm1[n] == 2)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+      cy = 2 * bsm1[n] + mpn_addlsh1_n_ip1 (vm1 + n, bsm1, n);
+#else
+      cy = 2 * bsm1[n] + mpn_addmul_1 (vm1 + n, bsm1, n, CNST_LIMB(2));
+#endif
+    }
+  else
+    cy = 0;
+  if (bsm1[n] != 0)
+    cy += mpn_add_n (vm1 + n, vm1 + n, asm1, n);
+  vm1[2 * n] = cy;
+#else /* SMALLER_RECURSION */
+  vm1[2 * n] = 0;
+  mpn_mul_n (vm1, asm1, bsm1, n + ((asm1[n] | bsm1[n]) != 0));
+#endif /* SMALLER_RECURSION */
+
+  /* v1, 2n+1 limbs */
+#ifdef SMALLER_RECURSION
+  mpn_mul_n (v1, as1, bs1, n);
+  if (as1[n] == 1)
+    {
+      cy = bs1[n] + mpn_add_n (v1 + n, v1 + n, bs1, n);
+    }
+  else if (as1[n] == 2)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+      cy = 2 * bs1[n] + mpn_addlsh1_n_ip1 (v1 + n, bs1, n);
+#else
+      cy = 2 * bs1[n] + mpn_addmul_1 (v1 + n, bs1, n, CNST_LIMB(2));
+#endif
+    }
+  else if (as1[n] != 0)
+    {
+      cy = as1[n] * bs1[n] + mpn_addmul_1 (v1 + n, bs1, n, as1[n]);
+    }
+  else
+    cy = 0;
+  if (bs1[n] == 1)
+    {
+      cy += mpn_add_n (v1 + n, v1 + n, as1, n);
+    }
+  else if (bs1[n] == 2)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n_ip1
+      cy += mpn_addlsh1_n_ip1 (v1 + n, as1, n);
+#else
+      cy += mpn_addmul_1 (v1 + n, as1, n, CNST_LIMB(2));
+#endif
+    }
+  v1[2 * n] = cy;
+#else /* SMALLER_RECURSION */
+  v1[2 * n] = 0;
+  mpn_mul_n (v1, as1, bs1, n + ((as1[n] | bs1[n]) != 0));
+#endif /* SMALLER_RECURSION */
+
+  mpn_mul_n (v0, a0, b0, n);			/* v0, 2n limbs */
+
+  /* vinf, s+t limbs */
+  if (s > t)  mpn_mul (vinf, a4, s, b2, t);
+  else        mpn_mul (vinf, b2, t, a4, s);
+
+  mpn_toom_interpolate_7pts (pp, n, flags, vm2, vm1, v2, vh, s + t,
+			     scratch_out);
+
+  TMP_FREE;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom54_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom54_mul.c
deleted file mode 120000
index 3ccd1dcd7..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom54_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom54_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom54_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom54_mul.c
new file mode 100644
index 000000000..343b02e94
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom54_mul.c
@@ -0,0 +1,142 @@
+/* Implementation of the algorithm for Toom-Cook 4.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+
+/* Toom-4.5, the splitting 5x4 unbalanced version.
+   Evaluate in: infinity, +4, -4, +2, -2, +1, -1, 0.
+
+  <--s-><--n--><--n--><--n--><--n-->
+   ____ ______ ______ ______ ______
+  |_a4_|__a3__|__a2__|__a1__|__a0__|
+	  |b3_|__b2__|__b1__|__b0__|
+	  <-t-><--n--><--n--><--n-->
+
+*/
+#define TOOM_54_MUL_N_REC(p, a, b, n, ws)		\
+  do {	mpn_mul_n (p, a, b, n);				\
+  } while (0)
+
+#define TOOM_54_MUL_REC(p, a, na, b, nb, ws)		\
+  do {	mpn_mul (p, a, na, b, nb);			\
+  } while (0)
+
+void
+mpn_toom54_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn, mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  int sign;
+
+  /***************************** decomposition *******************************/
+#define a4  (ap + 4 * n)
+#define b3  (bp + 3 * n)
+
+  ASSERT (an >= bn);
+  n = 1 + (4 * an >= 5 * bn ? (an - 1) / (size_t) 5 : (bn - 1) / (size_t) 4);
+
+  s = an - 4 * n;
+  t = bn - 3 * n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+  /* Required by mpn_toom_interpolate_8pts. */
+  ASSERT ( s + t >= n );
+  ASSERT ( s + t > 4);
+  ASSERT ( n > 2);
+
+#define   r8    pp				/* 2n   */
+#define   r7    scratch				/* 3n+1 */
+#define   r5    (pp + 3*n)			/* 3n+1 */
+#define   v0    (pp + 3*n)			/* n+1 */
+#define   v1    (pp + 4*n+1)			/* n+1 */
+#define   v2    (pp + 5*n+2)			/* n+1 */
+#define   v3    (pp + 6*n+3)			/* n+1 */
+#define   r3    (scratch + 3 * n + 1)		/* 3n+1 */
+#define   r1    (pp + 7*n)			/* s+t <= 2*n */
+#define   ws    (scratch + 6 * n + 2)		/* ??? */
+
+  /* Alloc also 3n+1 limbs for ws... mpn_toom_interpolate_8pts may
+     need all of them, when DO_mpn_sublsh_n usea a scratch  */
+  /********************** evaluation and recursive calls *********************/
+  /* $\pm4$ */
+  sign = mpn_toom_eval_pm2exp (v2, v0, 4, ap, n, s, 2, pp)
+       ^ mpn_toom_eval_pm2exp (v3, v1, 3, bp, n, t, 2, pp);
+  TOOM_54_MUL_N_REC(pp, v0, v1, n + 1, ws); /* A(-4)*B(-4) */
+  TOOM_54_MUL_N_REC(r3, v2, v3, n + 1, ws); /* A(+4)*B(+4) */
+  mpn_toom_couple_handling (r3, 2*n+1, pp, sign, n, 2, 4);
+
+  /* $\pm1$ */
+  sign = mpn_toom_eval_pm1 (v2, v0, 4, ap, n, s,    pp)
+       ^ mpn_toom_eval_dgr3_pm1 (v3, v1, bp, n, t,    pp);
+  TOOM_54_MUL_N_REC(pp, v0, v1, n + 1, ws); /* A(-1)*B(-1) */
+  TOOM_54_MUL_N_REC(r7, v2, v3, n + 1, ws); /* A(1)*B(1) */
+  mpn_toom_couple_handling (r7, 2*n+1, pp, sign, n, 0, 0);
+
+  /* $\pm2$ */
+  sign = mpn_toom_eval_pm2 (v2, v0, 4, ap, n, s, pp)
+       ^ mpn_toom_eval_dgr3_pm2 (v3, v1, bp, n, t, pp);
+  TOOM_54_MUL_N_REC(pp, v0, v1, n + 1, ws); /* A(-2)*B(-2) */
+  TOOM_54_MUL_N_REC(r5, v2, v3, n + 1, ws); /* A(+2)*B(+2) */
+  mpn_toom_couple_handling (r5, 2*n+1, pp, sign, n, 1, 2);
+
+  /* A(0)*B(0) */
+  TOOM_54_MUL_N_REC(pp, ap, bp, n, ws);
+
+  /* Infinity */
+  if (s > t) {
+    TOOM_54_MUL_REC(r1, a4, s, b3, t, ws);
+  } else {
+    TOOM_54_MUL_REC(r1, b3, t, a4, s, ws);
+  };
+
+  mpn_toom_interpolate_8pts (pp, n, r3, r7, s + t, ws);
+
+#undef a4
+#undef b3
+#undef r1
+#undef r3
+#undef r5
+#undef v0
+#undef v1
+#undef v2
+#undef v3
+#undef r7
+#undef r8
+#undef ws
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom62_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom62_mul.c
deleted file mode 120000
index 98039c1ff..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom62_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom62_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom62_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom62_mul.c
new file mode 100644
index 000000000..d971cc025
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom62_mul.c
@@ -0,0 +1,310 @@
+/* mpn_toom62_mul -- Multiply {ap,an} and {bp,bn} where an is nominally 3 times
+   as large as bn.  Or more accurately, (5/2)bn < an < 6bn.
+
+   Contributed to the GNU project by Torbjorn Granlund and Marco Bodrato.
+
+   The idea of applying toom to unbalanced multiplication is due to Marco
+   Bodrato and Alberto Zanoni.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006-2008, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluate in:
+   0, +1, -1, +2, -2, 1/2, +inf
+
+  <-s-><--n--><--n--><--n--><--n--><--n-->
+   ___ ______ ______ ______ ______ ______
+  |a5_|___a4_|___a3_|___a2_|___a1_|___a0_|
+			     |_b1_|___b0_|
+			     <-t--><--n-->
+
+  v0  =    a0                       *   b0      #    A(0)*B(0)
+  v1  = (  a0+  a1+ a2+ a3+  a4+  a5)*( b0+ b1) #    A(1)*B(1)      ah  <= 5   bh <= 1
+  vm1 = (  a0-  a1+ a2- a3+  a4-  a5)*( b0- b1) #   A(-1)*B(-1)    |ah| <= 2   bh  = 0
+  v2  = (  a0+ 2a1+4a2+8a3+16a4+32a5)*( b0+2b1) #    A(2)*B(2)      ah  <= 62  bh <= 2
+  vm2 = (  a0- 2a1+4a2-8a3+16a4-32a5)*( b0-2b1) #   A(-2)*B(-2)    -41<=ah<=20 -1<=bh<=0
+  vh  = (32a0+16a1+8a2+4a3+ 2a4+  a5)*(2b0+ b1) #  A(1/2)*B(1/2)    ah  <= 62  bh <= 2
+  vinf=                           a5 *      b1  #  A(inf)*B(inf)
+*/
+
+void
+mpn_toom62_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn,
+		mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  mp_limb_t cy;
+  mp_ptr as1, asm1, as2, asm2, ash;
+  mp_ptr bs1, bsm1, bs2, bsm2, bsh;
+  mp_ptr gp;
+  enum toom7_flags aflags, bflags;
+  TMP_DECL;
+
+#define a0  ap
+#define a1  (ap + n)
+#define a2  (ap + 2*n)
+#define a3  (ap + 3*n)
+#define a4  (ap + 4*n)
+#define a5  (ap + 5*n)
+#define b0  bp
+#define b1  (bp + n)
+
+  n = 1 + (an >= 3 * bn ? (an - 1) / (size_t) 6 : (bn - 1) >> 1);
+
+  s = an - 5 * n;
+  t = bn - n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+
+  TMP_MARK;
+
+  as1 = TMP_SALLOC_LIMBS (n + 1);
+  asm1 = TMP_SALLOC_LIMBS (n + 1);
+  as2 = TMP_SALLOC_LIMBS (n + 1);
+  asm2 = TMP_SALLOC_LIMBS (n + 1);
+  ash = TMP_SALLOC_LIMBS (n + 1);
+
+  bs1 = TMP_SALLOC_LIMBS (n + 1);
+  bsm1 = TMP_SALLOC_LIMBS (n);
+  bs2 = TMP_SALLOC_LIMBS (n + 1);
+  bsm2 = TMP_SALLOC_LIMBS (n + 1);
+  bsh = TMP_SALLOC_LIMBS (n + 1);
+
+  gp = pp;
+
+  /* Compute as1 and asm1.  */
+  aflags = (enum toom7_flags) (toom7_w3_neg & mpn_toom_eval_pm1 (as1, asm1, 5, ap, n, s, gp));
+
+  /* Compute as2 and asm2. */
+  aflags = (enum toom7_flags) (aflags | (toom7_w1_neg & mpn_toom_eval_pm2 (as2, asm2, 5, ap, n, s, gp)));
+
+  /* Compute ash = 32 a0 + 16 a1 + 8 a2 + 4 a3 + 2 a4 + a5
+     = 2*(2*(2*(2*(2*a0 + a1) + a2) + a3) + a4) + a5  */
+
+#if HAVE_NATIVE_mpn_addlsh1_n
+  cy = mpn_addlsh1_n (ash, a1, a0, n);
+  cy = 2*cy + mpn_addlsh1_n (ash, a2, ash, n);
+  cy = 2*cy + mpn_addlsh1_n (ash, a3, ash, n);
+  cy = 2*cy + mpn_addlsh1_n (ash, a4, ash, n);
+  if (s < n)
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_addlsh1_n (ash, a5, ash, s);
+      ash[n] = 2*cy + mpn_lshift (ash + s, ash + s, n - s, 1);
+      MPN_INCR_U (ash + s, n+1-s, cy2);
+    }
+  else
+    ash[n] = 2*cy + mpn_addlsh1_n (ash, a5, ash, n);
+#else
+  cy = mpn_lshift (ash, a0, n, 1);
+  cy += mpn_add_n (ash, ash, a1, n);
+  cy = 2*cy + mpn_lshift (ash, ash, n, 1);
+  cy += mpn_add_n (ash, ash, a2, n);
+  cy = 2*cy + mpn_lshift (ash, ash, n, 1);
+  cy += mpn_add_n (ash, ash, a3, n);
+  cy = 2*cy + mpn_lshift (ash, ash, n, 1);
+  cy += mpn_add_n (ash, ash, a4, n);
+  cy = 2*cy + mpn_lshift (ash, ash, n, 1);
+  ash[n] = cy + mpn_add (ash, ash, n, a5, s);
+#endif
+
+  /* Compute bs1 and bsm1.  */
+  if (t == n)
+    {
+#if HAVE_NATIVE_mpn_add_n_sub_n
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  cy = mpn_add_n_sub_n (bs1, bsm1, b1, b0, n);
+	  bflags = toom7_w3_neg;
+	}
+      else
+	{
+	  cy = mpn_add_n_sub_n (bs1, bsm1, b0, b1, n);
+	  bflags = (enum toom7_flags) 0;
+	}
+      bs1[n] = cy >> 1;
+#else
+      bs1[n] = mpn_add_n (bs1, b0, b1, n);
+      if (mpn_cmp (b0, b1, n) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, n);
+	  bflags = toom7_w3_neg;
+	}
+      else
+	{
+	  mpn_sub_n (bsm1, b0, b1, n);
+	  bflags = (enum toom7_flags) 0;
+	}
+#endif
+    }
+  else
+    {
+      bs1[n] = mpn_add (bs1, b0, n, b1, t);
+      if (mpn_zero_p (b0 + t, n - t) && mpn_cmp (b0, b1, t) < 0)
+	{
+	  mpn_sub_n (bsm1, b1, b0, t);
+	  MPN_ZERO (bsm1 + t, n - t);
+	  bflags = toom7_w3_neg;
+	}
+      else
+	{
+	  mpn_sub (bsm1, b0, n, b1, t);
+	  bflags = (enum toom7_flags) 0;
+	}
+    }
+
+  /* Compute bs2 and bsm2. Recycling bs1 and bsm1; bs2=bs1+b1, bsm2 =
+     bsm1 - b1 */
+  mpn_add (bs2, bs1, n + 1, b1, t);
+  if (bflags & toom7_w3_neg)
+    {
+      bsm2[n] = mpn_add (bsm2, bsm1, n, b1, t);
+      bflags = (enum toom7_flags) (bflags | toom7_w1_neg);
+    }
+  else
+    {
+      /* FIXME: Simplify this logic? */
+      if (t < n)
+	{
+	  if (mpn_zero_p (bsm1 + t, n - t) && mpn_cmp (bsm1, b1, t) < 0)
+	    {
+	      ASSERT_NOCARRY (mpn_sub_n (bsm2, b1, bsm1, t));
+	      MPN_ZERO (bsm2 + t, n + 1 - t);
+	      bflags = (enum toom7_flags) (bflags | toom7_w1_neg);
+	    }
+	  else
+	    {
+	      ASSERT_NOCARRY (mpn_sub (bsm2, bsm1, n, b1, t));
+	      bsm2[n] = 0;
+	    }
+	}
+      else
+	{
+	  if (mpn_cmp (bsm1, b1, n) < 0)
+	    {
+	      ASSERT_NOCARRY (mpn_sub_n (bsm2, b1, bsm1, n));
+	      bflags = (enum toom7_flags) (bflags | toom7_w1_neg);
+	    }
+	  else
+	    {
+	      ASSERT_NOCARRY (mpn_sub_n (bsm2, bsm1, b1, n));
+	    }
+	  bsm2[n] = 0;
+	}
+    }
+
+  /* Compute bsh, recycling bs1. bsh=bs1+b0;  */
+  bsh[n] = bs1[n] + mpn_add_n (bsh, bs1, b0, n);
+
+  ASSERT (as1[n] <= 5);
+  ASSERT (bs1[n] <= 1);
+  ASSERT (asm1[n] <= 2);
+  ASSERT (as2[n] <= 62);
+  ASSERT (bs2[n] <= 2);
+  ASSERT (asm2[n] <= 41);
+  ASSERT (bsm2[n] <= 1);
+  ASSERT (ash[n] <= 62);
+  ASSERT (bsh[n] <= 2);
+
+#define v0    pp				/* 2n */
+#define v1    (pp + 2 * n)			/* 2n+1 */
+#define vinf  (pp + 6 * n)			/* s+t */
+#define v2    scratch				/* 2n+1 */
+#define vm2   (scratch + 2 * n + 1)		/* 2n+1 */
+#define vh    (scratch + 4 * n + 2)		/* 2n+1 */
+#define vm1   (scratch + 6 * n + 3)		/* 2n+1 */
+#define scratch_out (scratch + 8 * n + 4)		/* 2n+1 */
+  /* Total scratch need: 10*n+5 */
+
+  /* Must be in allocation order, as they overwrite one limb beyond
+   * 2n+1. */
+  mpn_mul_n (v2, as2, bs2, n + 1);		/* v2, 2n+1 limbs */
+  mpn_mul_n (vm2, asm2, bsm2, n + 1);		/* vm2, 2n+1 limbs */
+  mpn_mul_n (vh, ash, bsh, n + 1);		/* vh, 2n+1 limbs */
+
+  /* vm1, 2n+1 limbs */
+  mpn_mul_n (vm1, asm1, bsm1, n);
+  cy = 0;
+  if (asm1[n] == 1)
+    {
+      cy = mpn_add_n (vm1 + n, vm1 + n, bsm1, n);
+    }
+  else if (asm1[n] == 2)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n
+      cy = mpn_addlsh1_n (vm1 + n, vm1 + n, bsm1, n);
+#else
+      cy = mpn_addmul_1 (vm1 + n, bsm1, n, CNST_LIMB(2));
+#endif
+    }
+  vm1[2 * n] = cy;
+
+  /* v1, 2n+1 limbs */
+  mpn_mul_n (v1, as1, bs1, n);
+  if (as1[n] == 1)
+    {
+      cy = bs1[n] + mpn_add_n (v1 + n, v1 + n, bs1, n);
+    }
+  else if (as1[n] == 2)
+    {
+#if HAVE_NATIVE_mpn_addlsh1_n
+      cy = 2 * bs1[n] + mpn_addlsh1_n (v1 + n, v1 + n, bs1, n);
+#else
+      cy = 2 * bs1[n] + mpn_addmul_1 (v1 + n, bs1, n, CNST_LIMB(2));
+#endif
+    }
+  else if (as1[n] != 0)
+    {
+      cy = as1[n] * bs1[n] + mpn_addmul_1 (v1 + n, bs1, n, as1[n]);
+    }
+  else
+    cy = 0;
+  if (bs1[n] != 0)
+    cy += mpn_add_n (v1 + n, v1 + n, as1, n);
+  v1[2 * n] = cy;
+
+  mpn_mul_n (v0, a0, b0, n);			/* v0, 2n limbs */
+
+  /* vinf, s+t limbs */
+  if (s > t)  mpn_mul (vinf, a5, s, b1, t);
+  else        mpn_mul (vinf, b1, t, a5, s);
+
+  mpn_toom_interpolate_7pts (pp, n, (enum toom7_flags) (aflags ^ bflags),
+			     vm2, vm1, v2, vh, s + t, scratch_out);
+
+  TMP_FREE;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom63_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom63_mul.c
deleted file mode 120000
index f74dea197..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom63_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom63_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom63_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom63_mul.c
new file mode 100644
index 000000000..181996d0a
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom63_mul.c
@@ -0,0 +1,231 @@
+/* Implementation of the algorithm for Toom-Cook 4.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Stores |{ap,n}-{bp,n}| in {rp,n}, returns the sign. */
+static int
+abs_sub_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n)
+{
+  mp_limb_t  x, y;
+  while (--n >= 0)
+    {
+      x = ap[n];
+      y = bp[n];
+      if (x != y)
+	{
+	  n++;
+	  if (x > y)
+	    {
+	      mpn_sub_n (rp, ap, bp, n);
+	      return 0;
+	    }
+	  else
+	    {
+	      mpn_sub_n (rp, bp, ap, n);
+	      return ~0;
+	    }
+	}
+      rp[n] = 0;
+    }
+  return 0;
+}
+
+static int
+abs_sub_add_n (mp_ptr rm, mp_ptr rp, mp_srcptr rs, mp_size_t n) {
+  int result;
+  result = abs_sub_n (rm, rp, rs, n);
+  ASSERT_NOCARRY(mpn_add_n (rp, rp, rs, n));
+  return result;
+}
+
+
+/* Toom-4.5, the splitting 6x3 unbalanced version.
+   Evaluate in: infinity, +4, -4, +2, -2, +1, -1, 0.
+
+  <--s-><--n--><--n--><--n--><--n--><--n-->
+   ____ ______ ______ ______ ______ ______
+  |_a5_|__a4__|__a3__|__a2__|__a1__|__a0__|
+			|b2_|__b1__|__b0__|
+			<-t-><--n--><--n-->
+
+*/
+#define TOOM_63_MUL_N_REC(p, a, b, n, ws)		\
+  do {	mpn_mul_n (p, a, b, n);				\
+  } while (0)
+
+#define TOOM_63_MUL_REC(p, a, na, b, nb, ws)		\
+  do {	mpn_mul (p, a, na, b, nb);			\
+  } while (0)
+
+void
+mpn_toom63_mul (mp_ptr pp,
+		mp_srcptr ap, mp_size_t an,
+		mp_srcptr bp, mp_size_t bn, mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  mp_limb_t cy;
+  int sign;
+
+  /***************************** decomposition *******************************/
+#define a5  (ap + 5 * n)
+#define b0  (bp + 0 * n)
+#define b1  (bp + 1 * n)
+#define b2  (bp + 2 * n)
+
+  ASSERT (an >= bn);
+  n = 1 + (an >= 2 * bn ? (an - 1) / (size_t) 6 : (bn - 1) / (size_t) 3);
+
+  s = an - 5 * n;
+  t = bn - 2 * n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+  /* WARNING! it assumes s+t>=n */
+  ASSERT ( s + t >= n );
+  ASSERT ( s + t > 4);
+  /* WARNING! it assumes n>1 */
+  ASSERT ( n > 2);
+
+#define   r8    pp				/* 2n   */
+#define   r7    scratch				/* 3n+1 */
+#define   r5    (pp + 3*n)			/* 3n+1 */
+#define   v0    (pp + 3*n)			/* n+1 */
+#define   v1    (pp + 4*n+1)			/* n+1 */
+#define   v2    (pp + 5*n+2)			/* n+1 */
+#define   v3    (pp + 6*n+3)			/* n+1 */
+#define   r3    (scratch + 3 * n + 1)		/* 3n+1 */
+#define   r1    (pp + 7*n)			/* s+t <= 2*n */
+#define   ws    (scratch + 6 * n + 2)		/* ??? */
+
+  /* Alloc also 3n+1 limbs for ws... mpn_toom_interpolate_8pts may
+     need all of them, when DO_mpn_sublsh_n usea a scratch  */
+/*   if (scratch == NULL) scratch = TMP_SALLOC_LIMBS (9 * n + 3); */
+
+  /********************** evaluation and recursive calls *********************/
+  /* $\pm4$ */
+  sign = mpn_toom_eval_pm2exp (v2, v0, 5, ap, n, s, 2, pp);
+  pp[n] = mpn_lshift (pp, b1, n, 2); /* 4b1 */
+  /* FIXME: use addlsh */
+  v3[t] = mpn_lshift (v3, b2, t, 4);/* 16b2 */
+  if ( n == t )
+    v3[n]+= mpn_add_n (v3, v3, b0, n); /* 16b2+b0 */
+  else
+    v3[n] = mpn_add (v3, b0, n, v3, t+1); /* 16b2+b0 */
+  sign ^= abs_sub_add_n (v1, v3, pp, n + 1);
+  TOOM_63_MUL_N_REC(pp, v0, v1, n + 1, ws); /* A(-4)*B(-4) */
+  TOOM_63_MUL_N_REC(r3, v2, v3, n + 1, ws); /* A(+4)*B(+4) */
+  mpn_toom_couple_handling (r3, 2*n+1, pp, sign, n, 2, 4);
+
+  /* $\pm1$ */
+  sign = mpn_toom_eval_pm1 (v2, v0, 5, ap, n, s,    pp);
+  /* Compute bs1 and bsm1. Code taken from toom33 */
+  cy = mpn_add (ws, b0, n, b2, t);
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (cy == 0 && mpn_cmp (ws, b1, n) < 0)
+    {
+      cy = mpn_add_n_sub_n (v3, v1, b1, ws, n);
+      v3[n] = cy >> 1;
+      v1[n] = 0;
+      sign = ~sign;
+    }
+  else
+    {
+      mp_limb_t cy2;
+      cy2 = mpn_add_n_sub_n (v3, v1, ws, b1, n);
+      v3[n] = cy + (cy2 >> 1);
+      v1[n] = cy - (cy2 & 1);
+    }
+#else
+  v3[n] = cy + mpn_add_n (v3, ws, b1, n);
+  if (cy == 0 && mpn_cmp (ws, b1, n) < 0)
+    {
+      mpn_sub_n (v1, b1, ws, n);
+      v1[n] = 0;
+      sign = ~sign;
+    }
+  else
+    {
+      cy -= mpn_sub_n (v1, ws, b1, n);
+      v1[n] = cy;
+    }
+#endif
+  TOOM_63_MUL_N_REC(pp, v0, v1, n + 1, ws); /* A(-1)*B(-1) */
+  TOOM_63_MUL_N_REC(r7, v2, v3, n + 1, ws); /* A(1)*B(1) */
+  mpn_toom_couple_handling (r7, 2*n+1, pp, sign, n, 0, 0);
+
+  /* $\pm2$ */
+  sign = mpn_toom_eval_pm2 (v2, v0, 5, ap, n, s, pp);
+  pp[n] = mpn_lshift (pp, b1, n, 1); /* 2b1 */
+  /* FIXME: use addlsh or addlsh2 */
+  v3[t] = mpn_lshift (v3, b2, t, 2);/* 4b2 */
+  if ( n == t )
+    v3[n]+= mpn_add_n (v3, v3, b0, n); /* 4b2+b0 */
+  else
+    v3[n] = mpn_add (v3, b0, n, v3, t+1); /* 4b2+b0 */
+  sign ^= abs_sub_add_n (v1, v3, pp, n + 1);
+  TOOM_63_MUL_N_REC(pp, v0, v1, n + 1, ws); /* A(-2)*B(-2) */
+  TOOM_63_MUL_N_REC(r5, v2, v3, n + 1, ws); /* A(+2)*B(+2) */
+  mpn_toom_couple_handling (r5, 2*n+1, pp, sign, n, 1, 2);
+
+  /* A(0)*B(0) */
+  TOOM_63_MUL_N_REC(pp, ap, bp, n, ws);
+
+  /* Infinity */
+  if (s > t) {
+    TOOM_63_MUL_REC(r1, a5, s, b2, t, ws);
+  } else {
+    TOOM_63_MUL_REC(r1, b2, t, a5, s, ws);
+  };
+
+  mpn_toom_interpolate_8pts (pp, n, r3, r7, s + t, ws);
+
+#undef a5
+#undef b0
+#undef b1
+#undef b2
+#undef r1
+#undef r3
+#undef r5
+#undef v0
+#undef v1
+#undef v2
+#undef v3
+#undef r7
+#undef r8
+#undef ws
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6_sqr.c
deleted file mode 120000
index f48935020..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6_sqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom6_sqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6_sqr.c
new file mode 100644
index 000000000..336eef9d6
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6_sqr.c
@@ -0,0 +1,181 @@
+/* Implementation of the squaring algorithm with Toom-Cook 6.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+#if GMP_NUMB_BITS < 21
+#error Not implemented.
+#endif
+
+
+#if TUNE_PROGRAM_BUILD
+#define MAYBE_sqr_basecase 1
+#define MAYBE_sqr_above_basecase   1
+#define MAYBE_sqr_toom2   1
+#define MAYBE_sqr_above_toom2   1
+#define MAYBE_sqr_toom3   1
+#define MAYBE_sqr_above_toom3   1
+#define MAYBE_sqr_above_toom4   1
+#else
+#ifdef  SQR_TOOM8_THRESHOLD
+#define SQR_TOOM6_MAX ((SQR_TOOM8_THRESHOLD+6*2-1+5)/6)
+#else
+#define SQR_TOOM6_MAX					\
+  ((SQR_FFT_THRESHOLD <= MP_SIZE_T_MAX - (6*2-1+5)) ?	\
+   ((SQR_FFT_THRESHOLD+6*2-1+5)/6)			\
+   : MP_SIZE_T_MAX )
+#endif
+#define MAYBE_sqr_basecase					\
+  (SQR_TOOM6_THRESHOLD < 6 * SQR_TOOM2_THRESHOLD)
+#define MAYBE_sqr_above_basecase				\
+  (SQR_TOOM6_MAX >=  SQR_TOOM2_THRESHOLD)
+#define MAYBE_sqr_toom2						\
+  (SQR_TOOM6_THRESHOLD < 6 * SQR_TOOM3_THRESHOLD)
+#define MAYBE_sqr_above_toom2					\
+  (SQR_TOOM6_MAX >= SQR_TOOM3_THRESHOLD)
+#define MAYBE_sqr_toom3						\
+  (SQR_TOOM6_THRESHOLD < 6 * SQR_TOOM4_THRESHOLD)
+#define MAYBE_sqr_above_toom3					\
+  (SQR_TOOM6_MAX >= SQR_TOOM4_THRESHOLD)
+#define MAYBE_sqr_above_toom4					\
+  (SQR_TOOM6_MAX >= SQR_TOOM6_THRESHOLD)
+#endif
+
+#define TOOM6_SQR_REC(p, a, n, ws)					\
+  do {									\
+    if (MAYBE_sqr_basecase && ( !MAYBE_sqr_above_basecase		\
+	|| BELOW_THRESHOLD (n, SQR_TOOM2_THRESHOLD)))			\
+      mpn_sqr_basecase (p, a, n);					\
+    else if (MAYBE_sqr_toom2 && ( !MAYBE_sqr_above_toom2		\
+	     || BELOW_THRESHOLD (n, SQR_TOOM3_THRESHOLD)))		\
+      mpn_toom2_sqr (p, a, n, ws);					\
+    else if (MAYBE_sqr_toom3 && ( !MAYBE_sqr_above_toom3		\
+	     || BELOW_THRESHOLD (n, SQR_TOOM4_THRESHOLD)))		\
+      mpn_toom3_sqr (p, a, n, ws);					\
+    else if (! MAYBE_sqr_above_toom4					\
+	     || BELOW_THRESHOLD (n, SQR_TOOM6_THRESHOLD))		\
+      mpn_toom4_sqr (p, a, n, ws);					\
+    else								\
+      mpn_toom6_sqr (p, a, n, ws);					\
+  } while (0)
+
+void
+mpn_toom6_sqr  (mp_ptr pp, mp_srcptr ap, mp_size_t an, mp_ptr scratch)
+{
+  mp_size_t n, s;
+
+  /***************************** decomposition *******************************/
+
+  ASSERT( an >= 18 );
+
+  n = 1 + (an - 1) / (size_t) 6;
+
+  s = an - 5 * n;
+
+  ASSERT (0 < s && s <= n);
+
+#define   r4    (pp + 3 * n)			/* 3n+1 */
+#define   r2    (pp + 7 * n)			/* 3n+1 */
+#define   r0    (pp +11 * n)			/* s+t <= 2*n */
+#define   r5    (scratch)			/* 3n+1 */
+#define   r3    (scratch + 3 * n + 1)		/* 3n+1 */
+#define   r1    (scratch + 6 * n + 2)		/* 3n+1 */
+#define   v0    (pp + 7 * n)			/* n+1 */
+#define   v2    (pp + 9 * n+2)			/* n+1 */
+#define   wse   (scratch + 9 * n + 3)		/* 3n+1 */
+
+  /* Alloc also 3n+1 limbs for ws... toom_interpolate_12pts may
+     need all of them, when DO_mpn_sublsh_n usea a scratch  */
+/*   if (scratch== NULL) */
+/*     scratch = TMP_SALLOC_LIMBS (12 * n + 6); */
+
+  /********************** evaluation and recursive calls *********************/
+  /* $\pm1/2$ */
+  mpn_toom_eval_pm2rexp (v2, v0, 5, ap, n, s, 1, pp);
+  TOOM6_SQR_REC(pp, v0, n + 1, wse); /* A(-1/2)*B(-1/2)*2^. */
+  TOOM6_SQR_REC(r5, v2, n + 1, wse); /* A(+1/2)*B(+1/2)*2^. */
+  mpn_toom_couple_handling (r5, 2 * n + 1, pp, 0, n, 1, 0);
+
+  /* $\pm1$ */
+  mpn_toom_eval_pm1 (v2, v0, 5, ap, n, s,    pp);
+  TOOM6_SQR_REC(pp, v0, n + 1, wse); /* A(-1)*B(-1) */
+  TOOM6_SQR_REC(r3, v2, n + 1, wse); /* A(1)*B(1) */
+  mpn_toom_couple_handling (r3, 2 * n + 1, pp, 0, n, 0, 0);
+
+  /* $\pm4$ */
+  mpn_toom_eval_pm2exp (v2, v0, 5, ap, n, s, 2, pp);
+  TOOM6_SQR_REC(pp, v0, n + 1, wse); /* A(-4)*B(-4) */
+  TOOM6_SQR_REC(r1, v2, n + 1, wse); /* A(+4)*B(+4) */
+  mpn_toom_couple_handling (r1, 2 * n + 1, pp, 0, n, 2, 4);
+
+  /* $\pm1/4$ */
+  mpn_toom_eval_pm2rexp (v2, v0, 5, ap, n, s, 2, pp);
+  TOOM6_SQR_REC(pp, v0, n + 1, wse); /* A(-1/4)*B(-1/4)*4^. */
+  TOOM6_SQR_REC(r4, v2, n + 1, wse); /* A(+1/4)*B(+1/4)*4^. */
+  mpn_toom_couple_handling (r4, 2 * n + 1, pp, 0, n, 2, 0);
+
+  /* $\pm2$ */
+  mpn_toom_eval_pm2 (v2, v0, 5, ap, n, s, pp);
+  TOOM6_SQR_REC(pp, v0, n + 1, wse); /* A(-2)*B(-2) */
+  TOOM6_SQR_REC(r2, v2, n + 1, wse); /* A(+2)*B(+2) */
+  mpn_toom_couple_handling (r2, 2 * n + 1, pp, 0, n, 1, 2);
+
+#undef v0
+#undef v2
+
+  /* A(0)*B(0) */
+  TOOM6_SQR_REC(pp, ap, n, wse);
+
+  mpn_toom_interpolate_12pts (pp, r1, r3, r5, n, 2 * s, 0, wse);
+
+#undef r0
+#undef r1
+#undef r2
+#undef r3
+#undef r4
+#undef r5
+
+}
+#undef TOOM6_SQR_REC
+#undef MAYBE_sqr_basecase
+#undef MAYBE_sqr_above_basecase
+#undef MAYBE_sqr_toom2
+#undef MAYBE_sqr_above_toom2
+#undef MAYBE_sqr_toom3
+#undef MAYBE_sqr_above_toom3
+#undef MAYBE_sqr_above_toom4
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6h_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6h_mul.c
deleted file mode 120000
index dca308e78..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6h_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom6h_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6h_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6h_mul.c
new file mode 100644
index 000000000..637f2a549
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom6h_mul.c
@@ -0,0 +1,262 @@
+/* Implementation of the multiplication algorithm for Toom-Cook 6.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+#if GMP_NUMB_BITS < 21
+#error Not implemented.
+#endif
+
+#if TUNE_PROGRAM_BUILD
+#define MAYBE_mul_basecase 1
+#define MAYBE_mul_toom22   1
+#define MAYBE_mul_toom33   1
+#define MAYBE_mul_toom6h   1
+#else
+#define MAYBE_mul_basecase						\
+  (MUL_TOOM6H_THRESHOLD < 6 * MUL_TOOM22_THRESHOLD)
+#define MAYBE_mul_toom22						\
+  (MUL_TOOM6H_THRESHOLD < 6 * MUL_TOOM33_THRESHOLD)
+#define MAYBE_mul_toom33						\
+  (MUL_TOOM6H_THRESHOLD < 6 * MUL_TOOM44_THRESHOLD)
+#define MAYBE_mul_toom6h						\
+  (MUL_FFT_THRESHOLD >= 6 * MUL_TOOM6H_THRESHOLD)
+#endif
+
+#define TOOM6H_MUL_N_REC(p, a, b, f, p2, a2, b2, n, ws)			\
+  do {									\
+    if (MAYBE_mul_basecase						\
+	&& BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD)) {			\
+      mpn_mul_basecase (p, a, n, b, n);					\
+      if (f)								\
+	mpn_mul_basecase (p2, a2, n, b2, n);				\
+    } else if (MAYBE_mul_toom22						\
+	       && BELOW_THRESHOLD (n, MUL_TOOM33_THRESHOLD)) {		\
+      mpn_toom22_mul (p, a, n, b, n, ws);				\
+      if (f)								\
+	mpn_toom22_mul (p2, a2, n, b2, n, ws);				\
+    } else if (MAYBE_mul_toom33						\
+	       && BELOW_THRESHOLD (n, MUL_TOOM44_THRESHOLD)) {		\
+      mpn_toom33_mul (p, a, n, b, n, ws);				\
+      if (f)								\
+	mpn_toom33_mul (p2, a2, n, b2, n, ws);				\
+    } else if (! MAYBE_mul_toom6h					\
+	       || BELOW_THRESHOLD (n, MUL_TOOM6H_THRESHOLD)) {		\
+      mpn_toom44_mul (p, a, n, b, n, ws);				\
+      if (f)								\
+	mpn_toom44_mul (p2, a2, n, b2, n, ws);				\
+    } else {								\
+      mpn_toom6h_mul (p, a, n, b, n, ws);				\
+      if (f)								\
+	mpn_toom6h_mul (p2, a2, n, b2, n, ws);				\
+    }									\
+  } while (0)
+
+#define TOOM6H_MUL_REC(p, a, na, b, nb, ws)		\
+  do { mpn_mul (p, a, na, b, nb);			\
+  } while (0)
+
+/* Toom-6.5 , compute the product {pp,an+bn} <- {ap,an} * {bp,bn}
+   With: an >= bn >= 46, an*6 <  bn * 17.
+   It _may_ work with bn<=46 and bn*17 < an*6 < bn*18
+
+   Evaluate in: infinity, +4, -4, +2, -2, +1, -1, +1/2, -1/2, +1/4, -1/4, 0.
+*/
+/* Estimate on needed scratch:
+   S(n) <= (n+5)\6*10+4+MAX(S((n+5)\6),1+2*(n+5)\6),
+   since n>42; S(n) <= ceil(log(n)/log(6))*(10+4)+n*12\6 < n*2 + lg2(n)*6
+ */
+
+void
+mpn_toom6h_mul   (mp_ptr pp,
+		  mp_srcptr ap, mp_size_t an,
+		  mp_srcptr bp, mp_size_t bn, mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  int p, q, half;
+  int sign;
+
+  /***************************** decomposition *******************************/
+
+  ASSERT (an >= bn);
+  /* Can not handle too much unbalancement */
+  ASSERT (bn >= 42);
+  /* Can not handle too much unbalancement */
+  ASSERT ((an*3 <  bn * 8) || (bn >= 46 && an * 6 <  bn * 17));
+
+  /* Limit num/den is a rational number between
+     (12/11)^(log(4)/log(2*4-1)) and (12/11)^(log(6)/log(2*6-1))             */
+#define LIMIT_numerator (18)
+#define LIMIT_denominat (17)
+
+  if (LIKELY (an * LIMIT_denominat < LIMIT_numerator * bn)) /* is 6*... < 6*... */
+    {
+      n = 1 + (an - 1) / (size_t) 6;
+      p = q = 5;
+      half = 0;
+
+      s = an - 5 * n;
+      t = bn - 5 * n;
+    }
+  else {
+    if (an * 5 * LIMIT_numerator < LIMIT_denominat * 7 * bn)
+      { p = 7; q = 6; }
+    else if (an * 5 * LIMIT_denominat < LIMIT_numerator * 7 * bn)
+      { p = 7; q = 5; }
+    else if (an * LIMIT_numerator < LIMIT_denominat * 2 * bn)  /* is 4*... < 8*... */
+      { p = 8; q = 5; }
+    else if (an * LIMIT_denominat < LIMIT_numerator * 2 * bn)  /* is 4*... < 8*... */
+      { p = 8; q = 4; }
+    else
+      { p = 9; q = 4; }
+
+    half = (p ^ q) & 1;
+    n = 1 + (q * an >= p * bn ? (an - 1) / (size_t) p : (bn - 1) / (size_t) q);
+    p--; q--;
+
+    s = an - p * n;
+    t = bn - q * n;
+
+    /* With LIMIT = 16/15, the following recover is needed only if bn<=73*/
+    if (half) { /* Recover from badly chosen splitting */
+      if (UNLIKELY (s<1)) {p--; s+=n; half=0;}
+      else if (UNLIKELY (t<1)) {q--; t+=n; half=0;}
+    }
+  }
+#undef LIMIT_numerator
+#undef LIMIT_denominat
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+  ASSERT (half || s + t > 3);
+  ASSERT (n > 2);
+
+#define   r4    (pp + 3 * n)			/* 3n+1 */
+#define   r2    (pp + 7 * n)			/* 3n+1 */
+#define   r0    (pp +11 * n)			/* s+t <= 2*n */
+#define   r5    (scratch)			/* 3n+1 */
+#define   r3    (scratch + 3 * n + 1)		/* 3n+1 */
+#define   r1    (scratch + 6 * n + 2)		/* 3n+1 */
+#define   v0    (pp + 7 * n)			/* n+1 */
+#define   v1    (pp + 8 * n+1)			/* n+1 */
+#define   v2    (pp + 9 * n+2)			/* n+1 */
+#define   v3    (scratch + 9 * n + 3)		/* n+1 */
+#define   wsi   (scratch + 9 * n + 3)		/* 3n+1 */
+#define   wse   (scratch +10 * n + 4)		/* 2n+1 */
+
+  /* Alloc also 3n+1 limbs for wsi... toom_interpolate_12pts may
+     need all of them  */
+/*   if (scratch == NULL) */
+/*     scratch = TMP_SALLOC_LIMBS(mpn_toom6_sqr_itch(n * 6)); */
+  ASSERT (12 * n + 6 <= mpn_toom6h_mul_itch(an,bn));
+  ASSERT (12 * n + 6 <= mpn_toom6_sqr_itch(n * 6));
+
+  /********************** evaluation and recursive calls *********************/
+  /* $\pm1/2$ */
+  sign = mpn_toom_eval_pm2rexp (v2, v0, p, ap, n, s, 1, pp) ^
+	 mpn_toom_eval_pm2rexp (v3, v1, q, bp, n, t, 1, pp);
+  /* A(-1/2)*B(-1/2)*2^. */ /* A(+1/2)*B(+1/2)*2^. */
+  TOOM6H_MUL_N_REC(pp, v0, v1, 2, r5, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r5, 2 * n + 1, pp, sign, n, 1+half , half);
+
+  /* $\pm1$ */
+  sign = mpn_toom_eval_pm1 (v2, v0, p, ap, n, s,    pp);
+  if (UNLIKELY (q == 3))
+    sign ^= mpn_toom_eval_dgr3_pm1 (v3, v1, bp, n, t,    pp);
+  else
+    sign ^= mpn_toom_eval_pm1 (v3, v1, q, bp, n, t,    pp);
+  /* A(-1)*B(-1) */ /* A(1)*B(1) */
+  TOOM6H_MUL_N_REC(pp, v0, v1, 2, r3, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r3, 2 * n + 1, pp, sign, n, 0, 0);
+
+  /* $\pm4$ */
+  sign = mpn_toom_eval_pm2exp (v2, v0, p, ap, n, s, 2, pp) ^
+	 mpn_toom_eval_pm2exp (v3, v1, q, bp, n, t, 2, pp);
+  /* A(-4)*B(-4) */
+  TOOM6H_MUL_N_REC(pp, v0, v1, 2, r1, v2, v3, n + 1, wse); /* A(+4)*B(+4) */
+  mpn_toom_couple_handling (r1, 2 * n + 1, pp, sign, n, 2, 4);
+
+  /* $\pm1/4$ */
+  sign = mpn_toom_eval_pm2rexp (v2, v0, p, ap, n, s, 2, pp) ^
+	 mpn_toom_eval_pm2rexp (v3, v1, q, bp, n, t, 2, pp);
+  /* A(-1/4)*B(-1/4)*4^. */ /* A(+1/4)*B(+1/4)*4^. */
+  TOOM6H_MUL_N_REC(pp, v0, v1, 2, r4, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r4, 2 * n + 1, pp, sign, n, 2*(1+half), 2*(half));
+
+  /* $\pm2$ */
+  sign = mpn_toom_eval_pm2 (v2, v0, p, ap, n, s, pp) ^
+	 mpn_toom_eval_pm2 (v3, v1, q, bp, n, t, pp);
+  /* A(-2)*B(-2) */ /* A(+2)*B(+2) */
+  TOOM6H_MUL_N_REC(pp, v0, v1, 2, r2, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r2, 2 * n + 1, pp, sign, n, 1, 2);
+
+#undef v0
+#undef v1
+#undef v2
+#undef v3
+#undef wse
+
+  /* A(0)*B(0) */
+  TOOM6H_MUL_N_REC(pp, ap, bp, 0, pp, ap, bp, n, wsi);
+
+  /* Infinity */
+  if (UNLIKELY (half != 0)) {
+    if (s > t) {
+      TOOM6H_MUL_REC(r0, ap + p * n, s, bp + q * n, t, wsi);
+    } else {
+      TOOM6H_MUL_REC(r0, bp + q * n, t, ap + p * n, s, wsi);
+    };
+  };
+
+  mpn_toom_interpolate_12pts (pp, r1, r3, r5, n, s+t, half, wsi);
+
+#undef r0
+#undef r1
+#undef r2
+#undef r3
+#undef r4
+#undef r5
+#undef wsi
+}
+
+#undef TOOM6H_MUL_N_REC
+#undef TOOM6H_MUL_REC
+#undef MAYBE_mul_basecase
+#undef MAYBE_mul_toom22
+#undef MAYBE_mul_toom33
+#undef MAYBE_mul_toom6h
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8_sqr.c
deleted file mode 120000
index f519bae90..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8_sqr.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom8_sqr.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8_sqr.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8_sqr.c
new file mode 100644
index 000000000..03e5c6450
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8_sqr.c
@@ -0,0 +1,225 @@
+/* Implementation of the squaring algorithm with Toom-Cook 8.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+#if GMP_NUMB_BITS < 29
+#error Not implemented.
+#endif
+
+#if GMP_NUMB_BITS < 43
+#define BIT_CORRECTION 1
+#define CORRECTION_BITS GMP_NUMB_BITS
+#else
+#define BIT_CORRECTION 0
+#define CORRECTION_BITS 0
+#endif
+
+#ifndef SQR_TOOM8_THRESHOLD
+#define SQR_TOOM8_THRESHOLD MUL_TOOM8H_THRESHOLD
+#endif
+
+#ifndef SQR_TOOM6_THRESHOLD
+#define SQR_TOOM6_THRESHOLD MUL_TOOM6H_THRESHOLD
+#endif
+
+#if TUNE_PROGRAM_BUILD
+#define MAYBE_sqr_basecase 1
+#define MAYBE_sqr_above_basecase   1
+#define MAYBE_sqr_toom2   1
+#define MAYBE_sqr_above_toom2   1
+#define MAYBE_sqr_toom3   1
+#define MAYBE_sqr_above_toom3   1
+#define MAYBE_sqr_toom4   1
+#define MAYBE_sqr_above_toom4   1
+#define MAYBE_sqr_above_toom6   1
+#else
+#define SQR_TOOM8_MAX					\
+  ((SQR_FFT_THRESHOLD <= MP_SIZE_T_MAX - (8*2-1+7)) ?	\
+   ((SQR_FFT_THRESHOLD+8*2-1+7)/8)			\
+   : MP_SIZE_T_MAX )
+#define MAYBE_sqr_basecase					\
+  (SQR_TOOM8_THRESHOLD < 8 * SQR_TOOM2_THRESHOLD)
+#define MAYBE_sqr_above_basecase				\
+  (SQR_TOOM8_MAX >= SQR_TOOM2_THRESHOLD)
+#define MAYBE_sqr_toom2						\
+  (SQR_TOOM8_THRESHOLD < 8 * SQR_TOOM3_THRESHOLD)
+#define MAYBE_sqr_above_toom2					\
+  (SQR_TOOM8_MAX >= SQR_TOOM3_THRESHOLD)
+#define MAYBE_sqr_toom3						\
+  (SQR_TOOM8_THRESHOLD < 8 * SQR_TOOM4_THRESHOLD)
+#define MAYBE_sqr_above_toom3					\
+  (SQR_TOOM8_MAX >= SQR_TOOM4_THRESHOLD)
+#define MAYBE_sqr_toom4						\
+  (SQR_TOOM8_THRESHOLD < 8 * SQR_TOOM6_THRESHOLD)
+#define MAYBE_sqr_above_toom4					\
+  (SQR_TOOM8_MAX >= SQR_TOOM6_THRESHOLD)
+#define MAYBE_sqr_above_toom6					\
+  (SQR_TOOM8_MAX >= SQR_TOOM8_THRESHOLD)
+#endif
+
+#define TOOM8_SQR_REC(p, a, f, p2, a2, n, ws)				\
+  do {									\
+    if (MAYBE_sqr_basecase && ( !MAYBE_sqr_above_basecase		\
+	|| BELOW_THRESHOLD (n, SQR_TOOM2_THRESHOLD))) {			\
+      mpn_sqr_basecase (p, a, n);					\
+      if (f) mpn_sqr_basecase (p2, a2, n);				\
+    } else if (MAYBE_sqr_toom2 && ( !MAYBE_sqr_above_toom2		\
+	     || BELOW_THRESHOLD (n, SQR_TOOM3_THRESHOLD))) {		\
+      mpn_toom2_sqr (p, a, n, ws);					\
+      if (f) mpn_toom2_sqr (p2, a2, n, ws);				\
+    } else if (MAYBE_sqr_toom3 && ( !MAYBE_sqr_above_toom3		\
+	     || BELOW_THRESHOLD (n, SQR_TOOM4_THRESHOLD))) {		\
+      mpn_toom3_sqr (p, a, n, ws);					\
+      if (f) mpn_toom3_sqr (p2, a2, n, ws);				\
+    } else if (MAYBE_sqr_toom4 && ( !MAYBE_sqr_above_toom4		\
+	     || BELOW_THRESHOLD (n, SQR_TOOM6_THRESHOLD))) {		\
+      mpn_toom4_sqr (p, a, n, ws);					\
+      if (f) mpn_toom4_sqr (p2, a2, n, ws);				\
+    } else if (! MAYBE_sqr_above_toom6					\
+	     || BELOW_THRESHOLD (n, SQR_TOOM8_THRESHOLD)) {		\
+      mpn_toom6_sqr (p, a, n, ws);					\
+      if (f) mpn_toom6_sqr (p2, a2, n, ws);				\
+    } else {								\
+      mpn_toom8_sqr (p, a, n, ws);					\
+      if (f) mpn_toom8_sqr (p2, a2, n, ws);				\
+    }									\
+  } while (0)
+
+void
+mpn_toom8_sqr  (mp_ptr pp, mp_srcptr ap, mp_size_t an, mp_ptr scratch)
+{
+  mp_size_t n, s;
+
+  /***************************** decomposition *******************************/
+
+  ASSERT ( an >= 40 );
+
+  n = 1 + ((an - 1)>>3);
+
+  s = an - 7 * n;
+
+  ASSERT (0 < s && s <= n);
+  ASSERT ( s + s > 3 );
+
+#define   r6    (pp + 3 * n)			/* 3n+1 */
+#define   r4    (pp + 7 * n)			/* 3n+1 */
+#define   r2    (pp +11 * n)			/* 3n+1 */
+#define   r0    (pp +15 * n)			/* s+t <= 2*n */
+#define   r7    (scratch)			/* 3n+1 */
+#define   r5    (scratch + 3 * n + 1)		/* 3n+1 */
+#define   r3    (scratch + 6 * n + 2)		/* 3n+1 */
+#define   r1    (scratch + 9 * n + 3)		/* 3n+1 */
+#define   v0    (pp +11 * n)			/* n+1 */
+#define   v2    (pp +13 * n+2)			/* n+1 */
+#define   wse   (scratch +12 * n + 4)		/* 3n+1 */
+
+  /* Alloc also 3n+1 limbs for ws... toom_interpolate_16pts may
+     need all of them, when DO_mpn_sublsh_n usea a scratch  */
+/*   if (scratch == NULL) */
+/*     scratch = TMP_SALLOC_LIMBS (30 * n + 6); */
+
+  /********************** evaluation and recursive calls *********************/
+  /* $\pm1/8$ */
+  mpn_toom_eval_pm2rexp (v2, v0, 7, ap, n, s, 3, pp);
+  /* A(-1/8)*B(-1/8)*8^. */ /* A(+1/8)*B(+1/8)*8^. */
+  TOOM8_SQR_REC(pp, v0, 2, r7, v2, n + 1, wse);
+  mpn_toom_couple_handling (r7, 2 * n + 1 + BIT_CORRECTION, pp, 0, n, 3, 0);
+
+  /* $\pm1/4$ */
+  mpn_toom_eval_pm2rexp (v2, v0, 7, ap, n, s, 2, pp);
+  /* A(-1/4)*B(-1/4)*4^. */ /* A(+1/4)*B(+1/4)*4^. */
+  TOOM8_SQR_REC(pp, v0, 2, r5, v2, n + 1, wse);
+  mpn_toom_couple_handling (r5, 2 * n + 1, pp, 0, n, 2, 0);
+
+  /* $\pm2$ */
+  mpn_toom_eval_pm2 (v2, v0, 7, ap, n, s, pp);
+  /* A(-2)*B(-2) */ /* A(+2)*B(+2) */
+  TOOM8_SQR_REC(pp, v0, 2, r3, v2, n + 1, wse);
+  mpn_toom_couple_handling (r3, 2 * n + 1, pp, 0, n, 1, 2);
+
+  /* $\pm8$ */
+  mpn_toom_eval_pm2exp (v2, v0, 7, ap, n, s, 3, pp);
+  /* A(-8)*B(-8) */ /* A(+8)*B(+8) */
+  TOOM8_SQR_REC(pp, v0, 2, r1, v2, n + 1, wse);
+  mpn_toom_couple_handling (r1, 2 * n + 1 + BIT_CORRECTION, pp, 0, n, 3, 6);
+
+  /* $\pm1/2$ */
+  mpn_toom_eval_pm2rexp (v2, v0, 7, ap, n, s, 1, pp);
+  /* A(-1/2)*B(-1/2)*2^. */ /* A(+1/2)*B(+1/2)*2^. */
+  TOOM8_SQR_REC(pp, v0, 2, r6, v2, n + 1, wse);
+  mpn_toom_couple_handling (r6, 2 * n + 1, pp, 0, n, 1, 0);
+
+  /* $\pm1$ */
+  mpn_toom_eval_pm1 (v2, v0, 7, ap, n, s,    pp);
+  /* A(-1)*B(-1) */ /* A(1)*B(1) */
+  TOOM8_SQR_REC(pp, v0, 2, r4, v2, n + 1, wse);
+  mpn_toom_couple_handling (r4, 2 * n + 1, pp, 0, n, 0, 0);
+
+  /* $\pm4$ */
+  mpn_toom_eval_pm2exp (v2, v0, 7, ap, n, s, 2, pp);
+  /* A(-4)*B(-4) */ /* A(+4)*B(+4) */
+  TOOM8_SQR_REC(pp, v0, 2, r2, v2, n + 1, wse);
+  mpn_toom_couple_handling (r2, 2 * n + 1, pp, 0, n, 2, 4);
+
+#undef v0
+#undef v2
+
+  /* A(0)*B(0) */
+  TOOM8_SQR_REC(pp, ap, 0, pp, ap, n, wse);
+
+  mpn_toom_interpolate_16pts (pp, r1, r3, r5, r7, n, 2 * s, 0, wse);
+
+#undef r0
+#undef r1
+#undef r2
+#undef r3
+#undef r4
+#undef r5
+#undef r6
+#undef wse
+
+}
+
+#undef TOOM8_SQR_REC
+#undef MAYBE_sqr_basecase
+#undef MAYBE_sqr_above_basecase
+#undef MAYBE_sqr_toom2
+#undef MAYBE_sqr_above_toom2
+#undef MAYBE_sqr_toom3
+#undef MAYBE_sqr_above_toom3
+#undef MAYBE_sqr_above_toom4
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8h_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8h_mul.c
deleted file mode 120000
index d40b0cdd6..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8h_mul.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom8h_mul.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8h_mul.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8h_mul.c
new file mode 100644
index 000000000..5ba259af5
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom8h_mul.c
@@ -0,0 +1,305 @@
+/* Implementation of the multiplication algorithm for Toom-Cook 8.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+#if GMP_NUMB_BITS < 29
+#error Not implemented.
+#endif
+
+#if GMP_NUMB_BITS < 43
+#define BIT_CORRECTION 1
+#define CORRECTION_BITS GMP_NUMB_BITS
+#else
+#define BIT_CORRECTION 0
+#define CORRECTION_BITS 0
+#endif
+
+
+#if TUNE_PROGRAM_BUILD
+#define MAYBE_mul_basecase 1
+#define MAYBE_mul_toom22   1
+#define MAYBE_mul_toom33   1
+#define MAYBE_mul_toom44   1
+#define MAYBE_mul_toom8h   1
+#else
+#define MAYBE_mul_basecase						\
+  (MUL_TOOM8H_THRESHOLD < 8 * MUL_TOOM22_THRESHOLD)
+#define MAYBE_mul_toom22						\
+  (MUL_TOOM8H_THRESHOLD < 8 * MUL_TOOM33_THRESHOLD)
+#define MAYBE_mul_toom33						\
+  (MUL_TOOM8H_THRESHOLD < 8 * MUL_TOOM44_THRESHOLD)
+#define MAYBE_mul_toom44						\
+  (MUL_TOOM8H_THRESHOLD < 8 * MUL_TOOM6H_THRESHOLD)
+#define MAYBE_mul_toom8h						\
+  (MUL_FFT_THRESHOLD >= 8 * MUL_TOOM8H_THRESHOLD)
+#endif
+
+#define TOOM8H_MUL_N_REC(p, a, b, f, p2, a2, b2, n, ws)			\
+  do {									\
+    if (MAYBE_mul_basecase						\
+	&& BELOW_THRESHOLD (n, MUL_TOOM22_THRESHOLD)) {			\
+      mpn_mul_basecase (p, a, n, b, n);					\
+      if (f) mpn_mul_basecase (p2, a2, n, b2, n);			\
+    } else if (MAYBE_mul_toom22						\
+	     && BELOW_THRESHOLD (n, MUL_TOOM33_THRESHOLD)) {		\
+      mpn_toom22_mul (p, a, n, b, n, ws);				\
+      if (f) mpn_toom22_mul (p2, a2, n, b2, n, ws);			\
+    } else if (MAYBE_mul_toom33						\
+	     && BELOW_THRESHOLD (n, MUL_TOOM44_THRESHOLD)) {		\
+      mpn_toom33_mul (p, a, n, b, n, ws);				\
+      if (f) mpn_toom33_mul (p2, a2, n, b2, n, ws);			\
+    } else if (MAYBE_mul_toom44						\
+	     && BELOW_THRESHOLD (n, MUL_TOOM6H_THRESHOLD)) {		\
+      mpn_toom44_mul (p, a, n, b, n, ws);				\
+      if (f) mpn_toom44_mul (p2, a2, n, b2, n, ws);			\
+    } else if (! MAYBE_mul_toom8h					\
+	     || BELOW_THRESHOLD (n, MUL_TOOM8H_THRESHOLD)) {		\
+      mpn_toom6h_mul (p, a, n, b, n, ws);				\
+      if (f) mpn_toom6h_mul (p2, a2, n, b2, n, ws);			\
+    } else {								\
+      mpn_toom8h_mul (p, a, n, b, n, ws);				\
+      if (f) mpn_toom8h_mul (p2, a2, n, b2, n, ws);			\
+    }									\
+  } while (0)
+
+#define TOOM8H_MUL_REC(p, a, na, b, nb, ws)		\
+  do { mpn_mul (p, a, na, b, nb); } while (0)
+
+/* Toom-8.5 , compute the product {pp,an+bn} <- {ap,an} * {bp,bn}
+   With: an >= bn >= 86, an*5 <  bn * 11.
+   It _may_ work with bn<=?? and bn*?? < an*? < bn*??
+
+   Evaluate in: infinity, +8,-8,+4,-4,+2,-2,+1,-1,+1/2,-1/2,+1/4,-1/4,+1/8,-1/8,0.
+*/
+/* Estimate on needed scratch:
+   S(n) <= (n+7)\8*13+5+MAX(S((n+7)\8),1+2*(n+7)\8),
+   since n>80; S(n) <= ceil(log(n/10)/log(8))*(13+5)+n*15\8 < n*15\8 + lg2(n)*6
+ */
+
+void
+mpn_toom8h_mul   (mp_ptr pp,
+		  mp_srcptr ap, mp_size_t an,
+		  mp_srcptr bp, mp_size_t bn, mp_ptr scratch)
+{
+  mp_size_t n, s, t;
+  int p, q, half;
+  int sign;
+
+  /***************************** decomposition *******************************/
+
+  ASSERT (an >= bn);
+  /* Can not handle too small operands */
+  ASSERT (bn >= 86);
+  /* Can not handle too much unbalancement */
+  ASSERT (an <= bn*4);
+  ASSERT (GMP_NUMB_BITS > 11*3 || an*4 <= bn*11);
+  ASSERT (GMP_NUMB_BITS > 10*3 || an*1 <= bn* 2);
+  ASSERT (GMP_NUMB_BITS >  9*3 || an*2 <= bn* 3);
+
+  /* Limit num/den is a rational number between
+     (16/15)^(log(6)/log(2*6-1)) and (16/15)^(log(8)/log(2*8-1))             */
+#define LIMIT_numerator (21)
+#define LIMIT_denominat (20)
+
+  if (LIKELY (an == bn) || an * (LIMIT_denominat>>1) < LIMIT_numerator * (bn>>1) ) /* is 8*... < 8*... */
+    {
+      half = 0;
+      n = 1 + ((an - 1)>>3);
+      p = q = 7;
+      s = an - 7 * n;
+      t = bn - 7 * n;
+    }
+  else
+    {
+      if (an * 13 < 16 * bn) /* (an*7*LIMIT_numerator<LIMIT_denominat*9*bn) */
+	{ p = 9; q = 8; }
+      else if (GMP_NUMB_BITS <= 9*3 ||
+	       an *(LIMIT_denominat>>1) < (LIMIT_numerator/7*9) * (bn>>1))
+	{ p = 9; q = 7; }
+      else if (an * 10 < 33 * (bn>>1)) /* (an*3*LIMIT_numerator<LIMIT_denominat*5*bn) */
+	{ p =10; q = 7; }
+      else if (GMP_NUMB_BITS <= 10*3 ||
+	       an * (LIMIT_denominat/5) < (LIMIT_numerator/3) * bn)
+	{ p =10; q = 6; }
+      else if (an * 6 < 13 * bn) /*(an * 5 * LIMIT_numerator < LIMIT_denominat *11 * bn)*/
+	{ p =11; q = 6; }
+      else if (GMP_NUMB_BITS <= 11*3 ||
+	       an * 4 < 9 * bn)
+	{ p =11; q = 5; }
+      else if (an *(LIMIT_numerator/3) < LIMIT_denominat * bn)  /* is 4*... <12*... */
+	{ p =12; q = 5; }
+      else if (GMP_NUMB_BITS <= 12*3 ||
+	       an * 9 < 28 * bn )  /* is 4*... <12*... */
+	{ p =12; q = 4; }
+      else
+	{ p =13; q = 4; }
+
+      half = (p+q)&1;
+      n = 1 + (q * an >= p * bn ? (an - 1) / (size_t) p : (bn - 1) / (size_t) q);
+      p--; q--;
+
+      s = an - p * n;
+      t = bn - q * n;
+
+      if(half) { /* Recover from badly chosen splitting */
+	if (UNLIKELY (s<1)) {p--; s+=n; half=0;}
+	else if (UNLIKELY (t<1)) {q--; t+=n; half=0;}
+      }
+    }
+#undef LIMIT_numerator
+#undef LIMIT_denominat
+
+  ASSERT (0 < s && s <= n);
+  ASSERT (0 < t && t <= n);
+  ASSERT (half || s + t > 3);
+  ASSERT (n > 2);
+
+#define   r6    (pp + 3 * n)			/* 3n+1 */
+#define   r4    (pp + 7 * n)			/* 3n+1 */
+#define   r2    (pp +11 * n)			/* 3n+1 */
+#define   r0    (pp +15 * n)			/* s+t <= 2*n */
+#define   r7    (scratch)			/* 3n+1 */
+#define   r5    (scratch + 3 * n + 1)		/* 3n+1 */
+#define   r3    (scratch + 6 * n + 2)		/* 3n+1 */
+#define   r1    (scratch + 9 * n + 3)		/* 3n+1 */
+#define   v0    (pp +11 * n)			/* n+1 */
+#define   v1    (pp +12 * n+1)			/* n+1 */
+#define   v2    (pp +13 * n+2)			/* n+1 */
+#define   v3    (scratch +12 * n + 4)		/* n+1 */
+#define   wsi   (scratch +12 * n + 4)		/* 3n+1 */
+#define   wse   (scratch +13 * n + 5)		/* 2n+1 */
+
+  /* Alloc also 3n+1 limbs for wsi... toom_interpolate_16pts may
+     need all of them  */
+/*   if (scratch == NULL) */
+/*     scratch = TMP_SALLOC_LIMBS(mpn_toom8_sqr_itch(n * 8)); */
+  ASSERT (15 * n + 6 <= mpn_toom8h_mul_itch (an, bn));
+  ASSERT (15 * n + 6 <= mpn_toom8_sqr_itch (n * 8));
+
+  /********************** evaluation and recursive calls *********************/
+
+  /* $\pm1/8$ */
+  sign = mpn_toom_eval_pm2rexp (v2, v0, p, ap, n, s, 3, pp) ^
+	 mpn_toom_eval_pm2rexp (v3, v1, q, bp, n, t, 3, pp);
+  /* A(-1/8)*B(-1/8)*8^. */ /* A(+1/8)*B(+1/8)*8^. */
+  TOOM8H_MUL_N_REC(pp, v0, v1, 2, r7, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r7, 2 * n + 1 + BIT_CORRECTION, pp, sign, n, 3*(1+half), 3*(half));
+
+  /* $\pm1/4$ */
+  sign = mpn_toom_eval_pm2rexp (v2, v0, p, ap, n, s, 2, pp) ^
+	 mpn_toom_eval_pm2rexp (v3, v1, q, bp, n, t, 2, pp);
+  /* A(-1/4)*B(-1/4)*4^. */ /* A(+1/4)*B(+1/4)*4^. */
+  TOOM8H_MUL_N_REC(pp, v0, v1, 2, r5, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r5, 2 * n + 1, pp, sign, n, 2*(1+half), 2*(half));
+
+  /* $\pm2$ */
+  sign = mpn_toom_eval_pm2 (v2, v0, p, ap, n, s, pp) ^
+	 mpn_toom_eval_pm2 (v3, v1, q, bp, n, t, pp);
+  /* A(-2)*B(-2) */ /* A(+2)*B(+2) */
+  TOOM8H_MUL_N_REC(pp, v0, v1, 2, r3, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r3, 2 * n + 1, pp, sign, n, 1, 2);
+
+  /* $\pm8$ */
+  sign = mpn_toom_eval_pm2exp (v2, v0, p, ap, n, s, 3, pp) ^
+	 mpn_toom_eval_pm2exp (v3, v1, q, bp, n, t, 3, pp);
+  /* A(-8)*B(-8) */ /* A(+8)*B(+8) */
+  TOOM8H_MUL_N_REC(pp, v0, v1, 2, r1, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r1, 2 * n + 1 + BIT_CORRECTION, pp, sign, n, 3, 6);
+
+  /* $\pm1/2$ */
+  sign = mpn_toom_eval_pm2rexp (v2, v0, p, ap, n, s, 1, pp) ^
+	 mpn_toom_eval_pm2rexp (v3, v1, q, bp, n, t, 1, pp);
+  /* A(-1/2)*B(-1/2)*2^. */ /* A(+1/2)*B(+1/2)*2^. */
+  TOOM8H_MUL_N_REC(pp, v0, v1, 2, r6, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r6, 2 * n + 1, pp, sign, n, 1+half, half);
+
+  /* $\pm1$ */
+  sign = mpn_toom_eval_pm1 (v2, v0, p, ap, n, s,    pp);
+  if (GMP_NUMB_BITS > 12*3 && UNLIKELY (q == 3))
+    sign ^= mpn_toom_eval_dgr3_pm1 (v3, v1, bp, n, t,    pp);
+  else
+    sign ^= mpn_toom_eval_pm1 (v3, v1, q, bp, n, t,    pp);
+  /* A(-1)*B(-1) */ /* A(1)*B(1) */
+  TOOM8H_MUL_N_REC(pp, v0, v1, 2, r4, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r4, 2 * n + 1, pp, sign, n, 0, 0);
+
+  /* $\pm4$ */
+  sign = mpn_toom_eval_pm2exp (v2, v0, p, ap, n, s, 2, pp) ^
+	 mpn_toom_eval_pm2exp (v3, v1, q, bp, n, t, 2, pp);
+  /* A(-4)*B(-4) */ /* A(+4)*B(+4) */
+  TOOM8H_MUL_N_REC(pp, v0, v1, 2, r2, v2, v3, n + 1, wse);
+  mpn_toom_couple_handling (r2, 2 * n + 1, pp, sign, n, 2, 4);
+
+#undef v0
+#undef v1
+#undef v2
+#undef v3
+#undef wse
+
+  /* A(0)*B(0) */
+  TOOM8H_MUL_N_REC(pp, ap, bp, 0, pp, ap, bp, n, wsi);
+
+  /* Infinity */
+  if (UNLIKELY (half != 0)) {
+    if (s > t) {
+      TOOM8H_MUL_REC(r0, ap + p * n, s, bp + q * n, t, wsi);
+    } else {
+      TOOM8H_MUL_REC(r0, bp + q * n, t, ap + p * n, s, wsi);
+    };
+  };
+
+  mpn_toom_interpolate_16pts (pp, r1, r3, r5, r7, n, s+t, half, wsi);
+
+#undef r0
+#undef r1
+#undef r2
+#undef r3
+#undef r4
+#undef r5
+#undef r6
+#undef wsi
+}
+
+#undef TOOM8H_MUL_N_REC
+#undef TOOM8H_MUL_REC
+#undef MAYBE_mul_basecase
+#undef MAYBE_mul_toom22
+#undef MAYBE_mul_toom33
+#undef MAYBE_mul_toom44
+#undef MAYBE_mul_toom8h
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_couple_handling.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_couple_handling.c
deleted file mode 120000
index 2a4eaedae..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_couple_handling.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_couple_handling.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_couple_handling.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_couple_handling.c
new file mode 100644
index 000000000..cd253f7a8
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_couple_handling.c
@@ -0,0 +1,80 @@
+/* Helper function for high degree Toom-Cook algorithms.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Gets {pp,n} and (sign?-1:1)*{np,n}. Computes at once:
+     {pp,n} <- ({pp,n}+{np,n})/2^{ps+1}
+     {pn,n} <- ({pp,n}-{np,n})/2^{ns+1}
+   Finally recompose them obtaining:
+     {pp,n+off} <- {pp,n}+{np,n}*2^{off*GMP_NUMB_BITS}
+*/
+void
+mpn_toom_couple_handling (mp_ptr pp, mp_size_t n, mp_ptr np,
+			  int nsign, mp_size_t off, int ps, int ns)
+{
+  if (nsign) {
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+    mpn_rsh1sub_n (np, pp, np, n);
+#else
+    mpn_sub_n (np, pp, np, n);
+    mpn_rshift (np, np, n, 1);
+#endif
+  } else {
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+    mpn_rsh1add_n (np, pp, np, n);
+#else
+    mpn_add_n (np, pp, np, n);
+    mpn_rshift (np, np, n, 1);
+#endif
+  }
+
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+  if (ps == 1)
+    mpn_rsh1sub_n (pp, pp, np, n);
+  else
+#endif
+  {
+    mpn_sub_n (pp, pp, np, n);
+    if (ps > 0)
+      mpn_rshift (pp, pp, n, ps);
+  }
+  if (ns > 0)
+    mpn_rshift (np, np, n, ns);
+  pp[n] = mpn_add_n (pp+off, pp+off, np, n-off);
+  ASSERT_NOCARRY (mpn_add_1(pp+n, np+n-off, off, pp[n]) );
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm1.c
deleted file mode 120000
index 42819a3f7..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_eval_dgr3_pm1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm1.c
new file mode 100644
index 000000000..5f491b651
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm1.c
@@ -0,0 +1,72 @@
+/* mpn_toom_eval_dgr3_pm1 -- Evaluate a degree 3 polynomial in +1 and -1
+
+   Contributed to the GNU project by Niels Möller
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+int
+mpn_toom_eval_dgr3_pm1 (mp_ptr xp1, mp_ptr xm1,
+			mp_srcptr xp, mp_size_t n, mp_size_t x3n, mp_ptr tp)
+{
+  int neg;
+
+  ASSERT (x3n > 0);
+  ASSERT (x3n <= n);
+
+  xp1[n] = mpn_add_n (xp1, xp, xp + 2*n, n);
+  tp[n] = mpn_add (tp, xp + n, n, xp + 3*n, x3n);
+
+  neg = (mpn_cmp (xp1, tp, n + 1) < 0) ? ~0 : 0;
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (neg)
+    mpn_add_n_sub_n (xp1, xm1, tp, xp1, n + 1);
+  else
+    mpn_add_n_sub_n (xp1, xm1, xp1, tp, n + 1);
+#else
+  if (neg)
+    mpn_sub_n (xm1, tp, xp1, n + 1);
+  else
+    mpn_sub_n (xm1, xp1, tp, n + 1);
+
+  mpn_add_n (xp1, xp1, tp, n + 1);
+#endif
+
+  ASSERT (xp1[n] <= 3);
+  ASSERT (xm1[n] <= 1);
+
+  return neg;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm2.c
deleted file mode 120000
index 1decd3458..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm2.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_eval_dgr3_pm2.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm2.c
new file mode 100644
index 000000000..55e6b89bf
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_dgr3_pm2.c
@@ -0,0 +1,97 @@
+/* mpn_toom_eval_dgr3_pm2 -- Evaluate a degree 3 polynomial in +2 and -2
+
+   Contributed to the GNU project by Niels Möller
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Needs n+1 limbs of temporary storage. */
+int
+mpn_toom_eval_dgr3_pm2 (mp_ptr xp2, mp_ptr xm2,
+			mp_srcptr xp, mp_size_t n, mp_size_t x3n, mp_ptr tp)
+{
+  mp_limb_t cy;
+  int neg;
+
+  ASSERT (x3n > 0);
+  ASSERT (x3n <= n);
+
+  /* (x0 + 4 * x2) +/- (2 x1 + 8 x_3) */
+#if HAVE_NATIVE_mpn_addlsh_n || HAVE_NATIVE_mpn_addlsh2_n
+#if HAVE_NATIVE_mpn_addlsh2_n
+  xp2[n] = mpn_addlsh2_n (xp2, xp, xp + 2*n, n);
+
+  cy = mpn_addlsh2_n (tp, xp + n, xp + 3*n, x3n);
+#else /* HAVE_NATIVE_mpn_addlsh_n */
+  xp2[n] = mpn_addlsh_n (xp2, xp, xp + 2*n, n, 2);
+
+  cy = mpn_addlsh_n (tp, xp + n, xp + 3*n, x3n, 2);
+#endif
+  if (x3n < n)
+    cy = mpn_add_1 (tp + x3n, xp + n + x3n, n - x3n, cy);
+  tp[n] = cy;
+#else
+  cy = mpn_lshift (tp, xp + 2*n, n, 2);
+  xp2[n] = cy + mpn_add_n (xp2, tp, xp, n);
+
+  tp[x3n] = mpn_lshift (tp, xp + 3*n, x3n, 2);
+  if (x3n < n)
+    tp[n] = mpn_add (tp, xp + n, n, tp, x3n + 1);
+  else
+    tp[n] += mpn_add_n (tp, xp + n, tp, n);
+#endif
+  mpn_lshift (tp, tp, n+1, 1);
+
+  neg = (mpn_cmp (xp2, tp, n + 1) < 0) ? ~0 : 0;
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (neg)
+    mpn_add_n_sub_n (xp2, xm2, tp, xp2, n + 1);
+  else
+    mpn_add_n_sub_n (xp2, xm2, xp2, tp, n + 1);
+#else
+  if (neg)
+    mpn_sub_n (xm2, tp, xp2, n + 1);
+  else
+    mpn_sub_n (xm2, xp2, tp, n + 1);
+
+  mpn_add_n (xp2, xp2, tp, n + 1);
+#endif
+
+  ASSERT (xp2[n] < 15);
+  ASSERT (xm2[n] < 10);
+
+  return neg;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm1.c
deleted file mode 120000
index 0f34ff356..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm1.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_eval_pm1.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm1.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm1.c
new file mode 100644
index 000000000..a8cfa9360
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm1.c
@@ -0,0 +1,89 @@
+/* mpn_toom_eval_pm1 -- Evaluate a polynomial in +1 and -1
+
+   Contributed to the GNU project by Niels Möller
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluates a polynomial of degree k > 3, in the points +1 and -1. */
+int
+mpn_toom_eval_pm1 (mp_ptr xp1, mp_ptr xm1, unsigned k,
+		   mp_srcptr xp, mp_size_t n, mp_size_t hn, mp_ptr tp)
+{
+  unsigned i;
+  int neg;
+
+  ASSERT (k >= 4);
+
+  ASSERT (hn > 0);
+  ASSERT (hn <= n);
+
+  /* The degree k is also the number of full-size coefficients, so
+   * that last coefficient, of size hn, starts at xp + k*n. */
+
+  xp1[n] = mpn_add_n (xp1, xp, xp + 2*n, n);
+  for (i = 4; i < k; i += 2)
+    ASSERT_NOCARRY (mpn_add (xp1, xp1, n+1, xp+i*n, n));
+
+  tp[n] = mpn_add_n (tp, xp + n, xp + 3*n, n);
+  for (i = 5; i < k; i += 2)
+    ASSERT_NOCARRY (mpn_add (tp, tp, n+1, xp+i*n, n));
+
+  if (k & 1)
+    ASSERT_NOCARRY (mpn_add (tp, tp, n+1, xp+k*n, hn));
+  else
+    ASSERT_NOCARRY (mpn_add (xp1, xp1, n+1, xp+k*n, hn));
+
+  neg = (mpn_cmp (xp1, tp, n + 1) < 0) ? ~0 : 0;
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (neg)
+    mpn_add_n_sub_n (xp1, xm1, tp, xp1, n + 1);
+  else
+    mpn_add_n_sub_n (xp1, xm1, xp1, tp, n + 1);
+#else
+  if (neg)
+    mpn_sub_n (xm1, tp, xp1, n + 1);
+  else
+    mpn_sub_n (xm1, xp1, tp, n + 1);
+
+  mpn_add_n (xp1, xp1, tp, n + 1);
+#endif
+
+  ASSERT (xp1[n] <= k);
+  ASSERT (xm1[n] <= k/2 + 1);
+
+  return neg;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2.c
deleted file mode 120000
index 8b85d5b19..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_eval_pm2.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2.c
new file mode 100644
index 000000000..be682c75c
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2.c
@@ -0,0 +1,130 @@
+/* mpn_toom_eval_pm2 -- Evaluate a polynomial in +2 and -2
+
+   Contributed to the GNU project by Niels Möller and Marco Bodrato
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+/* DO_addlsh2(d,a,b,n,cy) computes cy,{d,n} <- {a,n} + 4*(cy,{b,n}), it
+   can be used as DO_addlsh2(d,a,d,n,d[n]), for accumulation on {d,n+1}. */
+#if HAVE_NATIVE_mpn_addlsh2_n
+#define DO_addlsh2(d, a, b, n, cy)	\
+do {					\
+  (cy) <<= 2;				\
+  (cy) += mpn_addlsh2_n(d, a, b, n);	\
+} while (0)
+#else
+#if HAVE_NATIVE_mpn_addlsh_n
+#define DO_addlsh2(d, a, b, n, cy)	\
+do {					\
+  (cy) <<= 2;				\
+  (cy) += mpn_addlsh_n(d, a, b, n, 2);	\
+} while (0)
+#else
+/* The following is not a general substitute for addlsh2.
+   It is correct if d == b, but it is not if d == a.  */
+#define DO_addlsh2(d, a, b, n, cy)	\
+do {					\
+  (cy) <<= 2;				\
+  (cy) += mpn_lshift(d, b, n, 2);	\
+  (cy) += mpn_add_n(d, d, a, n);	\
+} while (0)
+#endif
+#endif
+
+/* Evaluates a polynomial of degree 2 < k < GMP_NUMB_BITS, in the
+   points +2 and -2. */
+int
+mpn_toom_eval_pm2 (mp_ptr xp2, mp_ptr xm2, unsigned k,
+		   mp_srcptr xp, mp_size_t n, mp_size_t hn, mp_ptr tp)
+{
+  int i;
+  int neg;
+  mp_limb_t cy;
+
+  ASSERT (k >= 3);
+  ASSERT (k < GMP_NUMB_BITS);
+
+  ASSERT (hn > 0);
+  ASSERT (hn <= n);
+
+  /* The degree k is also the number of full-size coefficients, so
+   * that last coefficient, of size hn, starts at xp + k*n. */
+
+  cy = 0;
+  DO_addlsh2 (xp2, xp + (k-2) * n, xp + k * n, hn, cy);
+  if (hn != n)
+    cy = mpn_add_1 (xp2 + hn, xp + (k-2) * n + hn, n - hn, cy);
+  for (i = k - 4; i >= 0; i -= 2)
+    DO_addlsh2 (xp2, xp + i * n, xp2, n, cy);
+  xp2[n] = cy;
+
+  k--;
+
+  cy = 0;
+  DO_addlsh2 (tp, xp + (k-2) * n, xp + k * n, n, cy);
+  for (i = k - 4; i >= 0; i -= 2)
+    DO_addlsh2 (tp, xp + i * n, tp, n, cy);
+  tp[n] = cy;
+
+  if (k & 1)
+    ASSERT_NOCARRY(mpn_lshift (tp , tp , n + 1, 1));
+  else
+    ASSERT_NOCARRY(mpn_lshift (xp2, xp2, n + 1, 1));
+
+  neg = (mpn_cmp (xp2, tp, n + 1) < 0) ? ~0 : 0;
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (neg)
+    mpn_add_n_sub_n (xp2, xm2, tp, xp2, n + 1);
+  else
+    mpn_add_n_sub_n (xp2, xm2, xp2, tp, n + 1);
+#else /* !HAVE_NATIVE_mpn_add_n_sub_n */
+  if (neg)
+    mpn_sub_n (xm2, tp, xp2, n + 1);
+  else
+    mpn_sub_n (xm2, xp2, tp, n + 1);
+
+  mpn_add_n (xp2, xp2, tp, n + 1);
+#endif /* !HAVE_NATIVE_mpn_add_n_sub_n */
+
+  ASSERT (xp2[n] < (1<<(k+2))-1);
+  ASSERT (xm2[n] < ((1<<(k+3))-1 - (1^k&1))/3);
+
+  neg ^= ((k & 1) - 1);
+
+  return neg;
+}
+
+#undef DO_addlsh2
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2exp.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2exp.c
deleted file mode 120000
index c4814a984..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2exp.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_eval_pm2exp.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2exp.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2exp.c
new file mode 100644
index 000000000..c3c465100
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2exp.c
@@ -0,0 +1,127 @@
+/* mpn_toom_eval_pm2exp -- Evaluate a polynomial in +2^k and -2^k
+
+   Contributed to the GNU project by Niels Möller
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+/* Evaluates a polynomial of degree k > 2, in the points +2^shift and -2^shift. */
+int
+mpn_toom_eval_pm2exp (mp_ptr xp2, mp_ptr xm2, unsigned k,
+		      mp_srcptr xp, mp_size_t n, mp_size_t hn, unsigned shift,
+		      mp_ptr tp)
+{
+  unsigned i;
+  int neg;
+#if HAVE_NATIVE_mpn_addlsh_n
+  mp_limb_t cy;
+#endif
+
+  ASSERT (k >= 3);
+  ASSERT (shift*k < GMP_NUMB_BITS);
+
+  ASSERT (hn > 0);
+  ASSERT (hn <= n);
+
+  /* The degree k is also the number of full-size coefficients, so
+   * that last coefficient, of size hn, starts at xp + k*n. */
+
+#if HAVE_NATIVE_mpn_addlsh_n
+  xp2[n] = mpn_addlsh_n (xp2, xp, xp + 2*n, n, 2*shift);
+  for (i = 4; i < k; i += 2)
+    xp2[n] += mpn_addlsh_n (xp2, xp2, xp + i*n, n, i*shift);
+
+  tp[n] = mpn_lshift (tp, xp+n, n, shift);
+  for (i = 3; i < k; i+= 2)
+    tp[n] += mpn_addlsh_n (tp, tp, xp+i*n, n, i*shift);
+
+  if (k & 1)
+    {
+      cy = mpn_addlsh_n (tp, tp, xp+k*n, hn, k*shift);
+      MPN_INCR_U (tp + hn, n+1 - hn, cy);
+    }
+  else
+    {
+      cy = mpn_addlsh_n (xp2, xp2, xp+k*n, hn, k*shift);
+      MPN_INCR_U (xp2 + hn, n+1 - hn, cy);
+    }
+
+#else /* !HAVE_NATIVE_mpn_addlsh_n */
+  xp2[n] = mpn_lshift (tp, xp+2*n, n, 2*shift);
+  xp2[n] += mpn_add_n (xp2, xp, tp, n);
+  for (i = 4; i < k; i += 2)
+    {
+      xp2[n] += mpn_lshift (tp, xp + i*n, n, i*shift);
+      xp2[n] += mpn_add_n (xp2, xp2, tp, n);
+    }
+
+  tp[n] = mpn_lshift (tp, xp+n, n, shift);
+  for (i = 3; i < k; i+= 2)
+    {
+      tp[n] += mpn_lshift (xm2, xp + i*n, n, i*shift);
+      tp[n] += mpn_add_n (tp, tp, xm2, n);
+    }
+
+  xm2[hn] = mpn_lshift (xm2, xp + k*n, hn, k*shift);
+  if (k & 1)
+    mpn_add (tp, tp, n+1, xm2, hn+1);
+  else
+    mpn_add (xp2, xp2, n+1, xm2, hn+1);
+#endif /* !HAVE_NATIVE_mpn_addlsh_n */
+
+  neg = (mpn_cmp (xp2, tp, n + 1) < 0) ? ~0 : 0;
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (neg)
+    mpn_add_n_sub_n (xp2, xm2, tp, xp2, n + 1);
+  else
+    mpn_add_n_sub_n (xp2, xm2, xp2, tp, n + 1);
+#else /* !HAVE_NATIVE_mpn_add_n_sub_n */
+  if (neg)
+    mpn_sub_n (xm2, tp, xp2, n + 1);
+  else
+    mpn_sub_n (xm2, xp2, tp, n + 1);
+
+  mpn_add_n (xp2, xp2, tp, n + 1);
+#endif /* !HAVE_NATIVE_mpn_add_n_sub_n */
+
+  /* FIXME: the following asserts are useless if (k+1)*shift >= GMP_LIMB_BITS */
+  ASSERT ((k+1)*shift >= GMP_LIMB_BITS ||
+	  xp2[n] < ((CNST_LIMB(1)<<((k+1)*shift))-1)/((CNST_LIMB(1)<<shift)-1));
+  ASSERT ((k+2)*shift >= GMP_LIMB_BITS ||
+	  xm2[n] < ((CNST_LIMB(1)<<((k+2)*shift))-((k&1)?(CNST_LIMB(1)<<shift):1))/((CNST_LIMB(1)<<(2*shift))-1));
+
+  return neg;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2rexp.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2rexp.c
deleted file mode 120000
index d151e02e4..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2rexp.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_eval_pm2rexp.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2rexp.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2rexp.c
new file mode 100644
index 000000000..6cd62fb5c
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_eval_pm2rexp.c
@@ -0,0 +1,101 @@
+/* mpn_toom_eval_pm2rexp -- Evaluate a polynomial in +2^-k and -2^-k
+
+   Contributed to the GNU project by Marco Bodrato
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+#if HAVE_NATIVE_mpn_addlsh_n
+#define DO_mpn_addlsh_n(dst,src,n,s,ws) mpn_addlsh_n(dst,dst,src,n,s)
+#else
+static mp_limb_t
+DO_mpn_addlsh_n(mp_ptr dst, mp_srcptr src, mp_size_t n, unsigned int s, mp_ptr ws)
+{
+#if USE_MUL_1 && 0
+  return mpn_addmul_1(dst,src,n,CNST_LIMB(1) <<(s));
+#else
+  mp_limb_t __cy;
+  __cy = mpn_lshift(ws,src,n,s);
+  return    __cy + mpn_add_n(dst,dst,ws,n);
+#endif
+}
+#endif
+
+/* Evaluates a polynomial of degree k >= 3. */
+int
+mpn_toom_eval_pm2rexp (mp_ptr rp, mp_ptr rm,
+		      unsigned int q, mp_srcptr ap, mp_size_t n, mp_size_t t,
+		      unsigned int s, mp_ptr ws)
+{
+  unsigned int i;
+  int neg;
+  /* {ap,q*n+t} -> {rp,n+1} {rm,n+1} , with {ws, n+1}*/
+  ASSERT (n >= t);
+  ASSERT (s != 0); /* or _eval_pm1 should be used */
+  ASSERT (q > 1);
+  ASSERT (s*q < GMP_NUMB_BITS);
+  rp[n] = mpn_lshift(rp, ap, n, s*q);
+  ws[n] = mpn_lshift(ws, ap+n, n, s*(q-1));
+  if( (q & 1) != 0) {
+    ASSERT_NOCARRY(mpn_add(ws,ws,n+1,ap+n*q,t));
+    rp[n] += DO_mpn_addlsh_n(rp, ap+n*(q-1), n, s, rm);
+  } else {
+    ASSERT_NOCARRY(mpn_add(rp,rp,n+1,ap+n*q,t));
+  }
+  for(i=2; i<q-1; i++)
+  {
+    rp[n] += DO_mpn_addlsh_n(rp, ap+n*i, n, s*(q-i), rm);
+    i++;
+    ws[n] += DO_mpn_addlsh_n(ws, ap+n*i, n, s*(q-i), rm);
+  };
+
+  neg = (mpn_cmp (rp, ws, n + 1) < 0) ? ~0 : 0;
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  if (neg)
+    mpn_add_n_sub_n (rp, rm, ws, rp, n + 1);
+  else
+    mpn_add_n_sub_n (rp, rm, rp, ws, n + 1);
+#else /* !HAVE_NATIVE_mpn_add_n_sub_n */
+  if (neg)
+    mpn_sub_n (rm, ws, rp, n + 1);
+  else
+    mpn_sub_n (rm, rp, ws, n + 1);
+
+  ASSERT_NOCARRY (mpn_add_n (rp, rp, ws, n + 1));
+#endif /* !HAVE_NATIVE_mpn_add_n_sub_n */
+
+  return neg;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_12pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_12pts.c
deleted file mode 120000
index f5999b5d7..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_12pts.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_interpolate_12pts.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_12pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_12pts.c
new file mode 100644
index 000000000..627346613
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_12pts.c
@@ -0,0 +1,374 @@
+/* Interpolation for the algorithm Toom-Cook 6.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010, 2012, 2015, 2020 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+#if GMP_NUMB_BITS < 21
+#error Not implemented: Both sublsh_n(,,,20) should be corrected.
+#endif
+
+#if GMP_NUMB_BITS < 16
+#error Not implemented: divexact_by42525 needs splitting.
+#endif
+
+#if GMP_NUMB_BITS < 12
+#error Not implemented: Hard to adapt...
+#endif
+
+
+/* FIXME: tuneup should decide the best variant */
+#ifndef AORSMUL_FASTER_AORS_AORSLSH
+#define AORSMUL_FASTER_AORS_AORSLSH 1
+#endif
+#ifndef AORSMUL_FASTER_AORS_2AORSLSH
+#define AORSMUL_FASTER_AORS_2AORSLSH 1
+#endif
+#ifndef AORSMUL_FASTER_2AORSLSH
+#define AORSMUL_FASTER_2AORSLSH 1
+#endif
+#ifndef AORSMUL_FASTER_3AORSLSH
+#define AORSMUL_FASTER_3AORSLSH 1
+#endif
+
+
+#if HAVE_NATIVE_mpn_sublsh_n
+#define DO_mpn_sublsh_n(dst,src,n,s,ws) mpn_sublsh_n(dst,dst,src,n,s)
+#else
+static mp_limb_t
+DO_mpn_sublsh_n(mp_ptr dst, mp_srcptr src, mp_size_t n, unsigned int s, mp_ptr ws)
+{
+#if USE_MUL_1 && 0
+  return mpn_submul_1(dst,src,n,CNST_LIMB(1) <<(s));
+#else
+  mp_limb_t __cy;
+  __cy = mpn_lshift(ws,src,n,s);
+  return    __cy + mpn_sub_n(dst,dst,ws,n);
+#endif
+}
+#endif
+
+#if HAVE_NATIVE_mpn_addlsh_n
+#define DO_mpn_addlsh_n(dst,src,n,s,ws) mpn_addlsh_n(dst,dst,src,n,s)
+#else
+#if !defined (AORSMUL_FASTER_2AORSLSH) && !defined (AORSMUL_FASTER_AORS_2AORSLSH)
+static mp_limb_t
+DO_mpn_addlsh_n(mp_ptr dst, mp_srcptr src, mp_size_t n, unsigned int s, mp_ptr ws)
+{
+#if USE_MUL_1 && 0
+  return mpn_addmul_1(dst,src,n,CNST_LIMB(1) <<(s));
+#else
+  mp_limb_t __cy;
+  __cy = mpn_lshift(ws,src,n,s);
+  return    __cy + mpn_add_n(dst,dst,ws,n);
+#endif
+}
+#endif
+#endif
+
+#if HAVE_NATIVE_mpn_subrsh
+#define DO_mpn_subrsh(dst,nd,src,ns,s,ws) mpn_subrsh(dst,nd,src,ns,s)
+#else
+/* FIXME: This is not a correct definition, it assumes no carry */
+#define DO_mpn_subrsh(dst,nd,src,ns,s,ws)				\
+do {									\
+  mp_limb_t __cy;							\
+  MPN_DECR_U (dst, nd, src[0] >> s);					\
+  __cy = DO_mpn_sublsh_n (dst, src + 1, ns - 1, GMP_NUMB_BITS - s, ws);	\
+  MPN_DECR_U (dst + ns - 1, nd - ns + 1, __cy);				\
+} while (0)
+#endif
+
+
+#define BINVERT_9 \
+  ((((GMP_NUMB_MAX / 9) << (6 - GMP_NUMB_BITS % 6)) * 8 & GMP_NUMB_MAX) | 0x39)
+
+#define BINVERT_255 \
+  (GMP_NUMB_MAX - ((GMP_NUMB_MAX / 255) << (8 - GMP_NUMB_BITS % 8)))
+
+  /* FIXME: find some more general expressions for 2835^-1, 42525^-1 */
+#if GMP_LIMB_BITS == 32
+#define BINVERT_2835  (GMP_NUMB_MASK &		CNST_LIMB(0x53E3771B))
+#define BINVERT_42525 (GMP_NUMB_MASK &		CNST_LIMB(0x9F314C35))
+#else
+#if GMP_LIMB_BITS == 64
+#define BINVERT_2835  (GMP_NUMB_MASK &	CNST_LIMB(0x938CC70553E3771B))
+#define BINVERT_42525 (GMP_NUMB_MASK &	CNST_LIMB(0xE7B40D449F314C35))
+#endif
+#endif
+
+#ifndef mpn_divexact_by255
+#if GMP_NUMB_BITS % 8 == 0
+#define mpn_divexact_by255(dst,src,size) \
+  (255 & 1 * mpn_bdiv_dbm1 (dst, src, size, __GMP_CAST (mp_limb_t, GMP_NUMB_MASK / 255)))
+#else
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by255(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(255),BINVERT_255,0)
+#else
+#define mpn_divexact_by255(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(255))
+#endif
+#endif
+#endif
+
+#ifndef mpn_divexact_by9x4
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by9x4(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(9),BINVERT_9,2)
+#else
+#define mpn_divexact_by9x4(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(9)<<2)
+#endif
+#endif
+
+#ifndef mpn_divexact_by42525
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_42525)
+#define mpn_divexact_by42525(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(42525),BINVERT_42525,0)
+#else
+#define mpn_divexact_by42525(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(42525))
+#endif
+#endif
+
+#ifndef mpn_divexact_by2835x4
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_2835)
+#define mpn_divexact_by2835x4(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(2835),BINVERT_2835,2)
+#else
+#define mpn_divexact_by2835x4(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(2835)<<2)
+#endif
+#endif
+
+/* Interpolation for Toom-6.5 (or Toom-6), using the evaluation
+   points: infinity(6.5 only), +-4, +-2, +-1, +-1/4, +-1/2, 0. More precisely,
+   we want to compute f(2^(GMP_NUMB_BITS * n)) for a polynomial f of
+   degree 11 (or 10), given the 12 (rsp. 11) values:
+
+     r0 = limit at infinity of f(x) / x^11,
+     r1 = f(4),f(-4),
+     r2 = f(2),f(-2),
+     r3 = f(1),f(-1),
+     r4 = f(1/4),f(-1/4),
+     r5 = f(1/2),f(-1/2),
+     r6 = f(0).
+
+   All couples of the form f(n),f(-n) must be already mixed with
+   toom_couple_handling(f(n),...,f(-n),...)
+
+   The result is stored in {pp, spt + 7*n (or 6*n)}.
+   At entry, r6 is stored at {pp, 2n},
+   r4 is stored at {pp + 3n, 3n + 1}.
+   r2 is stored at {pp + 7n, 3n + 1}.
+   r0 is stored at {pp +11n, spt}.
+
+   The other values are 3n+1 limbs each (with most significant limbs small).
+
+   Negative intermediate results are stored two-complemented.
+   Inputs are destroyed.
+*/
+
+void
+mpn_toom_interpolate_12pts (mp_ptr pp, mp_ptr r1, mp_ptr r3, mp_ptr r5,
+			mp_size_t n, mp_size_t spt, int half, mp_ptr wsi)
+{
+  mp_limb_t cy;
+  mp_size_t n3;
+  mp_size_t n3p1;
+  n3 = 3 * n;
+  n3p1 = n3 + 1;
+
+#define   r4    (pp + n3)			/* 3n+1 */
+#define   r2    (pp + 7 * n)			/* 3n+1 */
+#define   r0    (pp +11 * n)			/* s+t <= 2*n */
+
+  /******************************* interpolation *****************************/
+  if (half != 0) {
+    cy = mpn_sub_n (r3, r3, r0, spt);
+    MPN_DECR_U (r3 + spt, n3p1 - spt, cy);
+
+    cy = DO_mpn_sublsh_n (r2, r0, spt, 10, wsi);
+    MPN_DECR_U (r2 + spt, n3p1 - spt, cy);
+    DO_mpn_subrsh(r5, n3p1, r0, spt, 2, wsi);
+
+    cy = DO_mpn_sublsh_n (r1, r0, spt, 20, wsi);
+    MPN_DECR_U (r1 + spt, n3p1 - spt, cy);
+    DO_mpn_subrsh(r4, n3p1, r0, spt, 4, wsi);
+  };
+
+  r4[n3] -= DO_mpn_sublsh_n (r4 + n, pp, 2 * n, 20, wsi);
+  DO_mpn_subrsh(r1 + n, 2 * n + 1, pp, 2 * n, 4, wsi);
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  mpn_add_n_sub_n (r1, r4, r4, r1, n3p1);
+#else
+  ASSERT_NOCARRY(mpn_add_n (wsi, r1, r4, n3p1));
+  mpn_sub_n (r4, r4, r1, n3p1); /* can be negative */
+  MP_PTR_SWAP(r1, wsi);
+#endif
+
+  r5[n3] -= DO_mpn_sublsh_n (r5 + n, pp, 2 * n, 10, wsi);
+  DO_mpn_subrsh(r2 + n, 2 * n + 1, pp, 2 * n, 2, wsi);
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  mpn_add_n_sub_n (r2, r5, r5, r2, n3p1);
+#else
+  mpn_sub_n (wsi, r5, r2, n3p1); /* can be negative */
+  ASSERT_NOCARRY(mpn_add_n (r2, r2, r5, n3p1));
+  MP_PTR_SWAP(r5, wsi);
+#endif
+
+  r3[n3] -= mpn_sub_n (r3+n, r3+n, pp, 2 * n);
+
+#if AORSMUL_FASTER_AORS_AORSLSH
+  mpn_submul_1 (r4, r5, n3p1, 257); /* can be negative */
+#else
+  mpn_sub_n (r4, r4, r5, n3p1); /* can be negative */
+  DO_mpn_sublsh_n (r4, r5, n3p1, 8, wsi); /* can be negative */
+#endif
+  /* A division by 2835x4 follows. Warning: the operand can be negative! */
+  mpn_divexact_by2835x4(r4, r4, n3p1);
+  if ((r4[n3] & (GMP_NUMB_MAX << (GMP_NUMB_BITS-3))) != 0)
+    r4[n3] |= (GMP_NUMB_MAX << (GMP_NUMB_BITS-2));
+
+#if AORSMUL_FASTER_2AORSLSH
+  mpn_addmul_1 (r5, r4, n3p1, 60); /* can be negative */
+#else
+  DO_mpn_sublsh_n (r5, r4, n3p1, 2, wsi); /* can be negative */
+  DO_mpn_addlsh_n (r5, r4, n3p1, 6, wsi); /* can give a carry */
+#endif
+  mpn_divexact_by255(r5, r5, n3p1);
+
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r2, r3, n3p1, 5, wsi));
+
+#if AORSMUL_FASTER_3AORSLSH
+  ASSERT_NOCARRY(mpn_submul_1 (r1, r2, n3p1, 100));
+#else
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r1, r2, n3p1, 6, wsi));
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r1, r2, n3p1, 5, wsi));
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r1, r2, n3p1, 2, wsi));
+#endif
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r1, r3, n3p1, 9, wsi));
+  mpn_divexact_by42525(r1, r1, n3p1);
+
+#if AORSMUL_FASTER_AORS_2AORSLSH
+  ASSERT_NOCARRY(mpn_submul_1 (r2, r1, n3p1, 225));
+#else
+  ASSERT_NOCARRY(mpn_sub_n (r2, r2, r1, n3p1));
+  ASSERT_NOCARRY(DO_mpn_addlsh_n (r2, r1, n3p1, 5, wsi));
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r2, r1, n3p1, 8, wsi));
+#endif
+  mpn_divexact_by9x4(r2, r2, n3p1);
+
+  ASSERT_NOCARRY(mpn_sub_n (r3, r3, r2, n3p1));
+
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+  mpn_rsh1sub_n (r4, r2, r4, n3p1);
+  r4 [n3p1 - 1] &= GMP_NUMB_MASK >> 1;
+#else
+  mpn_sub_n (r4, r2, r4, n3p1);
+  ASSERT_NOCARRY(mpn_rshift(r4, r4, n3p1, 1));
+#endif
+  ASSERT_NOCARRY(mpn_sub_n (r2, r2, r4, n3p1));
+
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+  mpn_rsh1add_n (r5, r5, r1, n3p1);
+  r5 [n3p1 - 1] &= GMP_NUMB_MASK >> 1;
+#else
+  mpn_add_n (r5, r5, r1, n3p1);
+  ASSERT_NOCARRY(mpn_rshift(r5, r5, n3p1, 1));
+#endif
+
+  /* last interpolation steps... */
+  ASSERT_NOCARRY(mpn_sub_n (r3, r3, r1, n3p1));
+  ASSERT_NOCARRY(mpn_sub_n (r1, r1, r5, n3p1));
+  /* ... could be mixed with recomposition
+	||H-r5|M-r5|L-r5|   ||H-r1|M-r1|L-r1|
+  */
+
+  /***************************** recomposition *******************************/
+  /*
+    pp[] prior to operations:
+    |M r0|L r0|___||H r2|M r2|L r2|___||H r4|M r4|L r4|____|H_r6|L r6|pp
+
+    summation scheme for remaining operations:
+    |__12|n_11|n_10|n__9|n__8|n__7|n__6|n__5|n__4|n__3|n__2|n___|n___|pp
+    |M r0|L r0|___||H r2|M r2|L r2|___||H r4|M r4|L r4|____|H_r6|L r6|pp
+	||H r1|M r1|L r1|   ||H r3|M r3|L r3|   ||H_r5|M_r5|L_r5|
+  */
+
+  cy = mpn_add_n (pp + n, pp + n, r5, n);
+  cy = mpn_add_1 (pp + 2 * n, r5 + n, n, cy);
+#if HAVE_NATIVE_mpn_add_nc
+  cy = r5[n3] + mpn_add_nc(pp + n3, pp + n3, r5 + 2 * n, n, cy);
+#else
+  MPN_INCR_U (r5 + 2 * n, n + 1, cy);
+  cy = r5[n3] + mpn_add_n (pp + n3, pp + n3, r5 + 2 * n, n);
+#endif
+  MPN_INCR_U (pp + n3 + n, 2 * n + 1, cy);
+
+  pp[2 * n3]+= mpn_add_n (pp + 5 * n, pp + 5 * n, r3, n);
+  cy = mpn_add_1 (pp + 2 * n3, r3 + n, n, pp[2 * n3]);
+#if HAVE_NATIVE_mpn_add_nc
+  cy = r3[n3] + mpn_add_nc(pp + 7 * n, pp + 7 * n, r3 + 2 * n, n, cy);
+#else
+  MPN_INCR_U (r3 + 2 * n, n + 1, cy);
+  cy = r3[n3] + mpn_add_n (pp + 7 * n, pp + 7 * n, r3 + 2 * n, n);
+#endif
+  MPN_INCR_U (pp + 8 * n, 2 * n + 1, cy);
+
+  pp[10*n]+=mpn_add_n (pp + 9 * n, pp + 9 * n, r1, n);
+  if (half) {
+    cy = mpn_add_1 (pp + 10 * n, r1 + n, n, pp[10 * n]);
+#if HAVE_NATIVE_mpn_add_nc
+    if (LIKELY (spt > n)) {
+      cy = r1[n3] + mpn_add_nc(pp + 11 * n, pp + 11 * n, r1 + 2 * n, n, cy);
+      MPN_INCR_U (pp + 4 * n3, spt - n, cy);
+    } else {
+      ASSERT_NOCARRY(mpn_add_nc(pp + 11 * n, pp + 11 * n, r1 + 2 * n, spt, cy));
+    }
+#else
+    MPN_INCR_U (r1 + 2 * n, n + 1, cy);
+    if (LIKELY (spt > n)) {
+      cy = r1[n3] + mpn_add_n (pp + 11 * n, pp + 11 * n, r1 + 2 * n, n);
+      MPN_INCR_U (pp + 4 * n3, spt - n, cy);
+    } else {
+      ASSERT_NOCARRY(mpn_add_n (pp + 11 * n, pp + 11 * n, r1 + 2 * n, spt));
+    }
+#endif
+  } else {
+    ASSERT_NOCARRY(mpn_add_1 (pp + 10 * n, r1 + n, spt, pp[10 * n]));
+  }
+
+#undef   r0
+#undef   r2
+#undef   r4
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_16pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_16pts.c
deleted file mode 120000
index 5743b1ee3..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_16pts.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_interpolate_16pts.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_16pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_16pts.c
new file mode 100644
index 000000000..c1457be64
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_16pts.c
@@ -0,0 +1,545 @@
+/* Interpolation for the algorithm Toom-Cook 8.5-way.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010, 2012, 2015, 2020 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+
+#include "gmp-impl.h"
+
+
+#if GMP_NUMB_BITS < 29
+#error Not implemented: Both sublsh_n(,,,28) should be corrected; r2 and r5 need one more LIMB.
+#endif
+
+#if GMP_NUMB_BITS < 28
+#error Not implemented: divexact_by188513325 and _by182712915 will not work.
+#endif
+
+
+/* FIXME: tuneup should decide the best variant */
+#ifndef AORSMUL_FASTER_AORS_AORSLSH
+#define AORSMUL_FASTER_AORS_AORSLSH 1
+#endif
+#ifndef AORSMUL_FASTER_AORS_2AORSLSH
+#define AORSMUL_FASTER_AORS_2AORSLSH 1
+#endif
+#ifndef AORSMUL_FASTER_2AORSLSH
+#define AORSMUL_FASTER_2AORSLSH 1
+#endif
+#ifndef AORSMUL_FASTER_3AORSLSH
+#define AORSMUL_FASTER_3AORSLSH 1
+#endif
+
+
+#if HAVE_NATIVE_mpn_sublsh_n
+#define DO_mpn_sublsh_n(dst,src,n,s,ws) mpn_sublsh_n(dst,dst,src,n,s)
+#else
+static mp_limb_t
+DO_mpn_sublsh_n(mp_ptr dst, mp_srcptr src, mp_size_t n, unsigned int s, mp_ptr ws)
+{
+#if USE_MUL_1 && 0
+  return mpn_submul_1(dst,src,n,CNST_LIMB(1) <<(s));
+#else
+  mp_limb_t __cy;
+  __cy = mpn_lshift(ws,src,n,s);
+  return    __cy + mpn_sub_n(dst,dst,ws,n);
+#endif
+}
+#endif
+
+#if HAVE_NATIVE_mpn_addlsh_n
+#define DO_mpn_addlsh_n(dst,src,n,s,ws) mpn_addlsh_n(dst,dst,src,n,s)
+#else
+#if !defined (AORSMUL_FASTER_2AORSLSH) && !defined (AORSMUL_FASTER_AORS_2AORSLSH)
+static mp_limb_t
+DO_mpn_addlsh_n(mp_ptr dst, mp_srcptr src, mp_size_t n, unsigned int s, mp_ptr ws)
+{
+#if USE_MUL_1 && 0
+  return mpn_addmul_1(dst,src,n,CNST_LIMB(1) <<(s));
+#else
+  mp_limb_t __cy;
+  __cy = mpn_lshift(ws,src,n,s);
+  return    __cy + mpn_add_n(dst,dst,ws,n);
+#endif
+}
+#endif
+#endif
+
+#if HAVE_NATIVE_mpn_subrsh
+#define DO_mpn_subrsh(dst,nd,src,ns,s,ws) mpn_subrsh(dst,nd,src,ns,s)
+#else
+/* FIXME: This is not a correct definition, it assumes no carry */
+#define DO_mpn_subrsh(dst,nd,src,ns,s,ws)				\
+do {									\
+  mp_limb_t __cy;							\
+  MPN_DECR_U (dst, nd, src[0] >> s);					\
+  __cy = DO_mpn_sublsh_n (dst, src + 1, ns - 1, GMP_NUMB_BITS - s, ws);	\
+  MPN_DECR_U (dst + ns - 1, nd - ns + 1, __cy);				\
+} while (0)
+#endif
+
+
+#if GMP_NUMB_BITS < 43
+#define BIT_CORRECTION 1
+#define CORRECTION_BITS GMP_NUMB_BITS
+#else
+#define BIT_CORRECTION 0
+#define CORRECTION_BITS 0
+#endif
+
+#define BINVERT_9 \
+  ((((GMP_NUMB_MAX / 9) << (6 - GMP_NUMB_BITS % 6)) * 8 & GMP_NUMB_MAX) | 0x39)
+
+#define BINVERT_255 \
+  (GMP_NUMB_MAX - ((GMP_NUMB_MAX / 255) << (8 - GMP_NUMB_BITS % 8)))
+
+  /* FIXME: find some more general expressions for inverses */
+#if GMP_LIMB_BITS == 32
+#define BINVERT_2835  (GMP_NUMB_MASK &		CNST_LIMB(0x53E3771B))
+#define BINVERT_42525 (GMP_NUMB_MASK &		CNST_LIMB(0x9F314C35))
+#define BINVERT_182712915 (GMP_NUMB_MASK &	CNST_LIMB(0x550659DB))
+#define BINVERT_188513325 (GMP_NUMB_MASK &	CNST_LIMB(0xFBC333A5))
+#define BINVERT_255x182712915L (GMP_NUMB_MASK &	CNST_LIMB(0x6FC4CB25))
+#define BINVERT_255x188513325L (GMP_NUMB_MASK &	CNST_LIMB(0x6864275B))
+#if GMP_NAIL_BITS == 0
+#define BINVERT_255x182712915H CNST_LIMB(0x1B649A07)
+#define BINVERT_255x188513325H CNST_LIMB(0x06DB993A)
+#else /* GMP_NAIL_BITS != 0 */
+#define BINVERT_255x182712915H \
+  (GMP_NUMB_MASK & CNST_LIMB((0x1B649A07<<GMP_NAIL_BITS) | (0x6FC4CB25>>GMP_NUMB_BITS)))
+#define BINVERT_255x188513325H \
+  (GMP_NUMB_MASK & CNST_LIMB((0x06DB993A<<GMP_NAIL_BITS) | (0x6864275B>>GMP_NUMB_BITS)))
+#endif
+#else
+#if GMP_LIMB_BITS == 64
+#define BINVERT_2835  (GMP_NUMB_MASK &	CNST_LIMB(0x938CC70553E3771B))
+#define BINVERT_42525 (GMP_NUMB_MASK &	CNST_LIMB(0xE7B40D449F314C35))
+#define BINVERT_255x182712915  (GMP_NUMB_MASK &	CNST_LIMB(0x1B649A076FC4CB25))
+#define BINVERT_255x188513325  (GMP_NUMB_MASK &	CNST_LIMB(0x06DB993A6864275B))
+#endif
+#endif
+
+#ifndef mpn_divexact_by255
+#if GMP_NUMB_BITS % 8 == 0
+#define mpn_divexact_by255(dst,src,size) \
+  (255 & 1 * mpn_bdiv_dbm1 (dst, src, size, __GMP_CAST (mp_limb_t, GMP_NUMB_MASK / 255)))
+#else
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by255(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(255),BINVERT_255,0)
+#else
+#define mpn_divexact_by255(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(255))
+#endif
+#endif
+#endif
+
+#ifndef mpn_divexact_by255x4
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by255x4(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(255),BINVERT_255,2)
+#else
+#define mpn_divexact_by255x4(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(255)<<2)
+#endif
+#endif
+
+#ifndef mpn_divexact_by9x16
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by9x16(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(9),BINVERT_9,4)
+#else
+#define mpn_divexact_by9x16(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(9)<<4)
+#endif
+#endif
+
+#ifndef mpn_divexact_by42525x16
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_42525)
+#define mpn_divexact_by42525x16(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(42525),BINVERT_42525,4)
+#else
+#define mpn_divexact_by42525x16(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(42525)<<4)
+#endif
+#endif
+
+#ifndef mpn_divexact_by2835x64
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_2835)
+#define mpn_divexact_by2835x64(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(2835),BINVERT_2835,6)
+#else
+#define mpn_divexact_by2835x64(dst,src,size) mpn_divexact_1(dst,src,size,CNST_LIMB(2835)<<6)
+#endif
+#endif
+
+#ifndef  mpn_divexact_by255x182712915
+#if GMP_NUMB_BITS < 36
+#if HAVE_NATIVE_mpn_bdiv_q_2_pi2 && defined(BINVERT_255x182712915H)
+/* FIXME: use mpn_bdiv_q_2_pi2 */
+#endif
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_182712915)
+#define mpn_divexact_by255x182712915(dst,src,size)				\
+  do {										\
+    mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(182712915),BINVERT_182712915,0);	\
+    mpn_divexact_by255(dst,dst,size);						\
+  } while(0)
+#else
+#define mpn_divexact_by255x182712915(dst,src,size)	\
+  do {							\
+    mpn_divexact_1(dst,src,size,CNST_LIMB(182712915));	\
+    mpn_divexact_by255(dst,dst,size);			\
+  } while(0)
+#endif
+#else /* GMP_NUMB_BITS > 35 */
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_255x182712915)
+#define mpn_divexact_by255x182712915(dst,src,size) \
+  mpn_pi1_bdiv_q_1(dst,src,size,255*CNST_LIMB(182712915),BINVERT_255x182712915,0)
+#else
+#define mpn_divexact_by255x182712915(dst,src,size) mpn_divexact_1(dst,src,size,255*CNST_LIMB(182712915))
+#endif
+#endif /* GMP_NUMB_BITS >?< 36 */
+#endif
+
+#ifndef  mpn_divexact_by255x188513325
+#if GMP_NUMB_BITS < 36
+#if HAVE_NATIVE_mpn_bdiv_q_1_pi2 && defined(BINVERT_255x188513325H)
+/* FIXME: use mpn_bdiv_q_1_pi2 */
+#endif
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_188513325)
+#define mpn_divexact_by255x188513325(dst,src,size)			\
+  do {									\
+    mpn_pi1_bdiv_q_1(dst,src,size,CNST_LIMB(188513325),BINVERT_188513325,0);	\
+    mpn_divexact_by255(dst,dst,size);					\
+  } while(0)
+#else
+#define mpn_divexact_by255x188513325(dst,src,size)	\
+  do {							\
+    mpn_divexact_1(dst,src,size,CNST_LIMB(188513325));	\
+    mpn_divexact_by255(dst,dst,size);			\
+  } while(0)
+#endif
+#else /* GMP_NUMB_BITS > 35 */
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1 && defined(BINVERT_255x188513325)
+#define mpn_divexact_by255x188513325(dst,src,size) \
+  mpn_pi1_bdiv_q_1(dst,src,size,255*CNST_LIMB(188513325),BINVERT_255x188513325,0)
+#else
+#define mpn_divexact_by255x188513325(dst,src,size) mpn_divexact_1(dst,src,size,255*CNST_LIMB(188513325))
+#endif
+#endif /* GMP_NUMB_BITS >?< 36 */
+#endif
+
+/* Interpolation for Toom-8.5 (or Toom-8), using the evaluation
+   points: infinity(8.5 only), +-8, +-4, +-2, +-1, +-1/4, +-1/2,
+   +-1/8, 0. More precisely, we want to compute
+   f(2^(GMP_NUMB_BITS * n)) for a polynomial f of degree 15 (or
+   14), given the 16 (rsp. 15) values:
+
+     r0 = limit at infinity of f(x) / x^15,
+     r1 = f(8),f(-8),
+     r2 = f(4),f(-4),
+     r3 = f(2),f(-2),
+     r4 = f(1),f(-1),
+     r5 = f(1/4),f(-1/4),
+     r6 = f(1/2),f(-1/2),
+     r7 = f(1/8),f(-1/8),
+     r8 = f(0).
+
+   All couples of the form f(n),f(-n) must be already mixed with
+   toom_couple_handling(f(n),...,f(-n),...)
+
+   The result is stored in {pp, spt + 7*n (or 8*n)}.
+   At entry, r8 is stored at {pp, 2n},
+   r6 is stored at {pp + 3n, 3n + 1}.
+   r4 is stored at {pp + 7n, 3n + 1}.
+   r2 is stored at {pp +11n, 3n + 1}.
+   r0 is stored at {pp +15n, spt}.
+
+   The other values are 3n+1 limbs each (with most significant limbs small).
+
+   Negative intermediate results are stored two-complemented.
+   Inputs are destroyed.
+*/
+
+void
+mpn_toom_interpolate_16pts (mp_ptr pp, mp_ptr r1, mp_ptr r3, mp_ptr r5, mp_ptr r7,
+			mp_size_t n, mp_size_t spt, int half, mp_ptr wsi)
+{
+  mp_limb_t cy;
+  mp_size_t n3;
+  mp_size_t n3p1;
+  n3 = 3 * n;
+  n3p1 = n3 + 1;
+
+#define   r6    (pp + n3)			/* 3n+1 */
+#define   r4    (pp + 7 * n)			/* 3n+1 */
+#define   r2    (pp +11 * n)			/* 3n+1 */
+#define   r0    (pp +15 * n)			/* s+t <= 2*n */
+
+  ASSERT( spt <= 2 * n );
+  /******************************* interpolation *****************************/
+  if( half != 0) {
+    cy = mpn_sub_n (r4, r4, r0, spt);
+    MPN_DECR_U (r4 + spt, n3p1 - spt, cy);
+
+    cy = DO_mpn_sublsh_n (r3, r0, spt, 14, wsi);
+    MPN_DECR_U (r3 + spt, n3p1 - spt, cy);
+    DO_mpn_subrsh(r6, n3p1, r0, spt, 2, wsi);
+
+    cy = DO_mpn_sublsh_n (r2, r0, spt, 28, wsi);
+    MPN_DECR_U (r2 + spt, n3p1 - spt, cy);
+    DO_mpn_subrsh(r5, n3p1, r0, spt, 4, wsi);
+
+    cy = DO_mpn_sublsh_n (r1 + BIT_CORRECTION, r0, spt, 42 - CORRECTION_BITS, wsi);
+#if BIT_CORRECTION
+    cy = mpn_sub_1 (r1 + spt + BIT_CORRECTION, r1 + spt + BIT_CORRECTION,
+		    n3p1 - spt - BIT_CORRECTION, cy);
+    ASSERT (BIT_CORRECTION > 0 || cy == 0);
+    /* FIXME: assumes r7[n3p1] is writable (it is if r5 follows). */
+    cy = r7[n3p1];
+    r7[n3p1] = 0x80;
+#else
+    MPN_DECR_U (r1 + spt + BIT_CORRECTION, n3p1 - spt - BIT_CORRECTION, cy);
+#endif
+    DO_mpn_subrsh(r7, n3p1 + BIT_CORRECTION, r0, spt, 6, wsi);
+#if BIT_CORRECTION
+    /* FIXME: assumes r7[n3p1] is writable. */
+    ASSERT ( BIT_CORRECTION > 0 || r7[n3p1] == 0x80 );
+    r7[n3p1] = cy;
+#endif
+  };
+
+  r5[n3] -= DO_mpn_sublsh_n (r5 + n, pp, 2 * n, 28, wsi);
+  DO_mpn_subrsh(r2 + n, 2 * n + 1, pp, 2 * n, 4, wsi);
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  mpn_add_n_sub_n (r2, r5, r5, r2, n3p1);
+#else
+  mpn_sub_n (wsi, r5, r2, n3p1); /* can be negative */
+  ASSERT_NOCARRY(mpn_add_n (r2, r2, r5, n3p1));
+  MP_PTR_SWAP(r5, wsi);
+#endif
+
+  r6[n3] -= DO_mpn_sublsh_n (r6 + n, pp, 2 * n, 14, wsi);
+  DO_mpn_subrsh(r3 + n, 2 * n + 1, pp, 2 * n, 2, wsi);
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  mpn_add_n_sub_n (r3, r6, r6, r3, n3p1);
+#else
+  ASSERT_NOCARRY(mpn_add_n (wsi, r3, r6, n3p1));
+  mpn_sub_n (r6, r6, r3, n3p1); /* can be negative */
+  MP_PTR_SWAP(r3, wsi);
+#endif
+
+  cy = DO_mpn_sublsh_n (r7 + n + BIT_CORRECTION, pp, 2 * n, 42 - CORRECTION_BITS, wsi);
+#if BIT_CORRECTION
+  MPN_DECR_U (r1 + n, 2 * n + 1, pp[0] >> 6);
+  cy = DO_mpn_sublsh_n (r1 + n, pp + 1, 2 * n - 1, GMP_NUMB_BITS - 6, wsi);
+  cy = mpn_sub_1(r1 + 3 * n - 1, r1 + 3 * n - 1, 2, cy);
+  ASSERT ( BIT_CORRECTION > 0 || cy != 0 );
+#else
+  r7[n3] -= cy;
+  DO_mpn_subrsh(r1 + n, 2 * n + 1, pp, 2 * n, 6, wsi);
+#endif
+
+#if HAVE_NATIVE_mpn_add_n_sub_n
+  mpn_add_n_sub_n (r1, r7, r7, r1, n3p1);
+#else
+  mpn_sub_n (wsi, r7, r1, n3p1); /* can be negative */
+  mpn_add_n (r1, r1, r7, n3p1);  /* if BIT_CORRECTION != 0, can give a carry. */
+  MP_PTR_SWAP(r7, wsi);
+#endif
+
+  r4[n3] -= mpn_sub_n (r4+n, r4+n, pp, 2 * n);
+
+#if AORSMUL_FASTER_2AORSLSH
+  mpn_submul_1 (r5, r6, n3p1, 1028); /* can be negative */
+#else
+  DO_mpn_sublsh_n (r5, r6, n3p1, 2, wsi); /* can be negative */
+  DO_mpn_sublsh_n (r5, r6, n3p1,10, wsi); /* can be negative */
+#endif
+
+  mpn_submul_1 (r7, r5, n3p1, 1300); /* can be negative */
+#if AORSMUL_FASTER_3AORSLSH
+  mpn_submul_1 (r7, r6, n3p1, 1052688); /* can be negative */
+#else
+  DO_mpn_sublsh_n (r7, r6, n3p1, 4, wsi); /* can be negative */
+  DO_mpn_sublsh_n (r7, r6, n3p1,12, wsi); /* can be negative */
+  DO_mpn_sublsh_n (r7, r6, n3p1,20, wsi); /* can be negative */
+#endif
+  mpn_divexact_by255x188513325(r7, r7, n3p1);
+
+  mpn_submul_1 (r5, r7, n3p1, 12567555); /* can be negative */
+  /* A division by 2835x64 follows. Warning: the operand can be negative! */
+  mpn_divexact_by2835x64(r5, r5, n3p1);
+  if ((r5[n3] & (GMP_NUMB_MAX << (GMP_NUMB_BITS-7))) != 0)
+    r5[n3] |= (GMP_NUMB_MAX << (GMP_NUMB_BITS-6));
+
+#if AORSMUL_FASTER_AORS_AORSLSH
+  mpn_submul_1 (r6, r7, n3p1, 4095); /* can be negative */
+#else
+  mpn_add_n (r6, r6, r7, n3p1); /* can give a carry */
+  DO_mpn_sublsh_n (r6, r7, n3p1, 12, wsi); /* can be negative */
+#endif
+#if AORSMUL_FASTER_2AORSLSH
+  mpn_addmul_1 (r6, r5, n3p1, 240); /* can be negative */
+#else
+  DO_mpn_addlsh_n (r6, r5, n3p1, 8, wsi); /* can give a carry */
+  DO_mpn_sublsh_n (r6, r5, n3p1, 4, wsi); /* can be negative */
+#endif
+  /* A division by 255x4 follows. Warning: the operand can be negative! */
+  mpn_divexact_by255x4(r6, r6, n3p1);
+  if ((r6[n3] & (GMP_NUMB_MAX << (GMP_NUMB_BITS-3))) != 0)
+    r6[n3] |= (GMP_NUMB_MAX << (GMP_NUMB_BITS-2));
+
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r3, r4, n3p1, 7, wsi));
+
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r2, r4, n3p1, 13, wsi));
+  ASSERT_NOCARRY(mpn_submul_1 (r2, r3, n3p1, 400));
+
+  /* If GMP_NUMB_BITS < 42 next operations on r1 can give a carry!*/
+  DO_mpn_sublsh_n (r1, r4, n3p1, 19, wsi);
+  mpn_submul_1 (r1, r2, n3p1, 1428);
+  mpn_submul_1 (r1, r3, n3p1, 112896);
+  mpn_divexact_by255x182712915(r1, r1, n3p1);
+
+  ASSERT_NOCARRY(mpn_submul_1 (r2, r1, n3p1, 15181425));
+  mpn_divexact_by42525x16(r2, r2, n3p1);
+
+#if AORSMUL_FASTER_AORS_2AORSLSH
+  ASSERT_NOCARRY(mpn_submul_1 (r3, r1, n3p1, 3969));
+#else
+  ASSERT_NOCARRY(mpn_sub_n (r3, r3, r1, n3p1));
+  ASSERT_NOCARRY(DO_mpn_addlsh_n (r3, r1, n3p1, 7, wsi));
+  ASSERT_NOCARRY(DO_mpn_sublsh_n (r3, r1, n3p1, 12, wsi));
+#endif
+  ASSERT_NOCARRY(mpn_submul_1 (r3, r2, n3p1, 900));
+  mpn_divexact_by9x16(r3, r3, n3p1);
+
+  ASSERT_NOCARRY(mpn_sub_n (r4, r4, r1, n3p1));
+  ASSERT_NOCARRY(mpn_sub_n (r4, r4, r3, n3p1));
+  ASSERT_NOCARRY(mpn_sub_n (r4, r4, r2, n3p1));
+
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+  mpn_rsh1add_n (r6, r2, r6, n3p1);
+  r6 [n3p1 - 1] &= GMP_NUMB_MASK >> 1;
+#else
+  mpn_add_n (r6, r2, r6, n3p1);
+  ASSERT_NOCARRY(mpn_rshift(r6, r6, n3p1, 1));
+#endif
+  ASSERT_NOCARRY(mpn_sub_n (r2, r2, r6, n3p1));
+
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+  mpn_rsh1sub_n (r5, r3, r5, n3p1);
+  r5 [n3p1 - 1] &= GMP_NUMB_MASK >> 1;
+#else
+  mpn_sub_n (r5, r3, r5, n3p1);
+  ASSERT_NOCARRY(mpn_rshift(r5, r5, n3p1, 1));
+#endif
+  ASSERT_NOCARRY(mpn_sub_n (r3, r3, r5, n3p1));
+
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+  mpn_rsh1add_n (r7, r1, r7, n3p1);
+  r7 [n3p1 - 1] &= GMP_NUMB_MASK >> 1;
+#else
+  mpn_add_n (r7, r1, r7, n3p1);
+  ASSERT_NOCARRY(mpn_rshift(r7, r7, n3p1, 1));
+#endif
+  ASSERT_NOCARRY(mpn_sub_n (r1, r1, r7, n3p1));
+
+  /* last interpolation steps... */
+  /* ... could be mixed with recomposition
+	||H-r7|M-r7|L-r7|   ||H-r5|M-r5|L-r5|
+  */
+
+  /***************************** recomposition *******************************/
+  /*
+    pp[] prior to operations:
+    |M r0|L r0|___||H r2|M r2|L r2|___||H r4|M r4|L r4|___||H r6|M r6|L r6|____|H_r8|L r8|pp
+
+    summation scheme for remaining operations:
+    |__16|n_15|n_14|n_13|n_12|n_11|n_10|n__9|n__8|n__7|n__6|n__5|n__4|n__3|n__2|n___|n___|pp
+    |M r0|L r0|___||H r2|M r2|L r2|___||H r4|M r4|L r4|___||H r6|M r6|L r6|____|H_r8|L r8|pp
+	||H r1|M r1|L r1|   ||H r3|M r3|L r3|   ||H_r5|M_r5|L_r5|   ||H r7|M r7|L r7|
+  */
+
+  cy = mpn_add_n (pp + n, pp + n, r7, n);
+  cy = mpn_add_1 (pp + 2 * n, r7 + n, n, cy);
+#if HAVE_NATIVE_mpn_add_nc
+  cy = r7[n3] + mpn_add_nc(pp + n3, pp + n3, r7 + 2 * n, n, cy);
+#else
+  MPN_INCR_U (r7 + 2 * n, n + 1, cy);
+  cy = r7[n3] + mpn_add_n (pp + n3, pp + n3, r7 + 2 * n, n);
+#endif
+  MPN_INCR_U (pp + 4 * n, 2 * n + 1, cy);
+
+  pp[2 * n3]+= mpn_add_n (pp + 5 * n, pp + 5 * n, r5, n);
+  cy = mpn_add_1 (pp + 2 * n3, r5 + n, n, pp[2 * n3]);
+#if HAVE_NATIVE_mpn_add_nc
+  cy = r5[n3] + mpn_add_nc(pp + 7 * n, pp + 7 * n, r5 + 2 * n, n, cy);
+#else
+  MPN_INCR_U (r5 + 2 * n, n + 1, cy);
+  cy = r5[n3] + mpn_add_n (pp + 7 * n, pp + 7 * n, r5 + 2 * n, n);
+#endif
+  MPN_INCR_U (pp + 8 * n, 2 * n + 1, cy);
+
+  pp[10 * n]+= mpn_add_n (pp + 9 * n, pp + 9 * n, r3, n);
+  cy = mpn_add_1 (pp + 10 * n, r3 + n, n, pp[10 * n]);
+#if HAVE_NATIVE_mpn_add_nc
+  cy = r3[n3] + mpn_add_nc(pp +11 * n, pp +11 * n, r3 + 2 * n, n, cy);
+#else
+  MPN_INCR_U (r3 + 2 * n, n + 1, cy);
+  cy = r3[n3] + mpn_add_n (pp +11 * n, pp +11 * n, r3 + 2 * n, n);
+#endif
+  MPN_INCR_U (pp +12 * n, 2 * n + 1, cy);
+
+  pp[14 * n]+=mpn_add_n (pp +13 * n, pp +13 * n, r1, n);
+  if ( half ) {
+    cy = mpn_add_1 (pp + 14 * n, r1 + n, n, pp[14 * n]);
+#if HAVE_NATIVE_mpn_add_nc
+    if(LIKELY(spt > n)) {
+      cy = r1[n3] + mpn_add_nc(pp + 15 * n, pp + 15 * n, r1 + 2 * n, n, cy);
+      MPN_INCR_U (pp + 16 * n, spt - n, cy);
+    } else {
+      ASSERT_NOCARRY(mpn_add_nc(pp + 15 * n, pp + 15 * n, r1 + 2 * n, spt, cy));
+    }
+#else
+    MPN_INCR_U (r1 + 2 * n, n + 1, cy);
+    if(LIKELY(spt > n)) {
+      cy = r1[n3] + mpn_add_n (pp + 15 * n, pp + 15 * n, r1 + 2 * n, n);
+      MPN_INCR_U (pp + 16 * n, spt - n, cy);
+    } else {
+      ASSERT_NOCARRY(mpn_add_n (pp + 15 * n, pp + 15 * n, r1 + 2 * n, spt));
+    }
+#endif
+  } else {
+    ASSERT_NOCARRY(mpn_add_1 (pp + 14 * n, r1 + n, spt, pp[14 * n]));
+  }
+
+#undef   r0
+#undef   r2
+#undef   r4
+#undef   r6
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_5pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_5pts.c
deleted file mode 120000
index 76bc0d13b..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_5pts.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_interpolate_5pts.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_5pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_5pts.c
new file mode 100644
index 000000000..466ab8531
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_5pts.c
@@ -0,0 +1,198 @@
+/* mpn_toom_interpolate_5pts -- Interpolate for toom3, 33, 42.
+
+   Contributed to the GNU project by Robert Harley.
+   Improvements by Paul Zimmermann and Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2000-2003, 2005-2007, 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+void
+mpn_toom_interpolate_5pts (mp_ptr c, mp_ptr v2, mp_ptr vm1,
+			   mp_size_t k, mp_size_t twor, int sa,
+			   mp_limb_t vinf0)
+{
+  mp_limb_t cy, saved;
+  mp_size_t twok;
+  mp_size_t kk1;
+  mp_ptr c1, v1, c3, vinf;
+
+  twok = k + k;
+  kk1 = twok + 1;
+
+  c1 = c  + k;
+  v1 = c1 + k;
+  c3 = v1 + k;
+  vinf = c3 + k;
+
+#define v0 (c)
+  /* (1) v2 <- v2-vm1 < v2+|vm1|,       (16 8 4 2 1) - (1 -1 1 -1  1) =
+     thus 0 <= v2 < 50*B^(2k) < 2^6*B^(2k)             (15 9 3  3  0)
+  */
+  if (sa)
+    ASSERT_NOCARRY (mpn_add_n (v2, v2, vm1, kk1));
+  else
+    ASSERT_NOCARRY (mpn_sub_n (v2, v2, vm1, kk1));
+
+  /* {c,2k} {c+2k,2k+1} {c+4k+1,2r-1} {t,2k+1} {t+2k+1,2k+1} {t+4k+2,2r}
+       v0       v1       hi(vinf)       |vm1|     v2-vm1      EMPTY */
+
+  ASSERT_NOCARRY (mpn_divexact_by3 (v2, v2, kk1));    /* v2 <- v2 / 3 */
+						      /* (5 3 1 1 0)*/
+
+  /* {c,2k} {c+2k,2k+1} {c+4k+1,2r-1} {t,2k+1} {t+2k+1,2k+1} {t+4k+2,2r}
+       v0       v1      hi(vinf)       |vm1|     (v2-vm1)/3    EMPTY */
+
+  /* (2) vm1 <- tm1 := (v1 - vm1) / 2  [(1 1 1 1 1) - (1 -1 1 -1 1)] / 2 =
+     tm1 >= 0                                         (0  1 0  1 0)
+     No carry comes out from {v1, kk1} +/- {vm1, kk1},
+     and the division by two is exact.
+     If (sa!=0) the sign of vm1 is negative */
+  if (sa)
+    {
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+      mpn_rsh1add_n (vm1, v1, vm1, kk1);
+#else
+      ASSERT_NOCARRY (mpn_add_n (vm1, v1, vm1, kk1));
+      ASSERT_NOCARRY (mpn_rshift (vm1, vm1, kk1, 1));
+#endif
+    }
+  else
+    {
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+      mpn_rsh1sub_n (vm1, v1, vm1, kk1);
+#else
+      ASSERT_NOCARRY (mpn_sub_n (vm1, v1, vm1, kk1));
+      ASSERT_NOCARRY (mpn_rshift (vm1, vm1, kk1, 1));
+#endif
+    }
+
+  /* {c,2k} {c+2k,2k+1} {c+4k+1,2r-1} {t,2k+1} {t+2k+1,2k+1} {t+4k+2,2r}
+       v0       v1        hi(vinf)       tm1     (v2-vm1)/3    EMPTY */
+
+  /* (3) v1 <- t1 := v1 - v0    (1 1 1 1 1) - (0 0 0 0 1) = (1 1 1 1 0)
+     t1 >= 0
+  */
+  vinf[0] -= mpn_sub_n (v1, v1, c, twok);
+
+  /* {c,2k} {c+2k,2k+1} {c+4k+1,2r-1} {t,2k+1} {t+2k+1,2k+1} {t+4k+2,2r}
+       v0     v1-v0        hi(vinf)       tm1     (v2-vm1)/3    EMPTY */
+
+  /* (4) v2 <- t2 := ((v2-vm1)/3-t1)/2 = (v2-vm1-3*t1)/6
+     t2 >= 0                  [(5 3 1 1 0) - (1 1 1 1 0)]/2 = (2 1 0 0 0)
+  */
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+  mpn_rsh1sub_n (v2, v2, v1, kk1);
+#else
+  ASSERT_NOCARRY (mpn_sub_n (v2, v2, v1, kk1));
+  ASSERT_NOCARRY (mpn_rshift (v2, v2, kk1, 1));
+#endif
+
+  /* {c,2k} {c+2k,2k+1} {c+4k+1,2r-1} {t,2k+1} {t+2k+1,2k+1} {t+4k+2,2r}
+       v0     v1-v0        hi(vinf)     tm1    (v2-vm1-3t1)/6    EMPTY */
+
+  /* (5) v1 <- t1-tm1           (1 1 1 1 0) - (0 1 0 1 0) = (1 0 1 0 0)
+     result is v1 >= 0
+  */
+  ASSERT_NOCARRY (mpn_sub_n (v1, v1, vm1, kk1));
+
+  /* We do not need to read the value in vm1, so we add it in {c+k, ...} */
+  cy = mpn_add_n (c1, c1, vm1, kk1);
+  MPN_INCR_U (c3 + 1, twor + k - 1, cy); /* 2n-(3k+1) = 2r+k-1 */
+  /* Memory allocated for vm1 is now free, it can be recycled ...*/
+
+  /* (6) v2 <- v2 - 2*vinf,     (2 1 0 0 0) - 2*(1 0 0 0 0) = (0 1 0 0 0)
+     result is v2 >= 0 */
+  saved = vinf[0];       /* Remember v1's highest byte (will be overwritten). */
+  vinf[0] = vinf0;       /* Set the right value for vinf0                     */
+#ifdef HAVE_NATIVE_mpn_sublsh1_n_ip1
+  cy = mpn_sublsh1_n_ip1 (v2, vinf, twor);
+#else
+  /* Overwrite unused vm1 */
+  cy = mpn_lshift (vm1, vinf, twor, 1);
+  cy += mpn_sub_n (v2, v2, vm1, twor);
+#endif
+  MPN_DECR_U (v2 + twor, kk1 - twor, cy);
+
+  /* Current matrix is
+     [1 0 0 0 0; vinf
+      0 1 0 0 0; v2
+      1 0 1 0 0; v1
+      0 1 0 1 0; vm1
+      0 0 0 0 1] v0
+     Some values already are in-place (we added vm1 in the correct position)
+     | vinf|  v1 |  v0 |
+	      | vm1 |
+     One still is in a separated area
+	| +v2 |
+     We have to compute v1-=vinf; vm1 -= v2,
+	   |-vinf|
+	      | -v2 |
+     Carefully reordering operations we can avoid to compute twice the sum
+     of the high half of v2 plus the low half of vinf.
+  */
+
+  /* Add the high half of t2 in {vinf} */
+  if ( LIKELY(twor > k + 1) ) { /* This is the expected flow  */
+    cy = mpn_add_n (vinf, vinf, v2 + k, k + 1);
+    MPN_INCR_U (c3 + kk1, twor - k - 1, cy); /* 2n-(5k+1) = 2r-k-1 */
+  } else { /* triggered only by very unbalanced cases like
+	      (k+k+(k-2))x(k+k+1) , should be handled by toom32 */
+    ASSERT_NOCARRY (mpn_add_n (vinf, vinf, v2 + k, twor));
+  }
+  /* (7) v1 <- v1 - vinf,       (1 0 1 0 0) - (1 0 0 0 0) = (0 0 1 0 0)
+     result is >= 0 */
+  /* Side effect: we also subtracted (high half) vm1 -= v2 */
+  cy = mpn_sub_n (v1, v1, vinf, twor);          /* vinf is at most twor long.  */
+  vinf0 = vinf[0];                     /* Save again the right value for vinf0 */
+  vinf[0] = saved;
+  MPN_DECR_U (v1 + twor, kk1 - twor, cy);       /* Treat the last bytes.       */
+
+  /* (8) vm1 <- vm1-v2          (0 1 0 1 0) - (0 1 0 0 0) = (0 0 0 1 0)
+     Operate only on the low half.
+  */
+  cy = mpn_sub_n (c1, c1, v2, k);
+  MPN_DECR_U (v1, kk1, cy);
+
+  /********************* Beginning the final phase **********************/
+
+  /* Most of the recomposition was done */
+
+  /* add t2 in {c+3k, ...}, but only the low half */
+  cy = mpn_add_n (c3, c3, v2, k);
+  vinf[0] += cy;
+  ASSERT(vinf[0] >= cy); /* No carry */
+  MPN_INCR_U (vinf, twor, vinf0); /* Add vinf0, propagate carry. */
+
+#undef v0
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_6pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_6pts.c
deleted file mode 120000
index cf8c87773..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_6pts.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_interpolate_6pts.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_6pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_6pts.c
new file mode 100644
index 000000000..eb2366130
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_6pts.c
@@ -0,0 +1,241 @@
+/* mpn_toom_interpolate_6pts -- Interpolate for toom43, 52
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#define BINVERT_3 MODLIMB_INVERSE_3
+
+/* For odd divisors, mpn_divexact_1 works fine with two's complement. */
+#ifndef mpn_divexact_by3
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by3(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,3,BINVERT_3,0)
+#else
+#define mpn_divexact_by3(dst,src,size) mpn_divexact_1(dst,src,size,3)
+#endif
+#endif
+
+/* Interpolation for Toom-3.5, using the evaluation points: infinity,
+   1, -1, 2, -2. More precisely, we want to compute
+   f(2^(GMP_NUMB_BITS * n)) for a polynomial f of degree 5, given the
+   six values
+
+     w5 = f(0),
+     w4 = f(-1),
+     w3 = f(1)
+     w2 = f(-2),
+     w1 = f(2),
+     w0 = limit at infinity of f(x) / x^5,
+
+   The result is stored in {pp, 5*n + w0n}. At entry, w5 is stored at
+   {pp, 2n}, w3 is stored at {pp + 2n, 2n+1}, and w0 is stored at
+   {pp + 5n, w0n}. The other values are 2n + 1 limbs each (with most
+   significant limbs small). f(-1) and f(-2) may be negative, signs
+   determined by the flag bits. All intermediate results are positive.
+   Inputs are destroyed.
+
+   Interpolation sequence was taken from the paper: "Integer and
+   Polynomial Multiplication: Towards Optimal Toom-Cook Matrices".
+   Some slight variations were introduced: adaptation to "gmp
+   instruction set", and a final saving of an operation by interlacing
+   interpolation and recomposition phases.
+*/
+
+void
+mpn_toom_interpolate_6pts (mp_ptr pp, mp_size_t n, enum toom6_flags flags,
+			   mp_ptr w4, mp_ptr w2, mp_ptr w1,
+			   mp_size_t w0n)
+{
+  mp_limb_t cy;
+  /* cy6 can be stored in w1[2*n], cy4 in w4[0], embankment in w2[0] */
+  mp_limb_t cy4, cy6, embankment;
+
+  ASSERT( n > 0 );
+  ASSERT( 2*n >= w0n && w0n > 0 );
+
+#define w5  pp					/* 2n   */
+#define w3  (pp + 2 * n)			/* 2n+1 */
+#define w0  (pp + 5 * n)			/* w0n  */
+
+  /* Interpolate with sequence:
+     W2 =(W1 - W2)>>2
+     W1 =(W1 - W5)>>1
+     W1 =(W1 - W2)>>1
+     W4 =(W3 - W4)>>1
+     W2 =(W2 - W4)/3
+     W3 = W3 - W4 - W5
+     W1 =(W1 - W3)/3
+     // Last steps are mixed with recomposition...
+     W2 = W2 - W0<<2
+     W4 = W4 - W2
+     W3 = W3 - W1
+     W2 = W2 - W0
+  */
+
+  /* W2 =(W1 - W2)>>2 */
+  if (flags & toom6_vm2_neg)
+    mpn_add_n (w2, w1, w2, 2 * n + 1);
+  else
+    mpn_sub_n (w2, w1, w2, 2 * n + 1);
+  mpn_rshift (w2, w2, 2 * n + 1, 2);
+
+  /* W1 =(W1 - W5)>>1 */
+  w1[2*n] -= mpn_sub_n (w1, w1, w5, 2*n);
+  mpn_rshift (w1, w1, 2 * n + 1, 1);
+
+  /* W1 =(W1 - W2)>>1 */
+#if HAVE_NATIVE_mpn_rsh1sub_n
+  mpn_rsh1sub_n (w1, w1, w2, 2 * n + 1);
+#else
+  mpn_sub_n (w1, w1, w2, 2 * n + 1);
+  mpn_rshift (w1, w1, 2 * n + 1, 1);
+#endif
+
+  /* W4 =(W3 - W4)>>1 */
+  if (flags & toom6_vm1_neg)
+    {
+#if HAVE_NATIVE_mpn_rsh1add_n
+      mpn_rsh1add_n (w4, w3, w4, 2 * n + 1);
+#else
+      mpn_add_n (w4, w3, w4, 2 * n + 1);
+      mpn_rshift (w4, w4, 2 * n + 1, 1);
+#endif
+    }
+  else
+    {
+#if HAVE_NATIVE_mpn_rsh1sub_n
+      mpn_rsh1sub_n (w4, w3, w4, 2 * n + 1);
+#else
+      mpn_sub_n (w4, w3, w4, 2 * n + 1);
+      mpn_rshift (w4, w4, 2 * n + 1, 1);
+#endif
+    }
+
+  /* W2 =(W2 - W4)/3 */
+  mpn_sub_n (w2, w2, w4, 2 * n + 1);
+  mpn_divexact_by3 (w2, w2, 2 * n + 1);
+
+  /* W3 = W3 - W4 - W5 */
+  mpn_sub_n (w3, w3, w4, 2 * n + 1);
+  w3[2 * n] -= mpn_sub_n (w3, w3, w5, 2 * n);
+
+  /* W1 =(W1 - W3)/3 */
+  mpn_sub_n (w1, w1, w3, 2 * n + 1);
+  mpn_divexact_by3 (w1, w1, 2 * n + 1);
+
+  /*
+    [1 0 0 0 0 0;
+     0 1 0 0 0 0;
+     1 0 1 0 0 0;
+     0 1 0 1 0 0;
+     1 0 1 0 1 0;
+     0 0 0 0 0 1]
+
+    pp[] prior to operations:
+     |_H w0__|_L w0__|______||_H w3__|_L w3__|_H w5__|_L w5__|
+
+    summation scheme for remaining operations:
+     |______________5|n_____4|n_____3|n_____2|n______|n______|pp
+     |_H w0__|_L w0__|______||_H w3__|_L w3__|_H w5__|_L w5__|
+				    || H w4  | L w4  |
+		    || H w2  | L w2  |
+	    || H w1  | L w1  |
+			    ||-H w1  |-L w1  |
+		     |-H w0  |-L w0 ||-H w2  |-L w2  |
+  */
+  cy = mpn_add_n (pp + n, pp + n, w4, 2 * n + 1);
+  MPN_INCR_U (pp + 3 * n + 1, n, cy);
+
+  /* W2 -= W0<<2 */
+#if HAVE_NATIVE_mpn_sublsh_n || HAVE_NATIVE_mpn_sublsh2_n_ip1
+#if HAVE_NATIVE_mpn_sublsh2_n_ip1
+  cy = mpn_sublsh2_n_ip1 (w2, w0, w0n);
+#else
+  cy = mpn_sublsh_n (w2, w2, w0, w0n, 2);
+#endif
+#else
+  /* {W4,2*n+1} is now free and can be overwritten. */
+  cy = mpn_lshift(w4, w0, w0n, 2);
+  cy+= mpn_sub_n(w2, w2, w4, w0n);
+#endif
+  MPN_DECR_U (w2 + w0n, 2 * n + 1 - w0n, cy);
+
+  /* W4L = W4L - W2L */
+  cy = mpn_sub_n (pp + n, pp + n, w2, n);
+  MPN_DECR_U (w3, 2 * n + 1, cy);
+
+  /* W3H = W3H + W2L */
+  cy4 = w3[2 * n] + mpn_add_n (pp + 3 * n, pp + 3 * n, w2, n);
+  /* W1L + W2H */
+  cy = w2[2 * n] + mpn_add_n (pp + 4 * n, w1, w2 + n, n);
+  MPN_INCR_U (w1 + n, n + 1, cy);
+
+  /* W0 = W0 + W1H */
+  if (LIKELY (w0n > n))
+    cy6 = w1[2 * n] + mpn_add_n (w0, w0, w1 + n, n);
+  else
+    cy6 = mpn_add_n (w0, w0, w1 + n, w0n);
+
+  /*
+    summation scheme for the next operation:
+     |...____5|n_____4|n_____3|n_____2|n______|n______|pp
+     |...w0___|_w1_w2_|_H w3__|_L w3__|_H w5__|_L w5__|
+		     ...-w0___|-w1_w2 |
+  */
+  /* if(LIKELY(w0n>n)) the two operands below DO overlap! */
+  cy = mpn_sub_n (pp + 2 * n, pp + 2 * n, pp + 4 * n, n + w0n);
+
+  /* embankment is a "dirty trick" to avoid carry/borrow propagation
+     beyond allocated memory */
+  embankment = w0[w0n - 1] - 1;
+  w0[w0n - 1] = 1;
+  if (LIKELY (w0n > n)) {
+    if (cy4 > cy6)
+      MPN_INCR_U (pp + 4 * n, w0n + n, cy4 - cy6);
+    else
+      MPN_DECR_U (pp + 4 * n, w0n + n, cy6 - cy4);
+    MPN_DECR_U (pp + 3 * n + w0n, 2 * n, cy);
+    MPN_INCR_U (w0 + n, w0n - n, cy6);
+  } else {
+    MPN_INCR_U (pp + 4 * n, w0n + n, cy4);
+    MPN_DECR_U (pp + 3 * n + w0n, 2 * n, cy + cy6);
+  }
+  w0[w0n - 1] += embankment;
+
+#undef w5
+#undef w3
+#undef w0
+
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_7pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_7pts.c
deleted file mode 120000
index c75a4737e..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_7pts.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_interpolate_7pts.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_7pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_7pts.c
new file mode 100644
index 000000000..167c45be8
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_7pts.c
@@ -0,0 +1,274 @@
+/* mpn_toom_interpolate_7pts -- Interpolate for toom44, 53, 62.
+
+   Contributed to the GNU project by Niels Möller.
+   Improvements by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2006, 2007, 2009, 2014, 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#define BINVERT_3 MODLIMB_INVERSE_3
+
+#define BINVERT_9 \
+  ((((GMP_NUMB_MAX / 9) << (6 - GMP_NUMB_BITS % 6)) * 8 & GMP_NUMB_MAX) | 0x39)
+
+#define BINVERT_15 \
+  ((((GMP_NUMB_MAX >> (GMP_NUMB_BITS % 4)) / 15) * 14 * 16 & GMP_NUMB_MAX) + 15)
+
+/* For the various mpn_divexact_byN here, fall back to using either
+   mpn_pi1_bdiv_q_1 or mpn_divexact_1.  The former has less overhead and is
+   many faster if it is native.  For now, since mpn_divexact_1 is native on
+   several platforms where mpn_pi1_bdiv_q_1 does not yet exist, do not use
+   mpn_pi1_bdiv_q_1 unconditionally.  FIXME.  */
+
+/* For odd divisors, mpn_divexact_1 works fine with two's complement. */
+#ifndef mpn_divexact_by3
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by3(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,3,BINVERT_3,0)
+#else
+#define mpn_divexact_by3(dst,src,size) mpn_divexact_1(dst,src,size,3)
+#endif
+#endif
+
+#ifndef mpn_divexact_by9
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by9(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,9,BINVERT_9,0)
+#else
+#define mpn_divexact_by9(dst,src,size) mpn_divexact_1(dst,src,size,9)
+#endif
+#endif
+
+#ifndef mpn_divexact_by15
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by15(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,15,BINVERT_15,0)
+#else
+#define mpn_divexact_by15(dst,src,size) mpn_divexact_1(dst,src,size,15)
+#endif
+#endif
+
+/* Interpolation for toom4, using the evaluation points 0, infinity,
+   1, -1, 2, -2, 1/2. More precisely, we want to compute
+   f(2^(GMP_NUMB_BITS * n)) for a polynomial f of degree 6, given the
+   seven values
+
+     w0 = f(0),
+     w1 = f(-2),
+     w2 = f(1),
+     w3 = f(-1),
+     w4 = f(2)
+     w5 = 64 * f(1/2)
+     w6 = limit at infinity of f(x) / x^6,
+
+   The result is 6*n + w6n limbs. At entry, w0 is stored at {rp, 2n },
+   w2 is stored at { rp + 2n, 2n+1 }, and w6 is stored at { rp + 6n,
+   w6n }. The other values are 2n + 1 limbs each (with most
+   significant limbs small). f(-1) and f(-1/2) may be negative, signs
+   determined by the flag bits. Inputs are destroyed.
+
+   Needs (2*n + 1) limbs of temporary storage.
+*/
+
+void
+mpn_toom_interpolate_7pts (mp_ptr rp, mp_size_t n, enum toom7_flags flags,
+			   mp_ptr w1, mp_ptr w3, mp_ptr w4, mp_ptr w5,
+			   mp_size_t w6n, mp_ptr tp)
+{
+  mp_size_t m;
+  mp_limb_t cy;
+
+  m = 2*n + 1;
+#define w0 rp
+#define w2 (rp + 2*n)
+#define w6 (rp + 6*n)
+
+  ASSERT (w6n > 0);
+  ASSERT (w6n <= 2*n);
+
+  /* Using formulas similar to Marco Bodrato's
+
+     W5 = W5 + W4
+     W1 =(W4 - W1)/2
+     W4 = W4 - W0
+     W4 =(W4 - W1)/4 - W6*16
+     W3 =(W2 - W3)/2
+     W2 = W2 - W3
+
+     W5 = W5 - W2*65      May be negative.
+     W2 = W2 - W6 - W0
+     W5 =(W5 + W2*45)/2   Now >= 0 again.
+     W4 =(W4 - W2)/3
+     W2 = W2 - W4
+
+     W1 = W5 - W1         May be negative.
+     W5 =(W5 - W3*8)/9
+     W3 = W3 - W5
+     W1 =(W1/15 + W5)/2   Now >= 0 again.
+     W5 = W5 - W1
+
+     where W0 = f(0), W1 = f(-2), W2 = f(1), W3 = f(-1),
+	   W4 = f(2), W5 = f(1/2), W6 = f(oo),
+
+     Note that most intermediate results are positive; the ones that
+     may be negative are represented in two's complement. We must
+     never shift right a value that may be negative, since that would
+     invalidate the sign bit. On the other hand, divexact by odd
+     numbers work fine with two's complement.
+  */
+
+  mpn_add_n (w5, w5, w4, m);
+  if (flags & toom7_w1_neg)
+    {
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+      mpn_rsh1add_n (w1, w1, w4, m);
+#else
+      mpn_add_n (w1, w1, w4, m);  ASSERT (!(w1[0] & 1));
+      mpn_rshift (w1, w1, m, 1);
+#endif
+    }
+  else
+    {
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+      mpn_rsh1sub_n (w1, w4, w1, m);
+#else
+      mpn_sub_n (w1, w4, w1, m);  ASSERT (!(w1[0] & 1));
+      mpn_rshift (w1, w1, m, 1);
+#endif
+    }
+  mpn_sub (w4, w4, m, w0, 2*n);
+  mpn_sub_n (w4, w4, w1, m);  ASSERT (!(w4[0] & 3));
+  mpn_rshift (w4, w4, m, 2); /* w4>=0 */
+
+  tp[w6n] = mpn_lshift (tp, w6, w6n, 4);
+  mpn_sub (w4, w4, m, tp, w6n+1);
+
+  if (flags & toom7_w3_neg)
+    {
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+      mpn_rsh1add_n (w3, w3, w2, m);
+#else
+      mpn_add_n (w3, w3, w2, m);  ASSERT (!(w3[0] & 1));
+      mpn_rshift (w3, w3, m, 1);
+#endif
+    }
+  else
+    {
+#ifdef HAVE_NATIVE_mpn_rsh1sub_n
+      mpn_rsh1sub_n (w3, w2, w3, m);
+#else
+      mpn_sub_n (w3, w2, w3, m);  ASSERT (!(w3[0] & 1));
+      mpn_rshift (w3, w3, m, 1);
+#endif
+    }
+
+  mpn_sub_n (w2, w2, w3, m);
+
+  mpn_submul_1 (w5, w2, m, 65);
+  mpn_sub (w2, w2, m, w6, w6n);
+  mpn_sub (w2, w2, m, w0, 2*n);
+
+  mpn_addmul_1 (w5, w2, m, 45);  ASSERT (!(w5[0] & 1));
+  mpn_rshift (w5, w5, m, 1);
+  mpn_sub_n (w4, w4, w2, m);
+
+  mpn_divexact_by3 (w4, w4, m);
+  mpn_sub_n (w2, w2, w4, m);
+
+  mpn_sub_n (w1, w5, w1, m);
+  mpn_lshift (tp, w3, m, 3);
+  mpn_sub_n (w5, w5, tp, m);
+  mpn_divexact_by9 (w5, w5, m);
+  mpn_sub_n (w3, w3, w5, m);
+
+  mpn_divexact_by15 (w1, w1, m);
+#ifdef HAVE_NATIVE_mpn_rsh1add_n
+  mpn_rsh1add_n (w1, w1, w5, m);
+  w1[m - 1] &= GMP_NUMB_MASK >> 1;
+#else
+  mpn_add_n (w1, w1, w5, m);  ASSERT (!(w1[0] & 1));
+  mpn_rshift (w1, w1, m, 1); /* w1>=0 now */
+#endif
+
+  mpn_sub_n (w5, w5, w1, m);
+
+  /* These bounds are valid for the 4x4 polynomial product of toom44,
+   * and they are conservative for toom53 and toom62. */
+  ASSERT (w1[2*n] < 2);
+  ASSERT (w2[2*n] < 3);
+  ASSERT (w3[2*n] < 4);
+  ASSERT (w4[2*n] < 3);
+  ASSERT (w5[2*n] < 2);
+
+  /* Addition chain. Note carries and the 2n'th limbs that need to be
+   * added in.
+   *
+   * Special care is needed for w2[2n] and the corresponding carry,
+   * since the "simple" way of adding it all together would overwrite
+   * the limb at wp[2*n] and rp[4*n] (same location) with the sum of
+   * the high half of w3 and the low half of w4.
+   *
+   *         7    6    5    4    3    2    1    0
+   *    |    |    |    |    |    |    |    |    |
+   *                  ||w3 (2n+1)|
+   *             ||w4 (2n+1)|
+   *        ||w5 (2n+1)|        ||w1 (2n+1)|
+   *  + | w6 (w6n)|        ||w2 (2n+1)| w0 (2n) |  (share storage with r)
+   *  -----------------------------------------------
+   *  r |    |    |    |    |    |    |    |    |
+   *        c7   c6   c5   c4   c3                 Carries to propagate
+   */
+
+  cy = mpn_add_n (rp + n, rp + n, w1, m);
+  MPN_INCR_U (w2 + n + 1, n , cy);
+  cy = mpn_add_n (rp + 3*n, rp + 3*n, w3, n);
+  MPN_INCR_U (w3 + n, n + 1, w2[2*n] + cy);
+  cy = mpn_add_n (rp + 4*n, w3 + n, w4, n);
+  MPN_INCR_U (w4 + n, n + 1, w3[2*n] + cy);
+  cy = mpn_add_n (rp + 5*n, w4 + n, w5, n);
+  MPN_INCR_U (w5 + n, n + 1, w4[2*n] + cy);
+  if (w6n > n + 1)
+    {
+      cy = mpn_add_n (rp + 6*n, rp + 6*n, w5 + n, n + 1);
+      MPN_INCR_U (rp + 7*n + 1, w6n - n - 1, cy);
+    }
+  else
+    {
+      ASSERT_NOCARRY (mpn_add_n (rp + 6*n, rp + 6*n, w5 + n, w6n));
+#if WANT_ASSERT
+      {
+	mp_size_t i;
+	for (i = w6n; i <= n; i++)
+	  ASSERT (w5[n + i] == 0);
+      }
+#endif
+    }
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_8pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_8pts.c
deleted file mode 120000
index f23185bb5..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_8pts.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/toom_interpolate_8pts.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_8pts.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_8pts.c
new file mode 100644
index 000000000..5e65fab77
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/toom_interpolate_8pts.c
@@ -0,0 +1,211 @@
+/* mpn_toom_interpolate_8pts -- Interpolate for toom54, 63, 72.
+
+   Contributed to the GNU project by Marco Bodrato.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2011, 2012 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#define BINVERT_3 MODLIMB_INVERSE_3
+
+#define BINVERT_15 \
+  ((((GMP_NUMB_MAX >> (GMP_NUMB_BITS % 4)) / 15) * 14 * 16 & GMP_NUMB_MAX) + 15)
+
+#define BINVERT_45 ((BINVERT_15 * BINVERT_3) & GMP_NUMB_MASK)
+
+#ifndef mpn_divexact_by3
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by3(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,3,BINVERT_3,0)
+#else
+#define mpn_divexact_by3(dst,src,size) mpn_divexact_1(dst,src,size,3)
+#endif
+#endif
+
+#ifndef mpn_divexact_by45
+#if GMP_NUMB_BITS % 12 == 0
+#define mpn_divexact_by45(dst,src,size) \
+  (63 & 19 * mpn_bdiv_dbm1 (dst, src, size, __GMP_CAST (mp_limb_t, GMP_NUMB_MASK / 45)))
+#else
+#if HAVE_NATIVE_mpn_pi1_bdiv_q_1
+#define mpn_divexact_by45(dst,src,size) mpn_pi1_bdiv_q_1(dst,src,size,45,BINVERT_45,0)
+#else
+#define mpn_divexact_by45(dst,src,size) mpn_divexact_1(dst,src,size,45)
+#endif
+#endif
+#endif
+
+#if HAVE_NATIVE_mpn_sublsh2_n_ip1
+#define DO_mpn_sublsh2_n(dst,src,n,ws) mpn_sublsh2_n_ip1(dst,src,n)
+#else
+#define DO_mpn_sublsh2_n(dst,src,n,ws) DO_mpn_sublsh_n(dst,src,n,2,ws)
+#endif
+
+#if HAVE_NATIVE_mpn_sublsh_n
+#define DO_mpn_sublsh_n(dst,src,n,s,ws) mpn_sublsh_n (dst,dst,src,n,s)
+#else
+static mp_limb_t
+DO_mpn_sublsh_n (mp_ptr dst, mp_srcptr src, mp_size_t n, unsigned int s, mp_ptr ws)
+{
+#if USE_MUL_1 && 0
+  return mpn_submul_1(dst,src,n,CNST_LIMB(1) <<(s));
+#else
+  mp_limb_t __cy;
+  __cy = mpn_lshift (ws,src,n,s);
+  return __cy + mpn_sub_n (dst,dst,ws,n);
+#endif
+}
+#endif
+
+
+#if HAVE_NATIVE_mpn_subrsh
+#define DO_mpn_subrsh(dst,nd,src,ns,s,ws) mpn_subrsh (dst,nd,src,ns,s)
+#else
+/* This is not a correct definition, it assumes no carry */
+#define DO_mpn_subrsh(dst,nd,src,ns,s,ws)				\
+do {									\
+  mp_limb_t __cy;							\
+  MPN_DECR_U (dst, nd, src[0] >> s);					\
+  __cy = DO_mpn_sublsh_n (dst, src + 1, ns - 1, GMP_NUMB_BITS - s, ws);	\
+  MPN_DECR_U (dst + ns - 1, nd - ns + 1, __cy);				\
+} while (0)
+#endif
+
+/* Interpolation for Toom-4.5 (or Toom-4), using the evaluation
+   points: infinity(4.5 only), 4, -4, 2, -2, 1, -1, 0. More precisely,
+   we want to compute f(2^(GMP_NUMB_BITS * n)) for a polynomial f of
+   degree 7 (or 6), given the 8 (rsp. 7) values:
+
+     r1 = limit at infinity of f(x) / x^7,
+     r2 = f(4),
+     r3 = f(-4),
+     r4 = f(2),
+     r5 = f(-2),
+     r6 = f(1),
+     r7 = f(-1),
+     r8 = f(0).
+
+   All couples of the form f(n),f(-n) must be already mixed with
+   toom_couple_handling(f(n),...,f(-n),...)
+
+   The result is stored in {pp, spt + 7*n (or 6*n)}.
+   At entry, r8 is stored at {pp, 2n},
+   r5 is stored at {pp + 3n, 3n + 1}.
+
+   The other values are 2n+... limbs each (with most significant limbs small).
+
+   All intermediate results are positive.
+   Inputs are destroyed.
+*/
+
+void
+mpn_toom_interpolate_8pts (mp_ptr pp, mp_size_t n,
+			   mp_ptr r3, mp_ptr r7,
+			   mp_size_t spt, mp_ptr ws)
+{
+  mp_limb_signed_t cy;
+  mp_ptr r5, r1;
+  r5 = (pp + 3 * n);			/* 3n+1 */
+  r1 = (pp + 7 * n);			/* spt */
+
+  /******************************* interpolation *****************************/
+
+  DO_mpn_subrsh(r3+n, 2 * n + 1, pp, 2 * n, 4, ws);
+  cy = DO_mpn_sublsh_n (r3, r1, spt, 12, ws);
+  MPN_DECR_U (r3 + spt, 3 * n + 1 - spt, cy);
+
+  DO_mpn_subrsh(r5+n, 2 * n + 1, pp, 2 * n, 2, ws);
+  cy = DO_mpn_sublsh_n (r5, r1, spt, 6, ws);
+  MPN_DECR_U (r5 + spt, 3 * n + 1 - spt, cy);
+
+  r7[3*n] -= mpn_sub_n (r7+n, r7+n, pp, 2 * n);
+  cy = mpn_sub_n (r7, r7, r1, spt);
+  MPN_DECR_U (r7 + spt, 3 * n + 1 - spt, cy);
+
+  ASSERT_NOCARRY(mpn_sub_n (r3, r3, r5, 3 * n + 1));
+  ASSERT_NOCARRY(mpn_rshift(r3, r3, 3 * n + 1, 2));
+
+  ASSERT_NOCARRY(mpn_sub_n (r5, r5, r7, 3 * n + 1));
+
+  ASSERT_NOCARRY(mpn_sub_n (r3, r3, r5, 3 * n + 1));
+
+  mpn_divexact_by45 (r3, r3, 3 * n + 1);
+
+  ASSERT_NOCARRY(mpn_divexact_by3 (r5, r5, 3 * n + 1));
+
+  ASSERT_NOCARRY(DO_mpn_sublsh2_n (r5, r3, 3 * n + 1, ws));
+
+  /* last interpolation steps... */
+  /* ... are mixed with recomposition */
+
+  /***************************** recomposition *******************************/
+  /*
+    pp[] prior to operations:
+     |_H r1|_L r1|____||_H r5|_M_r5|_L r5|_____|_H r8|_L r8|pp
+
+    summation scheme for remaining operations:
+     |____8|n___7|n___6|n___5|n___4|n___3|n___2|n____|n____|pp
+     |_H r1|_L r1|____||_H*r5|_M r5|_L r5|_____|_H_r8|_L r8|pp
+	  ||_H r3|_M r3|_L*r3|
+				  ||_H_r7|_M_r7|_L_r7|
+		      ||-H r3|-M r3|-L*r3|
+				  ||-H*r5|-M_r5|-L_r5|
+  */
+
+  cy = mpn_add_n (pp + n, pp + n, r7, n); /* Hr8+Lr7-Lr5 */
+  cy-= mpn_sub_n (pp + n, pp + n, r5, n);
+  if (cy > 0) {
+    MPN_INCR_U (r7 + n, 2*n + 1, 1);
+    cy = 0;
+  }
+
+  cy = mpn_sub_nc (pp + 2*n, r7 + n, r5 + n, n, -cy); /* Mr7-Mr5 */
+  MPN_DECR_U (r7 + 2*n, n + 1, cy);
+
+  cy = mpn_add_n (pp + 3*n, r5, r7+ 2*n, n+1); /* Hr7+Lr5 */
+  r5[3*n]+= mpn_add_n (r5 + 2*n, r5 + 2*n, r3, n); /* Hr5+Lr3 */
+  cy-= mpn_sub_n (pp + 3*n, pp + 3*n, r5 + 2*n, n+1); /* Hr7-Hr5+Lr5-Lr3 */
+  if (UNLIKELY(0 > cy))
+    MPN_DECR_U (r5 + n + 1, 2*n, 1);
+  else
+    MPN_INCR_U (r5 + n + 1, 2*n, cy);
+
+  ASSERT_NOCARRY(mpn_sub_n(pp + 4*n, r5 + n, r3 + n, 2*n +1)); /* Mr5-Mr3,Hr5-Hr3 */
+
+  cy = mpn_add_1 (pp + 6*n, r3 + n, n, pp[6*n]);
+  MPN_INCR_U (r3 + 2*n, n + 1, cy);
+  cy = mpn_add_n (pp + 7*n, pp + 7*n, r3 + 2*n, n);
+  if (LIKELY(spt != n))
+    MPN_INCR_U (pp + 8*n, spt - n, cy + r3[3*n]);
+  else
+    ASSERT (r3[3*n] + cy == 0);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/trialdiv.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/trialdiv.c
deleted file mode 120000
index 169e53aac..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/trialdiv.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/trialdiv.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/trialdiv.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/trialdiv.c
new file mode 100644
index 000000000..65e089f7d
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/trialdiv.c
@@ -0,0 +1,131 @@
+/* mpn_trialdiv -- find small factors of an mpn number using trial division.
+
+   Contributed to the GNU project by Torbjorn Granlund.
+
+   THE FUNCTION IN THIS FILE IS INTERNAL WITH A MUTABLE INTERFACE.  IT IS ONLY
+   SAFE TO REACH IT THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+   GUARANTEED THAT IT WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
+
+Copyright 2009, 2010, 2012, 2013 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+/*
+   This function finds the first (smallest) factor represented in
+   trialdivtab.h.  It does not stop the factoring effort just because it has
+   reached some sensible limit, such as the square root of the input number.
+
+   The caller can limit the factoring effort by passing NPRIMES.  The function
+   will then divide until that limit, or perhaps a few primes more.  A position
+   which only mpn_trialdiv can make sense of is returned in the WHERE
+   parameter.  It can be used for restarting the factoring effort; the first
+   call should pass 0 here.
+
+   Input:        1. A non-negative number T = {tp,tn}
+                 2. NPRIMES as described above,
+                 3. *WHERE as described above.
+   Output:       1. *WHERE updated as described above.
+                 2. Return value is non-zero if we found a factor, else zero
+                    To get the actual prime factor, compute the mod B inverse
+                    of the return value.
+*/
+
+#include "gmp-impl.h"
+
+struct gmp_primes_dtab {
+  mp_limb_t binv;
+  mp_limb_t lim;
+};
+
+struct gmp_primes_ptab {
+  mp_limb_t ppp;	/* primes, multiplied together */
+  mp_limb_t cps[7];	/* ppp values pre-computed for mpn_mod_1s_4p */
+  gmp_uint_least32_t idx:24;	/* index of  first primes in dtab */
+  gmp_uint_least32_t np :8;	/* number of primes related to this entry */
+};
+
+
+static const struct gmp_primes_dtab gmp_primes_dtab[] =
+{
+#define WANT_dtab
+#define P(p,inv,lim) {inv,lim}
+#include "trialdivtab.h"
+#undef WANT_dtab
+#undef P
+  {0,0}
+};
+
+static const struct gmp_primes_ptab gmp_primes_ptab[] =
+{
+#define WANT_ptab
+#include "trialdivtab.h"
+#undef WANT_ptab
+};
+
+#define PTAB_LINES (sizeof (gmp_primes_ptab) / sizeof (gmp_primes_ptab[0]))
+
+/* FIXME: We could optimize out one of the outer loop conditions if we
+   had a final ptab entry with a huge np field.  */
+mp_limb_t
+mpn_trialdiv (mp_srcptr tp, mp_size_t tn, mp_size_t nprimes, int *where)
+{
+  mp_limb_t ppp;
+  const mp_limb_t *cps;
+  const struct gmp_primes_dtab *dp;
+  long i, j, idx, np;
+  mp_limb_t r, q;
+
+  ASSERT (tn >= 1);
+
+  for (i = *where; i < PTAB_LINES; i++)
+    {
+      ppp = gmp_primes_ptab[i].ppp;
+      cps = gmp_primes_ptab[i].cps;
+
+      r = mpn_mod_1s_4p (tp, tn, ppp << cps[1], cps);
+
+      idx = gmp_primes_ptab[i].idx;
+      np = gmp_primes_ptab[i].np;
+
+      /* Check divisibility by individual primes.  */
+      dp = &gmp_primes_dtab[idx] + np;
+      for (j = -np; j < 0; j++)
+	{
+	  q = r * dp[j].binv;
+	  if (q <= dp[j].lim)
+	    {
+	      *where = i;
+	      return dp[j].binv;
+	    }
+	}
+
+      nprimes -= np;
+      if (nprimes <= 0)
+	return 0;
+    }
+  return 0;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/xnor_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/xnor_n.c
deleted file mode 120000
index 0a553d94d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/xnor_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/logops_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/xnor_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/xnor_n.c
new file mode 100644
index 000000000..3adba2cdc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/xnor_n.c
@@ -0,0 +1,77 @@
+/* mpn_and_n, mpn_ior_n, etc -- mpn logical operations.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#ifdef OPERATION_and_n
+#define func __MPN(and_n)
+#define call mpn_and_n
+#endif
+
+#ifdef OPERATION_andn_n
+#define func __MPN(andn_n)
+#define call mpn_andn_n
+#endif
+
+#ifdef OPERATION_nand_n
+#define func __MPN(nand_n)
+#define call mpn_nand_n
+#endif
+
+#ifdef OPERATION_ior_n
+#define func __MPN(ior_n)
+#define call mpn_ior_n
+#endif
+
+#ifdef OPERATION_iorn_n
+#define func __MPN(iorn_n)
+#define call mpn_iorn_n
+#endif
+
+#ifdef OPERATION_nior_n
+#define func __MPN(nior_n)
+#define call mpn_nior_n
+#endif
+
+#ifdef OPERATION_xor_n
+#define func __MPN(xor_n)
+#define call mpn_xor_n
+#endif
+
+#ifdef OPERATION_xnor_n
+#define func __MPN(xnor_n)
+#define call mpn_xnor_n
+#endif
+
+void
+func (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  call (rp, up, vp, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/xor_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/xor_n.c
deleted file mode 120000
index 0a553d94d..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/xor_n.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/logops_n.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/xor_n.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/xor_n.c
new file mode 100644
index 000000000..3adba2cdc
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/xor_n.c
@@ -0,0 +1,77 @@
+/* mpn_and_n, mpn_ior_n, etc -- mpn logical operations.
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+#ifdef OPERATION_and_n
+#define func __MPN(and_n)
+#define call mpn_and_n
+#endif
+
+#ifdef OPERATION_andn_n
+#define func __MPN(andn_n)
+#define call mpn_andn_n
+#endif
+
+#ifdef OPERATION_nand_n
+#define func __MPN(nand_n)
+#define call mpn_nand_n
+#endif
+
+#ifdef OPERATION_ior_n
+#define func __MPN(ior_n)
+#define call mpn_ior_n
+#endif
+
+#ifdef OPERATION_iorn_n
+#define func __MPN(iorn_n)
+#define call mpn_iorn_n
+#endif
+
+#ifdef OPERATION_nior_n
+#define func __MPN(nior_n)
+#define call mpn_nior_n
+#endif
+
+#ifdef OPERATION_xor_n
+#define func __MPN(xor_n)
+#define call mpn_xor_n
+#endif
+
+#ifdef OPERATION_xnor_n
+#define func __MPN(xnor_n)
+#define call mpn_xnor_n
+#endif
+
+void
+func (mp_ptr rp, mp_srcptr up, mp_srcptr vp, mp_size_t n)
+{
+  call (rp, up, vp, n);
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/zero.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/zero.c
deleted file mode 120000
index e0ba5ec42..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/zero.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/zero.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/zero.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/zero.c
new file mode 100644
index 000000000..1a05453ba
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/zero.c
@@ -0,0 +1,41 @@
+/* mpn_zero
+
+Copyright 2009 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#include "gmp-impl.h"
+
+void
+mpn_zero (mp_ptr rp, mp_size_t n)
+{
+  mp_size_t i;
+
+  rp += n;
+  for (i = -n; i != 0; i++)
+    rp[i] = 0;
+}
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/zero_p.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/zero_p.c
deleted file mode 120000
index 3468aeff0..000000000
--- a/apps/KhiCAS/src/gmp-6.2.1/mpn/zero_p.c
+++ /dev/null
@@ -1 +0,0 @@
-../mpn/generic/zero_p.c
\ No newline at end of file
diff --git a/apps/KhiCAS/src/gmp-6.2.1/mpn/zero_p.c b/apps/KhiCAS/src/gmp-6.2.1/mpn/zero_p.c
new file mode 100644
index 000000000..c92f9b8ce
--- /dev/null
+++ b/apps/KhiCAS/src/gmp-6.2.1/mpn/zero_p.c
@@ -0,0 +1,33 @@
+/* mpn_zero_p (x,xsize) -- Return 1 if X is zero, 0 if it is non-zero.
+
+Copyright 2015 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * 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.
+
+or both in parallel, as here.
+
+The GNU MP Library 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 copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
+
+#define __GMP_FORCE_mpn_zero_p 1
+
+#include "gmp-impl.h"
diff --git a/apps/KhiCAS/src/main.cpp~ b/apps/KhiCAS/src/main.cpp~
deleted file mode 100644
index b2e5ab8fe..000000000
--- a/apps/KhiCAS/src/main.cpp~
+++ /dev/null
@@ -1,200 +0,0 @@
-#include <extapp_api.h>
-#include <cstring>
-#ifdef SIMULATOR
-#include <FL/Fl.H>
-#endif
-
-#ifndef SIMULATOR
-namespace Ion {
-namespace Timing {
-uint64_t millis() {
-  return extapp_millis();
-}
-}
-}
-
-extern "C" const char * mp_hal_input(const char * prompt) {
-  return 0;
-}
-
-#endif
-
-extern "C" {
-
-int ext_main();
-void extapp_main() {
-  ext_main();
-}
-
-uint64_t millis() {
-  return extapp_millis();
-}
-
-int os_file_browser(const char ** filenames, int maxrecords, const char * extension,int storage) {
-  int n = extapp_fileListWithExtension(filenames, maxrecords, extension, storage);
-  filenames[n] = 0;
-  return n;
-}
-
-bool file_exists(const char * filename) {
-  return extapp_fileExists(filename, EXTAPP_BOTH_FILE_SYSTEM);
-}
-
-bool erase_file(const char * filename){
-  return extapp_fileErase(filename, EXTAPP_RAM_FILE_SYSTEM);
-}
-
-  void console_output(const char * s,int l);
-const char * read_file(const char * filename){
-  const char * ptr = extapp_fileRead(filename, NULL, EXTAPP_RAM_FILE_SYSTEM);
-  if (0 && ptr && ( (unsigned char) *ptr<0x20) ) {
-    // extapp_fileRead in scriptstore now always skips 1st byte
-    // console_output("scriptstore\n",12); console_output(ptr,8);
-    // script from scriptstore
-    return ptr + 1;
-  }
-  //if (ptr){ console_output("scriptstore ",12); console_output(ptr,8); console_output("\n",1); return ptr;}
-  if (!ptr)
-    ptr=extapp_fileRead(filename, NULL, EXTAPP_FLASH_FILE_SYSTEM);
-  //if (ptr){ console_output("flash ",6); console_output(ptr,8); console_output("\n",1); }
-  return ptr;
-}
-
-bool write_file(const char * filename, const char * content, size_t len) {
-  if(len) {
-    return extapp_fileWrite(filename, content, len, EXTAPP_RAM_FILE_SYSTEM);
-  } else {
-    return extapp_fileWrite(filename, content, strlen(content) + 1, EXTAPP_RAM_FILE_SYSTEM);
-  }
-}
-
-int numworks_draw_string(int x, int y, int c, int bg, const char * text, bool fake) {
-  return extapp_drawTextLarge(text, x, y + 18, c, bg, fake);
-}
-
-int numworks_draw_string_small(int x, int y, int c, int bg, const char * text, bool fake) {
-  return extapp_drawTextSmall(text, x, y + 18, c, bg, fake);
-}
-
-bool waitforvblank() {
-  return extapp_waitForVBlank();
-}
-
-void numworks_set_pixel(int x, int y, int color) {
-  if (x<0 || x>=LCD_WIDTH || y<0 || y>=LCD_HEIGHT-18)
-    return;
-  extapp_pushRectUniform(x, y + 18, 1, 1, color);
-}
-
-void numworks_fill_rect(int x, int y, int w, int h, int c) {
-  if (x<0) {
-    w += x;
-    x=0;
-  }
-  if (y<0) {
-    h += y;
-    y=0;
-  }
-  if (h+y>=LCD_HEIGHT-18)
-    h=LCD_HEIGHT-18-y;
-  if (x+w>=LCD_WIDTH)
-    w=LCD_WIDTH-x;
-  if (h<=0 || w<=0)
-    return;
-  extapp_pushRectUniform(x, y + 18, w, h, c);
-}
-
-int numworks_get_pixel(int x, int y) {
-  uint16_t color;
-  extapp_pullRect(x, y, 1, 1, &color);
-  return color;
-}
-
-void numworks_wait_1ms(int ms) {
-  for (int i=0; i<ms/128; ++i) {
-#ifdef SIMULATOR
-    extapp_msleep(0);
-#endif
-    uint64_t scan = extapp_scanKeyboard();
-    if (scan & SCANCODE_Back) {
-      return;
-    }
-    extapp_msleep(128);
-  }
-  extapp_msleep(ms % 128);
-}
-
-static bool interruptible = true;
-
-bool back_key_pressed() {
-  static int c = 0;
-
-  ++c;
-  if (!interruptible || c%1024 != 0) {
-    return false;
-  } else {
-    #ifdef SIMULATOR
-    extapp_msleep(0);
-    #endif
-    return extapp_scanKeyboard() & SCANCODE_Back;
-  }
-}
-
-void enable_back_interrupt() {
-  interruptible = true;
-}
-
-void disable_back_interrupt() {
-  interruptible = false;
-}
-
-bool os_set_angle_unit(int mode) {
-  return false;
-}
-
-int os_get_angle_unit() {
-  return 0;
-}
-
-void numworks_hide_graph() {
-}
-
-void numworks_show_graph() {
-}
-
-void statuslinemsg(const char * msg) {
-  uint16_t c;
-  extapp_pullRect(0, 0, 1, 1, &c);
-  extapp_pushRectUniform(0, 0, 280, 18, c);
-  if(strlen(msg) > 25) {
-    extapp_drawTextSmall(msg, 0, 0, 65535, c, false);
-  } else {
-    extapp_drawTextLarge(msg, 0, 0, 65535, c, false);
-  }
-}
-
-void statusline(int mode, size_t heap) {
-}
-
-void lock_alpha() {
-  extapp_lockAlpha();
-}
-
-void reset_kbd() {
-  extapp_resetKeyboard();
-}
-
-static bool alphawasactive_ = false;
-bool alphawasactive () {
-  return alphawasactive_;
-}
-
-int getkey(int allow_suspend) {
-  return extapp_getKey(allow_suspend, &alphawasactive_);
-}
-
-void GetKey(int * key) {
-  *key = getkey(true);
-}
-
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/extmod/modurandom.c~ b/apps/KhiCAS/src/micropython-1.12/extmod/modurandom.c~
deleted file mode 100644
index e3c7fc7f5..000000000
--- a/apps/KhiCAS/src/micropython-1.12/extmod/modurandom.c~
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <assert.h>
-#include <string.h>
-
-#include "py/runtime.h"
-
-#if MICROPY_PY_URANDOM
-
-// Yasmarang random number generator
-// by Ilya Levin
-// http://www.literatecode.com/yasmarang
-// Public Domain
-
-#if !MICROPY_ENABLE_DYNRUNTIME
-STATIC uint32_t yasmarang_pad = 0xeda4baba, yasmarang_n = 69, yasmarang_d = 233;
-STATIC uint8_t yasmarang_dat = 0;
-#endif
-
-STATIC uint32_t yasmarang(void)
-{
-   yasmarang_pad += yasmarang_dat + yasmarang_d * yasmarang_n;
-   yasmarang_pad = (yasmarang_pad<<3) + (yasmarang_pad>>29);
-   yasmarang_n = yasmarang_pad | 2;
-   yasmarang_d ^= (yasmarang_pad<<31) + (yasmarang_pad>>1);
-   yasmarang_dat ^= (char) yasmarang_pad ^ (yasmarang_d>>8) ^ 1;
-
-   return (yasmarang_pad^(yasmarang_d<<5)^(yasmarang_pad>>18)^(yasmarang_dat<<1));
-}  /* yasmarang */
-
-// End of Yasmarang
-
-#if MICROPY_PY_URANDOM_EXTRA_FUNCS
-
-// returns an unsigned integer below the given argument
-// n must not be zero
-STATIC uint32_t yasmarang_randbelow(uint32_t n) {
-    uint32_t mask = 1;
-    while ((n & mask) < n) {
-        mask = (mask << 1) | 1;
-    }
-    uint32_t r;
-    do {
-        r = yasmarang() & mask;
-    } while (r >= n);
-    return r;
-}
-
-#endif
-
-STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
-    int n = mp_obj_get_int(num_in);
-    if (n > 32 || n == 0) {
-        mp_raise_ValueError(NULL);
-    }
-    uint32_t mask = ~0;
-    // Beware of C undefined behavior when shifting by >= than bit size
-    mask >>= (32 - n);
-    return mp_obj_new_int_from_uint(yasmarang() & mask);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_urandom_getrandbits_obj, mod_urandom_getrandbits);
-
-STATIC mp_obj_t mod_urandom_seed(mp_obj_t seed_in) {
-    mp_uint_t seed = mp_obj_get_int_truncated(seed_in);
-    yasmarang_pad = seed;
-    yasmarang_n = 69;
-    yasmarang_d = 233;
-    yasmarang_dat = 0;
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_urandom_seed_obj, mod_urandom_seed);
-
-#if MICROPY_PY_URANDOM_EXTRA_FUNCS
-
-STATIC mp_obj_t mod_urandom_randrange(size_t n_args, const mp_obj_t *args) {
-    mp_int_t start = mp_obj_get_int(args[0]);
-    if (n_args == 1) {
-        // range(stop)
-        if (start > 0) {
-            return mp_obj_new_int(yasmarang_randbelow(start));
-        } else {
-            goto error;
-        }
-    } else {
-        mp_int_t stop = mp_obj_get_int(args[1]);
-        if (n_args == 2) {
-            // range(start, stop)
-            if (start < stop) {
-                return mp_obj_new_int(start + yasmarang_randbelow(stop - start));
-            } else {
-                goto error;
-            }
-        } else {
-            // range(start, stop, step)
-            mp_int_t step = mp_obj_get_int(args[2]);
-            mp_int_t n;
-            if (step > 0) {
-                n = (stop - start + step - 1) / step;
-            } else if (step < 0) {
-                n = (stop - start + step + 1) / step;
-            } else {
-                goto error;
-            }
-            if (n > 0) {
-                return mp_obj_new_int(start + step * yasmarang_randbelow(n));
-            } else {
-                goto error;
-            }
-        }
-    }
-
-error:
-    mp_raise_ValueError(NULL);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_urandom_randrange_obj, 1, 3, mod_urandom_randrange);
-
-STATIC mp_obj_t mod_urandom_randint(mp_obj_t a_in, mp_obj_t b_in) {
-    mp_int_t a = mp_obj_get_int(a_in);
-    mp_int_t b = mp_obj_get_int(b_in);
-    if (a <= b) {
-        return mp_obj_new_int(a + yasmarang_randbelow(b - a + 1));
-    } else {
-        mp_raise_ValueError(NULL);
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_randint_obj, mod_urandom_randint);
-
-STATIC mp_obj_t mod_urandom_choice(mp_obj_t seq) {
-    mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
-    if (len > 0) {
-        return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow(len)), MP_OBJ_SENTINEL);
-    } else {
-        nlr_raise(mp_obj_new_exception(&mp_type_IndexError));
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_urandom_choice_obj, mod_urandom_choice);
-
-#if MICROPY_PY_BUILTINS_FLOAT
-
-// returns a number in the range [0..1) using Yasmarang to fill in the fraction bits
-STATIC mp_float_t yasmarang_float(void) {
-    #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-    typedef uint64_t mp_float_int_t;
-    #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-    typedef uint32_t mp_float_int_t;
-    #endif
-    union {
-        mp_float_t f;
-        #if MP_ENDIANNESS_LITTLE
-        struct { mp_float_int_t frc:MP_FLOAT_FRAC_BITS, exp:MP_FLOAT_EXP_BITS, sgn:1; } p;
-        #else
-        struct { mp_float_int_t sgn:1, exp:MP_FLOAT_EXP_BITS, frc:MP_FLOAT_FRAC_BITS; } p;
-        #endif
-    } u;
-    u.p.sgn = 0;
-    u.p.exp = (1 << (MP_FLOAT_EXP_BITS - 1)) - 1;
-    if (MP_FLOAT_FRAC_BITS <= 32) {
-        u.p.frc = yasmarang();
-    } else {
-        u.p.frc = ((uint64_t)yasmarang() << 32) | (uint64_t)yasmarang();
-    }
-    return u.f - 1;
-}
-
-STATIC mp_obj_t mod_urandom_random(void) {
-    return mp_obj_new_float(yasmarang_float());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom_random_obj, mod_urandom_random);
-
-STATIC mp_obj_t mod_urandom_uniform(mp_obj_t a_in, mp_obj_t b_in) {
-    mp_float_t a = mp_obj_get_float(a_in);
-    mp_float_t b = mp_obj_get_float(b_in);
-    return mp_obj_new_float(a + (b - a) * yasmarang_float());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_uniform_obj, mod_urandom_uniform);
-
-#endif
-
-#endif // MICROPY_PY_URANDOM_EXTRA_FUNCS
-
-#ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
-STATIC mp_obj_t mod_urandom___init__() {
-    mod_urandom_seed(MP_OBJ_NEW_SMALL_INT(MICROPY_PY_URANDOM_SEED_INIT_FUNC));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom___init___obj, mod_urandom___init__);
-#endif
-
-#if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_urandom_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_urandom) },
-    #ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
-    { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_urandom___init___obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&mod_urandom_getrandbits_obj) },
-    { MP_ROM_QSTR(MP_QSTR_seed), MP_ROM_PTR(&mod_urandom_seed_obj) },
-    #if MICROPY_PY_URANDOM_EXTRA_FUNCS
-    { MP_ROM_QSTR(MP_QSTR_randrange), MP_ROM_PTR(&mod_urandom_randrange_obj) },
-    { MP_ROM_QSTR(MP_QSTR_randint), MP_ROM_PTR(&mod_urandom_randint_obj) },
-    { MP_ROM_QSTR(MP_QSTR_choice), MP_ROM_PTR(&mod_urandom_choice_obj) },
-    #if MICROPY_PY_BUILTINS_FLOAT
-    { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mod_urandom_random_obj) },
-    { MP_ROM_QSTR(MP_QSTR_uniform), MP_ROM_PTR(&mod_urandom_uniform_obj) },
-    #endif
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(mp_module_urandom_globals, mp_module_urandom_globals_table);
-
-const mp_obj_module_t mp_module_urandom = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_urandom_globals,
-};
-#endif
-
-#endif //MICROPY_PY_URANDOM
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/Makefile~ b/apps/KhiCAS/src/micropython-1.12/nspire/Makefile~
deleted file mode 100644
index 6d785b456..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/Makefile~
+++ /dev/null
@@ -1,57 +0,0 @@
-include ../py/mkenv.mk
--include mpconfigport.mk
-
-CC := nspire-gcc
-LD := arm-none-eabi-ld.gold
-
-ZEHNFLAGS = --name "micropython" --author "micropython team, ported by Fabian Vogt" --notice "Interactive python console" --version 09 --compress
-
-# define main target
-PROG = micropython
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# OS name, for simple autoconfig
-UNAME_S := $(shell uname -s)
-
-# Disable stripping of the main executable, relocation info is needed by genzehn
-NOSTRIP := 1
-# DEBUG := 1
-
-# include py core make definitions
-include ../py/py.mk
-
-INC =  -I.
-INC += -I..
-INC += -I../py
-INC += -I$(BUILD)
-
-# Debugging/Optimization
-ifdef DEBUG
-COPT = -O0 -g
-else
-COPT = -Ofast -g #-fomit-frame-pointer -flto
-endif
-
-# compiler settings
-CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format
-CFLAGS = -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-
-LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -Wl,--nspireio
-
-# source files
-SRC_C = $(shell find . -name \*.c)
-
-SRC_QSTR += $(SRC_C)
-
-OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-
-include ../py/mkrules.mk
-
-all: $(PROG).tns
-
-$(PROG).tns: $(PROG)
-	+genzehn --input $^ --output $@.zehn $(ZEHNFLAGS)
-	+make-prg $@.zehn $@
-	+rm $@.zehn
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/changes~ b/apps/KhiCAS/src/micropython-1.12/nspire/changes~
deleted file mode 100644
index 0809a6c49..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/changes~
+++ /dev/null
@@ -1,103 +0,0 @@
-cp mpconfig.h ../py/mpconfig.h 
-micropylib.tgz + ajouter dans le repertoire py de l'information sur les lignes
-
-pour gerer les erreurs de parse
-parse.h: au debut extern int parser_errorline,parser_errorcol;
-parse.c: au debut int parser_errorline=0,parser_errorcol=0; (a mettre aussi avant un appel de mp_parse, dans main.c
-ligne 1056/7 mp_obj_exception_add_traceback(exc, lex->source_name, lex->tok_line, MP_QSTR_NULL); parser_errorline=lex->tok_line; parser_errorcol=lex->tok_column;
-
-renommer urandom en random dans extmod/modurandom.c py/objmodule.c
-
-import des fichiers: ajouter .tns dans py/buildimport.c apres .py
-
-pour apply dans py/objfun.c/.h declarer et enlever STATIC
-mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-
-modification dans py/objlist.c pour indiciage par tuple
-...
-STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-  if (mp_obj_get_type(index)==&mp_type_tuple){
-    size_t len;
-    mp_obj_t * elem;
-    mp_obj_get_array(index, &len, &elem);
-    if (len==0)
-      return self_in;
-    mp_obj_t curindex=elem[0];
-    if (len>1){
-      mp_obj_t cur=list_subscr(self_in,curindex,MP_OBJ_SENTINEL);
-      mp_obj_t r=mp_obj_new_tuple(len-1, elem+1);
-      return list_subscr(cur,r,value);
-    }
-    index=curindex;
-  }
-    if (value == MP_OBJ_NULL) {
-...
-
-meme chose dans py/objtuple.c
-...
-mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-  if (mp_obj_get_type(index)==&mp_type_tuple){
-    size_t len;
-    mp_obj_t * elem;
-    mp_obj_get_array(index, &len, &elem);
-    if (len==0)
-      return self_in;
-    mp_obj_t curindex=elem[0];
-    if (len>1){
-      mp_obj_t cur=mp_obj_tuple_subscr(self_in,curindex,MP_OBJ_SENTINEL);
-      mp_obj_t r=mp_obj_new_tuple(len-1, elem+1);
-      return mp_obj_tuple_subscr(cur,r,value);
-    }
-    index=curindex;
-  }
-    if (value == MP_OBJ_SENTINEL) {
-...
-
-modification dans py/modbuiltins.c pour round
-STATIC mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) {
-...
-#if MICROPY_PY_BUILTINS_FLOAT
-    mp_int_t num_dig = 0;
-    if (n_args > 1) {
-        num_dig = mp_obj_get_int(args[1]);
-        mp_float_t val = mp_obj_get_float(o_in);
-        mp_float_t mult = 1;
-	if (num_dig>=0){
-	  for (int i=0;i<num_dig;++i)
-	    mult*=10;
-	}
-	else
-	  mult = MICROPY_FLOAT_C_FUN(pow)(10, num_dig);	  
-        // TODO may lead to overflow
-        mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val * mult) / mult;
-        return mp_obj_new_float(rounded);
-    }
-    mp_float_t val = mp_obj_get_float(o_in);
-    if (val>-2147483648.0 && val<2147483648.0){
-      int v=val;
-      return mp_obj_new_int(v);
-    }
-    mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val);
-    return mp_obj_new_int_from_float(rounded);
-#else
-...
-
-./mklib:
-make, attendre l'erreur de link
-make V=1 >& log
-ouvrir log et modifier la ligne de link et en faire une lib avec
-arm-none-eabi-ar cru libmicropy fichiers_objs
-(au lieu de nspire-gcc micropython fichiers_objs)
-copier libmicropy.a dans un repertoire lib de ndless-sdk
-
-Fonctions exportees
-int do_file(const char *file);
-char * micropy_init();
-int micropy_eval(const char * line);
-void  mp_deinit();
-Initialisation de MicroPython 
-  char * heap=micropy_init();
-Sortie:
-  mp_deinit(); free(heap);
-
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/graphic.c~ b/apps/KhiCAS/src/micropython-1.12/nspire/graphic.c~
deleted file mode 100644
index 05ca5a5e6..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/graphic.c~
+++ /dev/null
@@ -1,2816 +0,0 @@
-/* -*- mode:C -*- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <math.h>
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "gc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objfun.h"
-#include "objstr.h"
-#include "objint.h"
-#include "runtime.h"
-#include "mpz.h"
-#include "lexer.h"
-#include "parse.h"
-#include "compile.h"
-extern const struct _mp_obj_module_t mp_module_graphic;
-// basic
-#ifdef NUMWORKS
-void c_sprint_double(char * s,double d);
-void strcat_double(char * s,double d){
-  for (;*s;)
-    ++s;
-  c_sprint_double(s,d);
-}
-int numworks_get_pixel(int x,int y);
-inline int os_get_pixel(int x,int y){ return numworks_get_pixel(x,y);}
-#else
-int os_get_pixel(int x,int y);
-void sync_screen();
-#endif
-void c_set_pixel(int x,int y,int c); // c_ prefixed functions run freeze=true
-void c_fill_rect(int x,int y,int w,int h,int c);
-int os_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-int os_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake);
-// more complex paths
-void c_draw_rectangle(int x,int y,int w,int h,int c);
-void c_draw_line(int x0,int y0,int x1,int y1,int c);
-void c_draw_circle(int xc,int yc,int r,int color,bool q1,bool q2,bool q3,bool q4);
-void c_draw_filled_circle(int xc,int yc,int r,int color,bool left,bool right);
-void c_draw_polygon(int * x,int *y ,int n,int color);
-void c_draw_filled_polygon(int * x,int *y, int n,int xmin,int xmax,int ymin,int ymax,int color);
-void c_draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2);
-void c_draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment);
-//const double M_PI=3.1415926535897932;
-#define LCD_WIDTH 320
-#define LCD_HEIGHT 222
-int select_item(const char ** ptr,const char * title,bool askfor1);
-
-#define mp_rgb(r,g,b) ((((r*32)/256)<<11) | (((g*64)/256)<<5) | (b*32/256))
-
-#ifndef M_PI
-#define M_PI (3.14159265358979323846)
-#endif
-
-void raisetypeerr(){
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Bad argument type"));
-}
-bool mp_int_float(mp_obj_t e,double * d){
-  *d=0;
-  if (mp_obj_is_float(e)){
-    *d=mp_obj_get_float(e);
-    return true;
-  }
-  if (MP_OBJ_IS_INT(e)){
-    *d=mp_obj_get_int(e);
-    return true;
-  }
-  return false;
-}
-
-const char * translate_point_type(const char * s){
-  if (strcmp("+",s)==0)
-    return "plus_point";
-  if (strcmp("*",s)==0)
-    return "star_point";
-  if (strcmp("x",s)==0)
-    return "point_croix";
-  if (strcmp("o",s)==0)
-    return "square_point";
-  return s;
-}
-
-int mp_int_float2color(mp_obj_t e){
-  if (mp_obj_is_float(e)){
-    double d=mp_obj_get_float(e);
-    if (d<=0) return 0;
-    if (d>=1) return 255;
-    int r=d*256;
-    return r;
-  }
-  int r=mp_obj_get_int(e);
-  if (r<=0) return 0;
-  if (r>255) return 255;
-  return r;
-}
-
-int mp_get_color(mp_obj_t tuple){
-  if (MP_OBJ_IS_SMALL_INT(tuple)) 
-    return MP_OBJ_SMALL_INT_VALUE(tuple) & 0xffffffff;
-  if (MP_OBJ_IS_STR(tuple)){
-    const char * col=mp_obj_str_get_str(tuple);
-    if (strcmp(col,"black")==0)
-      return 0;
-    if (strcmp(col,"white")==0)
-      return 0xffff;
-    if (strcmp(col,"blue")==0)
-      return 2079;
-    if (strcmp(col,"red")==0)
-      return 63488;
-    if (strcmp(col,"green")==0)
-      return 2016;
-    if (strcmp(col,"magenta")==0)
-      return 63519;
-    if (strcmp(col,"yellow")==0)
-      return 65504;
-    if (strcmp(col,"cyan")==0)
-      return 2047;
-    return -1;
-  }
-  size_t len;
-  mp_obj_t * elem;
-
-  mp_obj_get_array(tuple, &len, &elem);
-  if (len != 3) {
-    mp_raise_TypeError("color needs 3 components");
-  }
-  int r=mp_int_float2color(elem[0]);
-  int g=mp_int_float2color(elem[1]);
-  int b=mp_int_float2color(elem[2]);
-  return mp_rgb(r,g,b);
-}
-
-static mp_obj_t graphic_clear_screen(size_t n_args, const mp_obj_t *args){
-  int c=0xffff;
-  if (n_args==1) //  && MP_OBJ_IS_SMALL_INT(args[0]))
-    c=mp_get_color(args[0]); //MP_OBJ_SMALL_INT_VALUE(args[0]);
-  c_fill_rect(0,0,LCD_WIDTH,LCD_HEIGHT,c);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_clear_screen_obj, 0, 1, graphic_clear_screen);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_clear_obj, 0, 1, graphic_clear_screen);
-
-static mp_obj_t graphic_show_screen(){
-#ifndef NUMWORKS
-  sync_screen();
-#endif
-  return mp_const_none;
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(graphic_show_screen_obj, graphic_show_screen);
-static MP_DEFINE_CONST_FUN_OBJ_0(graphic_show_obj, graphic_show_screen);
-
-mp_obj_t mp_color_tuple(int c){
-  mp_obj_tuple_t * t = (mp_obj_tuple_t *)(MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL)));
-  c &= 0xffff;
-  int r=(c>>11)&0x1f,g=(c>>5)&0x3f,b=c&0x1f;
-  r *= 8; g*=4; b*=8;
-  t->items[0] = MP_OBJ_NEW_SMALL_INT(r);
-  t->items[1] = MP_OBJ_NEW_SMALL_INT(g);
-  t->items[2] = MP_OBJ_NEW_SMALL_INT(b);
-  return MP_OBJ_FROM_PTR(t);
-}  
-
-static mp_obj_t graphic_set_pixel(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]),color=0;
-  if (n_args==3)    
-    color = mp_get_color(args[2]);
-  c_set_pixel(x,y,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_set_pixel_obj, 2, 3, graphic_set_pixel);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_pixel_obj, 2, 3, graphic_set_pixel);
-
-static mp_obj_t graphic_draw_line(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_obj_get_int(args[4]);
-  c_draw_line(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_line_obj, 4, 5, graphic_draw_line);
-
-bool mp_array2inttab(mp_obj_t l,int ** x,size_t * n,size_t * m){
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  mp_obj_get_array(elem[0],m,&line);
-  if (*m==0)
-    return false;
-  int * ptr=(int *)malloc((*n)*(*m)*sizeof(int));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(*x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      *ptr=mp_obj_get_int(line[j]);
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-static mp_obj_t graphic_draw_polygon_(size_t n_args, const mp_obj_t *args,bool filled) {
-  int color=0;
-  int * tab=0;
-  size_t n=0,m=0;
-  if (!mp_array2inttab(args[0],&tab,&n,&m))
-      return mp_const_false;
-  if (m!=2){
-    free(tab);
-    return mp_const_false;
-  }
-  int x[n],y[n];
-  for (size_t i=0;i<n;++i){
-    x[i]=*tab;
-    ++tab;
-    y[i]=*tab;
-    ++tab;
-  }
-  if (n_args==2)    
-    color = mp_obj_get_int(args[1]);
-  if (filled)
-    c_draw_filled_polygon(x,y,n,0,LCD_WIDTH,0,LCD_HEIGHT,color);
-  else
-    c_draw_polygon(x,y,n,color);
-  return mp_const_none;
-}
-static mp_obj_t graphic_draw_polygon(size_t n_args, const mp_obj_t *args) {
-  return graphic_draw_polygon_(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_polygon_obj, 1, 2, graphic_draw_polygon);
-static mp_obj_t graphic_draw_filled_polygon(size_t n_args, const mp_obj_t *args) {
-  return graphic_draw_polygon_(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_polygon_obj, 1, 2, graphic_draw_filled_polygon);
-
-static mp_obj_t graphic_draw_rectangle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_get_color(args[4]);
-  c_draw_rectangle(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_rectangle_obj, 4, 5, graphic_draw_rectangle);
-
-static mp_obj_t graphic_fill_rect(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_get_color(args[4]);
-  c_fill_rect(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_fill_rect_obj, 4, 5, graphic_fill_rect);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_rectangle_obj, 4, 5, graphic_fill_rect);
-
-static mp_obj_t graphic_draw_circle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r = mp_obj_get_int(args[2]),
-    color=0;
-  if (n_args==4)    
-    color = mp_get_color(args[3]);
-  c_draw_circle(x1,y1,r,color,true,true,true,true);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_circle_obj, 3, 4, graphic_draw_circle);
-
-static mp_obj_t graphic_draw_filled_circle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r = mp_obj_get_int(args[2]),
-    color=0;
-  if (n_args==4)    
-    color = mp_get_color(args[3]);
-  c_draw_filled_circle(x1,y1,r,color,true,true);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_circle_obj, 3, 4, graphic_draw_filled_circle);
-
-static mp_obj_t graphic_draw_arc(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r1 = mp_obj_get_int(args[2]), r2=mp_obj_get_int(args[3]),
-    t1=0,t2=360,
-    color=0;
-  if (n_args>=6){
-    t1 = mp_obj_get_int(args[4]), t2=mp_obj_get_int(args[5]);
-  }
-  if (n_args==7)    
-    color = mp_get_color(args[6]);
-  c_draw_arc(x1,y1,r1,r2,color,t1*M_PI/180,t2*M_PI/180);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_arc_obj, 4, 7, graphic_draw_arc);
-
-static mp_obj_t graphic_draw_filled_arc(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r1 = mp_obj_get_int(args[2]), r2=mp_obj_get_int(args[3]),
-    t1=0,t2=360,
-    color=0;
-  if (n_args>=6){
-    t1 = mp_obj_get_int(args[4]), t2=mp_obj_get_int(args[5]);
-  }
-  if (n_args>=7)    
-    color = mp_get_color(args[6]);
-  c_draw_filled_arc(x1,y1,r1,r2,t1,t2,color,0,LCD_WIDTH,0,LCD_HEIGHT,n_args==8);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_arc_obj, 4, 8, graphic_draw_filled_arc);
-
-static mp_obj_t graphic_get_pixel(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]);
-  if (x<0 || x>=LCD_WIDTH || y<0 || y>LCD_HEIGHT)
-    return mp_const_none;
-  int c=os_get_pixel(x,y);
-  if (n_args==3) 
-    return MP_OBJ_NEW_SMALL_INT(c);
-  return mp_color_tuple(c);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_get_pixel_obj, 2, 3, graphic_get_pixel);
-
-static mp_obj_t graphic_draw_string(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]),c=0,bg=0xffff;
-  const char * text = mp_obj_str_get_str(args[2]);
-  if (n_args>=4)
-    c = mp_get_color(args[3]);
-  const char * font = 0;
-  if (n_args>=5)
-    font=mp_obj_str_get_str(args[4]);
-  if (font && strcmp(font,"small")==0)
-    c_draw_string_small(x,y,c,bg,text,false);
-  else {
-    if (font && strcmp(font,"large")==0)
-      c_draw_string(x,y,c,bg,text,false);
-    else
-      c_draw_string_medium(x,y,c,bg,text,false);
-  }
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_string_obj, 3, 5, graphic_draw_string);
-
-//
-static const mp_map_elem_t graphic_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_get_pixel), (mp_obj_t) &graphic_get_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cyan), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_magenta), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_yellow), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_blue), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,255)) },
-    { MP_ROM_QSTR(MP_QSTR_red), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_green), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_black), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_white), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_clear_screen), (mp_obj_t) &graphic_clear_screen_obj },
-	{ MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &graphic_clear_obj },
-	{ MP_ROM_QSTR(MP_QSTR_show_screen), (mp_obj_t) &graphic_show_screen_obj },
-	{ MP_ROM_QSTR(MP_QSTR_set_pixel), (mp_obj_t) &graphic_set_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_pixel), (mp_obj_t) &graphic_draw_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_line), (mp_obj_t) &graphic_draw_line_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_polygon), (mp_obj_t) &graphic_draw_polygon_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_filled_polygon), (mp_obj_t) &graphic_draw_filled_polygon_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_rectangle), (mp_obj_t) &graphic_draw_rectangle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_fill_rect), (mp_obj_t) &graphic_fill_rect_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_filled_rectangle), (mp_obj_t) &graphic_draw_filled_rectangle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_circle), (mp_obj_t) &graphic_draw_circle_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_filled_circle), (mp_obj_t) &graphic_draw_filled_circle_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_arc), (mp_obj_t) &graphic_draw_arc_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_filled_arc), (mp_obj_t) &graphic_draw_filled_arc_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_string), (mp_obj_t) &graphic_draw_string_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(graphic_locals_dict, graphic_locals_dict_table);
-
-const mp_obj_type_t graphic_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_graphic,
-    .locals_dict = (mp_obj_t)&graphic_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_graphic_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__graphic) },
-	{ MP_ROM_QSTR(MP_QSTR_cyan), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_magenta), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_yellow), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_blue), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,255)) },
-    { MP_ROM_QSTR(MP_QSTR_red), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_green), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_black), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_white), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,255)) },
-    { MP_ROM_QSTR(MP_QSTR_set_pixel), (mp_obj_t) &graphic_set_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_pixel), (mp_obj_t) &graphic_draw_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_line), (mp_obj_t) &graphic_draw_line_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_polygon), (mp_obj_t) &graphic_draw_polygon_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_polygon), (mp_obj_t) &graphic_draw_filled_polygon_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_rectangle), (mp_obj_t) &graphic_draw_rectangle_obj },
-    { MP_ROM_QSTR(MP_QSTR_fill_rect), (mp_obj_t) &graphic_fill_rect_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_rectangle), (mp_obj_t) &graphic_draw_filled_rectangle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_circle), (mp_obj_t) &graphic_draw_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_circle), (mp_obj_t) &graphic_draw_filled_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_arc), (mp_obj_t) &graphic_draw_arc_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_arc), (mp_obj_t) &graphic_draw_filled_arc_obj },
-    { MP_ROM_QSTR(MP_QSTR_get_pixel), (mp_obj_t) &graphic_get_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_string), (mp_obj_t) &graphic_draw_string_obj },
-    { MP_ROM_QSTR(MP_QSTR_show_screen), (mp_obj_t) &graphic_show_screen_obj },
-    { MP_ROM_QSTR(MP_QSTR_clear_screen), (mp_obj_t) &graphic_clear_screen_obj },
-    { MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &graphic_clear_obj },
-    { MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &graphic_show_obj },
-
-};
-
-STATIC const mp_obj_dict_t mp_module_graphic_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_graphic_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_graphic_globals_table),
-        .table = (mp_map_elem_t*)mp_module_graphic_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_graphic = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_graphic_globals,
-};
-
-/* ********************************
- *                  CAS           *
- * ******************************** */
-int mp_token(const char * line){ // does not work, always mp_type_fun_bc
-  mp_obj_dict_t *dict = NULL;
-  dict = mp_locals_get();//mp_globals_get();//
-  mp_map_t * m=mp_obj_dict_get_map(dict);
-  mp_obj_t index=mp_obj_new_str(line,strlen(line));
-  mp_map_elem_t *ptr=mp_map_lookup(m, index, MP_MAP_LOOKUP) ;
-  // 0 or 3
-  if (ptr)
-    return 3;
-  else
-    return 0;
-}
-
-const char * const * mp_vars();
-const char * const * mp_vars(){
-  mp_obj_dict_t *dict = NULL;
-  dict = mp_locals_get();
-
-  mp_obj_t dir = mp_obj_new_list(0, NULL);
-  if (dict != NULL) {
-    for (size_t i = 0; i < dict->map.alloc; i++) {
-      if (MP_MAP_SLOT_IS_FILLED(&dict->map, i)) {
-	//const char * ch=mp_obj_str_get_str(dict->map.table[i].key);
-	mp_obj_t v=dict->map.table[i].value;
-	mp_obj_type_t * vt=mp_obj_get_type(v);
-	if (vt!=&mp_type_fun_builtin_var
-	    && vt!=&mp_type_fun_builtin_0
-	    && vt!=&mp_type_fun_builtin_1
-	    && vt!=&mp_type_fun_builtin_2
-	    && vt!=&mp_type_fun_builtin_3
-	    )
-	  mp_obj_list_append(dir, dict->map.table[i].key);
-      }
-    }
-  }
-  mp_obj_t * line; size_t m=0;
-  mp_obj_get_array(dir,&m,&line);
-  const char ** tab=(const char **)malloc((m+1)*sizeof(char *));
-  if (!tab) return 0;
-  for (size_t i=0;i<m;++i){
-    tab[i]=mp_obj_str_get_str(line[i]);
-  }
-  tab[m]=0;
-  for (size_t i=0;i<m;++i){
-    if (strcmp(tab[i],"__name__")==0){
-      tab[i]=tab[m-1];
-      tab[m-1]="del ";
-      break;
-    }
-  }
-  return tab;
-}
-
-/* ********************************z
- *         LINALG & CAS           *
- * ******************************** */
-bool r_inv(double *,int n);
-bool r_rref(double *,int n,int m);
-double r_det(double *,int);
-struct double_pair {
-  double r,i;
-} ;
-typedef struct double_pair c_complex;
-bool c_inv(c_complex *,int n);
-bool c_rref(c_complex *,int n,int m);
-c_complex c_det(c_complex *,int);
-bool c_egv(c_complex * x,int n); // eigenvectors
-bool c_proot(c_complex * x,int n); 
-bool c_pcoeff(c_complex * x,int n); 
-bool c_fft(c_complex * x,int n,bool inverse); 
-bool c_eig(c_complex * x,c_complex * d,int n); // eigenvectors
-bool mp_get_c_complex(mp_obj_t e,c_complex * d){
-  d->r=d->i=0;
-  if (mp_obj_is_float(e)){
-    d->r=mp_obj_get_float(e);
-    return true;
-  }
-  if (MP_OBJ_IS_INT(e)){
-    d->r=mp_obj_get_int(e);
-    return true;
-  }
-  if (mp_obj_get_type(e)==&mp_type_complex){
-    mp_obj_get_complex(e,&d->r,&d->i);
-    return true;
-  }
-  return false;
-}
-
-void c_mul(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r*b.r-a.i*b.i;
-  c->i=a.r*b.i+a.i*b.r;
-}
-
-void c_sub(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r-b.r;
-  c->i=a.i-b.i;
-}
-
-void c_add(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r+b.r;
-  c->i=a.i+b.i;
-}
-
-bool mp_array2doubletab(mp_obj_t l,double ** x,size_t * n,size_t * m){
-  if (mp_obj_get_type(l)!=&mp_type_tuple &&
-      mp_obj_get_type(l)!=&mp_type_list)
-    return false;
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  *m=0;
-  if (mp_obj_get_type(elem[0])==&mp_type_tuple ||
-      mp_obj_get_type(elem[0])==&mp_type_list)
-    mp_obj_get_array(elem[0],m,&line);
-  if (*m==0){
-    double * ptr=(double *)malloc((*n)*sizeof(double));
-    *x=ptr;
-    for (size_t i=0;i<*n;++i){
-      if (MP_OBJ_IS_SMALL_INT(elem[i])) 
-	*ptr=MP_OBJ_SMALL_INT_VALUE(elem[i]);
-      else {
-	if (mp_obj_is_float(elem[i]))
-	  *ptr=mp_obj_float_get(elem[i]);
-	else {
-	  free(*x);
-	  return false;
-	}
-      }
-      ++ptr;
-    }
-    return true;
-  }
-  double * ptr=(double *)malloc((*n)*(*m)*sizeof(double));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      if (MP_OBJ_IS_SMALL_INT(line[j])) 
-	*ptr=MP_OBJ_SMALL_INT_VALUE(line[j]);
-      else {
-	if (mp_obj_is_float(line[j]))
-	  *ptr=mp_obj_float_get(line[j]);
-	else {
-	  free(*x);
-	  return false;
-	}
-      }
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-bool mp_array2c_complextab(mp_obj_t l,c_complex ** x,size_t * n,size_t * m){
-  if (mp_obj_get_type(l)!=&mp_type_tuple &&
-      mp_obj_get_type(l)!=&mp_type_list)
-    return false;
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  *m=0;
-  if (mp_obj_get_type(elem[0])==&mp_type_tuple ||
-      mp_obj_get_type(elem[0])==&mp_type_list)
-    mp_obj_get_array(elem[0],m,&line);
-  if (*m==0){
-    c_complex * ptr=(c_complex *)malloc((*n)*sizeof(c_complex));
-    *x=ptr;
-    for (size_t i=0;i<*n;++i){
-      ptr->i=0;
-      if (MP_OBJ_IS_SMALL_INT(elem[i])) 
-	ptr->r=MP_OBJ_SMALL_INT_VALUE(elem[i]);
-      else {
-	if (mp_obj_is_float(elem[i]))
-	  ptr->r=mp_obj_float_get(elem[i]);
-	else {
-	  if (mp_obj_get_type(elem[i])==&mp_type_complex){
-	    double R,I;
-	    mp_obj_get_complex(elem[i],&R,&I);
-	    ptr->r=R;
-	    ptr->i=I;
-	  }
-	  else {
-	    free(*x);
-	    return false;
-	  }
-	}
-      }
-      ++ptr;
-    }
-    return true;
-  }
-  c_complex * ptr=(c_complex *)malloc((*n)*(*m)*sizeof(c_complex));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      ptr->i=0;
-      if (MP_OBJ_IS_SMALL_INT(line[j])) 
-	ptr->r=MP_OBJ_SMALL_INT_VALUE(line[j]);
-      else {
-	if (mp_obj_is_float(line[j]))
-	  ptr->r=mp_obj_float_get(line[j]);
-	else {
-	  if (mp_obj_get_type(line[j])==&mp_type_complex){
-	    double r,i;
-	    mp_obj_get_complex(line[j],&r,&i);
-	    ptr->r=r;
-	    ptr->i=i;
-	  }
-	  else {
-	    free(*x);
-	    return false;
-	  }
-	}
-      }
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-// print array, 1-d if m==0
-// returns malloc-ed string
-char * printtab(double * x,size_t n,size_t m){
-  char buf[32];
-  if (m==0){
-    char * ptr=(char *)malloc(32*n);
-    strcpy(ptr,"[");
-    for (size_t i=0;i<n;++i){
-#ifdef NUMWORKS
-      buf[0]=0;
-      strcat_double(buf,x[i]);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g,",x[i]);
-#endif
-      strcat(ptr,buf);
-    }
-    ptr[strlen(ptr)-1]=']';
-    return ptr;
-  }
-  char * ptr=(char *)malloc(32*n*m);
-  strcpy(ptr,"[");
-  for (size_t i=0;i<n;++i){
-    strcat(ptr,"[");
-    for (size_t j=0;j<m;++j){
-#ifdef NUMWORKS
-      buf[0]=0;
-      strcat_double(buf,*x);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g,",*x);
-#endif
-      strcat(ptr,buf);
-      ++x;
-    }
-    ptr[strlen(ptr)-1]=']';
-    strcat(ptr,",");
-  }
-  ptr[strlen(ptr)-1]=']';
-  return ptr;
-}
-
-char * printc_complextab(c_complex * x,size_t n,size_t m){
-  char buf[256]="";
-  if (m==0){
-    char * ptr=(char *)malloc(64*n);
-    strcpy(ptr,"[");
-    for (size_t i=0;i<n;++i){
-#ifdef NUMWORKS
-      c_sprint_double(buf,x[i].r);
-      strcat(buf,"+i*");
-      strcat_double(buf,x[i].i);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g+i*%.14g,",x[i].r,x[i].i);
-#endif
-      strcat(ptr,buf);
-    }
-    ptr[strlen(ptr)-1]=']';
-    return ptr;
-  }
-  char * ptr=(char *)malloc(64*n*m);
-  strcpy(ptr,"[");
-  for (size_t i=0;i<n;++i){
-    strcat(ptr,"[");
-    for (size_t j=0;j<m;++j){
-#ifdef NUMWORKS
-      buf[0]=0;
-      c_sprint_double(buf,x->r);
-      strcat(buf,"+i*");
-      strcat_double(buf,x->i);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g+i*%.14g,",x->r,x->i);
-#endif
-      strcat(ptr,buf);
-      ++x;
-    }
-    ptr[strlen(ptr)-1]=']';
-    strcat(ptr,",");
-  }
-  ptr[strlen(ptr)-1]=']';
-  return ptr;
-}
-
-mp_obj_t doubletab2mp_array(double *x,size_t n,size_t m){
-  mp_obj_t r=mp_obj_new_list(0,NULL);
-  for (size_t i=0;i<n;++i){
-    mp_obj_t l=mp_obj_new_list(0,NULL);
-    for (size_t j=0;j<m;++j){
-      mp_obj_list_append(l,mp_obj_new_float(*x));
-      ++x;
-    }
-    mp_obj_list_append(r,l);
-  }
-  return r;
-}
-
-mp_obj_t c_complextab2mp_array(c_complex *x,size_t n,size_t m){
-  mp_obj_t r=mp_obj_new_list(0,NULL);
-  if (m==0){
-    for (size_t i=0;i<n;++i){
-      if (x->i==0)
-	mp_obj_list_append(r,mp_obj_new_float(x->r));
-      else
-	mp_obj_list_append(r,mp_obj_new_complex(x->r,x->i));
-      ++x;
-    }
-    return r;
-  }
-  for (size_t i=0;i<n;++i){
-    mp_obj_t l=mp_obj_new_list(0,NULL);
-    for (size_t j=0;j<m;++j){
-      if (x->i==0)
-	mp_obj_list_append(l,mp_obj_new_float(x->r));
-      else
-	mp_obj_list_append(l,mp_obj_new_complex(x->r,x->i));
-      ++x;
-    }
-    mp_obj_list_append(r,l);
-  }
-  return r;
-}
-
-const char * caseval(const char *);
-
-static mp_obj_t cas_caseval(size_t n_args, const mp_obj_t *args) {
-  const char * text = mp_obj_str_get_str(args[0]);
-  const char * val=caseval(text);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cas_caseval_obj, 1, 2, cas_caseval);
-
-//
-static const mp_map_elem_t cas_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_caseval), (mp_obj_t) &cas_caseval_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(cas_locals_dict, cas_locals_dict_table);
-
-const mp_obj_type_t cas_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cas,
-    .locals_dict = (mp_obj_t)&cas_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_cas_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__cas) },
-    { MP_ROM_QSTR(MP_QSTR_caseval), (mp_obj_t) &cas_caseval_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_cas_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_cas_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_cas_globals_table),
-        .table = (mp_map_elem_t*)mp_module_cas_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_cas = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_cas_globals,
-};
-
-/* ARIT 
-   mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base);
- */
-
-mp_obj_t str2int(const char * s){
-  bool neg=s[0]=='-';
-  if (neg)
-    ++s;
-  return mp_obj_new_int_from_str_len(&s,strlen(s),neg,10);
-}
-
-static mp_obj_t arit(const mp_obj_t *args,int nargs,int cmd) {
-  if (
-      !MP_OBJ_IS_INT(args[0])
-      || (nargs==2 && !MP_OBJ_IS_INT(args[1]))
-      )
-    mp_raise_TypeError("integer expected");
-  if (cmd==8 && mp_obj_get_int(args[0])>2e5)
-    mp_raise_TypeError("integer too large");
-  // The size of this buffer is rather arbitrary. If it's not large
-  // enough, a dynamic one will be allocated.
-  char stack_buf[512];
-  char *buf = stack_buf;
-  size_t buf_size = sizeof(stack_buf);
-  size_t fmt_size;
-  char *str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size, args[0], 10, NULL, '\0', '\0');
-  char BUF[strlen(str)+32];
-  switch (cmd){
-  case 0:
-    sprintf(BUF,"isprime(%s)",str);
-    break;
-  case 1:
-    sprintf(BUF,"nextprime(%s)",str);
-    break;
-  case 2:
-    sprintf(BUF,"prevprime(%s)",str);
-    break;
-  case 3:
-    sprintf(BUF,"ifactor(%s)",str);
-    break;
-  case 4:
-    sprintf(BUF,"gcd(%s,",str);
-    break;
-  case 5:
-    sprintf(BUF,"lcm(%s,",str);
-    break;
-  case 6:
-    sprintf(BUF,"iegcd(%s,",str);
-    break;
-  case 7:
-    sprintf(BUF,"euler(%s)",str);
-    break;
-  case 8:
-    sprintf(BUF,"nprimes(%s)",str);
-    break;
-  }
-  if (buf != stack_buf) {
-    m_del(char, buf, buf_size);
-  }
-  const char * val=0;
-  if (nargs==2){
-    buf=stack_buf;
-    str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size, args[1], 10, NULL, '\0', '\0');
-    char BUF2[strlen(BUF)+strlen(str)+32];
-    strcpy(BUF2,BUF);
-    strcat(BUF2,str);
-    if (buf != stack_buf) {
-      m_del(char, buf, buf_size);
-    }
-    strcat(BUF2,")");
-    val=caseval(BUF2);
-  }
-  else
-    val=caseval(BUF);
-  if (cmd==0){
-    if (strcmp(val,"True")==0 || strcmp(val,"true")==0 || strcmp(val,"1")==0)
-      return mp_const_true;
-    if (strcmp(val,"False")==0 || strcmp(val,"false")==0 || strcmp(val,"0")==0)
-      return mp_const_false;
-  }
-  if (cmd==1 || cmd==2 || cmd==4 || cmd==5  || cmd==7 || cmd==8){
-    return str2int(val);
-  }
-  if (cmd==6){
-    char buf[strlen(val)+1];
-    strcpy(buf,val);
-    char * buf1=buf;
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (;*buf1;++buf1){
-      if (*buf1=='[')
-	break;
-    }
-    if (*buf1){
-      ++buf1;
-      for (int i=0;i<3;++i){
-	char * buf2=buf1;
-	for (;*buf2;++buf2){
-	  if (*buf2==',')
-	    break;
-	}
-	*buf2=0;
-	mp_obj_list_append(res,str2int(buf1));
-	buf1=buf2+1;
-      }
-    }
-    return res;
-  }
-  return mp_obj_new_str(val,strlen(val));
-}
-static mp_obj_t arit_isprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_isprime_obj, 1, 1, arit_isprime);
-
-static mp_obj_t arit_nextprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_nextprime_obj, 1, 1, arit_nextprime);
-
-static mp_obj_t arit_prevprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,2);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_prevprime_obj, 1, 1, arit_prevprime);
-
-static mp_obj_t arit_ifactor(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,3);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_ifactor_obj, 1, 1, arit_ifactor);
-
-static mp_obj_t arit_gcd(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,4);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_gcd_obj, 2, 2, arit_gcd);
-
-static mp_obj_t arit_lcm(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,5);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_lcm_obj, 2, 2, arit_lcm);
-
-static mp_obj_t arit_iegcd(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,6);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_iegcd_obj, 2, 2, arit_iegcd);
-
-static mp_obj_t arit_euler(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,7);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_euler_obj, 1, 1, arit_euler);
-
-static mp_obj_t arit_nprimes(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,8);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_nprimes_obj, 1, 1, arit_nprimes);
-
-static mp_obj_t arit_char(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_SMALL_INT(args[0])){
-    char buf[2]={MP_OBJ_SMALL_INT_VALUE(args[0]),0};
-    return mp_obj_new_str(buf,1);
-  }
-  mp_obj_t * tab; size_t m=0;
-  mp_obj_get_array(args[0],&m,&tab);
-  if (m==0)
-    raisetypeerr();
-  char buf[m+1];
-  for (int i=0;i<m;++i){
-    if (!MP_OBJ_IS_SMALL_INT(tab[i]))
-      raisetypeerr();
-    buf[i]=MP_OBJ_SMALL_INT_VALUE(tab[i]);
-  }
-  return mp_obj_new_str(buf,m);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_char_obj, 1, 1, arit_char);
-
-static mp_obj_t arit_asc(size_t n_args, const mp_obj_t *args) {
-  if (!mp_obj_is_str(args[0]))
-    raisetypeerr();
-  size_t len;
-  const char * s=mp_obj_str_get_data(args[0],&len);
-  mp_obj_t res = mp_obj_new_list(0, NULL);
-  for (int i=0;i<len;++i)
-    mp_obj_list_append(res,mp_obj_new_int(s[i]));
-  return res;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_asc_obj, 1, 1, arit_asc);
-//
-static const mp_map_elem_t arit_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_isprime), (mp_obj_t) &arit_isprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_nextprime), (mp_obj_t) &arit_nextprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_prevprime), (mp_obj_t) &arit_prevprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ifactor), (mp_obj_t) &arit_ifactor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_gcd), (mp_obj_t) &arit_gcd_obj },
-	{ MP_ROM_QSTR(MP_QSTR_lcm), (mp_obj_t) &arit_lcm_obj },
-	{ MP_ROM_QSTR(MP_QSTR_iegcd), (mp_obj_t) &arit_iegcd_obj },
-	{ MP_ROM_QSTR(MP_QSTR_char), (mp_obj_t) &arit_char_obj },
-	{ MP_ROM_QSTR(MP_QSTR_asc), (mp_obj_t) &arit_asc_obj },
-        { MP_ROM_QSTR(MP_QSTR_euler), (mp_obj_t) &arit_euler_obj },
-        { MP_ROM_QSTR(MP_QSTR_nprimes), (mp_obj_t) &arit_nprimes_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(arit_locals_dict, arit_locals_dict_table);
-
-const mp_obj_type_t arit_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_arit,
-    .locals_dict = (mp_obj_t)&arit_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_arit_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__arit) },
-    { MP_ROM_QSTR(MP_QSTR_isprime), (mp_obj_t) &arit_isprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_nextprime), (mp_obj_t) &arit_nextprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_prevprime), (mp_obj_t) &arit_prevprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifactor), (mp_obj_t) &arit_ifactor_obj },
-    { MP_ROM_QSTR(MP_QSTR_gcd), (mp_obj_t) &arit_gcd_obj },
-    { MP_ROM_QSTR(MP_QSTR_lcm), (mp_obj_t) &arit_lcm_obj },
-    { MP_ROM_QSTR(MP_QSTR_iegcd), (mp_obj_t) &arit_iegcd_obj },
-    { MP_ROM_QSTR(MP_QSTR_char), (mp_obj_t) &arit_char_obj },
-    { MP_ROM_QSTR(MP_QSTR_asc), (mp_obj_t) &arit_asc_obj },
-    { MP_ROM_QSTR(MP_QSTR_euler), (mp_obj_t) &arit_euler_obj },
-    { MP_ROM_QSTR(MP_QSTR_nprimes), (mp_obj_t) &arit_nprimes_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_arit_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_arit_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_arit_globals_table),
-        .table = (mp_map_elem_t*)mp_module_arit_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_arit = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_arit_globals,
-};
-
-/* LINALG (with some NUMPY compatibility) */
-static mp_obj_t linalg_matrix(size_t n_args, const mp_obj_t *args) {
-  double *x=0;size_t n,m;
-  if (mp_array2doubletab(args[n_args-1],&x,&n,&m)){
-    if (n_args==1){
-      free(x);
-      return args[0];
-    }
-    if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[0]) &&  MP_OBJ_IS_SMALL_INT(args[1])){
-      int n1=MP_OBJ_SMALL_INT_VALUE(args[0]),m1=MP_OBJ_SMALL_INT_VALUE(args[1]);
-      int N=m?n*m:n,k=0;
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      for (int i=0;i<n1;++i){
-	mp_obj_t l = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m1;++j){
-	  mp_obj_list_append(l,mp_obj_new_float(k<N?x[k]:0));
-	  ++k;
-	}
-	mp_obj_list_append(r,l);
-      }
-      free(x);
-      return r;
-    }
-    if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[0]) ){
-      int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-      int N=m?n*m:n,k=0;
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      for (int i=0;i<n1;++i){
-	mp_obj_list_append(r,mp_obj_new_float(k<N?x[k]:0));
-	++k;
-      }
-      free(x);
-      return r;
-    }
-    free(x);
-  }
-  if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[0])){
-    int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      mp_obj_t arg=mp_obj_new_int(i);
-      mp_obj_list_append(r,fun_bc_call(args[1],1,0,&arg));	  
-    }
-    return r;
-  }
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_IS_SMALL_INT(args[1])){
-    int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    int m1=MP_OBJ_SMALL_INT_VALUE(args[1]);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    mp_obj_t arg[2];
-    for (int i=0;i<n1;++i){
-      arg[0]=mp_obj_new_int(i);
-      mp_obj_t l = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m1;++j){
-	arg[1]=mp_obj_new_int(j);
-	mp_obj_list_append(l,fun_bc_call(args[2],2,0,arg)); 
-      }
-      mp_obj_list_append(r,l);
-    }
-    return r;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_matrix_obj, 1, 3, linalg_matrix);
-
-static mp_obj_t linalg_arange(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t l = mp_obj_new_list(0, NULL);
-  double step=1,a,b;
-  if (n_args==3)
-    mp_int_float(args[2],&step);
-  if (step>0 && mp_int_float(args[0],&a) && mp_int_float(args[1],&b)){
-    for (;a<=b;a+=step){
-      mp_obj_list_append(l,mp_obj_new_float(a));
-    }
-    return l;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_arange_obj, 2, 3, linalg_arange);
-
-static mp_obj_t linalg_linspace(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t l = mp_obj_new_list(0, NULL);
-  double a,b;
-  if (mp_int_float(args[0],&a) && mp_int_float(args[1],&b) && a!=b && MP_OBJ_IS_SMALL_INT(args[2]) && MP_OBJ_SMALL_INT_VALUE(args[2])>1){
-    double step=(b-a)/(MP_OBJ_SMALL_INT_VALUE(args[2])-1);
-    if (step*(b-a)<0)
-      step=-step;
-    for (;a<=b;a+=step){
-      mp_obj_list_append(l,mp_obj_new_float(a));
-    }
-    return l;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_linspace_obj, 3, 3, linalg_linspace);
-
-void raisedimerr(){
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Dimension mismatch"));
-}
-
-mp_obj_t mp_obj_new_complex_real(double a,double b){
-  if (b==0)
-    return mp_obj_new_float(a);
-  return mp_obj_new_complex(a,b);
-}
-
-static mp_obj_t linalg_addsub(size_t n_args, const mp_obj_t *args,bool add) {
-  c_complex *x,*y;
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (n1!=n2 || m1!=m2){
-      free(x); free(y);
-      raisedimerr();
-    }
-    c_complex *x_=x,*y_=y;
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      if (m1==0){
-	if (add)
-	  mp_obj_list_append(res,mp_obj_new_complex_real(x->r+y->r,x->i+y->i));
-	else
-	  mp_obj_list_append(res,mp_obj_new_complex_real(x->r-y->r,x->i-y->i));
-	++x; ++y;
-	continue;
-      }
-      mp_obj_t line = mp_obj_new_list(0, NULL);
-      if (add){
-	for (int j=0;j<m1;++j,++x,++y){
-	  mp_obj_list_append(line,mp_obj_new_complex_real(x->r+y->r,x->i+y->i));
-	}
-      }
-      else {
-	for (int j=0;j<m1;++j,++x,++y){
-	  mp_obj_list_append(line,mp_obj_new_complex_real(x->r-y->r,x->i-y->i));
-	}
-      }
-      mp_obj_list_append(res,line);
-    }
-    free(x_); free(y_);
-    return res;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-static mp_obj_t linalg_add(size_t n_args, const mp_obj_t *args) {
-  return linalg_addsub(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_add_obj, 2, 2, linalg_add);
-static mp_obj_t linalg_sub(size_t n_args, const mp_obj_t *args) {
-  return linalg_addsub(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_sub_obj, 2, 2, linalg_sub);
-
-// scalar product of vectors x and y
-c_complex dot(c_complex *x,c_complex *y,int n){
-  c_complex r={0,0};
-  for (int i=0;i<n;++i){
-    r.r += x[i].r*y[i].r-x[i].i*y[i].i;
-    r.i += x[i].r*y[i].i+x[i].i*y[i].r;
-  }
-  return r;
-}
-
-c_complex mult(c_complex a,c_complex b){
-  c_complex c={a.r*b.r-a.i*b.i,a.r*b.i+a.i*b.r};
-  return c;
-}
-
-// transpose matrix in place
-void transpose(c_complex *x,int n,int m){
-  for (int i=1;i<n;++i){
-    for (int j=0;j<i;++j){
-      c_complex * a=x+i*m+j;
-      c_complex * b=x+j*m+i;
-      c_complex t=*a;
-      *a=*b;
-      *b=t;
-    }
-  }
-}
-
-
-static mp_obj_t linalg_dot(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*y; c_complex a;
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (mp_get_c_complex(args[1],&a)){
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      c_complex * x_=x;
-      if (m1==0){
-	for (;x_<x+n1;++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-	}
-	free(x);
-	return res;
-      }
-      for (int i=0;i<n1;++i){
-	mp_obj_t line = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m1;++j,++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-	}
-	mp_obj_list_append(res,line);
-      }
-      free(x);
-      return res;      
-    }
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (m1==0){ // v*M
-      if (m2==0 && n1==n2){
-	c_complex c={0,0};
-	c_complex * x_=x,*y_=y;
-	for (int i=0;i<n1;++i,++x_,++y_){
-	  c.r += x_->r*y_->r-x_->i*y_->i;
-	  c.i += x_->r*y_->i+x_->i*y_->r;
-	}
-	free(x);free(y);
-	return mp_obj_new_complex_real(c.r,c.i);
-      }
-      if (n1!=m2)
-	raisedimerr();
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      for (c_complex * y_=y;y_<y+n2*m2;y_+=m2){
-	c_complex c=dot(x,y_,m2);
-	mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-      }
-      free(x);free(y);
-      return res;
-    }
-    if (m2==0){ // M*v
-      if (n2!=m1)
-	raisedimerr();
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      for (c_complex * x_=x;x_<x+n1*m1;x_+=m1){
-	c_complex c=dot(x_,y,m1);
-	mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-      }
-      free(x);free(y);
-      return res;
-    }
-    if (m1!=n2){
-      free(x); free(y);
-      raisedimerr();
-    }
-    // M1*M2
-    transpose(y,n2,m2);
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      mp_obj_t line = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m2;++j){
-	c_complex c=dot(x+m1*i,y+m1*j,m1);
-	mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-      }
-      mp_obj_list_append(res,line);
-    }
-    free(x); free(y);
-    return res;
-  }
-  if (mp_array2c_complextab(args[1],&y,&n2,&m2)){
-    if (mp_get_c_complex(args[0],&a)){
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      c_complex * x_=y;
-      if (m2==0){
-	for (;x_<x+n2;++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-	}
-	free(y);
-	return res;
-      }
-      for (int i=0;i<n2;++i){
-	mp_obj_t line = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m2;++j,++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-	}
-	mp_obj_list_append(res,line);
-      }
-      free(y);
-      return res;      
-    }
-    free(y);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_dot_obj, 2, 2, linalg_dot);
-
-static mp_obj_t linalg_cross(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*y; 
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1) && n1==3 && m1==0){
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (n2!=3 || m2!=0){
-      free(x);
-      free(y);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    c_complex tmp1,tmp2,A,B,C;
-    c_mul(x[0],y[1],&tmp1);c_mul(x[1],y[0],&tmp2); c_sub(tmp1,tmp2,&C);
-    c_mul(x[2],y[0],&tmp1);c_mul(x[0],y[2],&tmp2); c_sub(tmp1,tmp2,&B);
-    c_mul(x[1],y[2],&tmp1);c_mul(x[2],y[1],&tmp2); c_sub(tmp1,tmp2,&A);
-    free(x);
-    free(y);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    mp_obj_list_append(r,mp_obj_new_complex_real(A.r,A.i));
-    mp_obj_list_append(r,mp_obj_new_complex_real(B.r,B.i));
-    mp_obj_list_append(r,mp_obj_new_complex_real(C.r,C.i));
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_cross_obj, 2, 2, linalg_cross);
-
-static mp_obj_t linalg_transpose(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    transpose(x,n1,m1);
-    mp_obj_t r=c_complextab2mp_array(x,m1,n1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_transpose_obj, 1, 1, linalg_transpose);
-
-static mp_obj_t linalg_rref(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (!c_rref(x,n1,m1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_rref_obj, 1, 1, linalg_rref);
-
-static mp_obj_t linalg_egv(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1 || !c_egv(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_egv_obj, 1, 1, linalg_egv);
-
-static mp_obj_t linalg_eig(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*d;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    d=(c_complex *) malloc(n1*n1*sizeof(c_complex));
-    if (n1!=m1 || !c_eig(x,d,n1)){
-      free(x); free(d);
-    }
-    else {
-      mp_obj_t items[2];
-      items[0]=c_complextab2mp_array(x,n1,m1);
-      items[1]=c_complextab2mp_array(d,n1,m1);
-      mp_obj_t r=mp_obj_new_tuple(2, items);
-      free(x); free(d);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_eig_obj, 1, 1, linalg_eig);
-
-static mp_obj_t linalg_inv(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1){
-      free(x);
-      raisedimerr();
-    }
-    if (!c_inv(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,m1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_inv_obj, 1, 1, linalg_inv);
-
-static mp_obj_t linalg_re(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return args[0];
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_float(R);
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i)
-      x[i].i=0;
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_re_obj, 1, 1, linalg_re);
-
-static mp_obj_t linalg_im(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return mp_obj_new_int(0);
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_float(I);
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].r=x[i].i;
-      x[i].i=0;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_im_obj, 1, 1, linalg_im);
-
-static mp_obj_t linalg_conj(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return args[0];
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_complex(R,-I);
-  }
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].i=-x[i].i;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_conj_obj, 1, 1, linalg_conj);
-
-double c_abs(c_complex c){
-  double x=c.r<0?-c.r:c.r;
-  double y=c.i<0?-c.i:c.i;
-  if (x>y){
-    double t=x;
-    x=y;
-    y=t;
-  }
-  // now x<=y
-  if (y==0) return 0;
-  double t=x/y;
-  return y*sqrt(1+t*t);
-}
-static mp_obj_t linalg_abs(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_SMALL_INT(args[0])){
-    long long i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    if (i>=0)
-      return args[0];
-    return mp_obj_new_int(-i);
-  }
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0])){
-    return mp_obj_new_float(fabs(mp_obj_get_float(args[0])));
-  }
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    R=fabs(R); I=fabs(I);
-    if (R<I){
-      double t=R;
-      R=I;
-      I=t;
-    }
-    double t=I/R;
-    return mp_obj_new_float(R*sqrt(1+t*t));
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].r=c_abs(x[i]);
-      x[i].i=0;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_abs_obj, 1, 1, linalg_abs);
-
-static mp_obj_t linalg_proot(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (m1!=0){
-      free(x);
-      raisedimerr();
-    }
-    if (!c_proot(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1-1,0);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_proot_obj, 1, 1, linalg_proot);
-
-static mp_obj_t linalg_pcoeff(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (m1!=0){
-      free(x);
-      raisedimerr();
-    }
-    c_complex y[n1+1];
-    for (int i=0;i<n1;++i)
-      y[i]=x[i];
-    free(x);
-    if (c_pcoeff(y,n1)){
-      mp_obj_t r=c_complextab2mp_array(y,n1+1,0);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_pcoeff_obj, 1, 1, linalg_pcoeff);
-
-static mp_obj_t linalg_fftifft(size_t n_args, const mp_obj_t *args,bool inverse) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int n2=n1,i;
-    for (i=-1;n2;++i){
-      n2/=2;
-    }
-    if (m1!=0 || n1!=(1<<i)){
-      free(x);
-      raisedimerr();
-    }
-    if (c_fft(x,n1,inverse)){
-      mp_obj_t r=c_complextab2mp_array(x,n1,0);
-      free(x);
-      return r;
-    }
-    free(x);    
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-static mp_obj_t linalg_fft(size_t n_args, const mp_obj_t *args) {
-  return linalg_fftifft(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_fft_obj, 1, 1, linalg_fft);
-static mp_obj_t linalg_ifft(size_t n_args, const mp_obj_t *args) {
-  return linalg_fftifft(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_ifft_obj, 1, 1, linalg_ifft);
-
-/* for a more efficient linear solver, use lu inside the CAS*/
-static mp_obj_t linalg_solve(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t arg[2];
-  arg[0]=linalg_inv(1,args);
-  arg[1]=args[1];
-  return linalg_dot(2,arg);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_solve_obj, 2, 2, linalg_solve);
-
-static mp_obj_t linalg_peval(size_t n_args, const mp_obj_t *args) {
-  c_complex *P,x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&P,&n1,&m1)){
-    if (m1!=0 || !mp_get_c_complex(args[1],&x)){
-      free(P);
-      raisedimerr();
-    }
-    c_complex res={0,0};
-    for (int i=0;i<n1;++i){
-      double r=res.r*x.r-res.i*x.i+P[i].r;
-      res.i=res.r*x.i+res.i*x.r+P[i].i;
-      res.r=r;
-    }
-    if (res.i==0)
-      return mp_obj_new_float(res.r);
-    else
-      return mp_obj_new_complex(res.r,res.i);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_peval_obj, 2, 2, linalg_peval);
-
-static mp_obj_t linalg_apply(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t * elem=0; size_t n=-1;
-  bool recur=false;
-  if (n_args==3 && args[2]==&linalg_matrix_obj)
-    recur=true;
-  if (MP_OBJ_IS_TYPE(args[1],&mp_type_list) || MP_OBJ_IS_TYPE(args[1],&mp_type_tuple))
-    mp_obj_get_array(args[1], &n, &elem);
-  if (MP_OBJ_IS_TYPE(args[0], &mp_type_fun_builtin_1)){
-    if (((int) n)>=0){
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      mp_obj_t args_[2];
-      args_[0]=args[0];
-      for (size_t i=0;i<n;++i){
-	if (recur){
-	  args_[1]=elem[i];
-	  mp_obj_list_append(r,linalg_apply(2,args_));
-	}
-	else
-	  mp_obj_list_append(r,fun_builtin_1_call(args[0],1,0,&elem[i]));	  
-      }
-      return r;
-    }
-    return fun_builtin_1_call(args[0],1,0,args+1);
-  }
-  else {
-    if (((int) n)>=0){
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      mp_obj_t args_[2];
-      args_[0]=args[0];
-      for (size_t i=0;i<n;++i){
-	if (recur){
-	  args_[1]=elem[i];
-	  mp_obj_list_append(r,linalg_apply(2,args_));
-	}
-	else
-	  mp_obj_list_append(r,fun_bc_call(args[0],1,0,&elem[i]));	  
-      }
-      return r;
-    }
-    return fun_bc_call(args[0],1,0,args+1);
-  }
-  //nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_apply_obj, 2, 3, linalg_apply);
-
-static mp_obj_t linalg_det(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1){
-      free(x);
-      raisedimerr();
-    }
-    c_complex r=c_det(x,n1);
-    free(x);
-    return mp_obj_new_complex_real(r.r,r.i);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_det_obj, 1, 1, linalg_det);
-
-static mp_obj_t linalg_zerosones(size_t n_args, const mp_obj_t *args,int v0,int v1) {
-  size_t n1=0,m1=0;
-  if (MP_OBJ_IS_SMALL_INT(args[0]))
-    n1= MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[1]))
-    m1= MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (v0==0 && v1==1)
-    m1=n1;
-  mp_obj_t r = mp_obj_new_list(0, NULL);
-  bool alea=v0==-1;
-  for (int i=0;i<n1;++i){
-    if (m1){
-      mp_obj_t l = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m1;++j){
-	mp_obj_list_append(l, mp_obj_new_float(alea?rand()/(RAND_MAX+1.0):(i==j?v1:v0)));	
-      }
-      mp_obj_list_append(r, l);
-    }
-    else
-      mp_obj_list_append(r, mp_obj_new_float(alea?rand()/(RAND_MAX+1.0):v0));
-  }
-  return r;
-}
-static mp_obj_t linalg_zeros(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,0,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_zeros_obj, 1, 2, linalg_zeros);
-static mp_obj_t linalg_ones(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,1,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_ones_obj, 1, 2, linalg_ones);
-static mp_obj_t linalg_eye(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,0,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_eye_obj, 1, 1, linalg_eye);
-static mp_obj_t linalg_rand(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,-1,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_rand_obj, 1, 2, linalg_rand);
-
-static mp_obj_t linalg_sizeshape(size_t n_args, const mp_obj_t *args,bool shape) {
-  int l=-1,m=0;
-  if (mp_obj_get_type(args[0])==&mp_type_list){
-    mp_obj_list_t *o = MP_OBJ_TO_PTR(args[0]);
-    l=o->len;
-    if (l>0){
-      mp_obj_t obj=o->items[0];
-      if (mp_obj_get_type(obj)==&mp_type_list){
-	o = MP_OBJ_TO_PTR(obj);
-	m=o->len;
-      }
-    }
-  }
-  if (shape){
-    mp_obj_t items[2];
-    items[0]=mp_obj_new_int(l);
-    items[1]=m==0?mp_const_none:mp_obj_new_int(m);
-    mp_obj_t r=mp_obj_new_tuple(2, items);
-    return r;
-  }
-  if (m==0) m=1;
-  return mp_obj_new_int(l*m);
-}
-static mp_obj_t linalg_shape(size_t n_args, const mp_obj_t *args) {
-  return linalg_sizeshape(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_shape_obj, 1, 1, linalg_shape);
-
-static mp_obj_t linalg_size(size_t n_args, const mp_obj_t *args) {
-  return linalg_sizeshape(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_size_obj, 1, 1, linalg_size);
-
-//
-static const mp_rom_map_elem_t linalg_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
-    { MP_ROM_QSTR(MP_QSTR_matrix), (mp_obj_t) &linalg_matrix_obj },
-    { MP_ROM_QSTR(MP_QSTR_arange), (mp_obj_t) &linalg_arange_obj },
-    { MP_ROM_QSTR(MP_QSTR_linspace), (mp_obj_t) &linalg_linspace_obj },
-    { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_cross), (mp_obj_t) &linalg_cross_obj },
-    { MP_ROM_QSTR(MP_QSTR_solve), (mp_obj_t) &linalg_solve_obj },
-    { MP_ROM_QSTR(MP_QSTR_peval), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_horner), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_mul), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_transpose), (mp_obj_t) &linalg_transpose_obj },
-    { MP_ROM_QSTR(MP_QSTR_rref), (mp_obj_t) &linalg_rref_obj },
-    { MP_ROM_QSTR(MP_QSTR_egv), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eigenvects), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t) &linalg_eig_obj },
-    { MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t) &linalg_det_obj },
-    { MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t) &linalg_zeros_obj },
-    { MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t) &linalg_ones_obj },
-    { MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_identity), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_idn), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_rand), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranv), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranm), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_shape), (mp_obj_t) &linalg_shape_obj },
-    { MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t) &linalg_size_obj },
-    { MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t) &linalg_inv_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_proot), (mp_obj_t) &linalg_proot_obj },
-    { MP_ROM_QSTR(MP_QSTR_pcoeff), (mp_obj_t) &linalg_pcoeff_obj },
-    { MP_ROM_QSTR(MP_QSTR_fft), (mp_obj_t) &linalg_fft_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifft), (mp_obj_t) &linalg_ifft_obj },
-    { MP_ROM_QSTR(MP_QSTR_apply), (mp_obj_t) &linalg_apply_obj },
-    { MP_ROM_QSTR(MP_QSTR_add), (mp_obj_t) &linalg_add_obj },
-    { MP_ROM_QSTR(MP_QSTR_sub), (mp_obj_t) &linalg_sub_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_real), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_im), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_imag), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_conj), (mp_obj_t) &linalg_conj_obj },
-    { MP_ROM_QSTR(MP_QSTR_abs), (mp_obj_t) &linalg_abs_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(linalg_locals_dict, linalg_locals_dict_table);
-
-const mp_obj_type_t linalg_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_linalg,
-    .locals_dict = (mp_obj_t)&linalg_locals_dict
-};
-
-
-STATIC const mp_rom_map_elem_t mp_module_linalg_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__linalg) },
-    { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
-    { MP_ROM_QSTR(MP_QSTR_matrix), (mp_obj_t) &linalg_matrix_obj },
-    { MP_ROM_QSTR(MP_QSTR_arange), (mp_obj_t) &linalg_arange_obj },
-    { MP_ROM_QSTR(MP_QSTR_linspace), (mp_obj_t) &linalg_linspace_obj },
-    { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_cross), (mp_obj_t) &linalg_cross_obj },
-    { MP_ROM_QSTR(MP_QSTR_solve), (mp_obj_t) &linalg_solve_obj },
-    { MP_ROM_QSTR(MP_QSTR_peval), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_horner), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_mul), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_transpose), (mp_obj_t) &linalg_transpose_obj },
-    { MP_ROM_QSTR(MP_QSTR_rref), (mp_obj_t) &linalg_rref_obj },
-    { MP_ROM_QSTR(MP_QSTR_egv), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eigenvects), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t) &linalg_eig_obj },
-    { MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t) &linalg_det_obj },
-    { MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t) &linalg_zeros_obj },
-    { MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t) &linalg_ones_obj },
-    { MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_identity), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_idn), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_rand), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranv), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranm), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_shape), (mp_obj_t) &linalg_shape_obj },
-    { MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t) &linalg_size_obj },
-    { MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t) &linalg_inv_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_proot), (mp_obj_t) &linalg_proot_obj },
-    { MP_ROM_QSTR(MP_QSTR_pcoeff), (mp_obj_t) &linalg_pcoeff_obj },
-    { MP_ROM_QSTR(MP_QSTR_fft), (mp_obj_t) &linalg_fft_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifft), (mp_obj_t) &linalg_ifft_obj },
-    { MP_ROM_QSTR(MP_QSTR_apply), (mp_obj_t) &linalg_apply_obj },
-    { MP_ROM_QSTR(MP_QSTR_add), (mp_obj_t) &linalg_add_obj },
-    { MP_ROM_QSTR(MP_QSTR_sub), (mp_obj_t) &linalg_sub_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_real), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_im), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_imag), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_conj), (mp_obj_t) &linalg_conj_obj },
-    { MP_ROM_QSTR(MP_QSTR_abs), (mp_obj_t) &linalg_abs_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_linalg_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_linalg_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_linalg_globals_table),
-        .table = (mp_map_elem_t*)mp_module_linalg_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_linalg = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_linalg_globals,
-};
-
-
-/* TURTLE, using caseval */
-void turtle_freeze();
-
-mp_obj_t turtle_ret(const char * val){
-  if (strncmp(val,"\"Done",5)==0)
-    return mp_const_none;
-  return mp_obj_new_str(val,strlen(val));  
-}
-
-static mp_obj_t turtle_forward(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=10;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"avance(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_forward_obj, 0, 1, turtle_forward);
-
-static mp_obj_t turtle_backward(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=10;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"recule(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_backward_obj, 0, 1, turtle_backward);
-
-static mp_obj_t turtle_left(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  char buf[256];
-  sprintf(buf,"tourne_gauche(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_left_obj, 0, 1, turtle_left);
-
-static mp_obj_t turtle_right(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  char buf[256];
-  sprintf(buf,"tourne_droite(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_right_obj, 0, 1, turtle_right);
-
-static mp_obj_t turtle_reset(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("efface(0,0):;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_reset_obj, 0, 0, turtle_reset);
-
-static mp_obj_t turtle_dessine_tortue(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("efface(0,0):;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_dessine_tortue_obj, 0, 0, turtle_dessine_tortue);
-
-static mp_obj_t turtle_circle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=0,y=0,z=360;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[2])) {
-    z=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  }
-  else {
-    if (n_args==2){
-      z=y;
-      y=0;
-    }
-  }
-  char buf[256];
-  sprintf(buf,"rond(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_circle_obj, 1, 3, turtle_circle);
-
-static mp_obj_t turtle_disque(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=0,y=0,z=360;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[2])) {
-    z=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  }
-  else {
-    if (n_args==2){
-      z=y;
-      y=0;
-    }
-  }
-  char buf[256];
-  sprintf(buf,"disque(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_disque_obj, 1, 3, turtle_disque);
-
-static mp_obj_t turtle_rectangle_plein(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=10,y=10;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    y=x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  char buf[256];
-  sprintf(buf,"rectangle_plein(%i,%i):;",x,y);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_rectangle_plein_obj, 1, 2, turtle_rectangle_plein);
-
-static mp_obj_t turtle_triangle_plein(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=10,y=10,z=60;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    y=x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args>=3 && MP_OBJ_IS_SMALL_INT(args[2])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  char buf[256];
-  sprintf(buf,"triangle_plein(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_triangle_plein_obj, 1, 3, turtle_triangle_plein);
-
-static mp_obj_t turtle_showturtle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("montre_tortue():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_showturtle_obj, 0, 0, turtle_showturtle);
-
-static mp_obj_t turtle_hideturtle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("cache_tortue():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_hideturtle_obj, 0, 0, turtle_hideturtle);
-
-static mp_obj_t turtle_down(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("baisse_crayon():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_down_obj, 0, 0, turtle_down);
-
-static mp_obj_t turtle_up(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("leve_crayon():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_up_obj, 0, 0, turtle_up);
-
-static mp_obj_t turtle_saute(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"saute(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_saute_obj, 1, 1, turtle_saute);
-
-static mp_obj_t turtle_pas_de_cote(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"pas_de_cote(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_pas_de_cote_obj, 1, 1, turtle_pas_de_cote);
-
-static mp_obj_t turtle_setheading(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"cap(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setheading_obj, 0, 1, turtle_setheading);
-
-static mp_obj_t turtle_setposition(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=0,y=0;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  char buf[256];
-  sprintf(buf,"position(%i,%i):;",x,y);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setposition_obj, 2, 2, turtle_setposition);
-
-static mp_obj_t turtle_setx(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"position(%i,position()[1]):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setx_obj, 0, 1, turtle_setx);
-
-static mp_obj_t turtle_sety(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"position(position()[0],%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_sety_obj, 0, 1, turtle_sety);
-
-static mp_obj_t turtle_write(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  char buf[256];
-  sprintf(buf,"ecris(%s):;",mp_obj_str_get_str(args[0]));
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_write_obj, 1, 1, turtle_write);
-
-static mp_obj_t turtle_pencolor(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  char buf[256]="crayon";
-  if (n_args==1){
-    if (MP_OBJ_IS_STR(args[0]))
-      sprintf(buf,"crayon(%s):;",mp_obj_str_get_str(args[0]));
-    if (MP_OBJ_IS_SMALL_INT(args[0])) {
-      i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-      sprintf(buf,"crayon(%i):;",i);
-    }
-    if (strlen(buf)==6){
-      size_t n=0; mp_obj_t * tab=0;
-      mp_obj_get_array(args[0],&n,&tab);
-      if (n==3 &&  mp_obj_is_float(tab[0]) && mp_obj_is_float(tab[1]) && mp_obj_is_float(tab[2])){
-	sprintf(buf,"crayon(%.3g,%.3g,%.3g):;",mp_obj_get_float(tab[0]),mp_obj_get_float(tab[1]),mp_obj_get_float(tab[2]));
-      }
-      if (n==3 &&  MP_OBJ_IS_SMALL_INT(tab[0]) && MP_OBJ_IS_SMALL_INT(tab[1]) && MP_OBJ_IS_SMALL_INT(tab[2])){
-	sprintf(buf,"crayon(%i,%i,%i):;",(int)MP_OBJ_SMALL_INT_VALUE(tab[0]),(int)MP_OBJ_SMALL_INT_VALUE(tab[1]),(int)MP_OBJ_SMALL_INT_VALUE(tab[2]));
-      }
-    }
-  }
-  if (n_args==3 && mp_obj_is_float(args[0]) && mp_obj_is_float(args[1]) && mp_obj_is_float(args[2]) ){
-    sprintf(buf,"crayon(%.3g,%.3g,%.3g):;",mp_obj_get_float(args[0]),mp_obj_get_float(args[1]),mp_obj_get_float(args[2]));
-  }
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_pencolor_obj, 0, 3, turtle_pencolor);
-
-static mp_obj_t turtle_speed(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"speed(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_speed_obj, 0, 1, turtle_speed);
-
-static const mp_map_elem_t turtle_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_forward), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_fd), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_backward), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_bk), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_left), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_lt), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_right), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rt), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_disque), (mp_obj_t) &turtle_disque_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rectangle_plein), (mp_obj_t) &turtle_rectangle_plein_obj },
-	{ MP_ROM_QSTR(MP_QSTR_triangle_plein), (mp_obj_t) &turtle_triangle_plein_obj },
-	{ MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_dessine_tortue), (mp_obj_t) &turtle_dessine_tortue_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setheading), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_seth), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setposition), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_goto), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setpos), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setx), (mp_obj_t) &turtle_setx_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sety), (mp_obj_t) &turtle_sety_obj },
-	{ MP_ROM_QSTR(MP_QSTR_write), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_speed), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_showturtle), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_st), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_hideturtle), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ht), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_down), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_saute), (mp_obj_t) &turtle_saute_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pas_de_cote), (mp_obj_t) &turtle_pas_de_cote_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pendown), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pd), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_up), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_penup), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pu), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t) &turtle_pencolor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_avance), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_av), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_recule), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_gauche), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tg), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_droite), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_td), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rond), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_efface), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cap), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_heading), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pos), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_position), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ecris), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vitesse_tortue), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_montre_tortue), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cache_tortue), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_baisse_crayon), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_leve_crayon), (mp_obj_t) &turtle_up_obj },
-	/* { MP_ROM_QSTR(MP_QSTR_time), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sleep), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_monotonic), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_time), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sleep), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pensize), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_width), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_isdown), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_isvisible), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_color), (mp_obj_t) &turtle_up_obj },*/
-
-};
-
-
-static MP_DEFINE_CONST_DICT(turtle_locals_dict, turtle_locals_dict_table);
-
-const mp_obj_type_t turtle_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_turtle,
-    .locals_dict = (mp_obj_t)&turtle_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_turtle_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__turtle) },
-    { MP_ROM_QSTR(MP_QSTR_forward), (mp_obj_t) &turtle_forward_obj },
-    { MP_ROM_QSTR(MP_QSTR_fd), (mp_obj_t) &turtle_forward_obj },
-    { MP_ROM_QSTR(MP_QSTR_backward), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_bk), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_left), (mp_obj_t) &turtle_left_obj },
-    { MP_ROM_QSTR(MP_QSTR_lt), (mp_obj_t) &turtle_left_obj },
-    { MP_ROM_QSTR(MP_QSTR_right), (mp_obj_t) &turtle_right_obj },
-    { MP_ROM_QSTR(MP_QSTR_rt), (mp_obj_t) &turtle_right_obj },
-    { MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t) &turtle_reset_obj },
-    { MP_ROM_QSTR(MP_QSTR_dessine_tortue), (mp_obj_t) &turtle_dessine_tortue_obj },
-    { MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t) &turtle_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_disque), (mp_obj_t) &turtle_disque_obj },
-    { MP_ROM_QSTR(MP_QSTR_rectangle_plein), (mp_obj_t) &turtle_rectangle_plein_obj },
-    { MP_ROM_QSTR(MP_QSTR_triangle_plein), (mp_obj_t) &turtle_triangle_plein_obj },
-    { MP_ROM_QSTR(MP_QSTR_setheading), (mp_obj_t) &turtle_setheading_obj },
-    { MP_ROM_QSTR(MP_QSTR_goto), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_seth), (mp_obj_t) &turtle_setheading_obj },
-    { MP_ROM_QSTR(MP_QSTR_setposition), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_setpos), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_setx), (mp_obj_t) &turtle_setx_obj },
-    { MP_ROM_QSTR(MP_QSTR_sety), (mp_obj_t) &turtle_sety_obj },
-    { MP_ROM_QSTR(MP_QSTR_write), (mp_obj_t) &turtle_write_obj },
-    { MP_ROM_QSTR(MP_QSTR_speed), (mp_obj_t) &turtle_speed_obj },
-    { MP_ROM_QSTR(MP_QSTR_showturtle), (mp_obj_t) &turtle_showturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_st), (mp_obj_t) &turtle_showturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_hideturtle), (mp_obj_t) &turtle_hideturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_ht), (mp_obj_t) &turtle_hideturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_down), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_saute), (mp_obj_t) &turtle_saute_obj },
-    { MP_ROM_QSTR(MP_QSTR_pas_de_cote), (mp_obj_t) &turtle_pas_de_cote_obj },
-    { MP_ROM_QSTR(MP_QSTR_pendown), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_pd), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_up), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_penup), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_pu), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t) &turtle_pencolor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_avance), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_av), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_recule), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_gauche), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tg), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_droite), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_td), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rond), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_efface), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cap), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_position), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ecris), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vitesse_tortue), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_montre_tortue), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cache_tortue), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_baisse_crayon), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_leve_crayon), (mp_obj_t) &turtle_up_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_turtle_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_turtle_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_turtle_globals_table),
-        .table = (mp_map_elem_t*)mp_module_turtle_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_turtle = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_turtle_globals,
-};
-
-/* MATPLOTL */
-static mp_obj_t matplotl_show(size_t n_args, const mp_obj_t *args) {
-  const char * val=caseval("show()");
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_show_obj, 0, 0, matplotl_show);
-
-static mp_obj_t matplotl_clf(size_t n_args, const mp_obj_t *args) {
-  const char * val=caseval("erase()");
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_clf_obj, 0, 0, matplotl_clf);
-
-static mp_obj_t matplotl_axis(size_t n_args, const mp_obj_t *args) {
-  if (n_args==0)
-    turtle_ret("axis: Autoscale");
-  double *x=0; size_t n=0,m=0;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    sprintf(buf,"axis(%s):;",ptr);
-    free(ptr);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  if (n_args==4){
-    double a=0,b=0,c=0,d=0;
-    if (mp_obj_is_float(args[0]))
-      a=mp_obj_get_float(args[0]);
-    if (MP_OBJ_IS_INT(args[0]))
-      a=mp_obj_get_int(args[0]);
-    if (mp_obj_is_float(args[1]))
-      b=mp_obj_get_float(args[1]);
-    if (MP_OBJ_IS_INT(args[1]))
-      b=mp_obj_get_int(args[1]);
-    if (mp_obj_is_float(args[2]))
-      c=mp_obj_get_float(args[2]);
-    if (MP_OBJ_IS_INT(args[2]))
-      c=mp_obj_get_int(args[2]);
-    if (mp_obj_is_float(args[3]))
-      d=mp_obj_get_float(args[3]);
-    if (MP_OBJ_IS_INT(args[3]))
-      d=mp_obj_get_int(args[3]);
-    if (a<b && c<d){
-      char buf[256]="";
-#ifdef NUMWORKS
-      strcat(buf,"axis(");
-      strcat_double(buf,a);
-      strcat(buf,",");
-      strcat_double(buf,b);
-      strcat(buf,",");
-      strcat_double(buf,c);
-      strcat(buf,",");
-      strcat_double(buf,d);
-      strcat(buf,"):;");
-#else      
-      sprintf(buf,"axis(%.14g,%.14g,%.14g,%.14g):;",a,b,c,d);
-#endif
-      const char * val=caseval(buf);
-      return turtle_ret(val);
-    }
-  }
-  return turtle_ret("axis: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_axis_obj, 0, 4, matplotl_axis);
-
-static mp_obj_t matplotl_text(size_t n_args, const mp_obj_t *args) {
-  double a=0,b=0;
-  if (mp_obj_is_float(args[0]))
-    a=mp_obj_get_float(args[0]);
-  if (MP_OBJ_IS_INT(args[0]))
-    a=mp_obj_get_int(args[0]);
-  if (mp_obj_is_float(args[1]))
-    b=mp_obj_get_float(args[1]);
-  if (MP_OBJ_IS_INT(args[1]))
-    b=mp_obj_get_int(args[1]);
-  if (MP_OBJ_IS_STR(args[2])){
-    char buf[256]="";
-#ifdef NUMWORKS
-    strcat(buf,"legend(point(");
-    strcat_double(buf,a);
-    strcat(buf,",");
-    strcat_double(buf,b);
-    char buf2[64];
-    sprintf(buf2,"),%s):;",mp_obj_str_get_str(args[2]));
-    strcat(buf,buf2);
-#else      
-    sprintf(buf,"legend(point(%.14g,%.14g),%s):;",a,b,mp_obj_str_get_str(args[2]));
-#endif
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("text: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_text_obj, 3, 3, matplotl_text);
-
-static mp_obj_t matplotl_plot(size_t n_args, const mp_obj_t *args) {
-  double *x=0,*y=0; size_t n=0,m=0,n1=0,m1=0;
-  int col=0;
-  if (n_args>=3)
-    col=mp_get_color(args[2]);
-  if (mp_array2doubletab(args[0],&x,&n,&m)){ 
-    char * ptrx=printtab(x,n,m);
-    free(x); 
-    char bufx[strlen(ptrx)+1];
-    strcpy(bufx,ptrx);
-    free(ptrx);
-    if (mp_array2doubletab(args[1],&y,&n1,&m1)){
-      char * ptry=printtab(y,n1,m1);
-      free(y);
-      char bufy[strlen(ptry)+1];
-      strcpy(bufy,ptry);
-      free(ptry);
-      if (n1==n && m==0 && m1==0){
-	char buf2[strlen(bufx)+strlen(bufy)+256];
-	sprintf(buf2,"polygonplot(%s,%s,color=%i):;",bufx,bufy,col>=0?col:0);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-    }
-  }
-  double xx=0,yy=0;
-  if (n_args>=2 && mp_int_float(args[0],&xx) && mp_int_float(args[1],&yy)){
-    char buf[512]="";
-#ifdef NUMWORKS
-    strcat(buf,"legend(point(");
-    strcat_double(buf,xx);
-    strcat(buf,",");
-    strcat_double(buf,yy);
-#else      
-    sprintf(buf,"point(%.14g,%.14g",xx,yy);
-#endif
-    if (col==-1)
-      sprintf(buf,",display=\"%s\"):;",translate_point_type(mp_obj_str_get_str(args[2])));
-    else
-      sprintf(buf,",color=%i):;",col);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("polygonplot: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_plot_obj, 2, 3, matplotl_plot);
-
-static mp_obj_t matplotl_bar_hist(size_t n_args, const mp_obj_t *args,bool bar) {
-  double *x=0; size_t n=0,m=0;
-  double largeur=0.8;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    if (n_args==1)
-      sprintf(buf,bar?"barplot(%s):;":"histogram(%s):;",ptr);
-    else
-      sprintf(buf,bar?"barplot(%s":"histogram(%s",ptr);
-    free(ptr);
-    if (n_args>=2){
-      if (mp_obj_is_float(args[1]))
-	largeur=mp_obj_get_float(args[1]);
-      if (n_args==3 && mp_obj_is_float(args[2]))
-	largeur=mp_obj_get_float(args[2]);
-      if (mp_array2doubletab(args[1],&x,&n,&m)){
-	ptr=printtab(x,n,m);
-	free(x);
-	char buf2[strlen(buf)+strlen(ptr)+256];
-	sprintf(buf2,"%s,%s,%.3g):;",buf,ptr,largeur);
-	free(ptr);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-      char buf2[strlen(buf)+256];
-      sprintf(buf2,"%s,%.3g):;",buf,largeur);
-      const char * val=caseval(buf2);
-      return turtle_ret(val);
-    }
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret(bar?"barplot: Bad argument type":"histogram: Bad argument type");
-}
-static mp_obj_t matplotl_bar(size_t n_args, const mp_obj_t *args) {
-  return matplotl_bar_hist(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_bar_obj, 1, 3, matplotl_bar);
-
-static mp_obj_t matplotl_hist(size_t n_args, const mp_obj_t *args) {
-  return matplotl_bar_hist(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_hist_obj, 1, 3, matplotl_hist);
-
-static mp_obj_t matplotl_boxplot(size_t n_args, const mp_obj_t *args) {
-  double *x=0; size_t n=0,m=0;
-  int col=0;
-  if (n_args==2)
-    col=mp_get_color(args[1]);
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    sprintf(buf,"moustache(%s,color=%i):;",ptr,col>=0?col:0);
-    free(ptr);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("moustache: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_boxplot_obj, 1, 2, matplotl_boxplot);
-
-static mp_obj_t matplotl_arrow(size_t n_args, const mp_obj_t *args) {
-  double a=0,b=0,c=0,d=d;
-  int col=0;
-  if (n_args==5)
-    col=mp_get_color(args[4]);
-  if (mp_int_float(args[0],&a) && mp_int_float(args[1],&b) &&
-      mp_int_float(args[2],&c) && mp_int_float(args[3],&d)){
-    char buf[512]="";
-#ifdef NUMWORKS
-    strcat(buf,"vector([");
-    strcat_double(buf,a);
-    strcat(buf,",");
-    strcat_double(buf,b);
-    strcat(buf,"],[");
-    strcat_double(buf,c);
-    strcat(buf,",");
-    strcat_double(buf,d);
-    char buf2[64];
-    sprintf(buf2,"],color=%i):;",col);
-    strcat(buf,buf2);
-#else          
-    sprintf(buf,"vector([%.14g,%.14g],[%.14g,%.14g],color=%i):;",a,b,c,d,col);
-#endif
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("vector: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_arrow_obj, 4, 5, matplotl_arrow);
-
-static mp_obj_t matplotl_grid(size_t n_args, const mp_obj_t *args) {
-  bool b=true;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_SMALL_INT_VALUE(args[0])==0)
-    b=false;
-  char buf[64];
-  sprintf(buf,"axes=%i",b?1:0);
-  const char * val=caseval(buf);
-  return turtle_ret(val);  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_grid_obj, 0, 1, matplotl_grid);
-
-static mp_obj_t matplotl_scatter_reg(size_t n_args, const mp_obj_t *args,bool scatter) {
-  int col=0;
-  if (n_args==3)
-    col=mp_get_color(args[2]);
-  double *x=0,*y=0; size_t n=0,m=0,n1=0,m1=0;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){ 
-    char * ptrx=printtab(x,n,m);
-    free(x); 
-    char bufx[strlen(ptrx)+1];
-    strcpy(bufx,ptrx);
-    free(ptrx);
-    if (mp_array2doubletab(args[1],&y,&n1,&m1)){
-      char * ptry=printtab(y,n1,m1);
-      free(y);
-      char bufy[strlen(ptry)+1];
-      strcpy(bufy,ptry);
-      free(ptry);
-      if (n1==n && m==0 && m1==0){
-	char buf2[strlen(bufx)+strlen(bufy)+256];
-	if (scatter)
-	  sprintf(buf2,"scatterplot(%s,%s,color=%i):;",bufx,bufy,col);
-	else
-	  sprintf(buf2,"linear_regression_plot(%s,%s,color=%i):;",bufx,bufy,col);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-    }
-  }
-  return turtle_ret("scatterplot: Bad argument type");
-}
-static mp_obj_t matplotl_scatter(size_t n_args, const mp_obj_t *args) {
-  return matplotl_scatter_reg(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_scatter_obj, 2, 3, matplotl_scatter);
-static mp_obj_t matplotl_linear_regression_plot(size_t n_args, const mp_obj_t *args) {
-  return matplotl_scatter_reg(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_linear_regression_plot_obj, 2, 3, matplotl_linear_regression_plot);
-
-//
-static const mp_map_elem_t matplotl_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &matplotl_show_obj },
-	{ MP_ROM_QSTR(MP_QSTR_clf), (mp_obj_t) &matplotl_clf_obj },
-	{ MP_ROM_QSTR(MP_QSTR_axis), (mp_obj_t) &matplotl_axis_obj },
-	{ MP_ROM_QSTR(MP_QSTR_text), (mp_obj_t) &matplotl_text_obj },
-	{ MP_ROM_QSTR(MP_QSTR_plot), (mp_obj_t) &matplotl_plot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_bar), (mp_obj_t) &matplotl_bar_obj },
-	{ MP_ROM_QSTR(MP_QSTR_hist), (mp_obj_t) &matplotl_hist_obj },
-	{ MP_ROM_QSTR(MP_QSTR_histogram), (mp_obj_t) &matplotl_hist_obj },
-	{ MP_ROM_QSTR(MP_QSTR_boxplot), (mp_obj_t) &matplotl_boxplot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_boxwhisker), (mp_obj_t) &matplotl_boxplot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_arrow), (mp_obj_t) &matplotl_arrow_obj },
-	{ MP_ROM_QSTR(MP_QSTR_grid), (mp_obj_t) &matplotl_grid_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vector), (mp_obj_t) &matplotl_arrow_obj },
-	{ MP_ROM_QSTR(MP_QSTR_barplot), (mp_obj_t) &matplotl_bar_obj },
-	{ MP_ROM_QSTR(MP_QSTR_scatter), (mp_obj_t) &matplotl_scatter_obj },
-	{ MP_ROM_QSTR(MP_QSTR_linear_regression_plot), (mp_obj_t) &matplotl_linear_regression_plot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_scatterplot), (mp_obj_t) &matplotl_scatter_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(matplotl_locals_dict, matplotl_locals_dict_table);
-
-const mp_obj_type_t matplotl_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_matplotl,
-    .locals_dict = (mp_obj_t)&matplotl_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_matplotl_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__matplotl) },
-    { MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &matplotl_show_obj },
-    { MP_ROM_QSTR(MP_QSTR_clf), (mp_obj_t) &matplotl_clf_obj },
-    { MP_ROM_QSTR(MP_QSTR_axis), (mp_obj_t) &matplotl_axis_obj },
-    { MP_ROM_QSTR(MP_QSTR_text), (mp_obj_t) &matplotl_text_obj },
-    { MP_ROM_QSTR(MP_QSTR_plot), (mp_obj_t) &matplotl_plot_obj },
-    { MP_ROM_QSTR(MP_QSTR_boxplot), (mp_obj_t) &matplotl_boxplot_obj },
-    { MP_ROM_QSTR(MP_QSTR_boxwhisker), (mp_obj_t) &matplotl_boxplot_obj },
-    { MP_ROM_QSTR(MP_QSTR_arrow), (mp_obj_t) &matplotl_arrow_obj },
-    { MP_ROM_QSTR(MP_QSTR_grid), (mp_obj_t) &matplotl_grid_obj },
-    { MP_ROM_QSTR(MP_QSTR_vector), (mp_obj_t) &matplotl_arrow_obj },
-    { MP_ROM_QSTR(MP_QSTR_bar), (mp_obj_t) &matplotl_bar_obj },
-    { MP_ROM_QSTR(MP_QSTR_hist), (mp_obj_t) &matplotl_hist_obj },
-    { MP_ROM_QSTR(MP_QSTR_histogram), (mp_obj_t) &matplotl_hist_obj },
-    { MP_ROM_QSTR(MP_QSTR_barplot), (mp_obj_t) &matplotl_bar_obj },
-    { MP_ROM_QSTR(MP_QSTR_scatter), (mp_obj_t) &matplotl_scatter_obj },
-    { MP_ROM_QSTR(MP_QSTR_linear_regression_plot), (mp_obj_t) &matplotl_linear_regression_plot_obj },
-    { MP_ROM_QSTR(MP_QSTR_scatterplot), (mp_obj_t) &matplotl_scatter_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_matplotl_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_matplotl_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_matplotl_globals_table),
-        .table = (mp_map_elem_t*)mp_module_matplotl_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_matplotl = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_matplotl_globals,
-};
-
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/input.c~ b/apps/KhiCAS/src/micropython-1.12/nspire/input.c~
deleted file mode 100644
index 97df2cca2..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/input.c~
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <nspireio/nspireio.h>
-
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "input.h"
-
-#ifdef MICROPY_LIB
-const char * console_input(const char * msg1,const char * msg2,bool numeric,int ypos);
-#endif
-
-char *prompt(char *p) {
-#ifdef MICROPY_LIB
-  return strdup(console_input(p,"? ",false,185));
-#else
-    static char buf[256];
-    fputs(p, stdout);
-    char *s = nio_fgets(buf, sizeof(buf), nio_get_default());
-    if(!s)
-        return NULL;
-
-    return strdup(buf);
-#endif
-}
-
-STATIC mp_obj_t mp_builtin_input(uint n_args, const mp_obj_t *args) {
-    if (n_args == 1) {
-        mp_obj_print(args[0], PRINT_STR);
-    }
-
-    char *line = prompt("");
-    if (line == NULL) {
-        nlr_raise(mp_obj_new_exception(&mp_type_EOFError));
-    }
-    mp_obj_t o = mp_obj_new_str(line, strlen(line));
-    free(line);
-    return o;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj, 0, 1, mp_builtin_input);
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/input.h~ b/apps/KhiCAS/src/micropython-1.12/nspire/input.h~
deleted file mode 100644
index 7623a8718..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/input.h~
+++ /dev/null
@@ -1,2 +0,0 @@
-char *prompt(char *p);
-
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/log~ b/apps/KhiCAS/src/micropython-1.12/nspire/log~
deleted file mode 100644
index cd4786f14..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/log~
+++ /dev/null
@@ -1,10 +0,0 @@
-python ../py/makeversionhdr.py build/genhdr/mpversion.h
-GEN build/genhdr/qstrdefs.collected.h
-python ../py/makeqstrdefs.py cat build/genhdr/qstr.i.last build/genhdr/qstr build/genhdr/qstrdefs.collected.h
-QSTR not updated
-LINK micropython
-nspire-gcc -o micropython build/py/mpstate.o build/py/nlrx86.o build/py/nlrx64.o build/py/nlrthumb.o build/py/nlrxtensa.o build/py/nlrsetjmp.o build/py/malloc.o build/py/gc.o build/py/qstr.o build/py/vstr.o build/py/mpprint.o build/py/unicode.o build/py/mpz.o build/py/reader.o build/py/lexer.o build/py/parse.o build/py/scope.o build/py/compile.o build/py/emitcommon.o build/py/emitbc.o build/py/asmbase.o build/py/asmx64.o build/py/emitnx64.o build/py/asmx86.o build/py/emitnx86.o build/py/asmthumb.o build/py/emitnthumb.o build/py/emitinlinethumb.o build/py/asmarm.o build/py/emitnarm.o build/py/asmxtensa.o build/py/emitnxtensa.o build/py/emitinlinextensa.o build/py/formatfloat.o build/py/parsenumbase.o build/py/parsenum.o build/py/emitglue.o build/py/persistentcode.o build/py/runtime.o build/py/runtime_utils.o build/py/scheduler.o build/py/nativeglue.o build/py/stackctrl.o build/py/argcheck.o build/py/warning.o build/py/map.o build/py/obj.o build/py/objarray.o build/py/objattrtuple.o build/py/objbool.o build/py/objboundmeth.o build/py/objcell.o build/py/objclosure.o build/py/objcomplex.o build/py/objdict.o build/py/objenumerate.o build/py/objexcept.o build/py/objfilter.o build/py/objfloat.o build/py/objfun.o build/py/objgenerator.o build/py/objgetitemiter.o build/py/objint.o build/py/objint_longlong.o build/py/objint_mpz.o build/py/objlist.o build/py/objmap.o build/py/objmodule.o build/py/objobject.o build/py/objpolyiter.o build/py/objproperty.o build/py/objnone.o build/py/objnamedtuple.o build/py/objrange.o build/py/objreversed.o build/py/objset.o build/py/objsingleton.o build/py/objslice.o build/py/objstr.o build/py/objstrunicode.o build/py/objstringio.o build/py/objtuple.o build/py/objtype.o build/py/objzip.o build/py/opmethods.o build/py/sequence.o build/py/stream.o build/py/binary.o build/py/builtinimport.o build/py/builtinevex.o build/py/builtinhelp.o build/py/modarray.o build/py/modbuiltins.o build/py/modcollections.o build/py/modgc.o build/py/modio.o build/py/modmath.o build/py/modcmath.o build/py/modmicropython.o build/py/modstruct.o build/py/modsys.o build/py/moduerrno.o build/py/modthread.o build/py/vm.o build/py/bc.o build/py/showbc.o build/py/repl.o build/py/smallint.o build/py/frozenmod.o build/py/../extmod/moductypes.o build/py/../extmod/modujson.o build/py/../extmod/modure.o build/py/../extmod/moduzlib.o build/py/../extmod/moduheapq.o build/py/../extmod/modutimeq.o build/py/../extmod/moduhashlib.o build/py/../extmod/modubinascii.o build/py/../extmod/virtpin.o build/py/../extmod/machine_mem.o build/py/../extmod/machine_pinbase.o build/py/../extmod/machine_signal.o build/py/../extmod/machine_pulse.o build/py/../extmod/machine_i2c.o build/py/../extmod/machine_spi.o build/py/../extmod/modussl_axtls.o build/py/../extmod/modussl_mbedtls.o build/py/../extmod/modurandom.o build/py/../extmod/moduselect.o build/py/../extmod/modwebsocket.o build/py/../extmod/modwebrepl.o build/py/../extmod/modframebuf.o build/py/../extmod/vfs.o build/py/../extmod/vfs_reader.o build/py/../extmod/vfs_fat.o build/py/../extmod/vfs_fat_diskio.o build/py/../extmod/vfs_fat_file.o build/py/../extmod/vfs_fat_misc.o build/py/../extmod/utime_mphal.o build/py/../extmod/uos_dupterm.o build/py/../lib/embed/abort_.o build/py/../lib/utils/printf.o build/./unix_mphal.o build/./modos.o build/./texture.o build/./gccollect.o build/./modnsp.o build/./input.o build/./file.o build/./main.o   -lm  -Wl,--nspireio
-arm-none-eabi-ld: /home/parisse/Ndless/ndless-sdk/bin/../system/crt0.o: in function `__base':
-(.text+0x1c): undefined reference to `main'
-collect2: erreur: ld a retourné le statut de sortie 1
-make: *** [../py/mkrules.mk:132: micropython] Error 1
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/main.c~ b/apps/KhiCAS/src/micropython-1.12/nspire/main.c~
deleted file mode 100644
index 8372764cf..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/main.c~
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <libndls.h>
-
-#include "py/mpstate.h"
-#include "py/nlr.h"
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-#include "py/repl.h"
-#include "py/gc.h"
-#include "py/stackctrl.h"
-#include "py/mphal.h"
-#include "py/mpthread.h"
-#include "extmod/misc.h"
-#include "genhdr/mpversion.h"
-#include "input.h"
-
-// Command line options, with their defaults
-// STATIC uint emit_opt = MP_EMIT_OPT_NONE;
-
-#if MICROPY_ENABLE_GC
-// Heap size of GC heap (if enabled)
-// Make it larger on a 64 bit machine, because pointers are larger.
-long heap_size = 1024*1024 * (sizeof(mp_uint_t) / 4);
-#endif
-
-void console_output(const char *,int);
-STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
-  console_output(str,len); return;
-    (void)env;
-    ssize_t dummy = write(STDERR_FILENO, str, len);
-    mp_uos_dupterm_tx_strn(str, len);
-    (void)dummy;
-}
-
-const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
-
-#define FORCED_EXIT (0x100)
-// If exc is SystemExit, return value where FORCED_EXIT bit set,
-// and lower 8 bits are SystemExit value. For all other exceptions,
-// return 1.
-STATIC int handle_uncaught_exception(mp_obj_base_t *exc) {
-    // check for SystemExit
-    if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
-        // None is an exit value of 0; an int is its value; anything else is 1
-        mp_obj_t exit_val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(exc));
-        mp_int_t val = 0;
-        if (exit_val != mp_const_none && !mp_obj_get_int_maybe(exit_val, &val)) {
-            val = 1;
-        }
-        return FORCED_EXIT | (val & 255);
-    }
-
-    // Report all other exceptions
-    mp_obj_print_exception(&mp_stderr_print, MP_OBJ_FROM_PTR(exc));
-    return 1;
-}
-
-#define LEX_SRC_STR (1)
-#define LEX_SRC_VSTR (2)
-#define LEX_SRC_FILENAME (3)
-#define LEX_SRC_STDIN (4)
-
-// Returns standard error codes: 0 for success, 1 for all other errors,
-// except if FORCED_EXIT bit is set then script raised SystemExit and the
-// value of the exit is in the lower 8 bits of the return value
-STATIC int execute_from_lexer(int source_kind, const void *source, mp_parse_input_kind_t input_kind, bool is_repl) {
-
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        // create lexer based on source kind
-        mp_lexer_t *lex;
-        if (source_kind == LEX_SRC_STR) {
-            const char *line = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, line, strlen(line), false);
-        } else if (source_kind == LEX_SRC_VSTR) {
-            const vstr_t *vstr = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, false);
-        } else if (source_kind == LEX_SRC_FILENAME) {
-            lex = mp_lexer_new_from_file((const char*)source);
-        } else { // LEX_SRC_STDIN
-            lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, 0, false);
-        }
-
-        qstr source_name = lex->source_name;
-
-        #if MICROPY_PY___FILE__
-        if (input_kind == MP_PARSE_FILE_INPUT) {
-            mp_store_global(MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
-        }
-        #endif
-	parser_errorline=0; parser_errorcol=0;
-        mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
-
-        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, is_repl);
-
-        // execute it
-        mp_call_function_0(module_fun);
-        // check for pending exception
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
-        }
-
-        nlr_pop();
-        return 0;
-    } else {
-        // uncaught exception
-        return handle_uncaught_exception(nlr.ret_val);
-    }
-}
-
-STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
-    int l1 = strlen(s1);
-    int l2 = strlen(s2);
-    char *s = malloc(l1 + l2 + 2);
-    memcpy(s, s1, l1);
-    if (sep_char != 0) {
-        s[l1] = sep_char;
-        l1 += 1;
-    }
-    memcpy(s + l1, s2, l2);
-    s[l1 + l2] = 0;
-    return s;
-}
-
-STATIC int do_repl(void) {
-    mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "\n");
-
-    // use simple readline
-
-    for (;;) {
-        char *line = prompt(">>> ");
-        if (line == NULL) {
-            // EOF
-            return 0;
-        }
-        while (mp_repl_continue_with_input(line)) {
-            char *line2 = prompt("... ");
-            if (line2 == NULL) {
-                break;
-            }
-            char *line3 = strjoin(line, '\n', line2);
-            free(line);
-            free(line2);
-            line = line3;
-        }
-
-        int ret = execute_from_lexer(LEX_SRC_STR, line, MP_PARSE_SINGLE_INPUT, true);
-        if (ret & FORCED_EXIT) {
-            return ret;
-        }
-
-        free(line);
-    }
-}
-
-#include "main.h"
-int do_file(const char *file) {
-    return execute_from_lexer(LEX_SRC_FILENAME, file, MP_PARSE_FILE_INPUT, false);
-}
-
-/*
-STATIC int do_str(const char *str) {
-    return execute_from_lexer(LEX_SRC_STR, str, MP_PARSE_FILE_INPUT, false);
-}
-*/
-
-STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
-    for (int i = start_arg; i < argc; i++) {
-        mp_obj_list_append(mp_sys_argv, MP_OBJ_NEW_QSTR(qstr_from_str(argv[i])));
-    }
-}
-
-MP_NOINLINE int main_(int argc, char **argv);
-
-
-int micropy_eval(const char * line){
-  return execute_from_lexer(LEX_SRC_STR, line, MP_PARSE_SINGLE_INPUT, true);
-}
-
-#ifndef MICROPY_LIB
-int main(int argc, char **argv) {
-    #if MICROPY_PY_THREAD
-    mp_thread_init();
-    #endif
-    // We should capture stack top ASAP after start, and it should be
-    // captured guaranteedly before any other stack variables are allocated.
-    // For this, actual main (renamed main_) should not be inlined into
-    // this function. main_() itself may have other functions inlined (with
-    // their own stack variables), that's why we need this main/main_ split.
-    mp_stack_ctrl_init();
-    return main_(argc, argv);
-}
-#endif
-
-char * micropy_init(){
-    mp_stack_set_limit(40000 * (BYTES_PER_WORD / 4));
-
-    //Disable output buffering, otherwise interactive mode becomes useless
-    setbuf(stdout, NULL);
-  
-    mp_stack_set_limit(32768);
-
-#if MICROPY_ENABLE_GC
-    char *heap = malloc(heap_size);
-    if(!heap)
-    {
-	_show_msgbox("Micropython", "Heap allocation failed. Please reboot.", 0);
-	return 0;
-    }
-    gc_init(heap, heap + heap_size - 1);
-#endif
-
-    mp_init();
-
-    return heap;
-}
-
-MP_NOINLINE int main_(int argc, char **argv) {
-    cfg_register_fileext("py", "micropython");
-  
-  char * heap=micropy_init();
-#if MICROPY_ENABLE_GC
-  if (!heap)
-    return 1;
-#endif
-    uint path_num = 2;
-    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), path_num);
-    mp_obj_t *path_items;
-    mp_obj_list_get(mp_sys_path, &path_num, &path_items);
-    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
-
-    path_items[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
-    path_items[1] = MP_OBJ_NEW_QSTR(qstr_from_str("/documents/ndless"));
-
-    mp_obj_list_init(mp_sys_argv, 0);
-  
-    const int NOTHING_EXECUTED = -2;
-    int ret = NOTHING_EXECUTED;
-
-    for (int a = 1; a < argc; a++) {
-        char *pathbuf = malloc(PATH_MAX);
-        char *basedir = realpath(argv[a], pathbuf);
-        if (basedir == NULL) {
-            mp_printf(&mp_stderr_print, "%s: can't open file '%s': [Errno %d] %s\n", argv[0], argv[a], errno, strerror(errno));
-            // CPython exits with 2 in such case
-            ret = 2;
-            break;
-        }
-
-        // Set base dir of the script as first entry in sys.path
-        char *p = strrchr(basedir, '/');
-        path_items[0] = MP_OBJ_NEW_QSTR(qstr_from_strn(basedir, p - basedir));
-        free(pathbuf);
-
-        set_sys_argv(argv, argc, a);
-        ret = do_file(argv[a]);
-        break;
-    }
-
-    if (ret == NOTHING_EXECUTED) {
-        ret = do_repl();
-    }
-    else
-    {
-        puts("Press any key to exit.");
-        wait_key_pressed();
-    }
-
-    mp_deinit();
-
-    if (heap) free(heap);
-
-    return ret & 0xff;
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
-  if (strcmp(path,"numpy.py.tns")==0)
-    return MP_IMPORT_STAT_FILE;
-  struct stat st;
-  if (stat(path, &st) == 0) {
-    if (S_ISDIR(st.st_mode)) {
-      return MP_IMPORT_STAT_DIR;
-    } else if (S_ISREG(st.st_mode)) {
-      return MP_IMPORT_STAT_FILE;
-    }
-  }
-  return MP_IMPORT_STAT_NO_EXIST;
-}
-
-void nlr_jump_fail(void *val) {
-    printf("FATAL: uncaught NLR %p\n", val);
-    exit(1);
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/main.h~ b/apps/KhiCAS/src/micropython-1.12/nspire/main.h~
deleted file mode 100644
index 18851c99e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/main.h~
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MICROPY_MAIN_H
-#define MICROPY_MAIN_H
-int do_file(const char *file);
-char * micropy_init();
-int micropy_eval(const char * line);
-void  mp_deinit();
-
-#endif
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/mklib~ b/apps/KhiCAS/src/micropython-1.12/nspire/mklib~
deleted file mode 100755
index 0a22d174e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/mklib~
+++ /dev/null
@@ -1,4 +0,0 @@
-# /bin/bash
-make V=1
-arm-none-eabi-ar cru libmicropy.a build/py/mpstate.o build/py/nlr.o build/py/nlrx86.o build/py/nlrx64.o build/py/nlrthumb.o build/py/nlrpowerpc.o build/py/nlrxtensa.o build/py/nlrsetjmp.o build/py/malloc.o build/py/gc.o build/py/pystack.o build/py/qstr.o build/py/vstr.o build/py/mpprint.o build/py/unicode.o build/py/mpz.o build/py/reader.o build/py/lexer.o build/py/parse.o build/py/scope.o build/py/compile.o build/py/emitcommon.o build/py/emitbc.o build/py/asmbase.o build/py/asmx64.o build/py/emitnx64.o build/py/asmx86.o build/py/emitnx86.o build/py/asmthumb.o build/py/emitnthumb.o build/py/emitinlinethumb.o build/py/asmarm.o build/py/emitnarm.o build/py/asmxtensa.o build/py/emitnxtensa.o build/py/emitinlinextensa.o build/py/emitnxtensawin.o build/py/formatfloat.o build/py/parsenumbase.o build/py/parsenum.o build/py/emitglue.o build/py/persistentcode.o build/py/runtime.o build/py/runtime_utils.o build/py/scheduler.o build/py/nativeglue.o build/py/ringbuf.o build/py/stackctrl.o build/py/argcheck.o build/py/warning.o build/py/profile.o build/py/map.o build/py/obj.o build/py/objarray.o build/py/objattrtuple.o build/py/objbool.o build/py/objboundmeth.o build/py/objcell.o build/py/objclosure.o build/py/objcomplex.o build/py/objdeque.o build/py/objdict.o build/py/objenumerate.o build/py/objexcept.o build/py/objfilter.o build/py/objfloat.o build/py/objfun.o build/py/objgenerator.o build/py/objgetitemiter.o build/py/objint.o build/py/objint_longlong.o build/py/objint_mpz.o build/py/objlist.o build/py/objmap.o build/py/objmodule.o build/py/objobject.o build/py/objpolyiter.o build/py/objproperty.o build/py/objnone.o build/py/objnamedtuple.o build/py/objrange.o build/py/objreversed.o build/py/objset.o build/py/objsingleton.o build/py/objslice.o build/py/objstr.o build/py/objstrunicode.o build/py/objstringio.o build/py/objtuple.o build/py/objtype.o build/py/objzip.o build/py/opmethods.o build/py/sequence.o build/py/stream.o build/py/binary.o build/py/builtinimport.o build/py/builtinevex.o build/py/builtinhelp.o build/py/modarray.o build/py/modbuiltins.o build/py/modcollections.o build/py/modgc.o build/py/modio.o build/py/modmath.o build/py/modcmath.o build/py/modmicropython.o build/py/modstruct.o build/py/modsys.o build/py/moduerrno.o build/py/modthread.o build/py/vm.o build/py/bc.o build/py/showbc.o build/py/repl.o build/py/smallint.o build/py/frozenmod.o build/extmod/moductypes.o build/extmod/modujson.o build/extmod/modure.o build/extmod/moduzlib.o build/extmod/moduheapq.o build/extmod/modutimeq.o build/extmod/moduhashlib.o build/extmod/moducryptolib.o build/extmod/modubinascii.o build/extmod/virtpin.o build/extmod/machine_mem.o build/extmod/machine_pinbase.o build/extmod/machine_signal.o build/extmod/machine_pulse.o build/extmod/machine_i2c.o build/extmod/machine_spi.o build/extmod/modbluetooth.o build/extmod/modussl_axtls.o build/extmod/modussl_mbedtls.o build/extmod/modurandom.o build/extmod/moduselect.o build/extmod/moduwebsocket.o build/extmod/modwebrepl.o build/extmod/modframebuf.o build/extmod/vfs.o build/extmod/vfs_blockdev.o build/extmod/vfs_reader.o build/extmod/vfs_posix.o build/extmod/vfs_posix_file.o build/extmod/vfs_fat.o build/extmod/vfs_fat_diskio.o build/extmod/vfs_fat_file.o build/extmod/vfs_lfs.o build/extmod/utime_mphal.o build/extmod/uos_dupterm.o build/lib/embed/abort_.o build/lib/utils/printf.o build/./unix_mphal.o build/./modos.o build/./texture.o build/./gccollect.o build/./modnsp.o build/./input.o build/./file.o build/./graphic.o build/./main.o
-/bin/cp libmicropy.a ../../Ndless/ndless-sdk/lib
\ No newline at end of file
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/modnsp.c~ b/apps/KhiCAS/src/micropython-1.12/nspire/modnsp.c~
deleted file mode 100644
index 2875b55e0..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/modnsp.c~
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <libndls.h>
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "objtuple.h"
-#include "texture.h"
-
-static mp_obj_t nsp_readRTC()
-{
-	return mp_obj_new_int(*(unsigned int*)0x90090000);
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(nsp_readRTC_obj, nsp_readRTC);
-
-static mp_obj_t nsp_waitKeypress()
-{
-	wait_key_pressed();
-	return mp_const_none;
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(nsp_waitKeypress_obj, nsp_waitKeypress);
-
-STATIC const mp_map_elem_t mp_module_nsp_globals_table[] = {
-        { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nsp) },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_Texture), (mp_obj_t) &nsp_texture_type },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_waitKeypress), (mp_obj_t) &nsp_waitKeypress_obj },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_readRTC), (mp_obj_t) &nsp_readRTC_obj }
-};
-
-STATIC const mp_obj_dict_t mp_module_nsp_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_nsp_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_nsp_globals_table),
-        .table = (mp_map_elem_t*) mp_module_nsp_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_nsp = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*) &mp_module_nsp_globals,
-};
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/mpconfig.h~ b/apps/KhiCAS/src/micropython-1.12/nspire/mpconfig.h~
deleted file mode 100644
index 1e786f753..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/mpconfig.h~
+++ /dev/null
@@ -1,1592 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
-#define MICROPY_INCLUDED_PY_MPCONFIG_H
-
-// Current version of MicroPython
-#define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 12
-#define MICROPY_VERSION_MICRO 0
-
-// Combined version as a 32-bit number for convenience
-#define MICROPY_VERSION ( \
-    MICROPY_VERSION_MAJOR << 16 \
-    | MICROPY_VERSION_MINOR << 8 \
-    | MICROPY_VERSION_MICRO)
-
-// String version
-#define MICROPY_VERSION_STRING \
-    MP_STRINGIFY(MICROPY_VERSION_MAJOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MINOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MICRO)
-
-// This file contains default configuration settings for MicroPython.
-// You can override any of the options below using mpconfigport.h file
-// located in a directory of your port.
-
-// mpconfigport.h is a file containing configuration settings for a
-// particular port. mpconfigport.h is actually a default name for
-// such config, and it can be overridden using MP_CONFIGFILE preprocessor
-// define (you can do that by passing CFLAGS_EXTRA='-DMP_CONFIGFILE="<file.h>"'
-// argument to make when using standard MicroPython makefiles).
-// This is useful to have more than one config per port, for example,
-// release vs debug configs, etc. Note that if you switch from one config
-// to another, you must rebuild from scratch using "-B" switch to make.
-
-#ifdef MP_CONFIGFILE
-#include MP_CONFIGFILE
-#else
-#include <mpconfigport.h>
-#endif
-
-// Any options not explicitly set in mpconfigport.h will get default
-// values below.
-
-/*****************************************************************************/
-/* Object representation                                                     */
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xxx1 : a small int, bits 1 and above are the value
-//  - xxxx...xx10 : a qstr, bits 2 and above are the value
-//  - xxxx...xx00 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_A (0)
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xx01 : a small int, bits 2 and above are the value
-//  - xxxx...xx11 : a qstr, bits 2 and above are the value
-//  - xxxx...xxx0 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_B (1)
-
-// A MicroPython object is a machine word having the following form (called R):
-//  - iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int with 31-bit signed value
-//  - 01111111 1qqqqqqq qqqqqqqq qqqqq110 str with 20-bit qstr value
-//  - s1111111 10000000 00000000 00000010 +/- inf
-//  - s1111111 1xxxxxxx xxxxxxxx xxxxx010 nan, x != 0
-//  - seeeeeee efffffff ffffffff ffffff10 30-bit fp, e != 0xff
-//  - pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Str and float stored as O = R + 0x80800000, retrieved as R = O - 0x80800000.
-// This makes strs easier to encode/decode as they have zeros in the top 9 bits.
-// This scheme only works with 32-bit word size and float enabled.
-#define MICROPY_OBJ_REPR_C (2)
-
-// A MicroPython object is a 64-bit word having the following form (called R):
-//  - seeeeeee eeeeffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff 64-bit fp, e != 0x7ff
-//  - s1111111 11110000 00000000 00000000 00000000 00000000 00000000 00000000 +/- inf
-//  - 01111111 11111000 00000000 00000000 00000000 00000000 00000000 00000000 normalised nan
-//  - 01111111 11111101 iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int
-//  - 01111111 11111110 00000000 00000000 qqqqqqqq qqqqqqqq qqqqqqqq qqqqqqq1 str
-//  - 01111111 11111100 00000000 00000000 pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Stored as O = R + 0x8004000000000000, retrieved as R = O - 0x8004000000000000.
-// This makes pointers have all zeros in the top 32 bits.
-// Small-ints and strs have 1 as LSB to make sure they don't look like pointers
-// to the garbage collector.
-#define MICROPY_OBJ_REPR_D (3)
-
-#ifndef MICROPY_OBJ_REPR
-#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A)
-#endif
-
-/*****************************************************************************/
-/* Memory allocation policy                                                  */
-
-// Number of bytes in memory allocation/GC block. Any size allocated will be
-// rounded up to be multiples of this.
-#ifndef MICROPY_BYTES_PER_GC_BLOCK
-#define MICROPY_BYTES_PER_GC_BLOCK (4 * BYTES_PER_WORD)
-#endif
-
-// Number of words allocated (in BSS) to the GC stack (minimum is 1)
-#ifndef MICROPY_ALLOC_GC_STACK_SIZE
-#define MICROPY_ALLOC_GC_STACK_SIZE (64)
-#endif
-
-// The C-type to use for entries in the GC stack.  By default it allows the
-// heap to be as large as the address space, but the bit-width of this type can
-// be reduced to save memory when the heap is small enough.  The type must be
-// big enough to index all blocks in the heap, which is set by
-// heap-size-in-bytes / MICROPY_BYTES_PER_GC_BLOCK.
-#ifndef MICROPY_GC_STACK_ENTRY_TYPE
-#define MICROPY_GC_STACK_ENTRY_TYPE size_t
-#endif
-
-// Be conservative and always clear to zero newly (re)allocated memory in the GC.
-// This helps eliminate stray pointers that hold on to memory that's no longer
-// used.  It decreases performance due to unnecessary memory clearing.
-// A memory manager which always clears memory can set this to 0.
-// TODO Do analysis to understand why some memory is not properly cleared and
-// find a more efficient way to clear it.
-#ifndef MICROPY_GC_CONSERVATIVE_CLEAR
-#define MICROPY_GC_CONSERVATIVE_CLEAR (MICROPY_ENABLE_GC)
-#endif
-
-// Support automatic GC when reaching allocation threshold,
-// configurable by gc.threshold().
-#ifndef MICROPY_GC_ALLOC_THRESHOLD
-#define MICROPY_GC_ALLOC_THRESHOLD (1)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// interned string data.  Smaller numbers lead to more chunks being needed
-// and more wastage at the end of the chunk.  Larger numbers lead to wasted
-// space at the end when no more strings need interning.
-#ifndef MICROPY_ALLOC_QSTR_CHUNK_INIT
-#define MICROPY_ALLOC_QSTR_CHUNK_INIT (128)
-#endif
-
-// Initial amount for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXER_INDENT_INIT
-#define MICROPY_ALLOC_LEXER_INDENT_INIT (10)
-#endif
-
-// Increment for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXEL_INDENT_INC
-#define MICROPY_ALLOC_LEXEL_INDENT_INC (8)
-#endif
-
-// Initial amount for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INIT
-#define MICROPY_ALLOC_PARSE_RULE_INIT (64)
-#endif
-
-// Increment for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INC
-#define MICROPY_ALLOC_PARSE_RULE_INC (16)
-#endif
-
-// Initial amount for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INIT
-#define MICROPY_ALLOC_PARSE_RESULT_INIT (32)
-#endif
-
-// Increment for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INC
-#define MICROPY_ALLOC_PARSE_RESULT_INC (16)
-#endif
-
-// Strings this length or less will be interned by the parser
-#ifndef MICROPY_ALLOC_PARSE_INTERN_STRING_LEN
-#define MICROPY_ALLOC_PARSE_INTERN_STRING_LEN (10)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// parse nodes.  Small leads to fragmentation, large leads to excess use.
-#ifndef MICROPY_ALLOC_PARSE_CHUNK_INIT
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (128)
-#endif
-
-// Initial amount for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INIT
-#define MICROPY_ALLOC_SCOPE_ID_INIT (4)
-#endif
-
-// Increment for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INC
-#define MICROPY_ALLOC_SCOPE_ID_INC (6)
-#endif
-
-// Maximum length of a path in the filesystem
-// So we can allocate a buffer on the stack for path manipulation in import
-#ifndef MICROPY_ALLOC_PATH_MAX
-#define MICROPY_ALLOC_PATH_MAX (512)
-#endif
-
-// Initial size of module dict
-#ifndef MICROPY_MODULE_DICT_SIZE
-#define MICROPY_MODULE_DICT_SIZE (1)
-#endif
-
-// Whether realloc/free should be passed allocated memory region size
-// You must enable this if MICROPY_MEM_STATS is enabled
-#ifndef MICROPY_MALLOC_USES_ALLOCATED_SIZE
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (0)
-#endif
-
-// Number of bytes used to store qstr length
-// Dictates hard limit on maximum Python identifier length, but 1 byte
-// (limit of 255 bytes in an identifier) should be enough for everyone
-#ifndef MICROPY_QSTR_BYTES_IN_LEN
-#define MICROPY_QSTR_BYTES_IN_LEN (1)
-#endif
-
-// Number of bytes used to store qstr hash
-#ifndef MICROPY_QSTR_BYTES_IN_HASH
-#define MICROPY_QSTR_BYTES_IN_HASH (2)
-#endif
-
-// Avoid using C stack when making Python function calls. C stack still
-// may be used if there's no free heap.
-#ifndef MICROPY_STACKLESS
-#define MICROPY_STACKLESS (0)
-#endif
-
-// Never use C stack when making Python function calls. This may break
-// testsuite as will subtly change which exception is thrown in case
-// of too deep recursion and other similar cases.
-#ifndef MICROPY_STACKLESS_STRICT
-#define MICROPY_STACKLESS_STRICT (0)
-#endif
-
-// Don't use alloca calls. As alloca() is not part of ANSI C, this
-// workaround option is provided for compilers lacking this de-facto
-// standard function. The way it works is allocating from heap, and
-// relying on garbage collection to free it eventually. This is of
-// course much less optimal than real alloca().
-#if defined(MICROPY_NO_ALLOCA) && MICROPY_NO_ALLOCA
-#undef alloca
-#define alloca(x) m_malloc(x)
-#endif
-
-/*****************************************************************************/
-/* MicroPython emitters                                                     */
-
-// Whether to support loading of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_LOAD
-#define MICROPY_PERSISTENT_CODE_LOAD (0)
-#endif
-
-// Whether to support saving of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_SAVE
-#define MICROPY_PERSISTENT_CODE_SAVE (0)
-#endif
-
-// Whether generated code can persist independently of the VM/runtime instance
-// This is enabled automatically when needed by other features
-#ifndef MICROPY_PERSISTENT_CODE
-#define MICROPY_PERSISTENT_CODE (MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether to emit x64 native code
-#ifndef MICROPY_EMIT_X64
-#define MICROPY_EMIT_X64 (0)
-#endif
-
-// Whether to emit x86 native code
-#ifndef MICROPY_EMIT_X86
-#define MICROPY_EMIT_X86 (0)
-#endif
-
-// Whether to emit thumb native code
-#ifndef MICROPY_EMIT_THUMB
-#define MICROPY_EMIT_THUMB (0)
-#endif
-
-// Whether to enable the thumb inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB
-#define MICROPY_EMIT_INLINE_THUMB (0)
-#endif
-
-// Whether to enable ARMv7-M instruction support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_ARMV7M
-#define MICROPY_EMIT_INLINE_THUMB_ARMV7M (1)
-#endif
-
-// Whether to enable float support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_FLOAT
-#define MICROPY_EMIT_INLINE_THUMB_FLOAT (1)
-#endif
-
-// Whether to emit ARM native code
-#ifndef MICROPY_EMIT_ARM
-#define MICROPY_EMIT_ARM (0)
-#endif
-
-// Whether to emit Xtensa native code
-#ifndef MICROPY_EMIT_XTENSA
-#define MICROPY_EMIT_XTENSA (0)
-#endif
-
-// Whether to enable the Xtensa inline assembler
-#ifndef MICROPY_EMIT_INLINE_XTENSA
-#define MICROPY_EMIT_INLINE_XTENSA (0)
-#endif
-
-// Whether to emit Xtensa-Windowed native code
-#ifndef MICROPY_EMIT_XTENSAWIN
-#define MICROPY_EMIT_XTENSAWIN (0)
-#endif
-
-// Convenience definition for whether any native emitter is enabled
-#define MICROPY_EMIT_NATIVE (MICROPY_EMIT_X64 || MICROPY_EMIT_X86 || MICROPY_EMIT_THUMB || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN)
-
-// Select prelude-as-bytes-object for certain emitters
-#define MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ (MICROPY_EMIT_XTENSAWIN)
-
-// Convenience definition for whether any inline assembler emitter is enabled
-#define MICROPY_EMIT_INLINE_ASM (MICROPY_EMIT_INLINE_THUMB || MICROPY_EMIT_INLINE_XTENSA)
-
-// Convenience definition for whether any native or inline assembler emitter is enabled
-#define MICROPY_EMIT_MACHINE_CODE (MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM)
-
-/*****************************************************************************/
-/* Compiler configuration                                                    */
-
-// Whether to include the compiler
-#ifndef MICROPY_ENABLE_COMPILER
-#define MICROPY_ENABLE_COMPILER (1)
-#endif
-
-// Whether the compiler is dynamically configurable (ie at runtime)
-// This will disable the ability to execute native/viper code
-#ifndef MICROPY_DYNAMIC_COMPILER
-#define MICROPY_DYNAMIC_COMPILER (0)
-#endif
-
-// Configure dynamic compiler macros
-#if MICROPY_DYNAMIC_COMPILER
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC (mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode)
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC (mp_dynamic_compiler.py_builtins_str_unicode)
-#else
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC MICROPY_PY_BUILTINS_STR_UNICODE
-#endif
-
-// Whether to enable constant folding; eg 1+2 rewritten as 3
-#ifndef MICROPY_COMP_CONST_FOLDING
-#define MICROPY_COMP_CONST_FOLDING (1)
-#endif
-
-// Whether to enable optimisations for constant literals, eg OrderedDict
-#ifndef MICROPY_COMP_CONST_LITERAL
-#define MICROPY_COMP_CONST_LITERAL (1)
-#endif
-
-// Whether to enable lookup of constants in modules; eg module.CONST
-#ifndef MICROPY_COMP_MODULE_CONST
-#define MICROPY_COMP_MODULE_CONST (0)
-#endif
-
-// Whether to enable constant optimisation; id = const(value)
-#ifndef MICROPY_COMP_CONST
-#define MICROPY_COMP_CONST (1)
-#endif
-
-// Whether to enable optimisation of: a, b = c, d
-// Costs 124 bytes (Thumb2)
-#ifndef MICROPY_COMP_DOUBLE_TUPLE_ASSIGN
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
-#endif
-
-// Whether to enable optimisation of: a, b, c = d, e, f
-// Requires MICROPY_COMP_DOUBLE_TUPLE_ASSIGN and costs 68 bytes (Thumb2)
-#ifndef MICROPY_COMP_TRIPLE_TUPLE_ASSIGN
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#endif
-
-// Whether to enable optimisation of: return a if b else c
-// Costs about 80 bytes (Thumb2) and saves 2 bytes of bytecode for each use
-#ifndef MICROPY_COMP_RETURN_IF_EXPR
-#define MICROPY_COMP_RETURN_IF_EXPR (0)
-#endif
-
-/*****************************************************************************/
-/* Internal debugging stuff                                                  */
-
-// Whether to collect memory allocation stats
-#ifndef MICROPY_MEM_STATS
-#define MICROPY_MEM_STATS (0)
-#endif
-
-// The mp_print_t printer used for debugging output
-#ifndef MICROPY_DEBUG_PRINTER
-#define MICROPY_DEBUG_PRINTER (&mp_plat_print)
-#endif
-
-// Whether to build functions that print debugging info:
-//   mp_bytecode_print
-//   mp_parse_node_print
-#ifndef MICROPY_DEBUG_PRINTERS
-#define MICROPY_DEBUG_PRINTERS (0)
-#endif
-
-// Whether to enable all debugging outputs (it will be extremely verbose)
-#ifndef MICROPY_DEBUG_VERBOSE
-#define MICROPY_DEBUG_VERBOSE (0)
-#endif
-
-// Whether to enable debugging versions of MP_OBJ_NULL/STOP_ITERATION/SENTINEL
-#ifndef MICROPY_DEBUG_MP_OBJ_SENTINELS
-#define MICROPY_DEBUG_MP_OBJ_SENTINELS (0)
-#endif
-
-// Whether to enable a simple VM stack overflow check
-#ifndef MICROPY_DEBUG_VM_STACK_OVERFLOW
-#define MICROPY_DEBUG_VM_STACK_OVERFLOW (0)
-#endif
-
-/*****************************************************************************/
-/* Optimisations                                                             */
-
-// Whether to use computed gotos in the VM, or a switch
-// Computed gotos are roughly 10% faster, and increase VM code size by a little
-// Note: enabling this will use the gcc-specific extensions of ranged designated
-// initialisers and addresses of labels, which are not part of the C99 standard.
-#ifndef MICROPY_OPT_COMPUTED_GOTO
-#define MICROPY_OPT_COMPUTED_GOTO (0)
-#endif
-
-// Whether to cache result of map lookups in LOAD_NAME, LOAD_GLOBAL, LOAD_ATTR,
-// STORE_ATTR bytecodes.  Uses 1 byte extra RAM for each of these opcodes and
-// uses a bit of extra code ROM, but greatly improves lookup speed.
-#ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
-#endif
-
-// Whether to use fast versions of bitwise operations (and, or, xor) when the
-// arguments are both positive.  Increases Thumb2 code size by about 250 bytes.
-#ifndef MICROPY_OPT_MPZ_BITWISE
-#define MICROPY_OPT_MPZ_BITWISE (0)
-#endif
-
-
-// Whether math.factorial is large, fast and recursive (1) or small and slow (0).
-#ifndef MICROPY_OPT_MATH_FACTORIAL
-#define MICROPY_OPT_MATH_FACTORIAL (0)
-#endif
-
-/*****************************************************************************/
-/* Python internal features                                                  */
-
-// Whether to enable import of external modules
-// When disabled, only importing of built-in modules is supported
-// When enabled, a port must implement mp_import_stat (among other things)
-#ifndef MICROPY_ENABLE_EXTERNAL_IMPORT
-#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
-#endif
-
-// Whether to use the POSIX reader for importing files
-#ifndef MICROPY_READER_POSIX
-#define MICROPY_READER_POSIX (0)
-#endif
-
-// Whether to use the VFS reader for importing files
-#ifndef MICROPY_READER_VFS
-#define MICROPY_READER_VFS (0)
-#endif
-
-// Whether any readers have been defined
-#ifndef MICROPY_HAS_FILE_READER
-#define MICROPY_HAS_FILE_READER (MICROPY_READER_POSIX || MICROPY_READER_VFS)
-#endif
-
-// Hook for the VM at the start of the opcode loop (can contain variable
-// definitions usable by the other hook functions)
-#ifndef MICROPY_VM_HOOK_INIT
-#define MICROPY_VM_HOOK_INIT
-#endif
-
-// Hook for the VM during the opcode loop (but only after jump opcodes)
-#ifndef MICROPY_VM_HOOK_LOOP
-#define MICROPY_VM_HOOK_LOOP
-#endif
-
-// Hook for the VM just before return opcode is finished being interpreted
-#ifndef MICROPY_VM_HOOK_RETURN
-#define MICROPY_VM_HOOK_RETURN
-#endif
-
-// Whether to include the garbage collector
-#ifndef MICROPY_ENABLE_GC
-#define MICROPY_ENABLE_GC (0)
-#endif
-
-// Whether to enable finalisers in the garbage collector (ie call __del__)
-#ifndef MICROPY_ENABLE_FINALISER
-#define MICROPY_ENABLE_FINALISER (0)
-#endif
-
-// Whether to enable a separate allocator for the Python stack.
-// If enabled then the code must call mp_pystack_init before mp_init.
-#ifndef MICROPY_ENABLE_PYSTACK
-#define MICROPY_ENABLE_PYSTACK (0)
-#endif
-
-// Number of bytes that memory returned by mp_pystack_alloc will be aligned by.
-#ifndef MICROPY_PYSTACK_ALIGN
-#define MICROPY_PYSTACK_ALIGN (8)
-#endif
-
-// Whether to check C stack usage. C stack used for calling Python functions,
-// etc. Not checking means segfault on overflow.
-#ifndef MICROPY_STACK_CHECK
-#define MICROPY_STACK_CHECK (0)
-#endif
-
-// Whether to have an emergency exception buffer
-#ifndef MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (0)
-#endif
-#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#   ifndef MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE
-#   define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)   // 0 - implies dynamic allocation
-#   endif
-#endif
-
-// Whether to provide the mp_kbd_exception object, and micropython.kbd_intr function
-#ifndef MICROPY_KBD_EXCEPTION
-#define MICROPY_KBD_EXCEPTION (0)
-#endif
-
-// Prefer to raise KeyboardInterrupt asynchronously (from signal or interrupt
-// handler) - if supported by a particular port.
-#ifndef MICROPY_ASYNC_KBD_INTR
-#define MICROPY_ASYNC_KBD_INTR (0)
-#endif
-
-// Whether to include REPL helper function
-#ifndef MICROPY_HELPER_REPL
-#define MICROPY_HELPER_REPL (0)
-#endif
-
-// Whether to include emacs-style readline behavior in REPL
-#ifndef MICROPY_REPL_EMACS_KEYS
-#define MICROPY_REPL_EMACS_KEYS (0)
-#endif
-
-// Whether to implement auto-indent in REPL
-#ifndef MICROPY_REPL_AUTO_INDENT
-#define MICROPY_REPL_AUTO_INDENT (0)
-#endif
-
-// Whether port requires event-driven REPL functions
-#ifndef MICROPY_REPL_EVENT_DRIVEN
-#define MICROPY_REPL_EVENT_DRIVEN (0)
-#endif
-
-// Whether to include lexer helper function for unix
-#ifndef MICROPY_HELPER_LEXER_UNIX
-#define MICROPY_HELPER_LEXER_UNIX (0)
-#endif
-
-// Long int implementation
-#define MICROPY_LONGINT_IMPL_NONE (0)
-#define MICROPY_LONGINT_IMPL_LONGLONG (1)
-#define MICROPY_LONGINT_IMPL_MPZ (2)
-
-#ifndef MICROPY_LONGINT_IMPL
-#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_NONE)
-#endif
-
-#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
-typedef long long mp_longint_impl_t;
-#endif
-
-// Whether to include information in the byte code to determine source
-// line number (increases RAM usage, but doesn't slow byte code execution)
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE (0)
-#endif
-
-// Whether to include doc strings (increases RAM usage)
-#ifndef MICROPY_ENABLE_DOC_STRING
-#define MICROPY_ENABLE_DOC_STRING (0)
-#endif
-
-// Exception messages are short static strings
-#define MICROPY_ERROR_REPORTING_TERSE    (1)
-// Exception messages provide basic error details
-#define MICROPY_ERROR_REPORTING_NORMAL   (2)
-// Exception messages provide full info, e.g. object names
-#define MICROPY_ERROR_REPORTING_DETAILED (3)
-
-#ifndef MICROPY_ERROR_REPORTING
-#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL)
-#endif
-
-// Whether issue warnings during compiling/execution
-#ifndef MICROPY_WARNINGS
-#define MICROPY_WARNINGS (0)
-#endif
-
-// Whether to support warning categories
-#ifndef MICROPY_WARNINGS_CATEGORY
-#define MICROPY_WARNINGS_CATEGORY (0)
-#endif
-
-// This macro is used when printing runtime warnings and errors
-#ifndef MICROPY_ERROR_PRINTER
-#define MICROPY_ERROR_PRINTER (&mp_plat_print)
-#endif
-
-// Float and complex implementation
-#define MICROPY_FLOAT_IMPL_NONE (0)
-#define MICROPY_FLOAT_IMPL_FLOAT (1)
-#define MICROPY_FLOAT_IMPL_DOUBLE (2)
-
-#ifndef MICROPY_FLOAT_IMPL
-#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_NONE)
-#endif
-
-#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x##F
-#define MICROPY_FLOAT_C_FUN(fun) fun##f
-typedef float mp_float_t;
-#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x
-#define MICROPY_FLOAT_C_FUN(fun) fun
-typedef double mp_float_t;
-#else
-#define MICROPY_PY_BUILTINS_FLOAT (0)
-#endif
-
-#ifndef MICROPY_PY_BUILTINS_COMPLEX
-#define MICROPY_PY_BUILTINS_COMPLEX (MICROPY_PY_BUILTINS_FLOAT)
-#endif
-
-// Whether to provide a high-quality hash for float and complex numbers.
-// Otherwise the default is a very simple but correct hashing function.
-#ifndef MICROPY_FLOAT_HIGH_QUALITY_HASH
-#define MICROPY_FLOAT_HIGH_QUALITY_HASH (0)
-#endif
-
-// Enable features which improve CPython compatibility
-// but may lead to more code size/memory usage.
-// TODO: Originally intended as generic category to not
-// add bunch of once-off options. May need refactoring later
-#ifndef MICROPY_CPYTHON_COMPAT
-#define MICROPY_CPYTHON_COMPAT (1)
-#endif
-
-// Perform full checks as done by CPython. Disabling this
-// may produce incorrect results, if incorrect data is fed,
-// but should not lead to MicroPython crashes or similar
-// grave issues (in other words, only user app should be,
-// affected, not system).
-#ifndef MICROPY_FULL_CHECKS
-#define MICROPY_FULL_CHECKS (1)
-#endif
-
-// Whether POSIX-semantics non-blocking streams are supported
-#ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK (0)
-#endif
-
-// Whether to provide stream functions with POSIX-like signatures
-// (useful for porting existing libraries to MicroPython).
-#ifndef MICROPY_STREAMS_POSIX_API
-#define MICROPY_STREAMS_POSIX_API (0)
-#endif
-
-// Whether to call __init__ when importing builtin modules for the first time
-#ifndef MICROPY_MODULE_BUILTIN_INIT
-#define MICROPY_MODULE_BUILTIN_INIT (0)
-#endif
-
-// Whether to support module-level __getattr__ (see PEP 562)
-#ifndef MICROPY_MODULE_GETATTR
-#define MICROPY_MODULE_GETATTR (0)
-#endif
-
-// Whether module weak links are supported
-#ifndef MICROPY_MODULE_WEAK_LINKS
-#define MICROPY_MODULE_WEAK_LINKS (0)
-#endif
-
-// Whether frozen modules are supported in the form of strings
-#ifndef MICROPY_MODULE_FROZEN_STR
-#define MICROPY_MODULE_FROZEN_STR (0)
-#endif
-
-// Whether frozen modules are supported in the form of .mpy files
-#ifndef MICROPY_MODULE_FROZEN_MPY
-#define MICROPY_MODULE_FROZEN_MPY (0)
-#endif
-
-// Convenience macro for whether frozen modules are supported
-#ifndef MICROPY_MODULE_FROZEN
-#define MICROPY_MODULE_FROZEN (MICROPY_MODULE_FROZEN_STR || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether you can override builtins in the builtins module
-#ifndef MICROPY_CAN_OVERRIDE_BUILTINS
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
-#endif
-
-// Whether to check that the "self" argument of a builtin method has the
-// correct type.  Such an explicit check is only needed if a builtin
-// method escapes to Python land without a first argument, eg
-// list.append([], 1).  Without this check such calls will have undefined
-// behaviour (usually segfault) if the first argument is the wrong type.
-#ifndef MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
-#endif
-
-// Whether to use internally defined errno's (otherwise system provided ones)
-#ifndef MICROPY_USE_INTERNAL_ERRNO
-#define MICROPY_USE_INTERNAL_ERRNO (0)
-#endif
-
-// Whether to use internally defined *printf() functions (otherwise external ones)
-#ifndef MICROPY_USE_INTERNAL_PRINTF
-#define MICROPY_USE_INTERNAL_PRINTF (1)
-#endif
-
-// Support for internal scheduler
-#ifndef MICROPY_ENABLE_SCHEDULER
-#define MICROPY_ENABLE_SCHEDULER (0)
-#endif
-
-// Maximum number of entries in the scheduler
-#ifndef MICROPY_SCHEDULER_DEPTH
-#define MICROPY_SCHEDULER_DEPTH (4)
-#endif
-
-// Support for generic VFS sub-system
-#ifndef MICROPY_VFS
-#define MICROPY_VFS (0)
-#endif
-
-// Support for VFS POSIX component, to mount a POSIX filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_POSIX (0)
-#endif
-
-// Support for VFS FAT component, to mount a FAT filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_FAT (0)
-#endif
-
-/*****************************************************************************/
-/* Fine control over Python builtins, classes, modules, etc                  */
-
-// Whether to support multiple inheritance of Python classes.  Multiple
-// inheritance makes some C functions inherently recursive, and adds a bit of
-// code overhead.
-#ifndef MICROPY_MULTIPLE_INHERITANCE
-#define MICROPY_MULTIPLE_INHERITANCE (1)
-#endif
-
-// Whether to implement attributes on functions
-#ifndef MICROPY_PY_FUNCTION_ATTRS
-#define MICROPY_PY_FUNCTION_ATTRS (0)
-#endif
-
-// Whether to support the descriptors __get__, __set__, __delete__
-// This costs some code size and makes load/store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DESCRIPTORS
-#define MICROPY_PY_DESCRIPTORS (0)
-#endif
-
-// Whether to support class __delattr__ and __setattr__ methods
-// This costs some code size and makes store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DELATTR_SETATTR
-#define MICROPY_PY_DELATTR_SETATTR (0)
-#endif
-
-// Support for async/await/async for/async with
-#ifndef MICROPY_PY_ASYNC_AWAIT
-#define MICROPY_PY_ASYNC_AWAIT (1)
-#endif
-
-// Non-standard .pend_throw() method for generators, allowing for
-// Future-like behavior with respect to exception handling: an
-// exception set with .pend_throw() will activate on the next call
-// to generator's .send() or .__next__(). (This is useful to implement
-// async schedulers.)
-#ifndef MICROPY_PY_GENERATOR_PEND_THROW
-#define MICROPY_PY_GENERATOR_PEND_THROW (1)
-#endif
-
-// Issue a warning when comparing str and bytes objects
-#ifndef MICROPY_PY_STR_BYTES_CMP_WARN
-#define MICROPY_PY_STR_BYTES_CMP_WARN (0)
-#endif
-
-// Whether str object is proper unicode
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
-#endif
-
-// Whether to check for valid UTF-8 when converting bytes to str
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
-#define MICROPY_PY_BUILTINS_STR_UNICODE_CHECK (MICROPY_PY_BUILTINS_STR_UNICODE)
-#endif
-
-// Whether str.center() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_CENTER
-#define MICROPY_PY_BUILTINS_STR_CENTER (0)
-#endif
-
-// Whether str.count() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_COUNT
-#define MICROPY_PY_BUILTINS_STR_COUNT (1)
-#endif
-
-// Whether str % (...) formatting operator provided
-#ifndef MICROPY_PY_BUILTINS_STR_OP_MODULO
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
-#endif
-
-// Whether str.partition()/str.rpartition() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_PARTITION
-#define MICROPY_PY_BUILTINS_STR_PARTITION (0)
-#endif
-
-// Whether str.splitlines() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_SPLITLINES
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
-#endif
-
-// Whether to support bytearray object
-#ifndef MICROPY_PY_BUILTINS_BYTEARRAY
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
-#endif
-
-// Whether to support dict.fromkeys() class method
-#ifndef MICROPY_PY_BUILTINS_DICT_FROMKEYS
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
-#endif
-
-// Whether to support memoryview object
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#endif
-
-// Whether to support memoryview.itemsize attribute
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (0)
-#endif
-
-// Whether to support set object
-#ifndef MICROPY_PY_BUILTINS_SET
-#define MICROPY_PY_BUILTINS_SET (1)
-#endif
-
-// Whether to support slice subscript operators and slice object
-#ifndef MICROPY_PY_BUILTINS_SLICE
-#define MICROPY_PY_BUILTINS_SLICE (1)
-#endif
-
-// Whether to support slice attribute read access,
-// i.e. slice.start, slice.stop, slice.step
-#ifndef MICROPY_PY_BUILTINS_SLICE_ATTRS
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
-#endif
-
-// Whether to support frozenset object
-#ifndef MICROPY_PY_BUILTINS_FROZENSET
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#endif
-
-// Whether to support property object
-#ifndef MICROPY_PY_BUILTINS_PROPERTY
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
-#endif
-
-// Whether to implement the start/stop/step attributes (readback) on
-// the "range" builtin type. Rarely used, and costs ~60 bytes (x86).
-#ifndef MICROPY_PY_BUILTINS_RANGE_ATTRS
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
-#endif
-
-// Whether to support binary ops [only (in)equality is defined] between range
-// objects.  With this option disabled all range objects that are not exactly
-// the same object will compare as not-equal.  With it enabled the semantics
-// match CPython and ranges are equal if they yield the same sequence of items.
-#ifndef MICROPY_PY_BUILTINS_RANGE_BINOP
-#define MICROPY_PY_BUILTINS_RANGE_BINOP (0)
-#endif
-
-// Support for callling next() with second argument
-#ifndef MICROPY_PY_BUILTINS_NEXT2
-#define MICROPY_PY_BUILTINS_NEXT2 (0)
-#endif
-
-// Whether to support rounding of integers (incl bignum); eg round(123,-1)=120
-#ifndef MICROPY_PY_BUILTINS_ROUND_INT
-#define MICROPY_PY_BUILTINS_ROUND_INT (0)
-#endif
-
-// Whether to support timeout exceptions (like socket.timeout)
-#ifndef MICROPY_PY_BUILTINS_TIMEOUTERROR
-#define MICROPY_PY_BUILTINS_TIMEOUTERROR (0)
-#endif
-
-// Whether to support complete set of special methods for user
-// classes, or only the most used ones. "Inplace" methods are
-// controlled by MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS below.
-// "Reverse" methods are controlled by
-// MICROPY_PY_REVERSE_SPECIAL_METHODS below.
-#ifndef MICROPY_PY_ALL_SPECIAL_METHODS
-#define MICROPY_PY_ALL_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support all inplace arithmetic operarion methods
-// (__imul__, etc.)
-#ifndef MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
-#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support reverse arithmetic operarion methods
-// (__radd__, etc.). Additionally gated by
-// MICROPY_PY_ALL_SPECIAL_METHODS.
-#ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support compile function
-#ifndef MICROPY_PY_BUILTINS_COMPILE
-#define MICROPY_PY_BUILTINS_COMPILE (0)
-#endif
-
-// Whether to support enumerate function(type)
-#ifndef MICROPY_PY_BUILTINS_ENUMERATE
-#define MICROPY_PY_BUILTINS_ENUMERATE (1)
-#endif
-
-// Whether to support eval and exec functions
-// By default they are supported if the compiler is enabled
-#ifndef MICROPY_PY_BUILTINS_EVAL_EXEC
-#define MICROPY_PY_BUILTINS_EVAL_EXEC (MICROPY_ENABLE_COMPILER)
-#endif
-
-// Whether to support the Python 2 execfile function
-#ifndef MICROPY_PY_BUILTINS_EXECFILE
-#define MICROPY_PY_BUILTINS_EXECFILE (0)
-#endif
-
-// Whether to support filter function(type)
-#ifndef MICROPY_PY_BUILTINS_FILTER
-#define MICROPY_PY_BUILTINS_FILTER (1)
-#endif
-
-// Whether to support reversed function(type)
-#ifndef MICROPY_PY_BUILTINS_REVERSED
-#define MICROPY_PY_BUILTINS_REVERSED (1)
-#endif
-
-// Whether to define "NotImplemented" special constant
-#ifndef MICROPY_PY_BUILTINS_NOTIMPLEMENTED
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
-#endif
-
-// Whether to provide the built-in input() function. The implementation of this
-// uses mp-readline, so can only be enabled if the port uses this readline.
-#ifndef MICROPY_PY_BUILTINS_INPUT
-#define MICROPY_PY_BUILTINS_INPUT (0)
-#endif
-
-// Whether to support min/max functions
-#ifndef MICROPY_PY_BUILTINS_MIN_MAX
-#define MICROPY_PY_BUILTINS_MIN_MAX (1)
-#endif
-
-// Support for calls to pow() with 3 integer arguments
-#ifndef MICROPY_PY_BUILTINS_POW3
-#define MICROPY_PY_BUILTINS_POW3 (0)
-#endif
-
-// Whether to provide the help function
-#ifndef MICROPY_PY_BUILTINS_HELP
-#define MICROPY_PY_BUILTINS_HELP (0)
-#endif
-
-// Use this to configure the help text shown for help().  It should be a
-// variable with the type "const char*".  A sensible default is provided.
-#ifndef MICROPY_PY_BUILTINS_HELP_TEXT
-#define MICROPY_PY_BUILTINS_HELP_TEXT mp_help_default_text
-#endif
-
-// Add the ability to list the available modules when executing help('modules')
-#ifndef MICROPY_PY_BUILTINS_HELP_MODULES
-#define MICROPY_PY_BUILTINS_HELP_MODULES (0)
-#endif
-
-// Whether to set __file__ for imported modules
-#ifndef MICROPY_PY___FILE__
-#define MICROPY_PY___FILE__ (1)
-#endif
-
-// Whether to provide mem-info related functions in micropython module
-#ifndef MICROPY_PY_MICROPYTHON_MEM_INFO
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
-#endif
-
-// Whether to provide "micropython.stack_use" function
-#ifndef MICROPY_PY_MICROPYTHON_STACK_USE
-#define MICROPY_PY_MICROPYTHON_STACK_USE (MICROPY_PY_MICROPYTHON_MEM_INFO)
-#endif
-
-// Whether to provide "array" module. Note that large chunk of the
-// underlying code is shared with "bytearray" builtin type, so to
-// get real savings, it should be disabled too.
-#ifndef MICROPY_PY_ARRAY
-#define MICROPY_PY_ARRAY (1)
-#endif
-
-// Whether to support slice assignments for array (and bytearray).
-// This is rarely used, but adds ~0.5K of code.
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (0)
-#endif
-
-// Whether to support attrtuple type (MicroPython extension)
-// It provides space-efficient tuples with attribute access
-#ifndef MICROPY_PY_ATTRTUPLE
-#define MICROPY_PY_ATTRTUPLE (1)
-#endif
-
-// Whether to provide "collections" module
-#ifndef MICROPY_PY_COLLECTIONS
-#define MICROPY_PY_COLLECTIONS (1)
-#endif
-
-// Whether to provide "ucollections.deque" type
-#ifndef MICROPY_PY_COLLECTIONS_DEQUE
-#define MICROPY_PY_COLLECTIONS_DEQUE (0)
-#endif
-
-// Whether to provide "collections.OrderedDict" type
-#ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
-#endif
-
-// Whether to provide the _asdict function for namedtuple
-#ifndef MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT
-#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (0)
-#endif
-
-// Whether to provide "math" module
-#ifndef MICROPY_PY_MATH
-#define MICROPY_PY_MATH (1)
-#endif
-
-// Whether to provide special math functions: math.{erf,erfc,gamma,lgamma}
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
-#endif
-
-// Whether to provide math.factorial function
-#ifndef MICROPY_PY_MATH_FACTORIAL
-#define MICROPY_PY_MATH_FACTORIAL (0)
-#endif
-
-// Whether to provide math.isclose function
-#ifndef MICROPY_PY_MATH_ISCLOSE
-#define MICROPY_PY_MATH_ISCLOSE (0)
-#endif
-
-// Whether to provide "cmath" module
-#ifndef MICROPY_PY_CMATH
-#define MICROPY_PY_CMATH (0)
-#endif
-
-// Whether to provide "gc" module
-#ifndef MICROPY_PY_GC
-#define MICROPY_PY_GC (1)
-#endif
-
-// Whether to return number of collected objects from gc.collect()
-#ifndef MICROPY_PY_GC_COLLECT_RETVAL
-#define MICROPY_PY_GC_COLLECT_RETVAL (0)
-#endif
-
-// Whether to provide "io" module
-#ifndef MICROPY_PY_IO
-#define MICROPY_PY_IO (1)
-#endif
-
-// Whether to provide "io.IOBase" class to support user streams
-#ifndef MICROPY_PY_IO_IOBASE
-#define MICROPY_PY_IO_IOBASE (0)
-#endif
-
-// Whether to provide "uio.resource_stream()" function with
-// the semantics of CPython's pkg_resources.resource_stream()
-// (allows to access binary resources in frozen source packages).
-// Note that the same functionality can be achieved in "pure
-// Python" by prepocessing binary resources into Python source
-// and bytecode-freezing it (with a simple helper module available
-// e.g. in micropython-lib).
-#ifndef MICROPY_PY_IO_RESOURCE_STREAM
-#define MICROPY_PY_IO_RESOURCE_STREAM (0)
-#endif
-
-// Whether to provide "io.FileIO" class
-#ifndef MICROPY_PY_IO_FILEIO
-#define MICROPY_PY_IO_FILEIO (0)
-#endif
-
-// Whether to provide "io.BytesIO" class
-#ifndef MICROPY_PY_IO_BYTESIO
-#define MICROPY_PY_IO_BYTESIO (1)
-#endif
-
-// Whether to provide "io.BufferedWriter" class
-#ifndef MICROPY_PY_IO_BUFFEREDWRITER
-#define MICROPY_PY_IO_BUFFEREDWRITER (0)
-#endif
-
-// Whether to provide "struct" module
-#ifndef MICROPY_PY_STRUCT
-#define MICROPY_PY_STRUCT (1)
-#endif
-
-// Whether to provide "sys" module
-#ifndef MICROPY_PY_SYS
-#define MICROPY_PY_SYS (1)
-#endif
-
-// Whether to provide "sys.maxsize" constant
-#ifndef MICROPY_PY_SYS_MAXSIZE
-#define MICROPY_PY_SYS_MAXSIZE (0)
-#endif
-
-// Whether to provide "sys.modules" dictionary
-#ifndef MICROPY_PY_SYS_MODULES
-#define MICROPY_PY_SYS_MODULES (1)
-#endif
-
-// Whether to provide "sys.exc_info" function
-// Avoid enabling this, this function is Python2 heritage
-#ifndef MICROPY_PY_SYS_EXC_INFO
-#define MICROPY_PY_SYS_EXC_INFO (0)
-#endif
-
-// Whether to provide "sys.exit" function
-#ifndef MICROPY_PY_SYS_EXIT
-#define MICROPY_PY_SYS_EXIT (1)
-#endif
-
-// Whether to provide "sys.atexit" function (MicroPython extension)
-#ifndef MICROPY_PY_SYS_ATEXIT
-#define MICROPY_PY_SYS_ATEXIT (0)
-#endif
-
-// Whether to provide "sys.settrace" function
-#ifndef MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PY_SYS_SETTRACE (0)
-#endif
-
-// Whether to provide "sys.getsizeof" function
-#ifndef MICROPY_PY_SYS_GETSIZEOF
-#define MICROPY_PY_SYS_GETSIZEOF (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr} objects
-#ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr}.buffer object
-// This is implemented per-port
-#ifndef MICROPY_PY_SYS_STDIO_BUFFER
-#define MICROPY_PY_SYS_STDIO_BUFFER (0)
-#endif
-
-// Whether to provide "uerrno" module
-#ifndef MICROPY_PY_UERRNO
-#define MICROPY_PY_UERRNO (0)
-#endif
-
-// Whether to provide the uerrno.errorcode dict
-#ifndef MICROPY_PY_UERRNO_ERRORCODE
-#define MICROPY_PY_UERRNO_ERRORCODE (1)
-#endif
-
-// Whether to provide "uselect" module (baremetal implementation)
-#ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT (0)
-#endif
-
-// Whether to provide "utime" module functions implementation
-// in terms of mp_hal_* functions.
-#ifndef MICROPY_PY_UTIME_MP_HAL
-#define MICROPY_PY_UTIME_MP_HAL (0)
-#endif
-
-// Period of values returned by utime.ticks_ms(), ticks_us(), ticks_cpu()
-// functions. Should be power of two. All functions above use the same
-// period, so if underlying hardware/API has different periods, the
-// minimum of them should be used. The value below is the maximum value
-// this parameter can take (corresponding to 30 bit tick values on 32-bit
-// system).
-#ifndef MICROPY_PY_UTIME_TICKS_PERIOD
-#define MICROPY_PY_UTIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1)
-#endif
-
-// Whether to provide "_thread" module
-#ifndef MICROPY_PY_THREAD
-#define MICROPY_PY_THREAD (0)
-#endif
-
-// Whether to make the VM/runtime thread-safe using a global lock
-// If not enabled then thread safety must be provided at the Python level
-#ifndef MICROPY_PY_THREAD_GIL
-#define MICROPY_PY_THREAD_GIL (MICROPY_PY_THREAD)
-#endif
-
-// Number of VM jump-loops to do before releasing the GIL.
-// Set this to 0 to disable the divisor.
-#ifndef MICROPY_PY_THREAD_GIL_VM_DIVISOR
-#define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32)
-#endif
-
-// Extended modules
-
-#ifndef MICROPY_PY_UCTYPES
-#define MICROPY_PY_UCTYPES (0)
-#endif
-
-// Whether to provide SHORT, INT, LONG, etc. types in addition to
-// exact-bitness types like INT16, INT32, etc.
-#ifndef MICROPY_PY_UCTYPES_NATIVE_C_TYPES
-#define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1)
-#endif
-
-#ifndef MICROPY_PY_UZLIB
-#define MICROPY_PY_UZLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UJSON
-#define MICROPY_PY_UJSON (0)
-#endif
-
-#ifndef MICROPY_PY_URE
-#define MICROPY_PY_URE (0)
-#endif
-
-#ifndef MICROPY_PY_URE_DEBUG
-#define MICROPY_PY_URE_DEBUG (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_GROUPS
-#define MICROPY_PY_URE_MATCH_GROUPS (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_SPAN_START_END
-#define MICROPY_PY_URE_MATCH_SPAN_START_END (0)
-#endif
-
-#ifndef MICROPY_PY_URE_SUB
-#define MICROPY_PY_URE_SUB (0)
-#endif
-
-#ifndef MICROPY_PY_UHEAPQ
-#define MICROPY_PY_UHEAPQ (0)
-#endif
-
-// Optimized heap queue for relative timestamps
-#ifndef MICROPY_PY_UTIMEQ
-#define MICROPY_PY_UTIMEQ (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB
-#define MICROPY_PY_UHASHLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_MD5
-#define MICROPY_PY_UHASHLIB_MD5 (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA1
-#define MICROPY_PY_UHASHLIB_SHA1  (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA256
-#define MICROPY_PY_UHASHLIB_SHA256 (1)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB
-#define MICROPY_PY_UCRYPTOLIB (0)
-#endif
-
-// Depends on MICROPY_PY_UCRYPTOLIB
-#ifndef MICROPY_PY_UCRYPTOLIB_CTR
-#define MICROPY_PY_UCRYPTOLIB_CTR (0)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB_CONSTS
-#define MICROPY_PY_UCRYPTOLIB_CONSTS (0)
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII (0)
-#endif
-
-// Depends on MICROPY_PY_UZLIB
-#ifndef MICROPY_PY_UBINASCII_CRC32
-#define MICROPY_PY_UBINASCII_CRC32 (0)
-#endif
-
-#ifndef MICROPY_PY_URANDOM
-#define MICROPY_PY_URANDOM (0)
-#endif
-
-// Whether to include: randrange, randint, choice, random, uniform
-#ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE
-#define MICROPY_PY_MACHINE (0)
-#endif
-
-// Whether to include: time_pulse_us
-#ifndef MICROPY_PY_MACHINE_PULSE
-#define MICROPY_PY_MACHINE_PULSE (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_I2C
-#define MICROPY_PY_MACHINE_I2C (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_SPI
-#define MICROPY_PY_MACHINE_SPI (0)
-#endif
-
-#ifndef MICROPY_PY_USSL
-#define MICROPY_PY_USSL (0)
-// Whether to add finaliser code to ussl objects
-#define MICROPY_PY_USSL_FINALISER (0)
-#endif
-
-#ifndef MICROPY_PY_UWEBSOCKET
-#define MICROPY_PY_UWEBSOCKET (0)
-#endif
-
-#ifndef MICROPY_PY_FRAMEBUF
-#define MICROPY_PY_FRAMEBUF (0)
-#endif
-
-#ifndef MICROPY_PY_BTREE
-#define MICROPY_PY_BTREE (0)
-#endif
-
-/*****************************************************************************/
-/* Hooks for a port to add builtins                                          */
-
-// Additional builtin function definitions - see modbuiltins.c:mp_module_builtins_globals_table for format.
-#ifndef MICROPY_PORT_BUILTINS
-#define MICROPY_PORT_BUILTINS
-#endif
-
-// Additional builtin module definitions - see objmodule.c:mp_builtin_module_table for format.
-#ifndef MICROPY_PORT_BUILTIN_MODULES
-#define MICROPY_PORT_BUILTIN_MODULES
-#endif
-
-// Additional constant definitions for the compiler - see compile.c:mp_constants_table.
-#ifndef MICROPY_PORT_CONSTANTS
-#define MICROPY_PORT_CONSTANTS
-#endif
-
-// Any root pointers for GC scanning - see mpstate.c
-#ifndef MICROPY_PORT_ROOT_POINTERS
-#define MICROPY_PORT_ROOT_POINTERS
-#endif
-
-/*****************************************************************************/
-/* Miscellaneous settings                                                    */
-
-// All uPy objects in ROM must be aligned on at least a 4 byte boundary
-// so that the small-int/qstr/pointer distinction can be made.  For machines
-// that don't do this (eg 16-bit CPU), define the following macro to something
-// like __attribute__((aligned(4))).
-#ifndef MICROPY_OBJ_BASE_ALIGNMENT
-#define MICROPY_OBJ_BASE_ALIGNMENT
-#endif
-
-// On embedded platforms, these will typically enable/disable irqs.
-#ifndef MICROPY_BEGIN_ATOMIC_SECTION
-#define MICROPY_BEGIN_ATOMIC_SECTION() (0)
-#endif
-#ifndef MICROPY_END_ATOMIC_SECTION
-#define MICROPY_END_ATOMIC_SECTION(state) (void)(state)
-#endif
-
-// Allow to override static modifier for global objects, e.g. to use with
-// object code analysis tools which don't support static symbols.
-#ifndef STATIC
-#define STATIC static
-#endif
-
-// Number of bytes in a word
-#ifndef BYTES_PER_WORD
-#define BYTES_PER_WORD (sizeof(mp_uint_t))
-#endif
-
-#define BITS_PER_BYTE (8)
-#define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD)
-// mp_int_t value with most significant bit set
-#define WORD_MSBIT_HIGH (((mp_uint_t)1) << (BYTES_PER_WORD * 8 - 1))
-
-// Make sure both MP_ENDIANNESS_LITTLE and MP_ENDIANNESS_BIG are
-// defined and that they are the opposite of each other.
-#if defined(MP_ENDIANNESS_LITTLE)
-#define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#elif defined(MP_ENDIANNESS_BIG)
-#define MP_ENDIANNESS_LITTLE (!MP_ENDIANNESS_BIG)
-#else
-  // Endianness not defined by port so try to autodetect it.
-  #if defined(__BYTE_ORDER__)
-    #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (1)
-    #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (0)
-    #endif
-  #else
-    #include <endian.h>
-      #if defined(__BYTE_ORDER)
-        #if __BYTE_ORDER == __LITTLE_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (1)
-        #elif __BYTE_ORDER == __BIG_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (0)
-        #endif
-      #endif
-  #endif
-  #ifndef MP_ENDIANNESS_LITTLE
-    #error endianness not defined and cannot detect it
-  #endif
-  #define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#endif
-
-// Make a pointer to RAM callable (eg set lower bit for Thumb code)
-// (This scheme won't work if we want to mix Thumb and normal ARM code.)
-#ifndef MICROPY_MAKE_POINTER_CALLABLE
-#define MICROPY_MAKE_POINTER_CALLABLE(p) (p)
-#endif
-
-// If these MP_PLAT_*_EXEC macros are overridden then the memory allocated by them
-// must be somehow reachable for marking by the GC, since the native code
-// generators store pointers to GC managed memory in the code.
-#ifndef MP_PLAT_ALLOC_EXEC
-#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) do { *ptr = m_new(byte, min_size); *size = min_size; } while (0)
-#endif
-
-#ifndef MP_PLAT_FREE_EXEC
-#define MP_PLAT_FREE_EXEC(ptr, size) m_del(byte, ptr, size)
-#endif
-
-// This macro is used to do all output (except when MICROPY_PY_IO is defined)
-#ifndef MP_PLAT_PRINT_STRN
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-#endif
-
-#ifndef MP_SSIZE_MAX
-#define MP_SSIZE_MAX SSIZE_MAX
-#endif
-
-// printf format spec to use for mp_int_t and friends
-#ifndef INT_FMT
-#if defined(__LP64__)
-// Archs where mp_int_t == long, long != int
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-#elif defined(_WIN64)
-#define UINT_FMT "%llu"
-#define INT_FMT "%lld"
-#else
-// Archs where mp_int_t == int
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-#endif
-#endif //INT_FMT
-
-// Modifier for function which doesn't return
-#ifndef NORETURN
-#define NORETURN __attribute__((noreturn))
-#endif
-
-// Modifier for weak functions
-#ifndef MP_WEAK
-#define MP_WEAK __attribute__((weak))
-#endif
-
-// Modifier for functions which should be never inlined
-#ifndef MP_NOINLINE
-#define MP_NOINLINE __attribute__((noinline))
-#endif
-
-// Modifier for functions which should be always inlined
-#ifndef MP_ALWAYSINLINE
-#define MP_ALWAYSINLINE __attribute__((always_inline))
-#endif
-
-// Condition is likely to be true, to help branch prediction
-#ifndef MP_LIKELY
-#define MP_LIKELY(x) __builtin_expect((x), 1)
-#endif
-
-// Condition is likely to be false, to help branch prediction
-#ifndef MP_UNLIKELY
-#define MP_UNLIKELY(x) __builtin_expect((x), 0)
-#endif
-
-// To annotate that code is unreachable
-#ifndef MP_UNREACHABLE
-#if defined(__GNUC__)
-#define MP_UNREACHABLE __builtin_unreachable();
-#else
-#define MP_UNREACHABLE for (;;);
-#endif
-#endif
-
-#ifndef MP_HTOBE16
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE16(x) ((uint16_t)( (((x) & 0xff) << 8) | (((x) >> 8) & 0xff) ))
-# define MP_BE16TOH(x) MP_HTOBE16(x)
-#else
-# define MP_HTOBE16(x) (x)
-# define MP_BE16TOH(x) (x)
-#endif
-#endif
-
-#ifndef MP_HTOBE32
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE32(x) ((uint32_t)( (((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) >> 8)  & 0xff00) | (((x) >> 24) & 0xff) ))
-# define MP_BE32TOH(x) MP_HTOBE32(x)
-#else
-# define MP_HTOBE32(x) (x)
-# define MP_BE32TOH(x) (x)
-#endif
-#endif
-
-// Warning categories are by default implemented as strings, though
-// hook is left for a port to define them as something else.
-#if MICROPY_WARNINGS_CATEGORY
-# ifndef MP_WARN_CAT
-# define MP_WARN_CAT(x) #x
-# endif
-#else
-# undef MP_WARN_CAT
-# define MP_WARN_CAT(x) (NULL)
-#endif
-
-// Feature dependency check.
-#if MICROPY_PY_SYS_SETTRACE
-#if !MICROPY_PERSISTENT_CODE_SAVE
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_PERSISTENT_CODE_SAVE to be enabled"
-#endif
-#if MICROPY_COMP_CONST
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_COMP_CONST to be disabled"
-#endif
-#endif
-
-#endif // MICROPY_INCLUDED_PY_MPCONFIG_H
diff --git a/apps/KhiCAS/src/micropython-1.12/nspire/mpconfigport.h~ b/apps/KhiCAS/src/micropython-1.12/nspire/mpconfigport.h~
deleted file mode 100644
index c89b24665..000000000
--- a/apps/KhiCAS/src/micropython-1.12/nspire/mpconfigport.h~
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// options to control how Micro Python is built
-
-#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
-#define MICROPY_EMIT_ARM            (1)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_COMPILE (1)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_PLATFORM     "nspire"
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO_FILEIO        (0)
-#define MICROPY_PY_GC_COLLECT_RETVAL (1)
-#define MICROPY_COMP_MODULE_CONST   (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
-#define MICROPY_STACK_CHECK         (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_REPL_AUTO_INDENT    (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_USE_INTERNAL_PRINTF (0)
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_DESCRIPTORS      (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_SYS_EXC_INFO     (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#define MICROPY_MODULE_FROZEN       (0)
-#define MICROPY_STACKLESS           (0)
-#define MICROPY_STACKLESS_STRICT    (0)
-#define MICROPY_PY_UZLIB            (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_UHEAPQ           (1)
-#define MICROPY_PY_UHASHLIB         (1)
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_MACHINE          (1)
-#define MICROPY_WARNINGS            (1)
-
-#define MICROPY_PY_UCTYPES          (1)
-
-// Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.
-// names in exception messages (may require more RAM).
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
-// Define to 1 to use untested inefficient GC helper implementation
-// (if more efficient arch-specific one is not available).
-#ifndef MICROPY_GCREGS_SETJMP
-#define MICROPY_GCREGS_SETJMP       (0)
-#endif
-
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (128)
-
-extern const struct _mp_obj_module_t mp_module_os;
-extern const struct _mp_obj_module_t mp_module_nsp;
-extern const struct _mp_obj_module_t mp_module_graphic;
-extern const struct _mp_obj_module_t mp_module_cas;
-extern const struct _mp_obj_module_t mp_module_turtle;
-extern const struct _mp_obj_module_t mp_module_matplotl;
-extern const struct _mp_obj_module_t mp_module_linalg;
-extern const struct _mp_obj_module_t mp_module_arit;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR__os), (mp_obj_t) &mp_module_os }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_nsp), (mp_obj_t) &mp_module_nsp }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_cas), (mp_obj_t) &mp_module_cas }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_arit), (mp_obj_t) &mp_module_arit }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_linalg), (mp_obj_t) &mp_module_linalg }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_matplotl), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_matplotlib), (mp_obj_t) &mp_module_matplotl }, \
-        { MP_OBJ_NEW_QSTR(MP_QSTR_matplotlib_dot_pyplot), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_pylab), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_turtle), (mp_obj_t) &mp_module_turtle }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_casioplot), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_kandinsky), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_graphic), (mp_obj_t) &mp_module_graphic }
-
-typedef int mp_int_t;
-typedef unsigned int mp_uint_t;
-typedef long mp_off_t;
-
-#define BYTES_PER_WORD sizeof(mp_int_t)
-#define MP_SSIZE_MAX INT_MAX
-
-typedef void *machine_ptr_t; // must be of pointer size
-typedef const void *machine_const_ptr_t; // must be of pointer size
-
-#define MICROPY_PORT_BUILTINS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
-
-#include <alloca.h>
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/Makefile.simu~ b/apps/KhiCAS/src/micropython-1.12/numworks/Makefile.simu~
deleted file mode 100644
index a4949115e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/Makefile.simu~
+++ /dev/null
@@ -1,55 +0,0 @@
-include ../py/mkenv.mk
--include mpconfigport.mk
-
-PREFIX=arm-none-eabi-
-CC = $(PREFIX)gcc
-CXX = $(PREFIX)g++
-LD = $(PREFIX)ld 
-
-# define main target
-PROG = micropython
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# OS name, for simple autoconfig
-UNAME_S := $(shell uname -s)
-
-# Disable stripping of the main executable, relocation info is needed by genzehn
-NOSTRIP := 1
-# DEBUG := 1
-
-# include py core make definitions
-include ../py/py.mk
-
-INC =  -I.
-INC += -I..
-INC += -I../py
-INC += -I$(BUILD)
-
-# Debugging/Optimization
-ifdef DEBUG
-COPT = -O0 -g
-else
-COPT = -Ofast -g #-fomit-frame-pointer -flto
-endif
-
-# compiler settings
-CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format
-CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-CFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard  -mcpu=cortex-m7 -mfpu=fpv5-sp-d16  -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive
-
-
-LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) 
-
-# source files
-SRC_C = $(shell find . -name \*.c)
-
-SRC_QSTR += $(SRC_C)
-
-OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-
-include ../py/mkrules.mk
-
-all: $(PROG)
-
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/Makefile~ b/apps/KhiCAS/src/micropython-1.12/numworks/Makefile~
deleted file mode 100644
index a4949115e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/Makefile~
+++ /dev/null
@@ -1,55 +0,0 @@
-include ../py/mkenv.mk
--include mpconfigport.mk
-
-PREFIX=arm-none-eabi-
-CC = $(PREFIX)gcc
-CXX = $(PREFIX)g++
-LD = $(PREFIX)ld 
-
-# define main target
-PROG = micropython
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# OS name, for simple autoconfig
-UNAME_S := $(shell uname -s)
-
-# Disable stripping of the main executable, relocation info is needed by genzehn
-NOSTRIP := 1
-# DEBUG := 1
-
-# include py core make definitions
-include ../py/py.mk
-
-INC =  -I.
-INC += -I..
-INC += -I../py
-INC += -I$(BUILD)
-
-# Debugging/Optimization
-ifdef DEBUG
-COPT = -O0 -g
-else
-COPT = -Ofast -g #-fomit-frame-pointer -flto
-endif
-
-# compiler settings
-CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format
-CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-CFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard  -mcpu=cortex-m7 -mfpu=fpv5-sp-d16  -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive
-
-
-LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) 
-
-# source files
-SRC_C = $(shell find . -name \*.c)
-
-SRC_QSTR += $(SRC_C)
-
-OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-
-include ../py/mkrules.mk
-
-all: $(PROG)
-
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/changes~ b/apps/KhiCAS/src/micropython-1.12/numworks/changes~
deleted file mode 100644
index 0809a6c49..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/changes~
+++ /dev/null
@@ -1,103 +0,0 @@
-cp mpconfig.h ../py/mpconfig.h 
-micropylib.tgz + ajouter dans le repertoire py de l'information sur les lignes
-
-pour gerer les erreurs de parse
-parse.h: au debut extern int parser_errorline,parser_errorcol;
-parse.c: au debut int parser_errorline=0,parser_errorcol=0; (a mettre aussi avant un appel de mp_parse, dans main.c
-ligne 1056/7 mp_obj_exception_add_traceback(exc, lex->source_name, lex->tok_line, MP_QSTR_NULL); parser_errorline=lex->tok_line; parser_errorcol=lex->tok_column;
-
-renommer urandom en random dans extmod/modurandom.c py/objmodule.c
-
-import des fichiers: ajouter .tns dans py/buildimport.c apres .py
-
-pour apply dans py/objfun.c/.h declarer et enlever STATIC
-mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-
-modification dans py/objlist.c pour indiciage par tuple
-...
-STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-  if (mp_obj_get_type(index)==&mp_type_tuple){
-    size_t len;
-    mp_obj_t * elem;
-    mp_obj_get_array(index, &len, &elem);
-    if (len==0)
-      return self_in;
-    mp_obj_t curindex=elem[0];
-    if (len>1){
-      mp_obj_t cur=list_subscr(self_in,curindex,MP_OBJ_SENTINEL);
-      mp_obj_t r=mp_obj_new_tuple(len-1, elem+1);
-      return list_subscr(cur,r,value);
-    }
-    index=curindex;
-  }
-    if (value == MP_OBJ_NULL) {
-...
-
-meme chose dans py/objtuple.c
-...
-mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-  if (mp_obj_get_type(index)==&mp_type_tuple){
-    size_t len;
-    mp_obj_t * elem;
-    mp_obj_get_array(index, &len, &elem);
-    if (len==0)
-      return self_in;
-    mp_obj_t curindex=elem[0];
-    if (len>1){
-      mp_obj_t cur=mp_obj_tuple_subscr(self_in,curindex,MP_OBJ_SENTINEL);
-      mp_obj_t r=mp_obj_new_tuple(len-1, elem+1);
-      return mp_obj_tuple_subscr(cur,r,value);
-    }
-    index=curindex;
-  }
-    if (value == MP_OBJ_SENTINEL) {
-...
-
-modification dans py/modbuiltins.c pour round
-STATIC mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) {
-...
-#if MICROPY_PY_BUILTINS_FLOAT
-    mp_int_t num_dig = 0;
-    if (n_args > 1) {
-        num_dig = mp_obj_get_int(args[1]);
-        mp_float_t val = mp_obj_get_float(o_in);
-        mp_float_t mult = 1;
-	if (num_dig>=0){
-	  for (int i=0;i<num_dig;++i)
-	    mult*=10;
-	}
-	else
-	  mult = MICROPY_FLOAT_C_FUN(pow)(10, num_dig);	  
-        // TODO may lead to overflow
-        mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val * mult) / mult;
-        return mp_obj_new_float(rounded);
-    }
-    mp_float_t val = mp_obj_get_float(o_in);
-    if (val>-2147483648.0 && val<2147483648.0){
-      int v=val;
-      return mp_obj_new_int(v);
-    }
-    mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val);
-    return mp_obj_new_int_from_float(rounded);
-#else
-...
-
-./mklib:
-make, attendre l'erreur de link
-make V=1 >& log
-ouvrir log et modifier la ligne de link et en faire une lib avec
-arm-none-eabi-ar cru libmicropy fichiers_objs
-(au lieu de nspire-gcc micropython fichiers_objs)
-copier libmicropy.a dans un repertoire lib de ndless-sdk
-
-Fonctions exportees
-int do_file(const char *file);
-char * micropy_init();
-int micropy_eval(const char * line);
-void  mp_deinit();
-Initialisation de MicroPython 
-  char * heap=micropy_init();
-Sortie:
-  mp_deinit(); free(heap);
-
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/file.c~ b/apps/KhiCAS/src/micropython-1.12/numworks/file.c~
deleted file mode 100644
index 9b2bf3b8e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/file.c~
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "py/nlr.h"
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/builtin.h"
-#include "py/mphal.h"
-#include "../unix/fdfile.h"
-
-#if MICROPY_PY_IO
-
-#ifdef _WIN32
-#define fsync _commit
-#endif
-
-#ifdef MICROPY_CPYTHON_COMPAT
-STATIC void check_fd_is_open(const mp_obj_fdfile_t *o) {
-    if (o->fd < 0) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "I/O operation on closed file"));
-    }
-}
-#else
-#define check_fd_is_open(o)
-#endif
-
-extern const mp_obj_type_t mp_type_fileio;
-extern const mp_obj_type_t mp_type_textio;
-
-STATIC void fdfile_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<io.%s %d>", mp_obj_get_type_str(self_in), self->fd);
-}
-
-STATIC mp_uint_t fdfile_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-    mp_int_t r = read(o->fd, buf, size);
-    if (r == -1) {
-        *errcode = errno;
-        return MP_STREAM_ERROR;
-    }
-    return r;
-}
-
-STATIC mp_uint_t fdfile_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-#if defined MICROPY_LIB || MICROPY_PY_OS_DUPTERM
-    if (o->fd <= STDERR_FILENO) {
-        mp_hal_stdout_tx_strn(buf, size);
-        return size;
-    }
-#endif
-    mp_int_t r = write(o->fd, buf, size);
-    while (r == -1 && errno == EINTR) {
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
-        }
-        r = write(o->fd, buf, size);
-    }
-    if (r == -1) {
-        *errcode = errno;
-        return MP_STREAM_ERROR;
-    }
-    return r;
-}
-
-STATIC mp_uint_t fdfile_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-    switch (request) {
-        case MP_STREAM_SEEK: {
-            struct mp_stream_seek_t *s = (struct mp_stream_seek_t*)arg;
-            off_t off = lseek(o->fd, s->offset, s->whence);
-            if (off == (off_t)-1) {
-                *errcode = errno;
-                return MP_STREAM_ERROR;
-            }
-            s->offset = off;
-            return 0;
-        }
-        case MP_STREAM_FLUSH:
-            return 0;
-        default:
-            *errcode = EINVAL;
-            return MP_STREAM_ERROR;
-    }
-}
-
-STATIC mp_obj_t fdfile_close(mp_obj_t self_in) {
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    close(self->fd);
-#ifdef MICROPY_CPYTHON_COMPAT
-    self->fd = -1;
-#endif
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fdfile_close_obj, fdfile_close);
-
-STATIC mp_obj_t fdfile___exit__(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    return fdfile_close(args[0]);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fdfile___exit___obj, 4, 4, fdfile___exit__);
-
-STATIC mp_obj_t fdfile_fileno(mp_obj_t self_in) {
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    check_fd_is_open(self);
-    return MP_OBJ_NEW_SMALL_INT(self->fd);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fdfile_fileno_obj, fdfile_fileno);
-
-// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
-// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
-STATIC const mp_arg_t file_open_args[] = {
-    { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-    { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
-    { MP_QSTR_buffering, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-    { MP_QSTR_encoding, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-};
-#define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
-
-STATIC mp_obj_t fdfile_open(const mp_obj_type_t *type, mp_arg_val_t *args) {
-    mp_obj_fdfile_t *o = m_new_obj(mp_obj_fdfile_t);
-    const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
-
-    int mode_rw = 0, mode_x = 0;
-    while (*mode_s) {
-        switch (*mode_s++) {
-            case 'r':
-                mode_rw = O_RDONLY;
-                break;
-            case 'w':
-                mode_rw = O_WRONLY;
-                mode_x = O_CREAT | O_TRUNC;
-                break;
-            case 'a':
-                mode_rw = O_WRONLY;
-                mode_x = O_CREAT | O_APPEND;
-                break;
-            case '+':
-                mode_rw = O_RDWR;
-                break;
-            #if MICROPY_PY_IO_FILEIO
-            // If we don't have io.FileIO, then files are in text mode implicitly
-            case 'b':
-                type = &mp_type_fileio;
-                break;
-            case 't':
-                type = &mp_type_textio;
-                break;
-            #endif
-        }
-    }
-
-    o->base.type = type;
-
-    mp_obj_t fid = args[0].u_obj;
-
-    if (MP_OBJ_IS_SMALL_INT(fid)) {
-        o->fd = MP_OBJ_SMALL_INT_VALUE(fid);
-        return MP_OBJ_FROM_PTR(o);
-    }
-
-    const char *fname = mp_obj_str_get_str(fid);
-    int fd = open(fname, mode_x | mode_rw, 0644);
-    if (fd == -1) {
-        mp_raise_OSError(errno);
-    }
-    o->fd = fd;
-    return MP_OBJ_FROM_PTR(o);
-}
-
-STATIC mp_obj_t fdfile_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
-    mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
-    return fdfile_open(type, arg_vals);
-}
-
-STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_fileno), MP_ROM_PTR(&fdfile_fileno_obj) },
-    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) },
-    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) },
-    { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
-    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&fdfile_close_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&fdfile___exit___obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
-
-#if MICROPY_PY_IO_FILEIO
-STATIC const mp_stream_p_t fileio_stream_p = {
-    .read = fdfile_read,
-    .write = fdfile_write,
-    .ioctl = fdfile_ioctl,
-};
-
-const mp_obj_type_t mp_type_fileio = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = fdfile_print,
-    .make_new = fdfile_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
-};
-#endif
-
-STATIC const mp_stream_p_t textio_stream_p = {
-    .read = fdfile_read,
-    .write = fdfile_write,
-    .ioctl = fdfile_ioctl,
-    .is_text = true,
-};
-
-const mp_obj_type_t mp_type_textio = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIOWrapper,
-    .print = fdfile_print,
-    .make_new = fdfile_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &textio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
-};
-
-// Factory function for I/O stream classes
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    // TODO: analyze buffering args and instantiate appropriate type
-    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
-    mp_arg_parse_all(n_args, args, kwargs, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
-    return fdfile_open(&mp_type_textio, arg_vals);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
-const mp_obj_fdfile_t mp_sys_stdin_obj  = { .base = {&mp_type_textio}, .fd = STDIN_FILENO };
-const mp_obj_fdfile_t mp_sys_stdout_obj = { .base = {&mp_type_textio}, .fd = STDOUT_FILENO };
-const mp_obj_fdfile_t mp_sys_stderr_obj = { .base = {&mp_type_textio}, .fd = STDERR_FILENO };
-
-#endif // MICROPY_PY_IO
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/graphic.c~ b/apps/KhiCAS/src/micropython-1.12/numworks/graphic.c~
deleted file mode 100644
index cc79ba545..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/graphic.c~
+++ /dev/null
@@ -1,3166 +0,0 @@
-/* -*- mode:C -*- */
-#if defined EMCC && !defined NO_QSTR
-#include <emscripten.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <math.h>
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "gc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objfun.h"
-#include "objstr.h"
-#include "objint.h"
-#include "runtime.h"
-#include "mpz.h"
-#include "lexer.h"
-#include "parse.h"
-#include "compile.h"
-extern const struct _mp_obj_module_t mp_module_graphic;
-// basic
-#ifdef NUMWORKS
-void c_sprint_double(char * s,double d);
-void strcat_double(char * s,double d){
-  for (;*s;)
-    ++s;
-  c_sprint_double(s,d);
-}
-int numworks_get_pixel(int x,int y);
-inline int os_get_pixel(int x,int y){ return numworks_get_pixel(x,y);}
-void sync_screen(){}
-#else // NUMWORKS
-int os_get_pixel(int x,int y);
-void sync_screen();
-#endif // NUMWORKS
-void c_set_pixel(int x,int y,int c); // c_ prefixed functions run freeze=true
-void c_fill_rect(int x,int y,int w,int h,int c);
-int os_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-int os_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake);
-// more complex paths
-void c_draw_rectangle(int x,int y,int w,int h,int c);
-void c_draw_line(int x0,int y0,int x1,int y1,int c);
-void c_draw_circle(int xc,int yc,int r,int color,bool q1,bool q2,bool q3,bool q4);
-void c_draw_filled_circle(int xc,int yc,int r,int color,bool left,bool right);
-void c_draw_polygon(int * x,int *y ,int n,int color);
-void c_draw_filled_polygon(int * x,int *y, int n,int xmin,int xmax,int ymin,int ymax,int color);
-void c_draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2);
-void c_draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment);
-void c_turtle_forward(double d);
-void c_turtle_left(double d);
-void c_turtle_up(int i);
-void c_turtle_goto(double x,double y);
-void c_turtle_cap(double x);
-void c_turtle_crayon(int i);
-void c_turtle_rond(int x,int y,int z);
-void c_turtle_disque(int x,int y,int z,int centre);
-void c_turtle_fill(int i);
-void c_turtle_fillcolor(double r,double g,double b,int entier);
-void c_turtle_getposition(double * x,double * y);
-//const double M_PI=3.1415926535897932;
-#define LCD_WIDTH 320
-#define LCD_HEIGHT 222
-int select_item(const char ** ptr,const char * title,bool askfor1);
-
-#define mp_rgb(r,g,b) ((((r*32)/256)<<11) | (((g*64)/256)<<5) | (b*32/256))
-
-#ifndef M_PI
-#define M_PI (3.14159265358979323846)
-#endif
-
-void raisetypeerr(){
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Bad argument type"));
-}
-bool mp_int_float(mp_obj_t e,double * d){
-  *d=0;
-  if (mp_obj_is_float(e)){
-    *d=mp_obj_get_float(e);
-    return true;
-  }
-  if (MP_OBJ_IS_INT(e)){
-    *d=mp_obj_get_int(e);
-    return true;
-  }
-  return false;
-}
-
-const char * translate_point_type(const char * s){
-  if (strcmp("+",s)==0)
-    return "plus_point";
-  if (strcmp("*",s)==0)
-    return "star_point";
-  if (strcmp("x",s)==0)
-    return "point_croix";
-  if (strcmp("o",s)==0)
-    return "square_point";
-  return s;
-}
-
-int mp_int_float2color(mp_obj_t e){
-  if (mp_obj_is_float(e)){
-    double d=mp_obj_get_float(e);
-    if (d<=0) return 0;
-    if (d>=1) return 255;
-    int r=d*256;
-    return r;
-  }
-  int r=mp_obj_get_int(e);
-  if (r<=0) return 0;
-  if (r>255) return 255;
-  return r;
-}
-
-int mp_get_color(mp_obj_t tuple){
-  if (MP_OBJ_IS_SMALL_INT(tuple)) 
-    return MP_OBJ_SMALL_INT_VALUE(tuple) & 0xffffffff;
-  if (MP_OBJ_IS_STR(tuple)){
-    const char * col=mp_obj_str_get_str(tuple);
-    if (strcmp(col,"black")==0)
-      return 0;
-    if (strcmp(col,"white")==0)
-      return 0xffff;
-    if (strcmp(col,"blue")==0)
-      return 2079;
-    if (strcmp(col,"red")==0)
-      return 63488;
-    if (strcmp(col,"green")==0)
-      return 2016;
-    if (strcmp(col,"magenta")==0)
-      return 63519;
-    if (strcmp(col,"yellow")==0)
-      return 65504;
-    if (strcmp(col,"cyan")==0)
-      return 2047;
-    return -1;
-  }
-  size_t len;
-  mp_obj_t * elem;
-
-  mp_obj_get_array(tuple, &len, &elem);
-  if (len != 3) {
-    mp_raise_TypeError("color needs 3 components");
-  }
-  int r=mp_int_float2color(elem[0]);
-  int g=mp_int_float2color(elem[1]);
-  int b=mp_int_float2color(elem[2]);
-  return mp_rgb(r,g,b);
-}
-
-static mp_obj_t graphic_clear_screen(size_t n_args, const mp_obj_t *args){
-  int c=0xffff;
-  if (n_args==1) //  && MP_OBJ_IS_SMALL_INT(args[0]))
-    c=mp_get_color(args[0]); //MP_OBJ_SMALL_INT_VALUE(args[0]);
-  c_fill_rect(0,0,LCD_WIDTH,LCD_HEIGHT,c);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_clear_screen_obj, 0, 1, graphic_clear_screen);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_clear_obj, 0, 1, graphic_clear_screen);
-
-static mp_obj_t graphic_show_screen(size_t n_args, const mp_obj_t *args){
-#ifndef NUMWORKS
-  sync_screen();
-#endif
-  return mp_const_none;
-}
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_show_screen_obj, 0,1,graphic_show_screen);
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_show_obj, 0,1,graphic_show_screen);
-
-mp_obj_t mp_color_tuple(int c){
-  mp_obj_tuple_t * t = (mp_obj_tuple_t *)(MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL)));
-  c &= 0xffff;
-  int r=(c>>11)&0x1f,g=(c>>5)&0x3f,b=c&0x1f;
-  r *= 8; g*=4; b*=8;
-  t->items[0] = MP_OBJ_NEW_SMALL_INT(r);
-  t->items[1] = MP_OBJ_NEW_SMALL_INT(g);
-  t->items[2] = MP_OBJ_NEW_SMALL_INT(b);
-  return MP_OBJ_FROM_PTR(t);
-}  
-
-static mp_obj_t graphic_set_pixel(size_t n_args, const mp_obj_t *args) {
-  if (n_args<2){
-    sync_screen();
-    return mp_const_none;
-  }
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]),color=0;
-  if (n_args==3)    
-    color = mp_get_color(args[2]);
-  c_set_pixel(x,y,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_set_pixel_obj, 0, 3, graphic_set_pixel);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_pixel_obj, 2, 3, graphic_set_pixel);
-
-
-static mp_obj_t graphic_draw_line(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_obj_get_int(args[4]);
-  c_draw_line(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_line_obj, 4, 5, graphic_draw_line);
-
-bool mp_array2inttab(mp_obj_t l,int ** x,size_t * n,size_t * m){
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  mp_obj_get_array(elem[0],m,&line);
-  if (*m==0)
-    return false;
-  int * ptr=(int *)malloc((*n)*(*m)*sizeof(int));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(*x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      *ptr=mp_obj_get_int(line[j]);
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-static mp_obj_t graphic_draw_polygon_(size_t n_args, const mp_obj_t *args,bool filled) {
-  int color=0;
-  int * tab=0;
-  size_t n=0,m=0;
-  if (!mp_array2inttab(args[0],&tab,&n,&m))
-      return mp_const_false;
-  if (m!=2){
-    free(tab);
-    return mp_const_false;
-  }
-  int x[n],y[n];
-  for (size_t i=0;i<n;++i){
-    x[i]=*tab;
-    ++tab;
-    y[i]=*tab;
-    ++tab;
-  }
-  if (n_args==2)    
-    color = mp_obj_get_int(args[1]);
-  if (filled)
-    c_draw_filled_polygon(x,y,n,0,LCD_WIDTH,0,LCD_HEIGHT,color);
-  else
-    c_draw_polygon(x,y,n,color);
-  return mp_const_none;
-}
-static mp_obj_t graphic_draw_polygon(size_t n_args, const mp_obj_t *args) {
-  return graphic_draw_polygon_(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_polygon_obj, 1, 2, graphic_draw_polygon);
-static mp_obj_t graphic_draw_filled_polygon(size_t n_args, const mp_obj_t *args) {
-  return graphic_draw_polygon_(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_polygon_obj, 1, 2, graphic_draw_filled_polygon);
-
-static mp_obj_t graphic_draw_rectangle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_get_color(args[4]);
-  c_draw_rectangle(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_rectangle_obj, 4, 5, graphic_draw_rectangle);
-
-static mp_obj_t graphic_fill_rect(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_get_color(args[4]);
-  c_fill_rect(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_fill_rect_obj, 4, 5, graphic_fill_rect);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_rectangle_obj, 4, 5, graphic_fill_rect);
-
-static mp_obj_t graphic_draw_circle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r = mp_obj_get_int(args[2]),
-    color=0;
-  if (n_args==4)    
-    color = mp_get_color(args[3]);
-  c_draw_circle(x1,y1,r,color,true,true,true,true);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_circle_obj, 3, 4, graphic_draw_circle);
-
-static mp_obj_t graphic_draw_filled_circle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r = mp_obj_get_int(args[2]),
-    color=0;
-  if (n_args==4)    
-    color = mp_get_color(args[3]);
-  c_draw_filled_circle(x1,y1,r,color,true,true);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_circle_obj, 3, 4, graphic_draw_filled_circle);
-
-static mp_obj_t graphic_draw_arc(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r1 = mp_obj_get_int(args[2]), r2=mp_obj_get_int(args[3]),
-    t1=0,t2=360,
-    color=0;
-  if (n_args>=6){
-    t1 = mp_obj_get_int(args[4]), t2=mp_obj_get_int(args[5]);
-  }
-  if (n_args==7)    
-    color = mp_get_color(args[6]);
-  c_draw_arc(x1,y1,r1,r2,color,t1*M_PI/180,t2*M_PI/180);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_arc_obj, 4, 7, graphic_draw_arc);
-
-static mp_obj_t graphic_draw_filled_arc(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r1 = mp_obj_get_int(args[2]), r2=mp_obj_get_int(args[3]),
-    t1=0,t2=360,
-    color=0;
-  if (n_args>=6){
-    t1 = mp_obj_get_int(args[4]), t2=mp_obj_get_int(args[5]);
-  }
-  if (n_args>=7)    
-    color = mp_get_color(args[6]);
-  c_draw_filled_arc(x1,y1,r1,r2,t1,t2,color,0,LCD_WIDTH,0,LCD_HEIGHT,n_args==8);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_arc_obj, 4, 8, graphic_draw_filled_arc);
-
-static mp_obj_t graphic_get_pixel(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]);
-  if (x<0 || x>=LCD_WIDTH || y<0 || y>=LCD_HEIGHT)
-    return mp_const_none;
-  int c=os_get_pixel(x,y);
-  if (n_args==3) 
-    return MP_OBJ_NEW_SMALL_INT(c);
-  return mp_color_tuple(c);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_get_pixel_obj, 2, 3, graphic_get_pixel);
-
-static mp_obj_t graphic_draw_string(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]),c=0,bg=0xffff;
-  const char * text = mp_obj_str_get_str(args[2]);
-  if (n_args>=4)
-    c = mp_get_color(args[3]);
-  if (n_args>=5)
-    bg = mp_get_color(args[4]);
-  const char * font = 0;
-  if (n_args>=6)
-    font=mp_obj_str_get_str(args[5]);
-  if (font && strcmp(font,"small")==0)
-    c_draw_string_small(x,y,c,bg,text,false);
-  else {
-    if (font && strcmp(font,"large")==0)
-      c_draw_string(x,y,c,bg,text,false);
-    else
-      c_draw_string_medium(x,y,c,bg,text,false);
-  }
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_string_obj, 3, 6, graphic_draw_string);
-
-//
-static const mp_map_elem_t graphic_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_get_pixel), (mp_obj_t) &graphic_get_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cyan), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_magenta), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_yellow), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_blue), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,255)) },
-    { MP_ROM_QSTR(MP_QSTR_red), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_green), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_black), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_white), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_clear_screen), (mp_obj_t) &graphic_clear_screen_obj },
-	{ MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &graphic_clear_obj },
-	{ MP_ROM_QSTR(MP_QSTR_show_screen), (mp_obj_t) &graphic_show_screen_obj },
-	{ MP_ROM_QSTR(MP_QSTR_set_pixel), (mp_obj_t) &graphic_set_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_pixel), (mp_obj_t) &graphic_draw_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_line), (mp_obj_t) &graphic_draw_line_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_polygon), (mp_obj_t) &graphic_draw_polygon_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_filled_polygon), (mp_obj_t) &graphic_draw_filled_polygon_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_rectangle), (mp_obj_t) &graphic_draw_rectangle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_fill_rect), (mp_obj_t) &graphic_fill_rect_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_filled_rectangle), (mp_obj_t) &graphic_draw_filled_rectangle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_circle), (mp_obj_t) &graphic_draw_circle_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_filled_circle), (mp_obj_t) &graphic_draw_filled_circle_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_arc), (mp_obj_t) &graphic_draw_arc_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_filled_arc), (mp_obj_t) &graphic_draw_filled_arc_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_string), (mp_obj_t) &graphic_draw_string_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(graphic_locals_dict, graphic_locals_dict_table);
-
-const mp_obj_type_t graphic_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_graphic,
-    .locals_dict = (mp_obj_t)&graphic_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_graphic_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__graphic) },
-	{ MP_ROM_QSTR(MP_QSTR_cyan), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_magenta), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_yellow), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_blue), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,255)) },
-    { MP_ROM_QSTR(MP_QSTR_red), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_green), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_black), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_white), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,255)) },
-    { MP_ROM_QSTR(MP_QSTR_set_pixel), (mp_obj_t) &graphic_set_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_pixel), (mp_obj_t) &graphic_draw_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_line), (mp_obj_t) &graphic_draw_line_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_polygon), (mp_obj_t) &graphic_draw_polygon_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_polygon), (mp_obj_t) &graphic_draw_filled_polygon_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_rectangle), (mp_obj_t) &graphic_draw_rectangle_obj },
-    { MP_ROM_QSTR(MP_QSTR_fill_rect), (mp_obj_t) &graphic_fill_rect_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_rectangle), (mp_obj_t) &graphic_draw_filled_rectangle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_circle), (mp_obj_t) &graphic_draw_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_circle), (mp_obj_t) &graphic_draw_filled_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_arc), (mp_obj_t) &graphic_draw_arc_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_arc), (mp_obj_t) &graphic_draw_filled_arc_obj },
-    { MP_ROM_QSTR(MP_QSTR_get_pixel), (mp_obj_t) &graphic_get_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_string), (mp_obj_t) &graphic_draw_string_obj },
-    { MP_ROM_QSTR(MP_QSTR_show_screen), (mp_obj_t) &graphic_show_screen_obj },
-    { MP_ROM_QSTR(MP_QSTR_clear_screen), (mp_obj_t) &graphic_clear_screen_obj },
-    { MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &graphic_clear_obj },
-    { MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &graphic_show_obj },
-
-};
-
-STATIC const mp_obj_dict_t mp_module_graphic_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_graphic_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_graphic_globals_table),
-        .table = (mp_map_elem_t*)mp_module_graphic_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_graphic = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_graphic_globals,
-};
-
-/* ********************************
- *                  CAS           *
- * ******************************** */
-int mp_token(const char * line){ // does not work, always mp_type_fun_bc
-  mp_obj_dict_t *dict = NULL;
-  dict = mp_locals_get();//mp_globals_get();//
-  mp_map_t * m=mp_obj_dict_get_map(dict);
-  mp_obj_t index=mp_obj_new_str(line,strlen(line));
-  mp_map_elem_t *ptr=mp_map_lookup(m, index, MP_MAP_LOOKUP) ;
-  // 0 or 3
-  if (ptr)
-    return 3;
-  else
-    return 0;
-}
-
-const char * const * mp_vars();
-const char * const * mp_vars(){
-  mp_obj_dict_t *dict = NULL;
-  dict = mp_locals_get();
-
-  mp_obj_t dir = mp_obj_new_list(0, NULL);
-  if (dict != NULL) {
-    for (size_t i = 0; i < dict->map.alloc; i++) {
-      if (MP_MAP_SLOT_IS_FILLED(&dict->map, i)) {
-	//const char * ch=mp_obj_str_get_str(dict->map.table[i].key);
-	mp_obj_t v=dict->map.table[i].value;
-	mp_obj_type_t * vt=mp_obj_get_type(v);
-	if (vt!=&mp_type_fun_builtin_var
-	    && vt!=&mp_type_fun_builtin_0
-	    && vt!=&mp_type_fun_builtin_1
-	    && vt!=&mp_type_fun_builtin_2
-	    && vt!=&mp_type_fun_builtin_3
-	    )
-	  mp_obj_list_append(dir, dict->map.table[i].key);
-      }
-    }
-  }
-  mp_obj_t * line; size_t m=0;
-  mp_obj_get_array(dir,&m,&line);
-  const char ** tab=(const char **)malloc((m+1)*sizeof(char *));
-  if (!tab) return 0;
-  for (size_t i=0;i<m;++i){
-    tab[i]=mp_obj_str_get_str(line[i]);
-  }
-  tab[m]=0;
-  for (size_t i=0;i<m;++i){
-    if (strcmp(tab[i],"__name__")==0){
-      tab[i]=tab[m-1];
-      tab[m-1]="del ";
-      break;
-    }
-  }
-  return tab;
-}
-
-/* ********************************z
- *         LINALG & CAS           *
- * ******************************** */
-bool r_inv(double *,int n);
-bool r_rref(double *,int n,int m);
-double r_det(double *,int);
-struct double_pair {
-  double r,i;
-} ;
-typedef struct double_pair c_complex;
-bool c_inv(c_complex *,int n);
-bool c_rref(c_complex *,int n,int m);
-c_complex c_det(c_complex *,int);
-bool c_egv(c_complex * x,int n); // eigenvectors
-bool c_proot(c_complex * x,int n); 
-bool c_pcoeff(c_complex * x,int n); 
-bool c_fft(c_complex * x,int n,bool inverse); 
-bool c_eig(c_complex * x,c_complex * d,int n); // eigenvectors
-bool mp_get_c_complex(mp_obj_t e,c_complex * d){
-  d->r=d->i=0;
-  if (mp_obj_is_float(e)){
-    d->r=mp_obj_get_float(e);
-    return true;
-  }
-  if (MP_OBJ_IS_INT(e)){
-    d->r=mp_obj_get_int(e);
-    return true;
-  }
-  if (mp_obj_get_type(e)==&mp_type_complex){
-    mp_obj_get_complex(e,&d->r,&d->i);
-    return true;
-  }
-  return false;
-}
-
-void c_mul(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r*b.r-a.i*b.i;
-  c->i=a.r*b.i+a.i*b.r;
-}
-
-void c_sub(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r-b.r;
-  c->i=a.i-b.i;
-}
-
-void c_add(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r+b.r;
-  c->i=a.i+b.i;
-}
-
-bool mp_array2doubletab(mp_obj_t l,double ** x,size_t * n,size_t * m){
-  if (mp_obj_get_type(l)!=&mp_type_tuple &&
-      mp_obj_get_type(l)!=&mp_type_list)
-    return false;
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  *m=0;
-  if (mp_obj_get_type(elem[0])==&mp_type_tuple ||
-      mp_obj_get_type(elem[0])==&mp_type_list)
-    mp_obj_get_array(elem[0],m,&line);
-  if (*m==0){
-    double * ptr=(double *)malloc((*n)*sizeof(double));
-    *x=ptr;
-    for (size_t i=0;i<*n;++i){
-      if (MP_OBJ_IS_SMALL_INT(elem[i])) 
-	*ptr=MP_OBJ_SMALL_INT_VALUE(elem[i]);
-      else {
-	if (mp_obj_is_float(elem[i]))
-	  *ptr=mp_obj_float_get(elem[i]);
-	else {
-	  free(*x);
-	  return false;
-	}
-      }
-      ++ptr;
-    }
-    return true;
-  }
-  double * ptr=(double *)malloc((*n)*(*m)*sizeof(double));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      if (MP_OBJ_IS_SMALL_INT(line[j])) 
-	*ptr=MP_OBJ_SMALL_INT_VALUE(line[j]);
-      else {
-	if (mp_obj_is_float(line[j]))
-	  *ptr=mp_obj_float_get(line[j]);
-	else {
-	  free(*x);
-	  return false;
-	}
-      }
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-bool mp_array2c_complextab(mp_obj_t l,c_complex ** x,size_t * n,size_t * m){
-  if (mp_obj_get_type(l)!=&mp_type_tuple &&
-      mp_obj_get_type(l)!=&mp_type_list)
-    return false;
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  *m=0;
-  if (mp_obj_get_type(elem[0])==&mp_type_tuple ||
-      mp_obj_get_type(elem[0])==&mp_type_list)
-    mp_obj_get_array(elem[0],m,&line);
-  if (*m==0){
-    c_complex * ptr=(c_complex *)malloc((*n)*sizeof(c_complex));
-    *x=ptr;
-    for (size_t i=0;i<*n;++i){
-      ptr->i=0;
-      if (MP_OBJ_IS_SMALL_INT(elem[i])) 
-	ptr->r=MP_OBJ_SMALL_INT_VALUE(elem[i]);
-      else {
-	if (mp_obj_is_float(elem[i]))
-	  ptr->r=mp_obj_float_get(elem[i]);
-	else {
-	  if (mp_obj_get_type(elem[i])==&mp_type_complex){
-	    double R,I;
-	    mp_obj_get_complex(elem[i],&R,&I);
-	    ptr->r=R;
-	    ptr->i=I;
-	  }
-	  else {
-	    free(*x);
-	    return false;
-	  }
-	}
-      }
-      ++ptr;
-    }
-    return true;
-  }
-  c_complex * ptr=(c_complex *)malloc((*n)*(*m)*sizeof(c_complex));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      ptr->i=0;
-      if (MP_OBJ_IS_SMALL_INT(line[j])) 
-	ptr->r=MP_OBJ_SMALL_INT_VALUE(line[j]);
-      else {
-	if (mp_obj_is_float(line[j]))
-	  ptr->r=mp_obj_float_get(line[j]);
-	else {
-	  if (mp_obj_get_type(line[j])==&mp_type_complex){
-	    double r,i;
-	    mp_obj_get_complex(line[j],&r,&i);
-	    ptr->r=r;
-	    ptr->i=i;
-	  }
-	  else {
-	    free(*x);
-	    return false;
-	  }
-	}
-      }
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-// print array, 1-d if m==0
-// returns malloc-ed string
-char * printtab(double * x,size_t n,size_t m){
-  char buf[32];
-  if (m==0){
-    char * ptr=(char *)malloc(32*n);
-    strcpy(ptr,"[");
-    for (size_t i=0;i<n;++i){
-#ifdef NUMWORKS
-      buf[0]=0;
-      strcat_double(buf,x[i]);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g,",x[i]);
-#endif
-      strcat(ptr,buf);
-    }
-    ptr[strlen(ptr)-1]=']';
-    return ptr;
-  }
-  char * ptr=(char *)malloc(32*n*m);
-  strcpy(ptr,"[");
-  for (size_t i=0;i<n;++i){
-    strcat(ptr,"[");
-    for (size_t j=0;j<m;++j){
-#ifdef NUMWORKS
-      buf[0]=0;
-      strcat_double(buf,*x);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g,",*x);
-#endif
-      strcat(ptr,buf);
-      ++x;
-    }
-    ptr[strlen(ptr)-1]=']';
-    strcat(ptr,",");
-  }
-  ptr[strlen(ptr)-1]=']';
-  return ptr;
-}
-
-char * printc_complextab(c_complex * x,size_t n,size_t m){
-  char buf[256]="";
-  if (m==0){
-    char * ptr=(char *)malloc(64*n);
-    strcpy(ptr,"[");
-    for (size_t i=0;i<n;++i){
-#ifdef NUMWORKS
-      c_sprint_double(buf,x[i].r);
-      strcat(buf,"+i*");
-      strcat_double(buf,x[i].i);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g+i*%.14g,",x[i].r,x[i].i);
-#endif
-      strcat(ptr,buf);
-    }
-    ptr[strlen(ptr)-1]=']';
-    return ptr;
-  }
-  char * ptr=(char *)malloc(64*n*m);
-  strcpy(ptr,"[");
-  for (size_t i=0;i<n;++i){
-    strcat(ptr,"[");
-    for (size_t j=0;j<m;++j){
-#ifdef NUMWORKS
-      buf[0]=0;
-      c_sprint_double(buf,x->r);
-      strcat(buf,"+i*");
-      strcat_double(buf,x->i);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g+i*%.14g,",x->r,x->i);
-#endif
-      strcat(ptr,buf);
-      ++x;
-    }
-    ptr[strlen(ptr)-1]=']';
-    strcat(ptr,",");
-  }
-  ptr[strlen(ptr)-1]=']';
-  return ptr;
-}
-
-mp_obj_t doubletab2mp_array(double *x,size_t n,size_t m){
-  mp_obj_t r=mp_obj_new_list(0,NULL);
-  for (size_t i=0;i<n;++i){
-    mp_obj_t l=mp_obj_new_list(0,NULL);
-    for (size_t j=0;j<m;++j){
-      mp_obj_list_append(l,mp_obj_new_float(*x));
-      ++x;
-    }
-    mp_obj_list_append(r,l);
-  }
-  return r;
-}
-
-mp_obj_t c_complextab2mp_array(c_complex *x,size_t n,size_t m){
-  mp_obj_t r=mp_obj_new_list(0,NULL);
-  if (m==0){
-    for (size_t i=0;i<n;++i){
-      if (x->i==0)
-	mp_obj_list_append(r,mp_obj_new_float(x->r));
-      else
-	mp_obj_list_append(r,mp_obj_new_complex(x->r,x->i));
-      ++x;
-    }
-    return r;
-  }
-  for (size_t i=0;i<n;++i){
-    mp_obj_t l=mp_obj_new_list(0,NULL);
-    for (size_t j=0;j<m;++j){
-      if (x->i==0)
-	mp_obj_list_append(l,mp_obj_new_float(x->r));
-      else
-	mp_obj_list_append(l,mp_obj_new_complex(x->r,x->i));
-      ++x;
-    }
-    mp_obj_list_append(r,l);
-  }
-  return r;
-}
-
-const char * caseval(const char *);
-
-// mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-// type= &mp_type_str, n_args==1, n_kw=0
-// mp_obj_is_str
-// const char *mp_obj_str_get_str(mp_obj_t self_in); 
-
-static mp_obj_t cas_caseval(size_t n_args, const mp_obj_t *args) {
-  const char * text = mp_obj_str_get_str(args[0]);
-  if (n_args>1){
-    size_t len=strlen(text);
-    const char * argtext[8];
-    for (int i=1;i<n_args;++i){
-      argtext[i]=mp_obj_str_get_str(mp_obj_str_make_new(&mp_type_str,1,0,&args[i]));
-      len += strlen(argtext[i]);
-    }
-    char * buf=malloc(len+64);
-    strcpy(buf,text);
-    strcat(buf,"(");
-    for (int i=1;i<n_args;++i){
-      strcat(buf,argtext[i]);
-      strcat(buf,",");
-    }
-    buf[strlen(buf)-1]=')';
-    const char * val=caseval(buf);
-    py_ck_ctrl_c();
-    return mp_obj_new_str(val,strlen(val));
-  }
-  const char * val=caseval(text);
-  py_ck_ctrl_c();
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cas_caseval_obj, 1, 8, cas_caseval);
-
-static mp_obj_t cas_get_key(size_t n_args, const mp_obj_t *args) {
-    const char * val=caseval("caseval(get_key())");
-    return mp_obj_new_int(atoi(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cas_get_key_obj, 0, 0, cas_get_key);
-
-//
-static const mp_map_elem_t cas_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_caseval), (mp_obj_t) &cas_caseval_obj },
-	{ MP_ROM_QSTR(MP_QSTR_get_key), (mp_obj_t) &cas_get_key_obj },
-	{ MP_ROM_QSTR(MP_QSTR_xcas), (mp_obj_t) &cas_caseval_obj },
-	{ MP_ROM_QSTR(MP_QSTR_eval_expr), (mp_obj_t) &cas_caseval_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(cas_locals_dict, cas_locals_dict_table);
-
-const mp_obj_type_t cas_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cas,
-    .locals_dict = (mp_obj_t)&cas_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_cas_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__cas) },
-    { MP_ROM_QSTR(MP_QSTR_caseval), (mp_obj_t) &cas_caseval_obj },
-    { MP_ROM_QSTR(MP_QSTR_get_key), (mp_obj_t) &cas_get_key_obj },
-    { MP_ROM_QSTR(MP_QSTR_xcas), (mp_obj_t) &cas_caseval_obj },
-    { MP_ROM_QSTR(MP_QSTR_eval_expr), (mp_obj_t) &cas_caseval_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_cas_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_cas_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_cas_globals_table),
-        .table = (mp_map_elem_t*)mp_module_cas_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_cas = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_cas_globals,
-};
-
-/* ARIT 
-   mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base);
- */
-
-mp_obj_t str2int(const char * s){
-  bool neg=s[0]=='-';
-  if (neg)
-    ++s;
-  return mp_obj_new_int_from_str_len(&s,strlen(s),neg,10);
-}
-
-static mp_obj_t str2list2int(const char * val,int N){
-  char buf[strlen(val)+1];
-  strcpy(buf,val);
-  char * buf1=buf;
-  mp_obj_t res = mp_obj_new_list(0, NULL);
-  for (;*buf1;++buf1){
-    if (*buf1=='[')
-      break;
-  }
-  if (*buf1){
-    ++buf1;
-    for (int i=0;i<N;++i){
-      char * buf2=buf1;
-      for (;*buf2;++buf2){
-	if (*buf2==',' || *buf2==']')
-	  break;
-      }
-      *buf2=0;
-      mp_obj_list_append(res,str2int(buf1));
-      buf1=buf2+1;
-      while (*buf1==' ')
-	++buf1;
-    }
-  }
-  return res;
-}
-
-static mp_obj_t arit(const mp_obj_t *args,int nargs,int cmd) {
-  if (
-      !MP_OBJ_IS_INT(args[0])
-      || (nargs==2 && !MP_OBJ_IS_INT(args[1]))
-      )
-    mp_raise_TypeError("integer expected");
-  if (cmd==8 && mp_obj_get_int(args[0])>2e5)
-    mp_raise_TypeError("integer too large");
-  // The size of this buffer is rather arbitrary. If it's not large
-  // enough, a dynamic one will be allocated.
-  char stack_buf[512];
-  char *buf = stack_buf;
-  size_t buf_size = sizeof(stack_buf);
-  size_t fmt_size;
-  char *str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size, args[0], 10, NULL, '\0', '\0');
-  char BUF[strlen(str)+32];
-  switch (cmd){
-  case 0:
-    sprintf(BUF,"isprime(%s)",str);
-    break;
-  case 1:
-    sprintf(BUF,"nextprime(%s)",str);
-    break;
-  case 2:
-    sprintf(BUF,"prevprime(%s)",str);
-    break;
-  case 3:
-    sprintf(BUF,"ifactor(%s)",str);
-    break;
-  case 4:
-    sprintf(BUF,"gcd(%s,",str);
-    break;
-  case 5:
-    sprintf(BUF,"lcm(%s,",str);
-    break;
-  case 6:
-    sprintf(BUF,"iegcd(%s,",str);
-    break;
-  case 7:
-    sprintf(BUF,"euler(%s)",str);
-    break;
-  case 8:
-    sprintf(BUF,"nprimes(%s)",str);
-    break;
-  }
-  if (buf != stack_buf) {
-    m_del(char, buf, buf_size);
-  }
-  const char * val=0;
-  if (nargs==2){
-    buf=stack_buf;
-    str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size, args[1], 10, NULL, '\0', '\0');
-    char BUF2[strlen(BUF)+strlen(str)+32];
-    strcpy(BUF2,BUF);
-    strcat(BUF2,str);
-    if (buf != stack_buf) {
-      m_del(char, buf, buf_size);
-    }
-    strcat(BUF2,")");
-    val=caseval(BUF2);
-  }
-  else
-    val=caseval(BUF);
-  if (cmd==0){
-    if (strcmp(val,"True")==0 || strcmp(val,"true")==0 || strcmp(val,"1")==0)
-      return mp_const_true;
-    if (strcmp(val,"False")==0 || strcmp(val,"false")==0 || strcmp(val,"0")==0)
-      return mp_const_false;
-  }
-  if (cmd==1 || cmd==2 || cmd==4 || cmd==5  || cmd==7 || cmd==8){
-    return str2int(val);
-  }
-  if (cmd==6){
-    return str2list2int(val,3);
-  }
-  return mp_obj_new_str(val,strlen(val));
-}
-static mp_obj_t arit_isprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_isprime_obj, 1, 1, arit_isprime);
-
-static mp_obj_t arit_nextprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_nextprime_obj, 1, 1, arit_nextprime);
-
-static mp_obj_t arit_prevprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,2);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_prevprime_obj, 1, 1, arit_prevprime);
-
-static mp_obj_t arit_ifactor(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,3);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_ifactor_obj, 1, 1, arit_ifactor);
-
-static mp_obj_t arit_gcd(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,4);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_gcd_obj, 2, 2, arit_gcd);
-
-static mp_obj_t arit_lcm(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,5);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_lcm_obj, 2, 2, arit_lcm);
-
-static mp_obj_t arit_iegcd(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,6);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_iegcd_obj, 2, 2, arit_iegcd);
-
-static mp_obj_t arit_euler(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,7);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_euler_obj, 1, 1, arit_euler);
-
-static mp_obj_t arit_nprimes(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,8);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_nprimes_obj, 1, 1, arit_nprimes);
-
-static mp_obj_t arit_char(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_SMALL_INT(args[0])){
-    char buf[2]={MP_OBJ_SMALL_INT_VALUE(args[0]),0};
-    return mp_obj_new_str(buf,1);
-  }
-  mp_obj_t * tab; size_t m=0;
-  mp_obj_get_array(args[0],&m,&tab);
-  if (m==0)
-    raisetypeerr();
-  char buf[m+1];
-  for (int i=0;i<m;++i){
-    if (!MP_OBJ_IS_SMALL_INT(tab[i]))
-      raisetypeerr();
-    buf[i]=MP_OBJ_SMALL_INT_VALUE(tab[i]);
-  }
-  return mp_obj_new_str(buf,m);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_char_obj, 1, 1, arit_char);
-
-static mp_obj_t arit_asc(size_t n_args, const mp_obj_t *args) {
-  if (!mp_obj_is_str(args[0]))
-    raisetypeerr();
-  size_t len;
-  const char * s=mp_obj_str_get_data(args[0],&len);
-  mp_obj_t res = mp_obj_new_list(0, NULL);
-  for (int i=0;i<len;++i)
-    mp_obj_list_append(res,mp_obj_new_int(s[i]));
-  return res;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_asc_obj, 1, 1, arit_asc);
-//
-static const mp_map_elem_t arit_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_isprime), (mp_obj_t) &arit_isprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_nextprime), (mp_obj_t) &arit_nextprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_prevprime), (mp_obj_t) &arit_prevprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ifactor), (mp_obj_t) &arit_ifactor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_gcd), (mp_obj_t) &arit_gcd_obj },
-	{ MP_ROM_QSTR(MP_QSTR_lcm), (mp_obj_t) &arit_lcm_obj },
-	{ MP_ROM_QSTR(MP_QSTR_iegcd), (mp_obj_t) &arit_iegcd_obj },
-	{ MP_ROM_QSTR(MP_QSTR_char), (mp_obj_t) &arit_char_obj },
-	{ MP_ROM_QSTR(MP_QSTR_asc), (mp_obj_t) &arit_asc_obj },
-        { MP_ROM_QSTR(MP_QSTR_euler), (mp_obj_t) &arit_euler_obj },
-        { MP_ROM_QSTR(MP_QSTR_nprimes), (mp_obj_t) &arit_nprimes_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(arit_locals_dict, arit_locals_dict_table);
-
-const mp_obj_type_t arit_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_arit,
-    .locals_dict = (mp_obj_t)&arit_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_arit_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__arit) },
-    { MP_ROM_QSTR(MP_QSTR_isprime), (mp_obj_t) &arit_isprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_nextprime), (mp_obj_t) &arit_nextprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_prevprime), (mp_obj_t) &arit_prevprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifactor), (mp_obj_t) &arit_ifactor_obj },
-    { MP_ROM_QSTR(MP_QSTR_gcd), (mp_obj_t) &arit_gcd_obj },
-    { MP_ROM_QSTR(MP_QSTR_lcm), (mp_obj_t) &arit_lcm_obj },
-    { MP_ROM_QSTR(MP_QSTR_iegcd), (mp_obj_t) &arit_iegcd_obj },
-    { MP_ROM_QSTR(MP_QSTR_char), (mp_obj_t) &arit_char_obj },
-    { MP_ROM_QSTR(MP_QSTR_asc), (mp_obj_t) &arit_asc_obj },
-    { MP_ROM_QSTR(MP_QSTR_euler), (mp_obj_t) &arit_euler_obj },
-    { MP_ROM_QSTR(MP_QSTR_nprimes), (mp_obj_t) &arit_nprimes_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_arit_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_arit_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_arit_globals_table),
-        .table = (mp_map_elem_t*)mp_module_arit_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_arit = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_arit_globals,
-};
-
-/* LINALG (with some NUMPY compatibility) */
-static mp_obj_t linalg_matrix(size_t n_args, const mp_obj_t *args) {
-  double *x=0;size_t n,m;
-  if (mp_array2doubletab(args[n_args-1],&x,&n,&m)){
-    if (n_args==1){
-      free(x);
-      return args[0];
-    }
-    if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[0]) &&  MP_OBJ_IS_SMALL_INT(args[1])){
-      int n1=MP_OBJ_SMALL_INT_VALUE(args[0]),m1=MP_OBJ_SMALL_INT_VALUE(args[1]);
-      int N=m?n*m:n,k=0;
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      for (int i=0;i<n1;++i){
-	mp_obj_t l = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m1;++j){
-	  mp_obj_list_append(l,mp_obj_new_float(k<N?x[k]:0));
-	  ++k;
-	}
-	mp_obj_list_append(r,l);
-      }
-      free(x);
-      return r;
-    }
-    if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[0]) ){
-      int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-      int N=m?n*m:n,k=0;
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      for (int i=0;i<n1;++i){
-	mp_obj_list_append(r,mp_obj_new_float(k<N?x[k]:0));
-	++k;
-      }
-      free(x);
-      return r;
-    }
-    free(x);
-  }
-  if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[0])){
-    int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      mp_obj_t arg=mp_obj_new_int(i);
-      mp_obj_list_append(r,fun_bc_call(args[1],1,0,&arg));	  
-    }
-    return r;
-  }
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_IS_SMALL_INT(args[1])){
-    int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    int m1=MP_OBJ_SMALL_INT_VALUE(args[1]);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    mp_obj_t arg[2];
-    for (int i=0;i<n1;++i){
-      arg[0]=mp_obj_new_int(i);
-      mp_obj_t l = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m1;++j){
-	arg[1]=mp_obj_new_int(j);
-	mp_obj_list_append(l,fun_bc_call(args[2],2,0,arg)); 
-      }
-      mp_obj_list_append(r,l);
-    }
-    return r;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_matrix_obj, 1, 3, linalg_matrix);
-
-static mp_obj_t linalg_arange(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t l = mp_obj_new_list(0, NULL);
-  double step=1,a,b;
-  if (n_args==3)
-    mp_int_float(args[2],&step);
-  if (step>0 && mp_int_float(args[0],&a) && mp_int_float(args[1],&b)){
-    for (;a<=b;a+=step){
-      mp_obj_list_append(l,mp_obj_new_float(a));
-    }
-    return l;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_arange_obj, 2, 3, linalg_arange);
-
-static mp_obj_t linalg_linspace(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t l = mp_obj_new_list(0, NULL);
-  double a,b;
-  if (mp_int_float(args[0],&a) && mp_int_float(args[1],&b) && a!=b && MP_OBJ_IS_SMALL_INT(args[2]) && MP_OBJ_SMALL_INT_VALUE(args[2])>1){
-    double step=(b-a)/(MP_OBJ_SMALL_INT_VALUE(args[2])-1);
-    if (step*(b-a)<0)
-      step=-step;
-    for (;a<=b;a+=step){
-      mp_obj_list_append(l,mp_obj_new_float(a));
-    }
-    return l;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_linspace_obj, 3, 3, linalg_linspace);
-
-void raisedimerr(){
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Dimension mismatch"));
-}
-
-mp_obj_t mp_obj_new_complex_real(double a,double b){
-  if (b==0)
-    return mp_obj_new_float(a);
-  return mp_obj_new_complex(a,b);
-}
-
-static mp_obj_t linalg_addsub(size_t n_args, const mp_obj_t *args,bool add) {
-  c_complex *x,*y;
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (n1!=n2 || m1!=m2){
-      free(x); free(y);
-      raisedimerr();
-    }
-    c_complex *x_=x,*y_=y;
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      if (m1==0){
-	if (add)
-	  mp_obj_list_append(res,mp_obj_new_complex_real(x->r+y->r,x->i+y->i));
-	else
-	  mp_obj_list_append(res,mp_obj_new_complex_real(x->r-y->r,x->i-y->i));
-	++x; ++y;
-	continue;
-      }
-      mp_obj_t line = mp_obj_new_list(0, NULL);
-      if (add){
-	for (int j=0;j<m1;++j,++x,++y){
-	  mp_obj_list_append(line,mp_obj_new_complex_real(x->r+y->r,x->i+y->i));
-	}
-      }
-      else {
-	for (int j=0;j<m1;++j,++x,++y){
-	  mp_obj_list_append(line,mp_obj_new_complex_real(x->r-y->r,x->i-y->i));
-	}
-      }
-      mp_obj_list_append(res,line);
-    }
-    free(x_); free(y_);
-    return res;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-static mp_obj_t linalg_add(size_t n_args, const mp_obj_t *args) {
-  return linalg_addsub(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_add_obj, 2, 2, linalg_add);
-static mp_obj_t linalg_sub(size_t n_args, const mp_obj_t *args) {
-  return linalg_addsub(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_sub_obj, 2, 2, linalg_sub);
-
-// scalar product of vectors x and y
-c_complex dot(c_complex *x,c_complex *y,int n){
-  c_complex r={0,0};
-  for (int i=0;i<n;++i){
-    r.r += x[i].r*y[i].r-x[i].i*y[i].i;
-    r.i += x[i].r*y[i].i+x[i].i*y[i].r;
-  }
-  return r;
-}
-
-c_complex mult(c_complex a,c_complex b){
-  c_complex c={a.r*b.r-a.i*b.i,a.r*b.i+a.i*b.r};
-  return c;
-}
-
-// transpose matrix (in place for square matrices)
-void transpose(c_complex *x,int n,int m){
-  if (n==m){
-    for (int i=1;i<n;++i){
-      for (int j=0;j<i;++j){
-	c_complex * a=x+i*m+j;
-	c_complex * b=x+j*m+i;
-	c_complex t=*a;
-	*a=*b;
-	*b=t;
-      }
-    }
-    return;
-  }
-  c_complex * tmp=(c_complex *) malloc(n*m*sizeof(c_complex));
-  if (!tmp)
-    return; // should error!
-  for (int i=0;i<n;++i){
-    for (int j=0;j<m;++j){
-      *(tmp+j*n+i)=*(x+i*m+j);
-    }
-  }
-  memcpy(x,tmp,n*m*sizeof(c_complex));
-  free(tmp);
-}
-
-
-static mp_obj_t linalg_dot(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*y; c_complex a;
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (mp_get_c_complex(args[1],&a)){
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      c_complex * x_=x;
-      if (m1==0){
-	for (;x_<x+n1;++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-	}
-	free(x);
-	return res;
-      }
-      for (int i=0;i<n1;++i){
-	mp_obj_t line = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m1;++j,++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-	}
-	mp_obj_list_append(res,line);
-      }
-      free(x);
-      return res;      
-    }
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (m1==0){ // v*M
-      if (m2==0 && n1==n2){
-	c_complex c={0,0};
-	c_complex * x_=x,*y_=y;
-	for (int i=0;i<n1;++i,++x_,++y_){
-	  c.r += x_->r*y_->r-x_->i*y_->i;
-	  c.i += x_->r*y_->i+x_->i*y_->r;
-	}
-	free(x);free(y);
-	return mp_obj_new_complex_real(c.r,c.i);
-      }
-      if (n1!=m2)
-	raisedimerr();
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      for (c_complex * y_=y;y_<y+n2*m2;y_+=m2){
-	c_complex c=dot(x,y_,m2);
-	mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-      }
-      free(x);free(y);
-      return res;
-    }
-    if (m2==0){ // M*v
-      if (n2!=m1)
-	raisedimerr();
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      for (c_complex * x_=x;x_<x+n1*m1;x_+=m1){
-	c_complex c=dot(x_,y,m1);
-	mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-      }
-      free(x);free(y);
-      return res;
-    }
-    if (m1!=n2){
-      free(x); free(y);
-      raisedimerr();
-    }
-    // M1*M2
-    transpose(y,n2,m2);
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      mp_obj_t line = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m2;++j){
-	c_complex c=dot(x+m1*i,y+m1*j,m1);
-	mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-      }
-      mp_obj_list_append(res,line);
-    }
-    free(x); free(y);
-    return res;
-  }
-  if (mp_array2c_complextab(args[1],&y,&n2,&m2)){
-    if (mp_get_c_complex(args[0],&a)){
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      c_complex * x_=y;
-      if (m2==0){
-	for (;x_<x+n2;++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-	}
-	free(y);
-	return res;
-      }
-      for (int i=0;i<n2;++i){
-	mp_obj_t line = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m2;++j,++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-	}
-	mp_obj_list_append(res,line);
-      }
-      free(y);
-      return res;      
-    }
-    free(y);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_dot_obj, 2, 2, linalg_dot);
-
-static mp_obj_t linalg_cross(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*y; 
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1) && n1==3 && m1==0){
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (n2!=3 || m2!=0){
-      free(x);
-      free(y);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    c_complex tmp1,tmp2,A,B,C;
-    c_mul(x[0],y[1],&tmp1);c_mul(x[1],y[0],&tmp2); c_sub(tmp1,tmp2,&C);
-    c_mul(x[2],y[0],&tmp1);c_mul(x[0],y[2],&tmp2); c_sub(tmp1,tmp2,&B);
-    c_mul(x[1],y[2],&tmp1);c_mul(x[2],y[1],&tmp2); c_sub(tmp1,tmp2,&A);
-    free(x);
-    free(y);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    mp_obj_list_append(r,mp_obj_new_complex_real(A.r,A.i));
-    mp_obj_list_append(r,mp_obj_new_complex_real(B.r,B.i));
-    mp_obj_list_append(r,mp_obj_new_complex_real(C.r,C.i));
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_cross_obj, 2, 2, linalg_cross);
-
-static mp_obj_t linalg_transpose(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    transpose(x,n1,m1);
-    mp_obj_t r=c_complextab2mp_array(x,m1,n1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_transpose_obj, 1, 1, linalg_transpose);
-
-static mp_obj_t linalg_rref(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (!c_rref(x,n1,m1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_rref_obj, 1, 1, linalg_rref);
-
-static mp_obj_t linalg_egv(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1 || !c_egv(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_egv_obj, 1, 1, linalg_egv);
-
-static mp_obj_t linalg_eig(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*d;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    d=(c_complex *) malloc(n1*n1*sizeof(c_complex));
-    if (n1!=m1 || !c_eig(x,d,n1)){
-      free(x); free(d);
-    }
-    else {
-      mp_obj_t items[2];
-      items[0]=c_complextab2mp_array(x,n1,m1);
-      items[1]=c_complextab2mp_array(d,n1,m1);
-      mp_obj_t r=mp_obj_new_tuple(2, items);
-      free(x); free(d);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(giac_linalg_eig_obj, 1, 1, linalg_eig);
-
-static mp_obj_t linalg_inv(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1){
-      free(x);
-      raisedimerr();
-    }
-    if (!c_inv(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,m1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(giac_linalg_inv_obj, 1, 1, linalg_inv);
-
-static mp_obj_t linalg_re(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return args[0];
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_float(R);
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i)
-      x[i].i=0;
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_re_obj, 1, 1, linalg_re);
-
-static mp_obj_t linalg_im(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return mp_obj_new_int(0);
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_float(I);
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].r=x[i].i;
-      x[i].i=0;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_im_obj, 1, 1, linalg_im);
-
-static mp_obj_t linalg_conj(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return args[0];
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_complex(R,-I);
-  }
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].i=-x[i].i;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_conj_obj, 1, 1, linalg_conj);
-
-double c_abs(c_complex c){
-  double x=c.r<0?-c.r:c.r;
-  double y=c.i<0?-c.i:c.i;
-  if (x>y){
-    double t=x;
-    x=y;
-    y=t;
-  }
-  // now x<=y
-  if (y==0) return 0;
-  double t=x/y;
-  return y*sqrt(1+t*t);
-}
-static mp_obj_t linalg_abs(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_SMALL_INT(args[0])){
-    long long i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    if (i>=0)
-      return args[0];
-    return mp_obj_new_int(-i);
-  }
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0])){
-    return mp_obj_new_float(fabs(mp_obj_get_float(args[0])));
-  }
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    R=fabs(R); I=fabs(I);
-    if (R<I){
-      double t=R;
-      R=I;
-      I=t;
-    }
-    double t=I/R;
-    return mp_obj_new_float(R*sqrt(1+t*t));
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].r=c_abs(x[i]);
-      x[i].i=0;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_abs_obj, 1, 1, linalg_abs);
-
-static mp_obj_t linalg_proot(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (m1!=0){
-      free(x);
-      raisedimerr();
-    }
-    if (!c_proot(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1-1,0);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_proot_obj, 1, 1, linalg_proot);
-
-static mp_obj_t linalg_pcoeff(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (m1!=0){
-      free(x);
-      raisedimerr();
-    }
-    c_complex y[n1+1];
-    for (int i=0;i<n1;++i)
-      y[i]=x[i];
-    free(x);
-    if (c_pcoeff(y,n1)){
-      mp_obj_t r=c_complextab2mp_array(y,n1+1,0);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_pcoeff_obj, 1, 1, linalg_pcoeff);
-
-static mp_obj_t linalg_fftifft(size_t n_args, const mp_obj_t *args,bool inverse) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int n2=n1,i;
-    for (i=-1;n2;++i){
-      n2/=2;
-    }
-    if (m1!=0 || n1!=(1<<i)){
-      free(x);
-      raisedimerr();
-    }
-    if (c_fft(x,n1,inverse)){
-      mp_obj_t r=c_complextab2mp_array(x,n1,0);
-      free(x);
-      return r;
-    }
-    free(x);    
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-static mp_obj_t linalg_fft(size_t n_args, const mp_obj_t *args) {
-  return linalg_fftifft(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_fft_obj, 1, 1, linalg_fft);
-static mp_obj_t linalg_ifft(size_t n_args, const mp_obj_t *args) {
-  return linalg_fftifft(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_ifft_obj, 1, 1, linalg_ifft);
-
-/* for a more efficient linear solver, use lu inside the CAS*/
-static mp_obj_t linalg_solve(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t arg[2];
-  arg[0]=linalg_inv(1,args);
-  arg[1]=args[1];
-  return linalg_dot(2,arg);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_solve_obj, 2, 2, linalg_solve);
-
-static mp_obj_t linalg_peval(size_t n_args, const mp_obj_t *args) {
-  c_complex *P,x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&P,&n1,&m1)){
-    if (m1!=0 || !mp_get_c_complex(args[1],&x)){
-      free(P);
-      raisedimerr();
-    }
-    c_complex res={0,0};
-    for (int i=0;i<n1;++i){
-      double r=res.r*x.r-res.i*x.i+P[i].r;
-      res.i=res.r*x.i+res.i*x.r+P[i].i;
-      res.r=r;
-    }
-    if (res.i==0)
-      return mp_obj_new_float(res.r);
-    else
-      return mp_obj_new_complex(res.r,res.i);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_peval_obj, 2, 2, linalg_peval);
-
-static mp_obj_t linalg_apply(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t * elem=0; size_t n=-1;
-  bool recur=false;
-  if (n_args==3 && args[2]==&linalg_matrix_obj)
-    recur=true;
-  if (MP_OBJ_IS_TYPE(args[1],&mp_type_list) || MP_OBJ_IS_TYPE(args[1],&mp_type_tuple))
-    mp_obj_get_array(args[1], &n, &elem);
-  if (MP_OBJ_IS_TYPE(args[0], &mp_type_fun_builtin_1)){
-    if (((int) n)>=0){
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      mp_obj_t args_[2];
-      args_[0]=args[0];
-      for (size_t i=0;i<n;++i){
-	if (recur){
-	  args_[1]=elem[i];
-	  mp_obj_list_append(r,linalg_apply(2,args_));
-	}
-	else
-	  mp_obj_list_append(r,fun_builtin_1_call(args[0],1,0,&elem[i]));	  
-      }
-      return r;
-    }
-    return fun_builtin_1_call(args[0],1,0,args+1);
-  }
-  else {
-    nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-    if (((int) n)>=0){
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      mp_obj_t args_[2];
-      args_[0]=args[0];
-      for (size_t i=0;i<n;++i){
-	if (recur){
-	  args_[1]=elem[i];
-	  mp_obj_list_append(r,linalg_apply(2,args_));
-	}
-	else
-	  mp_obj_list_append(r,fun_bc_call(args[0],1,0,&elem[i]));	  
-      }
-      return r;
-    }
-    return fun_bc_call(args[0],1,0,args+1);
-  }
-  //nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_apply_obj, 2, 3, linalg_apply);
-
-static mp_obj_t linalg_det(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1){
-      free(x);
-      raisedimerr();
-    }
-    c_complex r=c_det(x,n1);
-    free(x);
-    return mp_obj_new_complex_real(r.r,r.i);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(giac_linalg_det_obj, 1, 1, linalg_det);
-
-static mp_obj_t linalg_zerosones(size_t n_args, const mp_obj_t *args,int v0,int v1) {
-  size_t n1=0,m1=0;
-  if (MP_OBJ_IS_SMALL_INT(args[0]))
-    n1= MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[1]))
-    m1= MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (v0==0 && v1==1)
-    m1=n1;
-  mp_obj_t r = mp_obj_new_list(0, NULL);
-  bool alea=v0==-1;
-  for (int i=0;i<n1;++i){
-    if (m1){
-      mp_obj_t l = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m1;++j){
-	mp_obj_list_append(l, mp_obj_new_float(alea?rand()/(RAND_MAX+1.0):(i==j?v1:v0)));	
-      }
-      mp_obj_list_append(r, l);
-    }
-    else
-      mp_obj_list_append(r, mp_obj_new_float(alea?rand()/(RAND_MAX+1.0):v0));
-  }
-  return r;
-}
-static mp_obj_t linalg_zeros(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,0,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_zeros_obj, 1, 2, linalg_zeros);
-static mp_obj_t linalg_ones(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,1,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_ones_obj, 1, 2, linalg_ones);
-static mp_obj_t linalg_eye(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,0,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_eye_obj, 1, 1, linalg_eye);
-static mp_obj_t linalg_rand(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,-1,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_rand_obj, 1, 2, linalg_rand);
-
-static mp_obj_t linalg_sizeshape(size_t n_args, const mp_obj_t *args,bool shape) {
-  int l=-1,m=0;
-  if (mp_obj_get_type(args[0])==&mp_type_list){
-    mp_obj_list_t *o = MP_OBJ_TO_PTR(args[0]);
-    l=o->len;
-    if (l>0){
-      mp_obj_t obj=o->items[0];
-      if (mp_obj_get_type(obj)==&mp_type_list){
-	o = MP_OBJ_TO_PTR(obj);
-	m=o->len;
-      }
-    }
-  }
-  if (shape){
-    mp_obj_t items[2];
-    items[0]=mp_obj_new_int(l);
-    items[1]=m==0?mp_const_none:mp_obj_new_int(m);
-    mp_obj_t r=mp_obj_new_tuple(2, items);
-    return r;
-  }
-  if (m==0) m=1;
-  return mp_obj_new_int(l*m);
-}
-static mp_obj_t linalg_shape(size_t n_args, const mp_obj_t *args) {
-  return linalg_sizeshape(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_shape_obj, 1, 1, linalg_shape);
-
-static mp_obj_t linalg_size(size_t n_args, const mp_obj_t *args) {
-  return linalg_sizeshape(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_size_obj, 1, 1, linalg_size);
-
-//
-static const mp_rom_map_elem_t linalg_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
-    { MP_ROM_QSTR(MP_QSTR_matrix), (mp_obj_t) &linalg_matrix_obj },
-    { MP_ROM_QSTR(MP_QSTR_arange), (mp_obj_t) &linalg_arange_obj },
-    { MP_ROM_QSTR(MP_QSTR_linspace), (mp_obj_t) &linalg_linspace_obj },
-    { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_cross), (mp_obj_t) &linalg_cross_obj },
-    { MP_ROM_QSTR(MP_QSTR_solve), (mp_obj_t) &linalg_solve_obj },
-    { MP_ROM_QSTR(MP_QSTR_peval), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_horner), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_mul), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_transpose), (mp_obj_t) &linalg_transpose_obj },
-    { MP_ROM_QSTR(MP_QSTR_rref), (mp_obj_t) &linalg_rref_obj },
-    { MP_ROM_QSTR(MP_QSTR_egv), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eigenvects), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t) &giac_linalg_eig_obj },
-    { MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t) &giac_linalg_det_obj },
-    { MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t) &linalg_zeros_obj },
-    { MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t) &linalg_ones_obj },
-    { MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_identity), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_idn), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_rand), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranv), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranm), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_shape), (mp_obj_t) &linalg_shape_obj },
-    { MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t) &linalg_size_obj },
-    { MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t) &giac_linalg_inv_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_proot), (mp_obj_t) &linalg_proot_obj },
-    { MP_ROM_QSTR(MP_QSTR_pcoeff), (mp_obj_t) &linalg_pcoeff_obj },
-    { MP_ROM_QSTR(MP_QSTR_fft), (mp_obj_t) &linalg_fft_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifft), (mp_obj_t) &linalg_ifft_obj },
-    { MP_ROM_QSTR(MP_QSTR_apply), (mp_obj_t) &linalg_apply_obj },
-    { MP_ROM_QSTR(MP_QSTR_add), (mp_obj_t) &linalg_add_obj },
-    { MP_ROM_QSTR(MP_QSTR_sub), (mp_obj_t) &linalg_sub_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_real), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_im), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_imag), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_conj), (mp_obj_t) &linalg_conj_obj },
-    { MP_ROM_QSTR(MP_QSTR_abs), (mp_obj_t) &linalg_abs_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(linalg_locals_dict, linalg_locals_dict_table);
-
-const mp_obj_type_t linalg_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_linalg,
-    .locals_dict = (mp_obj_t)&linalg_locals_dict
-};
-
-
-STATIC const mp_rom_map_elem_t mp_module_linalg_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__linalg) },
-    { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
-    { MP_ROM_QSTR(MP_QSTR_matrix), (mp_obj_t) &linalg_matrix_obj },
-    { MP_ROM_QSTR(MP_QSTR_arange), (mp_obj_t) &linalg_arange_obj },
-    { MP_ROM_QSTR(MP_QSTR_linspace), (mp_obj_t) &linalg_linspace_obj },
-    { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_cross), (mp_obj_t) &linalg_cross_obj },
-    { MP_ROM_QSTR(MP_QSTR_solve), (mp_obj_t) &linalg_solve_obj },
-    { MP_ROM_QSTR(MP_QSTR_peval), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_horner), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_mul), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_transpose), (mp_obj_t) &linalg_transpose_obj },
-    { MP_ROM_QSTR(MP_QSTR_rref), (mp_obj_t) &linalg_rref_obj },
-    { MP_ROM_QSTR(MP_QSTR_egv), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eigenvects), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t) &giac_linalg_eig_obj },
-    { MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t) &giac_linalg_det_obj },
-    { MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t) &linalg_zeros_obj },
-    { MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t) &linalg_ones_obj },
-    { MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_identity), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_idn), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_rand), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranv), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranm), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_shape), (mp_obj_t) &linalg_shape_obj },
-    { MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t) &linalg_size_obj },
-    { MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t) &giac_linalg_inv_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_proot), (mp_obj_t) &linalg_proot_obj },
-    { MP_ROM_QSTR(MP_QSTR_pcoeff), (mp_obj_t) &linalg_pcoeff_obj },
-    { MP_ROM_QSTR(MP_QSTR_fft), (mp_obj_t) &linalg_fft_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifft), (mp_obj_t) &linalg_ifft_obj },
-    { MP_ROM_QSTR(MP_QSTR_apply), (mp_obj_t) &linalg_apply_obj },
-    { MP_ROM_QSTR(MP_QSTR_add), (mp_obj_t) &linalg_add_obj },
-    { MP_ROM_QSTR(MP_QSTR_sub), (mp_obj_t) &linalg_sub_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_real), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_im), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_imag), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_conj), (mp_obj_t) &linalg_conj_obj },
-    { MP_ROM_QSTR(MP_QSTR_abs), (mp_obj_t) &linalg_abs_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_linalg_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_linalg_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_linalg_globals_table),
-        .table = (mp_map_elem_t*)mp_module_linalg_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_linalg = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_linalg_globals,
-};
-
-
-/* TURTLE, using caseval */
-void turtle_freeze();
-void py_ck_ctrl_c();
-
-mp_obj_t turtle_ret(const char * val){
-  py_ck_ctrl_c();
-  if (strncmp(val,"\"Done",5)==0)
-    return mp_const_none;
-  return mp_obj_new_str(val,strlen(val));  
-}
-
-static mp_obj_t turtle_forward(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  double i=10;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  c_turtle_forward(i);
-  return mp_const_none;
-  char buf[256];
-  sprintf(buf,"avance(%.4g):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_forward_obj, 0, 1, turtle_forward);
-
-static mp_obj_t turtle_backward(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  double i=10;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  c_turtle_forward(-i);
-  return mp_const_none;
-  char buf[256];
-  sprintf(buf,"recule(%.4g):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_backward_obj, 0, 1, turtle_backward);
-
-static mp_obj_t turtle_left(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  double i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  else if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  else if (n_args==1) i=0;  
-  c_turtle_left(i);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_left_obj, 0, 1, turtle_left);
-
-static mp_obj_t turtle_pensize(size_t n_args, const mp_obj_t *args) {
-  if (n_args==0){
-    const char * val=caseval("crayon -128;");
-    return str2int(val);
-  }
-  turtle_freeze();
-  int i=1;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  if (i<1) i=1;
-  c_turtle_crayon(-i);
-  return mp_const_none;
-  char buf[256];
-  sprintf(buf,"crayon -%i:;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_pensize_obj, 0, 1, turtle_pensize);
-
-static mp_obj_t turtle_right(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  double i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  else if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  else if (n_args==1) i=0;
-  c_turtle_left(-i);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_right_obj, 0, 1, turtle_right);
-
-static mp_obj_t turtle_reset(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("efface(0,0):;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_reset_obj, 0, 0, turtle_reset);
-
-static mp_obj_t turtle_clear(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("efface(op(position())):;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_clear_obj, 0, 0, turtle_clear);
-
-static mp_obj_t turtle_dessine_tortue(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("efface(0,0):;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_dessine_tortue_obj, 0, 0, turtle_dessine_tortue);
-
-static mp_obj_t turtle_circle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=0,y=0,z=360;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[2])) {
-    z=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  }
-  else {
-    if (n_args==2){
-      z=y;
-      y=0;
-    }
-  }
-  c_turtle_rond(x,y,z);
-  return mp_const_none;
-  char buf[256];
-  sprintf(buf,"rond(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_circle_obj, 1, 3, turtle_circle);
-
-static mp_obj_t do_turtle_disque(size_t n_args, const mp_obj_t *args,bool centered) {
-  turtle_freeze();
-  int x=5,y=0,z=360;
-  if (n_args>=1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[2])) {
-    z=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  }
-  else {
-    if (n_args==2){
-      z=y;
-      y=0;
-    }
-  }
-  c_turtle_disque(x,y,z,centered);
-  return mp_const_none;
-  char buf[256];
-  sprintf(buf,centered?"disque_centre(%i,%i,%i):;":"disque(%i,%i,%i):;",x/2,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-static mp_obj_t turtle_disque(size_t n_args, const mp_obj_t *args) {
-  return do_turtle_disque(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_disque_obj, 0, 3, turtle_disque);
-
-static mp_obj_t turtle_dot(size_t n_args, const mp_obj_t *args) {
-  return do_turtle_disque(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_dot_obj, 0, 3, turtle_dot);
-
-static mp_obj_t turtle_rectangle_plein(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=10,y=10;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    y=x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  char buf[256];
-  sprintf(buf,"rectangle_plein(%i,%i):;",x,y);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_rectangle_plein_obj, 1, 2, turtle_rectangle_plein);
-
-static mp_obj_t turtle_triangle_plein(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=10,y=10,z=60;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    y=x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args>=3 && MP_OBJ_IS_SMALL_INT(args[2])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  char buf[256];
-  sprintf(buf,"triangle_plein(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_triangle_plein_obj, 1, 3, turtle_triangle_plein);
-
-static mp_obj_t turtle_showturtle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("montre_tortue():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_showturtle_obj, 0, 0, turtle_showturtle);
-
-static mp_obj_t turtle_hideturtle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("cache_tortue():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_hideturtle_obj, 0, 0, turtle_hideturtle);
-
-static mp_obj_t turtle_down(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  c_turtle_up(0);
-  return mp_const_none;
-  const char * val=caseval("baisse_crayon():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_down_obj, 0, 0, turtle_down);
-
-static mp_obj_t turtle_up(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  c_turtle_up(1);
-  return mp_const_none;
-  const char * val=caseval("leve_crayon():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_up_obj, 0, 0, turtle_up);
-
-static mp_obj_t turtle_saute(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"saute(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_saute_obj, 1, 1, turtle_saute);
-
-static mp_obj_t turtle_pas_de_cote(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"pas_de_cote(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_pas_de_cote_obj, 1, 1, turtle_pas_de_cote);
-
-static mp_obj_t turtle_towards(size_t n_args, const mp_obj_t *args) {
-  double x,y;
-  if (n_args!=2 || !mp_int_float(args[0],&x) || !mp_int_float(args[1],&y))
-    mp_raise_TypeError("x,y expected");
-#ifndef NUMWORKS
-  char buf[256];
-  sprintf(buf,"towards(%.4f,%.4f);",x,y);
-#else
-  char buf[256]="towards(";
-  strcat_double(buf,x);
-  strcat(buf,",");
-  strcat_double(buf,y);
-  strcat(buf,");");
-#endif
-  const char * val=caseval(buf);
-  x=atof(val);
-  return mp_obj_new_float(x);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_towards_obj, 2, 2, turtle_towards);
-
-static mp_obj_t turtle_setheading(size_t n_args, const mp_obj_t *args) {
-  if (n_args==0){
-    char buf[]="cap()";
-    const char * val=caseval(buf);
-    return str2int(val);
-  }
-  turtle_freeze();
-  double i=0;
-  if (n_args==1){
-    if (!mp_int_float(args[0],&i))
-      mp_raise_TypeError("int/float expected");
-  }
-  c_turtle_cap(i);
-  return mp_const_none;
-#ifndef NUMWORKS
-  char buf[256];
-  sprintf(buf,"cap(%.4f):;",i);
-#else
-  char buf[256]="cap(";
-  strcat_double(buf,i);
-  strcat(buf,"):;");
-#endif
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setheading_obj, 0, 1, turtle_setheading);
-
-static mp_obj_t turtle_setposition(size_t n_args, const mp_obj_t *args) {
-  if (n_args<2){
-    double x,y;
-    c_turtle_getposition(&x,&y);
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    mp_obj_list_append(res,mp_obj_new_int(x));
-    mp_obj_list_append(res,mp_obj_new_int(y));
-    return res;
-    char buf[]="position();";
-    const char * val=caseval(buf);
-    int l=strlen(val);
-    if (l<5 || val[0]!='[' || val[l-1]!=']')
-      return mp_obj_new_str(val,l);
-    // parse 2 integers separated by a comma
-    return str2list2int(val,2);
-  }
-  turtle_freeze();
-  double x=0,y=0;
-  if (!mp_int_float(args[0],&x) || !mp_int_float(args[1],&y))
-    mp_raise_TypeError("x,y expected");    
-  c_turtle_goto(x,y);
-  return mp_const_none;
-#ifndef NUMWORKS
-  char buf[256];
-  sprintf(buf,"position(%.4f,%.4f):;",x,y);
-#else
-  char buf[256]="position(";
-  strcat_double(buf,x);
-  strcat(buf,",");
-  strcat_double(buf,y);
-  strcat(buf,"):;");
-#endif
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setposition_obj, 0, 2, turtle_setposition);
-
-static mp_obj_t turtle_setx(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  double i=0;
-  if (n_args==1)
-    mp_int_float(args[0],&i);
-#ifndef NUMWORKS
-  char buf[256];
-  sprintf(buf,"position(%.4f,position()[1]):;",i);
-#else
-  char buf[256]="position(";
-  strcat_double(buf,i);
-  strcat(buf,"position()[1]):;");
-#endif
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setx_obj, 0, 1, turtle_setx);
-
-static mp_obj_t turtle_sety(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  double i=0;
-  if (n_args==1)
-    mp_int_float(args[0],&i);
-#ifndef NUMWORKS
-  char buf[256];
-  sprintf(buf,"position(position()[0],%.4f):;",i);
-#else
-  char buf[256]="position(position()[0],";
-  strcat_double(buf,i);
-  strcat(buf,"):;");
-#endif
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_sety_obj, 0, 1, turtle_sety);
-
-static mp_obj_t turtle_write(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  char buf[256];
-  sprintf(buf,"ecris(%s):;",mp_obj_str_get_str(args[0]));
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_write_obj, 1, 1, turtle_write);
-
-static mp_obj_t turtle_colormode(size_t n_args, const mp_obj_t *args) {
-  if (n_args==0)
-    return mp_obj_new_int(255);    
-  return turtle_ret("\"Done");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_colormode_obj, 0, 1, turtle_colormode);
-
-static mp_obj_t turtle_fillcolor(size_t n_args, const mp_obj_t *args) {
-  int i=0;
-  char buf[256]="polygone_rempli()";
-  if (n_args==1){
-    if (MP_OBJ_IS_STR(args[0]))
-      sprintf(buf,"polygone_rempli(%s):;",mp_obj_str_get_str(args[0]));
-    if (MP_OBJ_IS_SMALL_INT(args[0])) {
-      i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-      sprintf(buf,"polygone_rempli([%i]):;",i);
-    }
-    if (strlen(buf)==17){
-      size_t n=0; mp_obj_t * tab=0;
-      mp_obj_get_array(args[0],&n,&tab);
-      if (n==3 &&  mp_obj_is_float(tab[0]) && mp_obj_is_float(tab[1]) && mp_obj_is_float(tab[2])){
-	c_turtle_fillcolor(mp_obj_get_float(tab[0]),mp_obj_get_float(tab[1]),mp_obj_get_float(tab[2]),0);
-	return mp_const_none;
-#ifdef NUMWORKS
-	strcpy(buf,"polygone_rempli(");
-	for (int i=0;i<3;++i){
-	  strcat_double(buf,mp_obj_get_float(tab[i]));
-	  if (i<2)
-	    strcat(buf,",");
-	}
-	strcat(buf,"):;");
-#else
-	sprintf(buf,"polygone_rempli(%.3f,%.3f,%.3f):;",mp_obj_get_float(tab[0]),mp_obj_get_float(tab[1]),mp_obj_get_float(tab[2]));
-#endif
-      }
-      if (n==3 &&  MP_OBJ_IS_SMALL_INT(tab[0]) && MP_OBJ_IS_SMALL_INT(tab[1]) && MP_OBJ_IS_SMALL_INT(tab[2])){
-	c_turtle_fillcolor((int)MP_OBJ_SMALL_INT_VALUE(tab[0]),(int)MP_OBJ_SMALL_INT_VALUE(tab[1]),(int)MP_OBJ_SMALL_INT_VALUE(tab[2]),1);
-	return mp_const_none;
-	sprintf(buf,"polygone_rempli(%i,%i,%i):;",(int)MP_OBJ_SMALL_INT_VALUE(tab[0]),(int)MP_OBJ_SMALL_INT_VALUE(tab[1]),(int)MP_OBJ_SMALL_INT_VALUE(tab[2]));
-      }
-    }
-  }
-  if (n_args==3 &&  MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_IS_SMALL_INT(args[1]) && MP_OBJ_IS_SMALL_INT(args[2])){
-    sprintf(buf,"polygone_rempli(%i,%i,%i):;",(int)MP_OBJ_SMALL_INT_VALUE(args[0]),(int)MP_OBJ_SMALL_INT_VALUE(args[1]),(int)MP_OBJ_SMALL_INT_VALUE(args[2]));
-  }
-  if (n_args==3 && mp_obj_is_float(args[0]) && mp_obj_is_float(args[1]) && mp_obj_is_float(args[2]) ){
-#ifdef NUMWORKS
-	strcpy(buf,"polygone_rempli(");
-	for (int i=0;i<3;++i){
-	  strcat_double(buf,mp_obj_get_float(args[i]));
-	  if (i<2)
-	    strcat(buf,",");
-	}
-	strcat(buf,"):;");
-#else
-    sprintf(buf,"polygone_rempli(%.3f,%.3f,%.3f):;",mp_obj_get_float(args[0]),mp_obj_get_float(args[1]),mp_obj_get_float(args[2]));
-#endif
-  }
-  //printf(buf);
-  const char * val=caseval(buf);
-  if (n_args==0) return mp_obj_new_str(val,strlen(val));
-  return turtle_ret(val);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_fillcolor_obj, 0, 3, turtle_fillcolor);
-
-static mp_obj_t turtle_begin_fill(size_t n_args, const mp_obj_t *args) {
-  c_turtle_fill(1);
-  return mp_const_none;
-  const char * val=caseval("polygone_rempli([]):;");
-  return turtle_ret(val);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_begin_fill_obj, 0, 0, turtle_begin_fill);
-
-static mp_obj_t turtle_end_fill(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  c_turtle_fill(0);
-  return mp_const_none;
-  const char * val=caseval("polygone_rempli():;");
-  return turtle_ret(val);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_end_fill_obj, 0, 0, turtle_end_fill);
-
-static mp_obj_t turtle_pencolor(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  char buf[256]="crayon";
-  if (n_args==1){
-    if (MP_OBJ_IS_STR(args[0]))
-      sprintf(buf,"crayon(%s):;",mp_obj_str_get_str(args[0]));
-    if (MP_OBJ_IS_SMALL_INT(args[0])) {
-      i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-      sprintf(buf,"crayon(%i):;",i);
-    }
-    if (strlen(buf)==6){
-      size_t n=0; mp_obj_t * tab=0;
-      mp_obj_get_array(args[0],&n,&tab);
-      if (n==3 &&  mp_obj_is_float(tab[0]) && mp_obj_is_float(tab[1]) && mp_obj_is_float(tab[2])){
-#ifdef NUMWORKS
-	strcpy(buf,"crayon(");
-	for (int i=0;i<3;++i){
-	  strcat_double(buf,mp_obj_get_float(tab[i]));
-	  if (i<2)
-	    strcat(buf,",");
-	}
-	strcat(buf,"):;");
-#else
-	sprintf(buf,"crayon(%.3f,%.3f,%.3f):;",mp_obj_get_float(tab[0]),mp_obj_get_float(tab[1]),mp_obj_get_float(tab[2]));
-#endif
-      }
-      if (n==3 &&  MP_OBJ_IS_SMALL_INT(tab[0]) && MP_OBJ_IS_SMALL_INT(tab[1]) && MP_OBJ_IS_SMALL_INT(tab[2])){
-	sprintf(buf,"crayon(%i,%i,%i):;",(int)MP_OBJ_SMALL_INT_VALUE(tab[0]),(int)MP_OBJ_SMALL_INT_VALUE(tab[1]),(int)MP_OBJ_SMALL_INT_VALUE(tab[2]));
-      }
-    }
-  }
-  if (n_args==3 &&  MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_IS_SMALL_INT(args[1]) && MP_OBJ_IS_SMALL_INT(args[2])){
-    sprintf(buf,"crayon(%i,%i,%i):;",(int)MP_OBJ_SMALL_INT_VALUE(args[0]),(int)MP_OBJ_SMALL_INT_VALUE(args[1]),(int)MP_OBJ_SMALL_INT_VALUE(args[2]));
-  }
-  if (n_args==3 && mp_obj_is_float(args[0]) && mp_obj_is_float(args[1]) && mp_obj_is_float(args[2]) ){
-#ifdef NUMWORKS
-	strcpy(buf,"crayon(");
-	for (int i=0;i<3;++i){
-	  strcat_double(buf,mp_obj_get_float(args[i]));
-	  if (i<2)
-	    strcat(buf,",");
-	}
-	strcat(buf,"):;");
-#else
-    sprintf(buf,"crayon(%.3f,%.3f,%.3f):;",mp_obj_get_float(args[0]),mp_obj_get_float(args[1]),mp_obj_get_float(args[2]));
-#endif
-  }
-  if (n_args==2 ){
-    int f=mp_get_color(args[0]),b=mp_get_color(args[1]);
-    sprintf(buf,"crayon(%i),polygone_rempli(%i):;",f,b);
-  }
-  //printf(buf);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_pencolor_obj, 0, 3, turtle_pencolor);
-
-static mp_obj_t turtle_speed(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"speed(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_speed_obj, 0, 1, turtle_speed);
-
-static const mp_map_elem_t turtle_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_forward), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_fd), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_backward), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_bk), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_left), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_lt), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_right), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rt), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_disque), (mp_obj_t) &turtle_disque_obj },
-	{ MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &turtle_dot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rectangle_plein), (mp_obj_t) &turtle_rectangle_plein_obj },
-	{ MP_ROM_QSTR(MP_QSTR_triangle_plein), (mp_obj_t) &turtle_triangle_plein_obj },
-	{ MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &turtle_clear_obj },
-	{ MP_ROM_QSTR(MP_QSTR_dessine_tortue), (mp_obj_t) &turtle_dessine_tortue_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setheading), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_seth), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setposition), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_towards), (mp_obj_t) &turtle_towards_obj },
-	{ MP_ROM_QSTR(MP_QSTR_goto), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setpos), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setx), (mp_obj_t) &turtle_setx_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sety), (mp_obj_t) &turtle_sety_obj },
-	{ MP_ROM_QSTR(MP_QSTR_write), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_speed), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_fillcolor), (mp_obj_t) &turtle_fillcolor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_end_fill), (mp_obj_t) &turtle_end_fill_obj },
-	{ MP_ROM_QSTR(MP_QSTR_begin_fill), (mp_obj_t) &turtle_begin_fill_obj },
-	{ MP_ROM_QSTR(MP_QSTR_showturtle), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_st), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_hideturtle), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ht), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_down), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_saute), (mp_obj_t) &turtle_saute_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pas_de_cote), (mp_obj_t) &turtle_pas_de_cote_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pendown), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pd), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_up), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_penup), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pu), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t) &turtle_pencolor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_color), (mp_obj_t) &turtle_pencolor_obj },
-    { MP_ROM_QSTR(MP_QSTR_colormode), (mp_obj_t) &turtle_colormode_obj },
-	{ MP_ROM_QSTR(MP_QSTR_avance), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_av), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_recule), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_gauche), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tg), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_droite), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_td), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rond), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_efface), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cap), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_heading), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pos), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_position), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ecris), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vitesse_tortue), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_montre_tortue), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cache_tortue), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_baisse_crayon), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_leve_crayon), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pensize), (mp_obj_t) &turtle_pensize_obj },
-	{ MP_ROM_QSTR(MP_QSTR_width), (mp_obj_t) &turtle_pensize_obj },
-	/* { MP_ROM_QSTR(MP_QSTR_time), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sleep), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_monotonic), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_time), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sleep), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_width), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_isdown), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_isvisible), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_color), (mp_obj_t) &turtle_up_obj },*/
-
-};
-
-
-static MP_DEFINE_CONST_DICT(turtle_locals_dict, turtle_locals_dict_table);
-
-const mp_obj_type_t turtle_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_turtle,
-    .locals_dict = (mp_obj_t)&turtle_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_turtle_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__turtle) },
-    { MP_ROM_QSTR(MP_QSTR_forward), (mp_obj_t) &turtle_forward_obj },
-    { MP_ROM_QSTR(MP_QSTR_fd), (mp_obj_t) &turtle_forward_obj },
-    { MP_ROM_QSTR(MP_QSTR_backward), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_bk), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_left), (mp_obj_t) &turtle_left_obj },
-    { MP_ROM_QSTR(MP_QSTR_lt), (mp_obj_t) &turtle_left_obj },
-    { MP_ROM_QSTR(MP_QSTR_right), (mp_obj_t) &turtle_right_obj },
-    { MP_ROM_QSTR(MP_QSTR_rt), (mp_obj_t) &turtle_right_obj },
-    { MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t) &turtle_reset_obj },
-    { MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &turtle_clear_obj },
-    { MP_ROM_QSTR(MP_QSTR_dessine_tortue), (mp_obj_t) &turtle_dessine_tortue_obj },
-    { MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t) &turtle_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_disque), (mp_obj_t) &turtle_disque_obj },
-    { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &turtle_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_rectangle_plein), (mp_obj_t) &turtle_rectangle_plein_obj },
-    { MP_ROM_QSTR(MP_QSTR_triangle_plein), (mp_obj_t) &turtle_triangle_plein_obj },
-    { MP_ROM_QSTR(MP_QSTR_setheading), (mp_obj_t) &turtle_setheading_obj },
-    { MP_ROM_QSTR(MP_QSTR_goto), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_seth), (mp_obj_t) &turtle_setheading_obj },
-    { MP_ROM_QSTR(MP_QSTR_setposition), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_towards), (mp_obj_t) &turtle_towards_obj },
-    { MP_ROM_QSTR(MP_QSTR_setpos), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_setx), (mp_obj_t) &turtle_setx_obj },
-    { MP_ROM_QSTR(MP_QSTR_sety), (mp_obj_t) &turtle_sety_obj },
-    { MP_ROM_QSTR(MP_QSTR_write), (mp_obj_t) &turtle_write_obj },
-    { MP_ROM_QSTR(MP_QSTR_speed), (mp_obj_t) &turtle_speed_obj },
-    { MP_ROM_QSTR(MP_QSTR_fillcolor), (mp_obj_t) &turtle_fillcolor_obj },
-    { MP_ROM_QSTR(MP_QSTR_end_fill), (mp_obj_t) &turtle_end_fill_obj },
-    { MP_ROM_QSTR(MP_QSTR_begin_fill), (mp_obj_t) &turtle_begin_fill_obj },
-    { MP_ROM_QSTR(MP_QSTR_showturtle), (mp_obj_t) &turtle_showturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_st), (mp_obj_t) &turtle_showturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_hideturtle), (mp_obj_t) &turtle_hideturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_ht), (mp_obj_t) &turtle_hideturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_down), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_saute), (mp_obj_t) &turtle_saute_obj },
-    { MP_ROM_QSTR(MP_QSTR_pas_de_cote), (mp_obj_t) &turtle_pas_de_cote_obj },
-    { MP_ROM_QSTR(MP_QSTR_pendown), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_pd), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_up), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_penup), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_pu), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t) &turtle_pencolor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_color), (mp_obj_t) &turtle_pencolor_obj },
-    { MP_ROM_QSTR(MP_QSTR_colormode), (mp_obj_t) &turtle_colormode_obj },
-	{ MP_ROM_QSTR(MP_QSTR_avance), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_av), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_recule), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_gauche), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tg), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_droite), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_td), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rond), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_efface), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cap), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_heading), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_position), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pos), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ecris), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vitesse_tortue), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_montre_tortue), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cache_tortue), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_baisse_crayon), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_leve_crayon), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pensize), (mp_obj_t) &turtle_pensize_obj },
-	{ MP_ROM_QSTR(MP_QSTR_width), (mp_obj_t) &turtle_pensize_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_turtle_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_turtle_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_turtle_globals_table),
-        .table = (mp_map_elem_t*)mp_module_turtle_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_turtle = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_turtle_globals,
-};
-
-/* MATPLOTL */
-static mp_obj_t matplotl_show(size_t n_args, const mp_obj_t *args) {
-  const char * val=caseval("show()");
-#if defined EMCC && !defined NO_QSTR
-  EM_ASM_ARGS({
-      var msg = UTF8ToString($0);
-      UI.python_output += msg;
-    },val);
-#endif
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_show_obj, 0, 0, matplotl_show);
-
-static mp_obj_t matplotl_clf(size_t n_args, const mp_obj_t *args) {
-  const char * val=caseval("erase()");
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_clf_obj, 0, 0, matplotl_clf);
-
-static mp_obj_t matplotl_axis(size_t n_args, const mp_obj_t *args) {
-  if (n_args==0)
-    turtle_ret("axis: Autoscale");
-  double *x=0; size_t n=0,m=0;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    sprintf(buf,"axis(%s):;",ptr);
-    free(ptr);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  if (n_args==4){
-    double a=0,b=0,c=0,d=0;
-    if (mp_obj_is_float(args[0]))
-      a=mp_obj_get_float(args[0]);
-    if (MP_OBJ_IS_INT(args[0]))
-      a=mp_obj_get_int(args[0]);
-    if (mp_obj_is_float(args[1]))
-      b=mp_obj_get_float(args[1]);
-    if (MP_OBJ_IS_INT(args[1]))
-      b=mp_obj_get_int(args[1]);
-    if (mp_obj_is_float(args[2]))
-      c=mp_obj_get_float(args[2]);
-    if (MP_OBJ_IS_INT(args[2]))
-      c=mp_obj_get_int(args[2]);
-    if (mp_obj_is_float(args[3]))
-      d=mp_obj_get_float(args[3]);
-    if (MP_OBJ_IS_INT(args[3]))
-      d=mp_obj_get_int(args[3]);
-    if (a<b && c<d){
-      char buf[256]="";
-#ifdef NUMWORKS
-      strcat(buf,"axis(");
-      strcat_double(buf,a);
-      strcat(buf,",");
-      strcat_double(buf,b);
-      strcat(buf,",");
-      strcat_double(buf,c);
-      strcat(buf,",");
-      strcat_double(buf,d);
-      strcat(buf,"):;");
-#else      
-      sprintf(buf,"axis(%.14g,%.14g,%.14g,%.14g):;",a,b,c,d);
-#endif
-      const char * val=caseval(buf);
-      return turtle_ret(val);
-    }
-  }
-  return turtle_ret("axis: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_axis_obj, 0, 4, matplotl_axis);
-
-static mp_obj_t matplotl_text(size_t n_args, const mp_obj_t *args) {
-  double a=0,b=0;
-  if (mp_obj_is_float(args[0]))
-    a=mp_obj_get_float(args[0]);
-  if (MP_OBJ_IS_INT(args[0]))
-    a=mp_obj_get_int(args[0]);
-  if (mp_obj_is_float(args[1]))
-    b=mp_obj_get_float(args[1]);
-  if (MP_OBJ_IS_INT(args[1]))
-    b=mp_obj_get_int(args[1]);
-  if (MP_OBJ_IS_STR(args[2])){
-    char buf[256]="";
-#ifdef NUMWORKS
-    strcat(buf,"legend(point(");
-    strcat_double(buf,a);
-    strcat(buf,",");
-    strcat_double(buf,b);
-    char buf2[64];
-    sprintf(buf2,"),%s):;",mp_obj_str_get_str(args[2]));
-    strcat(buf,buf2);
-#else      
-    sprintf(buf,"legend(point(%.14g,%.14g),%s):;",a,b,mp_obj_str_get_str(args[2]));
-#endif
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("text: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_text_obj, 3, 3, matplotl_text);
-
-static mp_obj_t matplotl_plot(size_t n_args, const mp_obj_t *args) {
-  double *x=0,*y=0; size_t n=0,m=0,n1=0,m1=0;
-  int col=0;
-  if (n_args>=3)
-    col=mp_get_color(args[2]);
-  if (mp_array2doubletab(args[0],&x,&n,&m)){ 
-    char * ptrx=printtab(x,n,m);
-    free(x); 
-    char bufx[strlen(ptrx)+1];
-    strcpy(bufx,ptrx);
-    free(ptrx);
-    if (mp_array2doubletab(args[1],&y,&n1,&m1)){
-      char * ptry=printtab(y,n1,m1);
-      free(y);
-      char bufy[strlen(ptry)+1];
-      strcpy(bufy,ptry);
-      free(ptry);
-      if (n1==n && m==0 && m1==0){
-	char buf2[strlen(bufx)+strlen(bufy)+256];
-	sprintf(buf2,"polygonplot(%s,%s,color=%i):;",bufx,bufy,col>=0?col:0);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-    }
-  }
-  double xx=0,yy=0;
-  if (n_args>=2 && mp_int_float(args[0],&xx) && mp_int_float(args[1],&yy)){
-    char buf[512]="";
-#ifdef NUMWORKS
-    strcat(buf,"legend(point(");
-    strcat_double(buf,xx);
-    strcat(buf,",");
-    strcat_double(buf,yy);
-#else      
-    sprintf(buf,"point(%.14g,%.14g",xx,yy);
-#endif
-    if (col==-1)
-      sprintf(buf,",display=\"%s\"):;",translate_point_type(mp_obj_str_get_str(args[2])));
-    else
-      sprintf(buf,",color=%i):;",col);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("polygonplot: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_plot_obj, 2, 3, matplotl_plot);
-
-static mp_obj_t matplotl_bar_hist(size_t n_args, const mp_obj_t *args,bool bar) {
-  double *x=0; size_t n=0,m=0;
-  double largeur=0.8;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    if (n_args==1)
-      sprintf(buf,bar?"barplot(%s):;":"histogram(%s):;",ptr);
-    else
-      sprintf(buf,bar?"barplot(%s":"histogram(%s",ptr);
-    free(ptr);
-    if (n_args>=2){
-      if (mp_obj_is_float(args[1]))
-	largeur=mp_obj_get_float(args[1]);
-      if (n_args==3 && mp_obj_is_float(args[2]))
-	largeur=mp_obj_get_float(args[2]);
-      if (mp_array2doubletab(args[1],&x,&n,&m)){
-	ptr=printtab(x,n,m);
-	free(x);
-	char buf2[strlen(buf)+strlen(ptr)+256];
-#ifdef NUMWORKS
-	sprintf(buf2,"%s,%s,",buf,ptr);
-	strcat_double(buf2,largeur);
-	strcat(buf2,"):;");
-#else
-	sprintf(buf2,"%s,%s,%.3g):;",buf,ptr,largeur);
-#endif
-	free(ptr);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-      char buf2[strlen(buf)+256];
-#ifdef NUMWORKS
-      sprintf(buf2,"%s,",buf);
-      strcat_double(buf2,largeur);
-      strcat(buf2,"):;");
-#else
-      sprintf(buf2,"%s,%.3g):;",buf,largeur);
-#endif
-      const char * val=caseval(buf2);
-      return turtle_ret(val);
-    }
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret(bar?"barplot: Bad argument type":"histogram: Bad argument type");
-}
-static mp_obj_t matplotl_bar(size_t n_args, const mp_obj_t *args) {
-  return matplotl_bar_hist(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_bar_obj, 1, 3, matplotl_bar);
-
-static mp_obj_t matplotl_hist(size_t n_args, const mp_obj_t *args) {
-  return matplotl_bar_hist(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_hist_obj, 1, 3, matplotl_hist);
-
-static mp_obj_t matplotl_boxplot(size_t n_args, const mp_obj_t *args) {
-  double *x=0; size_t n=0,m=0;
-  int col=0;
-  if (n_args==2)
-    col=mp_get_color(args[1]);
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    sprintf(buf,"moustache(%s,color=%i):;",ptr,col>=0?col:0);
-    free(ptr);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("moustache: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_boxplot_obj, 1, 2, matplotl_boxplot);
-
-static mp_obj_t matplotl_arrow(size_t n_args, const mp_obj_t *args) {
-  double a=0,b=0,c=0,d=0;
-  int col=0;
-  if (n_args==5)
-    col=mp_get_color(args[4]);
-  if (mp_int_float(args[0],&a) && mp_int_float(args[1],&b) &&
-      mp_int_float(args[2],&c) && mp_int_float(args[3],&d)){
-    char buf[512]="";
-#ifdef NUMWORKS
-    strcat(buf,"vector([");
-    strcat_double(buf,a);
-    strcat(buf,",");
-    strcat_double(buf,b);
-    strcat(buf,"],[");
-    strcat_double(buf,c);
-    strcat(buf,",");
-    strcat_double(buf,d);
-    char buf2[64];
-    sprintf(buf2,"],color=%i):;",col);
-    strcat(buf,buf2);
-#else          
-    sprintf(buf,"vector([%.14g,%.14g],[%.14g,%.14g],color=%i):;",a,b,c,d,col);
-#endif
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("vector: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_arrow_obj, 4, 5, matplotl_arrow);
-
-static mp_obj_t matplotl_grid(size_t n_args, const mp_obj_t *args) {
-  bool b=true;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_SMALL_INT_VALUE(args[0])==0)
-    b=false;
-  char buf[64];
-  sprintf(buf,"axes=%i",b?1:0);
-  const char * val=caseval(buf);
-  return turtle_ret(val);  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_grid_obj, 0, 1, matplotl_grid);
-
-static mp_obj_t matplotl_scatter_reg(size_t n_args, const mp_obj_t *args,bool scatter) {
-  int col=0;
-  if (n_args==3)
-    col=mp_get_color(args[2]);
-  double *x=0,*y=0; size_t n=0,m=0,n1=0,m1=0;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){ 
-    char * ptrx=printtab(x,n,m);
-    free(x); 
-    char bufx[strlen(ptrx)+1];
-    strcpy(bufx,ptrx);
-    free(ptrx);
-    if (mp_array2doubletab(args[1],&y,&n1,&m1)){
-      char * ptry=printtab(y,n1,m1);
-      free(y);
-      char bufy[strlen(ptry)+1];
-      strcpy(bufy,ptry);
-      free(ptry);
-      if (n1==n && m==0 && m1==0){
-	char buf2[strlen(bufx)+strlen(bufy)+256];
-	if (scatter)
-	  sprintf(buf2,"scatterplot(%s,%s,color=%i):;",bufx,bufy,col);
-	else
-	  sprintf(buf2,"linear_regression_plot(%s,%s,color=%i):;",bufx,bufy,col);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-    }
-  }
-  return turtle_ret("scatterplot: Bad argument type");
-}
-static mp_obj_t matplotl_scatter(size_t n_args, const mp_obj_t *args) {
-  return matplotl_scatter_reg(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_scatter_obj, 2, 3, matplotl_scatter);
-static mp_obj_t matplotl_linear_regression_plot(size_t n_args, const mp_obj_t *args) {
-  return matplotl_scatter_reg(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_linear_regression_plot_obj, 2, 3, matplotl_linear_regression_plot);
-
-//
-static const mp_map_elem_t matplotl_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &matplotl_show_obj },
-	{ MP_ROM_QSTR(MP_QSTR_clf), (mp_obj_t) &matplotl_clf_obj },
-	{ MP_ROM_QSTR(MP_QSTR_axis), (mp_obj_t) &matplotl_axis_obj },
-	{ MP_ROM_QSTR(MP_QSTR_text), (mp_obj_t) &matplotl_text_obj },
-	{ MP_ROM_QSTR(MP_QSTR_plot), (mp_obj_t) &matplotl_plot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_bar), (mp_obj_t) &matplotl_bar_obj },
-	{ MP_ROM_QSTR(MP_QSTR_hist), (mp_obj_t) &matplotl_hist_obj },
-	{ MP_ROM_QSTR(MP_QSTR_histogram), (mp_obj_t) &matplotl_hist_obj },
-	{ MP_ROM_QSTR(MP_QSTR_boxplot), (mp_obj_t) &matplotl_boxplot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_boxwhisker), (mp_obj_t) &matplotl_boxplot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_arrow), (mp_obj_t) &matplotl_arrow_obj },
-	{ MP_ROM_QSTR(MP_QSTR_grid), (mp_obj_t) &matplotl_grid_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vector), (mp_obj_t) &matplotl_arrow_obj },
-	{ MP_ROM_QSTR(MP_QSTR_barplot), (mp_obj_t) &matplotl_bar_obj },
-	{ MP_ROM_QSTR(MP_QSTR_scatter), (mp_obj_t) &matplotl_scatter_obj },
-	{ MP_ROM_QSTR(MP_QSTR_linear_regression_plot), (mp_obj_t) &matplotl_linear_regression_plot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_scatterplot), (mp_obj_t) &matplotl_scatter_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(matplotl_locals_dict, matplotl_locals_dict_table);
-
-const mp_obj_type_t matplotl_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_matplotl,
-    .locals_dict = (mp_obj_t)&matplotl_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_matplotl_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__matplotl) },
-    { MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &matplotl_show_obj },
-    { MP_ROM_QSTR(MP_QSTR_clf), (mp_obj_t) &matplotl_clf_obj },
-    { MP_ROM_QSTR(MP_QSTR_axis), (mp_obj_t) &matplotl_axis_obj },
-    { MP_ROM_QSTR(MP_QSTR_text), (mp_obj_t) &matplotl_text_obj },
-    { MP_ROM_QSTR(MP_QSTR_plot), (mp_obj_t) &matplotl_plot_obj },
-    { MP_ROM_QSTR(MP_QSTR_boxplot), (mp_obj_t) &matplotl_boxplot_obj },
-    { MP_ROM_QSTR(MP_QSTR_boxwhisker), (mp_obj_t) &matplotl_boxplot_obj },
-    { MP_ROM_QSTR(MP_QSTR_arrow), (mp_obj_t) &matplotl_arrow_obj },
-    { MP_ROM_QSTR(MP_QSTR_grid), (mp_obj_t) &matplotl_grid_obj },
-    { MP_ROM_QSTR(MP_QSTR_vector), (mp_obj_t) &matplotl_arrow_obj },
-    { MP_ROM_QSTR(MP_QSTR_bar), (mp_obj_t) &matplotl_bar_obj },
-    { MP_ROM_QSTR(MP_QSTR_hist), (mp_obj_t) &matplotl_hist_obj },
-    { MP_ROM_QSTR(MP_QSTR_histogram), (mp_obj_t) &matplotl_hist_obj },
-    { MP_ROM_QSTR(MP_QSTR_barplot), (mp_obj_t) &matplotl_bar_obj },
-    { MP_ROM_QSTR(MP_QSTR_scatter), (mp_obj_t) &matplotl_scatter_obj },
-    { MP_ROM_QSTR(MP_QSTR_linear_regression_plot), (mp_obj_t) &matplotl_linear_regression_plot_obj },
-    { MP_ROM_QSTR(MP_QSTR_scatterplot), (mp_obj_t) &matplotl_scatter_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_matplotl_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_matplotl_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_matplotl_globals_table),
-        .table = (mp_map_elem_t*)mp_module_matplotl_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_matplotl = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_matplotl_globals,
-};
-
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/input.c~ b/apps/KhiCAS/src/micropython-1.12/numworks/input.c~
deleted file mode 100644
index 113397341..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/input.c~
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "input.h"
-
-const char * console_input(const char * msg1,const char * msg2,bool numeric,int ypos);
-
-char *prompt(char *p) {
-  return strdup(console_input(p,"? ",false,185));
-}
-
-STATIC mp_obj_t mp_builtin_input(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 1) {
-        mp_obj_print(args[0], PRINT_STR);
-    }
-
-    char *line = prompt("");
-    if (line == NULL) {
-        nlr_raise(mp_obj_new_exception(&mp_type_EOFError));
-    }
-    mp_obj_t o = mp_obj_new_str(line, strlen(line));
-    free(line);
-    return o;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj, 0, 1, mp_builtin_input);
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/input.h~ b/apps/KhiCAS/src/micropython-1.12/numworks/input.h~
deleted file mode 100644
index 8b1378917..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/input.h~
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/main.c b/apps/KhiCAS/src/micropython-1.12/numworks/main.c
index 8ab6f84c3..017da20f0 100644
--- a/apps/KhiCAS/src/micropython-1.12/numworks/main.c
+++ b/apps/KhiCAS/src/micropython-1.12/numworks/main.c
@@ -308,6 +308,7 @@ void mp_keyboard_interrupt(void) {
 bool back_key_pressed();
 int getkey(int allow_suspend);
 
+double millis();
 
 int micropython_port_vm_hook_loop() {
   /* This function is called very frequently by the MicroPython engine. We grab
@@ -317,12 +318,18 @@ int micropython_port_vm_hook_loop() {
   /* Doing too many things here slows down Python execution quite a lot. So we
    * only do things once in a while and return as soon as possible otherwise. */
   static int c = 0;
-
   ++c; 
-  if (c & 0x7ff ) {
+  if (c & 0x7f ) {
     return 0;
   }
 
+  static double t = 0;
+  const int delay = 100;
+  double t2 = millis();
+  if (t2-t<delay) 
+    return 0;
+  t = t2;
+
   // Check if the user asked for an interruption from the keyboard
   int g=getkey(mp_interrupt_char | 0x80000000);
   if (!g) return 0;
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/main.c~ b/apps/KhiCAS/src/micropython-1.12/numworks/main.c~
deleted file mode 100644
index 804d7526a..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/main.c~
+++ /dev/null
@@ -1,647 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#include "py/mpstate.h"
-#include "py/nlr.h"
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-#include "py/repl.h"
-#include "py/gc.h"
-#include "py/stackctrl.h"
-#include "py/mphal.h"
-#include "py/mpthread.h"
-#include "py/mperrno.h"
-#include "extmod/misc.h"
-#include "genhdr/mpversion.h"
-#include "input.h"
-#ifndef PATH_MAX
-#define PATH_MAX 128
-#endif
-
-void console_output(const char *,int);
-const char * read_file(const char * filename);
-bool file_exists(const char * filename);
-
-const char numpy_script[]=R"(import linalg
-import math
-class array: 
-    def __init__(self, a): 
-        self.a = a 
-  
-    def __add__(self, other): 
-        return array(linalg.add(self.a , other.a))
-  
-    def __sub__(self, other): 
-        return array(linalg.sub(self.a , other.a))
-  
-    def __mul__(self, other):
-        if type(self)==array:
-            if type(other)==array:
-                return array(linalg.mul(self.a , other.a))
-            return array(linalg.mul(self.a,other))
-        return array(linalg.mul(self,other.a))
-    
-    def __rmul__(self, other): 
-        if type(self)==array:
-            if type(other)==array:
-                return array(linalg.mul(self.a , other.a))
-            return array(linalg.mul(self.a,other))
-        return array(linalg.mul(self,other.a))
-
-    def __matmul__(self, other):
-        return __mul(self,other)
-
-    def __getitem__(self,key):
-        r=(self.a)[key]
-        if type(r)==list or type(r)==tuple:
-            return array(r)
-        return r
-
-    def __setitem__(self, key, value):
-        if (type(value)==array):
-            (self.a)[key]=value.a
-        else:
-            (self.a)[key]=value
-        return None
-
-    def __len__(self):
-        return len(self.a)
-    
-    def __str__(self): 
-        return 'array('+str(self.a)+')'
-  
-    def __repr__(self): 
-        return 'array('+str(self.a)+')'
-  
-    def __neg__(self):
-        return array(-self.a)
-
-    def __pos__(self):
-        return self
-    
-    def __abs__(self):
-        return array(linalg.abs(self.a))
-
-    def __round__(self):
-        return array(linalg.apply(round,self.a,linalg.matrix))
-
-    def __trunc__(self):
-        return array(linalg.apply(trunc,self.a,linalg.matrix))
-
-    def __floor__(self):
-        return array(linalg.apply(floor,self.a,linalg.matrix))
-
-    def __ceil__(self):
-        return array(linalg.apply(ceil,self.a,linalg.matrix))
-
-    def T(self):
-        return array(linalg.transpose(self.a))
-            
-def real(x):
-    if type(x)==array:
-        return array(linalg.re(x.a))
-    return x.real
-
-def imag(x):
-    if type(x)==array:
-        return array(linalg.im(x.a))
-    return x.imag
-
-def conj(x):
-    if type(x)==array:
-        return array(linalg.conj(x.a))
-    return linalg.conj(x)
-
-def sin(x):
-    if type(x)==array:
-        return array(linalg.apply(math.sin,x.a,linalg.matrix))
-    return math.sin(x)
-
-def cos(x):
-    if type(x)==array:
-        return array(linalg.apply(math.cos,x.a,linalg.matrix))
-    return math.cos(x)
-
-def tan(x):
-    if type(x)==array:
-        return array(linalg.apply(math.tan,x.a,linalg.matrix))
-    return math.tan(x)
-
-def asin(x):
-    if type(x)==array:
-        return array(linalg.apply(math.asin,x.a,linalg.matrix))
-    return math.asin(x)
-
-def acos(x):
-    if type(x)==array:
-        return array(linalg.apply(math.acos,x.a,linalg.matrix))
-    return math.acos(x)
-
-def atan(x):
-    if type(x)==array:
-        return array(linalg.apply(math.atan,x.a,linalg.matrix))
-    return math.atan(x)
-
-def sinh(x):
-    if type(x)==array:
-        return array(linalg.apply(math.sinh,x.a,linalg.matrix))
-    return math.sinh(x)
-
-def cosh(x):
-    if type(x)==array:
-        return array(linalg.apply(math.cosh,x.a,linalg.matrix))
-    return math.cosh(x)
-
-def tanh(x):
-    if type(x)==array:
-        return array(linalg.apply(math.tanh,x.a,linalg.matrix))
-    return math.tanh(x)
-
-def exp(x):
-    if type(x)==array:
-        return array(linalg.apply(math.exp,x.a,linalg.matrix))
-    return math.exp(x)
-
-def log(x):
-    if type(x)==array:
-        return array(linalg.apply(math.log,x.a,linalg.matrix))
-    return math.log(x)
-
-def size(x):
-    if type(x)==array:
-        return linalg.size(x.a)
-    return linalg.size(x)
-
-def shape(x):
-    if type(x)==array:
-        return linalg.shape(x.a)
-
-def dot(a,b):
-    return a*b
-
-def transpose(a):
-    if type(x)==array:
-        return array(linalg.transpose(x.a))
-
-def trn(a):
-    if type(x)==array:
-        return array(linalg.conj(linalg.transpose(x.a)))
-    return linalg.conj(linalg.transpose(x.a))
-
-def zeros(n,m=0):
-    return array(linalg.zeros(n,m))
-
-def ones(n,m=0):
-    return array(linalg.ones(n,m))
-
-def eye(n):
-    return array(linalg.eye(n))
-
-def det(x):
-    if type(x)==array:
-        return linalg.det(x.a)
-    return linalg.det(x)
-
-def inv(x):
-    if type(x)==array:
-        return array(linalg.inv(x.a))
-    return linalg.inv(x)
-
-def solve(a,b):
-    if type(a)==array:
-        if type(b)==array:
-            return array(linalg.solve(a.a,b.a))
-        return array(linalg.solve(a.a,b))
-    if type(b)==array:
-        return array(linalg.solve(a,b.a))
-    return linalg.solve(a,b)
-
-def eig(a):
-    if type(a)==array:
-        r=linalg.eig(a.a)
-        return array(r[0]),array(r[1])
-    return linalg.eig(a)
-
-def linspace(a,b,c):
-    return array(linalg.linspace(a,b,c))
-
-def arange(a,b,c=1):
-    return array(linalg.arange(a,b,c))
-
-def reshape(a,n,m=0):
-    if type(n)==tuple:
-        m=n[1]
-        n=n[0]
-    if type(a)==array:
-        return array(linalg.matrix(n,m,a.a))
-    return linalg.matrix(n,m,a)
-)";
-
-mp_lexer_t * mp_lexer_new_from_file(const char * filename) {
-  const char * script=read_file(filename);
-  if (!script && strcmp(filename,"numpy.py")==0)
-    script=numpy_script;
-  if (script) 
-    return mp_lexer_new_from_str_len(qstr_from_str(filename), script, strlen(script), 0 /* size_t free_len*/);
-  else
-    mp_raise_OSError(MP_ENOENT);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
-  if (strcmp(path,"numpy.py")==0 || file_exists(path)) {
-    return MP_IMPORT_STAT_FILE;
-  }
-  return MP_IMPORT_STAT_NO_EXIST;
-}
-
-
-#if MICROPY_KBD_EXCEPTION
-int mp_interrupt_char=5;
-
-void mp_hal_set_interrupt_char(int c) {
-  if (c != -1) {
-    mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
-  }
-  mp_interrupt_char = c;
-}
-
-void mp_keyboard_interrupt(void) {
-  MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
-}
-
-bool back_key_pressed();
-int getkey(int allow_suspend);
-
-
-int micropython_port_vm_hook_loop() {
-  /* This function is called very frequently by the MicroPython engine. We grab
-   * this opportunity to interrupt execution and/or refresh the display on
-   * platforms that need it. */
-
-  /* Doing too many things here slows down Python execution quite a lot. So we
-   * only do things once in a while and return as soon as possible otherwise. */
-  static int c = 0;
-
-  ++c; 
-  if (c & 0x7ff ) {
-    return 0;
-  }
-
-  // Check if the user asked for an interruption from the keyboard
-  int g=getkey(mp_interrupt_char | 0x80000000);
-  if (!g) return 0;
-  mp_keyboard_interrupt();
-  return 1;
-}
-
-
-#endif
-
-// Command line options, with their defaults
-// STATIC uint emit_opt = MP_EMIT_OPT_NONE;
-
-#if MICROPY_ENABLE_GC
-// Heap size of GC heap (if enabled)
-// Make it larger on a 64 bit machine, because pointers are larger.
-long heap_size = 1024*1024 * (sizeof(mp_uint_t) / 4);
-#endif
-
-STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
-  console_output(str,len); return;
-    (void)env;
-    ssize_t dummy = write(STDERR_FILENO, str, len);
-    mp_uos_dupterm_tx_strn(str, len);
-    (void)dummy;
-}
-
-const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
-
-#define FORCED_EXIT (0x100)
-// If exc is SystemExit, return value where FORCED_EXIT bit set,
-// and lower 8 bits are SystemExit value. For all other exceptions,
-// return 1.
-STATIC int handle_uncaught_exception(mp_obj_base_t *exc) {
-    // check for SystemExit
-    if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
-        // None is an exit value of 0; an int is its value; anything else is 1
-        mp_obj_t exit_val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(exc));
-        mp_int_t val = 0;
-        if (exit_val != mp_const_none && !mp_obj_get_int_maybe(exit_val, &val)) {
-            val = 1;
-        }
-        return FORCED_EXIT | (val & 255);
-    }
-
-    // Report all other exceptions
-    mp_obj_print_exception(&mp_stderr_print, MP_OBJ_FROM_PTR(exc));
-    return 1;
-}
-
-#define LEX_SRC_STR (1)
-#define LEX_SRC_VSTR (2)
-#define LEX_SRC_FILENAME (3)
-#define LEX_SRC_STDIN (4)
-
-// Returns standard error codes: 0 for success, 1 for all other errors,
-// except if FORCED_EXIT bit is set then script raised SystemExit and the
-// value of the exit is in the lower 8 bits of the return value
-STATIC int execute_from_lexer(int source_kind, const void *source, mp_parse_input_kind_t input_kind, bool is_repl) {
-
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        // create lexer based on source kind
-        mp_lexer_t *lex;
-        if (source_kind == LEX_SRC_STR) {
-            const char *line = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, line, strlen(line), false);
-        } else if (source_kind == LEX_SRC_VSTR) {
-            const vstr_t *vstr = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, false);
-        } else if (source_kind == LEX_SRC_FILENAME) {
-            lex = mp_lexer_new_from_file((const char*)source);
-        } else { // LEX_SRC_STDIN
-            lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, 0, false);
-        }
-
-        qstr source_name = lex->source_name;
-
-        #if MICROPY_PY___FILE__
-        if (input_kind == MP_PARSE_FILE_INPUT) {
-            mp_store_global(MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
-        }
-        #endif
-	parser_errorline=0; parser_errorcol=0;
-        mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
-
-        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, is_repl);
-
-        // execute it
-        mp_call_function_0(module_fun);
-        // check for pending exception
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
-        }
-
-        nlr_pop();
-        return 0;
-    } else {
-        // uncaught exception
-        return handle_uncaught_exception(nlr.ret_val);
-    }
-}
-
-STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
-    int l1 = strlen(s1);
-    int l2 = strlen(s2);
-    char *s = malloc(l1 + l2 + 2);
-    memcpy(s, s1, l1);
-    if (sep_char != 0) {
-        s[l1] = sep_char;
-        l1 += 1;
-    }
-    memcpy(s + l1, s2, l2);
-    s[l1 + l2] = 0;
-    return s;
-}
-
-STATIC int do_repl(void) {
-    mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "\n");
-
-    // use simple readline
-
-    for (;;) {
-        char *line = prompt(">>> ");
-        if (line == NULL) {
-            // EOF
-            return 0;
-        }
-        while (mp_repl_continue_with_input(line)) {
-            char *line2 = prompt("... ");
-            if (line2 == NULL) {
-                break;
-            }
-            char *line3 = strjoin(line, '\n', line2);
-            free(line);
-            free(line2);
-            line = line3;
-        }
-
-        int ret = execute_from_lexer(LEX_SRC_STR, line, MP_PARSE_SINGLE_INPUT, true);
-        if (ret & FORCED_EXIT) {
-            return ret;
-        }
-
-        free(line);
-    }
-}
-
-#include "main.h"
-int do_file(const char *file) {
-    return execute_from_lexer(LEX_SRC_FILENAME, file, MP_PARSE_FILE_INPUT, false);
-}
-
-/*
-STATIC int do_str(const char *str) {
-    return execute_from_lexer(LEX_SRC_STR, str, MP_PARSE_FILE_INPUT, false);
-}
-*/
-
-STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
-    for (int i = start_arg; i < argc; i++) {
-        mp_obj_list_append(mp_sys_argv, MP_OBJ_NEW_QSTR(qstr_from_str(argv[i])));
-    }
-}
-
-MP_NOINLINE int main_(int argc, char **argv);
-
-
-int micropy_eval(const char * str){
-  nlr_buf_t nlr;
-  if (nlr_push(&nlr) == 0) {
-    parser_errorline=0;
-    mp_lexer_t *lex = mp_lexer_new_from_str_len(0, str, strlen(str), false);
-    mp_parse_tree_t pt = mp_parse(lex, MP_PARSE_FILE_INPUT);
-    mp_obj_t module_fun = mp_compile(&pt, lex->source_name,true);
-    // mp_hal_set_interrupt_char((int)Ion::Keyboard::Key::Back);
-    mp_call_function_0(module_fun);
-    // mp_hal_set_interrupt_char(-1); // Disable interrupt
-    nlr_pop();
-  } else { // Uncaught exception
-#if 1
-    handle_uncaught_exception(nlr.ret_val);
-#else
-    /* mp_obj_print_exception is supposed to handle error printing. However,
-     * because we want to print custom information, we copied and modified the
-     * content of mp_obj_print_exception instead of calling it. */
-    if (mp_obj_is_exception_instance((mp_obj_t)nlr.ret_val)) {
-        size_t n, *values;
-        mp_obj_exception_get_traceback((mp_obj_t)nlr.ret_val, &n, &values);
-        if (n > 0) {
-            assert(n % 3 == 0);
-            for (int i = n - 3; i >= 0; i -= 3) {
-              if (values[i] != 0 || i == 0) {
-                if (values[i] == 0) {
-                  mp_printf(&mp_plat_print, "  Last command\n");
-                } else {
-#if MICROPY_ENABLE_SOURCE_LINE
-                  mp_printf(&mp_plat_print, "  File \"%q\", line %d", values[i], (int)values[i + 1]);
-#else
-                  mp_printf(&mp_plat_print, "  File \"%q\"", values[i]);
-#endif
-                  // the block name can be NULL if it's unknown
-                  qstr block = values[i + 2];
-                  if (block == MP_QSTR_NULL) {
-                    mp_print_str(&mp_plat_print, "\n");
-                  } else {
-                    mp_printf(&mp_plat_print, ", in %q\n", block);
-                  }
-                }
-              }
-            }
-        }
-    }
-    mp_obj_print_helper(&mp_plat_print, (mp_obj_t)nlr.ret_val, PRINT_EXC);
-    mp_print_str(&mp_plat_print, "\n");
-    /* End of mp_obj_print_exception. */
-#endif
-  }
-  return 0;
-}
-
-#ifndef MICROPY_LIB
-int main(int argc, char **argv) {
-    #if MICROPY_PY_THREAD
-    mp_thread_init();
-    #endif
-    // We should capture stack top ASAP after start, and it should be
-    // captured guaranteedly before any other stack variables are allocated.
-    // For this, actual main (renamed main_) should not be inlined into
-    // this function. main_() itself may have other functions inlined (with
-    // their own stack variables), that's why we need this main/main_ split.
-    mp_stack_ctrl_init();
-    return main_(argc, argv);
-}
-#endif
-
-char * micropy_init(int stack_size,int heap_size){
-  mp_stack_set_limit(40000 * (BYTES_PER_WORD / 4));
-
-    //Disable output buffering, otherwise interactive mode becomes useless
-    setbuf(stdout, NULL);
-  
-    mp_stack_set_limit(stack_size);// (32768);
-
-#if MICROPY_ENABLE_GC
-    char *heap = malloc(heap_size);
-    if(!heap)
-    {
-	return 0;
-    }
-    gc_init(heap, heap + heap_size - 1);
-#endif
-
-    mp_init();
-
-    return heap;
-}
-
-MP_NOINLINE int main_(int argc, char **argv) {
-  
-  char * heap=micropy_init(16*1024,32*1024);
-#if MICROPY_ENABLE_GC
-  if (!heap)
-    return 1;
-#endif
-    size_t path_num = 2;
-    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), path_num);
-    mp_obj_t *path_items;
-    mp_obj_list_get(mp_sys_path, &path_num, &path_items);
-    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
-
-    path_items[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
-    path_items[1] = MP_OBJ_NEW_QSTR(qstr_from_str("/documents/ndless"));
-
-    mp_obj_list_init(mp_sys_argv, 0);
-  
-    const int NOTHING_EXECUTED = -2;
-    int ret = NOTHING_EXECUTED;
-
-    for (int a = 1; a < argc; a++) {
-        char *pathbuf = malloc(PATH_MAX);
-        char *basedir = realpath(argv[a], pathbuf);
-        if (basedir == NULL) {
-            mp_printf(&mp_stderr_print, "%s: can't open file '%s': [Errno %d] %s\n", argv[0], argv[a], errno, strerror(errno));
-            // CPython exits with 2 in such case
-            ret = 2;
-            break;
-        }
-
-        // Set base dir of the script as first entry in sys.path
-        char *p = strrchr(basedir, '/');
-        path_items[0] = MP_OBJ_NEW_QSTR(qstr_from_strn(basedir, p - basedir));
-        free(pathbuf);
-
-        set_sys_argv(argv, argc, a);
-        ret = do_file(argv[a]);
-        break;
-    }
-
-    if (ret == NOTHING_EXECUTED) {
-        ret = do_repl();
-    }
-    else
-    {
-        puts("Press any key to exit.");
-        //wait_key_pressed();
-    }
-
-    mp_deinit();
-
-    if (heap) free(heap);
-
-    return ret & 0xff;
-}
-
-
-void nlr_jump_fail(void *val) {
-    printf("FATAL: uncaught NLR %p\n", val);
-    exit(1);
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/mklib.simu~ b/apps/KhiCAS/src/micropython-1.12/numworks/mklib.simu~
deleted file mode 100755
index 544f79968..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/mklib.simu~
+++ /dev/null
@@ -1,4 +0,0 @@
-# /bin/bash
-make
-arm-none-eabi-ar cru libmicropy.a build/py/mpstate.o build/py/nlr.o build/py/nlrx86.o build/py/nlrx64.o build/py/nlrthumb.o build/py/nlrpowerpc.o build/py/nlrxtensa.o build/py/nlrsetjmp.o build/py/malloc.o build/py/gc.o build/py/pystack.o build/py/qstr.o build/py/vstr.o build/py/mpprint.o build/py/unicode.o build/py/mpz.o build/py/reader.o build/py/lexer.o build/py/parse.o build/py/scope.o build/py/compile.o build/py/emitcommon.o build/py/emitbc.o build/py/asmbase.o build/py/asmx64.o build/py/emitnx64.o build/py/asmx86.o build/py/emitnx86.o build/py/asmthumb.o build/py/emitnthumb.o build/py/emitinlinethumb.o build/py/asmarm.o build/py/emitnarm.o build/py/asmxtensa.o build/py/emitnxtensa.o build/py/emitinlinextensa.o build/py/emitnxtensawin.o build/py/formatfloat.o build/py/parsenumbase.o build/py/parsenum.o build/py/emitglue.o build/py/persistentcode.o build/py/runtime.o build/py/runtime_utils.o build/py/scheduler.o build/py/nativeglue.o build/py/ringbuf.o build/py/stackctrl.o build/py/argcheck.o build/py/warning.o build/py/profile.o build/py/map.o build/py/obj.o build/py/objarray.o build/py/objattrtuple.o build/py/objbool.o build/py/objboundmeth.o build/py/objcell.o build/py/objclosure.o build/py/objcomplex.o build/py/objdeque.o build/py/objdict.o build/py/objenumerate.o build/py/objexcept.o build/py/objfilter.o build/py/objfloat.o build/py/objfun.o build/py/objgenerator.o build/py/objgetitemiter.o build/py/objint.o build/py/objint_longlong.o build/py/objint_mpz.o build/py/objlist.o build/py/objmap.o build/py/objmodule.o build/py/objobject.o build/py/objpolyiter.o build/py/objproperty.o build/py/objnone.o build/py/objnamedtuple.o build/py/objrange.o build/py/objreversed.o build/py/objset.o build/py/objsingleton.o build/py/objslice.o build/py/objstr.o build/py/objstrunicode.o build/py/objstringio.o build/py/objtuple.o build/py/objtype.o build/py/objzip.o build/py/opmethods.o build/py/sequence.o build/py/stream.o build/py/binary.o build/py/builtinimport.o build/py/builtinevex.o build/py/builtinhelp.o build/py/modarray.o build/py/modbuiltins.o build/py/modcollections.o build/py/modgc.o build/py/modio.o build/py/modmath.o build/py/modcmath.o build/py/modmicropython.o build/py/modstruct.o build/py/modsys.o build/py/moduerrno.o build/py/modthread.o build/py/vm.o build/py/bc.o build/py/showbc.o build/py/repl.o build/py/smallint.o build/py/frozenmod.o build/extmod/moductypes.o build/extmod/modujson.o build/extmod/modure.o build/extmod/moduzlib.o build/extmod/moduheapq.o build/extmod/modutimeq.o build/extmod/moduhashlib.o build/extmod/moducryptolib.o build/extmod/modubinascii.o build/extmod/virtpin.o build/extmod/machine_mem.o build/extmod/machine_pinbase.o build/extmod/machine_signal.o build/extmod/machine_pulse.o build/extmod/machine_i2c.o build/extmod/machine_spi.o build/extmod/modbluetooth.o build/extmod/modussl_axtls.o build/extmod/modussl_mbedtls.o build/extmod/modurandom.o build/extmod/moduselect.o build/extmod/moduwebsocket.o build/extmod/modwebrepl.o build/extmod/modframebuf.o build/extmod/vfs.o build/extmod/vfs_blockdev.o build/extmod/vfs_reader.o build/extmod/vfs_posix.o build/extmod/vfs_posix_file.o build/extmod/vfs_fat.o build/extmod/vfs_fat_diskio.o build/extmod/vfs_fat_file.o build/extmod/vfs_lfs.o build/extmod/utime_mphal.o build/extmod/uos_dupterm.o build/lib/embed/abort_.o build/lib/utils/printf.o build/./unix_mphal.o build/./modos.o build/./gccollect.o build/./modnsp.o build/./input.o build/./file.o build/./graphic.o build/./main.o
-/bin/cp libmicropy.a ~/final/nw-external-apps/apps/KhiCAS
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/mklib~ b/apps/KhiCAS/src/micropython-1.12/numworks/mklib~
deleted file mode 100755
index 943ad7137..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/mklib~
+++ /dev/null
@@ -1,6 +0,0 @@
-# /bin/bash
-make
-arm-none-eabi-ar cru libmicropy.a build/py/mpstate.o build/py/nlr.o build/py/nlrx86.o build/py/nlrx64.o build/py/nlrthumb.o build/py/nlrpowerpc.o build/py/nlrxtensa.o build/py/nlrsetjmp.o build/py/malloc.o build/py/gc.o build/py/pystack.o build/py/qstr.o build/py/vstr.o build/py/mpprint.o build/py/unicode.o build/py/mpz.o build/py/reader.o build/py/lexer.o build/py/parse.o build/py/scope.o build/py/compile.o build/py/emitcommon.o build/py/emitbc.o build/py/asmbase.o build/py/asmx64.o build/py/emitnx64.o build/py/asmx86.o build/py/emitnx86.o build/py/asmthumb.o build/py/emitnthumb.o build/py/emitinlinethumb.o build/py/asmarm.o build/py/emitnarm.o build/py/asmxtensa.o build/py/emitnxtensa.o build/py/emitinlinextensa.o build/py/emitnxtensawin.o build/py/formatfloat.o build/py/parsenumbase.o build/py/parsenum.o build/py/emitglue.o build/py/persistentcode.o build/py/runtime.o build/py/runtime_utils.o build/py/scheduler.o build/py/nativeglue.o build/py/ringbuf.o build/py/stackctrl.o build/py/argcheck.o build/py/warning.o build/py/profile.o build/py/map.o build/py/obj.o build/py/objarray.o build/py/objattrtuple.o build/py/objbool.o build/py/objboundmeth.o build/py/objcell.o build/py/objclosure.o build/py/objcomplex.o build/py/objdeque.o build/py/objdict.o build/py/objenumerate.o build/py/objexcept.o build/py/objfilter.o build/py/objfloat.o build/py/objfun.o build/py/objgenerator.o build/py/objgetitemiter.o build/py/objint.o build/py/objint_longlong.o build/py/objint_mpz.o build/py/objlist.o build/py/objmap.o build/py/objmodule.o build/py/objobject.o build/py/objpolyiter.o build/py/objproperty.o build/py/objnone.o build/py/objnamedtuple.o build/py/objrange.o build/py/objreversed.o build/py/objset.o build/py/objsingleton.o build/py/objslice.o build/py/objstr.o build/py/objstrunicode.o build/py/objstringio.o build/py/objtuple.o build/py/objtype.o build/py/objzip.o build/py/opmethods.o build/py/sequence.o build/py/stream.o build/py/binary.o build/py/builtinimport.o build/py/builtinevex.o build/py/builtinhelp.o build/py/modarray.o build/py/modbuiltins.o build/py/modcollections.o build/py/modgc.o build/py/modio.o build/py/modmath.o build/py/modcmath.o build/py/modmicropython.o build/py/modstruct.o build/py/modsys.o build/py/moduerrno.o build/py/modthread.o build/py/vm.o build/py/bc.o build/py/showbc.o build/py/repl.o build/py/smallint.o build/py/frozenmod.o build/extmod/moductypes.o build/extmod/modujson.o build/extmod/modure.o build/extmod/moduzlib.o build/extmod/moduheapq.o build/extmod/modutimeq.o build/extmod/moduhashlib.o build/extmod/moducryptolib.o build/extmod/modubinascii.o build/extmod/virtpin.o build/extmod/machine_mem.o build/extmod/machine_pinbase.o build/extmod/machine_signal.o build/extmod/machine_pulse.o build/extmod/machine_i2c.o build/extmod/machine_spi.o build/extmod/modbluetooth.o build/extmod/modussl_axtls.o build/extmod/modussl_mbedtls.o build/extmod/modurandom.o build/extmod/moduselect.o build/extmod/moduwebsocket.o build/extmod/modwebrepl.o build/extmod/modframebuf.o build/extmod/vfs.o build/extmod/vfs_blockdev.o build/extmod/vfs_reader.o build/extmod/vfs_posix.o build/extmod/vfs_posix_file.o build/extmod/vfs_fat.o build/extmod/vfs_fat_diskio.o build/extmod/vfs_fat_file.o build/extmod/vfs_lfs.o build/extmod/utime_mphal.o build/extmod/uos_dupterm.o build/lib/embed/abort_.o build/lib/utils/printf.o build/./unix_mphal.o build/./modos.o build/./gccollect.o build/./modnsp.o build/./input.o build/./file.o build/./graphic.o build/./main.o
-arm-none-eabi-ranlib libmicropy.a
-/bin/cp libmicropy.a ../../lib
-#/bin/cp libmicropy.a ~/final/nw-external-apps/apps/KhiCAS/src/lib/
\ No newline at end of file
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/modnsp.c~ b/apps/KhiCAS/src/micropython-1.12/numworks/modnsp.c~
deleted file mode 100644
index 55496e8f4..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/modnsp.c~
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "objtuple.h"
-
-double millis();
-int getkey(int);
-
-static mp_obj_t nsp_readRTC()
-{
-  return mp_obj_new_int(millis());
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(nsp_readRTC_obj, nsp_readRTC);
-
-static mp_obj_t nsp_waitKeypress()
-{
-  getkey(1);
-  return mp_const_none;
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(nsp_waitKeypress_obj, nsp_waitKeypress);
-
-STATIC const mp_map_elem_t mp_module_nsp_globals_table[] = {
-        { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nsp) },
-	//{ MP_OBJ_NEW_QSTR(MP_QSTR_Texture), (mp_obj_t) &nsp_texture_type },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_waitKeypress), (mp_obj_t) &nsp_waitKeypress_obj },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_readRTC), (mp_obj_t) &nsp_readRTC_obj },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_monotonic), (mp_obj_t) &nsp_readRTC_obj }
-};
-
-STATIC const mp_obj_dict_t mp_module_nsp_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_nsp_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_nsp_globals_table),
-        .table = (mp_map_elem_t*) mp_module_nsp_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_nsp = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*) &mp_module_nsp_globals,
-};
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/modos.c~ b/apps/KhiCAS/src/micropython-1.12/numworks/modos.c~
deleted file mode 100644
index 5135a0900..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/modos.c~
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2014 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "objtuple.h"
-
-#define RAISE_ERRNO(err_flag, error_val) \
-    { if (err_flag == -1) \
-        { nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_val))); } }
-
-STATIC mp_obj_t mod_os_stat(mp_obj_t path_in) {
-    struct stat sb;
-    uint len;
-    const char *path = mp_obj_str_get_data(path_in, &len);
-
-    int res = stat(path, &sb);
-    RAISE_ERRNO(res, errno);
-
-    mp_obj_tuple_t *t = mp_obj_new_tuple(10, NULL);
-    t->items[0] = MP_OBJ_NEW_SMALL_INT(sb.st_mode);
-    t->items[1] = MP_OBJ_NEW_SMALL_INT(sb.st_ino);
-    t->items[2] = MP_OBJ_NEW_SMALL_INT(sb.st_dev);
-    t->items[3] = MP_OBJ_NEW_SMALL_INT(sb.st_nlink);
-    t->items[4] = MP_OBJ_NEW_SMALL_INT(sb.st_uid);
-    t->items[5] = MP_OBJ_NEW_SMALL_INT(sb.st_gid);
-    t->items[6] = MP_OBJ_NEW_SMALL_INT(sb.st_size);
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(sb.st_atime);
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(sb.st_mtime);
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(sb.st_ctime);
-    return t;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_stat_obj, mod_os_stat);
-
-STATIC const mp_map_elem_t mp_module_os_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR__os) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_stat), (mp_obj_t)&mod_os_stat_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_os_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_os_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_os_globals_table),
-        .table = (mp_map_elem_t*)mp_module_os_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_os = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_os_globals,
-};
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/mpconfig.h~ b/apps/KhiCAS/src/micropython-1.12/numworks/mpconfig.h~
deleted file mode 100644
index 0676231d4..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/mpconfig.h~
+++ /dev/null
@@ -1,1592 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
-#define MICROPY_INCLUDED_PY_MPCONFIG_H
-
-// Current version of MicroPython
-#define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 12
-#define MICROPY_VERSION_MICRO 0
-
-// Combined version as a 32-bit number for convenience
-#define MICROPY_VERSION ( \
-    MICROPY_VERSION_MAJOR << 16 \
-    | MICROPY_VERSION_MINOR << 8 \
-    | MICROPY_VERSION_MICRO)
-
-// String version
-#define MICROPY_VERSION_STRING \
-    MP_STRINGIFY(MICROPY_VERSION_MAJOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MINOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MICRO)
-
-// This file contains default configuration settings for MicroPython.
-// You can override any of the options below using mpconfigport.h file
-// located in a directory of your port.
-
-// mpconfigport.h is a file containing configuration settings for a
-// particular port. mpconfigport.h is actually a default name for
-// such config, and it can be overridden using MP_CONFIGFILE preprocessor
-// define (you can do that by passing CFLAGS_EXTRA='-DMP_CONFIGFILE="<file.h>"'
-// argument to make when using standard MicroPython makefiles).
-// This is useful to have more than one config per port, for example,
-// release vs debug configs, etc. Note that if you switch from one config
-// to another, you must rebuild from scratch using "-B" switch to make.
-
-#ifdef MP_CONFIGFILE
-#include MP_CONFIGFILE
-#else
-#include <mpconfigport.h>
-#endif
-
-// Any options not explicitly set in mpconfigport.h will get default
-// values below.
-
-/*****************************************************************************/
-/* Object representation                                                     */
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xxx1 : a small int, bits 1 and above are the value
-//  - xxxx...xx10 : a qstr, bits 2 and above are the value
-//  - xxxx...xx00 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_A (0)
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xx01 : a small int, bits 2 and above are the value
-//  - xxxx...xx11 : a qstr, bits 2 and above are the value
-//  - xxxx...xxx0 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_B (1)
-
-// A MicroPython object is a machine word having the following form (called R):
-//  - iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int with 31-bit signed value
-//  - 01111111 1qqqqqqq qqqqqqqq qqqqq110 str with 20-bit qstr value
-//  - s1111111 10000000 00000000 00000010 +/- inf
-//  - s1111111 1xxxxxxx xxxxxxxx xxxxx010 nan, x != 0
-//  - seeeeeee efffffff ffffffff ffffff10 30-bit fp, e != 0xff
-//  - pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Str and float stored as O = R + 0x80800000, retrieved as R = O - 0x80800000.
-// This makes strs easier to encode/decode as they have zeros in the top 9 bits.
-// This scheme only works with 32-bit word size and float enabled.
-#define MICROPY_OBJ_REPR_C (2)
-
-// A MicroPython object is a 64-bit word having the following form (called R):
-//  - seeeeeee eeeeffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff 64-bit fp, e != 0x7ff
-//  - s1111111 11110000 00000000 00000000 00000000 00000000 00000000 00000000 +/- inf
-//  - 01111111 11111000 00000000 00000000 00000000 00000000 00000000 00000000 normalised nan
-//  - 01111111 11111101 iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int
-//  - 01111111 11111110 00000000 00000000 qqqqqqqq qqqqqqqq qqqqqqqq qqqqqqq1 str
-//  - 01111111 11111100 00000000 00000000 pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Stored as O = R + 0x8004000000000000, retrieved as R = O - 0x8004000000000000.
-// This makes pointers have all zeros in the top 32 bits.
-// Small-ints and strs have 1 as LSB to make sure they don't look like pointers
-// to the garbage collector.
-#define MICROPY_OBJ_REPR_D (3)
-
-#ifndef MICROPY_OBJ_REPR
-#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A)
-#endif
-
-/*****************************************************************************/
-/* Memory allocation policy                                                  */
-
-// Number of bytes in memory allocation/GC block. Any size allocated will be
-// rounded up to be multiples of this.
-#ifndef MICROPY_BYTES_PER_GC_BLOCK
-#define MICROPY_BYTES_PER_GC_BLOCK (4 * BYTES_PER_WORD)
-#endif
-
-// Number of words allocated (in BSS) to the GC stack (minimum is 1)
-#ifndef MICROPY_ALLOC_GC_STACK_SIZE
-#define MICROPY_ALLOC_GC_STACK_SIZE (64)
-#endif
-
-// The C-type to use for entries in the GC stack.  By default it allows the
-// heap to be as large as the address space, but the bit-width of this type can
-// be reduced to save memory when the heap is small enough.  The type must be
-// big enough to index all blocks in the heap, which is set by
-// heap-size-in-bytes / MICROPY_BYTES_PER_GC_BLOCK.
-#ifndef MICROPY_GC_STACK_ENTRY_TYPE
-#define MICROPY_GC_STACK_ENTRY_TYPE size_t
-#endif
-
-// Be conservative and always clear to zero newly (re)allocated memory in the GC.
-// This helps eliminate stray pointers that hold on to memory that's no longer
-// used.  It decreases performance due to unnecessary memory clearing.
-// A memory manager which always clears memory can set this to 0.
-// TODO Do analysis to understand why some memory is not properly cleared and
-// find a more efficient way to clear it.
-#ifndef MICROPY_GC_CONSERVATIVE_CLEAR
-#define MICROPY_GC_CONSERVATIVE_CLEAR (MICROPY_ENABLE_GC)
-#endif
-
-// Support automatic GC when reaching allocation threshold,
-// configurable by gc.threshold().
-#ifndef MICROPY_GC_ALLOC_THRESHOLD
-#define MICROPY_GC_ALLOC_THRESHOLD (1)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// interned string data.  Smaller numbers lead to more chunks being needed
-// and more wastage at the end of the chunk.  Larger numbers lead to wasted
-// space at the end when no more strings need interning.
-#ifndef MICROPY_ALLOC_QSTR_CHUNK_INIT
-#define MICROPY_ALLOC_QSTR_CHUNK_INIT (128)
-#endif
-
-// Initial amount for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXER_INDENT_INIT
-#define MICROPY_ALLOC_LEXER_INDENT_INIT (10)
-#endif
-
-// Increment for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXEL_INDENT_INC
-#define MICROPY_ALLOC_LEXEL_INDENT_INC (8)
-#endif
-
-// Initial amount for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INIT
-#define MICROPY_ALLOC_PARSE_RULE_INIT (64)
-#endif
-
-// Increment for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INC
-#define MICROPY_ALLOC_PARSE_RULE_INC (16)
-#endif
-
-// Initial amount for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INIT
-#define MICROPY_ALLOC_PARSE_RESULT_INIT (32)
-#endif
-
-// Increment for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INC
-#define MICROPY_ALLOC_PARSE_RESULT_INC (16)
-#endif
-
-// Strings this length or less will be interned by the parser
-#ifndef MICROPY_ALLOC_PARSE_INTERN_STRING_LEN
-#define MICROPY_ALLOC_PARSE_INTERN_STRING_LEN (10)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// parse nodes.  Small leads to fragmentation, large leads to excess use.
-#ifndef MICROPY_ALLOC_PARSE_CHUNK_INIT
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (128)
-#endif
-
-// Initial amount for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INIT
-#define MICROPY_ALLOC_SCOPE_ID_INIT (4)
-#endif
-
-// Increment for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INC
-#define MICROPY_ALLOC_SCOPE_ID_INC (6)
-#endif
-
-// Maximum length of a path in the filesystem
-// So we can allocate a buffer on the stack for path manipulation in import
-#ifndef MICROPY_ALLOC_PATH_MAX
-#define MICROPY_ALLOC_PATH_MAX (512)
-#endif
-
-// Initial size of module dict
-#ifndef MICROPY_MODULE_DICT_SIZE
-#define MICROPY_MODULE_DICT_SIZE (1)
-#endif
-
-// Whether realloc/free should be passed allocated memory region size
-// You must enable this if MICROPY_MEM_STATS is enabled
-#ifndef MICROPY_MALLOC_USES_ALLOCATED_SIZE
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (0)
-#endif
-
-// Number of bytes used to store qstr length
-// Dictates hard limit on maximum Python identifier length, but 1 byte
-// (limit of 255 bytes in an identifier) should be enough for everyone
-#ifndef MICROPY_QSTR_BYTES_IN_LEN
-#define MICROPY_QSTR_BYTES_IN_LEN (1)
-#endif
-
-// Number of bytes used to store qstr hash
-#ifndef MICROPY_QSTR_BYTES_IN_HASH
-#define MICROPY_QSTR_BYTES_IN_HASH (2)
-#endif
-
-// Avoid using C stack when making Python function calls. C stack still
-// may be used if there's no free heap.
-#ifndef MICROPY_STACKLESS
-#define MICROPY_STACKLESS (0)
-#endif
-
-// Never use C stack when making Python function calls. This may break
-// testsuite as will subtly change which exception is thrown in case
-// of too deep recursion and other similar cases.
-#ifndef MICROPY_STACKLESS_STRICT
-#define MICROPY_STACKLESS_STRICT (0)
-#endif
-
-// Don't use alloca calls. As alloca() is not part of ANSI C, this
-// workaround option is provided for compilers lacking this de-facto
-// standard function. The way it works is allocating from heap, and
-// relying on garbage collection to free it eventually. This is of
-// course much less optimal than real alloca().
-#if defined(MICROPY_NO_ALLOCA) && MICROPY_NO_ALLOCA
-#undef alloca
-#define alloca(x) m_malloc(x)
-#endif
-
-/*****************************************************************************/
-/* MicroPython emitters                                                     */
-
-// Whether to support loading of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_LOAD
-#define MICROPY_PERSISTENT_CODE_LOAD (0)
-#endif
-
-// Whether to support saving of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_SAVE
-#define MICROPY_PERSISTENT_CODE_SAVE (0)
-#endif
-
-// Whether generated code can persist independently of the VM/runtime instance
-// This is enabled automatically when needed by other features
-#ifndef MICROPY_PERSISTENT_CODE
-#define MICROPY_PERSISTENT_CODE (MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether to emit x64 native code
-#ifndef MICROPY_EMIT_X64
-#define MICROPY_EMIT_X64 (0)
-#endif
-
-// Whether to emit x86 native code
-#ifndef MICROPY_EMIT_X86
-#define MICROPY_EMIT_X86 (0)
-#endif
-
-// Whether to emit thumb native code
-#ifndef MICROPY_EMIT_THUMB
-#define MICROPY_EMIT_THUMB (0)
-#endif
-
-// Whether to enable the thumb inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB
-#define MICROPY_EMIT_INLINE_THUMB (0)
-#endif
-
-// Whether to enable ARMv7-M instruction support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_ARMV7M
-#define MICROPY_EMIT_INLINE_THUMB_ARMV7M (1)
-#endif
-
-// Whether to enable float support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_FLOAT
-#define MICROPY_EMIT_INLINE_THUMB_FLOAT (1)
-#endif
-
-// Whether to emit ARM native code
-#ifndef MICROPY_EMIT_ARM
-#define MICROPY_EMIT_ARM (0)
-#endif
-
-// Whether to emit Xtensa native code
-#ifndef MICROPY_EMIT_XTENSA
-#define MICROPY_EMIT_XTENSA (0)
-#endif
-
-// Whether to enable the Xtensa inline assembler
-#ifndef MICROPY_EMIT_INLINE_XTENSA
-#define MICROPY_EMIT_INLINE_XTENSA (0)
-#endif
-
-// Whether to emit Xtensa-Windowed native code
-#ifndef MICROPY_EMIT_XTENSAWIN
-#define MICROPY_EMIT_XTENSAWIN (0)
-#endif
-
-// Convenience definition for whether any native emitter is enabled
-#define MICROPY_EMIT_NATIVE (MICROPY_EMIT_X64 || MICROPY_EMIT_X86 || MICROPY_EMIT_THUMB || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN)
-
-// Select prelude-as-bytes-object for certain emitters
-#define MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ (MICROPY_EMIT_XTENSAWIN)
-
-// Convenience definition for whether any inline assembler emitter is enabled
-#define MICROPY_EMIT_INLINE_ASM (MICROPY_EMIT_INLINE_THUMB || MICROPY_EMIT_INLINE_XTENSA)
-
-// Convenience definition for whether any native or inline assembler emitter is enabled
-#define MICROPY_EMIT_MACHINE_CODE (MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM)
-
-/*****************************************************************************/
-/* Compiler configuration                                                    */
-
-// Whether to include the compiler
-#ifndef MICROPY_ENABLE_COMPILER
-#define MICROPY_ENABLE_COMPILER (1)
-#endif
-
-// Whether the compiler is dynamically configurable (ie at runtime)
-// This will disable the ability to execute native/viper code
-#ifndef MICROPY_DYNAMIC_COMPILER
-#define MICROPY_DYNAMIC_COMPILER (0)
-#endif
-
-// Configure dynamic compiler macros
-#if MICROPY_DYNAMIC_COMPILER
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC (mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode)
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC (mp_dynamic_compiler.py_builtins_str_unicode)
-#else
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC MICROPY_PY_BUILTINS_STR_UNICODE
-#endif
-
-// Whether to enable constant folding; eg 1+2 rewritten as 3
-#ifndef MICROPY_COMP_CONST_FOLDING
-#define MICROPY_COMP_CONST_FOLDING (1)
-#endif
-
-// Whether to enable optimisations for constant literals, eg OrderedDict
-#ifndef MICROPY_COMP_CONST_LITERAL
-#define MICROPY_COMP_CONST_LITERAL (1)
-#endif
-
-// Whether to enable lookup of constants in modules; eg module.CONST
-#ifndef MICROPY_COMP_MODULE_CONST
-#define MICROPY_COMP_MODULE_CONST (0)
-#endif
-
-// Whether to enable constant optimisation; id = const(value)
-#ifndef MICROPY_COMP_CONST
-#define MICROPY_COMP_CONST (1)
-#endif
-
-// Whether to enable optimisation of: a, b = c, d
-// Costs 124 bytes (Thumb2)
-#ifndef MICROPY_COMP_DOUBLE_TUPLE_ASSIGN
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
-#endif
-
-// Whether to enable optimisation of: a, b, c = d, e, f
-// Requires MICROPY_COMP_DOUBLE_TUPLE_ASSIGN and costs 68 bytes (Thumb2)
-#ifndef MICROPY_COMP_TRIPLE_TUPLE_ASSIGN
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#endif
-
-// Whether to enable optimisation of: return a if b else c
-// Costs about 80 bytes (Thumb2) and saves 2 bytes of bytecode for each use
-#ifndef MICROPY_COMP_RETURN_IF_EXPR
-#define MICROPY_COMP_RETURN_IF_EXPR (0)
-#endif
-
-/*****************************************************************************/
-/* Internal debugging stuff                                                  */
-
-// Whether to collect memory allocation stats
-#ifndef MICROPY_MEM_STATS
-#define MICROPY_MEM_STATS (0)
-#endif
-
-// The mp_print_t printer used for debugging output
-#ifndef MICROPY_DEBUG_PRINTER
-#define MICROPY_DEBUG_PRINTER (&mp_plat_print)
-#endif
-
-// Whether to build functions that print debugging info:
-//   mp_bytecode_print
-//   mp_parse_node_print
-#ifndef MICROPY_DEBUG_PRINTERS
-#define MICROPY_DEBUG_PRINTERS (0)
-#endif
-
-// Whether to enable all debugging outputs (it will be extremely verbose)
-#ifndef MICROPY_DEBUG_VERBOSE
-#define MICROPY_DEBUG_VERBOSE (0)
-#endif
-
-// Whether to enable debugging versions of MP_OBJ_NULL/STOP_ITERATION/SENTINEL
-#ifndef MICROPY_DEBUG_MP_OBJ_SENTINELS
-#define MICROPY_DEBUG_MP_OBJ_SENTINELS (0)
-#endif
-
-// Whether to enable a simple VM stack overflow check
-#ifndef MICROPY_DEBUG_VM_STACK_OVERFLOW
-#define MICROPY_DEBUG_VM_STACK_OVERFLOW (0)
-#endif
-
-/*****************************************************************************/
-/* Optimisations                                                             */
-
-// Whether to use computed gotos in the VM, or a switch
-// Computed gotos are roughly 10% faster, and increase VM code size by a little
-// Note: enabling this will use the gcc-specific extensions of ranged designated
-// initialisers and addresses of labels, which are not part of the C99 standard.
-#ifndef MICROPY_OPT_COMPUTED_GOTO
-#define MICROPY_OPT_COMPUTED_GOTO (0)
-#endif
-
-// Whether to cache result of map lookups in LOAD_NAME, LOAD_GLOBAL, LOAD_ATTR,
-// STORE_ATTR bytecodes.  Uses 1 byte extra RAM for each of these opcodes and
-// uses a bit of extra code ROM, but greatly improves lookup speed.
-#ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
-#endif
-
-// Whether to use fast versions of bitwise operations (and, or, xor) when the
-// arguments are both positive.  Increases Thumb2 code size by about 250 bytes.
-#ifndef MICROPY_OPT_MPZ_BITWISE
-#define MICROPY_OPT_MPZ_BITWISE (0)
-#endif
-
-
-// Whether math.factorial is large, fast and recursive (1) or small and slow (0).
-#ifndef MICROPY_OPT_MATH_FACTORIAL
-#define MICROPY_OPT_MATH_FACTORIAL (0)
-#endif
-
-/*****************************************************************************/
-/* Python internal features                                                  */
-
-// Whether to enable import of external modules
-// When disabled, only importing of built-in modules is supported
-// When enabled, a port must implement mp_import_stat (among other things)
-#ifndef MICROPY_ENABLE_EXTERNAL_IMPORT
-#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
-#endif
-
-// Whether to use the POSIX reader for importing files
-#ifndef MICROPY_READER_POSIX
-#define MICROPY_READER_POSIX (0)
-#endif
-
-// Whether to use the VFS reader for importing files
-#ifndef MICROPY_READER_VFS
-#define MICROPY_READER_VFS (0)
-#endif
-
-// Whether any readers have been defined
-#ifndef MICROPY_HAS_FILE_READER
-#define MICROPY_HAS_FILE_READER (MICROPY_READER_POSIX || MICROPY_READER_VFS)
-#endif
-
-// Hook for the VM at the start of the opcode loop (can contain variable
-// definitions usable by the other hook functions)
-#ifndef MICROPY_VM_HOOK_INIT
-#define MICROPY_VM_HOOK_INIT
-#endif
-
-// Hook for the VM during the opcode loop (but only after jump opcodes)
-#ifndef MICROPY_VM_HOOK_LOOP
-#define MICROPY_VM_HOOK_LOOP
-#endif
-
-// Hook for the VM just before return opcode is finished being interpreted
-#ifndef MICROPY_VM_HOOK_RETURN
-#define MICROPY_VM_HOOK_RETURN
-#endif
-
-// Whether to include the garbage collector
-#ifndef MICROPY_ENABLE_GC
-#define MICROPY_ENABLE_GC (0)
-#endif
-
-// Whether to enable finalisers in the garbage collector (ie call __del__)
-#ifndef MICROPY_ENABLE_FINALISER
-#define MICROPY_ENABLE_FINALISER (0)
-#endif
-
-// Whether to enable a separate allocator for the Python stack.
-// If enabled then the code must call mp_pystack_init before mp_init.
-#ifndef MICROPY_ENABLE_PYSTACK
-#define MICROPY_ENABLE_PYSTACK (0)
-#endif
-
-// Number of bytes that memory returned by mp_pystack_alloc will be aligned by.
-#ifndef MICROPY_PYSTACK_ALIGN
-#define MICROPY_PYSTACK_ALIGN (8)
-#endif
-
-// Whether to check C stack usage. C stack used for calling Python functions,
-// etc. Not checking means segfault on overflow.
-#ifndef MICROPY_STACK_CHECK
-#define MICROPY_STACK_CHECK (0)
-#endif
-
-// Whether to have an emergency exception buffer
-#ifndef MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (0)
-#endif
-#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#   ifndef MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE
-#   define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)   // 0 - implies dynamic allocation
-#   endif
-#endif
-
-// Whether to provide the mp_kbd_exception object, and micropython.kbd_intr function
-#ifndef MICROPY_KBD_EXCEPTION
-#define MICROPY_KBD_EXCEPTION (1)
-#endif
-
-// Prefer to raise KeyboardInterrupt asynchronously (from signal or interrupt
-// handler) - if supported by a particular port.
-#ifndef MICROPY_ASYNC_KBD_INTR
-#define MICROPY_ASYNC_KBD_INTR (0)
-#endif
-
-// Whether to include REPL helper function
-#ifndef MICROPY_HELPER_REPL
-#define MICROPY_HELPER_REPL (0)
-#endif
-
-// Whether to include emacs-style readline behavior in REPL
-#ifndef MICROPY_REPL_EMACS_KEYS
-#define MICROPY_REPL_EMACS_KEYS (0)
-#endif
-
-// Whether to implement auto-indent in REPL
-#ifndef MICROPY_REPL_AUTO_INDENT
-#define MICROPY_REPL_AUTO_INDENT (0)
-#endif
-
-// Whether port requires event-driven REPL functions
-#ifndef MICROPY_REPL_EVENT_DRIVEN
-#define MICROPY_REPL_EVENT_DRIVEN (0)
-#endif
-
-// Whether to include lexer helper function for unix
-#ifndef MICROPY_HELPER_LEXER_UNIX
-#define MICROPY_HELPER_LEXER_UNIX (0)
-#endif
-
-// Long int implementation
-#define MICROPY_LONGINT_IMPL_NONE (0)
-#define MICROPY_LONGINT_IMPL_LONGLONG (1)
-#define MICROPY_LONGINT_IMPL_MPZ (2)
-
-#ifndef MICROPY_LONGINT_IMPL
-#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_NONE)
-#endif
-
-#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
-typedef long long mp_longint_impl_t;
-#endif
-
-// Whether to include information in the byte code to determine source
-// line number (increases RAM usage, but doesn't slow byte code execution)
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE (0)
-#endif
-
-// Whether to include doc strings (increases RAM usage)
-#ifndef MICROPY_ENABLE_DOC_STRING
-#define MICROPY_ENABLE_DOC_STRING (0)
-#endif
-
-// Exception messages are short static strings
-#define MICROPY_ERROR_REPORTING_TERSE    (1)
-// Exception messages provide basic error details
-#define MICROPY_ERROR_REPORTING_NORMAL   (2)
-// Exception messages provide full info, e.g. object names
-#define MICROPY_ERROR_REPORTING_DETAILED (3)
-
-#ifndef MICROPY_ERROR_REPORTING
-#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL)
-#endif
-
-// Whether issue warnings during compiling/execution
-#ifndef MICROPY_WARNINGS
-#define MICROPY_WARNINGS (0)
-#endif
-
-// Whether to support warning categories
-#ifndef MICROPY_WARNINGS_CATEGORY
-#define MICROPY_WARNINGS_CATEGORY (0)
-#endif
-
-// This macro is used when printing runtime warnings and errors
-#ifndef MICROPY_ERROR_PRINTER
-#define MICROPY_ERROR_PRINTER (&mp_plat_print)
-#endif
-
-// Float and complex implementation
-#define MICROPY_FLOAT_IMPL_NONE (0)
-#define MICROPY_FLOAT_IMPL_FLOAT (1)
-#define MICROPY_FLOAT_IMPL_DOUBLE (2)
-
-#ifndef MICROPY_FLOAT_IMPL
-#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_NONE)
-#endif
-
-#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x##F
-#define MICROPY_FLOAT_C_FUN(fun) fun##f
-typedef float mp_float_t;
-#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x
-#define MICROPY_FLOAT_C_FUN(fun) fun
-typedef double mp_float_t;
-#else
-#define MICROPY_PY_BUILTINS_FLOAT (0)
-#endif
-
-#ifndef MICROPY_PY_BUILTINS_COMPLEX
-#define MICROPY_PY_BUILTINS_COMPLEX (MICROPY_PY_BUILTINS_FLOAT)
-#endif
-
-// Whether to provide a high-quality hash for float and complex numbers.
-// Otherwise the default is a very simple but correct hashing function.
-#ifndef MICROPY_FLOAT_HIGH_QUALITY_HASH
-#define MICROPY_FLOAT_HIGH_QUALITY_HASH (0)
-#endif
-
-// Enable features which improve CPython compatibility
-// but may lead to more code size/memory usage.
-// TODO: Originally intended as generic category to not
-// add bunch of once-off options. May need refactoring later
-#ifndef MICROPY_CPYTHON_COMPAT
-#define MICROPY_CPYTHON_COMPAT (1)
-#endif
-
-// Perform full checks as done by CPython. Disabling this
-// may produce incorrect results, if incorrect data is fed,
-// but should not lead to MicroPython crashes or similar
-// grave issues (in other words, only user app should be,
-// affected, not system).
-#ifndef MICROPY_FULL_CHECKS
-#define MICROPY_FULL_CHECKS (1)
-#endif
-
-// Whether POSIX-semantics non-blocking streams are supported
-#ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK (0)
-#endif
-
-// Whether to provide stream functions with POSIX-like signatures
-// (useful for porting existing libraries to MicroPython).
-#ifndef MICROPY_STREAMS_POSIX_API
-#define MICROPY_STREAMS_POSIX_API (0)
-#endif
-
-// Whether to call __init__ when importing builtin modules for the first time
-#ifndef MICROPY_MODULE_BUILTIN_INIT
-#define MICROPY_MODULE_BUILTIN_INIT (0)
-#endif
-
-// Whether to support module-level __getattr__ (see PEP 562)
-#ifndef MICROPY_MODULE_GETATTR
-#define MICROPY_MODULE_GETATTR (0)
-#endif
-
-// Whether module weak links are supported
-#ifndef MICROPY_MODULE_WEAK_LINKS
-#define MICROPY_MODULE_WEAK_LINKS (0)
-#endif
-
-// Whether frozen modules are supported in the form of strings
-#ifndef MICROPY_MODULE_FROZEN_STR
-#define MICROPY_MODULE_FROZEN_STR (0)
-#endif
-
-// Whether frozen modules are supported in the form of .mpy files
-#ifndef MICROPY_MODULE_FROZEN_MPY
-#define MICROPY_MODULE_FROZEN_MPY (0)
-#endif
-
-// Convenience macro for whether frozen modules are supported
-#ifndef MICROPY_MODULE_FROZEN
-#define MICROPY_MODULE_FROZEN (MICROPY_MODULE_FROZEN_STR || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether you can override builtins in the builtins module
-#ifndef MICROPY_CAN_OVERRIDE_BUILTINS
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
-#endif
-
-// Whether to check that the "self" argument of a builtin method has the
-// correct type.  Such an explicit check is only needed if a builtin
-// method escapes to Python land without a first argument, eg
-// list.append([], 1).  Without this check such calls will have undefined
-// behaviour (usually segfault) if the first argument is the wrong type.
-#ifndef MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
-#endif
-
-// Whether to use internally defined errno's (otherwise system provided ones)
-#ifndef MICROPY_USE_INTERNAL_ERRNO
-#define MICROPY_USE_INTERNAL_ERRNO (0)
-#endif
-
-// Whether to use internally defined *printf() functions (otherwise external ones)
-#ifndef MICROPY_USE_INTERNAL_PRINTF
-#define MICROPY_USE_INTERNAL_PRINTF (1)
-#endif
-
-// Support for internal scheduler
-#ifndef MICROPY_ENABLE_SCHEDULER
-#define MICROPY_ENABLE_SCHEDULER (0)
-#endif
-
-// Maximum number of entries in the scheduler
-#ifndef MICROPY_SCHEDULER_DEPTH
-#define MICROPY_SCHEDULER_DEPTH (4)
-#endif
-
-// Support for generic VFS sub-system
-#ifndef MICROPY_VFS
-#define MICROPY_VFS (0)
-#endif
-
-// Support for VFS POSIX component, to mount a POSIX filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_POSIX (0)
-#endif
-
-// Support for VFS FAT component, to mount a FAT filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_FAT (0)
-#endif
-
-/*****************************************************************************/
-/* Fine control over Python builtins, classes, modules, etc                  */
-
-// Whether to support multiple inheritance of Python classes.  Multiple
-// inheritance makes some C functions inherently recursive, and adds a bit of
-// code overhead.
-#ifndef MICROPY_MULTIPLE_INHERITANCE
-#define MICROPY_MULTIPLE_INHERITANCE (1)
-#endif
-
-// Whether to implement attributes on functions
-#ifndef MICROPY_PY_FUNCTION_ATTRS
-#define MICROPY_PY_FUNCTION_ATTRS (0)
-#endif
-
-// Whether to support the descriptors __get__, __set__, __delete__
-// This costs some code size and makes load/store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DESCRIPTORS
-#define MICROPY_PY_DESCRIPTORS (0)
-#endif
-
-// Whether to support class __delattr__ and __setattr__ methods
-// This costs some code size and makes store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DELATTR_SETATTR
-#define MICROPY_PY_DELATTR_SETATTR (0)
-#endif
-
-// Support for async/await/async for/async with
-#ifndef MICROPY_PY_ASYNC_AWAIT
-#define MICROPY_PY_ASYNC_AWAIT (1)
-#endif
-
-// Non-standard .pend_throw() method for generators, allowing for
-// Future-like behavior with respect to exception handling: an
-// exception set with .pend_throw() will activate on the next call
-// to generator's .send() or .__next__(). (This is useful to implement
-// async schedulers.)
-#ifndef MICROPY_PY_GENERATOR_PEND_THROW
-#define MICROPY_PY_GENERATOR_PEND_THROW (1)
-#endif
-
-// Issue a warning when comparing str and bytes objects
-#ifndef MICROPY_PY_STR_BYTES_CMP_WARN
-#define MICROPY_PY_STR_BYTES_CMP_WARN (0)
-#endif
-
-// Whether str object is proper unicode
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
-#endif
-
-// Whether to check for valid UTF-8 when converting bytes to str
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
-#define MICROPY_PY_BUILTINS_STR_UNICODE_CHECK (MICROPY_PY_BUILTINS_STR_UNICODE)
-#endif
-
-// Whether str.center() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_CENTER
-#define MICROPY_PY_BUILTINS_STR_CENTER (0)
-#endif
-
-// Whether str.count() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_COUNT
-#define MICROPY_PY_BUILTINS_STR_COUNT (1)
-#endif
-
-// Whether str % (...) formatting operator provided
-#ifndef MICROPY_PY_BUILTINS_STR_OP_MODULO
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
-#endif
-
-// Whether str.partition()/str.rpartition() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_PARTITION
-#define MICROPY_PY_BUILTINS_STR_PARTITION (0)
-#endif
-
-// Whether str.splitlines() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_SPLITLINES
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
-#endif
-
-// Whether to support bytearray object
-#ifndef MICROPY_PY_BUILTINS_BYTEARRAY
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
-#endif
-
-// Whether to support dict.fromkeys() class method
-#ifndef MICROPY_PY_BUILTINS_DICT_FROMKEYS
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
-#endif
-
-// Whether to support memoryview object
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#endif
-
-// Whether to support memoryview.itemsize attribute
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (0)
-#endif
-
-// Whether to support set object
-#ifndef MICROPY_PY_BUILTINS_SET
-#define MICROPY_PY_BUILTINS_SET (1)
-#endif
-
-// Whether to support slice subscript operators and slice object
-#ifndef MICROPY_PY_BUILTINS_SLICE
-#define MICROPY_PY_BUILTINS_SLICE (1)
-#endif
-
-// Whether to support slice attribute read access,
-// i.e. slice.start, slice.stop, slice.step
-#ifndef MICROPY_PY_BUILTINS_SLICE_ATTRS
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
-#endif
-
-// Whether to support frozenset object
-#ifndef MICROPY_PY_BUILTINS_FROZENSET
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#endif
-
-// Whether to support property object
-#ifndef MICROPY_PY_BUILTINS_PROPERTY
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
-#endif
-
-// Whether to implement the start/stop/step attributes (readback) on
-// the "range" builtin type. Rarely used, and costs ~60 bytes (x86).
-#ifndef MICROPY_PY_BUILTINS_RANGE_ATTRS
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
-#endif
-
-// Whether to support binary ops [only (in)equality is defined] between range
-// objects.  With this option disabled all range objects that are not exactly
-// the same object will compare as not-equal.  With it enabled the semantics
-// match CPython and ranges are equal if they yield the same sequence of items.
-#ifndef MICROPY_PY_BUILTINS_RANGE_BINOP
-#define MICROPY_PY_BUILTINS_RANGE_BINOP (0)
-#endif
-
-// Support for callling next() with second argument
-#ifndef MICROPY_PY_BUILTINS_NEXT2
-#define MICROPY_PY_BUILTINS_NEXT2 (0)
-#endif
-
-// Whether to support rounding of integers (incl bignum); eg round(123,-1)=120
-#ifndef MICROPY_PY_BUILTINS_ROUND_INT
-#define MICROPY_PY_BUILTINS_ROUND_INT (0)
-#endif
-
-// Whether to support timeout exceptions (like socket.timeout)
-#ifndef MICROPY_PY_BUILTINS_TIMEOUTERROR
-#define MICROPY_PY_BUILTINS_TIMEOUTERROR (0)
-#endif
-
-// Whether to support complete set of special methods for user
-// classes, or only the most used ones. "Inplace" methods are
-// controlled by MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS below.
-// "Reverse" methods are controlled by
-// MICROPY_PY_REVERSE_SPECIAL_METHODS below.
-#ifndef MICROPY_PY_ALL_SPECIAL_METHODS
-#define MICROPY_PY_ALL_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support all inplace arithmetic operarion methods
-// (__imul__, etc.)
-#ifndef MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
-#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support reverse arithmetic operarion methods
-// (__radd__, etc.). Additionally gated by
-// MICROPY_PY_ALL_SPECIAL_METHODS.
-#ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support compile function
-#ifndef MICROPY_PY_BUILTINS_COMPILE
-#define MICROPY_PY_BUILTINS_COMPILE (0)
-#endif
-
-// Whether to support enumerate function(type)
-#ifndef MICROPY_PY_BUILTINS_ENUMERATE
-#define MICROPY_PY_BUILTINS_ENUMERATE (1)
-#endif
-
-// Whether to support eval and exec functions
-// By default they are supported if the compiler is enabled
-#ifndef MICROPY_PY_BUILTINS_EVAL_EXEC
-#define MICROPY_PY_BUILTINS_EVAL_EXEC (MICROPY_ENABLE_COMPILER)
-#endif
-
-// Whether to support the Python 2 execfile function
-#ifndef MICROPY_PY_BUILTINS_EXECFILE
-#define MICROPY_PY_BUILTINS_EXECFILE (0)
-#endif
-
-// Whether to support filter function(type)
-#ifndef MICROPY_PY_BUILTINS_FILTER
-#define MICROPY_PY_BUILTINS_FILTER (1)
-#endif
-
-// Whether to support reversed function(type)
-#ifndef MICROPY_PY_BUILTINS_REVERSED
-#define MICROPY_PY_BUILTINS_REVERSED (1)
-#endif
-
-// Whether to define "NotImplemented" special constant
-#ifndef MICROPY_PY_BUILTINS_NOTIMPLEMENTED
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
-#endif
-
-// Whether to provide the built-in input() function. The implementation of this
-// uses mp-readline, so can only be enabled if the port uses this readline.
-#ifndef MICROPY_PY_BUILTINS_INPUT
-#define MICROPY_PY_BUILTINS_INPUT (0)
-#endif
-
-// Whether to support min/max functions
-#ifndef MICROPY_PY_BUILTINS_MIN_MAX
-#define MICROPY_PY_BUILTINS_MIN_MAX (1)
-#endif
-
-// Support for calls to pow() with 3 integer arguments
-#ifndef MICROPY_PY_BUILTINS_POW3
-#define MICROPY_PY_BUILTINS_POW3 (0)
-#endif
-
-// Whether to provide the help function
-#ifndef MICROPY_PY_BUILTINS_HELP
-#define MICROPY_PY_BUILTINS_HELP (0)
-#endif
-
-// Use this to configure the help text shown for help().  It should be a
-// variable with the type "const char*".  A sensible default is provided.
-#ifndef MICROPY_PY_BUILTINS_HELP_TEXT
-#define MICROPY_PY_BUILTINS_HELP_TEXT mp_help_default_text
-#endif
-
-// Add the ability to list the available modules when executing help('modules')
-#ifndef MICROPY_PY_BUILTINS_HELP_MODULES
-#define MICROPY_PY_BUILTINS_HELP_MODULES (0)
-#endif
-
-// Whether to set __file__ for imported modules
-#ifndef MICROPY_PY___FILE__
-#define MICROPY_PY___FILE__ (1)
-#endif
-
-// Whether to provide mem-info related functions in micropython module
-#ifndef MICROPY_PY_MICROPYTHON_MEM_INFO
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
-#endif
-
-// Whether to provide "micropython.stack_use" function
-#ifndef MICROPY_PY_MICROPYTHON_STACK_USE
-#define MICROPY_PY_MICROPYTHON_STACK_USE (MICROPY_PY_MICROPYTHON_MEM_INFO)
-#endif
-
-// Whether to provide "array" module. Note that large chunk of the
-// underlying code is shared with "bytearray" builtin type, so to
-// get real savings, it should be disabled too.
-#ifndef MICROPY_PY_ARRAY
-#define MICROPY_PY_ARRAY (1)
-#endif
-
-// Whether to support slice assignments for array (and bytearray).
-// This is rarely used, but adds ~0.5K of code.
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (0)
-#endif
-
-// Whether to support attrtuple type (MicroPython extension)
-// It provides space-efficient tuples with attribute access
-#ifndef MICROPY_PY_ATTRTUPLE
-#define MICROPY_PY_ATTRTUPLE (1)
-#endif
-
-// Whether to provide "collections" module
-#ifndef MICROPY_PY_COLLECTIONS
-#define MICROPY_PY_COLLECTIONS (1)
-#endif
-
-// Whether to provide "ucollections.deque" type
-#ifndef MICROPY_PY_COLLECTIONS_DEQUE
-#define MICROPY_PY_COLLECTIONS_DEQUE (0)
-#endif
-
-// Whether to provide "collections.OrderedDict" type
-#ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
-#endif
-
-// Whether to provide the _asdict function for namedtuple
-#ifndef MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT
-#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (0)
-#endif
-
-// Whether to provide "math" module
-#ifndef MICROPY_PY_MATH
-#define MICROPY_PY_MATH (1)
-#endif
-
-// Whether to provide special math functions: math.{erf,erfc,gamma,lgamma}
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
-#endif
-
-// Whether to provide math.factorial function
-#ifndef MICROPY_PY_MATH_FACTORIAL
-#define MICROPY_PY_MATH_FACTORIAL (0)
-#endif
-
-// Whether to provide math.isclose function
-#ifndef MICROPY_PY_MATH_ISCLOSE
-#define MICROPY_PY_MATH_ISCLOSE (0)
-#endif
-
-// Whether to provide "cmath" module
-#ifndef MICROPY_PY_CMATH
-#define MICROPY_PY_CMATH (0)
-#endif
-
-// Whether to provide "gc" module
-#ifndef MICROPY_PY_GC
-#define MICROPY_PY_GC (1)
-#endif
-
-// Whether to return number of collected objects from gc.collect()
-#ifndef MICROPY_PY_GC_COLLECT_RETVAL
-#define MICROPY_PY_GC_COLLECT_RETVAL (0)
-#endif
-
-// Whether to provide "io" module
-#ifndef MICROPY_PY_IO
-#define MICROPY_PY_IO (1)
-#endif
-
-// Whether to provide "io.IOBase" class to support user streams
-#ifndef MICROPY_PY_IO_IOBASE
-#define MICROPY_PY_IO_IOBASE (0)
-#endif
-
-// Whether to provide "uio.resource_stream()" function with
-// the semantics of CPython's pkg_resources.resource_stream()
-// (allows to access binary resources in frozen source packages).
-// Note that the same functionality can be achieved in "pure
-// Python" by prepocessing binary resources into Python source
-// and bytecode-freezing it (with a simple helper module available
-// e.g. in micropython-lib).
-#ifndef MICROPY_PY_IO_RESOURCE_STREAM
-#define MICROPY_PY_IO_RESOURCE_STREAM (0)
-#endif
-
-// Whether to provide "io.FileIO" class
-#ifndef MICROPY_PY_IO_FILEIO
-#define MICROPY_PY_IO_FILEIO (0)
-#endif
-
-// Whether to provide "io.BytesIO" class
-#ifndef MICROPY_PY_IO_BYTESIO
-#define MICROPY_PY_IO_BYTESIO (1)
-#endif
-
-// Whether to provide "io.BufferedWriter" class
-#ifndef MICROPY_PY_IO_BUFFEREDWRITER
-#define MICROPY_PY_IO_BUFFEREDWRITER (0)
-#endif
-
-// Whether to provide "struct" module
-#ifndef MICROPY_PY_STRUCT
-#define MICROPY_PY_STRUCT (1)
-#endif
-
-// Whether to provide "sys" module
-#ifndef MICROPY_PY_SYS
-#define MICROPY_PY_SYS (1)
-#endif
-
-// Whether to provide "sys.maxsize" constant
-#ifndef MICROPY_PY_SYS_MAXSIZE
-#define MICROPY_PY_SYS_MAXSIZE (0)
-#endif
-
-// Whether to provide "sys.modules" dictionary
-#ifndef MICROPY_PY_SYS_MODULES
-#define MICROPY_PY_SYS_MODULES (1)
-#endif
-
-// Whether to provide "sys.exc_info" function
-// Avoid enabling this, this function is Python2 heritage
-#ifndef MICROPY_PY_SYS_EXC_INFO
-#define MICROPY_PY_SYS_EXC_INFO (0)
-#endif
-
-// Whether to provide "sys.exit" function
-#ifndef MICROPY_PY_SYS_EXIT
-#define MICROPY_PY_SYS_EXIT (1)
-#endif
-
-// Whether to provide "sys.atexit" function (MicroPython extension)
-#ifndef MICROPY_PY_SYS_ATEXIT
-#define MICROPY_PY_SYS_ATEXIT (0)
-#endif
-
-// Whether to provide "sys.settrace" function
-#ifndef MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PY_SYS_SETTRACE (0)
-#endif
-
-// Whether to provide "sys.getsizeof" function
-#ifndef MICROPY_PY_SYS_GETSIZEOF
-#define MICROPY_PY_SYS_GETSIZEOF (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr} objects
-#ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr}.buffer object
-// This is implemented per-port
-#ifndef MICROPY_PY_SYS_STDIO_BUFFER
-#define MICROPY_PY_SYS_STDIO_BUFFER (0)
-#endif
-
-// Whether to provide "uerrno" module
-#ifndef MICROPY_PY_UERRNO
-#define MICROPY_PY_UERRNO (0)
-#endif
-
-// Whether to provide the uerrno.errorcode dict
-#ifndef MICROPY_PY_UERRNO_ERRORCODE
-#define MICROPY_PY_UERRNO_ERRORCODE (1)
-#endif
-
-// Whether to provide "uselect" module (baremetal implementation)
-#ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT (0)
-#endif
-
-// Whether to provide "utime" module functions implementation
-// in terms of mp_hal_* functions.
-#ifndef MICROPY_PY_UTIME_MP_HAL
-#define MICROPY_PY_UTIME_MP_HAL (0)
-#endif
-
-// Period of values returned by utime.ticks_ms(), ticks_us(), ticks_cpu()
-// functions. Should be power of two. All functions above use the same
-// period, so if underlying hardware/API has different periods, the
-// minimum of them should be used. The value below is the maximum value
-// this parameter can take (corresponding to 30 bit tick values on 32-bit
-// system).
-#ifndef MICROPY_PY_UTIME_TICKS_PERIOD
-#define MICROPY_PY_UTIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1)
-#endif
-
-// Whether to provide "_thread" module
-#ifndef MICROPY_PY_THREAD
-#define MICROPY_PY_THREAD (0)
-#endif
-
-// Whether to make the VM/runtime thread-safe using a global lock
-// If not enabled then thread safety must be provided at the Python level
-#ifndef MICROPY_PY_THREAD_GIL
-#define MICROPY_PY_THREAD_GIL (MICROPY_PY_THREAD)
-#endif
-
-// Number of VM jump-loops to do before releasing the GIL.
-// Set this to 0 to disable the divisor.
-#ifndef MICROPY_PY_THREAD_GIL_VM_DIVISOR
-#define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32)
-#endif
-
-// Extended modules
-
-#ifndef MICROPY_PY_UCTYPES
-#define MICROPY_PY_UCTYPES (0)
-#endif
-
-// Whether to provide SHORT, INT, LONG, etc. types in addition to
-// exact-bitness types like INT16, INT32, etc.
-#ifndef MICROPY_PY_UCTYPES_NATIVE_C_TYPES
-#define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1)
-#endif
-
-#ifndef MICROPY_PY_UZLIB
-#define MICROPY_PY_UZLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UJSON
-#define MICROPY_PY_UJSON (0)
-#endif
-
-#ifndef MICROPY_PY_URE
-#define MICROPY_PY_URE (0)
-#endif
-
-#ifndef MICROPY_PY_URE_DEBUG
-#define MICROPY_PY_URE_DEBUG (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_GROUPS
-#define MICROPY_PY_URE_MATCH_GROUPS (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_SPAN_START_END
-#define MICROPY_PY_URE_MATCH_SPAN_START_END (0)
-#endif
-
-#ifndef MICROPY_PY_URE_SUB
-#define MICROPY_PY_URE_SUB (0)
-#endif
-
-#ifndef MICROPY_PY_UHEAPQ
-#define MICROPY_PY_UHEAPQ (0)
-#endif
-
-// Optimized heap queue for relative timestamps
-#ifndef MICROPY_PY_UTIMEQ
-#define MICROPY_PY_UTIMEQ (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB
-#define MICROPY_PY_UHASHLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_MD5
-#define MICROPY_PY_UHASHLIB_MD5 (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA1
-#define MICROPY_PY_UHASHLIB_SHA1  (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA256
-#define MICROPY_PY_UHASHLIB_SHA256 (1)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB
-#define MICROPY_PY_UCRYPTOLIB (0)
-#endif
-
-// Depends on MICROPY_PY_UCRYPTOLIB
-#ifndef MICROPY_PY_UCRYPTOLIB_CTR
-#define MICROPY_PY_UCRYPTOLIB_CTR (0)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB_CONSTS
-#define MICROPY_PY_UCRYPTOLIB_CONSTS (0)
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII (0)
-#endif
-
-// Depends on MICROPY_PY_UZLIB
-#ifndef MICROPY_PY_UBINASCII_CRC32
-#define MICROPY_PY_UBINASCII_CRC32 (0)
-#endif
-
-#ifndef MICROPY_PY_URANDOM
-#define MICROPY_PY_URANDOM (0)
-#endif
-
-// Whether to include: randrange, randint, choice, random, uniform
-#ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE
-#define MICROPY_PY_MACHINE (0)
-#endif
-
-// Whether to include: time_pulse_us
-#ifndef MICROPY_PY_MACHINE_PULSE
-#define MICROPY_PY_MACHINE_PULSE (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_I2C
-#define MICROPY_PY_MACHINE_I2C (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_SPI
-#define MICROPY_PY_MACHINE_SPI (0)
-#endif
-
-#ifndef MICROPY_PY_USSL
-#define MICROPY_PY_USSL (0)
-// Whether to add finaliser code to ussl objects
-#define MICROPY_PY_USSL_FINALISER (0)
-#endif
-
-#ifndef MICROPY_PY_UWEBSOCKET
-#define MICROPY_PY_UWEBSOCKET (0)
-#endif
-
-#ifndef MICROPY_PY_FRAMEBUF
-#define MICROPY_PY_FRAMEBUF (0)
-#endif
-
-#ifndef MICROPY_PY_BTREE
-#define MICROPY_PY_BTREE (0)
-#endif
-
-/*****************************************************************************/
-/* Hooks for a port to add builtins                                          */
-
-// Additional builtin function definitions - see modbuiltins.c:mp_module_builtins_globals_table for format.
-#ifndef MICROPY_PORT_BUILTINS
-#define MICROPY_PORT_BUILTINS
-#endif
-
-// Additional builtin module definitions - see objmodule.c:mp_builtin_module_table for format.
-#ifndef MICROPY_PORT_BUILTIN_MODULES
-#define MICROPY_PORT_BUILTIN_MODULES
-#endif
-
-// Additional constant definitions for the compiler - see compile.c:mp_constants_table.
-#ifndef MICROPY_PORT_CONSTANTS
-#define MICROPY_PORT_CONSTANTS
-#endif
-
-// Any root pointers for GC scanning - see mpstate.c
-#ifndef MICROPY_PORT_ROOT_POINTERS
-#define MICROPY_PORT_ROOT_POINTERS
-#endif
-
-/*****************************************************************************/
-/* Miscellaneous settings                                                    */
-
-// All uPy objects in ROM must be aligned on at least a 4 byte boundary
-// so that the small-int/qstr/pointer distinction can be made.  For machines
-// that don't do this (eg 16-bit CPU), define the following macro to something
-// like __attribute__((aligned(4))).
-#ifndef MICROPY_OBJ_BASE_ALIGNMENT
-#define MICROPY_OBJ_BASE_ALIGNMENT
-#endif
-
-// On embedded platforms, these will typically enable/disable irqs.
-#ifndef MICROPY_BEGIN_ATOMIC_SECTION
-#define MICROPY_BEGIN_ATOMIC_SECTION() (0)
-#endif
-#ifndef MICROPY_END_ATOMIC_SECTION
-#define MICROPY_END_ATOMIC_SECTION(state) (void)(state)
-#endif
-
-// Allow to override static modifier for global objects, e.g. to use with
-// object code analysis tools which don't support static symbols.
-#ifndef STATIC
-#define STATIC static
-#endif
-
-// Number of bytes in a word
-#ifndef BYTES_PER_WORD
-#define BYTES_PER_WORD (sizeof(mp_uint_t))
-#endif
-
-#define BITS_PER_BYTE (8)
-#define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD)
-// mp_int_t value with most significant bit set
-#define WORD_MSBIT_HIGH (((mp_uint_t)1) << (BYTES_PER_WORD * 8 - 1))
-
-// Make sure both MP_ENDIANNESS_LITTLE and MP_ENDIANNESS_BIG are
-// defined and that they are the opposite of each other.
-#if defined(MP_ENDIANNESS_LITTLE)
-#define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#elif defined(MP_ENDIANNESS_BIG)
-#define MP_ENDIANNESS_LITTLE (!MP_ENDIANNESS_BIG)
-#else
-  // Endianness not defined by port so try to autodetect it.
-  #if defined(__BYTE_ORDER__)
-    #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (1)
-    #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (0)
-    #endif
-  #else
-    #include <endian.h>
-      #if defined(__BYTE_ORDER)
-        #if __BYTE_ORDER == __LITTLE_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (1)
-        #elif __BYTE_ORDER == __BIG_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (0)
-        #endif
-      #endif
-  #endif
-  #ifndef MP_ENDIANNESS_LITTLE
-    #error endianness not defined and cannot detect it
-  #endif
-  #define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#endif
-
-// Make a pointer to RAM callable (eg set lower bit for Thumb code)
-// (This scheme won't work if we want to mix Thumb and normal ARM code.)
-#ifndef MICROPY_MAKE_POINTER_CALLABLE
-#define MICROPY_MAKE_POINTER_CALLABLE(p) (p)
-#endif
-
-// If these MP_PLAT_*_EXEC macros are overridden then the memory allocated by them
-// must be somehow reachable for marking by the GC, since the native code
-// generators store pointers to GC managed memory in the code.
-#ifndef MP_PLAT_ALLOC_EXEC
-#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) do { *ptr = m_new(byte, min_size); *size = min_size; } while (0)
-#endif
-
-#ifndef MP_PLAT_FREE_EXEC
-#define MP_PLAT_FREE_EXEC(ptr, size) m_del(byte, ptr, size)
-#endif
-
-// This macro is used to do all output (except when MICROPY_PY_IO is defined)
-#ifndef MP_PLAT_PRINT_STRN
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-#endif
-
-#ifndef MP_SSIZE_MAX
-#define MP_SSIZE_MAX SSIZE_MAX
-#endif
-
-// printf format spec to use for mp_int_t and friends
-#ifndef INT_FMT
-#if defined(__LP64__)
-// Archs where mp_int_t == long, long != int
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-#elif defined(_WIN64)
-#define UINT_FMT "%llu"
-#define INT_FMT "%lld"
-#else
-// Archs where mp_int_t == int
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-#endif
-#endif //INT_FMT
-
-// Modifier for function which doesn't return
-#ifndef NORETURN
-#define NORETURN __attribute__((noreturn))
-#endif
-
-// Modifier for weak functions
-#ifndef MP_WEAK
-#define MP_WEAK __attribute__((weak))
-#endif
-
-// Modifier for functions which should be never inlined
-#ifndef MP_NOINLINE
-#define MP_NOINLINE __attribute__((noinline))
-#endif
-
-// Modifier for functions which should be always inlined
-#ifndef MP_ALWAYSINLINE
-#define MP_ALWAYSINLINE __attribute__((always_inline))
-#endif
-
-// Condition is likely to be true, to help branch prediction
-#ifndef MP_LIKELY
-#define MP_LIKELY(x) __builtin_expect((x), 1)
-#endif
-
-// Condition is likely to be false, to help branch prediction
-#ifndef MP_UNLIKELY
-#define MP_UNLIKELY(x) __builtin_expect((x), 0)
-#endif
-
-// To annotate that code is unreachable
-#ifndef MP_UNREACHABLE
-#if defined(__GNUC__)
-#define MP_UNREACHABLE __builtin_unreachable();
-#else
-#define MP_UNREACHABLE for (;;);
-#endif
-#endif
-
-#ifndef MP_HTOBE16
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE16(x) ((uint16_t)( (((x) & 0xff) << 8) | (((x) >> 8) & 0xff) ))
-# define MP_BE16TOH(x) MP_HTOBE16(x)
-#else
-# define MP_HTOBE16(x) (x)
-# define MP_BE16TOH(x) (x)
-#endif
-#endif
-
-#ifndef MP_HTOBE32
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE32(x) ((uint32_t)( (((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) >> 8)  & 0xff00) | (((x) >> 24) & 0xff) ))
-# define MP_BE32TOH(x) MP_HTOBE32(x)
-#else
-# define MP_HTOBE32(x) (x)
-# define MP_BE32TOH(x) (x)
-#endif
-#endif
-
-// Warning categories are by default implemented as strings, though
-// hook is left for a port to define them as something else.
-#if MICROPY_WARNINGS_CATEGORY
-# ifndef MP_WARN_CAT
-# define MP_WARN_CAT(x) #x
-# endif
-#else
-# undef MP_WARN_CAT
-# define MP_WARN_CAT(x) (NULL)
-#endif
-
-// Feature dependency check.
-#if MICROPY_PY_SYS_SETTRACE
-#if !MICROPY_PERSISTENT_CODE_SAVE
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_PERSISTENT_CODE_SAVE to be enabled"
-#endif
-#if MICROPY_COMP_CONST
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_COMP_CONST to be disabled"
-#endif
-#endif
-
-#endif // MICROPY_INCLUDED_PY_MPCONFIG_H
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/mpconfigport.h~ b/apps/KhiCAS/src/micropython-1.12/numworks/mpconfigport.h~
deleted file mode 100644
index 297208105..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/mpconfigport.h~
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-int micropython_port_vm_hook_loop() ;
-// options to control how Micro Python is built
-#define MICROPY_VM_HOOK_LOOP micropython_port_vm_hook_loop();
-
-#define MICROPY_ALLOC_PATH_MAX      (128)
-#define MICROPY_EMIT_ARM            (1)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_COMPILE (1)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_PLATFORM     "numworks"
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO_FILEIO        (0)
-#define MICROPY_PY_GC_COLLECT_RETVAL (1)
-#define MICROPY_COMP_MODULE_CONST   (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
-#define MICROPY_STACK_CHECK         (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_REPL_AUTO_INDENT    (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_USE_INTERNAL_PRINTF (0)
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_DESCRIPTORS      (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_SYS_EXC_INFO     (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#define MICROPY_MODULE_FROZEN       (0)
-#define MICROPY_STACKLESS           (0)
-#define MICROPY_STACKLESS_STRICT    (0)
-#define MICROPY_PY_UZLIB            (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_UHEAPQ           (1)
-#define MICROPY_PY_UHASHLIB         (1)
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_MACHINE          (1)
-#define MICROPY_WARNINGS            (1)
-
-#define MICROPY_PY_UCTYPES          (1)
-
-// Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.
-// names in exception messages (may require more RAM).
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
-// Define to 1 to use untested inefficient GC helper implementation
-// (if more efficient arch-specific one is not available).
-#ifndef MICROPY_GCREGS_SETJMP
-#define MICROPY_GCREGS_SETJMP       (0)
-#endif
-
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (128)
-int micropython_port_vm_hook_loop();
-
-#define MICROPY_VM_HOOK_LOOP micropython_port_vm_hook_loop();
-#define MICROPY_KBD_EXCEPTION (1)
-
-extern const struct _mp_obj_module_t mp_module_os;
-extern const struct _mp_obj_module_t mp_module_nsp;
-extern const struct _mp_obj_module_t mp_module_graphic;
-extern const struct _mp_obj_module_t mp_module_cas;
-extern const struct _mp_obj_module_t mp_module_arit;
-extern const struct _mp_obj_module_t mp_module_turtle;
-extern const struct _mp_obj_module_t mp_module_matplotl;
-extern const struct _mp_obj_module_t mp_module_linalg;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-	{ MP_ROM_QSTR(MP_QSTR__os), (mp_obj_t) &mp_module_os }, \
-	{ MP_ROM_QSTR(MP_QSTR_nsp), (mp_obj_t) &mp_module_nsp }, \
-	{ MP_ROM_QSTR(MP_QSTR_time), (mp_obj_t) &mp_module_nsp }, \
-	{ MP_ROM_QSTR(MP_QSTR_cas), (mp_obj_t) &mp_module_cas }, \
-	{ MP_ROM_QSTR(MP_QSTR_xcas), (mp_obj_t) &mp_module_cas }, \
-	{ MP_ROM_QSTR(MP_QSTR_arit), (mp_obj_t) &mp_module_arit }, \
-	{ MP_ROM_QSTR(MP_QSTR_linalg), (mp_obj_t) &mp_module_linalg }, \
-	{ MP_ROM_QSTR(MP_QSTR_matplotl), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_matplotlib), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_pylab), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_pyplot), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_turtle), (mp_obj_t) &mp_module_turtle }, \
-	{ MP_ROM_QSTR(MP_QSTR_casioplot), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_ROM_QSTR(MP_QSTR_kandinsky), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_ROM_QSTR(MP_QSTR_graphic), (mp_obj_t) &mp_module_graphic }
-
-#ifdef __x86_64__
-typedef long mp_int_t;
-typedef unsigned long mp_uint_t;
-typedef long mp_off_t;
-#else
-typedef int mp_int_t;
-typedef unsigned int mp_uint_t;
-typedef long mp_off_t;
-#endif
-
-#define BYTES_PER_WORD sizeof(mp_int_t)
-#define MP_SSIZE_MAX INT_MAX
-
-typedef void *machine_ptr_t; // must be of pointer size
-typedef const void *machine_const_ptr_t; // must be of pointer size
-
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
-    { MP_ROM_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
-
-#include <alloca.h>
diff --git a/apps/KhiCAS/src/micropython-1.12/numworks/mphalport.h~ b/apps/KhiCAS/src/micropython-1.12/numworks/mphalport.h~
deleted file mode 100644
index b308e5e41..000000000
--- a/apps/KhiCAS/src/micropython-1.12/numworks/mphalport.h~
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#include <unistd.h>
-
-#ifndef CHAR_CTRL_C
-#define CHAR_CTRL_C (3)
-#endif
-
-static inline void mp_hal_delay_ms(mp_uint_t ms) { usleep((ms) * 1000); }
-
-#define RAISE_ERRNO(err_flag, error_val) \
-    { if (err_flag == -1) \
-        { nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_val))); } }
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/Makefile~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/Makefile~
deleted file mode 100644
index 3dbcd3b61..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/Makefile~
+++ /dev/null
@@ -1,75 +0,0 @@
-include ../../py/mkenv.mk
-
-CROSS = 0
-
-QSTR_DEFS = qstrdefsport.h
-
-include $(TOP)/py/py.mk
-
-CC = emcc -g4
-LD = emcc -g4
-
-INC += -I.
-INC += -I../../py
-INC += -I$(TOP)
-INC += -I$(BUILD)
-
-CPP = clang -E
-
-ifdef EMSCRIPTEN
-    CPP += -isystem $(EMSCRIPTEN)/system/include/libc -cxx-isystem $(EMSCRIPTEN)/system/include/libcxx
-else
-	EMCC=/home/parisse/emsdk/fastcomp/emscripten
-	CPP += -I$(EMCC)/system/include/libc -I$(EMCC)/system/include/libcxx
-endif
-
-CFLAGS = -m32 -Wall -Werror $(INC)  $(COPT)
-LDFLAGS = -m32 -Wl,-Map=$@.map,--cref -Wl,--gc-sections -s ERROR_ON_UNDEFINED_SYMBOLS=0
-
-CFLAGS += -O0 -DNDEBUG -DMICROPY_LIB -DEMCC
-CFLAGS += -fdata-sections -ffunction-sections
-
-ifneq ($(FROZEN_MPY_DIR),)
-# To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
-# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
-CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
-endif
-
-SRC_LIB = $(addprefix lib/,\
-	utils/interrupt_char.c \
-	utils/stdout_helpers.c \
-	utils/pyexec.c \
-	mp-readline/readline.c \
-	)
-
-SRC_C = \
-	main.c \
-	mphalport.c \
-	modutime.c \
-	graphic.c \
-
-SRC_QSTR += $(SRC_C)
-
-OBJ = 
-OBJ = $(PY_O) 
-OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-
-JSFLAGS = -O0 -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s "BINARYEN_TRAP_MODE='clamp'" --memory-init-file 0 --js-library library.js
-
-all: $(BUILD)/micropython.js
-
-$(BUILD)/micropython.js: $(OBJ) library.js wrapper.js
-	$(ECHO) "LINK $(BUILD)/firmware.js"
-	$(Q)emcc $(LDFLAGS) -o $(BUILD)/firmware.js $(OBJ) $(JSFLAGS)
-	cat wrapper.js $(BUILD)/firmware.js > $@
-
-min: $(BUILD)/micropython.js
-	uglifyjs $< -c -o $(BUILD)/micropython.min.js
-
-test: $(BUILD)/micropython.js $(TOP)/tests/run-tests
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests
-
-include $(TOP)/py/mkrules.mk
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/file.c~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/file.c~
deleted file mode 100644
index 87538a0a9..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/file.c~
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "py/nlr.h"
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/builtin.h"
-#include "py/mphal.h"
-#include "fdfile.h"
-
-#if MICROPY_PY_IO
-
-#ifdef _WIN32
-#define fsync _commit
-#endif
-
-#ifdef MICROPY_CPYTHON_COMPAT
-STATIC void check_fd_is_open(const mp_obj_fdfile_t *o) {
-    if (o->fd < 0) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "I/O operation on closed file"));
-    }
-}
-#else
-#define check_fd_is_open(o)
-#endif
-
-extern const mp_obj_type_t mp_type_fileio;
-extern const mp_obj_type_t mp_type_textio;
-
-STATIC void fdfile_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<io.%s %d>", mp_obj_get_type_str(self_in), self->fd);
-}
-
-STATIC mp_uint_t fdfile_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-    mp_int_t r = read(o->fd, buf, size);
-    if (r == -1) {
-        *errcode = errno;
-        return MP_STREAM_ERROR;
-    }
-    return r;
-}
-
-STATIC mp_uint_t fdfile_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-#if defined MICROPY_LIB || MICROPY_PY_OS_DUPTERM
-    if (o->fd <= STDERR_FILENO) {
-        mp_hal_stdout_tx_strn(buf, size);
-        return size;
-    }
-#endif
-    mp_int_t r = write(o->fd, buf, size);
-    while (r == -1 && errno == EINTR) {
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
-        }
-        r = write(o->fd, buf, size);
-    }
-    if (r == -1) {
-        *errcode = errno;
-        return MP_STREAM_ERROR;
-    }
-    return r;
-}
-
-STATIC mp_uint_t fdfile_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-    switch (request) {
-        case MP_STREAM_SEEK: {
-            struct mp_stream_seek_t *s = (struct mp_stream_seek_t*)arg;
-            off_t off = lseek(o->fd, s->offset, s->whence);
-            if (off == (off_t)-1) {
-                *errcode = errno;
-                return MP_STREAM_ERROR;
-            }
-            s->offset = off;
-            return 0;
-        }
-        case MP_STREAM_FLUSH:
-            return 0;
-        default:
-            *errcode = EINVAL;
-            return MP_STREAM_ERROR;
-    }
-}
-
-STATIC mp_obj_t fdfile_close(mp_obj_t self_in) {
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    close(self->fd);
-#ifdef MICROPY_CPYTHON_COMPAT
-    self->fd = -1;
-#endif
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fdfile_close_obj, fdfile_close);
-
-STATIC mp_obj_t fdfile___exit__(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    return fdfile_close(args[0]);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fdfile___exit___obj, 4, 4, fdfile___exit__);
-
-STATIC mp_obj_t fdfile_fileno(mp_obj_t self_in) {
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    check_fd_is_open(self);
-    return MP_OBJ_NEW_SMALL_INT(self->fd);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fdfile_fileno_obj, fdfile_fileno);
-
-// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
-// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
-STATIC const mp_arg_t file_open_args[] = {
-    { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-    { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
-    { MP_QSTR_buffering, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-    { MP_QSTR_encoding, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-};
-#define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
-
-STATIC mp_obj_t fdfile_open(const mp_obj_type_t *type, mp_arg_val_t *args) {
-    mp_obj_fdfile_t *o = m_new_obj(mp_obj_fdfile_t);
-    const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
-
-    int mode_rw = 0, mode_x = 0;
-    while (*mode_s) {
-        switch (*mode_s++) {
-            case 'r':
-                mode_rw = O_RDONLY;
-                break;
-            case 'w':
-                mode_rw = O_WRONLY;
-                mode_x = O_CREAT | O_TRUNC;
-                break;
-            case 'a':
-                mode_rw = O_WRONLY;
-                mode_x = O_CREAT | O_APPEND;
-                break;
-            case '+':
-                mode_rw = O_RDWR;
-                break;
-            #if MICROPY_PY_IO_FILEIO
-            // If we don't have io.FileIO, then files are in text mode implicitly
-            case 'b':
-                type = &mp_type_fileio;
-                break;
-            case 't':
-                type = &mp_type_textio;
-                break;
-            #endif
-        }
-    }
-
-    o->base.type = type;
-
-    mp_obj_t fid = args[0].u_obj;
-
-    if (MP_OBJ_IS_SMALL_INT(fid)) {
-        o->fd = MP_OBJ_SMALL_INT_VALUE(fid);
-        return MP_OBJ_FROM_PTR(o);
-    }
-
-    const char *fname = mp_obj_str_get_str(fid);
-    int fd = open(fname, mode_x | mode_rw, 0644);
-    if (fd == -1) {
-        mp_raise_OSError(errno);
-    }
-    o->fd = fd;
-    return MP_OBJ_FROM_PTR(o);
-}
-
-STATIC mp_obj_t fdfile_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
-    mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
-    return fdfile_open(type, arg_vals);
-}
-
-STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_fileno), MP_ROM_PTR(&fdfile_fileno_obj) },
-    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) },
-    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) },
-    { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
-    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&fdfile_close_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&fdfile___exit___obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
-
-#if MICROPY_PY_IO_FILEIO
-STATIC const mp_stream_p_t fileio_stream_p = {
-    .read = fdfile_read,
-    .write = fdfile_write,
-    .ioctl = fdfile_ioctl,
-};
-
-const mp_obj_type_t mp_type_fileio = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = fdfile_print,
-    .make_new = fdfile_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
-};
-#endif
-
-STATIC const mp_stream_p_t textio_stream_p = {
-    .read = fdfile_read,
-    .write = fdfile_write,
-    .ioctl = fdfile_ioctl,
-    .is_text = true,
-};
-
-const mp_obj_type_t mp_type_textio = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIOWrapper,
-    .print = fdfile_print,
-    .make_new = fdfile_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &textio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
-};
-
-
-const mp_obj_fdfile_t mp_sys_stdin_obj  = { .base = {&mp_type_textio}, .fd = STDIN_FILENO };
-const mp_obj_fdfile_t mp_sys_stdout_obj = { .base = {&mp_type_textio}, .fd = STDOUT_FILENO };
-const mp_obj_fdfile_t mp_sys_stderr_obj = { .base = {&mp_type_textio}, .fd = STDERR_FILENO };
-
-#endif // MICROPY_PY_IO
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/library.js~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/library.js~
deleted file mode 100644
index 9aab3e432..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/library.js~
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017, 2018 Rami Ali
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-mergeInto(LibraryManager.library, {
-    mp_js_write: function(ptr, len) {
-        for (var i = 0; i < len; ++i) {
-            if (typeof window === 'undefined') {
-                var b = Buffer.alloc(1);
-                b.writeInt8(getValue(ptr + i, 'i8'));
-                process.stdout.write(b);
-            } else {
-                var c = String.fromCharCode(getValue(ptr + i, 'i8'));
-                var mp_js_stdout = document.getElementById('mp_js_stdout');
-                var print = new Event('print');
-                print.data = c;
-                mp_js_stdout.dispatchEvent(print);
-            }
-        }
-    },
-
-    mp_js_ticks_ms: function() {
-        return (new Date()).getTime() - MP_JS_EPOCH;
-    },
-
-    mp_js_hook: function() {
-        if (typeof window === 'undefined') {
-            var mp_interrupt_char = Module.ccall('mp_hal_get_interrupt_char', 'number', ['number'], ['null']);
-            var fs = require('fs');
-
-            var buf = Buffer.alloc(1);
-            try {
-                var n = fs.readSync(process.stdin.fd, buf, 0, 1);
-                if (n > 0) {
-                    if (buf[0] == mp_interrupt_char) {
-                        Module.ccall('mp_keyboard_interrupt', 'null', ['null'], ['null']);
-                    } else {
-                        process.stdout.write(String.fromCharCode(buf[0]));
-                    }
-                }
-            } catch (e) {
-                if (e.code === 'EAGAIN') {
-                } else {
-                    throw e;
-                }
-            }
-        }
-    },
-});
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/main.c~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/main.c~
deleted file mode 100644
index c53d72ed3..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/main.c~
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George and 2017, 2018 Rami Ali
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/repl.h"
-#include "py/gc.h"
-#include "py/mperrno.h"
-#include "lib/utils/pyexec.h"
-
-#include "library.h"
-#if defined EMCC && !defined NO_QSTR
-#include <emscripten.h>
-#endif
-
-#if MICROPY_ENABLE_COMPILER
-int do_str(const char *src, mp_parse_input_kind_t input_kind) {
-    int ret = 0;
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
-        qstr source_name = lex->source_name;
-        mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
-        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, false);
-        mp_call_function_0(module_fun);
-        nlr_pop();
-    } else {
-        // uncaught exception
-        if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_SystemExit)) {
-            mp_obj_t exit_val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val));
-            if (exit_val != mp_const_none) {
-                mp_int_t int_val;
-                if (mp_obj_get_int_maybe(exit_val, &int_val)) {
-                    ret = int_val & 255;
-                } else {
-                    ret = 1;
-                }
-            }
-        } else {
-            mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
-            ret = 1;
-        }
-    }
-    return ret;
-}
-#endif
-
-static char *stack_top;
-
-int mp_js_do_str(const char *code) {
-  EM_ASM_ARGS({
-      var msg = UTF8ToString($0);
-      console.log(msg);
-    },code);
-  
-  return do_str(code, MP_PARSE_FILE_INPUT);
-}
-
-int mp_js_process_char(int c) {
-    return pyexec_event_repl_process_char(c);
-}
-
-void mp_js_init(int heap_size) {
-    int stack_dummy;
-    stack_top = (char*)&stack_dummy;
-
-    #if MICROPY_ENABLE_GC
-    char *heap = (char*)malloc(heap_size * sizeof(char));
-    gc_init(heap, heap + heap_size);
-    #endif
-
-    #if MICROPY_ENABLE_PYSTACK
-    static mp_obj_t pystack[1024];
-    mp_pystack_init(pystack, &pystack[MP_ARRAY_SIZE(pystack)]);
-    #endif
-
-    mp_init();
-    
-    mp_obj_list_init(mp_sys_path, 0);
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
-    mp_obj_list_init(mp_sys_argv, 0);
-}
-
-void mp_js_init_repl() {
-    pyexec_event_repl_init();
-}
-
-void gc_collect(void) {
-    // WARNING: This gc_collect implementation doesn't try to get root
-    // pointers from CPU registers, and thus may function incorrectly.
-    jmp_buf dummy;
-    if (setjmp(dummy) == 0) {
-        longjmp(dummy, 1);
-    }
-    gc_collect_start();
-    gc_collect_root((void*)stack_top, ((mp_uint_t)(void*)(&dummy + 1) - (mp_uint_t)stack_top) / sizeof(mp_uint_t));
-    gc_collect_end();
-}
-
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
-void nlr_jump_fail(void *val) {
-    while (1);
-}
-
-void NORETURN __fatal_error(const char *msg) {
-    while (1);
-}
-
-#ifndef NDEBUG
-void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
-    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
-    __fatal_error("Assertion failed");
-}
-#endif
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/mklib~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/mklib~
deleted file mode 100644
index ad26ceb2e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/mklib~
+++ /dev/null
@@ -1,4 +0,0 @@
-# /bin/bash
-make V=1
-emar cru libmicropy.a build/py/mpstate.o build/py/nlr.o build/py/nlrx86.o build/py/nlrx64.o build/py/nlrthumb.o build/py/nlrpowerpc.o build/py/nlrxtensa.o build/py/nlrsetjmp.o build/py/malloc.o build/py/gc.o build/py/pystack.o build/py/qstr.o build/py/vstr.o build/py/mpprint.o build/py/unicode.o build/py/mpz.o build/py/reader.o build/py/lexer.o build/py/parse.o build/py/scope.o build/py/compile.o build/py/emitcommon.o build/py/emitbc.o build/py/asmbase.o build/py/asmx64.o build/py/emitnx64.o build/py/asmx86.o build/py/emitnx86.o build/py/asmthumb.o build/py/emitnthumb.o build/py/emitinlinethumb.o build/py/asmarm.o build/py/emitnarm.o build/py/asmxtensa.o build/py/emitnxtensa.o build/py/emitinlinextensa.o build/py/emitnxtensawin.o build/py/formatfloat.o build/py/parsenumbase.o build/py/parsenum.o build/py/emitglue.o build/py/persistentcode.o build/py/runtime.o build/py/runtime_utils.o build/py/scheduler.o build/py/nativeglue.o build/py/ringbuf.o build/py/stackctrl.o build/py/argcheck.o build/py/warning.o build/py/profile.o build/py/map.o build/py/obj.o build/py/objarray.o build/py/objattrtuple.o build/py/objbool.o build/py/objboundmeth.o build/py/objcell.o build/py/objclosure.o build/py/objcomplex.o build/py/objdeque.o build/py/objdict.o build/py/objenumerate.o build/py/objexcept.o build/py/objfilter.o build/py/objfloat.o build/py/objfun.o build/py/objgenerator.o build/py/objgetitemiter.o build/py/objint.o build/py/objint_longlong.o build/py/objint_mpz.o build/py/objlist.o build/py/objmap.o build/py/objmodule.o build/py/objobject.o build/py/objpolyiter.o build/py/objproperty.o build/py/objnone.o build/py/objnamedtuple.o build/py/objrange.o build/py/objreversed.o build/py/objset.o build/py/objsingleton.o build/py/objslice.o build/py/objstr.o build/py/objstrunicode.o build/py/objstringio.o build/py/objtuple.o build/py/objtype.o build/py/objzip.o build/py/opmethods.o build/py/sequence.o build/py/stream.o build/py/binary.o build/py/builtinimport.o build/py/builtinevex.o build/py/builtinhelp.o build/py/modarray.o build/py/modbuiltins.o build/py/modcollections.o build/py/modgc.o build/py/modio.o build/py/modmath.o build/py/modcmath.o build/py/modmicropython.o build/py/modstruct.o build/py/modsys.o build/py/moduerrno.o build/py/modthread.o build/py/vm.o build/py/bc.o build/py/showbc.o build/py/repl.o build/py/smallint.o build/py/frozenmod.o build/extmod/moductypes.o build/extmod/modujson.o build/extmod/modure.o build/extmod/moduzlib.o build/extmod/moduheapq.o build/extmod/modutimeq.o build/extmod/moduhashlib.o build/extmod/moducryptolib.o build/extmod/modubinascii.o build/extmod/virtpin.o build/extmod/machine_mem.o build/extmod/machine_pinbase.o build/extmod/machine_signal.o build/extmod/machine_pulse.o build/extmod/machine_i2c.o build/extmod/machine_spi.o build/extmod/modbluetooth.o build/extmod/modussl_axtls.o build/extmod/modussl_mbedtls.o build/extmod/modurandom.o build/extmod/moduselect.o build/extmod/moduwebsocket.o build/extmod/modwebrepl.o build/extmod/modframebuf.o build/extmod/vfs.o build/extmod/vfs_blockdev.o build/extmod/vfs_reader.o build/extmod/vfs_posix.o build/extmod/vfs_posix_file.o build/extmod/vfs_fat.o build/extmod/vfs_fat_diskio.o build/extmod/vfs_fat_file.o build/extmod/vfs_lfs.o build/extmod/utime_mphal.o build/extmod/uos_dupterm.o build/lib/embed/abort_.o build/lib/utils/printf.o  build/lib/utils/interrupt_char.o build/lib/utils/stdout_helpers.o build/lib/utils/pyexec.o build/lib/mp-readline/readline.o build/main.o build/mphalport.o build/modutime.o build/graphic.o # build/file.o
-/bin/cp libmicropy.a ../../../giac
\ No newline at end of file
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/modutime.c~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/modutime.c~
deleted file mode 100644
index 6c6bdcfa2..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/modutime.c~
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George and 2017, 2018 Rami Ali
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "mphalport.h"
-#include "py/nlr.h"
-#include "py/smallint.h"
-#include "py/obj.h"
-#include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
-#include "extmod/utime_mphal.h"
-
-STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
-
-    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
-
-const mp_obj_module_t mp_module_utime = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&time_module_globals,
-};
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/mpconfigport.h~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/mpconfigport.h~
deleted file mode 100644
index ff0d17b9c..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/mpconfigport.h~
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George and 2017, 2018 Rami Ali
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-
-// options to control how MicroPython is built
-
-// You can disable the built-in MicroPython compiler by setting the following
-// config option to 0.  If you do this then you won't get a REPL prompt, but you
-// will still be able to execute pre-compiled scripts, compiled with mpy-cross.
-#define MICROPY_ENABLE_COMPILER     (1)
-
-#define MICROPY_QSTR_BYTES_IN_HASH  (2)
-#define MICROPY_ALLOC_PATH_MAX      (256)
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (16)
-#define MICROPY_EMIT_X64            (0) //BROKEN
-#define MICROPY_EMIT_THUMB          (0) //BROKEN
-#define MICROPY_EMIT_INLINE_THUMB   (0)
-#define MICROPY_COMP_MODULE_CONST   (0)
-#define MICROPY_COMP_CONST          (1)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#define MICROPY_MEM_STATS           (0) //BROKEN
-#define MICROPY_DEBUG_PRINTERS      (0)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_GC_ALLOC_THRESHOLD  (1)
-#define MICROPY_GC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_REPL_EVENT_DRIVEN   (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (0)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
-#define MICROPY_ENABLE_DOC_STRING   (1)
-#define MICROPY_WARNINGS            (1)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
-#define MICROPY_PY_ASYNC_AWAIT      (1)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_ENUMERATE (1)
-#define MICROPY_PY_BUILTINS_FILTER  (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_REVERSED (1)
-#define MICROPY_PY_BUILTINS_SET     (1)
-#define MICROPY_PY_BUILTINS_SLICE   (1)
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX (1)
-#define MICROPY_PY___FILE__         (1)
-#define MICROPY_PY_GC               (1)
-#define MICROPY_PY_ARRAY            (1)
-#define MICROPY_PY_ATTRTUPLE        (1)
-#define MICROPY_PY_COLLECTIONS      (1)
-#define MICROPY_PY_MATH             (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#define MICROPY_PY_MATH_ISCLOSE     (1)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (1)
-#define MICROPY_PY_SYS              (1)
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_CPYTHON_COMPAT      (1)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
-
-#define MICROPY_USE_INTERNAL_PRINTF (0)
-#define MICROPY_ENABLE_PYSTACK      (1)
-#define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_REPL_AUTO_INDENT    (1)
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_BUILTINS_COMPILE (1)
-#define MICROPY_PY_BUILTINS_EXECFILE (1)
-#define MICROPY_PY_BUILTINS_INPUT (1)
-#define MICROPY_PY_BUILTINS_POW3 (1)
-#define MICROPY_PY_BUILTINS_HELP (1)
-#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_SYS_PLATFORM     "javascript"
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_UZLIB            (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_UHEAPQ           (1)
-#define MICROPY_PY_UHASHLIB         (1)
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_URANDOM          (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
-#define MICROPY_PY_USELECT          (1)
-#define MICROPY_PY_FRAMEBUF         (1)
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#define MICROPY_MODULE_WEAK_LINKS   (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_USE_INTERNAL_ERRNO  (1)
-#define MICROPY_ENABLE_SCHEDULER    (1)
-#define MICROPY_SCHEDULER_DEPTH     (1)
-
-#define MP_SSIZE_MAX (0x7fffffff)
-
-extern const struct _mp_obj_module_t mp_module_utime;
-
-
-//#define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
-#if MICROPY_PY_THREAD
-#define MICROPY_EVENT_POLL_HOOK \
-    do { \
-        extern void mp_handle_pending(void); \
-        mp_handle_pending(); \
-        if (pyb_thread_enabled) { \
-            MP_THREAD_GIL_EXIT(); \
-            pyb_thread_yield(); \
-            MP_THREAD_GIL_ENTER(); \
-        } else { \
-        } \
-    } while (0);
-
-#define MICROPY_THREAD_YIELD() pyb_thread_yield()
-#else
-#define MICROPY_EVENT_POLL_HOOK \
-    do { \
-        extern void mp_handle_pending(void); \
-        mp_handle_pending(); \
-    } while (0);
-
-#define MICROPY_THREAD_YIELD()
-#endif
-
-#define MICROPY_VM_HOOK_COUNT (10)
-#define MICROPY_VM_HOOK_INIT static uint vm_hook_divisor = MICROPY_VM_HOOK_COUNT;
-#define MICROPY_VM_HOOK_POLL if (--vm_hook_divisor == 0) { \
-        vm_hook_divisor = MICROPY_VM_HOOK_COUNT; \
-        extern void mp_js_hook(void); \
-        mp_js_hook(); \
-    }
-#define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
-#define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
-
-// type definitions for the specific machine
-
-//#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
-
-// This port is intended to be 32-bit, but unfortunately, int32_t for
-// different targets may be defined in different ways - either as int
-// or as long. This requires different printf formatting specifiers
-// to print such value. So, we avoid int32_t and use int directly.
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-typedef int mp_int_t; // must be pointer size
-typedef unsigned mp_uint_t; // must be pointer size
-typedef long mp_off_t;
-
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
-// We need to provide a declaration/definition of alloca()
-#include <alloca.h>
-
-#define MICROPY_HW_BOARD_NAME "JS"
-#define MICROPY_HW_MCU_NAME "Emscripten"
-
-#define MP_STATE_PORT MP_STATE_VM
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
-
-
-extern const struct _mp_obj_module_t mp_module_graphic;
-extern const struct _mp_obj_module_t mp_module_cas;
-extern const struct _mp_obj_module_t mp_module_turtle;
-extern const struct _mp_obj_module_t mp_module_matplotl;
-extern const struct _mp_obj_module_t mp_module_linalg;
-extern const struct _mp_obj_module_t mp_module_arit;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-  { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) },	       \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_cas), (mp_obj_t) &mp_module_cas },   \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_arit), (mp_obj_t) &mp_module_arit },	\
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_linalg), (mp_obj_t) &mp_module_linalg }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_matplotl), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_matplotlib), (mp_obj_t) &mp_module_matplotl }, \
-        { MP_OBJ_NEW_QSTR(MP_QSTR_matplotlib_dot_pyplot), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_pylab), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_turtle), (mp_obj_t) &mp_module_turtle }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_casioplot), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_kandinsky), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_graphic), (mp_obj_t) &mp_module_graphic }
-
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/javascript/mphalport.c~ b/apps/KhiCAS/src/micropython-1.12/ports/javascript/mphalport.c~
deleted file mode 100644
index 114aa5b50..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/javascript/mphalport.c~
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George and 2017, 2018 Rami Ali
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "library.h"
-#include "mphalport.h"
-#if defined EMCC && !defined NO_QSTR
-#include <emscripten.h>
-#endif
-
-void console_output(const char *s,int i){
-  EM_ASM_ARGS({
-      var text = UTF8ToString($0); // Convert message to JS string
-      text=text.substr(0,$1);
-      UI.add_python_output(text);
-      text=UI.clean_for_html(text);
-      var tmp=document.getElementById('consolediv');
-      if (tmp.style.display != 'block') {
-	tmp.style.display = 'block';
-	UI.set_config_width();
-      }
-      var element=document.getElementById('output');
-      element.style.display = 'inherit';
-      element.innerHTML += text; // element.value += text + "\n";
-      element.scrollTop = 99999; // focus on bottom      
-      // Module.print(text);
-    },s,i);
-}
-
-void mp_hal_stdout_tx_strn(const char *str, size_t len) {
-  console_output(str,len);
-  //mp_js_write(str, len);
-}
-
-void mp_hal_delay_ms(mp_uint_t ms) {
-    uint32_t start = mp_hal_ticks_ms();
-    while (mp_hal_ticks_ms() - start < ms) {
-    }
-}
-
-void mp_hal_delay_us(mp_uint_t us) {
-    uint32_t start = mp_hal_ticks_us();
-    while (mp_hal_ticks_us() - start < us) {
-    }
-}
-
-mp_uint_t mp_hal_ticks_us(void) {
-    return mp_js_ticks_ms() * 1000;
-}
-
-mp_uint_t mp_hal_ticks_ms(void) {
-    return mp_js_ticks_ms();
-}
-
-mp_uint_t mp_hal_ticks_cpu(void) {
-    return 0;
-}
-
-extern int mp_interrupt_char;
-
-int mp_hal_get_interrupt_char(void) {
-    return mp_interrupt_char;
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/unix/Makefile~ b/apps/KhiCAS/src/micropython-1.12/ports/unix/Makefile~
deleted file mode 100644
index 2fa1373e7..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/unix/Makefile~
+++ /dev/null
@@ -1,295 +0,0 @@
--include mpconfigport.mk
-include ../../py/mkenv.mk
-
-# use FROZEN_MANIFEST for new projects, others are legacy
-FROZEN_MANIFEST ?= manifest.py
-FROZEN_DIR =
-FROZEN_MPY_DIR =
-
-# define main target
-PROG = micropython
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# OS name, for simple autoconfig
-UNAME_S := $(shell uname -s)
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-GIT_SUBMODULES = lib/axtls lib/berkeley-db-1.xx lib/libffi
-
-INC +=  -I.
-INC +=  -I$(TOP)
-INC += -I$(BUILD)
-
-# compiler settings
-CWARN = -Wall -Werror
-CWARN += -Wpointer-arith -Wuninitialized
-CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-
-# Debugging/Optimization
-ifdef DEBUG
-CFLAGS += -g
-COPT = -O0
-else
-COPT = -Os -fdata-sections -ffunction-sections -DNDEBUG
-# _FORTIFY_SOURCE is a feature in gcc/glibc which is intended to provide extra
-# security for detecting buffer overflows. Some distros (Ubuntu at the very least)
-# have it enabled by default.
-#
-# gcc already optimizes some printf calls to call puts and/or putchar. When
-# _FORTIFY_SOURCE is enabled and compiling with -O1 or greater, then some
-# printf calls will also be optimized to call __printf_chk (in glibc). Any
-# printfs which get redirected to __printf_chk are then no longer synchronized
-# with printfs that go through mp_printf.
-#
-# In MicroPython, we don't want to use the runtime library's printf but rather
-# go through mp_printf, so that stdout is properly tied into streams, etc.
-# This means that we either need to turn off _FORTIFY_SOURCE or provide our
-# own implementation of __printf_chk. We've chosen to turn off _FORTIFY_SOURCE.
-# It should also be noted that the use of printf in MicroPython is typically
-# quite limited anyways (primarily for debug and some error reporting, etc
-# in the unix version).
-#
-# Information about _FORTIFY_SOURCE seems to be rather scarce. The best I could
-# find was this: https://securityblog.redhat.com/2014/03/26/fortify-and-you/
-# Original patchset was introduced by
-# https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html .
-#
-# Turning off _FORTIFY_SOURCE is only required when compiling with -O1 or greater
-CFLAGS += -U _FORTIFY_SOURCE
-endif
-
-# On OSX, 'gcc' is a symlink to clang unless a real gcc is installed.
-# The unix port of MicroPython on OSX must be compiled with clang,
-# while cross-compile ports require gcc, so we test here for OSX and
-# if necessary override the value of 'CC' set in py/mkenv.mk
-ifeq ($(UNAME_S),Darwin)
-ifeq ($(MICROPY_FORCE_32BIT),1)
-CC = clang -m32
-else
-CC = clang
-endif
-# Use clang syntax for map file
-LDFLAGS_ARCH = -Wl,-map,$@.map -Wl,-dead_strip
-else
-# Use gcc syntax for map file
-LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
-endif
-LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
-
-# Flags to link with pthread library
-LIBPTHREAD = -lpthread
-
-ifeq ($(MICROPY_FORCE_32BIT),1)
-# Note: you may need to install i386 versions of dependency packages,
-# starting with linux-libc-dev:i386
-ifeq ($(MICROPY_PY_FFI),1)
-ifeq ($(UNAME_S),Linux)
-CFLAGS_MOD += -I/usr/include/i686-linux-gnu
-endif
-endif
-endif
-
-ifeq ($(MICROPY_USE_READLINE),1)
-INC +=  -I$(TOP)/lib/mp-readline
-CFLAGS_MOD += -DMICROPY_USE_READLINE=1
-LIB_SRC_C_EXTRA += mp-readline/readline.c
-endif
-ifeq ($(MICROPY_PY_TERMIOS),1)
-CFLAGS_MOD += -DMICROPY_PY_TERMIOS=1
-SRC_MOD += modtermios.c
-endif
-ifeq ($(MICROPY_PY_SOCKET),1)
-CFLAGS_MOD += -DMICROPY_PY_SOCKET=1
-SRC_MOD += modusocket.c
-endif
-ifeq ($(MICROPY_PY_THREAD),1)
-CFLAGS_MOD += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
-LDFLAGS_MOD += $(LIBPTHREAD)
-endif
-
-ifeq ($(MICROPY_PY_FFI),1)
-
-ifeq ($(MICROPY_STANDALONE),1)
-LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
- ifeq ($(MICROPY_FORCE_32BIT),1)
-  LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib32/libffi.a
- else
-  LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib/libffi.a
- endif
-else
-LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
-LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
-endif
-
-ifeq ($(UNAME_S),Linux)
-LIBFFI_LDFLAGS_MOD += -ldl
-endif
-
-CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1
-LDFLAGS_MOD += $(LIBFFI_LDFLAGS_MOD)
-SRC_MOD += modffi.c
-endif
-
-ifeq ($(MICROPY_PY_JNI),1)
-# Path for 64-bit OpenJDK, should be adjusted for other JDKs
-CFLAGS_MOD += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
-SRC_MOD += modjni.c
-endif
-
-# source files
-SRC_C = \
-	main.c \
-	gccollect.c \
-	unix_mphal.c \
-	mpthreadport.c \
-	input.c \
-	file.c \
-	modmachine.c \
-	modos.c \
-	moduos_vfs.c \
-	modtime.c \
-	moduselect.c \
-	alloc.c \
-	coverage.c \
-	fatfs_port.c \
-	$(SRC_MOD)
-
-LIB_SRC_C = $(addprefix lib/,\
-	$(LIB_SRC_C_EXTRA) \
-	timeutils/timeutils.c \
-	)
-
-OBJ = $(PY_O)
-OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-
-# List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(LIB_SRC_C)
-# Append any auto-generated sources that are needed by sources listed in
-# SRC_QSTR
-SRC_QSTR_AUTO_DEPS +=
-
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
-# To use frozen code create a manifest.py file with a description of files to
-# freeze, then invoke make with FROZEN_MANIFEST=manifest.py (be sure to build from scratch).
-CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
-CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs
-MPY_CROSS_FLAGS += -mcache-lookup-bc
-endif
-
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
-CFLAGS += -DMICROPY_MODULE_FROZEN_STR
-endif
-
-include $(TOP)/py/mkrules.mk
-
-.PHONY: test
-
-test: $(PROG) $(TOP)/tests/run-tests
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests
-
-# install micropython in /usr/local/bin
-TARGET = micropython
-PREFIX = $(DESTDIR)/usr/local
-BINDIR = $(PREFIX)/bin
-
-install: micropython
-	install -d $(BINDIR)
-	install $(TARGET) $(BINDIR)/$(TARGET)
-
-# uninstall micropython
-uninstall:
-	-rm $(BINDIR)/$(TARGET)
-
-# build synthetically fast interpreter for benchmarking
-fast:
-	$(MAKE) COPT="-O2 -DNDEBUG -fno-crossjumping" CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_fast.h>"' BUILD=build-fast PROG=micropython_fast FROZEN_MANIFEST=
-
-# build a minimal interpreter
-minimal:
-	$(MAKE) COPT="-Os -DNDEBUG" CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_minimal.h>"' \
-	    BUILD=build-minimal PROG=micropython_minimal FROZEN_MANIFEST= \
-	    MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_SOCKET=0 MICROPY_PY_THREAD=0 \
-	    MICROPY_PY_TERMIOS=0 MICROPY_PY_USSL=0 \
-	    MICROPY_USE_READLINE=0
-
-# build interpreter with nan-boxing as object model
-nanbox:
-	$(MAKE) \
-	CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_nanbox.h>"' \
-	BUILD=build-nanbox \
-	PROG=micropython_nanbox \
-	MICROPY_FORCE_32BIT=1
-
-freedos:
-	$(MAKE) \
-	CC=i586-pc-msdosdjgpp-gcc \
-	STRIP=i586-pc-msdosdjgpp-strip \
-	SIZE=i586-pc-msdosdjgpp-size \
-	CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_freedos.h>" -DMICROPY_NLR_SETJMP -Dtgamma=gamma -DMICROPY_EMIT_X86=0 -DMICROPY_NO_ALLOCA=1 -DMICROPY_PY_USELECT_POSIX=0' \
-	BUILD=build-freedos \
-	PROG=micropython_freedos \
-	MICROPY_PY_SOCKET=0 \
-	MICROPY_PY_FFI=0 \
-	MICROPY_PY_JNI=0 \
-	MICROPY_PY_BTREE=0 \
-	MICROPY_PY_THREAD=0 \
-	MICROPY_PY_USSL=0
-
-# build an interpreter for coverage testing and do the testing
-coverage:
-	$(MAKE) \
-	    COPT="-O0" CFLAGS_EXTRA='$(CFLAGS_EXTRA) -DMP_CONFIGFILE="<mpconfigport_coverage.h>" \
-	    -fprofile-arcs -ftest-coverage \
-	    -Wdouble-promotion -Wformat -Wmissing-declarations -Wmissing-prototypes -Wsign-compare \
-	    -Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \
-	    -DMICROPY_UNIX_COVERAGE' \
-	    LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' \
-	    MICROPY_VFS_FAT=1 MICROPY_VFS_LFS1=1 MICROPY_VFS_LFS2=1 \
-	    FROZEN_MANIFEST=manifest_coverage.py \
-	    BUILD=build-coverage PROG=micropython_coverage
-
-coverage_test: coverage
-	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/micropython_coverage ./run-tests
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/micropython_coverage ./run-tests -d thread
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/micropython_coverage ./run-tests --emit native
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/micropython_coverage ./run-tests --via-mpy -d basics float micropython
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython
-	cat $(TOP)/tests/basics/0prelim.py | ./micropython_coverage | grep -q 'abc'
-	gcov -o build-coverage/py $(TOP)/py/*.c
-	gcov -o build-coverage/extmod $(TOP)/extmod/*.c
-
-# Value of configure's --host= option (required for cross-compilation).
-# Deduce it from CROSS_COMPILE by default, but can be overridden.
-ifneq ($(CROSS_COMPILE),)
-CROSS_COMPILE_HOST = --host=$(patsubst %-,%,$(CROSS_COMPILE))
-else
-CROSS_COMPILE_HOST =
-endif
-
-deplibs: libffi axtls
-
-libffi: $(BUILD)/lib/libffi/include/ffi.h
-
-$(TOP)/lib/libffi/configure: $(TOP)/lib/libffi/autogen.sh
-	cd $(TOP)/lib/libffi; ./autogen.sh
-
-# install-exec-recursive & install-data-am targets are used to avoid building
-# docs and depending on makeinfo
-$(BUILD)/lib/libffi/include/ffi.h: $(TOP)/lib/libffi/configure
-	mkdir -p $(BUILD)/lib/libffi; cd $(BUILD)/lib/libffi; \
-	$(abspath $(TOP))/lib/libffi/configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out --disable-structs CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="-Os -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-exceptions"; \
-	$(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
-
-axtls: $(TOP)/lib/axtls/README
-
-$(TOP)/lib/axtls/README:
-	@echo "You cloned without --recursive, fetching submodules for you."
-	(cd $(TOP); git submodule update --init --recursive)
diff --git a/apps/KhiCAS/src/micropython-1.12/ports/unix/mpconfigport.h~ b/apps/KhiCAS/src/micropython-1.12/ports/unix/mpconfigport.h~
deleted file mode 100644
index 40cd1f570..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ports/unix/mpconfigport.h~
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// options to control how MicroPython is built
-
-#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
-#define MICROPY_PERSISTENT_CODE_LOAD (1)
-#if !defined(MICROPY_EMIT_X64) && defined(__x86_64__)
-    #define MICROPY_EMIT_X64        (1)
-#endif
-#if !defined(MICROPY_EMIT_X86) && defined(__i386__)
-    #define MICROPY_EMIT_X86        (1)
-#endif
-#if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__)
-    #define MICROPY_EMIT_THUMB      (1)
-    #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
-#endif
-// Some compilers define __thumb2__ and __arm__ at the same time, let
-// autodetected thumb2 emitter have priority.
-#if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__)
-    #define MICROPY_EMIT_ARM        (1)
-#endif
-#define MICROPY_COMP_MODULE_CONST   (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
-#define MICROPY_COMP_RETURN_IF_EXPR (1)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_STACK_CHECK         (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_MEM_STATS           (1)
-#define MICROPY_DEBUG_PRINTERS      (1)
-// Printing debug to stderr may give tests which
-// check stdout a chance to pass, etc.
-#define MICROPY_DEBUG_PRINTER       (&mp_stderr_print)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_USE_READLINE_HISTORY (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_REPL_EMACS_KEYS     (1)
-#define MICROPY_REPL_AUTO_INDENT    (1)
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#define MICROPY_STREAMS_POSIX_API   (1)
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-#ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
-#endif
-#define MICROPY_MODULE_WEAK_LINKS   (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_DESCRIPTORS      (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_COMPILE (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
-#define MICROPY_PY_BUILTINS_INPUT   (1)
-#define MICROPY_PY_BUILTINS_POW3    (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT    (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_ATEXIT       (1)
-#if MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PERSISTENT_CODE_SAVE (1)
-#define MICROPY_COMP_CONST (0)
-#endif
-#if defined(__APPLE__) && defined(__MACH__)
-    #define MICROPY_PY_SYS_PLATFORM  "darwin"
-#else
-    #define MICROPY_PY_SYS_PLATFORM  "linux"
-#endif
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
-#define MICROPY_PY_SYS_EXC_INFO     (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#endif
-#define MICROPY_PY_MATH_ISCLOSE     (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO_IOBASE        (1)
-#define MICROPY_PY_IO_FILEIO        (1)
-#define MICROPY_PY_GC_COLLECT_RETVAL (1)
-
-#ifndef MICROPY_STACKLESS
-#define MICROPY_STACKLESS           (0)
-#define MICROPY_STACKLESS_STRICT    (0)
-#endif
-
-#define MICROPY_PY_OS_STATVFS       (1)
-#define MICROPY_PY_UTIME            (1)
-#define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_UZLIB            (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_UHEAPQ           (1)
-#define MICROPY_PY_UTIMEQ           (1)
-#define MICROPY_PY_UHASHLIB         (1)
-#if MICROPY_PY_USSL
-#define MICROPY_PY_UHASHLIB_MD5     (1)
-#define MICROPY_PY_UHASHLIB_SHA1    (1)
-#define MICROPY_PY_UCRYPTOLIB       (1)
-#endif
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_UBINASCII_CRC32  (1)
-#define MICROPY_PY_URANDOM          (1)
-#ifndef MICROPY_PY_USELECT_POSIX
-#define MICROPY_PY_USELECT_POSIX    (1)
-#endif
-#define MICROPY_PY_UWEBSOCKET       (1)
-#define MICROPY_PY_MACHINE          (1)
-#define MICROPY_PY_MACHINE_PULSE    (1)
-#define MICROPY_MACHINE_MEM_GET_READ_ADDR   mod_machine_mem_get_addr
-#define MICROPY_MACHINE_MEM_GET_WRITE_ADDR  mod_machine_mem_get_addr
-
-#define MICROPY_FATFS_ENABLE_LFN       (1)
-#define MICROPY_FATFS_RPATH            (2)
-#define MICROPY_FATFS_MAX_SS           (4096)
-#define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
-
-// Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.
-// names in exception messages (may require more RAM).
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
-#define MICROPY_WARNINGS            (1)
-#define MICROPY_ERROR_PRINTER       (&mp_stderr_print)
-#define MICROPY_PY_STR_BYTES_CMP_WARN (1)
-
-extern const struct _mp_print_t mp_stderr_print;
-
-// Define to 1 to use undertested inefficient GC helper implementation
-// (if more efficient arch-specific one is not available).
-#ifndef MICROPY_GCREGS_SETJMP
-    #ifdef __mips__
-        #define MICROPY_GCREGS_SETJMP (1)
-    #else
-        #define MICROPY_GCREGS_SETJMP (0)
-    #endif
-#endif
-
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (256)
-#define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_ASYNC_KBD_INTR      (1)
-
-extern const struct _mp_obj_module_t mp_module_machine;
-extern const struct _mp_obj_module_t mp_module_os;
-extern const struct _mp_obj_module_t mp_module_uos_vfs;
-extern const struct _mp_obj_module_t mp_module_uselect;
-extern const struct _mp_obj_module_t mp_module_time;
-extern const struct _mp_obj_module_t mp_module_termios;
-extern const struct _mp_obj_module_t mp_module_socket;
-extern const struct _mp_obj_module_t mp_module_ffi;
-extern const struct _mp_obj_module_t mp_module_jni;
-
-#if MICROPY_PY_UOS_VFS
-#define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos_vfs) },
-#else
-#define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) },
-#endif
-#if MICROPY_PY_FFI
-#define MICROPY_PY_FFI_DEF { MP_ROM_QSTR(MP_QSTR_ffi), MP_ROM_PTR(&mp_module_ffi) },
-#else
-#define MICROPY_PY_FFI_DEF
-#endif
-#if MICROPY_PY_JNI
-#define MICROPY_PY_JNI_DEF { MP_ROM_QSTR(MP_QSTR_jni), MP_ROM_PTR(&mp_module_jni) },
-#else
-#define MICROPY_PY_JNI_DEF
-#endif
-#if MICROPY_PY_UTIME
-#define MICROPY_PY_UTIME_DEF { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time) },
-#else
-#define MICROPY_PY_UTIME_DEF
-#endif
-#if MICROPY_PY_TERMIOS
-#define MICROPY_PY_TERMIOS_DEF { MP_ROM_QSTR(MP_QSTR_termios), MP_ROM_PTR(&mp_module_termios) },
-#else
-#define MICROPY_PY_TERMIOS_DEF
-#endif
-#if MICROPY_PY_SOCKET
-#define MICROPY_PY_SOCKET_DEF { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_socket) },
-#else
-#define MICROPY_PY_SOCKET_DEF
-#endif
-#if MICROPY_PY_USELECT_POSIX
-#define MICROPY_PY_USELECT_DEF { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
-#else
-#define MICROPY_PY_USELECT_DEF
-#endif
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    MICROPY_PY_FFI_DEF \
-    MICROPY_PY_JNI_DEF \
-    MICROPY_PY_UTIME_DEF \
-    MICROPY_PY_SOCKET_DEF \
-    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
-    MICROPY_PY_UOS_DEF \
-    MICROPY_PY_USELECT_DEF \
-    MICROPY_PY_TERMIOS_DEF \
-
-// type definitions for the specific machine
-
-// For size_t and ssize_t
-#include <unistd.h>
-
-// assume that if we already defined the obj repr then we also defined types
-#ifndef MICROPY_OBJ_REPR
-#ifdef __LP64__
-typedef long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
-#else
-// These are definitions for machines where sizeof(int) == sizeof(void*),
-// regardless of actual size.
-typedef int mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-#endif
-#endif
-
-// Cannot include <sys/types.h>, as it may lead to symbol name clashes
-#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
-typedef long long mp_off_t;
-#else
-typedef long mp_off_t;
-#endif
-
-void mp_unix_alloc_exec(size_t min_size, void** ptr, size_t *size);
-void mp_unix_free_exec(void *ptr, size_t size);
-void mp_unix_mark_exec(void);
-#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) mp_unix_alloc_exec(min_size, ptr, size)
-#define MP_PLAT_FREE_EXEC(ptr, size) mp_unix_free_exec(ptr, size)
-#ifndef MICROPY_FORCE_PLAT_ALLOC_EXEC
-// Use MP_PLAT_ALLOC_EXEC for any executable memory allocation, including for FFI
-// (overriding libffi own implementation)
-#define MICROPY_FORCE_PLAT_ALLOC_EXEC (1)
-#endif
-
-#if MICROPY_PY_OS_DUPTERM
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-#else
-#define MP_PLAT_PRINT_STRN(str, len) do { ssize_t ret = write(1, str, len); (void)ret; } while (0)
-#endif
-
-#ifdef __linux__
-// Can access physical memory using /dev/mem
-#define MICROPY_PLAT_DEV_MEM  (1)
-#endif
-
-// Assume that select() call, interrupted with a signal, and erroring
-// with EINTR, updates remaining timeout value.
-#define MICROPY_SELECT_REMAINING_TIME (1)
-
-#ifdef __ANDROID__
-#include <android/api-level.h>
-#if __ANDROID_API__ < 4
-// Bionic libc in Android 1.5 misses these 2 functions
-#define MP_NEED_LOG2 (1)
-#define nan(x) NAN
-#endif
-#endif
-
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
-#define MP_STATE_PORT MP_STATE_VM
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[50]; \
-    void *mmap_region_head; \
-
-// We need to provide a declaration/definition of alloca()
-// unless support for it is disabled.
-#if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0
-#ifdef __FreeBSD__
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif
-#endif
-
-// From "man readdir": "Under glibc, programs can check for the availability
-// of the fields [in struct dirent] not defined in POSIX.1 by testing whether
-// the macros [...], _DIRENT_HAVE_D_TYPE are defined."
-// Other libc's don't define it, but proactively assume that dirent->d_type
-// is available on a modern *nix system.
-#ifndef _DIRENT_HAVE_D_TYPE
-#define _DIRENT_HAVE_D_TYPE (1)
-#endif
-// This macro is not provided by glibc but we need it so ports that don't have
-// dirent->d_ino can disable the use of this field.
-#ifndef _DIRENT_HAVE_D_INO
-#define _DIRENT_HAVE_D_INO (1)
-#endif
-
-#ifndef __APPLE__
-// For debugging purposes, make printf() available to any source file.
-#include <stdio.h>
-#endif
diff --git a/apps/KhiCAS/src/micropython-1.12/py/builtinevex.c~ b/apps/KhiCAS/src/micropython-1.12/py/builtinevex.c~
deleted file mode 100644
index 819e3e1c6..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/builtinevex.c~
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-
-#include "py/objfun.h"
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-
-#if MICROPY_PY_BUILTINS_COMPILE
-
-typedef struct _mp_obj_code_t {
-    mp_obj_base_t base;
-    mp_obj_t module_fun;
-} mp_obj_code_t;
-
-STATIC const mp_obj_type_t mp_type_code = {
-    { &mp_type_type },
-    .name = MP_QSTR_code,
-};
-
-STATIC mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj_dict_t *locals) {
-    // save context and set new context
-    mp_obj_dict_t *old_globals = mp_globals_get();
-    mp_obj_dict_t *old_locals = mp_locals_get();
-    mp_globals_set(globals);
-    mp_locals_set(locals);
-
-    // a bit of a hack: fun_bc will re-set globals, so need to make sure it's
-    // the correct one
-    if (mp_obj_is_type(self->module_fun, &mp_type_fun_bc)) {
-        mp_obj_fun_bc_t *fun_bc = MP_OBJ_TO_PTR(self->module_fun);
-        fun_bc->globals = globals;
-    }
-
-    // execute code
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        mp_obj_t ret = mp_call_function_0(self->module_fun);
-        nlr_pop();
-        mp_globals_set(old_globals);
-        mp_locals_set(old_locals);
-        return ret;
-    } else {
-        // exception; restore context and re-raise same exception
-        mp_globals_set(old_globals);
-        mp_locals_set(old_locals);
-        nlr_jump(nlr.ret_val);
-    }
-}
-
-STATIC mp_obj_t mp_builtin_compile(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-
-    // get the source
-    size_t str_len;
-    const char *str = mp_obj_str_get_data(args[0], &str_len);
-
-    // get the filename
-    qstr filename = mp_obj_str_get_qstr(args[1]);
-
-    // create the lexer
-    mp_lexer_t *lex = mp_lexer_new_from_str_len(filename, str, str_len, 0);
-
-    // get the compile mode
-    qstr mode = mp_obj_str_get_qstr(args[2]);
-    mp_parse_input_kind_t parse_input_kind;
-    switch (mode) {
-        case MP_QSTR_single: parse_input_kind = MP_PARSE_SINGLE_INPUT; break;
-        case MP_QSTR_exec: parse_input_kind = MP_PARSE_FILE_INPUT; break;
-        case MP_QSTR_eval: parse_input_kind = MP_PARSE_EVAL_INPUT; break;
-        default:
-            mp_raise_ValueError("bad compile mode");
-    }
-
-    mp_obj_code_t *code = m_new_obj(mp_obj_code_t);
-    code->base.type = &mp_type_code;
-    code->module_fun = mp_parse_compile_execute(lex, parse_input_kind, NULL, NULL);
-    return MP_OBJ_FROM_PTR(code);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_compile_obj, 3, 6, mp_builtin_compile);
-
-#endif // MICROPY_PY_BUILTINS_COMPILE
-
-#if MICROPY_PY_BUILTINS_EVAL_EXEC
-
-STATIC mp_obj_t eval_exec_helper(size_t n_args, const mp_obj_t *args, mp_parse_input_kind_t parse_input_kind) {
-    // work out the context
-    mp_obj_dict_t *globals = mp_globals_get();
-    mp_obj_dict_t *locals = mp_locals_get();
-    for (size_t i = 1; i < 3 && i < n_args; ++i) {
-        if (args[i] != mp_const_none) {
-            if (!mp_obj_is_type(args[i], &mp_type_dict)) {
-                mp_raise_TypeError(NULL);
-            }
-            locals = MP_OBJ_TO_PTR(args[i]);
-            if (i == 1) {
-                globals = locals;
-            }
-        }
-    }
-
-    #if MICROPY_PY_BUILTINS_COMPILE
-    if (mp_obj_is_type(args[0], &mp_type_code)) {
-        return code_execute(MP_OBJ_TO_PTR(args[0]), globals, locals);
-    }
-    #endif
-
-    size_t str_len;
-    const char *str = mp_obj_str_get_data(args[0], &str_len);
-
-    // create the lexer
-    // MP_PARSE_SINGLE_INPUT is used to indicate a file input
-    mp_lexer_t *lex;
-    if (MICROPY_PY_BUILTINS_EXECFILE && parse_input_kind == MP_PARSE_SINGLE_INPUT) {
-        lex = mp_lexer_new_from_file(str);
-        parse_input_kind = MP_PARSE_FILE_INPUT;
-    } else {
-        lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, str, str_len, 0);
-    }
-
-    return mp_parse_compile_execute(lex, parse_input_kind, globals, locals);
-}
-
-STATIC mp_obj_t mp_builtin_eval(size_t n_args, const mp_obj_t *args) {
-    return eval_exec_helper(n_args, args, MP_PARSE_EVAL_INPUT);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_eval_obj, 1, 3, mp_builtin_eval);
-
-STATIC mp_obj_t mp_builtin_exec(size_t n_args, const mp_obj_t *args) {
-    return eval_exec_helper(n_args, args, MP_PARSE_FILE_INPUT);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_exec_obj, 1, 3, mp_builtin_exec);
-
-#endif // MICROPY_PY_BUILTINS_EVAL_EXEC
-
-#if MICROPY_PY_BUILTINS_EXECFILE
-STATIC mp_obj_t mp_builtin_execfile(size_t n_args, const mp_obj_t *args) {
-    // MP_PARSE_SINGLE_INPUT is used to indicate a file input
-    return eval_exec_helper(n_args, args, MP_PARSE_SINGLE_INPUT);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_execfile_obj, 1, 3, mp_builtin_execfile);
-#endif
diff --git a/apps/KhiCAS/src/micropython-1.12/py/builtinimport.c~ b/apps/KhiCAS/src/micropython-1.12/py/builtinimport.c~
deleted file mode 100644
index 74bc4647e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/builtinimport.c~
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013-2019 Damien P. George
- * Copyright (c) 2014 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "py/compile.h"
-#include "py/objmodule.h"
-#include "py/persistentcode.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-#include "py/frozenmod.h"
-
-#if MICROPY_DEBUG_VERBOSE // print debugging info
-#define DEBUG_PRINT (1)
-#define DEBUG_printf DEBUG_printf
-#else // don't print debugging info
-#define DEBUG_PRINT (0)
-#define DEBUG_printf(...) (void)0
-#endif
-
-#if MICROPY_ENABLE_EXTERNAL_IMPORT
-
-#define PATH_SEP_CHAR '/'
-
-bool mp_obj_is_package(mp_obj_t module) {
-    mp_obj_t dest[2];
-    mp_load_method_maybe(module, MP_QSTR___path__, dest);
-    return dest[0] != MP_OBJ_NULL;
-}
-
-// Stat either frozen or normal module by a given path
-// (whatever is available, if at all).
-STATIC mp_import_stat_t mp_import_stat_any(const char *path) {
-    #if MICROPY_MODULE_FROZEN
-    mp_import_stat_t st = mp_frozen_stat(path);
-    if (st != MP_IMPORT_STAT_NO_EXIST) {
-        return st;
-    }
-    #endif
-    return mp_import_stat(path);
-}
-
-STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
-    mp_import_stat_t stat = mp_import_stat_any(vstr_null_terminated_str(path));
-    if (stat == MP_IMPORT_STAT_FILE) {
-        return stat;
-    }
-
-    #if MICROPY_PERSISTENT_CODE_LOAD
-    vstr_ins_byte(path, path->len - 2, 'm');
-    stat = mp_import_stat_any(vstr_null_terminated_str(path));
-    if (stat == MP_IMPORT_STAT_FILE) {
-        return stat;
-    }
-    #endif
-
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-STATIC mp_import_stat_t stat_dir_or_file(vstr_t *path) {
-    mp_import_stat_t stat = mp_import_stat_any(vstr_null_terminated_str(path));
-    DEBUG_printf("stat %s: %d\n", vstr_str(path), stat);
-    if (stat == MP_IMPORT_STAT_DIR) {
-        return stat;
-    }
-
-    // not a directory, add .py and try as a file
-    vstr_add_str(path, ".py.tns");
-    return stat_file_py_or_mpy(path);
-}
-
-STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *dest) {
-#if MICROPY_PY_SYS
-    // extract the list of paths
-    size_t path_num;
-    mp_obj_t *path_items;
-    mp_obj_list_get(mp_sys_path, &path_num, &path_items);
-
-    if (path_num == 0) {
-#endif
-        // mp_sys_path is empty, so just use the given file name
-        vstr_add_strn(dest, file_str, file_len);
-        return stat_dir_or_file(dest);
-#if MICROPY_PY_SYS
-    } else {
-        // go through each path looking for a directory or file
-        for (size_t i = 0; i < path_num; i++) {
-            vstr_reset(dest);
-            size_t p_len;
-            const char *p = mp_obj_str_get_data(path_items[i], &p_len);
-            if (p_len > 0) {
-                vstr_add_strn(dest, p, p_len);
-                vstr_add_char(dest, PATH_SEP_CHAR);
-            }
-            vstr_add_strn(dest, file_str, file_len);
-            mp_import_stat_t stat = stat_dir_or_file(dest);
-            if (stat != MP_IMPORT_STAT_NO_EXIST) {
-                return stat;
-            }
-        }
-
-        // could not find a directory or file
-        return MP_IMPORT_STAT_NO_EXIST;
-    }
-#endif
-}
-
-#if MICROPY_MODULE_FROZEN_STR || MICROPY_ENABLE_COMPILER
-STATIC void do_load_from_lexer(mp_obj_t module_obj, mp_lexer_t *lex) {
-    #if MICROPY_PY___FILE__
-    qstr source_name = lex->source_name;
-    mp_store_attr(module_obj, MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
-    #endif
-
-    // parse, compile and execute the module in its context
-    mp_obj_dict_t *mod_globals = mp_obj_module_get_globals(module_obj);
-    mp_parse_compile_execute(lex, MP_PARSE_FILE_INPUT, mod_globals, mod_globals);
-}
-#endif
-
-#if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_MODULE_FROZEN_MPY
-STATIC void do_execute_raw_code(mp_obj_t module_obj, mp_raw_code_t *raw_code, const char* source_name) {
-    (void)source_name;
-
-    #if MICROPY_PY___FILE__
-    mp_store_attr(module_obj, MP_QSTR___file__, MP_OBJ_NEW_QSTR(qstr_from_str(source_name)));
-    #endif
-
-    // execute the module in its context
-    mp_obj_dict_t *mod_globals = mp_obj_module_get_globals(module_obj);
-
-    // save context
-    mp_obj_dict_t *volatile old_globals = mp_globals_get();
-    mp_obj_dict_t *volatile old_locals = mp_locals_get();
-
-    // set new context
-    mp_globals_set(mod_globals);
-    mp_locals_set(mod_globals);
-
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        mp_obj_t module_fun = mp_make_function_from_raw_code(raw_code, MP_OBJ_NULL, MP_OBJ_NULL);
-        mp_call_function_0(module_fun);
-
-        // finish nlr block, restore context
-        nlr_pop();
-        mp_globals_set(old_globals);
-        mp_locals_set(old_locals);
-    } else {
-        // exception; restore context and re-raise same exception
-        mp_globals_set(old_globals);
-        mp_locals_set(old_locals);
-        nlr_jump(nlr.ret_val);
-    }
-}
-#endif
-
-STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
-    #if MICROPY_MODULE_FROZEN || MICROPY_ENABLE_COMPILER || (MICROPY_PERSISTENT_CODE_LOAD && MICROPY_HAS_FILE_READER)
-    char *file_str = vstr_null_terminated_str(file);
-    #endif
-
-    // If we support frozen modules (either as str or mpy) then try to find the
-    // requested filename in the list of frozen module filenames.
-    #if MICROPY_MODULE_FROZEN
-    void *modref;
-    int frozen_type = mp_find_frozen_module(file_str, file->len, &modref);
-    #endif
-
-    // If we support frozen str modules and the compiler is enabled, and we
-    // found the filename in the list of frozen files, then load and execute it.
-    #if MICROPY_MODULE_FROZEN_STR
-    if (frozen_type == MP_FROZEN_STR) {
-        do_load_from_lexer(module_obj, modref);
-        return;
-    }
-    #endif
-
-    // If we support frozen mpy modules and we found a corresponding file (and
-    // its data) in the list of frozen files, execute it.
-    #if MICROPY_MODULE_FROZEN_MPY
-    if (frozen_type == MP_FROZEN_MPY) {
-        do_execute_raw_code(module_obj, modref, file_str);
-        return;
-    }
-    #endif
-
-    // If we support loading .mpy files then check if the file extension is of
-    // the correct format and, if so, load and execute the file.
-    #if MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD
-    if (file_str[file->len - 3] == 'm') {
-        mp_raw_code_t *raw_code = mp_raw_code_load_file(file_str);
-        do_execute_raw_code(module_obj, raw_code, file_str);
-        return;
-    }
-    #endif
-
-    // If we can compile scripts then load the file and compile and execute it.
-    #if MICROPY_ENABLE_COMPILER
-    {
-        mp_lexer_t *lex = mp_lexer_new_from_file(file_str);
-        do_load_from_lexer(module_obj, lex);
-        return;
-    }
-    #else
-    // If we get here then the file was not frozen and we can't compile scripts.
-    mp_raise_msg(&mp_type_ImportError, "script compilation not supported");
-    #endif
-}
-
-STATIC void chop_component(const char *start, const char **end) {
-    const char *p = *end;
-    while (p > start) {
-        if (*--p == '.') {
-            *end = p;
-            return;
-        }
-    }
-    *end = p;
-}
-
-mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
-#if DEBUG_PRINT
-    DEBUG_printf("__import__:\n");
-    for (size_t i = 0; i < n_args; i++) {
-        DEBUG_printf("  ");
-        mp_obj_print(args[i], PRINT_REPR);
-        DEBUG_printf("\n");
-    }
-#endif
-
-    mp_obj_t module_name = args[0];
-    mp_obj_t fromtuple = mp_const_none;
-    mp_int_t level = 0;
-    if (n_args >= 4) {
-        fromtuple = args[3];
-        if (n_args >= 5) {
-            level = MP_OBJ_SMALL_INT_VALUE(args[4]);
-            if (level < 0) {
-                mp_raise_ValueError(NULL);
-            }
-        }
-    }
-
-    size_t mod_len;
-    const char *mod_str = mp_obj_str_get_data(module_name, &mod_len);
-
-    if (level != 0) {
-        // What we want to do here is to take name of current module,
-        // chop <level> trailing components, and concatenate with passed-in
-        // module name, thus resolving relative import name into absolute.
-        // This even appears to be correct per
-        // http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name
-        // "Relative imports use a module's __name__ attribute to determine that
-        // module's position in the package hierarchy."
-        level--;
-        mp_obj_t this_name_q = mp_obj_dict_get(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(MP_QSTR___name__));
-        assert(this_name_q != MP_OBJ_NULL);
-        #if MICROPY_CPYTHON_COMPAT
-        if (MP_OBJ_QSTR_VALUE(this_name_q) == MP_QSTR___main__) {
-            // This is a module run by -m command-line switch, get its real name from backup attribute
-            this_name_q = mp_obj_dict_get(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(MP_QSTR___main__));
-        }
-        #endif
-        mp_map_t *globals_map = &mp_globals_get()->map;
-        mp_map_elem_t *elem = mp_map_lookup(globals_map, MP_OBJ_NEW_QSTR(MP_QSTR___path__), MP_MAP_LOOKUP);
-        bool is_pkg = (elem != NULL);
-
-#if DEBUG_PRINT
-        DEBUG_printf("Current module/package: ");
-        mp_obj_print(this_name_q, PRINT_REPR);
-        DEBUG_printf(", is_package: %d", is_pkg);
-        DEBUG_printf("\n");
-#endif
-
-        size_t this_name_l;
-        const char *this_name = mp_obj_str_get_data(this_name_q, &this_name_l);
-
-        const char *p = this_name + this_name_l;
-        if (!is_pkg) {
-            // We have module, but relative imports are anchored at package, so
-            // go there.
-            chop_component(this_name, &p);
-        }
-
-        while (level--) {
-            chop_component(this_name, &p);
-        }
-
-        // We must have some component left over to import from
-        if (p == this_name) {
-            mp_raise_ValueError("cannot perform relative import");
-        }
-
-        uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);
-        char *new_mod = mp_local_alloc(new_mod_l);
-        memcpy(new_mod, this_name, p - this_name);
-        if (mod_len != 0) {
-            new_mod[p - this_name] = '.';
-            memcpy(new_mod + (p - this_name) + 1, mod_str, mod_len);
-        }
-
-        qstr new_mod_q = qstr_from_strn(new_mod, new_mod_l);
-        mp_local_free(new_mod);
-        DEBUG_printf("Resolved base name for relative import: '%s'\n", qstr_str(new_mod_q));
-        module_name = MP_OBJ_NEW_QSTR(new_mod_q);
-        mod_str = qstr_str(new_mod_q);
-        mod_len = new_mod_l;
-    }
-
-    if (mod_len == 0) {
-        mp_raise_ValueError(NULL);
-    }
-
-    // check if module already exists
-    qstr module_name_qstr = mp_obj_str_get_qstr(module_name);
-    mp_obj_t module_obj = mp_module_get(module_name_qstr);
-    if (module_obj != MP_OBJ_NULL) {
-        DEBUG_printf("Module already loaded\n");
-        // If it's not a package, return module right away
-        char *p = strchr(mod_str, '.');
-        if (p == NULL) {
-            return module_obj;
-        }
-        // If fromlist is not empty, return leaf module
-        if (fromtuple != mp_const_none) {
-            return module_obj;
-        }
-        // Otherwise, we need to return top-level package
-        qstr pkg_name = qstr_from_strn(mod_str, p - mod_str);
-        return mp_module_get(pkg_name);
-    }
-    DEBUG_printf("Module not yet loaded\n");
-
-    uint last = 0;
-    VSTR_FIXED(path, MICROPY_ALLOC_PATH_MAX)
-    module_obj = MP_OBJ_NULL;
-    mp_obj_t top_module_obj = MP_OBJ_NULL;
-    mp_obj_t outer_module_obj = MP_OBJ_NULL;
-    uint i;
-    for (i = 1; i <= mod_len; i++) {
-        if (i == mod_len || mod_str[i] == '.') {
-            // create a qstr for the module name up to this depth
-            qstr mod_name = qstr_from_strn(mod_str, i);
-            DEBUG_printf("Processing module: %s\n", qstr_str(mod_name));
-            DEBUG_printf("Previous path: =%.*s=\n", vstr_len(&path), vstr_str(&path));
-
-            // find the file corresponding to the module name
-            mp_import_stat_t stat;
-            if (vstr_len(&path) == 0) {
-                // first module in the dotted-name; search for a directory or file
-                stat = find_file(mod_str, i, &path);
-            } else {
-                // latter module in the dotted-name; append to path
-                vstr_add_char(&path, PATH_SEP_CHAR);
-                vstr_add_strn(&path, mod_str + last, i - last);
-                stat = stat_dir_or_file(&path);
-            }
-            DEBUG_printf("Current path: %.*s\n", vstr_len(&path), vstr_str(&path));
-
-            if (stat == MP_IMPORT_STAT_NO_EXIST) {
-                module_obj = MP_OBJ_NULL;
-                #if MICROPY_MODULE_WEAK_LINKS
-                // check if there is a weak link to this module
-                if (i == mod_len) {
-                    module_obj = mp_module_search_umodule(mod_str);
-                    if (module_obj != MP_OBJ_NULL) {
-                        // found weak linked module
-                        mp_module_call_init(mod_name, module_obj);
-                    }
-                }
-                #endif
-                if (module_obj == MP_OBJ_NULL) {
-                    // couldn't find the file, so fail
-                    if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
-                        mp_raise_msg(&mp_type_ImportError, "module not found");
-                    } else {
-                        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError,
-                            "no module named '%q'", mod_name));
-                    }
-                }
-            } else {
-                // found the file, so get the module
-                module_obj = mp_module_get(mod_name);
-            }
-
-            if (module_obj == MP_OBJ_NULL) {
-                // module not already loaded, so load it!
-
-                module_obj = mp_obj_new_module(mod_name);
-
-                // if args[3] (fromtuple) has magic value False, set up
-                // this module for command-line "-m" option (set module's
-                // name to __main__ instead of real name). Do this only
-                // for *modules* however - packages never have their names
-                // replaced, instead they're -m'ed using a special __main__
-                // submodule in them. (This all apparently is done to not
-                // touch package name itself, which is important for future
-                // imports).
-                if (i == mod_len && fromtuple == mp_const_false && stat != MP_IMPORT_STAT_DIR) {
-                    mp_obj_module_t *o = MP_OBJ_TO_PTR(module_obj);
-                    mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR___main__));
-                    #if MICROPY_CPYTHON_COMPAT
-                    // Store module as "__main__" in the dictionary of loaded modules (returned by sys.modules).
-                    mp_obj_dict_store(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_loaded_modules_dict)), MP_OBJ_NEW_QSTR(MP_QSTR___main__), module_obj);
-                    // Store real name in "__main__" attribute. Chosen semi-randonly, to reuse existing qstr's.
-                    mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___main__), MP_OBJ_NEW_QSTR(mod_name));
-                    #endif
-                }
-
-                if (stat == MP_IMPORT_STAT_DIR) {
-                    DEBUG_printf("%.*s is dir\n", vstr_len(&path), vstr_str(&path));
-                    // https://docs.python.org/3/reference/import.html
-                    // "Specifically, any module that contains a __path__ attribute is considered a package."
-                    mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str(vstr_str(&path), vstr_len(&path)));
-                    size_t orig_path_len = path.len;
-                    vstr_add_char(&path, PATH_SEP_CHAR);
-                    vstr_add_str(&path, "__init__.py.tns");
-                    if (stat_file_py_or_mpy(&path) != MP_IMPORT_STAT_FILE) {
-                        //mp_warning("%s is imported as namespace package", vstr_str(&path));
-                    } else {
-                        do_load(module_obj, &path);
-                    }
-                    path.len = orig_path_len;
-                } else { // MP_IMPORT_STAT_FILE
-                    do_load(module_obj, &path);
-                    // This should be the last component in the import path.  If there are
-                    // remaining components then it's an ImportError because the current path
-                    // (the module that was just loaded) is not a package.  This will be caught
-                    // on the next iteration because the file will not exist.
-                }
-            }
-            if (outer_module_obj != MP_OBJ_NULL) {
-                qstr s = qstr_from_strn(mod_str + last, i - last);
-                mp_store_attr(outer_module_obj, s, module_obj);
-            }
-            outer_module_obj = module_obj;
-            if (top_module_obj == MP_OBJ_NULL) {
-                top_module_obj = module_obj;
-            }
-            last = i + 1;
-        }
-    }
-
-    // If fromlist is not empty, return leaf module
-    if (fromtuple != mp_const_none) {
-        return module_obj;
-    }
-    // Otherwise, we need to return top-level package
-    return top_module_obj;
-}
-
-#else // MICROPY_ENABLE_EXTERNAL_IMPORT
-
-mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
-    // Check that it's not a relative import
-    if (n_args >= 5 && MP_OBJ_SMALL_INT_VALUE(args[4]) != 0) {
-        mp_raise_NotImplementedError("relative import");
-    }
-
-    // Check if module already exists, and return it if it does
-    qstr module_name_qstr = mp_obj_str_get_qstr(args[0]);
-    mp_obj_t module_obj = mp_module_get(module_name_qstr);
-    if (module_obj != MP_OBJ_NULL) {
-        return module_obj;
-    }
-
-    #if MICROPY_MODULE_WEAK_LINKS
-    // Check if there is a weak link to this module
-    module_obj = mp_module_search_umodule(qstr_str(module_name_qstr));
-    if (module_obj != MP_OBJ_NULL) {
-        // Found weak-linked module
-        mp_module_call_init(module_name_qstr, module_obj);
-        return module_obj;
-    }
-    #endif
-
-    // Couldn't find the module, so fail
-    if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
-        mp_raise_msg(&mp_type_ImportError, "module not found");
-    } else {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError,
-            "no module named '%q'", module_name_qstr));
-    }
-}
-
-#endif // MICROPY_ENABLE_EXTERNAL_IMPORT
-
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin___import___obj, 1, 5, mp_builtin___import__);
diff --git a/apps/KhiCAS/src/micropython-1.12/py/lexer.c~ b/apps/KhiCAS/src/micropython-1.12/py/lexer.c~
deleted file mode 100644
index 5f8adda91..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/lexer.c~
+++ /dev/null
@@ -1,766 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "py/reader.h"
-#include "py/lexer.h"
-#include "py/runtime.h"
-
-#if MICROPY_ENABLE_COMPILER
-
-#define TAB_SIZE (8)
-
-// TODO seems that CPython allows NULL byte in the input stream
-// don't know if that's intentional or not, but we don't allow it
-
-#define MP_LEXER_EOF ((unichar)MP_READER_EOF)
-#define CUR_CHAR(lex) ((lex)->chr0)
-
-STATIC bool is_end(mp_lexer_t *lex) {
-    return lex->chr0 == MP_LEXER_EOF;
-}
-
-STATIC bool is_physical_newline(mp_lexer_t *lex) {
-    return lex->chr0 == '\n';
-}
-
-STATIC bool is_char(mp_lexer_t *lex, byte c) {
-    return lex->chr0 == c;
-}
-
-STATIC bool is_char_or(mp_lexer_t *lex, byte c1, byte c2) {
-    return lex->chr0 == c1 || lex->chr0 == c2;
-}
-
-STATIC bool is_char_or3(mp_lexer_t *lex, byte c1, byte c2, byte c3) {
-    return lex->chr0 == c1 || lex->chr0 == c2 || lex->chr0 == c3;
-}
-
-STATIC bool is_char_following(mp_lexer_t *lex, byte c) {
-    return lex->chr1 == c;
-}
-
-STATIC bool is_char_following_or(mp_lexer_t *lex, byte c1, byte c2) {
-    return lex->chr1 == c1 || lex->chr1 == c2;
-}
-
-STATIC bool is_char_following_following_or(mp_lexer_t *lex, byte c1, byte c2) {
-    return lex->chr2 == c1 || lex->chr2 == c2;
-}
-
-STATIC bool is_char_and(mp_lexer_t *lex, byte c1, byte c2) {
-    return lex->chr0 == c1 && lex->chr1 == c2;
-}
-
-STATIC bool is_whitespace(mp_lexer_t *lex) {
-    return unichar_isspace(lex->chr0);
-}
-
-STATIC bool is_letter(mp_lexer_t *lex) {
-    return unichar_isalpha(lex->chr0);
-}
-
-STATIC bool is_digit(mp_lexer_t *lex) {
-    return unichar_isdigit(lex->chr0);
-}
-
-STATIC bool is_following_digit(mp_lexer_t *lex) {
-    return unichar_isdigit(lex->chr1);
-}
-
-STATIC bool is_following_base_char(mp_lexer_t *lex) {
-    const unichar chr1 = lex->chr1 | 0x20;
-    return chr1 == 'b' || chr1 == 'o' || chr1 == 'x';
-}
-
-STATIC bool is_following_odigit(mp_lexer_t *lex) {
-    return lex->chr1 >= '0' && lex->chr1 <= '7';
-}
-
-STATIC bool is_string_or_bytes(mp_lexer_t *lex) {
-    return is_char_or(lex, '\'', '\"')
-        || (is_char_or3(lex, 'r', 'u', 'b') && is_char_following_or(lex, '\'', '\"'))
-        || ((is_char_and(lex, 'r', 'b') || is_char_and(lex, 'b', 'r'))
-            && is_char_following_following_or(lex, '\'', '\"'));
-}
-
-// to easily parse utf-8 identifiers we allow any raw byte with high bit set
-STATIC bool is_head_of_identifier(mp_lexer_t *lex) {
-    return is_letter(lex) || lex->chr0 == '_' || lex->chr0 >= 0x80;
-}
-
-STATIC bool is_tail_of_identifier(mp_lexer_t *lex) {
-    return is_head_of_identifier(lex) || is_digit(lex);
-}
-
-STATIC void next_char(mp_lexer_t *lex) {
-    if (lex->chr0 == '\n') {
-        // a new line
-        ++lex->line;
-        lex->column = 1;
-    } else if (lex->chr0 == '\t') {
-        // a tab
-        lex->column = (((lex->column - 1 + TAB_SIZE) / TAB_SIZE) * TAB_SIZE) + 1;
-    } else {
-        // a character worth one column
-        ++lex->column;
-    }
-
-    lex->chr0 = lex->chr1;
-    lex->chr1 = lex->chr2;
-    lex->chr2 = lex->reader.readbyte(lex->reader.data);
-
-    if (lex->chr1 == '\r') {
-        // CR is a new line, converted to LF
-        lex->chr1 = '\n';
-        if (lex->chr2 == '\n') {
-            // CR LF is a single new line, throw out the extra LF
-            lex->chr2 = lex->reader.readbyte(lex->reader.data);
-        }
-    }
-
-    // check if we need to insert a newline at end of file
-    if (lex->chr2 == MP_LEXER_EOF && lex->chr1 != MP_LEXER_EOF && lex->chr1 != '\n') {
-        lex->chr2 = '\n';
-    }
-}
-
-STATIC void indent_push(mp_lexer_t *lex, size_t indent) {
-    if (lex->num_indent_level >= lex->alloc_indent_level) {
-        lex->indent_level = m_renew(uint16_t, lex->indent_level, lex->alloc_indent_level, lex->alloc_indent_level + MICROPY_ALLOC_LEXEL_INDENT_INC);
-        lex->alloc_indent_level += MICROPY_ALLOC_LEXEL_INDENT_INC;
-    }
-    lex->indent_level[lex->num_indent_level++] = indent;
-}
-
-STATIC size_t indent_top(mp_lexer_t *lex) {
-    return lex->indent_level[lex->num_indent_level - 1];
-}
-
-STATIC void indent_pop(mp_lexer_t *lex) {
-    lex->num_indent_level -= 1;
-}
-
-// some tricky operator encoding:
-//     <op>  = begin with <op>, if this opchar matches then begin here
-//     e<op> = end with <op>, if this opchar matches then end
-//     c<op> = continue with <op>, if this opchar matches then continue matching
-// this means if the start of two ops are the same then they are equal til the last char
-
-STATIC const char *const tok_enc =
-    "()[]{},:;~" // singles
-    "<e=c<e="     // < <= << <<=
-    ">e=c>e="     // > >= >> >>=
-    "*e=c*e="     // * *= ** **=
-    "+e="         // + +=
-    "-e=e>"       // - -= ->
-    "&e="         // & &=
-    "|e="         // | |=
-    "/e=c/e="     // / /= // //=
-    "%e="         // % %=
-    "^e="         // ^ ^=
-    "@e="         // @ @=
-    "=e="         // = ==
-    "!.";         // start of special cases: != . ...
-
-// TODO static assert that number of tokens is less than 256 so we can safely make this table with byte sized entries
-STATIC const uint8_t tok_enc_kind[] = {
-    MP_TOKEN_DEL_PAREN_OPEN, MP_TOKEN_DEL_PAREN_CLOSE,
-    MP_TOKEN_DEL_BRACKET_OPEN, MP_TOKEN_DEL_BRACKET_CLOSE,
-    MP_TOKEN_DEL_BRACE_OPEN, MP_TOKEN_DEL_BRACE_CLOSE,
-    MP_TOKEN_DEL_COMMA, MP_TOKEN_DEL_COLON, MP_TOKEN_DEL_SEMICOLON, MP_TOKEN_OP_TILDE,
-
-    MP_TOKEN_OP_LESS, MP_TOKEN_OP_LESS_EQUAL, MP_TOKEN_OP_DBL_LESS, MP_TOKEN_DEL_DBL_LESS_EQUAL,
-    MP_TOKEN_OP_MORE, MP_TOKEN_OP_MORE_EQUAL, MP_TOKEN_OP_DBL_MORE, MP_TOKEN_DEL_DBL_MORE_EQUAL,
-    MP_TOKEN_OP_STAR, MP_TOKEN_DEL_STAR_EQUAL, MP_TOKEN_OP_DBL_STAR, MP_TOKEN_DEL_DBL_STAR_EQUAL,
-    MP_TOKEN_OP_PLUS, MP_TOKEN_DEL_PLUS_EQUAL,
-    MP_TOKEN_OP_MINUS, MP_TOKEN_DEL_MINUS_EQUAL, MP_TOKEN_DEL_MINUS_MORE,
-    MP_TOKEN_OP_AMPERSAND, MP_TOKEN_DEL_AMPERSAND_EQUAL,
-    MP_TOKEN_OP_PIPE, MP_TOKEN_DEL_PIPE_EQUAL,
-    MP_TOKEN_OP_SLASH, MP_TOKEN_DEL_SLASH_EQUAL, MP_TOKEN_OP_DBL_SLASH, MP_TOKEN_DEL_DBL_SLASH_EQUAL,
-    MP_TOKEN_OP_PERCENT, MP_TOKEN_DEL_PERCENT_EQUAL,
-    MP_TOKEN_OP_CARET, MP_TOKEN_DEL_CARET_EQUAL,
-    MP_TOKEN_OP_AT, MP_TOKEN_DEL_AT_EQUAL,
-    MP_TOKEN_DEL_EQUAL, MP_TOKEN_OP_DBL_EQUAL,
-};
-
-// must have the same order as enum in lexer.h
-// must be sorted according to strcmp
-STATIC const char *const tok_kw[] = {
-    "False",
-    "None",
-    "True",
-    "__debug__",
-    "and",
-    "as",
-    "assert",
-    #if MICROPY_PY_ASYNC_AWAIT
-    "async",
-    "await",
-    #endif
-    "break",
-    "class",
-    "continue",
-    "def",
-    "del",
-    "elif",
-    "else",
-    "except",
-    "finally",
-    "for",
-    "from",
-    "global",
-    "if",
-    "import",
-    "in",
-    "is",
-    "lambda",
-    "nonlocal",
-    "not",
-    "or",
-    "pass",
-    "raise",
-    "return",
-    "try",
-    "while",
-    "with",
-    "yield",
-};
-
-// This is called with CUR_CHAR() before first hex digit, and should return with
-// it pointing to last hex digit
-// num_digits must be greater than zero
-STATIC bool get_hex(mp_lexer_t *lex, size_t num_digits, mp_uint_t *result) {
-    mp_uint_t num = 0;
-    while (num_digits-- != 0) {
-        next_char(lex);
-        unichar c = CUR_CHAR(lex);
-        if (!unichar_isxdigit(c)) {
-            return false;
-        }
-        num = (num << 4) + unichar_xdigit_value(c);
-    }
-    *result = num;
-    return true;
-}
-
-STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw) {
-    // get first quoting character
-    char quote_char = '\'';
-    if (is_char(lex, '\"')) {
-        quote_char = '\"';
-    }
-    next_char(lex);
-
-    // work out if it's a single or triple quoted literal
-    size_t num_quotes;
-    if (is_char_and(lex, quote_char, quote_char)) {
-        // triple quotes
-        next_char(lex);
-        next_char(lex);
-        num_quotes = 3;
-    } else {
-        // single quotes
-        num_quotes = 1;
-    }
-
-    size_t n_closing = 0;
-    while (!is_end(lex) && (num_quotes > 1 || !is_char(lex, '\n')) && n_closing < num_quotes) {
-        if (is_char(lex, quote_char)) {
-            n_closing += 1;
-            vstr_add_char(&lex->vstr, CUR_CHAR(lex));
-        } else {
-            n_closing = 0;
-            if (is_char(lex, '\\')) {
-                next_char(lex);
-                unichar c = CUR_CHAR(lex);
-                if (is_raw) {
-                    // raw strings allow escaping of quotes, but the backslash is also emitted
-                    vstr_add_char(&lex->vstr, '\\');
-                } else {
-                    switch (c) {
-                        // note: "c" can never be MP_LEXER_EOF because next_char
-                        // always inserts a newline at the end of the input stream
-                        case '\n': c = MP_LEXER_EOF; break; // backslash escape the newline, just ignore it
-                        case '\\': break;
-                        case '\'': break;
-                        case '"': break;
-                        case 'a': c = 0x07; break;
-                        case 'b': c = 0x08; break;
-                        case 't': c = 0x09; break;
-                        case 'n': c = 0x0a; break;
-                        case 'v': c = 0x0b; break;
-                        case 'f': c = 0x0c; break;
-                        case 'r': c = 0x0d; break;
-                        case 'u':
-                        case 'U':
-                            if (lex->tok_kind == MP_TOKEN_BYTES) {
-                                // b'\u1234' == b'\\u1234'
-                                vstr_add_char(&lex->vstr, '\\');
-                                break;
-                            }
-                            // Otherwise fall through.
-                        case 'x':
-                        {
-                            mp_uint_t num = 0;
-                            if (!get_hex(lex, (c == 'x' ? 2 : c == 'u' ? 4 : 8), &num)) {
-                                // not enough hex chars for escape sequence
-                                lex->tok_kind = MP_TOKEN_INVALID;
-                            }
-                            c = num;
-                            break;
-                        }
-                        case 'N':
-                            // Supporting '\N{LATIN SMALL LETTER A}' == 'a' would require keeping the
-                            // entire Unicode name table in the core. As of Unicode 6.3.0, that's nearly
-                            // 3MB of text; even gzip-compressed and with minimal structure, it'll take
-                            // roughly half a meg of storage. This form of Unicode escape may be added
-                            // later on, but it's definitely not a priority right now. -- CJA 20140607
-                            mp_raise_NotImplementedError("unicode name escapes");
-                            break;
-                        default:
-                            if (c >= '0' && c <= '7') {
-                                // Octal sequence, 1-3 chars
-                                size_t digits = 3;
-                                mp_uint_t num = c - '0';
-                                while (is_following_odigit(lex) && --digits != 0) {
-                                    next_char(lex);
-                                    num = num * 8 + (CUR_CHAR(lex) - '0');
-                                }
-                                c = num;
-                            } else {
-                                // unrecognised escape character; CPython lets this through verbatim as '\' and then the character
-                                vstr_add_char(&lex->vstr, '\\');
-                            }
-                            break;
-                    }
-                }
-                if (c != MP_LEXER_EOF) {
-                    if (MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC) {
-                        if (c < 0x110000 && lex->tok_kind == MP_TOKEN_STRING) {
-                            vstr_add_char(&lex->vstr, c);
-                        } else if (c < 0x100 && lex->tok_kind == MP_TOKEN_BYTES) {
-                            vstr_add_byte(&lex->vstr, c);
-                        } else {
-                            // unicode character out of range
-                            // this raises a generic SyntaxError; could provide more info
-                            lex->tok_kind = MP_TOKEN_INVALID;
-                        }
-                    } else {
-                        // without unicode everything is just added as an 8-bit byte
-                        if (c < 0x100) {
-                            vstr_add_byte(&lex->vstr, c);
-                        } else {
-                            // 8-bit character out of range
-                            // this raises a generic SyntaxError; could provide more info
-                            lex->tok_kind = MP_TOKEN_INVALID;
-                        }
-                    }
-                }
-            } else {
-                // Add the "character" as a byte so that we remain 8-bit clean.
-                // This way, strings are parsed correctly whether or not they contain utf-8 chars.
-                vstr_add_byte(&lex->vstr, CUR_CHAR(lex));
-            }
-        }
-        next_char(lex);
-    }
-
-    // check we got the required end quotes
-    if (n_closing < num_quotes) {
-        lex->tok_kind = MP_TOKEN_LONELY_STRING_OPEN;
-    }
-
-    // cut off the end quotes from the token text
-    vstr_cut_tail_bytes(&lex->vstr, n_closing);
-}
-
-STATIC bool skip_whitespace(mp_lexer_t *lex, bool stop_at_newline) {
-    bool had_physical_newline = false;
-    while (!is_end(lex)) {
-        if (is_physical_newline(lex)) {
-            if (stop_at_newline && lex->nested_bracket_level == 0) {
-                break;
-            }
-            had_physical_newline = true;
-            next_char(lex);
-        } else if (is_whitespace(lex)) {
-            next_char(lex);
-        } else if (is_char(lex, '#')) {
-            next_char(lex);
-            while (!is_end(lex) && !is_physical_newline(lex)) {
-                next_char(lex);
-            }
-            // had_physical_newline will be set on next loop
-        } else if (is_char_and(lex, '\\', '\n')) {
-            // line-continuation, so don't set had_physical_newline
-            next_char(lex);
-            next_char(lex);
-        } else {
-            break;
-        }
-    }
-    return had_physical_newline;
-}
-
-void mp_lexer_to_next(mp_lexer_t *lex) {
-    // start new token text
-    vstr_reset(&lex->vstr);
-
-    // skip white space and comments
-    bool had_physical_newline = skip_whitespace(lex, false);
-
-    // set token source information
-    lex->tok_line = lex->line;
-    lex->tok_column = lex->column;
-
-    if (lex->emit_dent < 0) {
-        lex->tok_kind = MP_TOKEN_DEDENT;
-        lex->emit_dent += 1;
-
-    } else if (lex->emit_dent > 0) {
-        lex->tok_kind = MP_TOKEN_INDENT;
-        lex->emit_dent -= 1;
-
-    } else if (had_physical_newline && lex->nested_bracket_level == 0) {
-        lex->tok_kind = MP_TOKEN_NEWLINE;
-
-        size_t num_spaces = lex->column - 1;
-        if (num_spaces == indent_top(lex)) {
-        } else if (num_spaces > indent_top(lex)) {
-            indent_push(lex, num_spaces);
-            lex->emit_dent += 1;
-        } else {
-            while (num_spaces < indent_top(lex)) {
-                indent_pop(lex);
-                lex->emit_dent -= 1;
-            }
-            if (num_spaces != indent_top(lex)) {
-                lex->tok_kind = MP_TOKEN_DEDENT_MISMATCH;
-            }
-        }
-
-    } else if (is_end(lex)) {
-        lex->tok_kind = MP_TOKEN_END;
-
-    } else if (is_string_or_bytes(lex)) {
-        // a string or bytes literal
-
-        // Python requires adjacent string/bytes literals to be automatically
-        // concatenated.  We do it here in the tokeniser to make efficient use of RAM,
-        // because then the lexer's vstr can be used to accumulate the string literal,
-        // in contrast to creating a parse tree of strings and then joining them later
-        // in the compiler.  It's also more compact in code size to do it here.
-
-        // MP_TOKEN_END is used to indicate that this is the first string token
-        lex->tok_kind = MP_TOKEN_END;
-
-        // Loop to accumulate string/bytes literals
-        do {
-            // parse type codes
-            bool is_raw = false;
-            mp_token_kind_t kind = MP_TOKEN_STRING;
-            int n_char = 0;
-            if (is_char(lex, 'u')) {
-                n_char = 1;
-            } else if (is_char(lex, 'b')) {
-                kind = MP_TOKEN_BYTES;
-                n_char = 1;
-                if (is_char_following(lex, 'r')) {
-                    is_raw = true;
-                    n_char = 2;
-                }
-            } else if (is_char(lex, 'r')) {
-                is_raw = true;
-                n_char = 1;
-                if (is_char_following(lex, 'b')) {
-                    kind = MP_TOKEN_BYTES;
-                    n_char = 2;
-                }
-            }
-
-            // Set or check token kind
-            if (lex->tok_kind == MP_TOKEN_END) {
-                lex->tok_kind = kind;
-            } else if (lex->tok_kind != kind) {
-                // Can't concatenate string with bytes
-                break;
-            }
-
-            // Skip any type code characters
-            if (n_char != 0) {
-                next_char(lex);
-                if (n_char == 2) {
-                    next_char(lex);
-                }
-            }
-
-            // Parse the literal
-            parse_string_literal(lex, is_raw);
-
-            // Skip whitespace so we can check if there's another string following
-            skip_whitespace(lex, true);
-
-        } while (is_string_or_bytes(lex));
-
-    } else if (is_head_of_identifier(lex)) {
-        lex->tok_kind = MP_TOKEN_NAME;
-
-        // get first char (add as byte to remain 8-bit clean and support utf-8)
-        vstr_add_byte(&lex->vstr, CUR_CHAR(lex));
-        next_char(lex);
-
-        // get tail chars
-        while (!is_end(lex) && is_tail_of_identifier(lex)) {
-            vstr_add_byte(&lex->vstr, CUR_CHAR(lex));
-            next_char(lex);
-        }
-
-        // Check if the name is a keyword.
-        // We also check for __debug__ here and convert it to its value.  This is
-        // so the parser gives a syntax error on, eg, x.__debug__.  Otherwise, we
-        // need to check for this special token in many places in the compiler.
-        const char *s = vstr_null_terminated_str(&lex->vstr);
-        for (size_t i = 0; i < MP_ARRAY_SIZE(tok_kw); i++) {
-            int cmp = strcmp(s, tok_kw[i]);
-            if (cmp == 0) {
-                lex->tok_kind = MP_TOKEN_KW_FALSE + i;
-                if (lex->tok_kind == MP_TOKEN_KW___DEBUG__) {
-                    lex->tok_kind = (MP_STATE_VM(mp_optimise_value) == 0 ? MP_TOKEN_KW_TRUE : MP_TOKEN_KW_FALSE);
-                }
-                break;
-            } else if (cmp < 0) {
-                // Table is sorted and comparison was less-than, so stop searching
-                break;
-            }
-        }
-
-    } else if (is_digit(lex) || (is_char(lex, '.') && is_following_digit(lex))) {
-        bool forced_integer = false;
-        if (is_char(lex, '.')) {
-            lex->tok_kind = MP_TOKEN_FLOAT_OR_IMAG;
-        } else {
-            lex->tok_kind = MP_TOKEN_INTEGER;
-            if (is_char(lex, '0') && is_following_base_char(lex)) {
-                forced_integer = true;
-            }
-        }
-
-        // get first char
-        vstr_add_char(&lex->vstr, CUR_CHAR(lex));
-        next_char(lex);
-
-        // get tail chars
-        while (!is_end(lex)) {
-            if (!forced_integer && is_char_or(lex, 'e', 'E')) {
-                lex->tok_kind = MP_TOKEN_FLOAT_OR_IMAG;
-                vstr_add_char(&lex->vstr, 'e');
-                next_char(lex);
-                if (is_char(lex, '+') || is_char(lex, '-')) {
-                    vstr_add_char(&lex->vstr, CUR_CHAR(lex));
-                    next_char(lex);
-                }
-            } else if (is_letter(lex) || is_digit(lex) || is_char(lex, '.')) {
-                if (is_char_or3(lex, '.', 'j', 'J')) {
-                    lex->tok_kind = MP_TOKEN_FLOAT_OR_IMAG;
-                }
-                vstr_add_char(&lex->vstr, CUR_CHAR(lex));
-                next_char(lex);
-            } else if (is_char(lex, '_')) {
-                next_char(lex);
-            } else {
-                break;
-            }
-        }
-
-    } else {
-        // search for encoded delimiter or operator
-
-        const char *t = tok_enc;
-        size_t tok_enc_index = 0;
-        for (; *t != 0 && !is_char(lex, *t); t += 1) {
-            if (*t == 'e' || *t == 'c') {
-                t += 1;
-            }
-            tok_enc_index += 1;
-        }
-
-        next_char(lex);
-
-        if (*t == 0) {
-            // didn't match any delimiter or operator characters
-            lex->tok_kind = MP_TOKEN_INVALID;
-
-        } else if (*t == '!') {
-            // "!=" is a special case because "!" is not a valid operator
-            if (is_char(lex, '=')) {
-                next_char(lex);
-                lex->tok_kind = MP_TOKEN_OP_NOT_EQUAL;
-            } else {
-                lex->tok_kind = MP_TOKEN_INVALID;
-            }
-
-        } else if (*t == '.') {
-            // "." and "..." are special cases because ".." is not a valid operator
-            if (is_char_and(lex, '.', '.')) {
-                next_char(lex);
-                next_char(lex);
-                lex->tok_kind = MP_TOKEN_ELLIPSIS;
-            } else {
-                lex->tok_kind = MP_TOKEN_DEL_PERIOD;
-            }
-
-        } else {
-            // matched a delimiter or operator character
-
-            // get the maximum characters for a valid token
-            t += 1;
-            size_t t_index = tok_enc_index;
-            while (*t == 'c' || *t == 'e') {
-                t_index += 1;
-                if (is_char(lex, t[1])) {
-                    next_char(lex);
-                    tok_enc_index = t_index;
-                    if (*t == 'e') {
-                        break;
-                    }
-                } else if (*t == 'c') {
-                    break;
-                }
-                t += 2;
-            }
-
-            // set token kind
-            lex->tok_kind = tok_enc_kind[tok_enc_index];
-
-            // compute bracket level for implicit line joining
-            if (lex->tok_kind == MP_TOKEN_DEL_PAREN_OPEN || lex->tok_kind == MP_TOKEN_DEL_BRACKET_OPEN || lex->tok_kind == MP_TOKEN_DEL_BRACE_OPEN) {
-                lex->nested_bracket_level += 1;
-            } else if (lex->tok_kind == MP_TOKEN_DEL_PAREN_CLOSE || lex->tok_kind == MP_TOKEN_DEL_BRACKET_CLOSE || lex->tok_kind == MP_TOKEN_DEL_BRACE_CLOSE) {
-                lex->nested_bracket_level -= 1;
-            }
-        }
-    }
-}
-
-mp_lexer_t *mp_lexer_new(qstr src_name, mp_reader_t reader) {
-    mp_lexer_t *lex = m_new_obj(mp_lexer_t);
-
-    lex->source_name = src_name;
-    lex->reader = reader;
-    lex->line = 1;
-    lex->column = (size_t)-2; // account for 3 dummy bytes
-    lex->emit_dent = 0;
-    lex->nested_bracket_level = 0;
-    lex->alloc_indent_level = MICROPY_ALLOC_LEXER_INDENT_INIT;
-    lex->num_indent_level = 1;
-    lex->indent_level = m_new(uint16_t, lex->alloc_indent_level);
-    vstr_init(&lex->vstr, 32);
-
-    // store sentinel for first indentation level
-    lex->indent_level[0] = 0;
-
-    // load lexer with start of file, advancing lex->column to 1
-    // start with dummy bytes and use next_char() for proper EOL/EOF handling
-    lex->chr0 = lex->chr1 = lex->chr2 = 0;
-    next_char(lex);
-    next_char(lex);
-    next_char(lex);
-
-    // preload first token
-    mp_lexer_to_next(lex);
-
-    // Check that the first token is in the first column.  If it's not then we
-    // convert the token kind to INDENT so that the parser gives a syntax error.
-    if (lex->tok_column != 1) {
-        lex->tok_kind = MP_TOKEN_INDENT;
-    }
-
-    return lex;
-}
-
-mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, size_t len, size_t free_len) {
-    mp_reader_t reader;
-    mp_reader_new_mem(&reader, (const byte*)str, len, free_len);
-    return mp_lexer_new(src_name, reader);
-}
-
-#if MICROPY_READER_POSIX || MICROPY_READER_VFS
-
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_reader_t reader;
-    mp_reader_new_file(&reader, filename);
-    return mp_lexer_new(qstr_from_str(filename), reader);
-}
-
-#if MICROPY_HELPER_LEXER_UNIX
-
-mp_lexer_t *mp_lexer_new_from_fd(qstr filename, int fd, bool close_fd) {
-    mp_reader_t reader;
-    mp_reader_new_file_from_fd(&reader, fd, close_fd);
-    return mp_lexer_new(filename, reader);
-}
-
-#endif
-
-#endif
-
-void mp_lexer_free(mp_lexer_t *lex) {
-    if (lex) {
-        lex->reader.close(lex->reader.data);
-        vstr_clear(&lex->vstr);
-        m_del(uint16_t, lex->indent_level, lex->alloc_indent_level);
-        m_del_obj(mp_lexer_t, lex);
-    }
-}
-
-#if 0
-// This function is used to print the current token and should only be
-// needed to debug the lexer, so it's not available via a config option.
-void mp_lexer_show_token(const mp_lexer_t *lex) {
-    printf("(" UINT_FMT ":" UINT_FMT ") kind:%u str:%p len:%zu", lex->tok_line, lex->tok_column, lex->tok_kind, lex->vstr.buf, lex->vstr.len);
-    if (lex->vstr.len > 0) {
-        const byte *i = (const byte *)lex->vstr.buf;
-        const byte *j = (const byte *)i + lex->vstr.len;
-        printf(" ");
-        while (i < j) {
-            unichar c = utf8_get_char(i);
-            i = utf8_next_char(i);
-            if (unichar_isprint(c)) {
-                printf("%c", (int)c);
-            } else {
-                printf("?");
-            }
-        }
-    }
-    printf("\n");
-}
-#endif
-
-#endif // MICROPY_ENABLE_COMPILER
diff --git a/apps/KhiCAS/src/micropython-1.12/py/mkrules.mk~ b/apps/KhiCAS/src/micropython-1.12/py/mkrules.mk~
deleted file mode 100644
index 68da3e793..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/mkrules.mk~
+++ /dev/null
@@ -1,217 +0,0 @@
-ifneq ($(MKENV_INCLUDED),1)
-# We assume that mkenv is in the same directory as this file.
-THIS_MAKEFILE = $(lastword $(MAKEFILE_LIST))
-include $(dir $(THIS_MAKEFILE))mkenv.mk
-endif
-
-# This file expects that OBJ contains a list of all of the object files.
-# The directory portion of each object file is used to locate the source
-# and should not contain any ..'s but rather be relative to the top of the
-# tree.
-#
-# So for example, py/map.c would have an object file name py/map.o
-# The object files will go into the build directory and mantain the same
-# directory structure as the source tree. So the final dependency will look
-# like this:
-#
-# build/py/map.o: py/map.c
-#
-# We set vpath to point to the top of the tree so that the source files
-# can be located. By following this scheme, it allows a single build rule
-# to be used to compile all .c files.
-
-vpath %.S . $(TOP) $(USER_C_MODULES)
-$(BUILD)/%.o: %.S
-	$(ECHO) "CC $<"
-	$(Q)$(CC) $(CFLAGS) -c -o $@ $<
-
-vpath %.s . $(TOP) $(USER_C_MODULES)
-$(BUILD)/%.o: %.s
-	$(ECHO) "AS $<"
-	$(Q)$(AS) -o $@ $<
-
-define compile_c
-$(ECHO) "CC $<"
-$(Q)$(CC) $(CFLAGS) -c -MD -o $@ $<
-@# The following fixes the dependency file.
-@# See http://make.paulandlesley.org/autodep.html for details.
-@# Regex adjusted from the above to play better with Windows paths, etc.
-@$(CP) $(@:.o=.d) $(@:.o=.P); \
-  $(SED) -e 's/#.*//' -e 's/^.*:  *//' -e 's/ *\\$$//' \
-      -e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \
-  $(RM) -f $(@:.o=.d)
-endef
-
-vpath %.c . $(TOP) $(USER_C_MODULES)
-$(BUILD)/%.o: %.c
-	$(call compile_c)
-
-QSTR_GEN_EXTRA_CFLAGS += -DNO_QSTR
-QSTR_GEN_EXTRA_CFLAGS += -I$(BUILD)/tmp
-
-vpath %.c . $(TOP) $(USER_C_MODULES)
-
-$(BUILD)/%.pp: %.c
-	$(ECHO) "PreProcess $<"
-	$(Q)$(CPP) $(CFLAGS) -Wp,-C,-dD,-dI -o $@ $<
-
-# The following rule uses | to create an order only prerequisite. Order only
-# prerequisites only get built if they don't exist. They don't cause timestamp
-# checking to be performed.
-#
-# We don't know which source files actually need the generated.h (since
-# it is #included from str.h). The compiler generated dependencies will cause
-# the right .o's to get recompiled if the generated.h file changes. Adding
-# an order-only dependency to all of the .o's will cause the generated .h
-# to get built before we try to compile any of them.
-$(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h
-
-# The logic for qstr regeneration is:
-# - if anything in QSTR_GLOBAL_DEPENDENCIES is newer, then process all source files ($^)
-# - else, if list of newer prerequisites ($?) is not empty, then process just these ($?)
-# - else, process all source files ($^) [this covers "make -B" which can set $? to empty]
-# See more information about this process in docs/develop/qstr.rst.
-$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(QSTR_GLOBAL_REQUIREMENTS)
-	$(ECHO) "GEN $@"
-	$(Q)$(CPP) $(QSTR_GEN_EXTRA_CFLAGS) $(CFLAGS) $(if $(filter $?,$(QSTR_GLOBAL_DEPENDENCIES)),$^,$(if $?,$?,$^)) >$(HEADER_BUILD)/qstr.i.last
-
-$(HEADER_BUILD)/qstr.split: $(HEADER_BUILD)/qstr.i.last
-	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py split $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED)
-	$(Q)$(TOUCH) $@
-
-$(QSTR_DEFS_COLLECTED): $(HEADER_BUILD)/qstr.split
-	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED)
-
-# $(sort $(var)) removes duplicates
-#
-# The net effect of this, is it causes the objects to depend on the
-# object directories (but only for existence), and the object directories
-# will be created if they don't exist.
-OBJ_DIRS = $(sort $(dir $(OBJ)))
-$(OBJ): | $(OBJ_DIRS)
-$(OBJ_DIRS):
-	$(MKDIR) -p $@
-
-$(HEADER_BUILD):
-	$(MKDIR) -p $@
-
-ifneq ($(FROZEN_MANIFEST),)
-# to build frozen_content.c from a manifest
-$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h
-	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) $(FROZEN_MANIFEST)
-
-ifneq ($(FROZEN_DIR),)
-$(error FROZEN_DIR cannot be used in conjunction with FROZEN_MANIFEST)
-endif
-
-ifneq ($(FROZEN_MPY_DIR),)
-$(error FROZEN_MPY_DIR cannot be used in conjunction with FROZEN_MANIFEST)
-endif
-endif
-
-ifneq ($(FROZEN_DIR),)
-$(info Warning: FROZEN_DIR is deprecated in favour of FROZEN_MANIFEST)
-$(BUILD)/frozen.c: $(wildcard $(FROZEN_DIR)/*) $(HEADER_BUILD) $(FROZEN_EXTRA_DEPS)
-	$(ECHO) "GEN $@"
-	$(Q)$(MAKE_FROZEN) $(FROZEN_DIR) > $@
-endif
-
-ifneq ($(FROZEN_MPY_DIR),)
-$(info Warning: FROZEN_MPY_DIR is deprecated in favour of FROZEN_MANIFEST)
-# make a list of all the .py files that need compiling and freezing
-FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py' | $(SED) -e 's=^$(FROZEN_MPY_DIR)/==')
-FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
-
-# to build .mpy files from .py files
-$(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py
-	@$(ECHO) "MPY $<"
-	$(Q)$(MKDIR) -p $(dir $@)
-	$(Q)$(MPY_CROSS) -o $@ -s $(<:$(FROZEN_MPY_DIR)/%=%) $(MPY_CROSS_FLAGS) $<
-
-# to build frozen_mpy.c from all .mpy files
-$(BUILD)/frozen_mpy.c: $(FROZEN_MPY_MPY_FILES) $(BUILD)/genhdr/qstrdefs.generated.h
-	@$(ECHO) "GEN $@"
-	$(Q)$(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h $(FROZEN_MPY_MPY_FILES) > $@
-endif
-
-ifneq ($(PROG),)
-# Build a standalone executable (unix does this)
-
-all: $(PROG)
-
-$(PROG): $(OBJ)
-	$(ECHO) "LINK $@"
-# Do not pass COPT here - it's *C* compiler optimizations. For example,
-# we may want to compile using Thumb, but link with non-Thumb libc.
-	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
-ifndef DEBUG
-	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
-endif
-	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
-
-clean: clean-prog
-clean-prog:
-	$(RM) -f $(PROG)
-	$(RM) -f $(PROG).map
-
-.PHONY: clean-prog
-endif
-
-submodules:
-	$(ECHO) "Updating submodules: $(GIT_SUBMODULES)"
-ifneq ($(GIT_SUBMODULES),)
-	$(Q)git submodule update --init $(addprefix $(TOP)/,$(GIT_SUBMODULES))
-endif
-.PHONY: submodules
-
-LIBMICROPYTHON = libmicropython.a
-
-# We can execute extra commands after library creation using
-# LIBMICROPYTHON_EXTRA_CMD. This may be needed e.g. to integrate
-# with 3rd-party projects which don't have proper dependency
-# tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some
-# other file to cause needed effect, e.g. relinking with new lib.
-lib $(LIBMICROPYTHON): $(OBJ)
-	$(AR) rcs $(LIBMICROPYTHON) $^
-	$(LIBMICROPYTHON_EXTRA_CMD)
-
-clean:
-	$(RM) -rf $(BUILD) $(CLEAN_EXTRA)
-.PHONY: clean
-
-# Clean every non-git file from FROZEN_DIR/FROZEN_MPY_DIR, but making a backup.
-# We run rmdir below to avoid empty backup dir (it will silently fail if backup
-# is non-empty).
-clean-frozen:
-	if [ -n "$(FROZEN_MPY_DIR)" ]; then \
-	backup_dir=$(FROZEN_MPY_DIR).$$(date +%Y%m%dT%H%M%S); mkdir $$backup_dir; \
-	cd $(FROZEN_MPY_DIR); git status --ignored -u all -s . | awk ' {print $$2}' \
-	| xargs --no-run-if-empty cp --parents -t ../$$backup_dir; \
-	rmdir ../$$backup_dir 2>/dev/null || true; \
-	git clean -d -f .; \
-	fi
-
-	if [ -n "$(FROZEN_DIR)" ]; then \
-	backup_dir=$(FROZEN_DIR).$$(date +%Y%m%dT%H%M%S); mkdir $$backup_dir; \
-	cd $(FROZEN_DIR); git status --ignored -u all -s . | awk ' {print $$2}' \
-	| xargs --no-run-if-empty cp --parents -t ../$$backup_dir; \
-	rmdir ../$$backup_dir 2>/dev/null || true; \
-	git clean -d -f .; \
-	fi
-.PHONY: clean-frozen
-
-print-cfg:
-	$(ECHO) "PY_SRC = $(PY_SRC)"
-	$(ECHO) "BUILD  = $(BUILD)"
-	$(ECHO) "OBJ    = $(OBJ)"
-.PHONY: print-cfg
-
-print-def:
-	@$(ECHO) "The following defines are built into the $(CC) compiler"
-	$(TOUCH) __empty__.c
-	@$(CC) -E -Wp,-dM __empty__.c
-	@$(RM) -f __empty__.c
-
--include $(OBJ:.o=.P)
diff --git a/apps/KhiCAS/src/micropython-1.12/py/modbuiltins.c~ b/apps/KhiCAS/src/micropython-1.12/py/modbuiltins.c~
deleted file mode 100644
index a65f3beec..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/modbuiltins.c~
+++ /dev/null
@@ -1,777 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "py/smallint.h"
-#include "py/objint.h"
-#include "py/objstr.h"
-#include "py/objtype.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-#include "py/stream.h"
-
-#if MICROPY_PY_BUILTINS_FLOAT
-#include <math.h>
-#endif
-
-#if MICROPY_PY_IO
-extern struct _mp_dummy_t mp_sys_stdout_obj; // type is irrelevant, just need pointer
-#endif
-
-// args[0] is function from class body
-// args[1] is class name
-// args[2:] are base objects
-STATIC mp_obj_t mp_builtin___build_class__(size_t n_args, const mp_obj_t *args) {
-    assert(2 <= n_args);
-
-    // set the new classes __locals__ object
-    mp_obj_dict_t *old_locals = mp_locals_get();
-    mp_obj_t class_locals = mp_obj_new_dict(0);
-    mp_locals_set(MP_OBJ_TO_PTR(class_locals));
-
-    // call the class code
-    mp_obj_t cell = mp_call_function_0(args[0]);
-
-    // restore old __locals__ object
-    mp_locals_set(old_locals);
-
-    // get the class type (meta object) from the base objects
-    mp_obj_t meta;
-    if (n_args == 2) {
-        // no explicit bases, so use 'type'
-        meta = MP_OBJ_FROM_PTR(&mp_type_type);
-    } else {
-        // use type of first base object
-        meta = MP_OBJ_FROM_PTR(mp_obj_get_type(args[2]));
-    }
-
-    // TODO do proper metaclass resolution for multiple base objects
-
-    // create the new class using a call to the meta object
-    mp_obj_t meta_args[3];
-    meta_args[0] = args[1]; // class name
-    meta_args[1] = mp_obj_new_tuple(n_args - 2, args + 2); // tuple of bases
-    meta_args[2] = class_locals; // dict of members
-    mp_obj_t new_class = mp_call_function_n_kw(meta, 3, 0, meta_args);
-
-    // store into cell if neede
-    if (cell != mp_const_none) {
-        mp_obj_cell_set(cell, new_class);
-    }
-
-    return new_class;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR(mp_builtin___build_class___obj, 2, mp_builtin___build_class__);
-
-STATIC mp_obj_t mp_builtin_abs(mp_obj_t o_in) {
-    return mp_unary_op(MP_UNARY_OP_ABS, o_in);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_abs_obj, mp_builtin_abs);
-
-STATIC mp_obj_t mp_builtin_all(mp_obj_t o_in) {
-    mp_obj_iter_buf_t iter_buf;
-    mp_obj_t iterable = mp_getiter(o_in, &iter_buf);
-    mp_obj_t item;
-    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        if (!mp_obj_is_true(item)) {
-            return mp_const_false;
-        }
-    }
-    return mp_const_true;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_all_obj, mp_builtin_all);
-
-STATIC mp_obj_t mp_builtin_any(mp_obj_t o_in) {
-    mp_obj_iter_buf_t iter_buf;
-    mp_obj_t iterable = mp_getiter(o_in, &iter_buf);
-    mp_obj_t item;
-    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        if (mp_obj_is_true(item)) {
-            return mp_const_true;
-        }
-    }
-    return mp_const_false;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_any_obj, mp_builtin_any);
-
-STATIC mp_obj_t mp_builtin_bin(mp_obj_t o_in) {
-    mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR__brace_open__colon__hash_b_brace_close_), o_in };
-    return mp_obj_str_format(MP_ARRAY_SIZE(args), args, NULL);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_bin_obj, mp_builtin_bin);
-
-STATIC mp_obj_t mp_builtin_callable(mp_obj_t o_in) {
-    if (mp_obj_is_callable(o_in)) {
-        return mp_const_true;
-    } else {
-        return mp_const_false;
-    }
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_callable_obj, mp_builtin_callable);
-
-STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
-    #if MICROPY_PY_BUILTINS_STR_UNICODE
-    mp_uint_t c = mp_obj_get_int(o_in);
-    uint8_t str[4];
-    int len = 0;
-    if (c < 0x80) {
-        *str = c; len = 1;
-    } else if (c < 0x800) {
-        str[0] = (c >> 6) | 0xC0;
-        str[1] = (c & 0x3F) | 0x80;
-        len = 2;
-    } else if (c < 0x10000) {
-        str[0] = (c >> 12) | 0xE0;
-        str[1] = ((c >> 6) & 0x3F) | 0x80;
-        str[2] = (c & 0x3F) | 0x80;
-        len = 3;
-    } else if (c < 0x110000) {
-        str[0] = (c >> 18) | 0xF0;
-        str[1] = ((c >> 12) & 0x3F) | 0x80;
-        str[2] = ((c >> 6) & 0x3F) | 0x80;
-        str[3] = (c & 0x3F) | 0x80;
-        len = 4;
-    } else {
-        mp_raise_ValueError("chr() arg not in range(0x110000)");
-    }
-    return mp_obj_new_str_via_qstr((char*)str, len);
-    #else
-    mp_int_t ord = mp_obj_get_int(o_in);
-    if (0 <= ord && ord <= 0xff) {
-        uint8_t str[1] = {ord};
-        return mp_obj_new_str_via_qstr((char*)str, 1);
-    } else {
-        mp_raise_ValueError("chr() arg not in range(256)");
-    }
-    #endif
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_chr_obj, mp_builtin_chr);
-
-STATIC mp_obj_t mp_builtin_dir(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t dir = mp_obj_new_list(0, NULL);
-    if (n_args == 0) {
-        // Make a list of names in the local namespace
-        mp_obj_dict_t *dict = mp_locals_get();
-        for (size_t i = 0; i < dict->map.alloc; i++) {
-            if (mp_map_slot_is_filled(&dict->map, i)) {
-                mp_obj_list_append(dir, dict->map.table[i].key);
-            }
-        }
-    } else { // n_args == 1
-        // Make a list of names in the given object
-        // Implemented by probing all possible qstrs with mp_load_method_maybe
-        size_t nqstr = QSTR_TOTAL();
-        for (size_t i = MP_QSTR_ + 1; i < nqstr; ++i) {
-            mp_obj_t dest[2];
-            mp_load_method_protected(args[0], i, dest, false);
-            if (dest[0] != MP_OBJ_NULL) {
-                #if MICROPY_PY_ALL_SPECIAL_METHODS
-                // Support for __dir__: see if we can dispatch to this special method
-                // This relies on MP_QSTR__dir__ being first after MP_QSTR_
-                if (i == MP_QSTR___dir__ && dest[1] != MP_OBJ_NULL) {
-                    return mp_call_method_n_kw(0, 0, dest);
-                }
-                #endif
-                mp_obj_list_append(dir, MP_OBJ_NEW_QSTR(i));
-            }
-        }
-    }
-    return dir;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_dir_obj, 0, 1, mp_builtin_dir);
-
-STATIC mp_obj_t mp_builtin_divmod(mp_obj_t o1_in, mp_obj_t o2_in) {
-    return mp_binary_op(MP_BINARY_OP_DIVMOD, o1_in, o2_in);
-}
-MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_divmod_obj, mp_builtin_divmod);
-
-STATIC mp_obj_t mp_builtin_hash(mp_obj_t o_in) {
-    // result is guaranteed to be a (small) int
-    return mp_unary_op(MP_UNARY_OP_HASH, o_in);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_hash_obj, mp_builtin_hash);
-
-STATIC mp_obj_t mp_builtin_hex(mp_obj_t o_in) {
-    #if MICROPY_PY_BUILTINS_STR_OP_MODULO
-    return mp_binary_op(MP_BINARY_OP_MODULO, MP_OBJ_NEW_QSTR(MP_QSTR__percent__hash_x), o_in);
-    #else
-    mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR__brace_open__colon__hash_x_brace_close_), o_in };
-    return mp_obj_str_format(MP_ARRAY_SIZE(args), args, NULL);
-    #endif
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_hex_obj, mp_builtin_hex);
-
-#if MICROPY_PY_BUILTINS_INPUT
-
-#include "py/mphal.h"
-#include "lib/mp-readline/readline.h"
-
-// A port can define mp_hal_readline if they want to use a custom function here
-#ifndef mp_hal_readline
-#define mp_hal_readline readline
-#endif
-
-STATIC mp_obj_t mp_builtin_input(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 1) {
-        mp_obj_print(args[0], PRINT_STR);
-    }
-    vstr_t line;
-    vstr_init(&line, 16);
-    int ret = mp_hal_readline(&line, "");
-    if (ret == CHAR_CTRL_C) {
-        nlr_raise(mp_obj_new_exception(&mp_type_KeyboardInterrupt));
-    }
-    if (line.len == 0 && ret == CHAR_CTRL_D) {
-        nlr_raise(mp_obj_new_exception(&mp_type_EOFError));
-    }
-    return mp_obj_new_str_from_vstr(&mp_type_str, &line);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj, 0, 1, mp_builtin_input);
-
-#endif
-
-STATIC mp_obj_t mp_builtin_iter(mp_obj_t o_in) {
-    return mp_getiter(o_in, NULL);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_iter_obj, mp_builtin_iter);
-
-#if MICROPY_PY_BUILTINS_MIN_MAX
-
-STATIC mp_obj_t mp_builtin_min_max(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs, mp_uint_t op) {
-    mp_map_elem_t *key_elem = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_key), MP_MAP_LOOKUP);
-    mp_map_elem_t *default_elem;
-    mp_obj_t key_fn = key_elem == NULL ? MP_OBJ_NULL : key_elem->value;
-    if (n_args == 1) {
-        // given an iterable
-        mp_obj_iter_buf_t iter_buf;
-        mp_obj_t iterable = mp_getiter(args[0], &iter_buf);
-        mp_obj_t best_key = MP_OBJ_NULL;
-        mp_obj_t best_obj = MP_OBJ_NULL;
-        mp_obj_t item;
-        while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            mp_obj_t key = key_fn == MP_OBJ_NULL ? item : mp_call_function_1(key_fn, item);
-            if (best_obj == MP_OBJ_NULL || (mp_binary_op(op, key, best_key) == mp_const_true)) {
-                best_key = key;
-                best_obj = item;
-            }
-        }
-        if (best_obj == MP_OBJ_NULL) {
-            default_elem = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_default), MP_MAP_LOOKUP);
-            if (default_elem != NULL) {
-                best_obj = default_elem->value;
-            } else {
-                mp_raise_ValueError("arg is an empty sequence");
-            }
-        }
-        return best_obj;
-    } else {
-        // given many args
-        mp_obj_t best_key = MP_OBJ_NULL;
-        mp_obj_t best_obj = MP_OBJ_NULL;
-        for (size_t i = 0; i < n_args; i++) {
-            mp_obj_t key = key_fn == MP_OBJ_NULL ? args[i] : mp_call_function_1(key_fn, args[i]);
-            if (best_obj == MP_OBJ_NULL || (mp_binary_op(op, key, best_key) == mp_const_true)) {
-                best_key = key;
-                best_obj = args[i];
-            }
-        }
-        return best_obj;
-    }
-}
-
-STATIC mp_obj_t mp_builtin_max(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_builtin_min_max(n_args, args, kwargs, MP_BINARY_OP_MORE);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_max_obj, 1, mp_builtin_max);
-
-STATIC mp_obj_t mp_builtin_min(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_builtin_min_max(n_args, args, kwargs, MP_BINARY_OP_LESS);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_min_obj, 1, mp_builtin_min);
-
-#endif
-
-#if MICROPY_PY_BUILTINS_NEXT2
-STATIC mp_obj_t mp_builtin_next(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 1) {
-        mp_obj_t ret = mp_iternext_allow_raise(args[0]);
-        if (ret == MP_OBJ_STOP_ITERATION) {
-            nlr_raise(mp_obj_new_exception(&mp_type_StopIteration));
-        } else {
-            return ret;
-        }
-    } else {
-        mp_obj_t ret = mp_iternext(args[0]);
-        return ret == MP_OBJ_STOP_ITERATION ? args[1] : ret;
-    }
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_next_obj, 1, 2, mp_builtin_next);
-#else
-STATIC mp_obj_t mp_builtin_next(mp_obj_t o) {
-    mp_obj_t ret = mp_iternext_allow_raise(o);
-    if (ret == MP_OBJ_STOP_ITERATION) {
-        nlr_raise(mp_obj_new_exception(&mp_type_StopIteration));
-    } else {
-        return ret;
-    }
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_next_obj, mp_builtin_next);
-#endif
-
-STATIC mp_obj_t mp_builtin_oct(mp_obj_t o_in) {
-    #if MICROPY_PY_BUILTINS_STR_OP_MODULO
-    return mp_binary_op(MP_BINARY_OP_MODULO, MP_OBJ_NEW_QSTR(MP_QSTR__percent__hash_o), o_in);
-    #else
-    mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR__brace_open__colon__hash_o_brace_close_), o_in };
-    return mp_obj_str_format(MP_ARRAY_SIZE(args), args, NULL);
-    #endif
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_oct_obj, mp_builtin_oct);
-
-STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
-    size_t len;
-    const byte *str = (const byte*)mp_obj_str_get_data(o_in, &len);
-    #if MICROPY_PY_BUILTINS_STR_UNICODE
-    if (mp_obj_is_str(o_in)) {
-        len = utf8_charlen(str, len);
-        if (len == 1) {
-            return mp_obj_new_int(utf8_get_char(str));
-        }
-    } else
-    #endif
-    {
-        // a bytes object, or a str without unicode support (don't sign extend the char)
-        if (len == 1) {
-            return MP_OBJ_NEW_SMALL_INT(str[0]);
-        }
-    }
-
-    if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
-        mp_raise_TypeError("ord expects a character");
-    } else {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
-            "ord() expected a character, but string of length %d found", (int)len));
-    }
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_ord_obj, mp_builtin_ord);
-
-STATIC mp_obj_t mp_builtin_pow(size_t n_args, const mp_obj_t *args) {
-    switch (n_args) {
-        case 2: return mp_binary_op(MP_BINARY_OP_POWER, args[0], args[1]);
-        default:
-#if !MICROPY_PY_BUILTINS_POW3
-            mp_raise_msg(&mp_type_NotImplementedError, "3-arg pow() not supported");
-#elif MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_MPZ
-            return mp_binary_op(MP_BINARY_OP_MODULO, mp_binary_op(MP_BINARY_OP_POWER, args[0], args[1]), args[2]);
-#else
-            return mp_obj_int_pow3(args[0], args[1], args[2]);
-#endif
-    }
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_pow_obj, 2, 3, mp_builtin_pow);
-
-STATIC mp_obj_t mp_builtin_print(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_sep, ARG_end, ARG_file };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_sep, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_QSTR(MP_QSTR__space_)} },
-        { MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_QSTR(MP_QSTR__0x0a_)} },
-        #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
-        { MP_QSTR_file, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_sys_stdout_obj)} },
-        #endif
-    };
-
-    // parse args (a union is used to reduce the amount of C stack that is needed)
-    union {
-        mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-        size_t len[2];
-    } u;
-    mp_arg_parse_all(0, NULL, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, u.args);
-
-    #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
-    mp_get_stream_raise(u.args[ARG_file].u_obj, MP_STREAM_OP_WRITE);
-    mp_print_t print = {MP_OBJ_TO_PTR(u.args[ARG_file].u_obj), mp_stream_write_adaptor};
-    #endif
-
-    // extract the objects first because we are going to use the other part of the union
-    mp_obj_t sep = u.args[ARG_sep].u_obj;
-    mp_obj_t end = u.args[ARG_end].u_obj;
-    const char *sep_data = mp_obj_str_get_data(sep, &u.len[0]);
-    const char *end_data = mp_obj_str_get_data(end, &u.len[1]);
-
-    for (size_t i = 0; i < n_args; i++) {
-        if (i > 0) {
-            #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
-            mp_stream_write_adaptor(print.data, sep_data, u.len[0]);
-            #else
-            mp_print_strn(&mp_plat_print, sep_data, u.len[0], 0, 0, 0);
-            #endif
-        }
-        #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
-        mp_obj_print_helper(&print, pos_args[i], PRINT_STR);
-        #else
-        mp_obj_print_helper(&mp_plat_print, pos_args[i], PRINT_STR);
-        #endif
-    }
-    #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
-    mp_stream_write_adaptor(print.data, end_data, u.len[1]);
-    #else
-    mp_print_strn(&mp_plat_print, end_data, u.len[1], 0, 0, 0);
-    #endif
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_print_obj, 0, mp_builtin_print);
-
-STATIC mp_obj_t mp_builtin___repl_print__(mp_obj_t o) {
-    if (o != mp_const_none) {
-        mp_obj_print_helper(MP_PYTHON_PRINTER, o, PRINT_REPR);
-        mp_print_str(MP_PYTHON_PRINTER, "\n");
-        #if MICROPY_CAN_OVERRIDE_BUILTINS
-        // Set "_" special variable
-        mp_obj_t dest[2] = {MP_OBJ_SENTINEL, o};
-        mp_type_module.attr(MP_OBJ_FROM_PTR(&mp_module_builtins), MP_QSTR__, dest);
-        #endif
-    }
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin___repl_print___obj, mp_builtin___repl_print__);
-
-STATIC mp_obj_t mp_builtin_repr(mp_obj_t o_in) {
-    vstr_t vstr;
-    mp_print_t print;
-    vstr_init_print(&vstr, 16, &print);
-    mp_obj_print_helper(&print, o_in, PRINT_REPR);
-    return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_repr_obj, mp_builtin_repr);
-
-STATIC mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t o_in = args[0];
-    if (mp_obj_is_int(o_in)) {
-        if (n_args <= 1) {
-            return o_in;
-        }
-
-        #if !MICROPY_PY_BUILTINS_ROUND_INT
-        mp_raise_NotImplementedError(NULL);
-        #else
-        mp_int_t num_dig = mp_obj_get_int(args[1]);
-        if (num_dig >= 0) {
-            return o_in;
-        }
-
-        mp_obj_t mult = mp_binary_op(MP_BINARY_OP_POWER, MP_OBJ_NEW_SMALL_INT(10), MP_OBJ_NEW_SMALL_INT(-num_dig));
-        mp_obj_t half_mult =  mp_binary_op(MP_BINARY_OP_FLOOR_DIVIDE, mult, MP_OBJ_NEW_SMALL_INT(2));
-        mp_obj_t modulo = mp_binary_op(MP_BINARY_OP_MODULO, o_in, mult);
-        mp_obj_t rounded = mp_binary_op(MP_BINARY_OP_SUBTRACT, o_in, modulo);
-        if (mp_obj_is_true(mp_binary_op(MP_BINARY_OP_MORE, half_mult, modulo))) {
-            return rounded;
-        } else if (mp_obj_is_true(mp_binary_op(MP_BINARY_OP_MORE, modulo, half_mult))) {
-            return mp_binary_op(MP_BINARY_OP_ADD, rounded, mult);
-        } else {
-            // round to even number
-            mp_obj_t floor = mp_binary_op(MP_BINARY_OP_FLOOR_DIVIDE, o_in, mult);
-            if (mp_obj_is_true(mp_binary_op(MP_BINARY_OP_AND, floor, MP_OBJ_NEW_SMALL_INT(1)))) {
-                return mp_binary_op(MP_BINARY_OP_ADD, rounded, mult);
-            } else {
-                return rounded;
-            }
-        }
-        #endif
-    }
-#if MICROPY_PY_BUILTINS_FLOAT
-    mp_float_t val = mp_obj_get_float(o_in);
-    if (n_args > 1) {
-        mp_int_t num_dig = mp_obj_get_int(args[1]);
-        mp_float_t mult = MICROPY_FLOAT_C_FUN(pow)(10, num_dig);
-        // TODO may lead to overflow
-        mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val * mult) / mult;
-        return mp_obj_new_float(rounded);
-    }
-    mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val);
-    return mp_obj_new_int_from_float(rounded);
-#else
-    mp_int_t r = mp_obj_get_int(o_in);
-    return mp_obj_new_int(r);
-#endif
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_round_obj, 1, 2, mp_builtin_round);
-
-STATIC mp_obj_t mp_builtin_sum(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t value;
-    switch (n_args) {
-        case 1: value = MP_OBJ_NEW_SMALL_INT(0); break;
-        default: value = args[1]; break;
-    }
-    mp_obj_iter_buf_t iter_buf;
-    mp_obj_t iterable = mp_getiter(args[0], &iter_buf);
-    mp_obj_t item;
-    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-        value = mp_binary_op(MP_BINARY_OP_ADD, value, item);
-    }
-    return value;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_sum_obj, 1, 2, mp_builtin_sum);
-
-STATIC mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    if (n_args > 1) {
-        mp_raise_TypeError("must use keyword argument for key function");
-    }
-    mp_obj_t self = mp_type_list.make_new(&mp_type_list, 1, 0, args);
-    mp_obj_list_sort(1, &self, kwargs);
-
-    return self;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_sorted_obj, 1, mp_builtin_sorted);
-
-// See mp_load_attr() if making any changes
-static inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t defval) {
-    mp_obj_t dest[2];
-    // use load_method, raising or not raising exception
-    ((defval == MP_OBJ_NULL) ? mp_load_method : mp_load_method_maybe)(base, attr, dest);
-    if (dest[0] == MP_OBJ_NULL) {
-        return defval;
-    } else if (dest[1] == MP_OBJ_NULL) {
-        // load_method returned just a normal attribute
-        return dest[0];
-    } else {
-        // load_method returned a method, so build a bound method object
-        return mp_obj_new_bound_meth(dest[0], dest[1]);
-    }
-}
-
-STATIC mp_obj_t mp_builtin_getattr(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t defval = MP_OBJ_NULL;
-    if (n_args > 2) {
-        defval = args[2];
-    }
-    return mp_load_attr_default(args[0], mp_obj_str_get_qstr(args[1]), defval);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr);
-
-STATIC mp_obj_t mp_builtin_setattr(mp_obj_t base, mp_obj_t attr, mp_obj_t value) {
-    mp_store_attr(base, mp_obj_str_get_qstr(attr), value);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_3(mp_builtin_setattr_obj, mp_builtin_setattr);
-
-#if MICROPY_CPYTHON_COMPAT
-STATIC mp_obj_t mp_builtin_delattr(mp_obj_t base, mp_obj_t attr) {
-    return mp_builtin_setattr(base, attr, MP_OBJ_NULL);
-}
-MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_delattr_obj, mp_builtin_delattr);
-#endif
-
-STATIC mp_obj_t mp_builtin_hasattr(mp_obj_t object_in, mp_obj_t attr_in) {
-    qstr attr = mp_obj_str_get_qstr(attr_in);
-    mp_obj_t dest[2];
-    mp_load_method_protected(object_in, attr, dest, false);
-    return mp_obj_new_bool(dest[0] != MP_OBJ_NULL);
-}
-MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_hasattr_obj, mp_builtin_hasattr);
-
-STATIC mp_obj_t mp_builtin_globals(void) {
-    return MP_OBJ_FROM_PTR(mp_globals_get());
-}
-MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_globals_obj, mp_builtin_globals);
-
-STATIC mp_obj_t mp_builtin_locals(void) {
-    return MP_OBJ_FROM_PTR(mp_locals_get());
-}
-MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_locals_obj, mp_builtin_locals);
-
-// These are defined in terms of MicroPython API functions right away
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_id_obj, mp_obj_id);
-MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_len_obj, mp_obj_len);
-
-STATIC const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_builtins) },
-
-    // built-in core functions
-    { MP_ROM_QSTR(MP_QSTR___build_class__), MP_ROM_PTR(&mp_builtin___build_class___obj) },
-    { MP_ROM_QSTR(MP_QSTR___import__), MP_ROM_PTR(&mp_builtin___import___obj) },
-    { MP_ROM_QSTR(MP_QSTR___repl_print__), MP_ROM_PTR(&mp_builtin___repl_print___obj) },
-
-    // built-in types
-    { MP_ROM_QSTR(MP_QSTR_bool), MP_ROM_PTR(&mp_type_bool) },
-    { MP_ROM_QSTR(MP_QSTR_bytes), MP_ROM_PTR(&mp_type_bytes) },
-    #if MICROPY_PY_BUILTINS_BYTEARRAY
-    { MP_ROM_QSTR(MP_QSTR_bytearray), MP_ROM_PTR(&mp_type_bytearray) },
-    #endif
-    #if MICROPY_PY_BUILTINS_COMPLEX
-    { MP_ROM_QSTR(MP_QSTR_complex), MP_ROM_PTR(&mp_type_complex) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_dict), MP_ROM_PTR(&mp_type_dict) },
-    #if MICROPY_PY_BUILTINS_ENUMERATE
-    { MP_ROM_QSTR(MP_QSTR_enumerate), MP_ROM_PTR(&mp_type_enumerate) },
-    #endif
-    #if MICROPY_PY_BUILTINS_FILTER
-    { MP_ROM_QSTR(MP_QSTR_filter), MP_ROM_PTR(&mp_type_filter) },
-    #endif
-    #if MICROPY_PY_BUILTINS_FLOAT
-    { MP_ROM_QSTR(MP_QSTR_float), MP_ROM_PTR(&mp_type_float) },
-    #endif
-    #if MICROPY_PY_BUILTINS_SET && MICROPY_PY_BUILTINS_FROZENSET
-    { MP_ROM_QSTR(MP_QSTR_frozenset), MP_ROM_PTR(&mp_type_frozenset) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_int), MP_ROM_PTR(&mp_type_int) },
-    { MP_ROM_QSTR(MP_QSTR_list), MP_ROM_PTR(&mp_type_list) },
-    { MP_ROM_QSTR(MP_QSTR_map), MP_ROM_PTR(&mp_type_map) },
-    #if MICROPY_PY_BUILTINS_MEMORYVIEW
-    { MP_ROM_QSTR(MP_QSTR_memoryview), MP_ROM_PTR(&mp_type_memoryview) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_object), MP_ROM_PTR(&mp_type_object) },
-    #if MICROPY_PY_BUILTINS_PROPERTY
-    { MP_ROM_QSTR(MP_QSTR_property), MP_ROM_PTR(&mp_type_property) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_range), MP_ROM_PTR(&mp_type_range) },
-    #if MICROPY_PY_BUILTINS_REVERSED
-    { MP_ROM_QSTR(MP_QSTR_reversed), MP_ROM_PTR(&mp_type_reversed) },
-    #endif
-    #if MICROPY_PY_BUILTINS_SET
-    { MP_ROM_QSTR(MP_QSTR_set), MP_ROM_PTR(&mp_type_set) },
-    #endif
-    #if MICROPY_PY_BUILTINS_SLICE
-    { MP_ROM_QSTR(MP_QSTR_slice), MP_ROM_PTR(&mp_type_slice) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_str), MP_ROM_PTR(&mp_type_str) },
-    { MP_ROM_QSTR(MP_QSTR_super), MP_ROM_PTR(&mp_type_super) },
-    { MP_ROM_QSTR(MP_QSTR_tuple), MP_ROM_PTR(&mp_type_tuple) },
-    { MP_ROM_QSTR(MP_QSTR_type), MP_ROM_PTR(&mp_type_type) },
-    { MP_ROM_QSTR(MP_QSTR_zip), MP_ROM_PTR(&mp_type_zip) },
-
-    { MP_ROM_QSTR(MP_QSTR_classmethod), MP_ROM_PTR(&mp_type_classmethod) },
-    { MP_ROM_QSTR(MP_QSTR_staticmethod), MP_ROM_PTR(&mp_type_staticmethod) },
-
-    // built-in objects
-    { MP_ROM_QSTR(MP_QSTR_Ellipsis), MP_ROM_PTR(&mp_const_ellipsis_obj) },
-    #if MICROPY_PY_BUILTINS_NOTIMPLEMENTED
-    { MP_ROM_QSTR(MP_QSTR_NotImplemented), MP_ROM_PTR(&mp_const_notimplemented_obj) },
-    #endif
-
-    // built-in user functions
-    { MP_ROM_QSTR(MP_QSTR_abs), MP_ROM_PTR(&mp_builtin_abs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_all), MP_ROM_PTR(&mp_builtin_all_obj) },
-    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&mp_builtin_any_obj) },
-    { MP_ROM_QSTR(MP_QSTR_bin), MP_ROM_PTR(&mp_builtin_bin_obj) },
-    { MP_ROM_QSTR(MP_QSTR_callable), MP_ROM_PTR(&mp_builtin_callable_obj) },
-    #if MICROPY_PY_BUILTINS_COMPILE
-    { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mp_builtin_compile_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_chr), MP_ROM_PTR(&mp_builtin_chr_obj) },
-    #if MICROPY_CPYTHON_COMPAT
-    { MP_ROM_QSTR(MP_QSTR_delattr), MP_ROM_PTR(&mp_builtin_delattr_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_dir), MP_ROM_PTR(&mp_builtin_dir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_divmod), MP_ROM_PTR(&mp_builtin_divmod_obj) },
-    #if MICROPY_PY_BUILTINS_EVAL_EXEC
-    { MP_ROM_QSTR(MP_QSTR_eval), MP_ROM_PTR(&mp_builtin_eval_obj) },
-    { MP_ROM_QSTR(MP_QSTR_exec), MP_ROM_PTR(&mp_builtin_exec_obj) },
-    #endif
-    #if MICROPY_PY_BUILTINS_EXECFILE
-    { MP_ROM_QSTR(MP_QSTR_execfile), MP_ROM_PTR(&mp_builtin_execfile_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_getattr), MP_ROM_PTR(&mp_builtin_getattr_obj) },
-    { MP_ROM_QSTR(MP_QSTR_setattr), MP_ROM_PTR(&mp_builtin_setattr_obj) },
-    { MP_ROM_QSTR(MP_QSTR_globals), MP_ROM_PTR(&mp_builtin_globals_obj) },
-    { MP_ROM_QSTR(MP_QSTR_hasattr), MP_ROM_PTR(&mp_builtin_hasattr_obj) },
-    { MP_ROM_QSTR(MP_QSTR_hash), MP_ROM_PTR(&mp_builtin_hash_obj) },
-    #if MICROPY_PY_BUILTINS_HELP
-    { MP_ROM_QSTR(MP_QSTR_help), MP_ROM_PTR(&mp_builtin_help_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_hex), MP_ROM_PTR(&mp_builtin_hex_obj) },
-    { MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&mp_builtin_id_obj) },
-    #if MICROPY_PY_BUILTINS_INPUT
-    { MP_ROM_QSTR(MP_QSTR_input), MP_ROM_PTR(&mp_builtin_input_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_isinstance), MP_ROM_PTR(&mp_builtin_isinstance_obj) },
-    { MP_ROM_QSTR(MP_QSTR_issubclass), MP_ROM_PTR(&mp_builtin_issubclass_obj) },
-    { MP_ROM_QSTR(MP_QSTR_iter), MP_ROM_PTR(&mp_builtin_iter_obj) },
-    { MP_ROM_QSTR(MP_QSTR_len), MP_ROM_PTR(&mp_builtin_len_obj) },
-    { MP_ROM_QSTR(MP_QSTR_locals), MP_ROM_PTR(&mp_builtin_locals_obj) },
-    #if MICROPY_PY_BUILTINS_MIN_MAX
-    { MP_ROM_QSTR(MP_QSTR_max), MP_ROM_PTR(&mp_builtin_max_obj) },
-    { MP_ROM_QSTR(MP_QSTR_min), MP_ROM_PTR(&mp_builtin_min_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_next), MP_ROM_PTR(&mp_builtin_next_obj) },
-    { MP_ROM_QSTR(MP_QSTR_oct), MP_ROM_PTR(&mp_builtin_oct_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ord), MP_ROM_PTR(&mp_builtin_ord_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pow), MP_ROM_PTR(&mp_builtin_pow_obj) },
-    { MP_ROM_QSTR(MP_QSTR_print), MP_ROM_PTR(&mp_builtin_print_obj) },
-    { MP_ROM_QSTR(MP_QSTR_repr), MP_ROM_PTR(&mp_builtin_repr_obj) },
-    { MP_ROM_QSTR(MP_QSTR_round), MP_ROM_PTR(&mp_builtin_round_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sorted), MP_ROM_PTR(&mp_builtin_sorted_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sum), MP_ROM_PTR(&mp_builtin_sum_obj) },
-
-    // built-in exceptions
-    { MP_ROM_QSTR(MP_QSTR_BaseException), MP_ROM_PTR(&mp_type_BaseException) },
-    { MP_ROM_QSTR(MP_QSTR_ArithmeticError), MP_ROM_PTR(&mp_type_ArithmeticError) },
-    { MP_ROM_QSTR(MP_QSTR_AssertionError), MP_ROM_PTR(&mp_type_AssertionError) },
-    { MP_ROM_QSTR(MP_QSTR_AttributeError), MP_ROM_PTR(&mp_type_AttributeError) },
-    { MP_ROM_QSTR(MP_QSTR_EOFError), MP_ROM_PTR(&mp_type_EOFError) },
-    { MP_ROM_QSTR(MP_QSTR_Exception), MP_ROM_PTR(&mp_type_Exception) },
-    { MP_ROM_QSTR(MP_QSTR_GeneratorExit), MP_ROM_PTR(&mp_type_GeneratorExit) },
-    { MP_ROM_QSTR(MP_QSTR_ImportError), MP_ROM_PTR(&mp_type_ImportError) },
-    { MP_ROM_QSTR(MP_QSTR_IndentationError), MP_ROM_PTR(&mp_type_IndentationError) },
-    { MP_ROM_QSTR(MP_QSTR_IndexError), MP_ROM_PTR(&mp_type_IndexError) },
-    { MP_ROM_QSTR(MP_QSTR_KeyboardInterrupt), MP_ROM_PTR(&mp_type_KeyboardInterrupt) },
-    { MP_ROM_QSTR(MP_QSTR_KeyError), MP_ROM_PTR(&mp_type_KeyError) },
-    { MP_ROM_QSTR(MP_QSTR_LookupError), MP_ROM_PTR(&mp_type_LookupError) },
-    { MP_ROM_QSTR(MP_QSTR_MemoryError), MP_ROM_PTR(&mp_type_MemoryError) },
-    { MP_ROM_QSTR(MP_QSTR_NameError), MP_ROM_PTR(&mp_type_NameError) },
-    { MP_ROM_QSTR(MP_QSTR_NotImplementedError), MP_ROM_PTR(&mp_type_NotImplementedError) },
-    { MP_ROM_QSTR(MP_QSTR_OSError), MP_ROM_PTR(&mp_type_OSError) },
-    { MP_ROM_QSTR(MP_QSTR_OverflowError), MP_ROM_PTR(&mp_type_OverflowError) },
-    { MP_ROM_QSTR(MP_QSTR_RuntimeError), MP_ROM_PTR(&mp_type_RuntimeError) },
-    #if MICROPY_PY_ASYNC_AWAIT
-    { MP_ROM_QSTR(MP_QSTR_StopAsyncIteration), MP_ROM_PTR(&mp_type_StopAsyncIteration) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_StopIteration), MP_ROM_PTR(&mp_type_StopIteration) },
-    { MP_ROM_QSTR(MP_QSTR_SyntaxError), MP_ROM_PTR(&mp_type_SyntaxError) },
-    { MP_ROM_QSTR(MP_QSTR_SystemExit), MP_ROM_PTR(&mp_type_SystemExit) },
-    { MP_ROM_QSTR(MP_QSTR_TypeError), MP_ROM_PTR(&mp_type_TypeError) },
-    #if MICROPY_PY_BUILTINS_STR_UNICODE
-    { MP_ROM_QSTR(MP_QSTR_UnicodeError), MP_ROM_PTR(&mp_type_UnicodeError) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_ValueError), MP_ROM_PTR(&mp_type_ValueError) },
-    #if MICROPY_EMIT_NATIVE
-    { MP_ROM_QSTR(MP_QSTR_ViperTypeError), MP_ROM_PTR(&mp_type_ViperTypeError) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_ZeroDivisionError), MP_ROM_PTR(&mp_type_ZeroDivisionError) },
-    // Somehow CPython managed to have OverflowError not inherit from ValueError ;-/
-    // TODO: For MICROPY_CPYTHON_COMPAT==0 use ValueError to avoid exc proliferation
-
-    // Extra builtins as defined by a port
-    MICROPY_PORT_BUILTINS
-};
-
-MP_DEFINE_CONST_DICT(mp_module_builtins_globals, mp_module_builtins_globals_table);
-
-const mp_obj_module_t mp_module_builtins = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_builtins_globals,
-};
diff --git a/apps/KhiCAS/src/micropython-1.12/py/mpconfig.h~ b/apps/KhiCAS/src/micropython-1.12/py/mpconfig.h~
deleted file mode 100644
index 1e786f753..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/mpconfig.h~
+++ /dev/null
@@ -1,1592 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
-#define MICROPY_INCLUDED_PY_MPCONFIG_H
-
-// Current version of MicroPython
-#define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 12
-#define MICROPY_VERSION_MICRO 0
-
-// Combined version as a 32-bit number for convenience
-#define MICROPY_VERSION ( \
-    MICROPY_VERSION_MAJOR << 16 \
-    | MICROPY_VERSION_MINOR << 8 \
-    | MICROPY_VERSION_MICRO)
-
-// String version
-#define MICROPY_VERSION_STRING \
-    MP_STRINGIFY(MICROPY_VERSION_MAJOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MINOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MICRO)
-
-// This file contains default configuration settings for MicroPython.
-// You can override any of the options below using mpconfigport.h file
-// located in a directory of your port.
-
-// mpconfigport.h is a file containing configuration settings for a
-// particular port. mpconfigport.h is actually a default name for
-// such config, and it can be overridden using MP_CONFIGFILE preprocessor
-// define (you can do that by passing CFLAGS_EXTRA='-DMP_CONFIGFILE="<file.h>"'
-// argument to make when using standard MicroPython makefiles).
-// This is useful to have more than one config per port, for example,
-// release vs debug configs, etc. Note that if you switch from one config
-// to another, you must rebuild from scratch using "-B" switch to make.
-
-#ifdef MP_CONFIGFILE
-#include MP_CONFIGFILE
-#else
-#include <mpconfigport.h>
-#endif
-
-// Any options not explicitly set in mpconfigport.h will get default
-// values below.
-
-/*****************************************************************************/
-/* Object representation                                                     */
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xxx1 : a small int, bits 1 and above are the value
-//  - xxxx...xx10 : a qstr, bits 2 and above are the value
-//  - xxxx...xx00 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_A (0)
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xx01 : a small int, bits 2 and above are the value
-//  - xxxx...xx11 : a qstr, bits 2 and above are the value
-//  - xxxx...xxx0 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_B (1)
-
-// A MicroPython object is a machine word having the following form (called R):
-//  - iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int with 31-bit signed value
-//  - 01111111 1qqqqqqq qqqqqqqq qqqqq110 str with 20-bit qstr value
-//  - s1111111 10000000 00000000 00000010 +/- inf
-//  - s1111111 1xxxxxxx xxxxxxxx xxxxx010 nan, x != 0
-//  - seeeeeee efffffff ffffffff ffffff10 30-bit fp, e != 0xff
-//  - pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Str and float stored as O = R + 0x80800000, retrieved as R = O - 0x80800000.
-// This makes strs easier to encode/decode as they have zeros in the top 9 bits.
-// This scheme only works with 32-bit word size and float enabled.
-#define MICROPY_OBJ_REPR_C (2)
-
-// A MicroPython object is a 64-bit word having the following form (called R):
-//  - seeeeeee eeeeffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff 64-bit fp, e != 0x7ff
-//  - s1111111 11110000 00000000 00000000 00000000 00000000 00000000 00000000 +/- inf
-//  - 01111111 11111000 00000000 00000000 00000000 00000000 00000000 00000000 normalised nan
-//  - 01111111 11111101 iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int
-//  - 01111111 11111110 00000000 00000000 qqqqqqqq qqqqqqqq qqqqqqqq qqqqqqq1 str
-//  - 01111111 11111100 00000000 00000000 pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Stored as O = R + 0x8004000000000000, retrieved as R = O - 0x8004000000000000.
-// This makes pointers have all zeros in the top 32 bits.
-// Small-ints and strs have 1 as LSB to make sure they don't look like pointers
-// to the garbage collector.
-#define MICROPY_OBJ_REPR_D (3)
-
-#ifndef MICROPY_OBJ_REPR
-#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A)
-#endif
-
-/*****************************************************************************/
-/* Memory allocation policy                                                  */
-
-// Number of bytes in memory allocation/GC block. Any size allocated will be
-// rounded up to be multiples of this.
-#ifndef MICROPY_BYTES_PER_GC_BLOCK
-#define MICROPY_BYTES_PER_GC_BLOCK (4 * BYTES_PER_WORD)
-#endif
-
-// Number of words allocated (in BSS) to the GC stack (minimum is 1)
-#ifndef MICROPY_ALLOC_GC_STACK_SIZE
-#define MICROPY_ALLOC_GC_STACK_SIZE (64)
-#endif
-
-// The C-type to use for entries in the GC stack.  By default it allows the
-// heap to be as large as the address space, but the bit-width of this type can
-// be reduced to save memory when the heap is small enough.  The type must be
-// big enough to index all blocks in the heap, which is set by
-// heap-size-in-bytes / MICROPY_BYTES_PER_GC_BLOCK.
-#ifndef MICROPY_GC_STACK_ENTRY_TYPE
-#define MICROPY_GC_STACK_ENTRY_TYPE size_t
-#endif
-
-// Be conservative and always clear to zero newly (re)allocated memory in the GC.
-// This helps eliminate stray pointers that hold on to memory that's no longer
-// used.  It decreases performance due to unnecessary memory clearing.
-// A memory manager which always clears memory can set this to 0.
-// TODO Do analysis to understand why some memory is not properly cleared and
-// find a more efficient way to clear it.
-#ifndef MICROPY_GC_CONSERVATIVE_CLEAR
-#define MICROPY_GC_CONSERVATIVE_CLEAR (MICROPY_ENABLE_GC)
-#endif
-
-// Support automatic GC when reaching allocation threshold,
-// configurable by gc.threshold().
-#ifndef MICROPY_GC_ALLOC_THRESHOLD
-#define MICROPY_GC_ALLOC_THRESHOLD (1)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// interned string data.  Smaller numbers lead to more chunks being needed
-// and more wastage at the end of the chunk.  Larger numbers lead to wasted
-// space at the end when no more strings need interning.
-#ifndef MICROPY_ALLOC_QSTR_CHUNK_INIT
-#define MICROPY_ALLOC_QSTR_CHUNK_INIT (128)
-#endif
-
-// Initial amount for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXER_INDENT_INIT
-#define MICROPY_ALLOC_LEXER_INDENT_INIT (10)
-#endif
-
-// Increment for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXEL_INDENT_INC
-#define MICROPY_ALLOC_LEXEL_INDENT_INC (8)
-#endif
-
-// Initial amount for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INIT
-#define MICROPY_ALLOC_PARSE_RULE_INIT (64)
-#endif
-
-// Increment for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INC
-#define MICROPY_ALLOC_PARSE_RULE_INC (16)
-#endif
-
-// Initial amount for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INIT
-#define MICROPY_ALLOC_PARSE_RESULT_INIT (32)
-#endif
-
-// Increment for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INC
-#define MICROPY_ALLOC_PARSE_RESULT_INC (16)
-#endif
-
-// Strings this length or less will be interned by the parser
-#ifndef MICROPY_ALLOC_PARSE_INTERN_STRING_LEN
-#define MICROPY_ALLOC_PARSE_INTERN_STRING_LEN (10)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// parse nodes.  Small leads to fragmentation, large leads to excess use.
-#ifndef MICROPY_ALLOC_PARSE_CHUNK_INIT
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (128)
-#endif
-
-// Initial amount for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INIT
-#define MICROPY_ALLOC_SCOPE_ID_INIT (4)
-#endif
-
-// Increment for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INC
-#define MICROPY_ALLOC_SCOPE_ID_INC (6)
-#endif
-
-// Maximum length of a path in the filesystem
-// So we can allocate a buffer on the stack for path manipulation in import
-#ifndef MICROPY_ALLOC_PATH_MAX
-#define MICROPY_ALLOC_PATH_MAX (512)
-#endif
-
-// Initial size of module dict
-#ifndef MICROPY_MODULE_DICT_SIZE
-#define MICROPY_MODULE_DICT_SIZE (1)
-#endif
-
-// Whether realloc/free should be passed allocated memory region size
-// You must enable this if MICROPY_MEM_STATS is enabled
-#ifndef MICROPY_MALLOC_USES_ALLOCATED_SIZE
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (0)
-#endif
-
-// Number of bytes used to store qstr length
-// Dictates hard limit on maximum Python identifier length, but 1 byte
-// (limit of 255 bytes in an identifier) should be enough for everyone
-#ifndef MICROPY_QSTR_BYTES_IN_LEN
-#define MICROPY_QSTR_BYTES_IN_LEN (1)
-#endif
-
-// Number of bytes used to store qstr hash
-#ifndef MICROPY_QSTR_BYTES_IN_HASH
-#define MICROPY_QSTR_BYTES_IN_HASH (2)
-#endif
-
-// Avoid using C stack when making Python function calls. C stack still
-// may be used if there's no free heap.
-#ifndef MICROPY_STACKLESS
-#define MICROPY_STACKLESS (0)
-#endif
-
-// Never use C stack when making Python function calls. This may break
-// testsuite as will subtly change which exception is thrown in case
-// of too deep recursion and other similar cases.
-#ifndef MICROPY_STACKLESS_STRICT
-#define MICROPY_STACKLESS_STRICT (0)
-#endif
-
-// Don't use alloca calls. As alloca() is not part of ANSI C, this
-// workaround option is provided for compilers lacking this de-facto
-// standard function. The way it works is allocating from heap, and
-// relying on garbage collection to free it eventually. This is of
-// course much less optimal than real alloca().
-#if defined(MICROPY_NO_ALLOCA) && MICROPY_NO_ALLOCA
-#undef alloca
-#define alloca(x) m_malloc(x)
-#endif
-
-/*****************************************************************************/
-/* MicroPython emitters                                                     */
-
-// Whether to support loading of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_LOAD
-#define MICROPY_PERSISTENT_CODE_LOAD (0)
-#endif
-
-// Whether to support saving of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_SAVE
-#define MICROPY_PERSISTENT_CODE_SAVE (0)
-#endif
-
-// Whether generated code can persist independently of the VM/runtime instance
-// This is enabled automatically when needed by other features
-#ifndef MICROPY_PERSISTENT_CODE
-#define MICROPY_PERSISTENT_CODE (MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether to emit x64 native code
-#ifndef MICROPY_EMIT_X64
-#define MICROPY_EMIT_X64 (0)
-#endif
-
-// Whether to emit x86 native code
-#ifndef MICROPY_EMIT_X86
-#define MICROPY_EMIT_X86 (0)
-#endif
-
-// Whether to emit thumb native code
-#ifndef MICROPY_EMIT_THUMB
-#define MICROPY_EMIT_THUMB (0)
-#endif
-
-// Whether to enable the thumb inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB
-#define MICROPY_EMIT_INLINE_THUMB (0)
-#endif
-
-// Whether to enable ARMv7-M instruction support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_ARMV7M
-#define MICROPY_EMIT_INLINE_THUMB_ARMV7M (1)
-#endif
-
-// Whether to enable float support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_FLOAT
-#define MICROPY_EMIT_INLINE_THUMB_FLOAT (1)
-#endif
-
-// Whether to emit ARM native code
-#ifndef MICROPY_EMIT_ARM
-#define MICROPY_EMIT_ARM (0)
-#endif
-
-// Whether to emit Xtensa native code
-#ifndef MICROPY_EMIT_XTENSA
-#define MICROPY_EMIT_XTENSA (0)
-#endif
-
-// Whether to enable the Xtensa inline assembler
-#ifndef MICROPY_EMIT_INLINE_XTENSA
-#define MICROPY_EMIT_INLINE_XTENSA (0)
-#endif
-
-// Whether to emit Xtensa-Windowed native code
-#ifndef MICROPY_EMIT_XTENSAWIN
-#define MICROPY_EMIT_XTENSAWIN (0)
-#endif
-
-// Convenience definition for whether any native emitter is enabled
-#define MICROPY_EMIT_NATIVE (MICROPY_EMIT_X64 || MICROPY_EMIT_X86 || MICROPY_EMIT_THUMB || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN)
-
-// Select prelude-as-bytes-object for certain emitters
-#define MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ (MICROPY_EMIT_XTENSAWIN)
-
-// Convenience definition for whether any inline assembler emitter is enabled
-#define MICROPY_EMIT_INLINE_ASM (MICROPY_EMIT_INLINE_THUMB || MICROPY_EMIT_INLINE_XTENSA)
-
-// Convenience definition for whether any native or inline assembler emitter is enabled
-#define MICROPY_EMIT_MACHINE_CODE (MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM)
-
-/*****************************************************************************/
-/* Compiler configuration                                                    */
-
-// Whether to include the compiler
-#ifndef MICROPY_ENABLE_COMPILER
-#define MICROPY_ENABLE_COMPILER (1)
-#endif
-
-// Whether the compiler is dynamically configurable (ie at runtime)
-// This will disable the ability to execute native/viper code
-#ifndef MICROPY_DYNAMIC_COMPILER
-#define MICROPY_DYNAMIC_COMPILER (0)
-#endif
-
-// Configure dynamic compiler macros
-#if MICROPY_DYNAMIC_COMPILER
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC (mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode)
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC (mp_dynamic_compiler.py_builtins_str_unicode)
-#else
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC MICROPY_PY_BUILTINS_STR_UNICODE
-#endif
-
-// Whether to enable constant folding; eg 1+2 rewritten as 3
-#ifndef MICROPY_COMP_CONST_FOLDING
-#define MICROPY_COMP_CONST_FOLDING (1)
-#endif
-
-// Whether to enable optimisations for constant literals, eg OrderedDict
-#ifndef MICROPY_COMP_CONST_LITERAL
-#define MICROPY_COMP_CONST_LITERAL (1)
-#endif
-
-// Whether to enable lookup of constants in modules; eg module.CONST
-#ifndef MICROPY_COMP_MODULE_CONST
-#define MICROPY_COMP_MODULE_CONST (0)
-#endif
-
-// Whether to enable constant optimisation; id = const(value)
-#ifndef MICROPY_COMP_CONST
-#define MICROPY_COMP_CONST (1)
-#endif
-
-// Whether to enable optimisation of: a, b = c, d
-// Costs 124 bytes (Thumb2)
-#ifndef MICROPY_COMP_DOUBLE_TUPLE_ASSIGN
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
-#endif
-
-// Whether to enable optimisation of: a, b, c = d, e, f
-// Requires MICROPY_COMP_DOUBLE_TUPLE_ASSIGN and costs 68 bytes (Thumb2)
-#ifndef MICROPY_COMP_TRIPLE_TUPLE_ASSIGN
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#endif
-
-// Whether to enable optimisation of: return a if b else c
-// Costs about 80 bytes (Thumb2) and saves 2 bytes of bytecode for each use
-#ifndef MICROPY_COMP_RETURN_IF_EXPR
-#define MICROPY_COMP_RETURN_IF_EXPR (0)
-#endif
-
-/*****************************************************************************/
-/* Internal debugging stuff                                                  */
-
-// Whether to collect memory allocation stats
-#ifndef MICROPY_MEM_STATS
-#define MICROPY_MEM_STATS (0)
-#endif
-
-// The mp_print_t printer used for debugging output
-#ifndef MICROPY_DEBUG_PRINTER
-#define MICROPY_DEBUG_PRINTER (&mp_plat_print)
-#endif
-
-// Whether to build functions that print debugging info:
-//   mp_bytecode_print
-//   mp_parse_node_print
-#ifndef MICROPY_DEBUG_PRINTERS
-#define MICROPY_DEBUG_PRINTERS (0)
-#endif
-
-// Whether to enable all debugging outputs (it will be extremely verbose)
-#ifndef MICROPY_DEBUG_VERBOSE
-#define MICROPY_DEBUG_VERBOSE (0)
-#endif
-
-// Whether to enable debugging versions of MP_OBJ_NULL/STOP_ITERATION/SENTINEL
-#ifndef MICROPY_DEBUG_MP_OBJ_SENTINELS
-#define MICROPY_DEBUG_MP_OBJ_SENTINELS (0)
-#endif
-
-// Whether to enable a simple VM stack overflow check
-#ifndef MICROPY_DEBUG_VM_STACK_OVERFLOW
-#define MICROPY_DEBUG_VM_STACK_OVERFLOW (0)
-#endif
-
-/*****************************************************************************/
-/* Optimisations                                                             */
-
-// Whether to use computed gotos in the VM, or a switch
-// Computed gotos are roughly 10% faster, and increase VM code size by a little
-// Note: enabling this will use the gcc-specific extensions of ranged designated
-// initialisers and addresses of labels, which are not part of the C99 standard.
-#ifndef MICROPY_OPT_COMPUTED_GOTO
-#define MICROPY_OPT_COMPUTED_GOTO (0)
-#endif
-
-// Whether to cache result of map lookups in LOAD_NAME, LOAD_GLOBAL, LOAD_ATTR,
-// STORE_ATTR bytecodes.  Uses 1 byte extra RAM for each of these opcodes and
-// uses a bit of extra code ROM, but greatly improves lookup speed.
-#ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
-#endif
-
-// Whether to use fast versions of bitwise operations (and, or, xor) when the
-// arguments are both positive.  Increases Thumb2 code size by about 250 bytes.
-#ifndef MICROPY_OPT_MPZ_BITWISE
-#define MICROPY_OPT_MPZ_BITWISE (0)
-#endif
-
-
-// Whether math.factorial is large, fast and recursive (1) or small and slow (0).
-#ifndef MICROPY_OPT_MATH_FACTORIAL
-#define MICROPY_OPT_MATH_FACTORIAL (0)
-#endif
-
-/*****************************************************************************/
-/* Python internal features                                                  */
-
-// Whether to enable import of external modules
-// When disabled, only importing of built-in modules is supported
-// When enabled, a port must implement mp_import_stat (among other things)
-#ifndef MICROPY_ENABLE_EXTERNAL_IMPORT
-#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
-#endif
-
-// Whether to use the POSIX reader for importing files
-#ifndef MICROPY_READER_POSIX
-#define MICROPY_READER_POSIX (0)
-#endif
-
-// Whether to use the VFS reader for importing files
-#ifndef MICROPY_READER_VFS
-#define MICROPY_READER_VFS (0)
-#endif
-
-// Whether any readers have been defined
-#ifndef MICROPY_HAS_FILE_READER
-#define MICROPY_HAS_FILE_READER (MICROPY_READER_POSIX || MICROPY_READER_VFS)
-#endif
-
-// Hook for the VM at the start of the opcode loop (can contain variable
-// definitions usable by the other hook functions)
-#ifndef MICROPY_VM_HOOK_INIT
-#define MICROPY_VM_HOOK_INIT
-#endif
-
-// Hook for the VM during the opcode loop (but only after jump opcodes)
-#ifndef MICROPY_VM_HOOK_LOOP
-#define MICROPY_VM_HOOK_LOOP
-#endif
-
-// Hook for the VM just before return opcode is finished being interpreted
-#ifndef MICROPY_VM_HOOK_RETURN
-#define MICROPY_VM_HOOK_RETURN
-#endif
-
-// Whether to include the garbage collector
-#ifndef MICROPY_ENABLE_GC
-#define MICROPY_ENABLE_GC (0)
-#endif
-
-// Whether to enable finalisers in the garbage collector (ie call __del__)
-#ifndef MICROPY_ENABLE_FINALISER
-#define MICROPY_ENABLE_FINALISER (0)
-#endif
-
-// Whether to enable a separate allocator for the Python stack.
-// If enabled then the code must call mp_pystack_init before mp_init.
-#ifndef MICROPY_ENABLE_PYSTACK
-#define MICROPY_ENABLE_PYSTACK (0)
-#endif
-
-// Number of bytes that memory returned by mp_pystack_alloc will be aligned by.
-#ifndef MICROPY_PYSTACK_ALIGN
-#define MICROPY_PYSTACK_ALIGN (8)
-#endif
-
-// Whether to check C stack usage. C stack used for calling Python functions,
-// etc. Not checking means segfault on overflow.
-#ifndef MICROPY_STACK_CHECK
-#define MICROPY_STACK_CHECK (0)
-#endif
-
-// Whether to have an emergency exception buffer
-#ifndef MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (0)
-#endif
-#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#   ifndef MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE
-#   define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)   // 0 - implies dynamic allocation
-#   endif
-#endif
-
-// Whether to provide the mp_kbd_exception object, and micropython.kbd_intr function
-#ifndef MICROPY_KBD_EXCEPTION
-#define MICROPY_KBD_EXCEPTION (0)
-#endif
-
-// Prefer to raise KeyboardInterrupt asynchronously (from signal or interrupt
-// handler) - if supported by a particular port.
-#ifndef MICROPY_ASYNC_KBD_INTR
-#define MICROPY_ASYNC_KBD_INTR (0)
-#endif
-
-// Whether to include REPL helper function
-#ifndef MICROPY_HELPER_REPL
-#define MICROPY_HELPER_REPL (0)
-#endif
-
-// Whether to include emacs-style readline behavior in REPL
-#ifndef MICROPY_REPL_EMACS_KEYS
-#define MICROPY_REPL_EMACS_KEYS (0)
-#endif
-
-// Whether to implement auto-indent in REPL
-#ifndef MICROPY_REPL_AUTO_INDENT
-#define MICROPY_REPL_AUTO_INDENT (0)
-#endif
-
-// Whether port requires event-driven REPL functions
-#ifndef MICROPY_REPL_EVENT_DRIVEN
-#define MICROPY_REPL_EVENT_DRIVEN (0)
-#endif
-
-// Whether to include lexer helper function for unix
-#ifndef MICROPY_HELPER_LEXER_UNIX
-#define MICROPY_HELPER_LEXER_UNIX (0)
-#endif
-
-// Long int implementation
-#define MICROPY_LONGINT_IMPL_NONE (0)
-#define MICROPY_LONGINT_IMPL_LONGLONG (1)
-#define MICROPY_LONGINT_IMPL_MPZ (2)
-
-#ifndef MICROPY_LONGINT_IMPL
-#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_NONE)
-#endif
-
-#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
-typedef long long mp_longint_impl_t;
-#endif
-
-// Whether to include information in the byte code to determine source
-// line number (increases RAM usage, but doesn't slow byte code execution)
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE (0)
-#endif
-
-// Whether to include doc strings (increases RAM usage)
-#ifndef MICROPY_ENABLE_DOC_STRING
-#define MICROPY_ENABLE_DOC_STRING (0)
-#endif
-
-// Exception messages are short static strings
-#define MICROPY_ERROR_REPORTING_TERSE    (1)
-// Exception messages provide basic error details
-#define MICROPY_ERROR_REPORTING_NORMAL   (2)
-// Exception messages provide full info, e.g. object names
-#define MICROPY_ERROR_REPORTING_DETAILED (3)
-
-#ifndef MICROPY_ERROR_REPORTING
-#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL)
-#endif
-
-// Whether issue warnings during compiling/execution
-#ifndef MICROPY_WARNINGS
-#define MICROPY_WARNINGS (0)
-#endif
-
-// Whether to support warning categories
-#ifndef MICROPY_WARNINGS_CATEGORY
-#define MICROPY_WARNINGS_CATEGORY (0)
-#endif
-
-// This macro is used when printing runtime warnings and errors
-#ifndef MICROPY_ERROR_PRINTER
-#define MICROPY_ERROR_PRINTER (&mp_plat_print)
-#endif
-
-// Float and complex implementation
-#define MICROPY_FLOAT_IMPL_NONE (0)
-#define MICROPY_FLOAT_IMPL_FLOAT (1)
-#define MICROPY_FLOAT_IMPL_DOUBLE (2)
-
-#ifndef MICROPY_FLOAT_IMPL
-#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_NONE)
-#endif
-
-#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x##F
-#define MICROPY_FLOAT_C_FUN(fun) fun##f
-typedef float mp_float_t;
-#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x
-#define MICROPY_FLOAT_C_FUN(fun) fun
-typedef double mp_float_t;
-#else
-#define MICROPY_PY_BUILTINS_FLOAT (0)
-#endif
-
-#ifndef MICROPY_PY_BUILTINS_COMPLEX
-#define MICROPY_PY_BUILTINS_COMPLEX (MICROPY_PY_BUILTINS_FLOAT)
-#endif
-
-// Whether to provide a high-quality hash for float and complex numbers.
-// Otherwise the default is a very simple but correct hashing function.
-#ifndef MICROPY_FLOAT_HIGH_QUALITY_HASH
-#define MICROPY_FLOAT_HIGH_QUALITY_HASH (0)
-#endif
-
-// Enable features which improve CPython compatibility
-// but may lead to more code size/memory usage.
-// TODO: Originally intended as generic category to not
-// add bunch of once-off options. May need refactoring later
-#ifndef MICROPY_CPYTHON_COMPAT
-#define MICROPY_CPYTHON_COMPAT (1)
-#endif
-
-// Perform full checks as done by CPython. Disabling this
-// may produce incorrect results, if incorrect data is fed,
-// but should not lead to MicroPython crashes or similar
-// grave issues (in other words, only user app should be,
-// affected, not system).
-#ifndef MICROPY_FULL_CHECKS
-#define MICROPY_FULL_CHECKS (1)
-#endif
-
-// Whether POSIX-semantics non-blocking streams are supported
-#ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK (0)
-#endif
-
-// Whether to provide stream functions with POSIX-like signatures
-// (useful for porting existing libraries to MicroPython).
-#ifndef MICROPY_STREAMS_POSIX_API
-#define MICROPY_STREAMS_POSIX_API (0)
-#endif
-
-// Whether to call __init__ when importing builtin modules for the first time
-#ifndef MICROPY_MODULE_BUILTIN_INIT
-#define MICROPY_MODULE_BUILTIN_INIT (0)
-#endif
-
-// Whether to support module-level __getattr__ (see PEP 562)
-#ifndef MICROPY_MODULE_GETATTR
-#define MICROPY_MODULE_GETATTR (0)
-#endif
-
-// Whether module weak links are supported
-#ifndef MICROPY_MODULE_WEAK_LINKS
-#define MICROPY_MODULE_WEAK_LINKS (0)
-#endif
-
-// Whether frozen modules are supported in the form of strings
-#ifndef MICROPY_MODULE_FROZEN_STR
-#define MICROPY_MODULE_FROZEN_STR (0)
-#endif
-
-// Whether frozen modules are supported in the form of .mpy files
-#ifndef MICROPY_MODULE_FROZEN_MPY
-#define MICROPY_MODULE_FROZEN_MPY (0)
-#endif
-
-// Convenience macro for whether frozen modules are supported
-#ifndef MICROPY_MODULE_FROZEN
-#define MICROPY_MODULE_FROZEN (MICROPY_MODULE_FROZEN_STR || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether you can override builtins in the builtins module
-#ifndef MICROPY_CAN_OVERRIDE_BUILTINS
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
-#endif
-
-// Whether to check that the "self" argument of a builtin method has the
-// correct type.  Such an explicit check is only needed if a builtin
-// method escapes to Python land without a first argument, eg
-// list.append([], 1).  Without this check such calls will have undefined
-// behaviour (usually segfault) if the first argument is the wrong type.
-#ifndef MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
-#endif
-
-// Whether to use internally defined errno's (otherwise system provided ones)
-#ifndef MICROPY_USE_INTERNAL_ERRNO
-#define MICROPY_USE_INTERNAL_ERRNO (0)
-#endif
-
-// Whether to use internally defined *printf() functions (otherwise external ones)
-#ifndef MICROPY_USE_INTERNAL_PRINTF
-#define MICROPY_USE_INTERNAL_PRINTF (1)
-#endif
-
-// Support for internal scheduler
-#ifndef MICROPY_ENABLE_SCHEDULER
-#define MICROPY_ENABLE_SCHEDULER (0)
-#endif
-
-// Maximum number of entries in the scheduler
-#ifndef MICROPY_SCHEDULER_DEPTH
-#define MICROPY_SCHEDULER_DEPTH (4)
-#endif
-
-// Support for generic VFS sub-system
-#ifndef MICROPY_VFS
-#define MICROPY_VFS (0)
-#endif
-
-// Support for VFS POSIX component, to mount a POSIX filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_POSIX (0)
-#endif
-
-// Support for VFS FAT component, to mount a FAT filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_FAT (0)
-#endif
-
-/*****************************************************************************/
-/* Fine control over Python builtins, classes, modules, etc                  */
-
-// Whether to support multiple inheritance of Python classes.  Multiple
-// inheritance makes some C functions inherently recursive, and adds a bit of
-// code overhead.
-#ifndef MICROPY_MULTIPLE_INHERITANCE
-#define MICROPY_MULTIPLE_INHERITANCE (1)
-#endif
-
-// Whether to implement attributes on functions
-#ifndef MICROPY_PY_FUNCTION_ATTRS
-#define MICROPY_PY_FUNCTION_ATTRS (0)
-#endif
-
-// Whether to support the descriptors __get__, __set__, __delete__
-// This costs some code size and makes load/store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DESCRIPTORS
-#define MICROPY_PY_DESCRIPTORS (0)
-#endif
-
-// Whether to support class __delattr__ and __setattr__ methods
-// This costs some code size and makes store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DELATTR_SETATTR
-#define MICROPY_PY_DELATTR_SETATTR (0)
-#endif
-
-// Support for async/await/async for/async with
-#ifndef MICROPY_PY_ASYNC_AWAIT
-#define MICROPY_PY_ASYNC_AWAIT (1)
-#endif
-
-// Non-standard .pend_throw() method for generators, allowing for
-// Future-like behavior with respect to exception handling: an
-// exception set with .pend_throw() will activate on the next call
-// to generator's .send() or .__next__(). (This is useful to implement
-// async schedulers.)
-#ifndef MICROPY_PY_GENERATOR_PEND_THROW
-#define MICROPY_PY_GENERATOR_PEND_THROW (1)
-#endif
-
-// Issue a warning when comparing str and bytes objects
-#ifndef MICROPY_PY_STR_BYTES_CMP_WARN
-#define MICROPY_PY_STR_BYTES_CMP_WARN (0)
-#endif
-
-// Whether str object is proper unicode
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
-#endif
-
-// Whether to check for valid UTF-8 when converting bytes to str
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
-#define MICROPY_PY_BUILTINS_STR_UNICODE_CHECK (MICROPY_PY_BUILTINS_STR_UNICODE)
-#endif
-
-// Whether str.center() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_CENTER
-#define MICROPY_PY_BUILTINS_STR_CENTER (0)
-#endif
-
-// Whether str.count() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_COUNT
-#define MICROPY_PY_BUILTINS_STR_COUNT (1)
-#endif
-
-// Whether str % (...) formatting operator provided
-#ifndef MICROPY_PY_BUILTINS_STR_OP_MODULO
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
-#endif
-
-// Whether str.partition()/str.rpartition() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_PARTITION
-#define MICROPY_PY_BUILTINS_STR_PARTITION (0)
-#endif
-
-// Whether str.splitlines() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_SPLITLINES
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
-#endif
-
-// Whether to support bytearray object
-#ifndef MICROPY_PY_BUILTINS_BYTEARRAY
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
-#endif
-
-// Whether to support dict.fromkeys() class method
-#ifndef MICROPY_PY_BUILTINS_DICT_FROMKEYS
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
-#endif
-
-// Whether to support memoryview object
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#endif
-
-// Whether to support memoryview.itemsize attribute
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (0)
-#endif
-
-// Whether to support set object
-#ifndef MICROPY_PY_BUILTINS_SET
-#define MICROPY_PY_BUILTINS_SET (1)
-#endif
-
-// Whether to support slice subscript operators and slice object
-#ifndef MICROPY_PY_BUILTINS_SLICE
-#define MICROPY_PY_BUILTINS_SLICE (1)
-#endif
-
-// Whether to support slice attribute read access,
-// i.e. slice.start, slice.stop, slice.step
-#ifndef MICROPY_PY_BUILTINS_SLICE_ATTRS
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
-#endif
-
-// Whether to support frozenset object
-#ifndef MICROPY_PY_BUILTINS_FROZENSET
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#endif
-
-// Whether to support property object
-#ifndef MICROPY_PY_BUILTINS_PROPERTY
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
-#endif
-
-// Whether to implement the start/stop/step attributes (readback) on
-// the "range" builtin type. Rarely used, and costs ~60 bytes (x86).
-#ifndef MICROPY_PY_BUILTINS_RANGE_ATTRS
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
-#endif
-
-// Whether to support binary ops [only (in)equality is defined] between range
-// objects.  With this option disabled all range objects that are not exactly
-// the same object will compare as not-equal.  With it enabled the semantics
-// match CPython and ranges are equal if they yield the same sequence of items.
-#ifndef MICROPY_PY_BUILTINS_RANGE_BINOP
-#define MICROPY_PY_BUILTINS_RANGE_BINOP (0)
-#endif
-
-// Support for callling next() with second argument
-#ifndef MICROPY_PY_BUILTINS_NEXT2
-#define MICROPY_PY_BUILTINS_NEXT2 (0)
-#endif
-
-// Whether to support rounding of integers (incl bignum); eg round(123,-1)=120
-#ifndef MICROPY_PY_BUILTINS_ROUND_INT
-#define MICROPY_PY_BUILTINS_ROUND_INT (0)
-#endif
-
-// Whether to support timeout exceptions (like socket.timeout)
-#ifndef MICROPY_PY_BUILTINS_TIMEOUTERROR
-#define MICROPY_PY_BUILTINS_TIMEOUTERROR (0)
-#endif
-
-// Whether to support complete set of special methods for user
-// classes, or only the most used ones. "Inplace" methods are
-// controlled by MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS below.
-// "Reverse" methods are controlled by
-// MICROPY_PY_REVERSE_SPECIAL_METHODS below.
-#ifndef MICROPY_PY_ALL_SPECIAL_METHODS
-#define MICROPY_PY_ALL_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support all inplace arithmetic operarion methods
-// (__imul__, etc.)
-#ifndef MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
-#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support reverse arithmetic operarion methods
-// (__radd__, etc.). Additionally gated by
-// MICROPY_PY_ALL_SPECIAL_METHODS.
-#ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support compile function
-#ifndef MICROPY_PY_BUILTINS_COMPILE
-#define MICROPY_PY_BUILTINS_COMPILE (0)
-#endif
-
-// Whether to support enumerate function(type)
-#ifndef MICROPY_PY_BUILTINS_ENUMERATE
-#define MICROPY_PY_BUILTINS_ENUMERATE (1)
-#endif
-
-// Whether to support eval and exec functions
-// By default they are supported if the compiler is enabled
-#ifndef MICROPY_PY_BUILTINS_EVAL_EXEC
-#define MICROPY_PY_BUILTINS_EVAL_EXEC (MICROPY_ENABLE_COMPILER)
-#endif
-
-// Whether to support the Python 2 execfile function
-#ifndef MICROPY_PY_BUILTINS_EXECFILE
-#define MICROPY_PY_BUILTINS_EXECFILE (0)
-#endif
-
-// Whether to support filter function(type)
-#ifndef MICROPY_PY_BUILTINS_FILTER
-#define MICROPY_PY_BUILTINS_FILTER (1)
-#endif
-
-// Whether to support reversed function(type)
-#ifndef MICROPY_PY_BUILTINS_REVERSED
-#define MICROPY_PY_BUILTINS_REVERSED (1)
-#endif
-
-// Whether to define "NotImplemented" special constant
-#ifndef MICROPY_PY_BUILTINS_NOTIMPLEMENTED
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
-#endif
-
-// Whether to provide the built-in input() function. The implementation of this
-// uses mp-readline, so can only be enabled if the port uses this readline.
-#ifndef MICROPY_PY_BUILTINS_INPUT
-#define MICROPY_PY_BUILTINS_INPUT (0)
-#endif
-
-// Whether to support min/max functions
-#ifndef MICROPY_PY_BUILTINS_MIN_MAX
-#define MICROPY_PY_BUILTINS_MIN_MAX (1)
-#endif
-
-// Support for calls to pow() with 3 integer arguments
-#ifndef MICROPY_PY_BUILTINS_POW3
-#define MICROPY_PY_BUILTINS_POW3 (0)
-#endif
-
-// Whether to provide the help function
-#ifndef MICROPY_PY_BUILTINS_HELP
-#define MICROPY_PY_BUILTINS_HELP (0)
-#endif
-
-// Use this to configure the help text shown for help().  It should be a
-// variable with the type "const char*".  A sensible default is provided.
-#ifndef MICROPY_PY_BUILTINS_HELP_TEXT
-#define MICROPY_PY_BUILTINS_HELP_TEXT mp_help_default_text
-#endif
-
-// Add the ability to list the available modules when executing help('modules')
-#ifndef MICROPY_PY_BUILTINS_HELP_MODULES
-#define MICROPY_PY_BUILTINS_HELP_MODULES (0)
-#endif
-
-// Whether to set __file__ for imported modules
-#ifndef MICROPY_PY___FILE__
-#define MICROPY_PY___FILE__ (1)
-#endif
-
-// Whether to provide mem-info related functions in micropython module
-#ifndef MICROPY_PY_MICROPYTHON_MEM_INFO
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
-#endif
-
-// Whether to provide "micropython.stack_use" function
-#ifndef MICROPY_PY_MICROPYTHON_STACK_USE
-#define MICROPY_PY_MICROPYTHON_STACK_USE (MICROPY_PY_MICROPYTHON_MEM_INFO)
-#endif
-
-// Whether to provide "array" module. Note that large chunk of the
-// underlying code is shared with "bytearray" builtin type, so to
-// get real savings, it should be disabled too.
-#ifndef MICROPY_PY_ARRAY
-#define MICROPY_PY_ARRAY (1)
-#endif
-
-// Whether to support slice assignments for array (and bytearray).
-// This is rarely used, but adds ~0.5K of code.
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (0)
-#endif
-
-// Whether to support attrtuple type (MicroPython extension)
-// It provides space-efficient tuples with attribute access
-#ifndef MICROPY_PY_ATTRTUPLE
-#define MICROPY_PY_ATTRTUPLE (1)
-#endif
-
-// Whether to provide "collections" module
-#ifndef MICROPY_PY_COLLECTIONS
-#define MICROPY_PY_COLLECTIONS (1)
-#endif
-
-// Whether to provide "ucollections.deque" type
-#ifndef MICROPY_PY_COLLECTIONS_DEQUE
-#define MICROPY_PY_COLLECTIONS_DEQUE (0)
-#endif
-
-// Whether to provide "collections.OrderedDict" type
-#ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
-#endif
-
-// Whether to provide the _asdict function for namedtuple
-#ifndef MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT
-#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (0)
-#endif
-
-// Whether to provide "math" module
-#ifndef MICROPY_PY_MATH
-#define MICROPY_PY_MATH (1)
-#endif
-
-// Whether to provide special math functions: math.{erf,erfc,gamma,lgamma}
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
-#endif
-
-// Whether to provide math.factorial function
-#ifndef MICROPY_PY_MATH_FACTORIAL
-#define MICROPY_PY_MATH_FACTORIAL (0)
-#endif
-
-// Whether to provide math.isclose function
-#ifndef MICROPY_PY_MATH_ISCLOSE
-#define MICROPY_PY_MATH_ISCLOSE (0)
-#endif
-
-// Whether to provide "cmath" module
-#ifndef MICROPY_PY_CMATH
-#define MICROPY_PY_CMATH (0)
-#endif
-
-// Whether to provide "gc" module
-#ifndef MICROPY_PY_GC
-#define MICROPY_PY_GC (1)
-#endif
-
-// Whether to return number of collected objects from gc.collect()
-#ifndef MICROPY_PY_GC_COLLECT_RETVAL
-#define MICROPY_PY_GC_COLLECT_RETVAL (0)
-#endif
-
-// Whether to provide "io" module
-#ifndef MICROPY_PY_IO
-#define MICROPY_PY_IO (1)
-#endif
-
-// Whether to provide "io.IOBase" class to support user streams
-#ifndef MICROPY_PY_IO_IOBASE
-#define MICROPY_PY_IO_IOBASE (0)
-#endif
-
-// Whether to provide "uio.resource_stream()" function with
-// the semantics of CPython's pkg_resources.resource_stream()
-// (allows to access binary resources in frozen source packages).
-// Note that the same functionality can be achieved in "pure
-// Python" by prepocessing binary resources into Python source
-// and bytecode-freezing it (with a simple helper module available
-// e.g. in micropython-lib).
-#ifndef MICROPY_PY_IO_RESOURCE_STREAM
-#define MICROPY_PY_IO_RESOURCE_STREAM (0)
-#endif
-
-// Whether to provide "io.FileIO" class
-#ifndef MICROPY_PY_IO_FILEIO
-#define MICROPY_PY_IO_FILEIO (0)
-#endif
-
-// Whether to provide "io.BytesIO" class
-#ifndef MICROPY_PY_IO_BYTESIO
-#define MICROPY_PY_IO_BYTESIO (1)
-#endif
-
-// Whether to provide "io.BufferedWriter" class
-#ifndef MICROPY_PY_IO_BUFFEREDWRITER
-#define MICROPY_PY_IO_BUFFEREDWRITER (0)
-#endif
-
-// Whether to provide "struct" module
-#ifndef MICROPY_PY_STRUCT
-#define MICROPY_PY_STRUCT (1)
-#endif
-
-// Whether to provide "sys" module
-#ifndef MICROPY_PY_SYS
-#define MICROPY_PY_SYS (1)
-#endif
-
-// Whether to provide "sys.maxsize" constant
-#ifndef MICROPY_PY_SYS_MAXSIZE
-#define MICROPY_PY_SYS_MAXSIZE (0)
-#endif
-
-// Whether to provide "sys.modules" dictionary
-#ifndef MICROPY_PY_SYS_MODULES
-#define MICROPY_PY_SYS_MODULES (1)
-#endif
-
-// Whether to provide "sys.exc_info" function
-// Avoid enabling this, this function is Python2 heritage
-#ifndef MICROPY_PY_SYS_EXC_INFO
-#define MICROPY_PY_SYS_EXC_INFO (0)
-#endif
-
-// Whether to provide "sys.exit" function
-#ifndef MICROPY_PY_SYS_EXIT
-#define MICROPY_PY_SYS_EXIT (1)
-#endif
-
-// Whether to provide "sys.atexit" function (MicroPython extension)
-#ifndef MICROPY_PY_SYS_ATEXIT
-#define MICROPY_PY_SYS_ATEXIT (0)
-#endif
-
-// Whether to provide "sys.settrace" function
-#ifndef MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PY_SYS_SETTRACE (0)
-#endif
-
-// Whether to provide "sys.getsizeof" function
-#ifndef MICROPY_PY_SYS_GETSIZEOF
-#define MICROPY_PY_SYS_GETSIZEOF (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr} objects
-#ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr}.buffer object
-// This is implemented per-port
-#ifndef MICROPY_PY_SYS_STDIO_BUFFER
-#define MICROPY_PY_SYS_STDIO_BUFFER (0)
-#endif
-
-// Whether to provide "uerrno" module
-#ifndef MICROPY_PY_UERRNO
-#define MICROPY_PY_UERRNO (0)
-#endif
-
-// Whether to provide the uerrno.errorcode dict
-#ifndef MICROPY_PY_UERRNO_ERRORCODE
-#define MICROPY_PY_UERRNO_ERRORCODE (1)
-#endif
-
-// Whether to provide "uselect" module (baremetal implementation)
-#ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT (0)
-#endif
-
-// Whether to provide "utime" module functions implementation
-// in terms of mp_hal_* functions.
-#ifndef MICROPY_PY_UTIME_MP_HAL
-#define MICROPY_PY_UTIME_MP_HAL (0)
-#endif
-
-// Period of values returned by utime.ticks_ms(), ticks_us(), ticks_cpu()
-// functions. Should be power of two. All functions above use the same
-// period, so if underlying hardware/API has different periods, the
-// minimum of them should be used. The value below is the maximum value
-// this parameter can take (corresponding to 30 bit tick values on 32-bit
-// system).
-#ifndef MICROPY_PY_UTIME_TICKS_PERIOD
-#define MICROPY_PY_UTIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1)
-#endif
-
-// Whether to provide "_thread" module
-#ifndef MICROPY_PY_THREAD
-#define MICROPY_PY_THREAD (0)
-#endif
-
-// Whether to make the VM/runtime thread-safe using a global lock
-// If not enabled then thread safety must be provided at the Python level
-#ifndef MICROPY_PY_THREAD_GIL
-#define MICROPY_PY_THREAD_GIL (MICROPY_PY_THREAD)
-#endif
-
-// Number of VM jump-loops to do before releasing the GIL.
-// Set this to 0 to disable the divisor.
-#ifndef MICROPY_PY_THREAD_GIL_VM_DIVISOR
-#define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32)
-#endif
-
-// Extended modules
-
-#ifndef MICROPY_PY_UCTYPES
-#define MICROPY_PY_UCTYPES (0)
-#endif
-
-// Whether to provide SHORT, INT, LONG, etc. types in addition to
-// exact-bitness types like INT16, INT32, etc.
-#ifndef MICROPY_PY_UCTYPES_NATIVE_C_TYPES
-#define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1)
-#endif
-
-#ifndef MICROPY_PY_UZLIB
-#define MICROPY_PY_UZLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UJSON
-#define MICROPY_PY_UJSON (0)
-#endif
-
-#ifndef MICROPY_PY_URE
-#define MICROPY_PY_URE (0)
-#endif
-
-#ifndef MICROPY_PY_URE_DEBUG
-#define MICROPY_PY_URE_DEBUG (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_GROUPS
-#define MICROPY_PY_URE_MATCH_GROUPS (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_SPAN_START_END
-#define MICROPY_PY_URE_MATCH_SPAN_START_END (0)
-#endif
-
-#ifndef MICROPY_PY_URE_SUB
-#define MICROPY_PY_URE_SUB (0)
-#endif
-
-#ifndef MICROPY_PY_UHEAPQ
-#define MICROPY_PY_UHEAPQ (0)
-#endif
-
-// Optimized heap queue for relative timestamps
-#ifndef MICROPY_PY_UTIMEQ
-#define MICROPY_PY_UTIMEQ (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB
-#define MICROPY_PY_UHASHLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_MD5
-#define MICROPY_PY_UHASHLIB_MD5 (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA1
-#define MICROPY_PY_UHASHLIB_SHA1  (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA256
-#define MICROPY_PY_UHASHLIB_SHA256 (1)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB
-#define MICROPY_PY_UCRYPTOLIB (0)
-#endif
-
-// Depends on MICROPY_PY_UCRYPTOLIB
-#ifndef MICROPY_PY_UCRYPTOLIB_CTR
-#define MICROPY_PY_UCRYPTOLIB_CTR (0)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB_CONSTS
-#define MICROPY_PY_UCRYPTOLIB_CONSTS (0)
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII (0)
-#endif
-
-// Depends on MICROPY_PY_UZLIB
-#ifndef MICROPY_PY_UBINASCII_CRC32
-#define MICROPY_PY_UBINASCII_CRC32 (0)
-#endif
-
-#ifndef MICROPY_PY_URANDOM
-#define MICROPY_PY_URANDOM (0)
-#endif
-
-// Whether to include: randrange, randint, choice, random, uniform
-#ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE
-#define MICROPY_PY_MACHINE (0)
-#endif
-
-// Whether to include: time_pulse_us
-#ifndef MICROPY_PY_MACHINE_PULSE
-#define MICROPY_PY_MACHINE_PULSE (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_I2C
-#define MICROPY_PY_MACHINE_I2C (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_SPI
-#define MICROPY_PY_MACHINE_SPI (0)
-#endif
-
-#ifndef MICROPY_PY_USSL
-#define MICROPY_PY_USSL (0)
-// Whether to add finaliser code to ussl objects
-#define MICROPY_PY_USSL_FINALISER (0)
-#endif
-
-#ifndef MICROPY_PY_UWEBSOCKET
-#define MICROPY_PY_UWEBSOCKET (0)
-#endif
-
-#ifndef MICROPY_PY_FRAMEBUF
-#define MICROPY_PY_FRAMEBUF (0)
-#endif
-
-#ifndef MICROPY_PY_BTREE
-#define MICROPY_PY_BTREE (0)
-#endif
-
-/*****************************************************************************/
-/* Hooks for a port to add builtins                                          */
-
-// Additional builtin function definitions - see modbuiltins.c:mp_module_builtins_globals_table for format.
-#ifndef MICROPY_PORT_BUILTINS
-#define MICROPY_PORT_BUILTINS
-#endif
-
-// Additional builtin module definitions - see objmodule.c:mp_builtin_module_table for format.
-#ifndef MICROPY_PORT_BUILTIN_MODULES
-#define MICROPY_PORT_BUILTIN_MODULES
-#endif
-
-// Additional constant definitions for the compiler - see compile.c:mp_constants_table.
-#ifndef MICROPY_PORT_CONSTANTS
-#define MICROPY_PORT_CONSTANTS
-#endif
-
-// Any root pointers for GC scanning - see mpstate.c
-#ifndef MICROPY_PORT_ROOT_POINTERS
-#define MICROPY_PORT_ROOT_POINTERS
-#endif
-
-/*****************************************************************************/
-/* Miscellaneous settings                                                    */
-
-// All uPy objects in ROM must be aligned on at least a 4 byte boundary
-// so that the small-int/qstr/pointer distinction can be made.  For machines
-// that don't do this (eg 16-bit CPU), define the following macro to something
-// like __attribute__((aligned(4))).
-#ifndef MICROPY_OBJ_BASE_ALIGNMENT
-#define MICROPY_OBJ_BASE_ALIGNMENT
-#endif
-
-// On embedded platforms, these will typically enable/disable irqs.
-#ifndef MICROPY_BEGIN_ATOMIC_SECTION
-#define MICROPY_BEGIN_ATOMIC_SECTION() (0)
-#endif
-#ifndef MICROPY_END_ATOMIC_SECTION
-#define MICROPY_END_ATOMIC_SECTION(state) (void)(state)
-#endif
-
-// Allow to override static modifier for global objects, e.g. to use with
-// object code analysis tools which don't support static symbols.
-#ifndef STATIC
-#define STATIC static
-#endif
-
-// Number of bytes in a word
-#ifndef BYTES_PER_WORD
-#define BYTES_PER_WORD (sizeof(mp_uint_t))
-#endif
-
-#define BITS_PER_BYTE (8)
-#define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD)
-// mp_int_t value with most significant bit set
-#define WORD_MSBIT_HIGH (((mp_uint_t)1) << (BYTES_PER_WORD * 8 - 1))
-
-// Make sure both MP_ENDIANNESS_LITTLE and MP_ENDIANNESS_BIG are
-// defined and that they are the opposite of each other.
-#if defined(MP_ENDIANNESS_LITTLE)
-#define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#elif defined(MP_ENDIANNESS_BIG)
-#define MP_ENDIANNESS_LITTLE (!MP_ENDIANNESS_BIG)
-#else
-  // Endianness not defined by port so try to autodetect it.
-  #if defined(__BYTE_ORDER__)
-    #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (1)
-    #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (0)
-    #endif
-  #else
-    #include <endian.h>
-      #if defined(__BYTE_ORDER)
-        #if __BYTE_ORDER == __LITTLE_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (1)
-        #elif __BYTE_ORDER == __BIG_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (0)
-        #endif
-      #endif
-  #endif
-  #ifndef MP_ENDIANNESS_LITTLE
-    #error endianness not defined and cannot detect it
-  #endif
-  #define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#endif
-
-// Make a pointer to RAM callable (eg set lower bit for Thumb code)
-// (This scheme won't work if we want to mix Thumb and normal ARM code.)
-#ifndef MICROPY_MAKE_POINTER_CALLABLE
-#define MICROPY_MAKE_POINTER_CALLABLE(p) (p)
-#endif
-
-// If these MP_PLAT_*_EXEC macros are overridden then the memory allocated by them
-// must be somehow reachable for marking by the GC, since the native code
-// generators store pointers to GC managed memory in the code.
-#ifndef MP_PLAT_ALLOC_EXEC
-#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) do { *ptr = m_new(byte, min_size); *size = min_size; } while (0)
-#endif
-
-#ifndef MP_PLAT_FREE_EXEC
-#define MP_PLAT_FREE_EXEC(ptr, size) m_del(byte, ptr, size)
-#endif
-
-// This macro is used to do all output (except when MICROPY_PY_IO is defined)
-#ifndef MP_PLAT_PRINT_STRN
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-#endif
-
-#ifndef MP_SSIZE_MAX
-#define MP_SSIZE_MAX SSIZE_MAX
-#endif
-
-// printf format spec to use for mp_int_t and friends
-#ifndef INT_FMT
-#if defined(__LP64__)
-// Archs where mp_int_t == long, long != int
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-#elif defined(_WIN64)
-#define UINT_FMT "%llu"
-#define INT_FMT "%lld"
-#else
-// Archs where mp_int_t == int
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-#endif
-#endif //INT_FMT
-
-// Modifier for function which doesn't return
-#ifndef NORETURN
-#define NORETURN __attribute__((noreturn))
-#endif
-
-// Modifier for weak functions
-#ifndef MP_WEAK
-#define MP_WEAK __attribute__((weak))
-#endif
-
-// Modifier for functions which should be never inlined
-#ifndef MP_NOINLINE
-#define MP_NOINLINE __attribute__((noinline))
-#endif
-
-// Modifier for functions which should be always inlined
-#ifndef MP_ALWAYSINLINE
-#define MP_ALWAYSINLINE __attribute__((always_inline))
-#endif
-
-// Condition is likely to be true, to help branch prediction
-#ifndef MP_LIKELY
-#define MP_LIKELY(x) __builtin_expect((x), 1)
-#endif
-
-// Condition is likely to be false, to help branch prediction
-#ifndef MP_UNLIKELY
-#define MP_UNLIKELY(x) __builtin_expect((x), 0)
-#endif
-
-// To annotate that code is unreachable
-#ifndef MP_UNREACHABLE
-#if defined(__GNUC__)
-#define MP_UNREACHABLE __builtin_unreachable();
-#else
-#define MP_UNREACHABLE for (;;);
-#endif
-#endif
-
-#ifndef MP_HTOBE16
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE16(x) ((uint16_t)( (((x) & 0xff) << 8) | (((x) >> 8) & 0xff) ))
-# define MP_BE16TOH(x) MP_HTOBE16(x)
-#else
-# define MP_HTOBE16(x) (x)
-# define MP_BE16TOH(x) (x)
-#endif
-#endif
-
-#ifndef MP_HTOBE32
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE32(x) ((uint32_t)( (((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) >> 8)  & 0xff00) | (((x) >> 24) & 0xff) ))
-# define MP_BE32TOH(x) MP_HTOBE32(x)
-#else
-# define MP_HTOBE32(x) (x)
-# define MP_BE32TOH(x) (x)
-#endif
-#endif
-
-// Warning categories are by default implemented as strings, though
-// hook is left for a port to define them as something else.
-#if MICROPY_WARNINGS_CATEGORY
-# ifndef MP_WARN_CAT
-# define MP_WARN_CAT(x) #x
-# endif
-#else
-# undef MP_WARN_CAT
-# define MP_WARN_CAT(x) (NULL)
-#endif
-
-// Feature dependency check.
-#if MICROPY_PY_SYS_SETTRACE
-#if !MICROPY_PERSISTENT_CODE_SAVE
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_PERSISTENT_CODE_SAVE to be enabled"
-#endif
-#if MICROPY_COMP_CONST
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_COMP_CONST to be disabled"
-#endif
-#endif
-
-#endif // MICROPY_INCLUDED_PY_MPCONFIG_H
diff --git a/apps/KhiCAS/src/micropython-1.12/py/mpstate.h~ b/apps/KhiCAS/src/micropython-1.12/py/mpstate.h~
deleted file mode 100644
index ab7d8c51b..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/mpstate.h~
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_PY_MPSTATE_H
-#define MICROPY_INCLUDED_PY_MPSTATE_H
-
-#include <stdint.h>
-
-#include "py/mpconfig.h"
-#include "py/mpthread.h"
-#include "py/misc.h"
-#include "py/nlr.h"
-#include "py/obj.h"
-#include "py/objlist.h"
-#include "py/objexcept.h"
-
-// This file contains structures defining the state of the MicroPython
-// memory system, runtime and virtual machine.  The state is a global
-// variable, but in the future it is hoped that the state can become local.
-
-// This structure contains dynamic configuration for the compiler.
-#if MICROPY_DYNAMIC_COMPILER
-typedef struct mp_dynamic_compiler_t {
-    uint8_t small_int_bits; // must be <= host small_int_bits
-    bool opt_cache_map_lookup_in_bytecode;
-    bool py_builtins_str_unicode;
-    uint8_t native_arch;
-    uint8_t nlr_buf_num_regs;
-} mp_dynamic_compiler_t;
-extern mp_dynamic_compiler_t mp_dynamic_compiler;
-#endif
-
-// These are the values for sched_state
-#define MP_SCHED_IDLE (1)
-#define MP_SCHED_LOCKED (-1)
-#define MP_SCHED_PENDING (0) // 0 so it's a quick check in the VM
-
-typedef struct _mp_sched_item_t {
-    mp_obj_t func;
-    mp_obj_t arg;
-} mp_sched_item_t;
-
-// This structure hold information about the memory allocation system.
-typedef struct _mp_state_mem_t {
-    #if MICROPY_MEM_STATS
-    size_t total_bytes_allocated;
-    size_t current_bytes_allocated;
-    size_t peak_bytes_allocated;
-    #endif
-
-    byte *gc_alloc_table_start;
-    size_t gc_alloc_table_byte_len;
-    #if MICROPY_ENABLE_FINALISER
-    byte *gc_finaliser_table_start;
-    #endif
-    byte *gc_pool_start;
-    byte *gc_pool_end;
-
-    int gc_stack_overflow;
-    MICROPY_GC_STACK_ENTRY_TYPE gc_stack[MICROPY_ALLOC_GC_STACK_SIZE];
-    uint16_t gc_lock_depth;
-
-    // This variable controls auto garbage collection.  If set to 0 then the
-    // GC won't automatically run when gc_alloc can't find enough blocks.  But
-    // you can still allocate/free memory and also explicitly call gc_collect.
-    uint16_t gc_auto_collect_enabled;
-
-    #if MICROPY_GC_ALLOC_THRESHOLD
-    size_t gc_alloc_amount;
-    size_t gc_alloc_threshold;
-    #endif
-
-    size_t gc_last_free_atb_index;
-
-    #if MICROPY_PY_GC_COLLECT_RETVAL
-    size_t gc_collected;
-    #endif
-
-    #if MICROPY_PY_THREAD
-    // This is a global mutex used to make the GC thread-safe.
-    mp_thread_mutex_t gc_mutex;
-    #endif
-} mp_state_mem_t;
-
-// This structure hold runtime and VM information.  It includes a section
-// which contains root pointers that must be scanned by the GC.
-typedef struct _mp_state_vm_t {
-    //
-    // CONTINUE ROOT POINTER SECTION
-    // This must start at the start of this structure and follows
-    // the state in the mp_state_thread_t structure, continuing
-    // the root pointer section from there.
-    //
-
-    qstr_pool_t *last_pool;
-
-    // non-heap memory for creating an exception if we can't allocate RAM
-    mp_obj_exception_t mp_emergency_exception_obj;
-
-    // memory for exception arguments if we can't allocate RAM
-    #if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-    #if MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE > 0
-    // statically allocated buf (needs to be aligned to mp_obj_t)
-    mp_obj_t mp_emergency_exception_buf[MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE / sizeof(mp_obj_t)];
-    #else
-    // dynamically allocated buf
-    byte *mp_emergency_exception_buf;
-    #endif
-    #endif
-
-    #if MICROPY_KBD_EXCEPTION
-    // exception object of type KeyboardInterrupt
-    mp_obj_exception_t mp_kbd_exception;
-    #endif
-
-    // dictionary with loaded modules (may be exposed as sys.modules)
-    mp_obj_dict_t mp_loaded_modules_dict;
-
-    // pending exception object (MP_OBJ_NULL if not pending)
-    volatile mp_obj_t mp_pending_exception;
-
-    #if MICROPY_ENABLE_SCHEDULER
-    mp_sched_item_t sched_queue[MICROPY_SCHEDULER_DEPTH];
-    #endif
-
-    // current exception being handled, for sys.exc_info()
-    #if MICROPY_PY_SYS_EXC_INFO
-    mp_obj_base_t *cur_exception;
-    #endif
-
-    #if MICROPY_PY_SYS_ATEXIT
-    // exposed through sys.atexit function
-    mp_obj_t sys_exitfunc;
-    #endif
-
-    // dictionary for the __main__ module
-    mp_obj_dict_t dict_main;
-
-    // these two lists must be initialised per port, after the call to mp_init
-    mp_obj_list_t mp_sys_path_obj;
-    mp_obj_list_t mp_sys_argv_obj;
-
-    // dictionary for overridden builtins
-    #if MICROPY_CAN_OVERRIDE_BUILTINS
-    mp_obj_dict_t *mp_module_builtins_override_dict;
-    #endif
-
-    // include any root pointers defined by a port
-    MICROPY_PORT_ROOT_POINTERS
-
-    // root pointers for extmod
-
-    #if MICROPY_REPL_EVENT_DRIVEN
-    vstr_t *repl_line;
-    #endif
-
-    #if MICROPY_PY_OS_DUPTERM
-    mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM];
-    #endif
-
-    #if MICROPY_PY_LWIP_SLIP
-    mp_obj_t lwip_slip_stream;
-    #endif
-
-    #if MICROPY_VFS
-    struct _mp_vfs_mount_t *vfs_cur;
-    struct _mp_vfs_mount_t *vfs_mount_table;
-    #endif
-
-    #if MICROPY_PY_BLUETOOTH
-    mp_obj_t bluetooth;
-    #endif
-
-    //
-    // END ROOT POINTER SECTION
-    ////////////////////////////////////////////////////////////
-
-    // pointer and sizes to store interned string data
-    // (qstr_last_chunk can be root pointer but is also stored in qstr pool)
-    byte *qstr_last_chunk;
-    size_t qstr_last_alloc;
-    size_t qstr_last_used;
-
-    #if MICROPY_PY_THREAD
-    // This is a global mutex used to make qstr interning thread-safe.
-    mp_thread_mutex_t qstr_mutex;
-    #endif
-
-    #if MICROPY_ENABLE_COMPILER
-    mp_uint_t mp_optimise_value;
-    #if MICROPY_EMIT_NATIVE
-    uint8_t default_emit_opt; // one of MP_EMIT_OPT_xxx
-    #endif
-    #endif
-
-    // size of the emergency exception buf, if it's dynamically allocated
-    #if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF && MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE == 0
-    mp_int_t mp_emergency_exception_buf_size;
-    #endif
-
-    #if MICROPY_ENABLE_SCHEDULER
-    volatile int16_t sched_state;
-    uint8_t sched_len;
-    uint8_t sched_idx;
-    #endif
-
-    #if MICROPY_PY_THREAD_GIL
-    // This is a global mutex used to make the VM/runtime thread-safe.
-    mp_thread_mutex_t gil_mutex;
-    #endif
-} mp_state_vm_t;
-
-// This structure holds state that is specific to a given thread.
-// Everything in this structure is scanned for root pointers.
-typedef struct _mp_state_thread_t {
-    // Stack top at the start of program
-    char *stack_top;
-
-    #if MICROPY_STACK_CHECK
-    size_t stack_limit;
-    #endif
-
-    #if MICROPY_ENABLE_PYSTACK
-    uint8_t *pystack_start;
-    uint8_t *pystack_end;
-    uint8_t *pystack_cur;
-    #endif
-
-    ////////////////////////////////////////////////////////////
-    // START ROOT POINTER SECTION
-    // Everything that needs GC scanning must start here, and
-    // is followed by state in the mp_state_vm_t structure.
-    //
-
-    mp_obj_dict_t *dict_locals;
-    mp_obj_dict_t *dict_globals;
-
-    nlr_buf_t *nlr_top;
-
-    #if MICROPY_PY_SYS_SETTRACE
-    mp_obj_t prof_trace_callback;
-    bool prof_callback_is_executing;
-    struct _mp_code_state_t *current_code_state;
-    #endif
-} mp_state_thread_t;
-
-// This structure combines the above 3 structures.
-// The order of the entries are important for root pointer scanning in the GC to work.
-typedef struct _mp_state_ctx_t {
-    mp_state_thread_t thread;
-    mp_state_vm_t vm;
-    mp_state_mem_t mem;
-} mp_state_ctx_t;
-
-extern mp_state_ctx_t mp_state_ctx;
-
-#define MP_STATE_VM(x) (mp_state_ctx.vm.x)
-#define MP_STATE_MEM(x) (mp_state_ctx.mem.x)
-
-#if MICROPY_PY_THREAD
-extern mp_state_thread_t *mp_thread_get_state(void);
-#define MP_STATE_THREAD(x) (mp_thread_get_state()->x)
-#else
-#define MP_STATE_THREAD(x) (mp_state_ctx.thread.x)
-#endif
-
-#endif // MICROPY_INCLUDED_PY_MPSTATE_H
diff --git a/apps/KhiCAS/src/micropython-1.12/py/objfun.c~ b/apps/KhiCAS/src/micropython-1.12/py/objfun.c~
deleted file mode 100644
index 7051f3476..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/objfun.c~
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2014 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <string.h>
-#include <assert.h>
-
-#include "py/objtuple.h"
-#include "py/objfun.h"
-#include "py/runtime.h"
-#include "py/bc.h"
-#include "py/stackctrl.h"
-
-#if MICROPY_DEBUG_VERBOSE // print debugging info
-#define DEBUG_PRINT (1)
-#else // don't print debugging info
-#define DEBUG_PRINT (0)
-#define DEBUG_printf(...) (void)0
-#endif
-
-// Note: the "name" entry in mp_obj_type_t for a function type must be
-// MP_QSTR_function because it is used to determine if an object is of generic
-// function type.
-
-/******************************************************************************/
-/* builtin functions                                                          */
-
-STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    (void)args;
-    assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_0));
-    mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_arg_check_num(n_args, n_kw, 0, 0, false);
-    return self->fun._0();
-}
-
-const mp_obj_type_t mp_type_fun_builtin_0 = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-    .call = fun_builtin_0_call,
-    .unary_op = mp_generic_unary_op,
-};
-
-STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_1));
-    mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_arg_check_num(n_args, n_kw, 1, 1, false);
-    return self->fun._1(args[0]);
-}
-
-const mp_obj_type_t mp_type_fun_builtin_1 = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-    .call = fun_builtin_1_call,
-    .unary_op = mp_generic_unary_op,
-};
-
-STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_2));
-    mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_arg_check_num(n_args, n_kw, 2, 2, false);
-    return self->fun._2(args[0], args[1]);
-}
-
-const mp_obj_type_t mp_type_fun_builtin_2 = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-    .call = fun_builtin_2_call,
-    .unary_op = mp_generic_unary_op,
-};
-
-STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_3));
-    mp_obj_fun_builtin_fixed_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_arg_check_num(n_args, n_kw, 3, 3, false);
-    return self->fun._3(args[0], args[1], args[2]);
-}
-
-const mp_obj_type_t mp_type_fun_builtin_3 = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-    .call = fun_builtin_3_call,
-    .unary_op = mp_generic_unary_op,
-};
-
-STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_var));
-    mp_obj_fun_builtin_var_t *self = MP_OBJ_TO_PTR(self_in);
-
-    // check number of arguments
-    mp_arg_check_num_sig(n_args, n_kw, self->sig);
-
-    if (self->sig & 1) {
-        // function allows keywords
-
-        // we create a map directly from the given args array
-        mp_map_t kw_args;
-        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-
-        return self->fun.kw(n_args, args, &kw_args);
-
-    } else {
-        // function takes a variable number of arguments, but no keywords
-
-        return self->fun.var(n_args, args);
-    }
-}
-
-const mp_obj_type_t mp_type_fun_builtin_var = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-    .call = fun_builtin_var_call,
-    .unary_op = mp_generic_unary_op,
-};
-
-/******************************************************************************/
-/* byte code functions                                                        */
-
-qstr mp_obj_code_get_name(const byte *code_info) {
-    MP_BC_PRELUDE_SIZE_DECODE(code_info);
-    #if MICROPY_PERSISTENT_CODE
-    return code_info[0] | (code_info[1] << 8);
-    #else
-    return mp_decode_uint_value(code_info);
-    #endif
-}
-
-#if MICROPY_EMIT_NATIVE
-STATIC const mp_obj_type_t mp_type_fun_native;
-#endif
-
-qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
-    const mp_obj_fun_bc_t *fun = MP_OBJ_TO_PTR(fun_in);
-    #if MICROPY_EMIT_NATIVE
-    if (fun->base.type == &mp_type_fun_native || fun->base.type == &mp_type_native_gen_wrap) {
-        // TODO native functions don't have name stored
-        return MP_QSTR_;
-    }
-    #endif
-
-    const byte *bc = fun->bytecode;
-    MP_BC_PRELUDE_SIG_DECODE(bc);
-    return mp_obj_code_get_name(bc);
-}
-
-#if MICROPY_CPYTHON_COMPAT
-STATIC void fun_bc_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(o_in);
-    mp_printf(print, "<function %q at 0x%p>", mp_obj_fun_get_name(o_in), o);
-}
-#endif
-
-#if DEBUG_PRINT
-STATIC void dump_args(const mp_obj_t *a, size_t sz) {
-    DEBUG_printf("%p: ", a);
-    for (size_t i = 0; i < sz; i++) {
-        DEBUG_printf("%p ", a[i]);
-    }
-    DEBUG_printf("\n");
-}
-#else
-#define dump_args(...) (void)0
-#endif
-
-// With this macro you can tune the maximum number of function state bytes
-// that will be allocated on the stack.  Any function that needs more
-// than this will try to use the heap, with fallback to stack allocation.
-#define VM_MAX_STATE_ON_STACK (11 * sizeof(mp_uint_t))
-
-#define DECODE_CODESTATE_SIZE(bytecode, n_state_out_var, state_size_out_var) \
-    { \
-        const uint8_t *ip = bytecode; \
-        size_t n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_args; \
-        MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state_out_var, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_args); \
-                                    \
-        /* state size in bytes */                                                 \
-        state_size_out_var = n_state_out_var * sizeof(mp_obj_t)                   \
-                           + n_exc_stack * sizeof(mp_exc_stack_t);                \
-    }
-
-#define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \
-    code_state->fun_bc = _fun_bc; \
-    code_state->ip = 0; \
-    code_state->n_state = _n_state; \
-    mp_setup_code_state(code_state, n_args, n_kw, args); \
-    code_state->old_globals = mp_globals_get();
-
-#if MICROPY_STACKLESS
-mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    MP_STACK_CHECK();
-    mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
-
-    size_t n_state, state_size;
-    DECODE_CODESTATE_SIZE(self->bytecode, n_state, state_size);
-
-    mp_code_state_t *code_state;
-    #if MICROPY_ENABLE_PYSTACK
-    code_state = mp_pystack_alloc(sizeof(mp_code_state_t) + state_size);
-    #else
-    // If we use m_new_obj_var(), then on no memory, MemoryError will be
-    // raised. But this is not correct exception for a function call,
-    // RuntimeError should be raised instead. So, we use m_new_obj_var_maybe(),
-    // return NULL, then vm.c takes the needed action (either raise
-    // RuntimeError or fallback to stack allocation).
-    code_state = m_new_obj_var_maybe(mp_code_state_t, byte, state_size);
-    if (!code_state) {
-        return NULL;
-    }
-    #endif
-
-    INIT_CODESTATE(code_state, self, n_state, n_args, n_kw, args);
-
-    // execute the byte code with the correct globals context
-    mp_globals_set(self->globals);
-
-    return code_state;
-}
-#endif
-
-STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    MP_STACK_CHECK();
-
-    DEBUG_printf("Input n_args: " UINT_FMT ", n_kw: " UINT_FMT "\n", n_args, n_kw);
-    DEBUG_printf("Input pos args: ");
-    dump_args(args, n_args);
-    DEBUG_printf("Input kw args: ");
-    dump_args(args + n_args, n_kw * 2);
-
-    mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
-
-    size_t n_state, state_size;
-    DECODE_CODESTATE_SIZE(self->bytecode, n_state, state_size);
-
-    // allocate state for locals and stack
-    mp_code_state_t *code_state = NULL;
-    #if MICROPY_ENABLE_PYSTACK
-    code_state = mp_pystack_alloc(sizeof(mp_code_state_t) + state_size);
-    #else
-    if (state_size > VM_MAX_STATE_ON_STACK) {
-        code_state = m_new_obj_var_maybe(mp_code_state_t, byte, state_size);
-        #if MICROPY_DEBUG_VM_STACK_OVERFLOW
-        if (code_state != NULL) {
-            memset(code_state->state, 0, state_size);
-        }
-        #endif
-    }
-    if (code_state == NULL) {
-        code_state = alloca(sizeof(mp_code_state_t) + state_size);
-        #if MICROPY_DEBUG_VM_STACK_OVERFLOW
-        memset(code_state->state, 0, state_size);
-        #endif
-        state_size = 0; // indicate that we allocated using alloca
-    }
-    #endif
-
-    INIT_CODESTATE(code_state, self, n_state, n_args, n_kw, args);
-
-    // execute the byte code with the correct globals context
-    mp_globals_set(self->globals);
-    mp_vm_return_kind_t vm_return_kind = mp_execute_bytecode(code_state, MP_OBJ_NULL);
-    mp_globals_set(code_state->old_globals);
-
-    #if MICROPY_DEBUG_VM_STACK_OVERFLOW
-    if (vm_return_kind == MP_VM_RETURN_NORMAL) {
-        if (code_state->sp < code_state->state) {
-            mp_printf(MICROPY_DEBUG_PRINTER, "VM stack underflow: " INT_FMT "\n", code_state->sp - code_state->state);
-            assert(0);
-        }
-    }
-    const byte *bytecode_ptr = self->bytecode;
-    size_t n_state_unused, n_exc_stack_unused, scope_flags_unused;
-    size_t n_pos_args, n_kwonly_args, n_def_args_unused;
-    MP_BC_PRELUDE_SIG_DECODE_INTO(bytecode_ptr, n_state_unused, n_exc_stack_unused,
-        scope_flags_unused, n_pos_args, n_kwonly_args, n_def_args_unused);
-    // We can't check the case when an exception is returned in state[0]
-    // and there are no arguments, because in this case our detection slot may have
-    // been overwritten by the returned exception (which is allowed).
-    if (!(vm_return_kind == MP_VM_RETURN_EXCEPTION && n_pos_args + n_kwonly_args == 0)) {
-        // Just check to see that we have at least 1 null object left in the state.
-        bool overflow = true;
-        for (size_t i = 0; i < n_state - n_pos_args - n_kwonly_args; ++i) {
-            if (code_state->state[i] == MP_OBJ_NULL) {
-                overflow = false;
-                break;
-            }
-        }
-        if (overflow) {
-            mp_printf(MICROPY_DEBUG_PRINTER, "VM stack overflow state=%p n_state+1=" UINT_FMT "\n", code_state->state, n_state);
-            assert(0);
-        }
-    }
-    #endif
-
-    mp_obj_t result;
-    if (vm_return_kind == MP_VM_RETURN_NORMAL) {
-        // return value is in *sp
-        result = *code_state->sp;
-    } else {
-        // must be an exception because normal functions can't yield
-        assert(vm_return_kind == MP_VM_RETURN_EXCEPTION);
-        // returned exception is in state[0]
-        result = code_state->state[0];
-    }
-
-    #if MICROPY_ENABLE_PYSTACK
-    mp_pystack_free(code_state);
-    #else
-    // free the state if it was allocated on the heap
-    if (state_size != 0) {
-        m_del_var(mp_code_state_t, byte, state_size, code_state);
-    }
-    #endif
-
-    if (vm_return_kind == MP_VM_RETURN_NORMAL) {
-        return result;
-    } else { // MP_VM_RETURN_EXCEPTION
-        nlr_raise(result);
-    }
-}
-
-#if MICROPY_PY_FUNCTION_ATTRS
-void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    if (dest[0] != MP_OBJ_NULL) {
-        // not load attribute
-        return;
-    }
-    if (attr == MP_QSTR___name__) {
-        dest[0] = MP_OBJ_NEW_QSTR(mp_obj_fun_get_name(self_in));
-    }
-}
-#endif
-
-const mp_obj_type_t mp_type_fun_bc = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-#if MICROPY_CPYTHON_COMPAT
-    .print = fun_bc_print,
-#endif
-    .call = fun_bc_call,
-    .unary_op = mp_generic_unary_op,
-#if MICROPY_PY_FUNCTION_ATTRS
-    .attr = mp_obj_fun_bc_attr,
-#endif
-};
-
-mp_obj_t mp_obj_new_fun_bc(mp_obj_t def_args_in, mp_obj_t def_kw_args, const byte *code, const mp_uint_t *const_table) {
-    size_t n_def_args = 0;
-    size_t n_extra_args = 0;
-    mp_obj_tuple_t *def_args = MP_OBJ_TO_PTR(def_args_in);
-    if (def_args_in != MP_OBJ_NULL) {
-        assert(mp_obj_is_type(def_args_in, &mp_type_tuple));
-        n_def_args = def_args->len;
-        n_extra_args = def_args->len;
-    }
-    if (def_kw_args != MP_OBJ_NULL) {
-        n_extra_args += 1;
-    }
-    mp_obj_fun_bc_t *o = m_new_obj_var(mp_obj_fun_bc_t, mp_obj_t, n_extra_args);
-    o->base.type = &mp_type_fun_bc;
-    o->globals = mp_globals_get();
-    o->bytecode = code;
-    o->const_table = const_table;
-    if (def_args != NULL) {
-        memcpy(o->extra_args, def_args->items, n_def_args * sizeof(mp_obj_t));
-    }
-    if (def_kw_args != MP_OBJ_NULL) {
-        o->extra_args[n_def_args] = def_kw_args;
-    }
-    return MP_OBJ_FROM_PTR(o);
-}
-
-/******************************************************************************/
-/* native functions                                                           */
-
-#if MICROPY_EMIT_NATIVE
-
-STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    MP_STACK_CHECK();
-    mp_obj_fun_bc_t *self = self_in;
-    mp_call_fun_t fun = MICROPY_MAKE_POINTER_CALLABLE((void*)self->bytecode);
-    return fun(self_in, n_args, n_kw, args);
-}
-
-STATIC const mp_obj_type_t mp_type_fun_native = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-    .call = fun_native_call,
-    .unary_op = mp_generic_unary_op,
-};
-
-mp_obj_t mp_obj_new_fun_native(mp_obj_t def_args_in, mp_obj_t def_kw_args, const void *fun_data, const mp_uint_t *const_table) {
-    mp_obj_fun_bc_t *o = mp_obj_new_fun_bc(def_args_in, def_kw_args, (const byte*)fun_data, const_table);
-    o->base.type = &mp_type_fun_native;
-    return o;
-}
-
-#endif // MICROPY_EMIT_NATIVE
-
-/******************************************************************************/
-/* inline assembler functions                                                 */
-
-#if MICROPY_EMIT_INLINE_ASM
-
-typedef struct _mp_obj_fun_asm_t {
-    mp_obj_base_t base;
-    size_t n_args;
-    const void *fun_data; // GC must be able to trace this pointer
-    mp_uint_t type_sig;
-} mp_obj_fun_asm_t;
-
-typedef mp_uint_t (*inline_asm_fun_0_t)(void);
-typedef mp_uint_t (*inline_asm_fun_1_t)(mp_uint_t);
-typedef mp_uint_t (*inline_asm_fun_2_t)(mp_uint_t, mp_uint_t);
-typedef mp_uint_t (*inline_asm_fun_3_t)(mp_uint_t, mp_uint_t, mp_uint_t);
-typedef mp_uint_t (*inline_asm_fun_4_t)(mp_uint_t, mp_uint_t, mp_uint_t, mp_uint_t);
-
-// convert a MicroPython object to a sensible value for inline asm
-STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
-    // TODO for byte_array, pass pointer to the array
-    if (mp_obj_is_small_int(obj)) {
-        return MP_OBJ_SMALL_INT_VALUE(obj);
-    } else if (obj == mp_const_none) {
-        return 0;
-    } else if (obj == mp_const_false) {
-        return 0;
-    } else if (obj == mp_const_true) {
-        return 1;
-    } else if (mp_obj_is_type(obj, &mp_type_int)) {
-        return mp_obj_int_get_truncated(obj);
-    } else if (mp_obj_is_str(obj)) {
-        // pointer to the string (it's probably constant though!)
-        size_t l;
-        return (mp_uint_t)mp_obj_str_get_data(obj, &l);
-    } else {
-        mp_obj_type_t *type = mp_obj_get_type(obj);
-#if MICROPY_PY_BUILTINS_FLOAT
-        if (type == &mp_type_float) {
-            // convert float to int (could also pass in float registers)
-            return (mp_int_t)mp_obj_float_get(obj);
-        } else
-#endif
-        if (type == &mp_type_tuple || type == &mp_type_list) {
-            // pointer to start of tuple (could pass length, but then could use len(x) for that)
-            size_t len;
-            mp_obj_t *items;
-            mp_obj_get_array(obj, &len, &items);
-            return (mp_uint_t)items;
-        } else {
-            mp_buffer_info_t bufinfo;
-            if (mp_get_buffer(obj, &bufinfo, MP_BUFFER_READ)) {
-                // supports the buffer protocol, return a pointer to the data
-                return (mp_uint_t)bufinfo.buf;
-            } else {
-                // just pass along a pointer to the object
-                return (mp_uint_t)obj;
-            }
-        }
-    }
-}
-
-STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_obj_fun_asm_t *self = self_in;
-
-    mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false);
-
-    const void *fun = MICROPY_MAKE_POINTER_CALLABLE(self->fun_data);
-
-    mp_uint_t ret;
-    if (n_args == 0) {
-        ret = ((inline_asm_fun_0_t)fun)();
-    } else if (n_args == 1) {
-        ret = ((inline_asm_fun_1_t)fun)(convert_obj_for_inline_asm(args[0]));
-    } else if (n_args == 2) {
-        ret = ((inline_asm_fun_2_t)fun)(convert_obj_for_inline_asm(args[0]), convert_obj_for_inline_asm(args[1]));
-    } else if (n_args == 3) {
-        ret = ((inline_asm_fun_3_t)fun)(convert_obj_for_inline_asm(args[0]), convert_obj_for_inline_asm(args[1]), convert_obj_for_inline_asm(args[2]));
-    } else {
-        // compiler allows at most 4 arguments
-        assert(n_args == 4);
-        ret = ((inline_asm_fun_4_t)fun)(
-            convert_obj_for_inline_asm(args[0]),
-            convert_obj_for_inline_asm(args[1]),
-            convert_obj_for_inline_asm(args[2]),
-            convert_obj_for_inline_asm(args[3])
-        );
-    }
-
-    return mp_native_to_obj(ret, self->type_sig);
-}
-
-STATIC const mp_obj_type_t mp_type_fun_asm = {
-    { &mp_type_type },
-    .name = MP_QSTR_function,
-    .call = fun_asm_call,
-    .unary_op = mp_generic_unary_op,
-};
-
-mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_sig) {
-    mp_obj_fun_asm_t *o = m_new_obj(mp_obj_fun_asm_t);
-    o->base.type = &mp_type_fun_asm;
-    o->n_args = n_args;
-    o->fun_data = fun_data;
-    o->type_sig = type_sig;
-    return o;
-}
-
-#endif // MICROPY_EMIT_INLINE_ASM
diff --git a/apps/KhiCAS/src/micropython-1.12/py/objfun.h~ b/apps/KhiCAS/src/micropython-1.12/py/objfun.h~
deleted file mode 100644
index 905b5dbca..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/objfun.h~
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_PY_OBJFUN_H
-#define MICROPY_INCLUDED_PY_OBJFUN_H
-
-#include "py/obj.h"
-
-typedef struct _mp_obj_fun_bc_t {
-    mp_obj_base_t base;
-    mp_obj_dict_t *globals;         // the context within which this function was defined
-    const byte *bytecode;           // bytecode for the function
-    const mp_uint_t *const_table;   // constant table
-    #if MICROPY_PY_SYS_SETTRACE
-    const struct _mp_raw_code_t *rc;
-    #endif
-    // the following extra_args array is allocated space to take (in order):
-    //  - values of positional default args (if any)
-    //  - a single slot for default kw args dict (if it has them)
-    //  - a single slot for var args tuple (if it takes them)
-    //  - a single slot for kw args dict (if it takes them)
-    mp_obj_t extra_args[];
-} mp_obj_fun_bc_t;
-
-void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
-
-#endif // MICROPY_INCLUDED_PY_OBJFUN_H
diff --git a/apps/KhiCAS/src/micropython-1.12/py/objlist.c~ b/apps/KhiCAS/src/micropython-1.12/py/objlist.c~
deleted file mode 100644
index ec9d57fc7..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/objlist.c~
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <string.h>
-#include <assert.h>
-
-#include "py/objlist.h"
-#include "py/runtime.h"
-#include "py/stackctrl.h"
-
-STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf);
-STATIC mp_obj_list_t *list_new(size_t n);
-STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in);
-STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args);
-
-// TODO: Move to mpconfig.h
-#define LIST_MIN_ALLOC 4
-
-/******************************************************************************/
-/* list                                                                       */
-
-STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
-    mp_obj_list_t *o = MP_OBJ_TO_PTR(o_in);
-    if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
-        kind = PRINT_REPR;
-    }
-    mp_print_str(print, "[");
-    for (size_t i = 0; i < o->len; i++) {
-        if (i > 0) {
-            mp_print_str(print, ", ");
-        }
-        mp_obj_print_helper(print, o->items[i], kind);
-    }
-    mp_print_str(print, "]");
-}
-
-STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) {
-    mp_obj_t iter = mp_getiter(iterable, NULL);
-    mp_obj_t item;
-    while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
-        mp_obj_list_append(list, item);
-    }
-    return list;
-}
-
-STATIC mp_obj_t list_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    (void)type_in;
-    mp_arg_check_num(n_args, n_kw, 0, 1, false);
-
-    switch (n_args) {
-        case 0:
-            // return a new, empty list
-            return mp_obj_new_list(0, NULL);
-
-        case 1:
-        default: {
-            // make list from iterable
-            // TODO: optimize list/tuple
-            mp_obj_t list = mp_obj_new_list(0, NULL);
-            return list_extend_from_iter(list, args[0]);
-        }
-    }
-}
-
-STATIC mp_obj_t list_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    switch (op) {
-        case MP_UNARY_OP_BOOL: return mp_obj_new_bool(self->len != 0);
-        case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len);
-        #if MICROPY_PY_SYS_GETSIZEOF
-        case MP_UNARY_OP_SIZEOF: {
-            size_t sz = sizeof(*self) + sizeof(mp_obj_t) * self->alloc;
-            return MP_OBJ_NEW_SMALL_INT(sz);
-        }
-        #endif
-        default: return MP_OBJ_NULL; // op not supported
-    }
-}
-
-STATIC mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
-    mp_obj_list_t *o = MP_OBJ_TO_PTR(lhs);
-    switch (op) {
-        case MP_BINARY_OP_ADD: {
-            if (!mp_obj_is_type(rhs, &mp_type_list)) {
-                return MP_OBJ_NULL; // op not supported
-            }
-            mp_obj_list_t *p = MP_OBJ_TO_PTR(rhs);
-            mp_obj_list_t *s = list_new(o->len + p->len);
-            mp_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t);
-            return MP_OBJ_FROM_PTR(s);
-        }
-        case MP_BINARY_OP_INPLACE_ADD: {
-            list_extend(lhs, rhs);
-            return lhs;
-        }
-        case MP_BINARY_OP_MULTIPLY: {
-            mp_int_t n;
-            if (!mp_obj_get_int_maybe(rhs, &n)) {
-                return MP_OBJ_NULL; // op not supported
-            }
-            if (n < 0) {
-                n = 0;
-            }
-            mp_obj_list_t *s = list_new(o->len * n);
-            mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
-            return MP_OBJ_FROM_PTR(s);
-        }
-        case MP_BINARY_OP_EQUAL:
-        case MP_BINARY_OP_LESS:
-        case MP_BINARY_OP_LESS_EQUAL:
-        case MP_BINARY_OP_MORE:
-        case MP_BINARY_OP_MORE_EQUAL: {
-            if (!mp_obj_is_type(rhs, &mp_type_list)) {
-                if (op == MP_BINARY_OP_EQUAL) {
-                    return mp_const_false;
-                }
-                return MP_OBJ_NULL; // op not supported
-            }
-
-            mp_obj_list_t *another = MP_OBJ_TO_PTR(rhs);
-            bool res = mp_seq_cmp_objs(op, o->items, o->len, another->items, another->len);
-            return mp_obj_new_bool(res);
-        }
-
-        default:
-            return MP_OBJ_NULL; // op not supported
-    }
-}
-
-STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-    if (value == MP_OBJ_NULL) {
-        // delete
-#if MICROPY_PY_BUILTINS_SLICE
-        if (mp_obj_is_type(index, &mp_type_slice)) {
-            mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-            mp_bound_slice_t slice;
-            if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
-                mp_raise_NotImplementedError(NULL);
-            }
-
-            mp_int_t len_adj = slice.start - slice.stop;
-            //printf("Len adj: %d\n", len_adj);
-            assert(len_adj <= 0);
-            mp_seq_replace_slice_no_grow(self->items, self->len, slice.start, slice.stop, self->items/*NULL*/, 0, sizeof(*self->items));
-            // Clear "freed" elements at the end of list
-            mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items));
-            self->len += len_adj;
-            return mp_const_none;
-        }
-#endif
-        mp_obj_t args[2] = {self_in, index};
-        list_pop(2, args);
-        return mp_const_none;
-    } else if (value == MP_OBJ_SENTINEL) {
-        // load
-        mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-#if MICROPY_PY_BUILTINS_SLICE
-        if (mp_obj_is_type(index, &mp_type_slice)) {
-            mp_bound_slice_t slice;
-            if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
-                return mp_seq_extract_slice(self->len, self->items, &slice);
-            }
-            mp_obj_list_t *res = list_new(slice.stop - slice.start);
-            mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);
-            return MP_OBJ_FROM_PTR(res);
-        }
-#endif
-        size_t index_val = mp_get_index(self->base.type, self->len, index, false);
-        return self->items[index_val];
-    } else {
-#if MICROPY_PY_BUILTINS_SLICE
-        if (mp_obj_is_type(index, &mp_type_slice)) {
-            mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-            size_t value_len; mp_obj_t *value_items;
-            mp_obj_get_array(value, &value_len, &value_items);
-            mp_bound_slice_t slice_out;
-            if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice_out)) {
-                mp_raise_NotImplementedError(NULL);
-            }
-            mp_int_t len_adj = value_len - (slice_out.stop - slice_out.start);
-            //printf("Len adj: %d\n", len_adj);
-            if (len_adj > 0) {
-                if (self->len + len_adj > self->alloc) {
-                    // TODO: Might optimize memory copies here by checking if block can
-                    // be grown inplace or not
-                    self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + len_adj);
-                    self->alloc = self->len + len_adj;
-                }
-                mp_seq_replace_slice_grow_inplace(self->items, self->len,
-                    slice_out.start, slice_out.stop, value_items, value_len, len_adj, sizeof(*self->items));
-            } else {
-                mp_seq_replace_slice_no_grow(self->items, self->len,
-                    slice_out.start, slice_out.stop, value_items, value_len, sizeof(*self->items));
-                // Clear "freed" elements at the end of list
-                mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items));
-                // TODO: apply allocation policy re: alloc_size
-            }
-            self->len += len_adj;
-            return mp_const_none;
-        }
-#endif
-        mp_obj_list_store(self_in, index, value);
-        return mp_const_none;
-    }
-}
-
-STATIC mp_obj_t list_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
-    return mp_obj_new_list_iterator(o_in, 0, iter_buf);
-}
-
-mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->len >= self->alloc) {
-        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
-        self->alloc *= 2;
-        mp_seq_clear(self->items, self->len + 1, self->alloc, sizeof(*self->items));
-    }
-    self->items[self->len++] = arg;
-    return mp_const_none; // return None, as per CPython
-}
-
-STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    if (mp_obj_is_type(arg_in, &mp_type_list)) {
-        mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-        mp_obj_list_t *arg = MP_OBJ_TO_PTR(arg_in);
-
-        if (self->len + arg->len > self->alloc) {
-            // TODO: use alloc policy for "4"
-            self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4);
-            self->alloc = self->len + arg->len + 4;
-            mp_seq_clear(self->items, self->len + arg->len, self->alloc, sizeof(*self->items));
-        }
-
-        memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len);
-        self->len += arg->len;
-    } else {
-        list_extend_from_iter(self_in, arg_in);
-    }
-    return mp_const_none; // return None, as per CPython
-}
-
-STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_type(args[0], &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]);
-    if (self->len == 0) {
-        mp_raise_msg(&mp_type_IndexError, "pop from empty list");
-    }
-    size_t index = mp_get_index(self->base.type, self->len, n_args == 1 ? MP_OBJ_NEW_SMALL_INT(-1) : args[1], false);
-    mp_obj_t ret = self->items[index];
-    self->len -= 1;
-    memmove(self->items + index, self->items + index + 1, (self->len - index) * sizeof(mp_obj_t));
-    // Clear stale pointer from slot which just got freed to prevent GC issues
-    self->items[self->len] = MP_OBJ_NULL;
-    if (self->alloc > LIST_MIN_ALLOC && self->alloc > 2 * self->len) {
-        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc/2);
-        self->alloc /= 2;
-    }
-    return ret;
-}
-
-STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, mp_obj_t binop_less_result) {
-    MP_STACK_CHECK();
-    while (head < tail) {
-        mp_obj_t *h = head - 1;
-        mp_obj_t *t = tail;
-        mp_obj_t v = key_fn == MP_OBJ_NULL ? tail[0] : mp_call_function_1(key_fn, tail[0]); // get pivot using key_fn
-        for (;;) {
-            do ++h; while (h < t && mp_binary_op(MP_BINARY_OP_LESS, key_fn == MP_OBJ_NULL ? h[0] : mp_call_function_1(key_fn, h[0]), v) == binop_less_result);
-            do --t; while (h < t && mp_binary_op(MP_BINARY_OP_LESS, v, key_fn == MP_OBJ_NULL ? t[0] : mp_call_function_1(key_fn, t[0])) == binop_less_result);
-            if (h >= t) break;
-            mp_obj_t x = h[0];
-            h[0] = t[0];
-            t[0] = x;
-        }
-        mp_obj_t x = h[0];
-        h[0] = tail[0];
-        tail[0] = x;
-        // do the smaller recursive call first, to keep stack within O(log(N))
-        if (t - head < tail - h - 1) {
-            mp_quicksort(head, t, key_fn, binop_less_result);
-            head = h + 1;
-        } else {
-            mp_quicksort(h + 1, tail, key_fn, binop_less_result);
-            tail = t;
-        }
-    }
-}
-
-// TODO Python defines sort to be stable but ours is not
-mp_obj_t mp_obj_list_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-        { MP_QSTR_reverse, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
-    };
-
-    // parse args
-    struct {
-        mp_arg_val_t key, reverse;
-    } args;
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args,
-        MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t*)&args);
-
-    mp_check_self(mp_obj_is_type(pos_args[0], &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-
-    if (self->len > 1) {
-        mp_quicksort(self->items, self->items + self->len - 1,
-                     args.key.u_obj == mp_const_none ? MP_OBJ_NULL : args.key.u_obj,
-                     args.reverse.u_bool ? mp_const_false : mp_const_true);
-    }
-
-    return mp_const_none;
-}
-
-STATIC mp_obj_t list_clear(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    self->len = 0;
-    self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC);
-    self->alloc = LIST_MIN_ALLOC;
-    mp_seq_clear(self->items, 0, self->alloc, sizeof(*self->items));
-    return mp_const_none;
-}
-
-STATIC mp_obj_t list_copy(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_list(self->len, self->items);
-}
-
-STATIC mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_seq_count_obj(self->items, self->len, value);
-}
-
-STATIC mp_obj_t list_index(size_t n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_type(args[0], &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]);
-    return mp_seq_index_obj(self->items, self->len, n_args, args);
-}
-
-STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    // insert has its own strange index logic
-    mp_int_t index = MP_OBJ_SMALL_INT_VALUE(idx);
-    if (index < 0) {
-         index += self->len;
-    }
-    if (index < 0) {
-         index = 0;
-    }
-    if ((size_t)index > self->len) {
-         index = self->len;
-    }
-
-    mp_obj_list_append(self_in, mp_const_none);
-
-    for (mp_int_t i = self->len-1; i > index; i--) {
-         self->items[i] = self->items[i-1];
-    }
-    self->items[index] = obj;
-
-    return mp_const_none;
-}
-
-mp_obj_t mp_obj_list_remove(mp_obj_t self_in, mp_obj_t value) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    mp_obj_t args[] = {self_in, value};
-    args[1] = list_index(2, args);
-    list_pop(2, args);
-
-    return mp_const_none;
-}
-
-STATIC mp_obj_t list_reverse(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-
-    mp_int_t len = self->len;
-    for (mp_int_t i = 0; i < len/2; i++) {
-         mp_obj_t a = self->items[i];
-         self->items[i] = self->items[len-i-1];
-         self->items[len-i-1] = a;
-    }
-
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, mp_obj_list_remove);
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 1, mp_obj_list_sort);
-
-STATIC const mp_rom_map_elem_t list_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&list_append_obj) },
-    { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&list_clear_obj) },
-    { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&list_copy_obj) },
-    { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&list_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&list_extend_obj) },
-    { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&list_index_obj) },
-    { MP_ROM_QSTR(MP_QSTR_insert), MP_ROM_PTR(&list_insert_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&list_pop_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&list_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_reverse), MP_ROM_PTR(&list_reverse_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sort), MP_ROM_PTR(&list_sort_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);
-
-const mp_obj_type_t mp_type_list = {
-    { &mp_type_type },
-    .name = MP_QSTR_list,
-    .print = list_print,
-    .make_new = list_make_new,
-    .unary_op = list_unary_op,
-    .binary_op = list_binary_op,
-    .subscr = list_subscr,
-    .getiter = list_getiter,
-    .locals_dict = (mp_obj_dict_t*)&list_locals_dict,
-};
-
-void mp_obj_list_init(mp_obj_list_t *o, size_t n) {
-    o->base.type = &mp_type_list;
-    o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n;
-    o->len = n;
-    o->items = m_new(mp_obj_t, o->alloc);
-    mp_seq_clear(o->items, n, o->alloc, sizeof(*o->items));
-}
-
-STATIC mp_obj_list_t *list_new(size_t n) {
-    mp_obj_list_t *o = m_new_obj(mp_obj_list_t);
-    mp_obj_list_init(o, n);
-    return o;
-}
-
-mp_obj_t mp_obj_new_list(size_t n, mp_obj_t *items) {
-    mp_obj_list_t *o = list_new(n);
-    if (items != NULL) {
-        for (size_t i = 0; i < n; i++) {
-            o->items[i] = items[i];
-        }
-    }
-    return MP_OBJ_FROM_PTR(o);
-}
-
-void mp_obj_list_get(mp_obj_t self_in, size_t *len, mp_obj_t **items) {
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    *len = self->len;
-    *items = self->items;
-}
-
-void mp_obj_list_set_len(mp_obj_t self_in, size_t len) {
-    // trust that the caller knows what it's doing
-    // TODO realloc if len got much smaller than alloc
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    self->len = len;
-}
-
-void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-    mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
-    size_t i = mp_get_index(self->base.type, self->len, index, false);
-    self->items[i] = value;
-}
-
-/******************************************************************************/
-/* list iterator                                                              */
-
-typedef struct _mp_obj_list_it_t {
-    mp_obj_base_t base;
-    mp_fun_1_t iternext;
-    mp_obj_t list;
-    size_t cur;
-} mp_obj_list_it_t;
-
-STATIC mp_obj_t list_it_iternext(mp_obj_t self_in) {
-    mp_obj_list_it_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list);
-    if (self->cur < list->len) {
-        mp_obj_t o_out = list->items[self->cur];
-        self->cur += 1;
-        return o_out;
-    } else {
-        return MP_OBJ_STOP_ITERATION;
-    }
-}
-
-mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf) {
-    assert(sizeof(mp_obj_list_it_t) <= sizeof(mp_obj_iter_buf_t));
-    mp_obj_list_it_t *o = (mp_obj_list_it_t*)iter_buf;
-    o->base.type = &mp_type_polymorph_iter;
-    o->iternext = list_it_iternext;
-    o->list = list;
-    o->cur = cur;
-    return MP_OBJ_FROM_PTR(o);
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/py/objmodule.c~ b/apps/KhiCAS/src/micropython-1.12/py/objmodule.c~
deleted file mode 100644
index 81558a02e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/objmodule.c~
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013-2019 Damien P. George
- * Copyright (c) 2014-2015 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "py/objmodule.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-
-#include "genhdr/moduledefs.h"
-
-STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
-
-    const char *module_name = "";
-    mp_map_elem_t *elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_MAP_LOOKUP);
-    if (elem != NULL) {
-        module_name = mp_obj_str_get_str(elem->value);
-    }
-
-#if MICROPY_PY___FILE__
-    // If we store __file__ to imported modules then try to lookup this
-    // symbol to give more information about the module.
-    elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___file__), MP_MAP_LOOKUP);
-    if (elem != NULL) {
-        mp_printf(print, "<module '%s' from '%s'>", module_name, mp_obj_str_get_str(elem->value));
-        return;
-    }
-#endif
-
-    mp_printf(print, "<module '%s'>", module_name);
-}
-
-STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
-    if (dest[0] == MP_OBJ_NULL) {
-        // load attribute
-        mp_map_elem_t *elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
-        if (elem != NULL) {
-            dest[0] = elem->value;
-        #if MICROPY_MODULE_GETATTR
-        } else if (attr != MP_QSTR___getattr__) {
-            elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___getattr__), MP_MAP_LOOKUP);
-            if (elem != NULL) {
-                dest[0] = mp_call_function_1(elem->value, MP_OBJ_NEW_QSTR(attr));
-            }
-        #endif
-        }
-    } else {
-        // delete/store attribute
-        mp_obj_dict_t *dict = self->globals;
-        if (dict->map.is_fixed) {
-            #if MICROPY_CAN_OVERRIDE_BUILTINS
-            if (dict == &mp_module_builtins_globals) {
-                if (MP_STATE_VM(mp_module_builtins_override_dict) == NULL) {
-                    MP_STATE_VM(mp_module_builtins_override_dict) = MP_OBJ_TO_PTR(mp_obj_new_dict(1));
-                }
-                dict = MP_STATE_VM(mp_module_builtins_override_dict);
-            } else
-            #endif
-            {
-                // can't delete or store to fixed map
-                return;
-            }
-        }
-        if (dest[1] == MP_OBJ_NULL) {
-            // delete attribute
-            mp_obj_dict_delete(MP_OBJ_FROM_PTR(dict), MP_OBJ_NEW_QSTR(attr));
-        } else {
-            // store attribute
-            mp_obj_dict_store(MP_OBJ_FROM_PTR(dict), MP_OBJ_NEW_QSTR(attr), dest[1]);
-        }
-        dest[0] = MP_OBJ_NULL; // indicate success
-    }
-}
-
-const mp_obj_type_t mp_type_module = {
-    { &mp_type_type },
-    .name = MP_QSTR_module,
-    .print = module_print,
-    .attr = module_attr,
-};
-
-mp_obj_t mp_obj_new_module(qstr module_name) {
-    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
-    mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
-    // We could error out if module already exists, but let C extensions
-    // add new members to existing modules.
-    if (el->value != MP_OBJ_NULL) {
-        return el->value;
-    }
-
-    // create new module object
-    mp_obj_module_t *o = m_new_obj(mp_obj_module_t);
-    o->base.type = &mp_type_module;
-    o->globals = MP_OBJ_TO_PTR(mp_obj_new_dict(MICROPY_MODULE_DICT_SIZE));
-
-    // store __name__ entry in the module
-    mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(module_name));
-
-    // store the new module into the slot in the global dict holding all modules
-    el->value = MP_OBJ_FROM_PTR(o);
-
-    // return the new module
-    return MP_OBJ_FROM_PTR(o);
-}
-
-/******************************************************************************/
-// Global module table and related functions
-
-STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___main__), MP_ROM_PTR(&mp_module___main__) },
-    { MP_ROM_QSTR(MP_QSTR_builtins), MP_ROM_PTR(&mp_module_builtins) },
-    { MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) },
-
-#if MICROPY_PY_IO
-    { MP_ROM_QSTR(MP_QSTR_uio), MP_ROM_PTR(&mp_module_io) },
-#endif
-#if MICROPY_PY_COLLECTIONS
-    { MP_ROM_QSTR(MP_QSTR_ucollections), MP_ROM_PTR(&mp_module_collections) },
-#endif
-#if MICROPY_PY_STRUCT
-    { MP_ROM_QSTR(MP_QSTR_ustruct), MP_ROM_PTR(&mp_module_ustruct) },
-#endif
-
-#if MICROPY_PY_BUILTINS_FLOAT
-#if MICROPY_PY_MATH
-    { MP_ROM_QSTR(MP_QSTR_math), MP_ROM_PTR(&mp_module_math) },
-#endif
-#if MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH
-    { MP_ROM_QSTR(MP_QSTR_cmath), MP_ROM_PTR(&mp_module_cmath) },
-#endif
-#endif
-#if MICROPY_PY_SYS
-    { MP_ROM_QSTR(MP_QSTR_sys), MP_ROM_PTR(&mp_module_sys) },
-#endif
-#if MICROPY_PY_GC && MICROPY_ENABLE_GC
-    { MP_ROM_QSTR(MP_QSTR_gc), MP_ROM_PTR(&mp_module_gc) },
-#endif
-#if MICROPY_PY_THREAD
-    { MP_ROM_QSTR(MP_QSTR__thread), MP_ROM_PTR(&mp_module_thread) },
-#endif
-
-    // extmod modules
-
-#if MICROPY_PY_UERRNO
-    { MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) },
-#endif
-#if MICROPY_PY_UCTYPES
-    { MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
-#endif
-#if MICROPY_PY_UZLIB
-    { MP_ROM_QSTR(MP_QSTR_uzlib), MP_ROM_PTR(&mp_module_uzlib) },
-#endif
-#if MICROPY_PY_UJSON
-    { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
-#endif
-#if MICROPY_PY_URE
-    { MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
-#endif
-#if MICROPY_PY_UHEAPQ
-    { MP_ROM_QSTR(MP_QSTR_uheapq), MP_ROM_PTR(&mp_module_uheapq) },
-#endif
-#if MICROPY_PY_UTIMEQ
-    { MP_ROM_QSTR(MP_QSTR_utimeq), MP_ROM_PTR(&mp_module_utimeq) },
-#endif
-#if MICROPY_PY_UHASHLIB
-    { MP_ROM_QSTR(MP_QSTR_uhashlib), MP_ROM_PTR(&mp_module_uhashlib) },
-#endif
-#if MICROPY_PY_UCRYPTOLIB
-    { MP_ROM_QSTR(MP_QSTR_ucryptolib), MP_ROM_PTR(&mp_module_ucryptolib) },
-#endif
-#if MICROPY_PY_UBINASCII
-    { MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) },
-#endif
-#if MICROPY_PY_URANDOM
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_module_urandom) },
-#endif
-#if MICROPY_PY_USELECT
-    { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
-#endif
-#if MICROPY_PY_USSL
-    { MP_ROM_QSTR(MP_QSTR_ussl), MP_ROM_PTR(&mp_module_ussl) },
-#endif
-#if MICROPY_PY_LWIP
-    { MP_ROM_QSTR(MP_QSTR_lwip), MP_ROM_PTR(&mp_module_lwip) },
-#endif
-#if MICROPY_PY_UWEBSOCKET
-    { MP_ROM_QSTR(MP_QSTR_uwebsocket), MP_ROM_PTR(&mp_module_uwebsocket) },
-#endif
-#if MICROPY_PY_WEBREPL
-    { MP_ROM_QSTR(MP_QSTR__webrepl), MP_ROM_PTR(&mp_module_webrepl) },
-#endif
-#if MICROPY_PY_FRAMEBUF
-    { MP_ROM_QSTR(MP_QSTR_framebuf), MP_ROM_PTR(&mp_module_framebuf) },
-#endif
-#if MICROPY_PY_BTREE
-    { MP_ROM_QSTR(MP_QSTR_btree), MP_ROM_PTR(&mp_module_btree) },
-#endif
-#if MICROPY_PY_BLUETOOTH
-    { MP_ROM_QSTR(MP_QSTR_ubluetooth), MP_ROM_PTR(&mp_module_ubluetooth) },
-#endif
-
-    // extra builtin modules as defined by a port
-    MICROPY_PORT_BUILTIN_MODULES
-
-    #ifdef MICROPY_REGISTERED_MODULES
-    // builtin modules declared with MP_REGISTER_MODULE()
-    MICROPY_REGISTERED_MODULES
-    #endif
-};
-
-MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
-
-// returns MP_OBJ_NULL if not found
-mp_obj_t mp_module_get(qstr module_name) {
-    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
-    // lookup module
-    mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
-
-    if (el == NULL) {
-        // module not found, look for builtin module names
-        el = mp_map_lookup((mp_map_t*)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
-        if (el == NULL) {
-            return MP_OBJ_NULL;
-        }
-        mp_module_call_init(module_name, el->value);
-    }
-
-    // module found, return it
-    return el->value;
-}
-
-void mp_module_register(qstr qst, mp_obj_t module) {
-    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
-    mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
-}
-
-#if MICROPY_MODULE_WEAK_LINKS
-// Search for u"foo" in built-in modules, return MP_OBJ_NULL if not found
-mp_obj_t mp_module_search_umodule(const char *module_str) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(mp_builtin_module_table); ++i) {
-        const mp_map_elem_t *entry = (const mp_map_elem_t*)&mp_builtin_module_table[i];
-        const char *key = qstr_str(MP_OBJ_QSTR_VALUE(entry->key));
-        if (key[0] == 'u' && strcmp(&key[1], module_str) == 0) {
-            return (mp_obj_t)entry->value;
-        }
-
-    }
-    return MP_OBJ_NULL;
-}
-#endif
-
-#if MICROPY_MODULE_BUILTIN_INIT
-void mp_module_call_init(qstr module_name, mp_obj_t module_obj) {
-    // Look for __init__ and call it if it exists
-    mp_obj_t dest[2];
-    mp_load_method_maybe(module_obj, MP_QSTR___init__, dest);
-    if (dest[0] != MP_OBJ_NULL) {
-        mp_call_method_n_kw(0, 0, dest);
-        // Register module so __init__ is not called again.
-        // If a module can be referenced by more than one name (eg due to weak links)
-        // then __init__ will still be called for each distinct import, and it's then
-        // up to the particular module to make sure it's __init__ code only runs once.
-        mp_module_register(module_name, module_obj);
-    }
-}
-#endif
diff --git a/apps/KhiCAS/src/micropython-1.12/py/objtuple.c~ b/apps/KhiCAS/src/micropython-1.12/py/objtuple.c~
deleted file mode 100644
index 740e0795b..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/objtuple.c~
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2014-2017 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <string.h>
-#include <assert.h>
-
-#include "py/objtuple.h"
-#include "py/runtime.h"
-
-// type check is done on getiter method to allow tuple, namedtuple, attrtuple
-#define mp_obj_is_tuple_compatible(o) (mp_obj_get_type(o)->getiter == mp_obj_tuple_getiter)
-
-/******************************************************************************/
-/* tuple                                                                      */
-
-void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
-    mp_obj_tuple_t *o = MP_OBJ_TO_PTR(o_in);
-    if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
-        mp_print_str(print, "[");
-    } else {
-        mp_print_str(print, "(");
-        kind = PRINT_REPR;
-    }
-    for (size_t i = 0; i < o->len; i++) {
-        if (i > 0) {
-            mp_print_str(print, ", ");
-        }
-        mp_obj_print_helper(print, o->items[i], kind);
-    }
-    if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
-        mp_print_str(print, "]");
-    } else {
-        if (o->len == 1) {
-            mp_print_str(print, ",");
-        }
-        mp_print_str(print, ")");
-    }
-}
-
-STATIC mp_obj_t mp_obj_tuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    (void)type_in;
-
-    mp_arg_check_num(n_args, n_kw, 0, 1, false);
-
-    switch (n_args) {
-        case 0:
-            // return a empty tuple
-            return mp_const_empty_tuple;
-
-        case 1:
-        default: {
-            // 1 argument, an iterable from which we make a new tuple
-            if (mp_obj_is_type(args[0], &mp_type_tuple)) {
-                return args[0];
-            }
-
-            // TODO optimise for cases where we know the length of the iterator
-
-            size_t alloc = 4;
-            size_t len = 0;
-            mp_obj_t *items = m_new(mp_obj_t, alloc);
-
-            mp_obj_t iterable = mp_getiter(args[0], NULL);
-            mp_obj_t item;
-            while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-                if (len >= alloc) {
-                    items = m_renew(mp_obj_t, items, alloc, alloc * 2);
-                    alloc *= 2;
-                }
-                items[len++] = item;
-            }
-
-            mp_obj_t tuple = mp_obj_new_tuple(len, items);
-            m_del(mp_obj_t, items, alloc);
-
-            return tuple;
-        }
-    }
-}
-
-// Don't pass MP_BINARY_OP_NOT_EQUAL here
-STATIC mp_obj_t tuple_cmp_helper(mp_uint_t op, mp_obj_t self_in, mp_obj_t another_in) {
-    mp_check_self(mp_obj_is_tuple_compatible(self_in));
-    mp_obj_type_t *another_type = mp_obj_get_type(another_in);
-    mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    if (another_type->getiter != mp_obj_tuple_getiter) {
-        // Slow path for user subclasses
-        another_in = mp_instance_cast_to_native_base(another_in, MP_OBJ_FROM_PTR(&mp_type_tuple));
-        if (another_in == MP_OBJ_NULL) {
-            if (op == MP_BINARY_OP_EQUAL) {
-                return mp_const_false;
-            }
-            return MP_OBJ_NULL;
-        }
-    }
-    mp_obj_tuple_t *another = MP_OBJ_TO_PTR(another_in);
-
-    return mp_obj_new_bool(mp_seq_cmp_objs(op, self->items, self->len, another->items, another->len));
-}
-
-mp_obj_t mp_obj_tuple_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    switch (op) {
-        case MP_UNARY_OP_BOOL: return mp_obj_new_bool(self->len != 0);
-        case MP_UNARY_OP_HASH: {
-            // start hash with pointer to empty tuple, to make it fairly unique
-            mp_int_t hash = (mp_int_t)mp_const_empty_tuple;
-            for (size_t i = 0; i < self->len; i++) {
-                hash += MP_OBJ_SMALL_INT_VALUE(mp_unary_op(MP_UNARY_OP_HASH, self->items[i]));
-            }
-            return MP_OBJ_NEW_SMALL_INT(hash);
-        }
-        case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len);
-        default: return MP_OBJ_NULL; // op not supported
-    }
-}
-
-mp_obj_t mp_obj_tuple_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
-    mp_obj_tuple_t *o = MP_OBJ_TO_PTR(lhs);
-    switch (op) {
-        case MP_BINARY_OP_ADD:
-        case MP_BINARY_OP_INPLACE_ADD: {
-            if (!mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(rhs)), MP_OBJ_FROM_PTR(&mp_type_tuple))) {
-                return MP_OBJ_NULL; // op not supported
-            }
-            mp_obj_tuple_t *p = MP_OBJ_TO_PTR(rhs);
-            mp_obj_tuple_t *s = MP_OBJ_TO_PTR(mp_obj_new_tuple(o->len + p->len, NULL));
-            mp_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t);
-            return MP_OBJ_FROM_PTR(s);
-        }
-        case MP_BINARY_OP_MULTIPLY:
-        case MP_BINARY_OP_INPLACE_MULTIPLY: {
-            mp_int_t n;
-            if (!mp_obj_get_int_maybe(rhs, &n)) {
-                return MP_OBJ_NULL; // op not supported
-            }
-            if (n <= 0) {
-                return mp_const_empty_tuple;
-            }
-            mp_obj_tuple_t *s = MP_OBJ_TO_PTR(mp_obj_new_tuple(o->len * n, NULL));
-            mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
-            return MP_OBJ_FROM_PTR(s);
-        }
-        case MP_BINARY_OP_EQUAL:
-        case MP_BINARY_OP_LESS:
-        case MP_BINARY_OP_LESS_EQUAL:
-        case MP_BINARY_OP_MORE:
-        case MP_BINARY_OP_MORE_EQUAL:
-            return tuple_cmp_helper(op, lhs, rhs);
-
-        default:
-            return MP_OBJ_NULL; // op not supported
-    }
-}
-
-mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-    if (value == MP_OBJ_SENTINEL) {
-        // load
-        mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-#if MICROPY_PY_BUILTINS_SLICE
-        if (mp_obj_is_type(index, &mp_type_slice)) {
-            mp_bound_slice_t slice;
-            if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
-                mp_raise_NotImplementedError("only slices with step=1 (aka None) are supported");
-            }
-            mp_obj_tuple_t *res = MP_OBJ_TO_PTR(mp_obj_new_tuple(slice.stop - slice.start, NULL));
-            mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);
-            return MP_OBJ_FROM_PTR(res);
-        }
-#endif
-        size_t index_value = mp_get_index(self->base.type, self->len, index, false);
-        return self->items[index_value];
-    } else {
-        return MP_OBJ_NULL; // op not supported
-    }
-}
-
-STATIC mp_obj_t tuple_count(mp_obj_t self_in, mp_obj_t value) {
-    mp_check_self(mp_obj_is_type(self_in, &mp_type_tuple));
-    mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_seq_count_obj(self->items, self->len, value);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(tuple_count_obj, tuple_count);
-
-STATIC mp_obj_t tuple_index(size_t n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_type(args[0], &mp_type_tuple));
-    mp_obj_tuple_t *self = MP_OBJ_TO_PTR(args[0]);
-    return mp_seq_index_obj(self->items, self->len, n_args, args);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tuple_index_obj, 2, 4, tuple_index);
-
-STATIC const mp_rom_map_elem_t tuple_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&tuple_count_obj) },
-    { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&tuple_index_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table);
-
-const mp_obj_type_t mp_type_tuple = {
-    { &mp_type_type },
-    .name = MP_QSTR_tuple,
-    .print = mp_obj_tuple_print,
-    .make_new = mp_obj_tuple_make_new,
-    .unary_op = mp_obj_tuple_unary_op,
-    .binary_op = mp_obj_tuple_binary_op,
-    .subscr = mp_obj_tuple_subscr,
-    .getiter = mp_obj_tuple_getiter,
-    .locals_dict = (mp_obj_dict_t*)&tuple_locals_dict,
-};
-
-// the zero-length tuple
-const mp_obj_tuple_t mp_const_empty_tuple_obj = {{&mp_type_tuple}, 0};
-
-mp_obj_t mp_obj_new_tuple(size_t n, const mp_obj_t *items) {
-    if (n == 0) {
-        return mp_const_empty_tuple;
-    }
-    mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n);
-    o->base.type = &mp_type_tuple;
-    o->len = n;
-    if (items) {
-        for (size_t i = 0; i < n; i++) {
-            o->items[i] = items[i];
-        }
-    }
-    return MP_OBJ_FROM_PTR(o);
-}
-
-void mp_obj_tuple_get(mp_obj_t self_in, size_t *len, mp_obj_t **items) {
-    assert(mp_obj_is_tuple_compatible(self_in));
-    mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    *len = self->len;
-    *items = &self->items[0];
-}
-
-void mp_obj_tuple_del(mp_obj_t self_in) {
-    assert(mp_obj_is_type(self_in, &mp_type_tuple));
-    mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    m_del_var(mp_obj_tuple_t, mp_obj_t, self->len, self);
-}
-
-/******************************************************************************/
-/* tuple iterator                                                             */
-
-typedef struct _mp_obj_tuple_it_t {
-    mp_obj_base_t base;
-    mp_fun_1_t iternext;
-    mp_obj_tuple_t *tuple;
-    size_t cur;
-} mp_obj_tuple_it_t;
-
-STATIC mp_obj_t tuple_it_iternext(mp_obj_t self_in) {
-    mp_obj_tuple_it_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->cur < self->tuple->len) {
-        mp_obj_t o_out = self->tuple->items[self->cur];
-        self->cur += 1;
-        return o_out;
-    } else {
-        return MP_OBJ_STOP_ITERATION;
-    }
-}
-
-mp_obj_t mp_obj_tuple_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
-    assert(sizeof(mp_obj_tuple_it_t) <= sizeof(mp_obj_iter_buf_t));
-    mp_obj_tuple_it_t *o = (mp_obj_tuple_it_t*)iter_buf;
-    o->base.type = &mp_type_polymorph_iter;
-    o->iternext = tuple_it_iternext;
-    o->tuple = MP_OBJ_TO_PTR(o_in);
-    o->cur = 0;
-    return MP_OBJ_FROM_PTR(o);
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/py/parse.c~ b/apps/KhiCAS/src/micropython-1.12/py/parse.c~
deleted file mode 100644
index 82b5413e5..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/parse.c~
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013-2017 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <unistd.h> // for ssize_t
-#include <assert.h>
-#include <string.h>
-
-#include "py/lexer.h"
-#include "py/parse.h"
-#include "py/parsenum.h"
-#include "py/runtime.h"
-#include "py/objint.h"
-#include "py/objstr.h"
-#include "py/builtin.h"
-
-#if MICROPY_ENABLE_COMPILER
-
-#define RULE_ACT_ARG_MASK       (0x0f)
-#define RULE_ACT_KIND_MASK      (0x30)
-#define RULE_ACT_ALLOW_IDENT    (0x40)
-#define RULE_ACT_ADD_BLANK      (0x80)
-#define RULE_ACT_OR             (0x10)
-#define RULE_ACT_AND            (0x20)
-#define RULE_ACT_LIST           (0x30)
-
-#define RULE_ARG_KIND_MASK      (0xf000)
-#define RULE_ARG_ARG_MASK       (0x0fff)
-#define RULE_ARG_TOK            (0x1000)
-#define RULE_ARG_RULE           (0x2000)
-#define RULE_ARG_OPT_RULE       (0x3000)
-
-// (un)comment to use rule names; for debugging
-//#define USE_RULE_NAME (1)
-
-enum {
-// define rules with a compile function
-#define DEF_RULE(rule, comp, kind, ...) RULE_##rule,
-#define DEF_RULE_NC(rule, kind, ...)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-    RULE_const_object, // special node for a constant, generic Python object
-
-// define rules without a compile function
-#define DEF_RULE(rule, comp, kind, ...)
-#define DEF_RULE_NC(rule, kind, ...) RULE_##rule,
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-};
-
-// Define an array of actions corresponding to each rule
-STATIC const uint8_t rule_act_table[] = {
-#define or(n)                   (RULE_ACT_OR | n)
-#define and(n)                  (RULE_ACT_AND | n)
-#define and_ident(n)            (RULE_ACT_AND | n | RULE_ACT_ALLOW_IDENT)
-#define and_blank(n)            (RULE_ACT_AND | n | RULE_ACT_ADD_BLANK)
-#define one_or_more             (RULE_ACT_LIST | 2)
-#define list                    (RULE_ACT_LIST | 1)
-#define list_with_end           (RULE_ACT_LIST | 3)
-
-#define DEF_RULE(rule, comp, kind, ...) kind,
-#define DEF_RULE_NC(rule, kind, ...)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-
-    0, // RULE_const_object
-
-#define DEF_RULE(rule, comp, kind, ...)
-#define DEF_RULE_NC(rule, kind, ...) kind,
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-
-#undef or
-#undef and
-#undef and_ident
-#undef and_blank
-#undef one_or_more
-#undef list
-#undef list_with_end
-};
-
-// Define the argument data for each rule, as a combined array
-STATIC const uint16_t rule_arg_combined_table[] = {
-#define tok(t)                  (RULE_ARG_TOK | MP_TOKEN_##t)
-#define rule(r)                 (RULE_ARG_RULE | RULE_##r)
-#define opt_rule(r)             (RULE_ARG_OPT_RULE | RULE_##r)
-
-#define DEF_RULE(rule, comp, kind, ...) __VA_ARGS__,
-#define DEF_RULE_NC(rule, kind, ...)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-
-#define DEF_RULE(rule, comp, kind, ...)
-#define DEF_RULE_NC(rule, kind, ...)  __VA_ARGS__,
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-
-#undef tok
-#undef rule
-#undef opt_rule
-};
-
-// Macro to create a list of N identifiers where N is the number of variable arguments to the macro
-#define RULE_EXPAND(x) x
-#define RULE_PADDING(rule, ...) RULE_PADDING2(rule, __VA_ARGS__, RULE_PADDING_IDS(rule))
-#define RULE_PADDING2(rule, ...) RULE_EXPAND(RULE_PADDING3(rule, __VA_ARGS__))
-#define RULE_PADDING3(rule, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, ...) __VA_ARGS__
-#define RULE_PADDING_IDS(r) PAD13_##r, PAD12_##r, PAD11_##r, PAD10_##r, PAD9_##r, PAD8_##r, PAD7_##r, PAD6_##r, PAD5_##r, PAD4_##r, PAD3_##r, PAD2_##r, PAD1_##r,
-
-// Use an enum to create constants specifying how much room a rule takes in rule_arg_combined_table
-enum {
-#define DEF_RULE(rule, comp, kind, ...) RULE_PADDING(rule, __VA_ARGS__)
-#define DEF_RULE_NC(rule, kind, ...)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-#define DEF_RULE(rule, comp, kind, ...)
-#define DEF_RULE_NC(rule, kind, ...) RULE_PADDING(rule, __VA_ARGS__)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-};
-
-// Macro to compute the start of a rule in rule_arg_combined_table
-#define RULE_ARG_OFFSET(rule, ...) RULE_ARG_OFFSET2(rule, __VA_ARGS__, RULE_ARG_OFFSET_IDS(rule))
-#define RULE_ARG_OFFSET2(rule, ...) RULE_EXPAND(RULE_ARG_OFFSET3(rule, __VA_ARGS__))
-#define RULE_ARG_OFFSET3(rule, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, ...) _14
-#define RULE_ARG_OFFSET_IDS(r) PAD13_##r, PAD12_##r, PAD11_##r, PAD10_##r, PAD9_##r, PAD8_##r, PAD7_##r, PAD6_##r, PAD5_##r, PAD4_##r, PAD3_##r, PAD2_##r, PAD1_##r, PAD0_##r,
-
-// Use the above enum values to create a table of offsets for each rule's arg
-// data, which indexes rule_arg_combined_table.  The offsets require 9 bits of
-// storage but only the lower 8 bits are stored here.  The 9th bit is computed
-// in get_rule_arg using the FIRST_RULE_WITH_OFFSET_ABOVE_255 constant.
-STATIC const uint8_t rule_arg_offset_table[] = {
-#define DEF_RULE(rule, comp, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) & 0xff,
-#define DEF_RULE_NC(rule, kind, ...)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-    0, // RULE_const_object
-#define DEF_RULE(rule, comp, kind, ...)
-#define DEF_RULE_NC(rule, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) & 0xff,
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-};
-
-// Define a constant that's used to determine the 9th bit of the values in rule_arg_offset_table
-static const size_t FIRST_RULE_WITH_OFFSET_ABOVE_255 =
-#define DEF_RULE(rule, comp, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) >= 0x100 ? RULE_##rule :
-#define DEF_RULE_NC(rule, kind, ...)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-#define DEF_RULE(rule, comp, kind, ...)
-#define DEF_RULE_NC(rule, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) >= 0x100 ? RULE_##rule :
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-0;
-
-#if USE_RULE_NAME
-// Define an array of rule names corresponding to each rule
-STATIC const char *const rule_name_table[] = {
-#define DEF_RULE(rule, comp, kind, ...) #rule,
-#define DEF_RULE_NC(rule, kind, ...)
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-    "", // RULE_const_object
-#define DEF_RULE(rule, comp, kind, ...)
-#define DEF_RULE_NC(rule, kind, ...) #rule,
-#include "py/grammar.h"
-#undef DEF_RULE
-#undef DEF_RULE_NC
-};
-#endif
-
-typedef struct _rule_stack_t {
-    size_t src_line : 8 * sizeof(size_t) - 8; // maximum bits storing source line number
-    size_t rule_id : 8; // this must be large enough to fit largest rule number
-    size_t arg_i; // this dictates the maximum nodes in a "list" of things
-} rule_stack_t;
-
-typedef struct _mp_parse_chunk_t {
-    size_t alloc;
-    union {
-        size_t used;
-        struct _mp_parse_chunk_t *next;
-    } union_;
-    byte data[];
-} mp_parse_chunk_t;
-
-typedef struct _parser_t {
-    size_t rule_stack_alloc;
-    size_t rule_stack_top;
-    rule_stack_t *rule_stack;
-
-    size_t result_stack_alloc;
-    size_t result_stack_top;
-    mp_parse_node_t *result_stack;
-
-    mp_lexer_t *lexer;
-
-    mp_parse_tree_t tree;
-    mp_parse_chunk_t *cur_chunk;
-
-    #if MICROPY_COMP_CONST
-    mp_map_t consts;
-    #endif
-} parser_t;
-
-STATIC const uint16_t *get_rule_arg(uint8_t r_id) {
-    size_t off = rule_arg_offset_table[r_id];
-    if (r_id >= FIRST_RULE_WITH_OFFSET_ABOVE_255) {
-        off |= 0x100;
-    }
-    return &rule_arg_combined_table[off];
-}
-
-STATIC void *parser_alloc(parser_t *parser, size_t num_bytes) {
-    // use a custom memory allocator to store parse nodes sequentially in large chunks
-
-    mp_parse_chunk_t *chunk = parser->cur_chunk;
-
-    if (chunk != NULL && chunk->union_.used + num_bytes > chunk->alloc) {
-        // not enough room at end of previously allocated chunk so try to grow
-        mp_parse_chunk_t *new_data = (mp_parse_chunk_t*)m_renew_maybe(byte, chunk,
-            sizeof(mp_parse_chunk_t) + chunk->alloc,
-            sizeof(mp_parse_chunk_t) + chunk->alloc + num_bytes, false);
-        if (new_data == NULL) {
-            // could not grow existing memory; shrink it to fit previous
-            (void)m_renew_maybe(byte, chunk, sizeof(mp_parse_chunk_t) + chunk->alloc,
-                sizeof(mp_parse_chunk_t) + chunk->union_.used, false);
-            chunk->alloc = chunk->union_.used;
-            chunk->union_.next = parser->tree.chunk;
-            parser->tree.chunk = chunk;
-            chunk = NULL;
-        } else {
-            // could grow existing memory
-            chunk->alloc += num_bytes;
-        }
-    }
-
-    if (chunk == NULL) {
-        // no previous chunk, allocate a new chunk
-        size_t alloc = MICROPY_ALLOC_PARSE_CHUNK_INIT;
-        if (alloc < num_bytes) {
-            alloc = num_bytes;
-        }
-        chunk = (mp_parse_chunk_t*)m_new(byte, sizeof(mp_parse_chunk_t) + alloc);
-        chunk->alloc = alloc;
-        chunk->union_.used = 0;
-        parser->cur_chunk = chunk;
-    }
-
-    byte *ret = chunk->data + chunk->union_.used;
-    chunk->union_.used += num_bytes;
-    return ret;
-}
-
-STATIC void push_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t arg_i) {
-    if (parser->rule_stack_top >= parser->rule_stack_alloc) {
-        rule_stack_t *rs = m_renew(rule_stack_t, parser->rule_stack, parser->rule_stack_alloc, parser->rule_stack_alloc + MICROPY_ALLOC_PARSE_RULE_INC);
-        parser->rule_stack = rs;
-        parser->rule_stack_alloc += MICROPY_ALLOC_PARSE_RULE_INC;
-    }
-    rule_stack_t *rs = &parser->rule_stack[parser->rule_stack_top++];
-    rs->src_line = src_line;
-    rs->rule_id = rule_id;
-    rs->arg_i = arg_i;
-}
-
-STATIC void push_rule_from_arg(parser_t *parser, size_t arg) {
-    assert((arg & RULE_ARG_KIND_MASK) == RULE_ARG_RULE || (arg & RULE_ARG_KIND_MASK) == RULE_ARG_OPT_RULE);
-    size_t rule_id = arg & RULE_ARG_ARG_MASK;
-    push_rule(parser, parser->lexer->tok_line, rule_id, 0);
-}
-
-STATIC uint8_t pop_rule(parser_t *parser, size_t *arg_i, size_t *src_line) {
-    parser->rule_stack_top -= 1;
-    uint8_t rule_id = parser->rule_stack[parser->rule_stack_top].rule_id;
-    *arg_i = parser->rule_stack[parser->rule_stack_top].arg_i;
-    *src_line = parser->rule_stack[parser->rule_stack_top].src_line;
-    return rule_id;
-}
-
-bool mp_parse_node_is_const_false(mp_parse_node_t pn) {
-    return MP_PARSE_NODE_IS_TOKEN_KIND(pn, MP_TOKEN_KW_FALSE)
-        || (MP_PARSE_NODE_IS_SMALL_INT(pn) && MP_PARSE_NODE_LEAF_SMALL_INT(pn) == 0);
-}
-
-bool mp_parse_node_is_const_true(mp_parse_node_t pn) {
-    return MP_PARSE_NODE_IS_TOKEN_KIND(pn, MP_TOKEN_KW_TRUE)
-        || (MP_PARSE_NODE_IS_SMALL_INT(pn) && MP_PARSE_NODE_LEAF_SMALL_INT(pn) != 0);
-}
-
-bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
-    if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
-        *o = MP_OBJ_NEW_SMALL_INT(MP_PARSE_NODE_LEAF_SMALL_INT(pn));
-        return true;
-    } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_const_object)) {
-        mp_parse_node_struct_t *pns = (mp_parse_node_struct_t*)pn;
-        #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-        // nodes are 32-bit pointers, but need to extract 64-bit object
-        *o = (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32);
-        #else
-        *o = (mp_obj_t)pns->nodes[0];
-        #endif
-        return mp_obj_is_int(*o);
-    } else {
-        return false;
-    }
-}
-
-int mp_parse_node_extract_list(mp_parse_node_t *pn, size_t pn_kind, mp_parse_node_t **nodes) {
-    if (MP_PARSE_NODE_IS_NULL(*pn)) {
-        *nodes = NULL;
-        return 0;
-    } else if (MP_PARSE_NODE_IS_LEAF(*pn)) {
-        *nodes = pn;
-        return 1;
-    } else {
-        mp_parse_node_struct_t *pns = (mp_parse_node_struct_t*)(*pn);
-        if (MP_PARSE_NODE_STRUCT_KIND(pns) != pn_kind) {
-            *nodes = pn;
-            return 1;
-        } else {
-            *nodes = pns->nodes;
-            return MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
-        }
-    }
-}
-
-#if MICROPY_DEBUG_PRINTERS
-void mp_parse_node_print(mp_parse_node_t pn, size_t indent) {
-    if (MP_PARSE_NODE_IS_STRUCT(pn)) {
-        printf("[% 4d] ", (int)((mp_parse_node_struct_t*)pn)->source_line);
-    } else {
-        printf("       ");
-    }
-    for (size_t i = 0; i < indent; i++) {
-        printf(" ");
-    }
-    if (MP_PARSE_NODE_IS_NULL(pn)) {
-        printf("NULL\n");
-    } else if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
-        mp_int_t arg = MP_PARSE_NODE_LEAF_SMALL_INT(pn);
-        printf("int(" INT_FMT ")\n", arg);
-    } else if (MP_PARSE_NODE_IS_LEAF(pn)) {
-        uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
-        switch (MP_PARSE_NODE_LEAF_KIND(pn)) {
-            case MP_PARSE_NODE_ID: printf("id(%s)\n", qstr_str(arg)); break;
-            case MP_PARSE_NODE_STRING: printf("str(%s)\n", qstr_str(arg)); break;
-            case MP_PARSE_NODE_BYTES: printf("bytes(%s)\n", qstr_str(arg)); break;
-            default:
-                assert(MP_PARSE_NODE_LEAF_KIND(pn) == MP_PARSE_NODE_TOKEN);
-                printf("tok(%u)\n", (uint)arg); break;
-        }
-    } else {
-        // node must be a mp_parse_node_struct_t
-        mp_parse_node_struct_t *pns = (mp_parse_node_struct_t*)pn;
-        if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_const_object) {
-            #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-            printf("literal const(%016llx)\n", (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32));
-            #else
-            printf("literal const(%p)\n", (mp_obj_t)pns->nodes[0]);
-            #endif
-        } else {
-            size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
-            #if USE_RULE_NAME
-            printf("%s(%u) (n=%u)\n", rule_name_table[MP_PARSE_NODE_STRUCT_KIND(pns)], (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
-            #else
-            printf("rule(%u) (n=%u)\n", (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
-            #endif
-            for (size_t i = 0; i < n; i++) {
-                mp_parse_node_print(pns->nodes[i], indent + 2);
-            }
-        }
-    }
-}
-#endif // MICROPY_DEBUG_PRINTERS
-
-/*
-STATIC void result_stack_show(parser_t *parser) {
-    printf("result stack, most recent first\n");
-    for (ssize_t i = parser->result_stack_top - 1; i >= 0; i--) {
-        mp_parse_node_print(parser->result_stack[i], 0);
-    }
-}
-*/
-
-STATIC mp_parse_node_t pop_result(parser_t *parser) {
-    assert(parser->result_stack_top > 0);
-    return parser->result_stack[--parser->result_stack_top];
-}
-
-STATIC mp_parse_node_t peek_result(parser_t *parser, size_t pos) {
-    assert(parser->result_stack_top > pos);
-    return parser->result_stack[parser->result_stack_top - 1 - pos];
-}
-
-STATIC void push_result_node(parser_t *parser, mp_parse_node_t pn) {
-    if (parser->result_stack_top >= parser->result_stack_alloc) {
-        mp_parse_node_t *stack = m_renew(mp_parse_node_t, parser->result_stack, parser->result_stack_alloc, parser->result_stack_alloc + MICROPY_ALLOC_PARSE_RESULT_INC);
-        parser->result_stack = stack;
-        parser->result_stack_alloc += MICROPY_ALLOC_PARSE_RESULT_INC;
-    }
-    parser->result_stack[parser->result_stack_top++] = pn;
-}
-
-STATIC mp_parse_node_t make_node_const_object(parser_t *parser, size_t src_line, mp_obj_t obj) {
-    mp_parse_node_struct_t *pn = parser_alloc(parser, sizeof(mp_parse_node_struct_t) + sizeof(mp_obj_t));
-    pn->source_line = src_line;
-    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-    // nodes are 32-bit pointers, but need to store 64-bit object
-    pn->kind_num_nodes = RULE_const_object | (2 << 8);
-    pn->nodes[0] = (uint64_t)obj;
-    pn->nodes[1] = (uint64_t)obj >> 32;
-    #else
-    pn->kind_num_nodes = RULE_const_object | (1 << 8);
-    pn->nodes[0] = (uintptr_t)obj;
-    #endif
-    return (mp_parse_node_t)pn;
-}
-
-STATIC mp_parse_node_t mp_parse_node_new_small_int_checked(parser_t *parser, mp_obj_t o_val) {
-    (void)parser;
-    mp_int_t val = MP_OBJ_SMALL_INT_VALUE(o_val);
-    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-    // A parse node is only 32-bits and the small-int value must fit in 31-bits
-    if (((val ^ (val << 1)) & 0xffffffff80000000) != 0) {
-        return make_node_const_object(parser, 0, o_val);
-    }
-    #endif
-    return mp_parse_node_new_small_int(val);
-}
-
-STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
-    mp_parse_node_t pn;
-    mp_lexer_t *lex = parser->lexer;
-    if (lex->tok_kind == MP_TOKEN_NAME) {
-        qstr id = qstr_from_strn(lex->vstr.buf, lex->vstr.len);
-        #if MICROPY_COMP_CONST
-        // if name is a standalone identifier, look it up in the table of dynamic constants
-        mp_map_elem_t *elem;
-        if (rule_id == RULE_atom
-            && (elem = mp_map_lookup(&parser->consts, MP_OBJ_NEW_QSTR(id), MP_MAP_LOOKUP)) != NULL) {
-            if (mp_obj_is_small_int(elem->value)) {
-                pn = mp_parse_node_new_small_int_checked(parser, elem->value);
-            } else {
-                pn = make_node_const_object(parser, lex->tok_line, elem->value);
-            }
-        } else {
-            pn = mp_parse_node_new_leaf(MP_PARSE_NODE_ID, id);
-        }
-        #else
-        (void)rule_id;
-        pn = mp_parse_node_new_leaf(MP_PARSE_NODE_ID, id);
-        #endif
-    } else if (lex->tok_kind == MP_TOKEN_INTEGER) {
-        mp_obj_t o = mp_parse_num_integer(lex->vstr.buf, lex->vstr.len, 0, lex);
-        if (mp_obj_is_small_int(o)) {
-            pn = mp_parse_node_new_small_int_checked(parser, o);
-        } else {
-            pn = make_node_const_object(parser, lex->tok_line, o);
-        }
-    } else if (lex->tok_kind == MP_TOKEN_FLOAT_OR_IMAG) {
-        mp_obj_t o = mp_parse_num_decimal(lex->vstr.buf, lex->vstr.len, true, false, lex);
-        pn = make_node_const_object(parser, lex->tok_line, o);
-    } else if (lex->tok_kind == MP_TOKEN_STRING || lex->tok_kind == MP_TOKEN_BYTES) {
-        // Don't automatically intern all strings/bytes.  doc strings (which are usually large)
-        // will be discarded by the compiler, and so we shouldn't intern them.
-        qstr qst = MP_QSTRnull;
-        if (lex->vstr.len <= MICROPY_ALLOC_PARSE_INTERN_STRING_LEN) {
-            // intern short strings
-            qst = qstr_from_strn(lex->vstr.buf, lex->vstr.len);
-        } else {
-            // check if this string is already interned
-            qst = qstr_find_strn(lex->vstr.buf, lex->vstr.len);
-        }
-        if (qst != MP_QSTRnull) {
-            // qstr exists, make a leaf node
-            pn = mp_parse_node_new_leaf(lex->tok_kind == MP_TOKEN_STRING ? MP_PARSE_NODE_STRING : MP_PARSE_NODE_BYTES, qst);
-        } else {
-            // not interned, make a node holding a pointer to the string/bytes object
-            mp_obj_t o = mp_obj_new_str_copy(
-                lex->tok_kind == MP_TOKEN_STRING ? &mp_type_str : &mp_type_bytes,
-                (const byte*)lex->vstr.buf, lex->vstr.len);
-            pn = make_node_const_object(parser, lex->tok_line, o);
-        }
-    } else {
-        pn = mp_parse_node_new_leaf(MP_PARSE_NODE_TOKEN, lex->tok_kind);
-    }
-    push_result_node(parser, pn);
-}
-
-#if MICROPY_COMP_MODULE_CONST
-STATIC const mp_rom_map_elem_t mp_constants_table[] = {
-    #if MICROPY_PY_UERRNO
-    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) },
-    #endif
-    #if MICROPY_PY_UCTYPES
-    { MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
-    #endif
-    // Extra constants as defined by a port
-    MICROPY_PORT_CONSTANTS
-};
-STATIC MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
-#endif
-
-STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args);
-
-#if MICROPY_COMP_CONST_FOLDING
-STATIC bool fold_logical_constants(parser_t *parser, uint8_t rule_id, size_t *num_args) {
-    if (rule_id == RULE_or_test
-        || rule_id == RULE_and_test) {
-        // folding for binary logical ops: or and
-        size_t copy_to = *num_args;
-        for (size_t i = copy_to; i > 0;) {
-            mp_parse_node_t pn = peek_result(parser, --i);
-            parser->result_stack[parser->result_stack_top - copy_to] = pn;
-            if (i == 0) {
-                // always need to keep the last value
-                break;
-            }
-            if (rule_id == RULE_or_test) {
-                if (mp_parse_node_is_const_true(pn)) {
-                    //
-                    break;
-                } else if (!mp_parse_node_is_const_false(pn)) {
-                    copy_to -= 1;
-                }
-            } else {
-                // RULE_and_test
-                if (mp_parse_node_is_const_false(pn)) {
-                    break;
-                } else if (!mp_parse_node_is_const_true(pn)) {
-                    copy_to -= 1;
-                }
-            }
-        }
-        copy_to -= 1; // copy_to now contains number of args to pop
-
-        // pop and discard all the short-circuited expressions
-        for (size_t i = 0; i < copy_to; ++i) {
-            pop_result(parser);
-        }
-        *num_args -= copy_to;
-
-        // we did a complete folding if there's only 1 arg left
-        return *num_args == 1;
-
-    } else if (rule_id == RULE_not_test_2) {
-        // folding for unary logical op: not
-        mp_parse_node_t pn = peek_result(parser, 0);
-        if (mp_parse_node_is_const_false(pn)) {
-            pn = mp_parse_node_new_leaf(MP_PARSE_NODE_TOKEN, MP_TOKEN_KW_TRUE);
-        } else if (mp_parse_node_is_const_true(pn)) {
-            pn = mp_parse_node_new_leaf(MP_PARSE_NODE_TOKEN, MP_TOKEN_KW_FALSE);
-        } else {
-            return false;
-        }
-        pop_result(parser);
-        push_result_node(parser, pn);
-        return true;
-    }
-
-    return false;
-}
-
-STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
-    // this code does folding of arbitrary integer expressions, eg 1 + 2 * 3 + 4
-    // it does not do partial folding, eg 1 + 2 + x -> 3 + x
-
-    mp_obj_t arg0;
-    if (rule_id == RULE_expr
-        || rule_id == RULE_xor_expr
-        || rule_id == RULE_and_expr) {
-        // folding for binary ops: | ^ &
-        mp_parse_node_t pn = peek_result(parser, num_args - 1);
-        if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
-            return false;
-        }
-        mp_binary_op_t op;
-        if (rule_id == RULE_expr) {
-            op = MP_BINARY_OP_OR;
-        } else if (rule_id == RULE_xor_expr) {
-            op = MP_BINARY_OP_XOR;
-        } else {
-            op = MP_BINARY_OP_AND;
-        }
-        for (ssize_t i = num_args - 2; i >= 0; --i) {
-            pn = peek_result(parser, i);
-            mp_obj_t arg1;
-            if (!mp_parse_node_get_int_maybe(pn, &arg1)) {
-                return false;
-            }
-            arg0 = mp_binary_op(op, arg0, arg1);
-        }
-    } else if (rule_id == RULE_shift_expr
-        || rule_id == RULE_arith_expr
-        || rule_id == RULE_term) {
-        // folding for binary ops: << >> + - * @ / % //
-        mp_parse_node_t pn = peek_result(parser, num_args - 1);
-        if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
-            return false;
-        }
-        for (ssize_t i = num_args - 2; i >= 1; i -= 2) {
-            pn = peek_result(parser, i - 1);
-            mp_obj_t arg1;
-            if (!mp_parse_node_get_int_maybe(pn, &arg1)) {
-                return false;
-            }
-            mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, i));
-            if (tok == MP_TOKEN_OP_AT || tok == MP_TOKEN_OP_SLASH || tok == MP_TOKEN_OP_DBL_STAR) {
-                // Can't fold @ or / or **
-                return false;
-            }
-            mp_binary_op_t op = MP_BINARY_OP_LSHIFT + (tok - MP_TOKEN_OP_DBL_LESS);
-            int rhs_sign = mp_obj_int_sign(arg1);
-            if (op <= MP_BINARY_OP_RSHIFT) {
-                // << and >> can't have negative rhs
-                if (rhs_sign < 0) {
-                    return false;
-                }
-            } else if (op >= MP_BINARY_OP_FLOOR_DIVIDE) {
-                // % and // can't have zero rhs
-                if (rhs_sign == 0) {
-                    return false;
-                }
-            }
-            arg0 = mp_binary_op(op, arg0, arg1);
-        }
-    } else if (rule_id == RULE_factor_2) {
-        // folding for unary ops: + - ~
-        mp_parse_node_t pn = peek_result(parser, 0);
-        if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
-            return false;
-        }
-        mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, 1));
-        mp_unary_op_t op;
-        if (tok == MP_TOKEN_OP_TILDE) {
-            op = MP_UNARY_OP_INVERT;
-        } else {
-            assert(tok == MP_TOKEN_OP_PLUS || tok == MP_TOKEN_OP_MINUS); // should be
-            op = MP_UNARY_OP_POSITIVE + (tok - MP_TOKEN_OP_PLUS);
-        }
-        arg0 = mp_unary_op(op, arg0);
-
-    #if MICROPY_COMP_CONST
-    } else if (rule_id == RULE_expr_stmt) {
-        mp_parse_node_t pn1 = peek_result(parser, 0);
-        if (!MP_PARSE_NODE_IS_NULL(pn1)
-            && !(MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_expr_stmt_augassign)
-            || MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_expr_stmt_assign_list))) {
-            // this node is of the form <x> = <y>
-            mp_parse_node_t pn0 = peek_result(parser, 1);
-            if (MP_PARSE_NODE_IS_ID(pn0)
-                && MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_atom_expr_normal)
-                && MP_PARSE_NODE_IS_ID(((mp_parse_node_struct_t*)pn1)->nodes[0])
-                && MP_PARSE_NODE_LEAF_ARG(((mp_parse_node_struct_t*)pn1)->nodes[0]) == MP_QSTR_const
-                && MP_PARSE_NODE_IS_STRUCT_KIND(((mp_parse_node_struct_t*)pn1)->nodes[1], RULE_trailer_paren)
-                ) {
-                // code to assign dynamic constants: id = const(value)
-
-                // get the id
-                qstr id = MP_PARSE_NODE_LEAF_ARG(pn0);
-
-                // get the value
-                mp_parse_node_t pn_value = ((mp_parse_node_struct_t*)((mp_parse_node_struct_t*)pn1)->nodes[1])->nodes[0];
-                mp_obj_t value;
-                if (!mp_parse_node_get_int_maybe(pn_value, &value)) {
-                    mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
-                        "constant must be an integer");
-                    mp_obj_exception_add_traceback(exc, parser->lexer->source_name,
-                        ((mp_parse_node_struct_t*)pn1)->source_line, MP_QSTRnull);
-                    nlr_raise(exc);
-                }
-
-                // store the value in the table of dynamic constants
-                mp_map_elem_t *elem = mp_map_lookup(&parser->consts, MP_OBJ_NEW_QSTR(id), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
-                assert(elem->value == MP_OBJ_NULL);
-                elem->value = value;
-
-                // If the constant starts with an underscore then treat it as a private
-                // variable and don't emit any code to store the value to the id.
-                if (qstr_str(id)[0] == '_') {
-                    pop_result(parser); // pop const(value)
-                    pop_result(parser); // pop id
-                    push_result_rule(parser, 0, RULE_pass_stmt, 0); // replace with "pass"
-                    return true;
-                }
-
-                // replace const(value) with value
-                pop_result(parser);
-                push_result_node(parser, pn_value);
-
-                // finished folding this assignment, but we still want it to be part of the tree
-                return false;
-            }
-        }
-        return false;
-    #endif
-
-    #if MICROPY_COMP_MODULE_CONST
-    } else if (rule_id == RULE_atom_expr_normal) {
-        mp_parse_node_t pn0 = peek_result(parser, 1);
-        mp_parse_node_t pn1 = peek_result(parser, 0);
-        if (!(MP_PARSE_NODE_IS_ID(pn0)
-            && MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_trailer_period))) {
-            return false;
-        }
-        // id1.id2
-        // look it up in constant table, see if it can be replaced with an integer
-        mp_parse_node_struct_t *pns1 = (mp_parse_node_struct_t*)pn1;
-        assert(MP_PARSE_NODE_IS_ID(pns1->nodes[0]));
-        qstr q_base = MP_PARSE_NODE_LEAF_ARG(pn0);
-        qstr q_attr = MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]);
-        mp_map_elem_t *elem = mp_map_lookup((mp_map_t*)&mp_constants_map, MP_OBJ_NEW_QSTR(q_base), MP_MAP_LOOKUP);
-        if (elem == NULL) {
-            return false;
-        }
-        mp_obj_t dest[2];
-        mp_load_method_maybe(elem->value, q_attr, dest);
-        if (!(dest[0] != MP_OBJ_NULL && mp_obj_is_int(dest[0]) && dest[1] == MP_OBJ_NULL)) {
-            return false;
-        }
-        arg0 = dest[0];
-    #endif
-
-    } else {
-        return false;
-    }
-
-    // success folding this rule
-
-    for (size_t i = num_args; i > 0; i--) {
-        pop_result(parser);
-    }
-    if (mp_obj_is_small_int(arg0)) {
-        push_result_node(parser, mp_parse_node_new_small_int_checked(parser, arg0));
-    } else {
-        // TODO reuse memory for parse node struct?
-        push_result_node(parser, make_node_const_object(parser, 0, arg0));
-    }
-
-    return true;
-}
-#endif
-
-STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
-    // optimise away parenthesis around an expression if possible
-    if (rule_id == RULE_atom_paren) {
-        // there should be just 1 arg for this rule
-        mp_parse_node_t pn = peek_result(parser, 0);
-        if (MP_PARSE_NODE_IS_NULL(pn)) {
-            // need to keep parenthesis for ()
-        } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_testlist_comp)) {
-            // need to keep parenthesis for (a, b, ...)
-        } else {
-            // parenthesis around a single expression, so it's just the expression
-            return;
-        }
-    }
-
-    #if MICROPY_COMP_CONST_FOLDING
-    if (fold_logical_constants(parser, rule_id, &num_args)) {
-        // we folded this rule so return straight away
-        return;
-    }
-    if (fold_constants(parser, rule_id, num_args)) {
-        // we folded this rule so return straight away
-        return;
-    }
-    #endif
-
-    mp_parse_node_struct_t *pn = parser_alloc(parser, sizeof(mp_parse_node_struct_t) + sizeof(mp_parse_node_t) * num_args);
-    pn->source_line = src_line;
-    pn->kind_num_nodes = (rule_id & 0xff) | (num_args << 8);
-    for (size_t i = num_args; i > 0; i--) {
-        pn->nodes[i - 1] = pop_result(parser);
-    }
-    push_result_node(parser, (mp_parse_node_t)pn);
-}
-
-mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
-
-    // initialise parser and allocate memory for its stacks
-
-    parser_t parser;
-
-    parser.rule_stack_alloc = MICROPY_ALLOC_PARSE_RULE_INIT;
-    parser.rule_stack_top = 0;
-    parser.rule_stack = m_new(rule_stack_t, parser.rule_stack_alloc);
-
-    parser.result_stack_alloc = MICROPY_ALLOC_PARSE_RESULT_INIT;
-    parser.result_stack_top = 0;
-    parser.result_stack = m_new(mp_parse_node_t, parser.result_stack_alloc);
-
-    parser.lexer = lex;
-
-    parser.tree.chunk = NULL;
-    parser.cur_chunk = NULL;
-
-    #if MICROPY_COMP_CONST
-    mp_map_init(&parser.consts, 0);
-    #endif
-
-    // work out the top-level rule to use, and push it on the stack
-    size_t top_level_rule;
-    switch (input_kind) {
-        case MP_PARSE_SINGLE_INPUT: top_level_rule = RULE_single_input; break;
-        case MP_PARSE_EVAL_INPUT: top_level_rule = RULE_eval_input; break;
-        default: top_level_rule = RULE_file_input;
-    }
-    push_rule(&parser, lex->tok_line, top_level_rule, 0);
-
-    // parse!
-
-    bool backtrack = false;
-
-    for (;;) {
-        next_rule:
-        if (parser.rule_stack_top == 0) {
-            break;
-        }
-
-        // Pop the next rule to process it
-        size_t i; // state for the current rule
-        size_t rule_src_line; // source line for the first token matched by the current rule
-        uint8_t rule_id = pop_rule(&parser, &i, &rule_src_line);
-        uint8_t rule_act = rule_act_table[rule_id];
-        const uint16_t *rule_arg = get_rule_arg(rule_id);
-        size_t n = rule_act & RULE_ACT_ARG_MASK;
-
-        #if 0
-        // debugging
-        printf("depth=" UINT_FMT " ", parser.rule_stack_top);
-        for (int j = 0; j < parser.rule_stack_top; ++j) {
-            printf(" ");
-        }
-        printf("%s n=" UINT_FMT " i=" UINT_FMT " bt=%d\n", rule_name_table[rule_id], n, i, backtrack);
-        #endif
-
-        switch (rule_act & RULE_ACT_KIND_MASK) {
-            case RULE_ACT_OR:
-                if (i > 0 && !backtrack) {
-                    goto next_rule;
-                } else {
-                    backtrack = false;
-                }
-                for (; i < n; ++i) {
-                    uint16_t kind = rule_arg[i] & RULE_ARG_KIND_MASK;
-                    if (kind == RULE_ARG_TOK) {
-                        if (lex->tok_kind == (rule_arg[i] & RULE_ARG_ARG_MASK)) {
-                            push_result_token(&parser, rule_id);
-                            mp_lexer_to_next(lex);
-                            goto next_rule;
-                        }
-                    } else {
-                        assert(kind == RULE_ARG_RULE);
-                        if (i + 1 < n) {
-                            push_rule(&parser, rule_src_line, rule_id, i + 1); // save this or-rule
-                        }
-                        push_rule_from_arg(&parser, rule_arg[i]); // push child of or-rule
-                        goto next_rule;
-                    }
-                }
-                backtrack = true;
-                break;
-
-            case RULE_ACT_AND: {
-
-                // failed, backtrack if we can, else syntax error
-                if (backtrack) {
-                    assert(i > 0);
-                    if ((rule_arg[i - 1] & RULE_ARG_KIND_MASK) == RULE_ARG_OPT_RULE) {
-                        // an optional rule that failed, so continue with next arg
-                        push_result_node(&parser, MP_PARSE_NODE_NULL);
-                        backtrack = false;
-                    } else {
-                        // a mandatory rule that failed, so propagate backtrack
-                        if (i > 1) {
-                            // already eaten tokens so can't backtrack
-                            goto syntax_error;
-                        } else {
-                            goto next_rule;
-                        }
-                    }
-                }
-
-                // progress through the rule
-                for (; i < n; ++i) {
-                    if ((rule_arg[i] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
-                        // need to match a token
-                        mp_token_kind_t tok_kind = rule_arg[i] & RULE_ARG_ARG_MASK;
-                        if (lex->tok_kind == tok_kind) {
-                            // matched token
-                            if (tok_kind == MP_TOKEN_NAME) {
-                                push_result_token(&parser, rule_id);
-                            }
-                            mp_lexer_to_next(lex);
-                        } else {
-                            // failed to match token
-                            if (i > 0) {
-                                // already eaten tokens so can't backtrack
-                                goto syntax_error;
-                            } else {
-                                // this rule failed, so backtrack
-                                backtrack = true;
-                                goto next_rule;
-                            }
-                        }
-                    } else {
-                        push_rule(&parser, rule_src_line, rule_id, i + 1); // save this and-rule
-                        push_rule_from_arg(&parser, rule_arg[i]); // push child of and-rule
-                        goto next_rule;
-                    }
-                }
-
-                assert(i == n);
-
-                // matched the rule, so now build the corresponding parse_node
-
-                #if !MICROPY_ENABLE_DOC_STRING
-                // this code discards lonely statements, such as doc strings
-                if (input_kind != MP_PARSE_SINGLE_INPUT && rule_id == RULE_expr_stmt && peek_result(&parser, 0) == MP_PARSE_NODE_NULL) {
-                    mp_parse_node_t p = peek_result(&parser, 1);
-                    if ((MP_PARSE_NODE_IS_LEAF(p) && !MP_PARSE_NODE_IS_ID(p))
-                        || MP_PARSE_NODE_IS_STRUCT_KIND(p, RULE_const_object)) {
-                        pop_result(&parser); // MP_PARSE_NODE_NULL
-                        pop_result(&parser); // const expression (leaf or RULE_const_object)
-                        // Pushing the "pass" rule here will overwrite any RULE_const_object
-                        // entry that was on the result stack, allowing the GC to reclaim
-                        // the memory from the const object when needed.
-                        push_result_rule(&parser, rule_src_line, RULE_pass_stmt, 0);
-                        break;
-                    }
-                }
-                #endif
-
-                // count number of arguments for the parse node
-                i = 0;
-                size_t num_not_nil = 0;
-                for (size_t x = n; x > 0;) {
-                    --x;
-                    if ((rule_arg[x] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
-                        mp_token_kind_t tok_kind = rule_arg[x] & RULE_ARG_ARG_MASK;
-                        if (tok_kind == MP_TOKEN_NAME) {
-                            // only tokens which were names are pushed to stack
-                            i += 1;
-                            num_not_nil += 1;
-                        }
-                    } else {
-                        // rules are always pushed
-                        if (peek_result(&parser, i) != MP_PARSE_NODE_NULL) {
-                            num_not_nil += 1;
-                        }
-                        i += 1;
-                    }
-                }
-
-                if (num_not_nil == 1 && (rule_act & RULE_ACT_ALLOW_IDENT)) {
-                    // this rule has only 1 argument and should not be emitted
-                    mp_parse_node_t pn = MP_PARSE_NODE_NULL;
-                    for (size_t x = 0; x < i; ++x) {
-                        mp_parse_node_t pn2 = pop_result(&parser);
-                        if (pn2 != MP_PARSE_NODE_NULL) {
-                            pn = pn2;
-                        }
-                    }
-                    push_result_node(&parser, pn);
-                } else {
-                    // this rule must be emitted
-
-                    if (rule_act & RULE_ACT_ADD_BLANK) {
-                        // and add an extra blank node at the end (used by the compiler to store data)
-                        push_result_node(&parser, MP_PARSE_NODE_NULL);
-                        i += 1;
-                    }
-
-                    push_result_rule(&parser, rule_src_line, rule_id, i);
-                }
-                break;
-            }
-
-            default: {
-                assert((rule_act & RULE_ACT_KIND_MASK) == RULE_ACT_LIST);
-
-                // n=2 is: item item*
-                // n=1 is: item (sep item)*
-                // n=3 is: item (sep item)* [sep]
-                bool had_trailing_sep;
-                if (backtrack) {
-                    list_backtrack:
-                    had_trailing_sep = false;
-                    if (n == 2) {
-                        if (i == 1) {
-                            // fail on item, first time round; propagate backtrack
-                            goto next_rule;
-                        } else {
-                            // fail on item, in later rounds; finish with this rule
-                            backtrack = false;
-                        }
-                    } else {
-                        if (i == 1) {
-                            // fail on item, first time round; propagate backtrack
-                            goto next_rule;
-                        } else if ((i & 1) == 1) {
-                            // fail on item, in later rounds; have eaten tokens so can't backtrack
-                            if (n == 3) {
-                                // list allows trailing separator; finish parsing list
-                                had_trailing_sep = true;
-                                backtrack = false;
-                            } else {
-                                // list doesn't allowing trailing separator; fail
-                                goto syntax_error;
-                            }
-                        } else {
-                            // fail on separator; finish parsing list
-                            backtrack = false;
-                        }
-                    }
-                } else {
-                    for (;;) {
-                        size_t arg = rule_arg[i & 1 & n];
-                        if ((arg & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
-                            if (lex->tok_kind == (arg & RULE_ARG_ARG_MASK)) {
-                                if (i & 1 & n) {
-                                    // separators which are tokens are not pushed to result stack
-                                } else {
-                                    push_result_token(&parser, rule_id);
-                                }
-                                mp_lexer_to_next(lex);
-                                // got element of list, so continue parsing list
-                                i += 1;
-                            } else {
-                                // couldn't get element of list
-                                i += 1;
-                                backtrack = true;
-                                goto list_backtrack;
-                            }
-                        } else {
-                            assert((arg & RULE_ARG_KIND_MASK) == RULE_ARG_RULE);
-                            push_rule(&parser, rule_src_line, rule_id, i + 1); // save this list-rule
-                            push_rule_from_arg(&parser, arg); // push child of list-rule
-                            goto next_rule;
-                        }
-                    }
-                }
-                assert(i >= 1);
-
-                // compute number of elements in list, result in i
-                i -= 1;
-                if ((n & 1) && (rule_arg[1] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
-                    // don't count separators when they are tokens
-                    i = (i + 1) / 2;
-                }
-
-                if (i == 1) {
-                    // list matched single item
-                    if (had_trailing_sep) {
-                        // if there was a trailing separator, make a list of a single item
-                        push_result_rule(&parser, rule_src_line, rule_id, i);
-                    } else {
-                        // just leave single item on stack (ie don't wrap in a list)
-                    }
-                } else {
-                    push_result_rule(&parser, rule_src_line, rule_id, i);
-                }
-                break;
-            }
-        }
-    }
-
-    #if MICROPY_COMP_CONST
-    mp_map_deinit(&parser.consts);
-    #endif
-
-    // truncate final chunk and link into chain of chunks
-    if (parser.cur_chunk != NULL) {
-        (void)m_renew_maybe(byte, parser.cur_chunk,
-            sizeof(mp_parse_chunk_t) + parser.cur_chunk->alloc,
-            sizeof(mp_parse_chunk_t) + parser.cur_chunk->union_.used,
-            false);
-        parser.cur_chunk->alloc = parser.cur_chunk->union_.used;
-        parser.cur_chunk->union_.next = parser.tree.chunk;
-        parser.tree.chunk = parser.cur_chunk;
-    }
-
-    if (
-        lex->tok_kind != MP_TOKEN_END // check we are at the end of the token stream
-        || parser.result_stack_top == 0 // check that we got a node (can fail on empty input)
-        ) {
-    syntax_error:;
-        mp_obj_t exc;
-        if (lex->tok_kind == MP_TOKEN_INDENT) {
-            exc = mp_obj_new_exception_msg(&mp_type_IndentationError,
-                "unexpected indent");
-        } else if (lex->tok_kind == MP_TOKEN_DEDENT_MISMATCH) {
-            exc = mp_obj_new_exception_msg(&mp_type_IndentationError,
-                "unindent doesn't match any outer indent level");
-        } else {
-            exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
-                "invalid syntax");
-        }
-        // add traceback to give info about file name and location
-        // we don't have a 'block' name, so just pass the NULL qstr to indicate this
-        mp_obj_exception_add_traceback(exc, lex->source_name, lex->tok_line, MP_QSTRnull);
-        nlr_raise(exc);
-    }
-
-    // get the root parse node that we created
-    assert(parser.result_stack_top == 1);
-    parser.tree.root = parser.result_stack[0];
-
-    // free the memory that we don't need anymore
-    m_del(rule_stack_t, parser.rule_stack, parser.rule_stack_alloc);
-    m_del(mp_parse_node_t, parser.result_stack, parser.result_stack_alloc);
-
-    // we also free the lexer on behalf of the caller
-    mp_lexer_free(lex);
-
-    return parser.tree;
-}
-
-void mp_parse_tree_clear(mp_parse_tree_t *tree) {
-    mp_parse_chunk_t *chunk = tree->chunk;
-    while (chunk != NULL) {
-        mp_parse_chunk_t *next = chunk->union_.next;
-        m_del(byte, chunk, sizeof(mp_parse_chunk_t) + chunk->alloc);
-        chunk = next;
-    }
-}
-
-#endif // MICROPY_ENABLE_COMPILER
diff --git a/apps/KhiCAS/src/micropython-1.12/py/parse.h~ b/apps/KhiCAS/src/micropython-1.12/py/parse.h~
deleted file mode 100644
index 9a1a2b4dd..000000000
--- a/apps/KhiCAS/src/micropython-1.12/py/parse.h~
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_PY_PARSE_H
-#define MICROPY_INCLUDED_PY_PARSE_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "py/obj.h"
-
-struct _mp_lexer_t;
-
-// a mp_parse_node_t is:
-//  - 0000...0000: no node
-//  - xxxx...xxx1: a small integer; bits 1 and above are the signed value, 2's complement
-//  - xxxx...xx00: pointer to mp_parse_node_struct_t
-//  - xx...xx0010: an identifier; bits 4 and above are the qstr
-//  - xx...xx0110: a string; bits 4 and above are the qstr holding the value
-//  - xx...xx1010: a string of bytes; bits 4 and above are the qstr holding the value
-//  - xx...xx1110: a token; bits 4 and above are mp_token_kind_t
-
-#define MP_PARSE_NODE_NULL      (0)
-#define MP_PARSE_NODE_SMALL_INT (0x1)
-#define MP_PARSE_NODE_ID        (0x02)
-#define MP_PARSE_NODE_STRING    (0x06)
-#define MP_PARSE_NODE_BYTES     (0x0a)
-#define MP_PARSE_NODE_TOKEN     (0x0e)
-
-typedef uintptr_t mp_parse_node_t; // must be pointer size
-
-typedef struct _mp_parse_node_struct_t {
-    uint32_t source_line;       // line number in source file
-    uint32_t kind_num_nodes;    // parse node kind, and number of nodes
-    mp_parse_node_t nodes[];    // nodes
-} mp_parse_node_struct_t;
-
-// macros for mp_parse_node_t usage
-// some of these evaluate their argument more than once
-
-#define MP_PARSE_NODE_IS_NULL(pn) ((pn) == MP_PARSE_NODE_NULL)
-#define MP_PARSE_NODE_IS_LEAF(pn) ((pn) & 3)
-#define MP_PARSE_NODE_IS_STRUCT(pn) ((pn) != MP_PARSE_NODE_NULL && ((pn) & 3) == 0)
-#define MP_PARSE_NODE_IS_STRUCT_KIND(pn, k) ((pn) != MP_PARSE_NODE_NULL && ((pn) & 3) == 0 && MP_PARSE_NODE_STRUCT_KIND((mp_parse_node_struct_t*)(pn)) == (k))
-
-#define MP_PARSE_NODE_IS_SMALL_INT(pn) (((pn) & 0x1) == MP_PARSE_NODE_SMALL_INT)
-#define MP_PARSE_NODE_IS_ID(pn) (((pn) & 0x0f) == MP_PARSE_NODE_ID)
-#define MP_PARSE_NODE_IS_TOKEN(pn) (((pn) & 0x0f) == MP_PARSE_NODE_TOKEN)
-#define MP_PARSE_NODE_IS_TOKEN_KIND(pn, k) ((pn) == (MP_PARSE_NODE_TOKEN | ((k) << 4)))
-
-#define MP_PARSE_NODE_LEAF_KIND(pn) ((pn) & 0x0f)
-#define MP_PARSE_NODE_LEAF_ARG(pn) (((uintptr_t)(pn)) >> 4)
-#define MP_PARSE_NODE_LEAF_SMALL_INT(pn) (((mp_int_t)(intptr_t)(pn)) >> 1)
-#define MP_PARSE_NODE_STRUCT_KIND(pns) ((pns)->kind_num_nodes & 0xff)
-#define MP_PARSE_NODE_STRUCT_NUM_NODES(pns) ((pns)->kind_num_nodes >> 8)
-
-static inline mp_parse_node_t mp_parse_node_new_small_int(mp_int_t val) {
-    return (mp_parse_node_t)(MP_PARSE_NODE_SMALL_INT | ((mp_uint_t)val << 1));
-}
-static inline mp_parse_node_t mp_parse_node_new_leaf(size_t kind, mp_int_t arg) {
-    return (mp_parse_node_t)(kind | ((mp_uint_t)arg << 4));
-}
-bool mp_parse_node_is_const_false(mp_parse_node_t pn);
-bool mp_parse_node_is_const_true(mp_parse_node_t pn);
-bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o);
-int mp_parse_node_extract_list(mp_parse_node_t *pn, size_t pn_kind, mp_parse_node_t **nodes);
-void mp_parse_node_print(mp_parse_node_t pn, size_t indent);
-
-typedef enum {
-    MP_PARSE_SINGLE_INPUT,
-    MP_PARSE_FILE_INPUT,
-    MP_PARSE_EVAL_INPUT,
-} mp_parse_input_kind_t;
-
-typedef struct _mp_parse_t {
-    mp_parse_node_t root;
-    struct _mp_parse_chunk_t *chunk;
-} mp_parse_tree_t;
-
-// the parser will raise an exception if an error occurred
-// the parser will free the lexer before it returns
-mp_parse_tree_t mp_parse(struct _mp_lexer_t *lex, mp_parse_input_kind_t input_kind);
-void mp_parse_tree_clear(mp_parse_tree_t *tree);
-
-#endif // MICROPY_INCLUDED_PY_PARSE_H
diff --git a/apps/KhiCAS/src/micropython-1.12/ulab/Makefile.am~ b/apps/KhiCAS/src/micropython-1.12/ulab/Makefile.am~
deleted file mode 100644
index 0ab0efc6a..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ulab/Makefile.am~
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = *
\ No newline at end of file
diff --git a/apps/KhiCAS/src/micropython-1.12/ulab/ndarray.c~ b/apps/KhiCAS/src/micropython-1.12/ulab/ndarray.c~
deleted file mode 100644
index 45e19c262..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ulab/ndarray.c~
+++ /dev/null
@@ -1,1985 +0,0 @@
-
-/*
- * This file is part of the micropython-ulab project,
- *
- * https://github.com/v923z/micropython-ulab
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019-2021 Zoltán Vörös
- *               2020 Jeff Epler for Adafruit Industries
- *               2020 Taku Fukada
-*/
-
-#include <unistd.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "py/runtime.h"
-#include "py/binary.h"
-#include "py/obj.h"
-#include "py/objtuple.h"
-#include "py/objint.h"
-
-#include "ulab_tools.h"
-#include "ndarray.h"
-#include "ndarray_operators.h"
-
-mp_uint_t ndarray_print_threshold = NDARRAY_PRINT_THRESHOLD;
-mp_uint_t ndarray_print_edgeitems = NDARRAY_PRINT_EDGEITEMS;
-
-//| """Manipulate numeric data similar to numpy
-//|
-//| `ulab` is a numpy-like module for micropython, meant to simplify and
-//| speed up common mathematical operations on arrays. The primary goal was to
-//| implement a small subset of numpy that might be useful in the context of a
-//| microcontroller. This means low-level data processing of linear (array) and
-//| two-dimensional (matrix) data.
-//|
-//| `ulab` is adapted from micropython-ulab, and the original project's
-//| documentation can be found at
-//| https://micropython-ulab.readthedocs.io/en/latest/
-//|
-//| `ulab` is modeled after numpy, and aims to be a compatible subset where
-//| possible.  Numpy's documentation can be found at
-//| https://docs.scipy.org/doc/numpy/index.html"""
-//|
-
-#ifdef CIRCUITPY
-void ndarray_set_value(char typecode, void *p, size_t index, mp_obj_t val_in) {
-    switch (typecode) {
-        case NDARRAY_INT8:
-            ((signed char *)p)[index] = mp_obj_get_int(val_in);
-            break;
-        case NDARRAY_UINT8:
-            ((unsigned char *)p)[index] = mp_obj_get_int(val_in);
-            break;
-        case NDARRAY_INT16:
-            ((short *)p)[index] = mp_obj_get_int(val_in);
-            break;
-        case NDARRAY_UINT16:
-            ((unsigned short *)p)[index] = mp_obj_get_int(val_in);
-            break;
-        case NDARRAY_FLOAT:
-            ((mp_float_t *)p)[index] = mp_obj_get_float(val_in);
-            break;
-    }
-}
-#endif
-
-#if defined(MICROPY_VERSION_MAJOR) && MICROPY_VERSION_MAJOR == 1 && MICROPY_VERSION_MINOR == 11
-
-void mp_obj_slice_indices(mp_obj_t self_in, mp_int_t length, mp_bound_slice_t *result) {
-    mp_obj_slice_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t start, stop, step;
-
-    if (self->step == mp_const_none) {
-        step = 1;
-    } else {
-        step = mp_obj_get_int(self->step);
-        if (step == 0) {
-            mp_raise_ValueError(translate("slice step can't be zero"));
-        }
-    }
-
-    if (step > 0) {
-        // Positive step
-        if (self->start == mp_const_none) {
-            start = 0;
-        } else {
-            start = mp_obj_get_int(self->start);
-            if (start < 0) {
-                start += length;
-            }
-            start = MIN(length, MAX(start, 0));
-        }
-
-        if (self->stop == mp_const_none) {
-            stop = length;
-        } else {
-            stop = mp_obj_get_int(self->stop);
-            if (stop < 0) {
-                stop += length;
-            }
-            stop = MIN(length, MAX(stop, 0));
-        }
-    } else {
-        // Negative step
-        if (self->start == mp_const_none) {
-            start = length - 1;
-        } else {
-            start = mp_obj_get_int(self->start);
-            if (start < 0) {
-                start += length;
-            }
-            start = MIN(length - 1, MAX(start, -1));
-        }
-
-        if (self->stop == mp_const_none) {
-            stop = -1;
-        } else {
-            stop = mp_obj_get_int(self->stop);
-            if (stop < 0) {
-                stop += length;
-            }
-            stop = MIN(length - 1, MAX(stop, -1));
-        }
-    }
-
-    result->start = start;
-    result->stop = stop;
-    result->step = step;
-}
-#endif /* MICROPY_VERSION v1.11 */
-
-void ndarray_fill_array_iterable(mp_float_t *array, mp_obj_t iterable) {
-    mp_obj_iter_buf_t x_buf;
-    mp_obj_t x_item, x_iterable = mp_getiter(iterable, &x_buf);
-    while ((x_item = mp_iternext(x_iterable)) != MP_OBJ_STOP_ITERATION) {
-        *array++ = (mp_float_t)mp_obj_get_float(x_item);
-    }
-}
-
-#if ULAB_HAS_FUNCTION_ITERATOR
-size_t *ndarray_new_coords(uint8_t ndim) {
-    size_t *coords = m_new(size_t, ndim);
-    memset(coords, 0, ndim*sizeof(size_t));
-    return coords;
-}
-
-void ndarray_rewind_array(uint8_t ndim, uint8_t *array, size_t *shape, int32_t *strides, size_t *coords) {
-    // resets the data pointer of a single array, whenever an axis is full
-    // since we always iterate over the very last axis, we have to keep track of
-    // the last ndim-2 axes only
-    array -= shape[ULAB_MAX_DIMS - 1] * strides[ULAB_MAX_DIMS - 1];
-    array += strides[ULAB_MAX_DIMS - 2];
-    for(uint8_t i=1; i < ndim-1; i++) {
-        coords[ULAB_MAX_DIMS - 1 - i] += 1;
-        if(coords[ULAB_MAX_DIMS - 1 - i] == shape[ULAB_MAX_DIMS - 1 - i]) { // we are at a dimension boundary
-            array -= shape[ULAB_MAX_DIMS - 1 - i] * strides[ULAB_MAX_DIMS - 1 - i];
-            array += strides[ULAB_MAX_DIMS - 2 - i];
-            coords[ULAB_MAX_DIMS - 1 - i] = 0;
-            coords[ULAB_MAX_DIMS - 2 - i] += 1;
-        } else { // coordinates can change only, if the last coordinate changes
-            return;
-        }
-    }
-}
-#endif
-
-static int32_t *strides_from_shape(size_t *shape, uint8_t dtype) {
-    // returns a strides array that corresponds to a dense array with the prescribed shape
-    int32_t *strides = m_new(int32_t, ULAB_MAX_DIMS);
-    strides[ULAB_MAX_DIMS-1] = (int32_t)mp_binary_get_size('@', dtype, NULL);
-    for(uint8_t i=ULAB_MAX_DIMS; i > 1; i--) {
-        strides[i-2] = strides[i-1] * shape[i-1];
-    }
-    return strides;
-}
-
-size_t *ndarray_shape_vector(size_t a, size_t b, size_t c, size_t d) {
-    // returns a ULAB_MAX_DIMS-aware array of shapes
-    // WARNING: this assumes that the maximum possible dimension is 4!
-    size_t *shape = m_new(size_t, ULAB_MAX_DIMS);
-    shape[ULAB_MAX_DIMS - 1] = d;
-    #if ULAB_MAX_DIMS > 1
-    shape[ULAB_MAX_DIMS - 2] = c;
-    #endif
-    #if ULAB_MAX_DIMS > 2
-    shape[ULAB_MAX_DIMS - 3] = b;
-    #endif
-    #if ULAB_MAX_DIMS > 3
-    shape[ULAB_MAX_DIMS - 4] = a;
-    #endif
-    return shape;
-}
-
-bool ndarray_object_is_array_like(mp_obj_t o_in) {
-    if(mp_obj_is_type(o_in, &ulab_ndarray_type) ||
-      mp_obj_is_type(o_in, &mp_type_tuple) ||
-      mp_obj_is_type(o_in, &mp_type_list) ||
-      mp_obj_is_type(o_in, &mp_type_range)) {
-        return true;
-    }
-    return false;
-}
-
-void fill_array_iterable(mp_float_t *array, mp_obj_t iterable) {
-    mp_obj_iter_buf_t x_buf;
-    mp_obj_t x_item, x_iterable = mp_getiter(iterable, &x_buf);
-    size_t i=0;
-    while ((x_item = mp_iternext(x_iterable)) != MP_OBJ_STOP_ITERATION) {
-        array[i] = (mp_float_t)mp_obj_get_float(x_item);
-        i++;
-    }
-}
-
-#if NDARRAY_HAS_DTYPE
-#if ULAB_HAS_DTYPE_OBJECT
-void ndarray_dtype_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    dtype_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_print_str(print, "dtype('");
-    if(self->dtype == NDARRAY_BOOLEAN) {
-        mp_print_str(print, "bool')");
-    } else if(self->dtype == NDARRAY_UINT8) {
-        mp_print_str(print, "uint8')");
-    } else if(self->dtype == NDARRAY_INT8) {
-        mp_print_str(print, "int8')");
-    } else if(self->dtype == NDARRAY_UINT16) {
-        mp_print_str(print, "uint16')");
-    } else if(self->dtype == NDARRAY_INT16) {
-        mp_print_str(print, "int16')");
-    } else {
-        #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-        mp_print_str(print, "float32')");
-        #else
-        mp_print_str(print, "float64')");
-        #endif
-    }
-}
-
-mp_obj_t ndarray_dtype_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    (void) type;
-    mp_arg_check_num(n_args, n_kw, 0, 1, true);
-    mp_map_t kw_args;
-    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_, MP_ARG_OBJ, { .u_obj = mp_const_none } },
-    };
-    mp_arg_val_t _args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, args, &kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, _args);
-
-    dtype_obj_t *dtype = m_new_obj(dtype_obj_t);
-    dtype->base.type = &ulab_dtype_type;
-
-    if(mp_obj_is_type(args[0], &ulab_ndarray_type)) {
-        // return the dtype of the array
-        ndarray_obj_t *ndarray = MP_OBJ_TO_PTR(args[0]);
-        dtype->dtype = ndarray->dtype;
-    } else {
-        uint8_t _dtype;
-        if(mp_obj_is_int(_args[0].u_obj)) {
-            _dtype = mp_obj_get_int(_args[0].u_obj);
-            if((_dtype != NDARRAY_BOOL) && (_dtype != NDARRAY_UINT8)
-                && (_dtype != NDARRAY_INT8) && (_dtype != NDARRAY_UINT16)
-                && (_dtype != NDARRAY_INT16) && (_dtype != NDARRAY_FLOAT)) {
-                mp_raise_TypeError(translate("data type not understood"));
-            }
-        } else {
-            GET_STR_DATA_LEN(_args[0].u_obj, _dtype_, len);
-            if(memcmp(_dtype_, "uint8", 5) == 0) {
-                _dtype = NDARRAY_UINT8;
-            } else if(memcmp(_dtype_, "int8", 4) == 0) {
-                _dtype = NDARRAY_INT8;
-            } else if(memcmp(_dtype_, "uint16", 6) == 0) {
-                _dtype = NDARRAY_UINT16;
-            } else if(memcmp(_dtype_, "int16", 5) == 0) {
-                _dtype = NDARRAY_INT16;
-            } else if(memcmp(_dtype_, "float", 5) == 0) {
-                _dtype = NDARRAY_FLOAT;
-            } else {
-                mp_raise_TypeError(translate("data type not understood"));
-            }
-        }
-        dtype->dtype = _dtype;
-    }
-    return dtype;
-}
-
-mp_obj_t ndarray_dtype(mp_obj_t self_in) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    dtype_obj_t *dtype = m_new_obj(dtype_obj_t);
-    dtype->base.type = &ulab_dtype_type;
-    dtype->dtype = self->dtype;
-    return dtype;
-}
-
-#else
-// this is the cheap implementation of tbe dtype
-mp_obj_t ndarray_dtype(mp_obj_t self_in) {
-    uint8_t dtype;
-    if(mp_obj_is_type(self_in, &ulab_ndarray_type)) {
-        ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-        dtype = self->dtype;
-    } else { // we assume here that the input is a single character
-        GET_STR_DATA_LEN(self_in, _dtype, len);
-        if((len != 1) || ((*_dtype != NDARRAY_BOOL) && (*_dtype != NDARRAY_UINT8)
-            && (*_dtype != NDARRAY_INT8) && (*_dtype != NDARRAY_UINT16)
-            && (*_dtype != NDARRAY_INT16) && (*_dtype != NDARRAY_FLOAT))) {
-            mp_raise_TypeError(translate("data type not understood"));
-        }
-        dtype = *_dtype;
-    }
-    return mp_obj_new_int(dtype);
-}
-#endif /* ULAB_HAS_DTYPE_OBJECT */
-#endif /* NDARRAY_HAS_DTYPE */
-
-#if ULAB_HAS_PRINTOPTIONS
-mp_obj_t ndarray_set_printoptions(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_threshold, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = mp_const_none} },
-        { MP_QSTR_edgeitems, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = mp_const_none} },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    if(args[0].u_rom_obj != mp_const_none) {
-        ndarray_print_threshold = mp_obj_get_int(args[0].u_rom_obj);
-    }
-    if(args[1].u_rom_obj != mp_const_none) {
-        ndarray_print_edgeitems = mp_obj_get_int(args[1].u_rom_obj);
-    }
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_KW(ndarray_set_printoptions_obj, 0, ndarray_set_printoptions);
-
-mp_obj_t ndarray_get_printoptions(void) {
-    mp_obj_t dict = mp_obj_new_dict(2);
-    mp_obj_dict_store(MP_OBJ_FROM_PTR(dict), MP_OBJ_NEW_QSTR(MP_QSTR_threshold), mp_obj_new_int(ndarray_print_threshold));
-    mp_obj_dict_store(MP_OBJ_FROM_PTR(dict), MP_OBJ_NEW_QSTR(MP_QSTR_edgeitems), mp_obj_new_int(ndarray_print_edgeitems));
-    return dict;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_0(ndarray_get_printoptions_obj, ndarray_get_printoptions);
-#endif
-
-mp_obj_t ndarray_get_item(ndarray_obj_t *ndarray, void *array) {
-    // returns a proper micropython object from an array
-    if(!ndarray->boolean) {
-        return mp_binary_get_val_array(ndarray->dtype, array, 0);
-    } else {
-        if(*(uint8_t *)array) {
-            return mp_const_true;
-        } else {
-            return mp_const_false;
-        }
-    }
-}
-
-static void ndarray_print_row(const mp_print_t *print, ndarray_obj_t * ndarray, uint8_t *array, size_t stride, size_t n) {
-    if(n == 0) {
-        return;
-    }
-    mp_print_str(print, "[");
-    if((n <= ndarray_print_threshold) || (n <= 2*ndarray_print_edgeitems)) { // if the array is short, print everything
-        mp_obj_print_helper(print, ndarray_get_item(ndarray, array), PRINT_REPR);
-        array += stride;
-        for(size_t i=1; i < n; i++, array += stride) {
-            mp_print_str(print, ", ");
-            mp_obj_print_helper(print, ndarray_get_item(ndarray, array), PRINT_REPR);
-        }
-    } else {
-        mp_obj_print_helper(print, ndarray_get_item(ndarray, array), PRINT_REPR);
-        array += stride;
-        for(size_t i=1; i < ndarray_print_edgeitems; i++, array += stride) {
-            mp_print_str(print, ", ");
-            mp_obj_print_helper(print, ndarray_get_item(ndarray, array), PRINT_REPR);
-        }
-        mp_printf(print, ", ..., ");
-        array += stride * (n - 2 *  ndarray_print_edgeitems);
-        mp_obj_print_helper(print, ndarray_get_item(ndarray, array), PRINT_REPR);
-        array += stride;
-        for(size_t i=1; i < ndarray_print_edgeitems; i++, array += stride) {
-            mp_print_str(print, ", ");
-            mp_obj_print_helper(print, ndarray_get_item(ndarray, array), PRINT_REPR);
-        }
-    }
-    mp_print_str(print, "]");
-}
-
-#if ULAB_MAX_DIMS > 1
-static void ndarray_print_bracket(const mp_print_t *print, const size_t condition, const size_t shape, const char *string) {
-    if(condition < shape) {
-        mp_print_str(print, string);
-    }
-}
-#endif
-
-void ndarray_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t *array = (uint8_t *)self->array;
-    mp_print_str(print, "array(");
-    if(self->len == 0) {
-        mp_print_str(print, "[]");
-        if(self->ndim > 1) {
-            mp_print_str(print, ", shape=(");
-            #if ULAB_MAX_DIMS > 1
-            for(uint8_t ndim = self->ndim; ndim > 1; ndim--) {
-                mp_printf(MP_PYTHON_PRINTER, "%d,", self->shape[ULAB_MAX_DIMS - ndim]);
-            }
-            #else
-            mp_printf(MP_PYTHON_PRINTER, "%d,", self->shape[0]);
-            #endif
-            mp_printf(MP_PYTHON_PRINTER, "%d)", self->shape[ULAB_MAX_DIMS - 1]);
-        }
-    } else {
-        #if ULAB_MAX_DIMS > 3
-        size_t i=0;
-        ndarray_print_bracket(print, 0, self->shape[ULAB_MAX_DIMS-4], "[");
-        do {
-        #endif
-            #if ULAB_MAX_DIMS > 2
-            size_t j = 0;
-            ndarray_print_bracket(print, 0, self->shape[ULAB_MAX_DIMS-3], "[");
-            do {
-            #endif
-                #if ULAB_MAX_DIMS > 1
-                size_t k = 0;
-                ndarray_print_bracket(print, 0, self->shape[ULAB_MAX_DIMS-2], "[");
-                do {
-                #endif
-                    ndarray_print_row(print, self, array, self->strides[ULAB_MAX_DIMS-1], self->shape[ULAB_MAX_DIMS-1]);
-                #if ULAB_MAX_DIMS > 1
-                    array += self->strides[ULAB_MAX_DIMS-2];
-                    k++;
-                    ndarray_print_bracket(print, k, self->shape[ULAB_MAX_DIMS-2], ",\n       ");
-                } while(k < self->shape[ULAB_MAX_DIMS-2]);
-                ndarray_print_bracket(print, 0, self->shape[ULAB_MAX_DIMS-2], "]");
-                #endif
-            #if ULAB_MAX_DIMS > 2
-                j++;
-                ndarray_print_bracket(print, j, self->shape[ULAB_MAX_DIMS-3], ",\n\n       ");
-                array -= self->strides[ULAB_MAX_DIMS-2] * self->shape[ULAB_MAX_DIMS-2];
-                array += self->strides[ULAB_MAX_DIMS-3];
-            } while(j < self->shape[ULAB_MAX_DIMS-3]);
-            ndarray_print_bracket(print, 0, self->shape[ULAB_MAX_DIMS-3], "]");
-            #endif
-        #if ULAB_MAX_DIMS > 3
-            array -= self->strides[ULAB_MAX_DIMS-3] * self->shape[ULAB_MAX_DIMS-3];
-            array += self->strides[ULAB_MAX_DIMS-4];
-            i++;
-            ndarray_print_bracket(print, i, self->shape[ULAB_MAX_DIMS-4], ",\n\n       ");
-        } while(i < self->shape[ULAB_MAX_DIMS-4]);
-        ndarray_print_bracket(print, 0, self->shape[ULAB_MAX_DIMS-4], "]");
-        #endif
-    }
-    if(self->boolean) {
-        mp_print_str(print, ", dtype=bool)");
-    } else if(self->dtype == NDARRAY_UINT8) {
-        mp_print_str(print, ", dtype=uint8)");
-    } else if(self->dtype == NDARRAY_INT8) {
-        mp_print_str(print, ", dtype=int8)");
-    } else if(self->dtype == NDARRAY_UINT16) {
-        mp_print_str(print, ", dtype=uint16)");
-    } else if(self->dtype == NDARRAY_INT16) {
-        mp_print_str(print, ", dtype=int16)");
-    } else {
-        #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-        mp_print_str(print, ", dtype=float32)");
-        #else
-        mp_print_str(print, ", dtype=float64)");
-        #endif
-    }
-}
-
-void ndarray_assign_elements(ndarray_obj_t *ndarray, mp_obj_t iterable, uint8_t dtype, size_t *idx) {
-    // assigns a single row in the tensor
-    mp_obj_t item;
-    if(ndarray->boolean) {
-        uint8_t *array = (uint8_t *)ndarray->array;
-        array += *idx;
-        while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            // TODO: this might be wrong here: we have to check for the trueness of item
-            if(mp_obj_is_true(item)) {
-                *array = 1;
-            }
-            array++;
-            (*idx)++;
-        }
-    } else {
-        while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            ndarray_set_value(dtype, ndarray->array, (*idx)++, item);
-        }
-    }
-}
-
-bool ndarray_is_dense(ndarray_obj_t *ndarray) {
-    // returns true, if the array is dense, false otherwise
-    // the array should be dense, if the very first stride can be calculated from shape
-    int32_t stride = ndarray->itemsize;
-    for(uint8_t i = ULAB_MAX_DIMS - 1; i > ULAB_MAX_DIMS-ndarray->ndim; i--) {
-        stride *= ndarray->shape[i];
-    }
-    return stride == ndarray->strides[ULAB_MAX_DIMS-ndarray->ndim] ? true : false;
-}
-
-
-ndarray_obj_t *ndarray_new_ndarray(uint8_t ndim, size_t *shape, int32_t *strides, uint8_t dtype) {
-    // Creates the base ndarray with shape, and initialises the values to straight 0s
-    ndarray_obj_t *ndarray = m_new_obj(ndarray_obj_t);
-    ndarray->base.type = &ulab_ndarray_type;
-    ndarray->dtype = dtype == NDARRAY_BOOL ? NDARRAY_UINT8 : dtype;
-    ndarray->boolean = dtype == NDARRAY_BOOL ? NDARRAY_BOOLEAN : NDARRAY_NUMERIC;
-    ndarray->ndim = ndim;
-    ndarray->len = ndim == 0 ? 0 : 1;
-    ndarray->itemsize = mp_binary_get_size('@', ndarray->dtype, NULL);
-    int32_t *_strides;
-    if(strides == NULL) {
-        _strides = strides_from_shape(shape, ndarray->dtype);
-    } else {
-        _strides = strides;
-    }
-    for(uint8_t i=ULAB_MAX_DIMS; i > ULAB_MAX_DIMS-ndim; i--) {
-        ndarray->shape[i-1] = shape[i-1];
-        ndarray->strides[i-1] = _strides[i-1];
-        ndarray->len *= shape[i-1];
-    }
-
-    // if the length is 0, still allocate a single item, so that contractions can be handled
-    size_t len = ndarray->itemsize * MAX(1, ndarray->len);
-    uint8_t *array = m_new(byte, len);
-    // this should set all elements to 0, irrespective of the of the dtype (all bits are zero)
-    // we could, perhaps, leave this step out, and initialise the array only, when needed
-    memset(array, 0, len);
-    ndarray->array = array;
-    ndarray->origin = array;
-    return ndarray;
-}
-
-ndarray_obj_t *ndarray_new_dense_ndarray(uint8_t ndim, size_t *shape, uint8_t dtype) {
-    // creates a dense array, i.e., one, where the strides are derived directly from the shapes
-    // the function should work in the general n-dimensional case
-    int32_t *strides = m_new(int32_t, ULAB_MAX_DIMS);
-    strides[ULAB_MAX_DIMS-1] = dtype == NDARRAY_BOOL ? 1 : mp_binary_get_size('@', dtype, NULL);
-    for(size_t i=ULAB_MAX_DIMS; i > 1; i--) {
-        strides[i-2] = strides[i-1] * MAX(1, shape[i-1]);
-    }
-    return ndarray_new_ndarray(ndim, shape, strides, dtype);
-}
-
-ndarray_obj_t *ndarray_new_ndarray_from_tuple(mp_obj_tuple_t *_shape, uint8_t dtype) {
-    // creates a dense array from a tuple
-    // the function should work in the general n-dimensional case
-    size_t *shape = m_new(size_t, ULAB_MAX_DIMS);
-    for(size_t i=0; i < ULAB_MAX_DIMS; i++) {
-        if(i < ULAB_MAX_DIMS - _shape->len) {
-            shape[i] = 0;
-        } else {
-            shape[i] = mp_obj_get_int(_shape->items[i]);
-        }
-    }
-    return ndarray_new_dense_ndarray(_shape->len, shape, dtype);
-}
-
-void ndarray_copy_array(ndarray_obj_t *source, ndarray_obj_t *target) {
-    // TODO: if the array is dense, the content could be copied in a single pass
-    // copies the content of source->array into a new dense void pointer
-    // it is assumed that the dtypes in source and target are the same
-    // Since the target is a new array, it is supposed to be dense
-    uint8_t *sarray = (uint8_t *)source->array;
-    uint8_t *tarray = (uint8_t *)target->array;
-
-    #if ULAB_MAX_DIMS > 3
-    size_t i = 0;
-    do {
-    #endif
-        #if ULAB_MAX_DIMS > 2
-        size_t j = 0;
-        do {
-        #endif
-            #if ULAB_MAX_DIMS > 1
-            size_t k = 0;
-            do {
-            #endif
-                size_t l = 0;
-                do {
-                    memcpy(tarray, sarray, source->itemsize);
-                    tarray += target->itemsize;
-                    sarray += source->strides[ULAB_MAX_DIMS - 1];
-                    l++;
-                } while(l < source->shape[ULAB_MAX_DIMS - 1]);
-            #if ULAB_MAX_DIMS > 1
-                sarray -= source->strides[ULAB_MAX_DIMS - 1] * source->shape[ULAB_MAX_DIMS-1];
-                sarray += source->strides[ULAB_MAX_DIMS - 2];
-                k++;
-            } while(k < source->shape[ULAB_MAX_DIMS - 2]);
-            #endif
-        #if ULAB_MAX_DIMS > 2
-            sarray -= source->strides[ULAB_MAX_DIMS - 2] * source->shape[ULAB_MAX_DIMS-2];
-            sarray += source->strides[ULAB_MAX_DIMS - 3];
-            j++;
-        } while(j < source->shape[ULAB_MAX_DIMS - 3]);
-        #endif
-    #if ULAB_MAX_DIMS > 3
-        sarray -= source->strides[ULAB_MAX_DIMS - 3] * source->shape[ULAB_MAX_DIMS-3];
-        sarray += source->strides[ULAB_MAX_DIMS - 4];
-        i++;
-    } while(i < source->shape[ULAB_MAX_DIMS - 4]);
-    #endif
-}
-
-ndarray_obj_t *ndarray_new_view(ndarray_obj_t *source, uint8_t ndim, size_t *shape, int32_t *strides, int32_t offset) {
-    // creates a new view from the input arguments
-    ndarray_obj_t *ndarray = m_new_obj(ndarray_obj_t);
-    ndarray->base.type = &ulab_ndarray_type;
-    ndarray->boolean = source->boolean;
-    ndarray->dtype = source->dtype;
-    ndarray->ndim = ndim;
-    ndarray->itemsize = source->itemsize;
-    ndarray->len = ndim == 0 ? 0 : 1;
-    for(uint8_t i=ULAB_MAX_DIMS; i > ULAB_MAX_DIMS-ndim; i--) {
-        ndarray->shape[i-1] = shape[i-1];
-        ndarray->strides[i-1] = strides[i-1];
-        ndarray->len *= shape[i-1];
-    }
-    uint8_t *pointer = (uint8_t *)source->array;
-    pointer += offset;
-    ndarray->array = pointer;
-    ndarray->origin = source->origin;
-    return ndarray;
-}
-
-ndarray_obj_t *ndarray_copy_view(ndarray_obj_t *source) {
-    // creates a one-to-one deep copy of the input ndarray or its view
-    // the function should work in the general n-dimensional case
-    // In order to make it dtype-agnostic, we copy the memory content
-    // instead of reading out the values
-
-    int32_t *strides = strides_from_shape(source->shape, source->dtype);
-
-    uint8_t dtype = source->dtype;
-    if(source->boolean) {
-        dtype = NDARRAY_BOOLEAN;
-    }
-    ndarray_obj_t *ndarray = ndarray_new_ndarray(source->ndim, source->shape, strides, dtype);
-    ndarray_copy_array(source, ndarray);
-    return ndarray;
-}
-
-#if NDARRAY_HAS_BYTESWAP
-mp_obj_t ndarray_byteswap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    // changes the endiannes of an array
-    // if the dtype of the input uint8/int8/bool, simply return a copy or view
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_rom_obj = mp_const_none } },
-        { MP_QSTR_inplace, MP_ARG_KW_ONLY | MP_ARG_OBJ, { .u_rom_obj = mp_const_false } },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(args[0].u_obj);
-    ndarray_obj_t *ndarray = NULL;
-    if(args[1].u_obj == mp_const_false) {
-        ndarray = ndarray_copy_view(self);
-    } else {
-        ndarray = ndarray_new_view(self, self->ndim, self->shape, self->strides, 0);
-    }
-    if((self->dtype == NDARRAY_BOOL) || (self->dtype == NDARRAY_UINT8) || (self->dtype == NDARRAY_INT8)) {
-        return MP_OBJ_FROM_PTR(ndarray);
-    } else {
-        uint8_t *array = (uint8_t *)ndarray->array;
-        #if ULAB_MAX_DIMS > 3
-        size_t i = 0;
-        do {
-        #endif
-            #if ULAB_MAX_DIMS > 2
-            size_t j = 0;
-            do {
-            #endif
-                #if ULAB_MAX_DIMS > 1
-                size_t k = 0;
-                do {
-                #endif
-                    size_t l = 0;
-                    do {
-                        if(self->dtype == NDARRAY_FLOAT) {
-                            #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-                            SWAP(uint8_t, array[0], array[3]);
-                            SWAP(uint8_t, array[1], array[2]);
-                            #else
-                            SWAP(uint8_t, array[0], array[7]);
-                            SWAP(uint8_t, array[1], array[6]);
-                            SWAP(uint8_t, array[2], array[5]);
-                            SWAP(uint8_t, array[3], array[4]);
-                            #endif
-                        } else {
-                            SWAP(uint8_t, array[0], array[1]);
-                        }
-                        array += ndarray->strides[ULAB_MAX_DIMS - 1];
-                        l++;
-                    } while(l < ndarray->shape[ULAB_MAX_DIMS - 1]);
-                #if ULAB_MAX_DIMS > 1
-                    array -= ndarray->strides[ULAB_MAX_DIMS - 1] * ndarray->shape[ULAB_MAX_DIMS-1];
-                    array += ndarray->strides[ULAB_MAX_DIMS - 2];
-                    k++;
-                } while(k < ndarray->shape[ULAB_MAX_DIMS - 2]);
-                #endif
-            #if ULAB_MAX_DIMS > 2
-                array -= ndarray->strides[ULAB_MAX_DIMS - 2] * ndarray->shape[ULAB_MAX_DIMS-2];
-                array += ndarray->strides[ULAB_MAX_DIMS - 3];
-                j++;
-            } while(j < ndarray->shape[ULAB_MAX_DIMS - 3]);
-            #endif
-        #if ULAB_MAX_DIMS > 3
-            array -= ndarray->strides[ULAB_MAX_DIMS - 3] * ndarray->shape[ULAB_MAX_DIMS-3];
-            array += ndarray->strides[ULAB_MAX_DIMS - 4];
-            i++;
-        } while(i < ndarray->shape[ULAB_MAX_DIMS - 4]);
-        #endif
-    }
-    return MP_OBJ_FROM_PTR(ndarray);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_KW(ndarray_byteswap_obj, 1, ndarray_byteswap);
-#endif
-
-#if NDARRAY_HAS_COPY
-mp_obj_t ndarray_copy(mp_obj_t self_in) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_FROM_PTR(ndarray_copy_view(self));
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(ndarray_copy_obj, ndarray_copy);
-#endif
-
-ndarray_obj_t *ndarray_new_linear_array(size_t len, uint8_t dtype) {
-    size_t *shape = m_new(size_t, ULAB_MAX_DIMS);
-    if(len == 0) {
-        return ndarray_new_dense_ndarray(0, shape, dtype);
-    }
-    shape[ULAB_MAX_DIMS-1] = len;
-    return ndarray_new_dense_ndarray(1, shape, dtype);
-}
-
-ndarray_obj_t *ndarray_from_iterable(mp_obj_t obj, uint8_t dtype) {
-    // returns an ndarray from an iterable micropython object
-    // if the input is an ndarray, returns the input...
-    if(mp_obj_is_type(obj, &ulab_ndarray_type)) {
-        return MP_OBJ_TO_PTR(obj);
-    }
-    // ... otherwise, takes the values from the iterable, and creates the corresponding ndarray
-
-    // First, we have to figure out, whether the elements of the iterable are iterables themself
-    uint8_t ndim = 0;
-    size_t shape[ULAB_MAX_DIMS];
-    mp_obj_iter_buf_t iter_buf[ULAB_MAX_DIMS];
-    mp_obj_t iterable[ULAB_MAX_DIMS];
-    // inspect only the very first element in each dimension; this is fast,
-    // but not completely safe, e.g., length compatibility is not checked
-    mp_obj_t item = obj;
-
-    while(1) {
-        if(mp_obj_len_maybe(item) == MP_OBJ_NULL) {
-            break;
-        }
-        if(ndim == ULAB_MAX_DIMS) {
-            mp_raise_ValueError(translate("too many dimensions"));
-        }
-        shape[ndim] = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(item));
-        if(shape[ndim] == 0) {
-            ndim++;
-            break;
-        }
-        iterable[ndim] = mp_getiter(item, &iter_buf[ndim]);
-        item = mp_iternext(iterable[ndim]);
-        ndim++;
-    }
-    for(uint8_t i = 0; i < ndim; i++) {
-        // align all values to the right
-        shape[ULAB_MAX_DIMS - i - 1] = shape[ndim - 1 - i];
-    }
-
-    ndarray_obj_t *ndarray = ndarray_new_dense_ndarray(ndim, shape, dtype);
-    item = obj;
-    for(uint8_t i = 0; i < ndim - 1; i++) {
-        // if ndim > 1, descend into the hierarchy
-        iterable[ULAB_MAX_DIMS - ndim + i] = mp_getiter(item, &iter_buf[ULAB_MAX_DIMS - ndim + i]);
-        item = mp_iternext(iterable[ULAB_MAX_DIMS - ndim + i]);
-    }
-
-    size_t idx = 0;
-    // TODO: this could surely be done in a more elegant way...
-    #if ULAB_MAX_DIMS > 3
-    do {
-    #endif
-        #if ULAB_MAX_DIMS > 2
-        do {
-        #endif
-            #if ULAB_MAX_DIMS > 1
-            do {
-            #endif
-                iterable[ULAB_MAX_DIMS - 1] = mp_getiter(item, &iter_buf[ULAB_MAX_DIMS - 1]);
-                ndarray_assign_elements(ndarray, iterable[ULAB_MAX_DIMS - 1], ndarray->dtype, &idx);
-            #if ULAB_MAX_DIMS > 1
-                item = ndim > 1 ? mp_iternext(iterable[ULAB_MAX_DIMS - 2]) : MP_OBJ_STOP_ITERATION;
-            } while(item != MP_OBJ_STOP_ITERATION);
-            #endif
-        #if ULAB_MAX_DIMS > 2
-            item = ndim > 2 ? mp_iternext(iterable[ULAB_MAX_DIMS - 3]) : MP_OBJ_STOP_ITERATION;
-            if(item != MP_OBJ_STOP_ITERATION) {
-                iterable[ULAB_MAX_DIMS - 2] = mp_getiter(item, &iter_buf[ULAB_MAX_DIMS - 2]);
-                item = mp_iternext(iterable[ULAB_MAX_DIMS - 2]);
-            } else {
-                iterable[ULAB_MAX_DIMS - 2] = MP_OBJ_STOP_ITERATION;
-            }
-        } while(iterable[ULAB_MAX_DIMS - 2] != MP_OBJ_STOP_ITERATION);
-        #endif
-    #if ULAB_MAX_DIMS > 3
-        item = ndim > 3 ? mp_iternext(iterable[ULAB_MAX_DIMS - 4]) : MP_OBJ_STOP_ITERATION;
-        if(item != MP_OBJ_STOP_ITERATION) {
-            iterable[ULAB_MAX_DIMS - 3] = mp_getiter(item, &iter_buf[ULAB_MAX_DIMS - 3]);
-            item = mp_iternext(iterable[ULAB_MAX_DIMS - 3]);
-        } else {
-            iterable[ULAB_MAX_DIMS - 3] = MP_OBJ_STOP_ITERATION;
-        }
-    } while(iterable[ULAB_MAX_DIMS - 3] != MP_OBJ_STOP_ITERATION);
-    #endif
-
-    return ndarray;
-}
-
-STATIC uint8_t ndarray_init_helper(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = mp_const_none } },
-        { MP_QSTR_dtype, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_ROM_INT(NDARRAY_FLOAT) } },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    uint8_t _dtype;
-    #if ULAB_HAS_DTYPE_OBJECT
-    if(mp_obj_is_type(args[1].u_obj, &ulab_dtype_type)) {
-        dtype_obj_t *dtype = MP_OBJ_TO_PTR(args[1].u_obj);
-        _dtype = dtype->dtype;
-    } else { // this must be an integer defined as a class constant (ulba.uint8 etc.)
-        _dtype = mp_obj_get_int(args[1].u_obj);
-    }
-    #else
-    _dtype = mp_obj_get_int(args[1].u_obj);
-    #endif
-    return _dtype;
-}
-
-STATIC mp_obj_t ndarray_make_new_core(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args, mp_map_t *kw_args) {
-    uint8_t dtype = ndarray_init_helper(n_args, args, kw_args);
-
-    if(mp_obj_is_type(args[0], &ulab_ndarray_type)) {
-        ndarray_obj_t *source = MP_OBJ_TO_PTR(args[0]);
-        if(dtype == source->dtype) {
-            return ndarray_copy_view(source);
-        }
-        ndarray_obj_t *target = ndarray_new_dense_ndarray(source->ndim, source->shape, dtype);
-        uint8_t *sarray = (uint8_t *)source->array;
-        uint8_t *tarray = (uint8_t *)target->array;
-        #if ULAB_MAX_DIMS > 3
-        size_t i = 0;
-        do {
-        #endif
-            #if ULAB_MAX_DIMS > 2
-            size_t j = 0;
-            do {
-            #endif
-                #if ULAB_MAX_DIMS > 1
-                size_t k = 0;
-                do {
-                #endif
-                    size_t l = 0;
-                    do {
-                        mp_obj_t item;
-                        if((source->dtype == NDARRAY_FLOAT) && (dtype != NDARRAY_FLOAT)) {
-                            // floats must be treated separately, because they can't directly be converted to integer types
-                            mp_float_t f = ndarray_get_float_value(sarray, source->dtype);
-                            item = mp_obj_new_int((int32_t)MICROPY_FLOAT_C_FUN(floor)(f));
-                        } else {
-                            item = mp_binary_get_val_array(source->dtype, sarray, 0);
-                        }
-                        ndarray_set_value(dtype, tarray, 0, item);
-                        tarray += target->itemsize;
-                        sarray += source->strides[ULAB_MAX_DIMS - 1];
-                        l++;
-                    } while(l < source->shape[ULAB_MAX_DIMS - 1]);
-                #if ULAB_MAX_DIMS > 1
-                    sarray -= source->strides[ULAB_MAX_DIMS - 1] * source->shape[ULAB_MAX_DIMS-1];
-                    sarray += source->strides[ULAB_MAX_DIMS - 2];
-                    k++;
-                } while(k < source->shape[ULAB_MAX_DIMS - 2]);
-                #endif
-            #if ULAB_MAX_DIMS > 2
-                sarray -= source->strides[ULAB_MAX_DIMS - 2] * source->shape[ULAB_MAX_DIMS-2];
-                sarray += source->strides[ULAB_MAX_DIMS - 3];
-                j++;
-            } while(j < source->shape[ULAB_MAX_DIMS - 3]);
-            #endif
-        #if ULAB_MAX_DIMS > 3
-            sarray -= source->strides[ULAB_MAX_DIMS - 3] * source->shape[ULAB_MAX_DIMS-3];
-            sarray += source->strides[ULAB_MAX_DIMS - 4];
-            i++;
-        } while(i < source->shape[ULAB_MAX_DIMS - 4]);
-        #endif
-        return MP_OBJ_FROM_PTR(target);
-    } else {
-        // assume that the input is an iterable
-        return MP_OBJ_FROM_PTR(ndarray_from_iterable(args[0], dtype));
-    }
-}
-
-mp_obj_t ndarray_array_constructor(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    // array constructor for ndarray, equivalent to numpy.array(...)
-    return ndarray_make_new_core(&ulab_ndarray_type, n_args, kw_args->used, pos_args, kw_args);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(ndarray_array_constructor_obj, 1, ndarray_array_constructor);
-
-mp_obj_t ndarray_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    (void) type;
-    mp_arg_check_num(n_args, n_kw, 1, 2, true);
-    mp_map_t kw_args;
-    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    return ndarray_make_new_core(type, n_args, n_kw, args, &kw_args);
-}
-
-// broadcasting is used at a number of places, always include
-bool ndarray_can_broadcast(ndarray_obj_t *lhs, ndarray_obj_t *rhs, uint8_t *ndim, size_t *shape, int32_t *lstrides, int32_t *rstrides) {
-    // Returns true or false, depending on, whether the two arrays can be broadcast together
-    // with numpy's broadcasting rules. These are as follows:
-    //
-    // 1. the two shapes are either equal
-    // 2. one of the shapes is 1
-    memset(lstrides, 0, sizeof(size_t)*ULAB_MAX_DIMS);
-    memset(rstrides, 0, sizeof(size_t)*ULAB_MAX_DIMS);
-    lstrides[ULAB_MAX_DIMS - 1] = lhs->strides[ULAB_MAX_DIMS - 1];
-    rstrides[ULAB_MAX_DIMS - 1] = rhs->strides[ULAB_MAX_DIMS - 1];
-    for(uint8_t i=ULAB_MAX_DIMS; i > 0; i--) {
-        if((lhs->shape[i-1] == rhs->shape[i-1]) || (lhs->shape[i-1] == 0) || (lhs->shape[i-1] == 1) ||
-        (rhs->shape[i-1] == 0) || (rhs->shape[i-1] == 1)) {
-            shape[i-1] = MAX(lhs->shape[i-1], rhs->shape[i-1]);
-            if(shape[i-1] > 0) (*ndim)++;
-            if(lhs->shape[i-1] < 2) {
-                lstrides[i-1] = 0;
-            } else {
-                lstrides[i-1] = lhs->strides[i-1];
-            }
-            if(rhs->shape[i-1] < 2) {
-                rstrides[i-1] = 0;
-            } else {
-                rstrides[i-1] = rhs->strides[i-1];
-            }
-        } else {
-            return false;
-        }
-    }
-    return true;
-}
-
-#if NDARRAY_HAS_INPLACE_OPS
-bool ndarray_can_broadcast_inplace(ndarray_obj_t *lhs, ndarray_obj_t *rhs, int32_t *rstrides) {
-    // returns true or false, depending on, whether the two arrays can be broadcast together inplace
-    // this means that the right hand side always must be "smaller" than the left hand side, i.e.
-    // the broadcasting rules are as follows:
-    //
-    // 1. the two shapes are either equal
-    // 2. the shapes on the right hand side is 1
-    memset(rstrides, 0, sizeof(size_t)*ULAB_MAX_DIMS);
-    rstrides[ULAB_MAX_DIMS - 1] = rhs->strides[ULAB_MAX_DIMS - 1];
-    for(uint8_t i=ULAB_MAX_DIMS; i > 0; i--) {
-        if((lhs->shape[i-1] == rhs->shape[i-1]) || (rhs->shape[i-1] == 0) || (rhs->shape[i-1] == 1)) {
-            if(rhs->shape[i-1] < 2) {
-                rstrides[i-1] = 0;
-            } else {
-                rstrides[i-1] = rhs->strides[i-1];
-            }
-        } else {
-            return false;
-        }
-    }
-    return true;
-}
-#endif
-
-#if NDARRAY_IS_SLICEABLE
-static size_t slice_length(mp_bound_slice_t slice) {
-    ssize_t len, correction = 1;
-    if(slice.step > 0) correction = -1;
-    len = (ssize_t)(slice.stop - slice.start + (slice.step + correction)) / slice.step;
-    if(len < 0) return 0;
-    return (size_t)len;
-}
-
-static mp_bound_slice_t generate_slice(mp_int_t n, mp_obj_t index) {
-    mp_bound_slice_t slice;
-    if(mp_obj_is_type(index, &mp_type_slice)) {
-        mp_obj_slice_indices(index, n, &slice);
-    } else if(mp_obj_is_int(index)) {
-        mp_int_t _index = mp_obj_get_int(index);
-        if(_index < 0) {
-            _index += n;
-        }
-        if((_index >= n) || (_index < 0)) {
-            mp_raise_msg(&mp_type_IndexError, translate("index is out of bounds"));
-        }
-        slice.start = _index;
-        slice.stop = _index + 1;
-        slice.step = 1;
-    } else {
-        mp_raise_msg(&mp_type_IndexError, translate("indices must be integers, slices, or Boolean lists"));
-    }
-    return slice;
-}
-
-static ndarray_obj_t *ndarray_view_from_slices(ndarray_obj_t *ndarray, mp_obj_tuple_t *tuple) {
-    size_t *shape = m_new(size_t, ULAB_MAX_DIMS);
-    memset(shape, 0, sizeof(size_t)*ULAB_MAX_DIMS);
-    int32_t *strides = m_new(int32_t, ULAB_MAX_DIMS);
-    memset(strides, 0, sizeof(size_t)*ULAB_MAX_DIMS);
-
-    uint8_t ndim = ndarray->ndim;
-
-    for(uint8_t i=0; i < ndim; i++) {
-        // copy from the end
-        shape[ULAB_MAX_DIMS - 1 - i] = ndarray->shape[ULAB_MAX_DIMS  - 1 - i];
-        strides[ULAB_MAX_DIMS - 1 - i] = ndarray->strides[ULAB_MAX_DIMS  - 1 - i];
-    }
-    int32_t offset = 0;
-    for(uint8_t i=0; i  < tuple->len; i++) {
-        if(mp_obj_is_int(tuple->items[i])) {
-            // if item is an int, the dimension will first be reduced ...
-            ndim--;
-            int32_t k = mp_obj_get_int(tuple->items[i]);
-            if(k < 0) {
-                k += ndarray->shape[ULAB_MAX_DIMS - ndarray->ndim + i];
-            }
-            if((k >= (int32_t)ndarray->shape[ULAB_MAX_DIMS - ndarray->ndim + i]) || (k < 0)) {
-                mp_raise_msg(&mp_type_IndexError, translate("index is out of bounds"));
-            }
-            offset += ndarray->strides[ULAB_MAX_DIMS - ndarray->ndim + i] * k;
-            // ... and then we have to shift the shapes to the right
-            for(uint8_t j=0; j < i; j++) {
-                shape[ULAB_MAX_DIMS - ndarray->ndim + i - j] = shape[ULAB_MAX_DIMS - ndarray->ndim + i - j - 1];
-                strides[ULAB_MAX_DIMS - ndarray->ndim + i - j] = strides[ULAB_MAX_DIMS - ndarray->ndim + i - j - 1];
-            }
-        } else {
-            mp_bound_slice_t slice = generate_slice(shape[ULAB_MAX_DIMS - ndarray->ndim + i], tuple->items[i]);
-            shape[ULAB_MAX_DIMS - ndarray->ndim + i] = slice_length(slice);
-            offset += ndarray->strides[ULAB_MAX_DIMS - ndarray->ndim + i] * (int32_t)slice.start;
-            strides[ULAB_MAX_DIMS - ndarray->ndim + i] = (int32_t)slice.step * ndarray->strides[ULAB_MAX_DIMS - ndarray->ndim + i];
-        }
-    }
-    return ndarray_new_view(ndarray, ndim, shape, strides, offset);
-}
-
-void ndarray_assign_view(ndarray_obj_t *view, ndarray_obj_t *values) {
-    if(values->len == 0) {
-        return;
-    }
-    uint8_t ndim = 0;
-    size_t *shape = m_new(size_t, ULAB_MAX_DIMS);
-    int32_t *lstrides = m_new(int32_t, ULAB_MAX_DIMS);
-    int32_t *rstrides = m_new(int32_t, ULAB_MAX_DIMS);
-    if(!ndarray_can_broadcast(view, values, &ndim, shape, lstrides, rstrides)) {
-        mp_raise_ValueError(translate("operands could not be broadcast together"));
-        m_del(size_t, shape, ULAB_MAX_DIMS);
-        m_del(int32_t, lstrides, ULAB_MAX_DIMS);
-        m_del(int32_t, rstrides, ULAB_MAX_DIMS);
-    }
-
-    uint8_t *rarray = (uint8_t *)values->array;
-    // since in ASSIGNMENT_LOOP the array has a type, we have to divide the strides by the itemsize
-    for(uint8_t i=0; i < ULAB_MAX_DIMS; i++) {
-        lstrides[i] /= view->itemsize;
-    }
-
-    if(view->dtype == NDARRAY_UINT8) {
-        if(values->dtype == NDARRAY_UINT8) {
-            ASSIGNMENT_LOOP(view, uint8_t, uint8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT8) {
-            ASSIGNMENT_LOOP(view, uint8_t, int8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            ASSIGNMENT_LOOP(view, uint8_t, uint16_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT16) {
-            ASSIGNMENT_LOOP(view, uint8_t, int16_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            ASSIGNMENT_LOOP(view, uint8_t, mp_float_t, lstrides, rarray, rstrides);
-        }
-    } else if(view->dtype == NDARRAY_INT8) {
-        if(values->dtype == NDARRAY_UINT8) {
-            ASSIGNMENT_LOOP(view, int8_t, uint8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT8) {
-            ASSIGNMENT_LOOP(view, int8_t, int8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            ASSIGNMENT_LOOP(view, int8_t, uint16_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT16) {
-            ASSIGNMENT_LOOP(view, int8_t, int16_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            ASSIGNMENT_LOOP(view, int8_t, mp_float_t, lstrides, rarray, rstrides);
-        }
-    } else if(view->dtype == NDARRAY_UINT16) {
-        if(values->dtype == NDARRAY_UINT8) {
-            ASSIGNMENT_LOOP(view, uint16_t, uint8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT8) {
-            ASSIGNMENT_LOOP(view, uint16_t, int8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            ASSIGNMENT_LOOP(view, uint16_t, uint16_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT16) {
-            ASSIGNMENT_LOOP(view, uint16_t, int16_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            ASSIGNMENT_LOOP(view, uint16_t, mp_float_t, lstrides, rarray, rstrides);
-        }
-    } else if(view->dtype == NDARRAY_INT16) {
-        if(values->dtype == NDARRAY_UINT8) {
-            ASSIGNMENT_LOOP(view, int16_t, uint8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT8) {
-            ASSIGNMENT_LOOP(view, int16_t, int8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            ASSIGNMENT_LOOP(view, int16_t, uint16_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT16) {
-            ASSIGNMENT_LOOP(view, int16_t, int16_t,  lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            ASSIGNMENT_LOOP(view, int16_t, mp_float_t,  lstrides, rarray, rstrides);
-        }
-    } else { // the dtype must be an mp_float_t now
-        if(values->dtype == NDARRAY_UINT8) {
-            ASSIGNMENT_LOOP(view, mp_float_t, uint8_t, lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT8) {
-            ASSIGNMENT_LOOP(view, mp_float_t, int8_t,  lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            ASSIGNMENT_LOOP(view, mp_float_t, uint16_t,  lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_INT16) {
-            ASSIGNMENT_LOOP(view, mp_float_t, int16_t,  lstrides, rarray, rstrides);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            ASSIGNMENT_LOOP(view, mp_float_t, mp_float_t,  lstrides, rarray, rstrides);
-        }
-    }
-}
-
-static mp_obj_t ndarray_from_boolean_index(ndarray_obj_t *ndarray, ndarray_obj_t *index) {
-    // returns a 1D array, indexed by a Boolean array
-    if(ndarray->len != index->len) {
-        mp_raise_ValueError(translate("array and index length must be equal"));
-    }
-    uint8_t *iarray = (uint8_t *)index->array;
-    // first we have to find out how many trues there are
-    size_t count = 0;
-    for(size_t i=0; i < index->len; i++) {
-        count += *iarray;
-        iarray += index->strides[ULAB_MAX_DIMS - 1];
-    }
-    ndarray_obj_t *results = ndarray_new_linear_array(count, ndarray->dtype);
-    uint8_t *rarray = (uint8_t *)results->array;
-    uint8_t *array = (uint8_t *)ndarray->array;
-    // re-wind the index array
-    iarray = index->array;
-    for(size_t i=0; i < index->len; i++) {
-        if(*iarray) {
-            memcpy(rarray, array, results->itemsize);
-            rarray += results->itemsize;
-            count++;
-        }
-        array += ndarray->strides[ULAB_MAX_DIMS - 1];
-        iarray += index->strides[ULAB_MAX_DIMS - 1];
-    }
-    return MP_OBJ_FROM_PTR(results);
-}
-
-static mp_obj_t ndarray_assign_from_boolean_index(ndarray_obj_t *ndarray, ndarray_obj_t *index, ndarray_obj_t *values) {
-    // assigns values to a Boolean-indexed array
-    // first we have to find out how many trues there are
-    uint8_t *iarray = (uint8_t *)index->array;
-    size_t count = 0;
-    for(size_t i=0; i < index->len; i++) {
-        count += *iarray;
-        iarray += index->strides[ULAB_MAX_DIMS - 1];
-    }
-    // re-wind the index array
-    iarray = index->array;
-    uint8_t *varray = (uint8_t *)values->array;
-    size_t vstride;
-    size_t istride = index->strides[ULAB_MAX_DIMS - 1];
-
-    if(count == values->len) {
-        // there are as many values as true indices
-        vstride = values->strides[ULAB_MAX_DIMS - 1];
-    } else {
-        // there is a single value
-        vstride = 0;
-    }
-    if(ndarray->dtype == NDARRAY_UINT8) {
-        if(values->dtype == NDARRAY_UINT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint8_t, uint8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint8_t, int8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint8_t, uint16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint8_t, int16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint8_t, mp_float_t, ndarray, iarray, istride, varray, vstride);
-        }
-    } else if(ndarray->dtype == NDARRAY_INT8) {
-        if(values->dtype == NDARRAY_UINT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(int8_t, uint8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(int8_t, int8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(int8_t, uint16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(int8_t, int16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            BOOLEAN_ASSIGNMENT_LOOP(int8_t, mp_float_t, ndarray, iarray, istride, varray, vstride);
-        }
-    } else if(ndarray->dtype == NDARRAY_UINT16) {
-        if(values->dtype == NDARRAY_UINT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint16_t, uint8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint16_t, int8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint16_t, uint16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint16_t, int16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            BOOLEAN_ASSIGNMENT_LOOP(uint16_t, mp_float_t, ndarray, iarray, istride, varray, vstride);
-        }
-    } else if(ndarray->dtype == NDARRAY_INT16) {
-        if(values->dtype == NDARRAY_UINT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(int16_t, uint8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(int16_t, int8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(int16_t, uint16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(int16_t, int16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            BOOLEAN_ASSIGNMENT_LOOP(int16_t, mp_float_t, ndarray, iarray, istride, varray, vstride);
-        }
-    } else {
-        if(values->dtype == NDARRAY_UINT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(mp_float_t, uint8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT8) {
-            BOOLEAN_ASSIGNMENT_LOOP(mp_float_t, int8_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_UINT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(mp_float_t, uint16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_INT16) {
-            BOOLEAN_ASSIGNMENT_LOOP(mp_float_t, int16_t, ndarray, iarray, istride, varray, vstride);
-        } else if(values->dtype == NDARRAY_FLOAT) {
-            BOOLEAN_ASSIGNMENT_LOOP(mp_float_t, mp_float_t, ndarray, iarray, istride, varray, vstride);
-        }
-    }
-    return MP_OBJ_FROM_PTR(ndarray);
-}
-
-static mp_obj_t ndarray_get_slice(ndarray_obj_t *ndarray, mp_obj_t index, ndarray_obj_t *values) {
-    if(mp_obj_is_type(index, &ulab_ndarray_type)) {
-        ndarray_obj_t *nindex = MP_OBJ_TO_PTR(index);
-        if((nindex->ndim > 1) || (nindex->boolean == false)) {
-            mp_raise_NotImplementedError(translate("operation is implemented for 1D Boolean arrays only"));
-        }
-        if(values == NULL) { // return value(s)
-            return ndarray_from_boolean_index(ndarray, nindex);
-        } else { // assign value(s)
-            ndarray_assign_from_boolean_index(ndarray, index, values);
-        }
-    }
-    if(mp_obj_is_type(index, &mp_type_tuple) || mp_obj_is_int(index) || mp_obj_is_type(index, &mp_type_slice)) {
-        mp_obj_tuple_t *tuple;
-        if(mp_obj_is_type(index, &mp_type_tuple)) {
-            tuple = MP_OBJ_TO_PTR(index);
-            if(tuple->len > ndarray->ndim) {
-                mp_raise_msg(&mp_type_IndexError, translate("too many indices"));
-            }
-        } else {
-            mp_obj_t *items = m_new(mp_obj_t, 1);
-            items[0] = index;
-            tuple = mp_obj_new_tuple(1, items);
-        }
-        ndarray_obj_t *view = ndarray_view_from_slices(ndarray, tuple);
-        if(values == NULL) { // return value(s)
-            // if the view has been reduced to nothing, return a single value
-            if(view->ndim == 0) {
-                return mp_binary_get_val_array(view->dtype, view->array, 0);
-            } else {
-                return MP_OBJ_FROM_PTR(view);
-            }
-        } else { // assign value(s)
-            ndarray_assign_view(view, values);
-        }
-    }
-    return mp_const_none;
-}
-
-mp_obj_t ndarray_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
-    if (value == MP_OBJ_SENTINEL) { // return value(s)
-        return ndarray_get_slice(self, index, NULL);
-    } else { // assignment to slices; the value must be an ndarray, or a scalar
-        ndarray_obj_t *values = ndarray_from_mp_obj(value, 0);
-        return ndarray_get_slice(self, index, values);
-    }
-    return mp_const_none;
-}
-#endif /* NDARRAY_IS_SLICEABLE */
-
-#if NDARRAY_IS_ITERABLE
-
-// itarray iterator
-mp_obj_t ndarray_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
-    return ndarray_new_ndarray_iterator(o_in, iter_buf);
-}
-
-typedef struct _mp_obj_ndarray_it_t {
-    mp_obj_base_t base;
-    mp_fun_1_t iternext;
-    mp_obj_t ndarray;
-    size_t cur;
-} mp_obj_ndarray_it_t;
-
-mp_obj_t ndarray_iternext(mp_obj_t self_in) {
-    mp_obj_ndarray_it_t *self = MP_OBJ_TO_PTR(self_in);
-    ndarray_obj_t *ndarray = MP_OBJ_TO_PTR(self->ndarray);
-    uint8_t *array = (uint8_t *)ndarray->array;
-
-    size_t iter_end = ndarray->shape[ULAB_MAX_DIMS-ndarray->ndim];
-    if(self->cur < iter_end) {
-        // separating this case out saves 50 bytes for 1D arrays
-        #if ULAB_MAX_DIMS == 1
-        array += self->cur * ndarray->strides[0];
-        self->cur++;
-        return ndarray_get_item(ndarray, array);
-        #else
-        if(ndarray->ndim == 1) { // we have a linear array
-            array += self->cur * ndarray->strides[ULAB_MAX_DIMS - 1];
-            self->cur++;
-            return ndarray_get_item(ndarray, array);
-        } else { // we have a tensor, return the reduced view
-            size_t offset = self->cur * ndarray->strides[ULAB_MAX_DIMS - ndarray->ndim];
-            self->cur++;
-            return MP_OBJ_FROM_PTR(ndarray_new_view(ndarray, ndarray->ndim-1, ndarray->shape, ndarray->strides, offset));
-        }
-        #endif
-    } else {
-        return MP_OBJ_STOP_ITERATION;
-    }
-}
-
-mp_obj_t ndarray_new_ndarray_iterator(mp_obj_t ndarray, mp_obj_iter_buf_t *iter_buf) {
-    assert(sizeof(mp_obj_ndarray_it_t) <= sizeof(mp_obj_iter_buf_t));
-    mp_obj_ndarray_it_t *iter = (mp_obj_ndarray_it_t *)iter_buf;
-    iter->base.type = &mp_type_polymorph_iter;
-    iter->iternext = ndarray_iternext;
-    iter->ndarray = ndarray;
-    iter->cur = 0;
-    return MP_OBJ_FROM_PTR(iter);
-}
-#endif /* NDARRAY_IS_ITERABLE */
-
-#if NDARRAY_HAS_FLATTEN
-mp_obj_t ndarray_flatten(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_order, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_QSTR(MP_QSTR_C)} },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-    GET_STR_DATA_LEN(args[0].u_obj, order, len);
-    if((len != 1) || ((memcmp(order, "C", 1) != 0) && (memcmp(order, "F", 1) != 0))) {
-        mp_raise_ValueError(translate("flattening order must be either 'C', or 'F'"));
-    }
-
-    uint8_t *sarray = (uint8_t *)self->array;
-    ndarray_obj_t *ndarray = ndarray_new_linear_array(self->len, self->dtype);
-    uint8_t *array = (uint8_t *)ndarray->array;
-
-    if(memcmp(order, "C", 1) == 0) { // C-type ordering
-        #if ULAB_MAX_DIMS > 3
-        size_t i = 0;
-        do {
-        #endif
-            #if ULAB_MAX_DIMS > 2
-            size_t j = 0;
-            do {
-            #endif
-                #if ULAB_MAX_DIMS > 1
-                size_t k = 0;
-                do {
-                #endif
-                    size_t l = 0;
-                    do {
-                        memcpy(array, sarray, self->itemsize);
-                        array += ndarray->strides[ULAB_MAX_DIMS - 1];
-                        sarray += self->strides[ULAB_MAX_DIMS - 1];
-                        l++;
-                    } while(l <  self->shape[ULAB_MAX_DIMS - 1]);
-                #if ULAB_MAX_DIMS > 1
-                    sarray -= self->strides[ULAB_MAX_DIMS - 1] * self->shape[ULAB_MAX_DIMS-1];
-                    sarray += self->strides[ULAB_MAX_DIMS - 2];
-                    k++;
-                } while(k <  self->shape[ULAB_MAX_DIMS - 2]);
-                #endif
-            #if ULAB_MAX_DIMS > 2
-                sarray -= self->strides[ULAB_MAX_DIMS - 2] * self->shape[ULAB_MAX_DIMS-2];
-                sarray += self->strides[ULAB_MAX_DIMS - 3];
-                j++;
-            } while(j <  self->shape[ULAB_MAX_DIMS - 3]);
-            #endif
-        #if ULAB_MAX_DIMS > 3
-            sarray -= self->strides[ULAB_MAX_DIMS - 3] * self->shape[ULAB_MAX_DIMS-3];
-            sarray += self->strides[ULAB_MAX_DIMS - 4];
-            i++;
-        } while(i <  self->shape[ULAB_MAX_DIMS - 4]);
-        #endif
-    } else { // 'F', Fortran-type ordering
-        #if ULAB_MAX_DIMS > 3
-        size_t i = 0;
-        do {
-        #endif
-            #if ULAB_MAX_DIMS > 2
-            size_t j = 0;
-            do {
-            #endif
-                #if ULAB_MAX_DIMS > 1
-                size_t k = 0;
-                do {
-                #endif
-                    size_t l = 0;
-                    do {
-                        memcpy(array, sarray, self->itemsize);
-                        array += ndarray->strides[ULAB_MAX_DIMS - 1];
-                        sarray += self->strides[0];
-                        l++;
-                    } while(l < self->shape[0]);
-                #if ULAB_MAX_DIMS > 1
-                    sarray -= self->strides[0] * self->shape[0];
-                    sarray += self->strides[1];
-                    k++;
-                } while(k < self->shape[1]);
-                #endif
-            #if ULAB_MAX_DIMS > 2
-                sarray -= self->strides[1] * self->shape[1];
-                sarray += self->strides[2];
-                j++;
-            } while(j < self->shape[2]);
-            #endif
-        #if ULAB_MAX_DIMS > 3
-            sarray -= self->strides[2] * self->shape[2];
-            sarray += self->strides[3];
-            i++;
-        } while(i < self->shape[3]);
-        #endif
-    }
-    return MP_OBJ_FROM_PTR(ndarray);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_KW(ndarray_flatten_obj, 1, ndarray_flatten);
-#endif
-
-#if NDARRAY_HAS_ITEMSIZE
-mp_obj_t ndarray_itemsize(mp_obj_t self_in) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(self->itemsize);
-}
-#endif
-
-#if NDARRAY_HAS_SHAPE
-mp_obj_t ndarray_shape(mp_obj_t self_in) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t nitems = MAX(1, self->ndim);
-    mp_obj_t *items = m_new(mp_obj_t, nitems);
-    for(uint8_t i = 0; i < nitems; i++) {
-        items[nitems - i - 1] = mp_obj_new_int(self->shape[ULAB_MAX_DIMS - i - 1]);
-    }
-    mp_obj_t tuple = mp_obj_new_tuple(nitems, items);
-    m_del(mp_obj_t, items, nitems);
-    return tuple;
-}
-#endif
-
-#if NDARRAY_HAS_SIZE
-mp_obj_t ndarray_size(mp_obj_t self_in) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int(self->len);
-}
-#endif
-
-#if NDARRAY_HAS_STRIDES
-mp_obj_t ndarray_strides(mp_obj_t self_in) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_t *items = m_new(mp_obj_t, self->ndim);
-    for(int8_t i=0; i < self->ndim; i++) {
-        items[i] = mp_obj_new_int(self->strides[ULAB_MAX_DIMS - self->ndim + i]);
-    }
-    mp_obj_t tuple = mp_obj_new_tuple(self->ndim, items);
-    m_del(mp_obj_t, items, self->ndim);
-    return tuple;
-}
-#endif
-
-#if NDARRAY_HAS_TOBYTES
-mp_obj_t ndarray_tobytes(mp_obj_t self_in) {
-    // As opposed to numpy, this function returns a bytearray object with the data pointer (i.e., not a copy)
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    // Piping into a bytearray makes sense for dense arrays only,
-    // so bail out, if that is not the case
-    if(!ndarray_is_dense(self)) {
-        mp_raise_ValueError(translate("tobytes can be invoked for dense arrays only"));
-    }
-    return mp_obj_new_bytearray_by_ref(self->itemsize * self->len, self->array);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(ndarray_tobytes_obj, ndarray_tobytes);
-#endif
-
-// Binary operations
-ndarray_obj_t *ndarray_from_mp_obj(mp_obj_t obj, uint8_t other_type) {
-    // creates an ndarray from a micropython int or float
-    // if the input is an ndarray, it is returned
-    // if other_type is 0, return the smallest type that can accommodate the object
-    ndarray_obj_t *ndarray;
-
-    if(mp_obj_is_int(obj)) {
-        int32_t ivalue = mp_obj_get_int(obj);
-        if((ivalue < -32767) || (ivalue > 32767)) {
-            // the integer value clearly does not fit the ulab integer types, so move on to float
-            ndarray = ndarray_new_linear_array(1, NDARRAY_FLOAT);
-            mp_float_t *array = (mp_float_t *)ndarray->array;
-            array[0] = (mp_float_t)ivalue;
-        } else {
-            uint8_t dtype;
-            if(ivalue < 0) {
-                if(ivalue > -128) {
-                    dtype = NDARRAY_INT8;
-                } else {
-                    dtype = NDARRAY_INT16;
-                }
-            } else { // ivalue >= 0
-                if((other_type == NDARRAY_INT8) || (other_type == NDARRAY_INT16)) {
-                    if(ivalue < 128) {
-                        dtype = NDARRAY_INT8;
-                    } else {
-                        dtype = NDARRAY_INT16;
-                    }
-                } else { // other_type = 0 is also included here
-                    if(ivalue < 256) {
-                        dtype = NDARRAY_UINT8;
-                    } else {
-                        dtype = NDARRAY_UINT16;
-                    }
-                }
-            }
-            ndarray = ndarray_new_linear_array(1, dtype);
-            ndarray_set_value(dtype, ndarray->array, 0, obj);
-        }
-    } else if(mp_obj_is_float(obj)) {
-        ndarray = ndarray_new_linear_array(1, NDARRAY_FLOAT);
-        mp_float_t *array = (mp_float_t *)ndarray->array;
-        array[0] = mp_obj_get_float(obj);
-    } else if(mp_obj_is_type(obj, &ulab_ndarray_type)){
-        return obj;
-    } else {
-        // assume that the input is an iterable (raises an exception, if it is not the case)
-        ndarray = ndarray_from_iterable(obj, NDARRAY_FLOAT);
-    }
-    return ndarray;
-}
-
-#if NDARRAY_HAS_BINARY_OPS || NDARRAY_HAS_INPLACE_OPS
-mp_obj_t ndarray_binary_op(mp_binary_op_t _op, mp_obj_t lobj, mp_obj_t robj) {
-    // TODO: implement in-place operators
-    // if the ndarray stands on the right hand side of the expression, simply swap the operands
-    ndarray_obj_t *lhs, *rhs;
-    mp_binary_op_t op = _op;
-    if((op == MP_BINARY_OP_REVERSE_ADD) || (op == MP_BINARY_OP_REVERSE_MULTIPLY) ||
-        (op == MP_BINARY_OP_REVERSE_POWER) || (op == MP_BINARY_OP_REVERSE_SUBTRACT) ||
-        (op == MP_BINARY_OP_REVERSE_TRUE_DIVIDE)) {
-        lhs = ndarray_from_mp_obj(robj, 0);
-        rhs = ndarray_from_mp_obj(lobj, lhs->dtype);
-    } else {
-        lhs = ndarray_from_mp_obj(lobj, 0);
-        rhs = ndarray_from_mp_obj(robj, lhs->dtype);
-    }
-    if(op == MP_BINARY_OP_REVERSE_ADD) {
-        op = MP_BINARY_OP_ADD;
-    } else if(op == MP_BINARY_OP_REVERSE_MULTIPLY) {
-        op = MP_BINARY_OP_MULTIPLY;
-    } else if(op == MP_BINARY_OP_REVERSE_POWER) {
-        op = MP_BINARY_OP_POWER;
-    } else if(op == MP_BINARY_OP_REVERSE_SUBTRACT) {
-        op = MP_BINARY_OP_SUBTRACT;
-    } else if(op == MP_BINARY_OP_REVERSE_TRUE_DIVIDE) {
-        op = MP_BINARY_OP_TRUE_DIVIDE;
-    }
-
-    uint8_t ndim = 0;
-    size_t *shape = m_new(size_t, ULAB_MAX_DIMS);
-    int32_t *lstrides = m_new(int32_t, ULAB_MAX_DIMS);
-    int32_t *rstrides = m_new(int32_t, ULAB_MAX_DIMS);
-    uint8_t broadcastable;
-    if((op == MP_BINARY_OP_INPLACE_ADD) || (op == MP_BINARY_OP_INPLACE_MULTIPLY) || (op == MP_BINARY_OP_INPLACE_POWER) ||
-        (op == MP_BINARY_OP_INPLACE_SUBTRACT) || (op == MP_BINARY_OP_INPLACE_TRUE_DIVIDE)) {
-        broadcastable = ndarray_can_broadcast_inplace(lhs, rhs, rstrides);
-    } else {
-        broadcastable = ndarray_can_broadcast(lhs, rhs, &ndim, shape, lstrides, rstrides);
-    }
-    if(!broadcastable) {
-        mp_raise_ValueError(translate("operands could not be broadcast together"));
-        m_del(size_t, shape, ULAB_MAX_DIMS);
-        m_del(int32_t, lstrides, ULAB_MAX_DIMS);
-        m_del(int32_t, rstrides, ULAB_MAX_DIMS);
-    }
-    // the empty arrays have to be treated separately
-    uint8_t dtype = NDARRAY_INT16;
-    ndarray_obj_t *nd;
-    if((lhs->ndim == 0) || (rhs->ndim == 0)) {
-        switch(op) {
-            case MP_BINARY_OP_INPLACE_ADD:
-            case MP_BINARY_OP_INPLACE_MULTIPLY:
-            case MP_BINARY_OP_INPLACE_SUBTRACT:
-            case MP_BINARY_OP_ADD:
-            case MP_BINARY_OP_MULTIPLY:
-            case MP_BINARY_OP_SUBTRACT:
-                // here we don't have to list those cases that result in an int16,
-                // because dtype is initialised with that NDARRAY_INT16
-                if(lhs->dtype == rhs->dtype) {
-                    dtype = rhs->dtype;
-                } else if((lhs->dtype == NDARRAY_FLOAT) || (rhs->dtype == NDARRAY_FLOAT)) {
-                    dtype = NDARRAY_FLOAT;
-                } else if(((lhs->dtype == NDARRAY_UINT8) && (rhs->dtype == NDARRAY_UINT16)) ||
-                            ((lhs->dtype == NDARRAY_INT8) && (rhs->dtype == NDARRAY_UINT16)) ||
-                            ((rhs->dtype == NDARRAY_UINT8) && (lhs->dtype == NDARRAY_UINT16)) ||
-                            ((rhs->dtype == NDARRAY_INT8) && (lhs->dtype == NDARRAY_UINT16))) {
-                    dtype = NDARRAY_UINT16;
-                }
-                return MP_OBJ_FROM_PTR(ndarray_new_linear_array(0, dtype));
-                break;
-
-            case MP_BINARY_OP_INPLACE_POWER:
-            case MP_BINARY_OP_INPLACE_TRUE_DIVIDE:
-            case MP_BINARY_OP_POWER:
-            case MP_BINARY_OP_TRUE_DIVIDE:
-                return MP_OBJ_FROM_PTR(ndarray_new_linear_array(0, NDARRAY_FLOAT));
-                break;
-
-            case MP_BINARY_OP_LESS:
-            case MP_BINARY_OP_LESS_EQUAL:
-            case MP_BINARY_OP_MORE:
-            case MP_BINARY_OP_MORE_EQUAL:
-            case MP_BINARY_OP_EQUAL:
-            case MP_BINARY_OP_NOT_EQUAL:
-                nd = ndarray_new_linear_array(0, NDARRAY_UINT8);
-                nd->boolean = true;
-                return MP_OBJ_FROM_PTR(nd);
-
-            default:
-                return mp_const_none;
-                break;
-        }
-    }
-
-    switch(op) {
-        // first the in-place operators
-        #if NDARRAY_HAS_INPLACE_ADD
-        case MP_BINARY_OP_INPLACE_ADD:
-            return ndarray_inplace_ams(lhs, rhs, rstrides, op);
-            break;
-        #endif
-        #if NDARRAY_HAS_INPLACE_MULTIPLY
-        case MP_BINARY_OP_INPLACE_MULTIPLY:
-            return ndarray_inplace_ams(lhs, rhs, rstrides, op);
-            break;
-        #endif
-        #if NDARRAY_HAS_INPLACE_POWER
-        case MP_BINARY_OP_INPLACE_POWER:
-            return ndarray_inplace_power(lhs, rhs, rstrides);
-            break;
-        #endif
-        #if NDARRAY_HAS_INPLACE_SUBTRACT
-        case MP_BINARY_OP_INPLACE_SUBTRACT:
-            return ndarray_inplace_ams(lhs, rhs, rstrides, op);
-            break;
-        #endif
-        #if NDARRAY_HAS_INPLACE_TRUE_DIVIDE
-        case MP_BINARY_OP_INPLACE_TRUE_DIVIDE:
-            return ndarray_inplace_divide(lhs, rhs, rstrides);
-            break;
-        #endif
-        // end if in-place operators
-
-        #if NDARRAY_HAS_BINARY_OP_LESS
-        case MP_BINARY_OP_LESS:
-            // here we simply swap the operands
-            return ndarray_binary_more(rhs, lhs, ndim, shape, rstrides, lstrides, MP_BINARY_OP_MORE);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_LESS_EQUAL
-        case MP_BINARY_OP_LESS_EQUAL:
-            // here we simply swap the operands
-            return ndarray_binary_more(rhs, lhs, ndim, shape, rstrides, lstrides, MP_BINARY_OP_MORE_EQUAL);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_EQUAL
-        case MP_BINARY_OP_EQUAL:
-            return ndarray_binary_equality(lhs, rhs, ndim, shape, lstrides, rstrides, MP_BINARY_OP_EQUAL);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_NOT_EQUAL
-        case MP_BINARY_OP_NOT_EQUAL:
-            return ndarray_binary_equality(lhs, rhs, ndim, shape, lstrides, rstrides, MP_BINARY_OP_NOT_EQUAL);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_ADD
-        case MP_BINARY_OP_ADD:
-            return ndarray_binary_add(lhs, rhs, ndim, shape, lstrides, rstrides);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_MULTIPLY
-        case MP_BINARY_OP_MULTIPLY:
-            return ndarray_binary_multiply(lhs, rhs, ndim, shape, lstrides, rstrides);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_MORE
-        case MP_BINARY_OP_MORE:
-            return ndarray_binary_more(lhs, rhs, ndim, shape, lstrides, rstrides, MP_BINARY_OP_MORE);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_MORE_EQUAL
-        case MP_BINARY_OP_MORE_EQUAL:
-            return ndarray_binary_more(lhs, rhs, ndim, shape, lstrides, rstrides, MP_BINARY_OP_MORE_EQUAL);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_SUBTRACT
-        case MP_BINARY_OP_SUBTRACT:
-            return ndarray_binary_subtract(lhs, rhs, ndim, shape, lstrides, rstrides);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_TRUE_DIVIDE
-        case MP_BINARY_OP_TRUE_DIVIDE:
-            return ndarray_binary_true_divide(lhs, rhs, ndim, shape, lstrides, rstrides);
-            break;
-        #endif
-        #if NDARRAY_HAS_BINARY_OP_POWER
-        case MP_BINARY_OP_POWER:
-            return ndarray_binary_power(lhs, rhs, ndim, shape, lstrides, rstrides);
-            break;
-        #endif
-        default:
-            return MP_OBJ_NULL; // op not supported
-            break;
-    }
-    return MP_OBJ_NULL;
-}
-#endif /* NDARRAY_HAS_BINARY_OPS || NDARRAY_HAS_INPLACE_OPS */
-
-#if NDARRAY_HAS_UNARY_OPS
-mp_obj_t ndarray_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    ndarray_obj_t *ndarray = NULL;
-
-    switch (op) {
-        #if NDARRAY_HAS_UNARY_OP_ABS
-        case MP_UNARY_OP_ABS:
-            ndarray = ndarray_copy_view(self);
-            // if Boolean, NDARRAY_UINT8, or NDARRAY_UINT16, there is nothing to do
-            if(self->dtype == NDARRAY_INT8) {
-                int8_t *array = (int8_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) {
-                    if(*array < 0) *array = -(*array);
-                }
-            } else if(self->dtype == NDARRAY_INT16) {
-                int16_t *array = (int16_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) {
-                    if(*array < 0) *array = -(*array);
-                }
-            } else {
-                mp_float_t *array = (mp_float_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) {
-                    if(*array < 0) *array = -(*array);
-                }
-            }
-            return MP_OBJ_FROM_PTR(ndarray);
-            break;
-        #endif
-        #if NDARRAY_HAS_UNARY_OP_INVERT
-        case MP_UNARY_OP_INVERT:
-            if(self->dtype == NDARRAY_FLOAT) {
-                mp_raise_ValueError(translate("operation is not supported for given type"));
-            }
-            // we can invert the content byte by byte, no need to distinguish between different dtypes
-            ndarray = ndarray_copy_view(self); // from this point, this is a dense copy
-            uint8_t *array = (uint8_t *)ndarray->array;
-            if(ndarray->boolean) {
-                for(size_t i=0; i < ndarray->len; i++, array++) *array = *array ^ 0x01;
-            } else {
-                uint8_t itemsize = mp_binary_get_size('@', self->dtype, NULL);
-                for(size_t i=0; i < ndarray->len*itemsize; i++, array++) *array ^= 0xFF;
-            }
-            return MP_OBJ_FROM_PTR(ndarray);
-            break;
-        #endif
-        #if NDARRAY_HAS_UNARY_OP_LEN
-        case MP_UNARY_OP_LEN:
-            return mp_obj_new_int(self->shape[ULAB_MAX_DIMS - self->ndim]);
-            break;
-        #endif
-        #if NDARRAY_HAS_UNARY_OP_NEGATIVE
-        case MP_UNARY_OP_NEGATIVE:
-            ndarray = ndarray_copy_view(self); // from this point, this is a dense copy
-            if(self->dtype == NDARRAY_UINT8) {
-                uint8_t *array = (uint8_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) *array = -(*array);
-            } else if(self->dtype == NDARRAY_INT8) {
-                int8_t *array = (int8_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) *array = -(*array);
-            } else if(self->dtype == NDARRAY_UINT16) {
-                uint16_t *array = (uint16_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) *array = -(*array);
-            } else if(self->dtype == NDARRAY_INT16) {
-                int16_t *array = (int16_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) *array = -(*array);
-            } else {
-                mp_float_t *array = (mp_float_t *)ndarray->array;
-                for(size_t i=0; i < self->len; i++, array++) *array = -(*array);
-            }
-            return MP_OBJ_FROM_PTR(ndarray);
-            break;
-        #endif
-        #if NDARRAY_HAS_UNARY_OP_POSITIVE
-        case MP_UNARY_OP_POSITIVE:
-            return MP_OBJ_FROM_PTR(ndarray_copy_view(self));
-        #endif
-
-        default:
-            return MP_OBJ_NULL; // operator not supported
-            break;
-    }
-}
-#endif /* NDARRAY_HAS_UNARY_OPS */
-
-#if NDARRAY_HAS_TRANSPOSE
-mp_obj_t ndarray_transpose(mp_obj_t self_in) {
-    #if ULAB_MAX_DIMS == 1
-        return self_in;
-    #endif
-    // TODO: check, what happens to the offset here, if we have a view
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if(self->ndim == 1) {
-        return self_in;
-    }
-    size_t *shape = m_new(size_t, self->ndim);
-    int32_t *strides = m_new(int32_t, self->ndim);
-    for(uint8_t i=0; i < self->ndim; i++) {
-        shape[ULAB_MAX_DIMS - 1 - i] = self->shape[ULAB_MAX_DIMS - self->ndim + i];
-        strides[ULAB_MAX_DIMS - 1 - i] = self->strides[ULAB_MAX_DIMS - self->ndim + i];
-    }
-    // TODO: I am not sure ndarray_new_view is OK here...
-    // should be deep copy...
-    ndarray_obj_t *ndarray = ndarray_new_view(self, self->ndim, shape, strides, 0);
-    return MP_OBJ_FROM_PTR(ndarray);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(ndarray_transpose_obj, ndarray_transpose);
-#endif /* NDARRAY_HAS_TRANSPOSE */
-
-#if ULAB_MAX_DIMS > 1
-#if NDARRAY_HAS_RESHAPE
-mp_obj_t ndarray_reshape_core(mp_obj_t oin, mp_obj_t _shape, bool inplace) {
-    ndarray_obj_t *source = MP_OBJ_TO_PTR(oin);
-    if(!mp_obj_is_type(_shape, &mp_type_tuple)) {
-        mp_raise_TypeError(translate("shape must be a tuple"));
-    }
-
-    mp_obj_tuple_t *shape = MP_OBJ_TO_PTR(_shape);
-    if(shape->len > ULAB_MAX_DIMS) {
-        mp_raise_ValueError(translate("maximum number of dimensions is 4"));
-    }
-    size_t *new_shape = m_new(size_t, ULAB_MAX_DIMS);
-    memset(new_shape, 0, sizeof(size_t)*ULAB_MAX_DIMS);
-    size_t new_length = 1;
-    for(uint8_t i=0; i < shape->len; i++) {
-        new_shape[ULAB_MAX_DIMS - i - 1] = mp_obj_get_int(shape->items[shape->len - i - 1]);
-        new_length *= new_shape[ULAB_MAX_DIMS - i - 1];
-    }
-    if(source->len != new_length) {
-        mp_raise_ValueError(translate("input and output shapes are not compatible"));
-    }
-    ndarray_obj_t *ndarray;
-    if(ndarray_is_dense(source)) {
-        int32_t *new_strides = strides_from_shape(new_shape, source->dtype);
-        if(inplace) {
-            for(uint8_t i = 0; i < ULAB_MAX_DIMS; i++) {
-                source->shape[i] = new_shape[i];
-                source->strides[i] = new_strides[i];
-            }
-            return MP_OBJ_FROM_PTR(oin);
-        } else {
-            ndarray = ndarray_new_view(source, shape->len, new_shape, new_strides, 0);
-        }
-    } else {
-        if(inplace) {
-            mp_raise_ValueError(translate("cannot assign new shape"));
-        }
-        ndarray = ndarray_new_ndarray_from_tuple(shape, source->dtype);
-        ndarray_copy_array(source, ndarray);
-    }
-    return MP_OBJ_FROM_PTR(ndarray);
-}
-
-mp_obj_t ndarray_reshape(mp_obj_t oin, mp_obj_t _shape) {
-    return ndarray_reshape_core(oin, _shape, 0);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_2(ndarray_reshape_obj, ndarray_reshape);
-#endif /* NDARRAY_HAS_RESHAPE */
-#endif /* ULAB_MAX_DIMS > 1 */
-
-#if ULAB_NUMPY_HAS_NDINFO
-mp_obj_t ndarray_info(mp_obj_t obj_in) {
-    ndarray_obj_t *ndarray = MP_OBJ_TO_PTR(obj_in);
-    if(!mp_obj_is_type(ndarray, &ulab_ndarray_type)) {
-        mp_raise_TypeError(translate("function is defined for ndarrays only"));
-    }
-    mp_printf(MP_PYTHON_PRINTER, "class: ndarray\n");
-    mp_printf(MP_PYTHON_PRINTER, "shape: (");
-    if(ndarray->ndim == 1) {
-        mp_printf(MP_PYTHON_PRINTER, "%d,", ndarray->shape[ULAB_MAX_DIMS-1]);
-    } else {
-        for(uint8_t i=0; i < ndarray->ndim-1; i++) mp_printf(MP_PYTHON_PRINTER, "%d, ", ndarray->shape[i]);
-        mp_printf(MP_PYTHON_PRINTER, "%d", ndarray->shape[ULAB_MAX_DIMS-1]);
-    }
-    mp_printf(MP_PYTHON_PRINTER, ")\n");
-    mp_printf(MP_PYTHON_PRINTER, "strides: (");
-    if(ndarray->ndim == 1) {
-        mp_printf(MP_PYTHON_PRINTER, "%d,", ndarray->strides[ULAB_MAX_DIMS-1]);
-    } else {
-        for(uint8_t i=0; i < ndarray->ndim-1; i++) mp_printf(MP_PYTHON_PRINTER, "%d, ", ndarray->strides[i]);
-        mp_printf(MP_PYTHON_PRINTER, "%d", ndarray->strides[ULAB_MAX_DIMS-1]);
-    }
-    mp_printf(MP_PYTHON_PRINTER, ")\n");
-    mp_printf(MP_PYTHON_PRINTER, "itemsize: %d\n", ndarray->itemsize);
-    mp_printf(MP_PYTHON_PRINTER, "data pointer: 0x%p\n", ndarray->array);
-    mp_printf(MP_PYTHON_PRINTER, "type: ");
-    if(ndarray->boolean) {
-        mp_printf(MP_PYTHON_PRINTER, "bool\n");
-    } else if(ndarray->dtype == NDARRAY_UINT8) {
-        mp_printf(MP_PYTHON_PRINTER, "uint8\n");
-    } else if(ndarray->dtype == NDARRAY_INT8) {
-        mp_printf(MP_PYTHON_PRINTER, "int8\n");
-    } else if(ndarray->dtype == NDARRAY_UINT16) {
-        mp_printf(MP_PYTHON_PRINTER, "uint16\n");
-    } else if(ndarray->dtype == NDARRAY_INT16) {
-        mp_printf(MP_PYTHON_PRINTER, "int16\n");
-    } else if(ndarray->dtype == NDARRAY_FLOAT) {
-        mp_printf(MP_PYTHON_PRINTER, "float\n");
-    }
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(ndarray_info_obj, ndarray_info);
-#endif
-
-// (the get_buffer protocol returns 0 for success, 1 for failure)
-mp_int_t ndarray_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
-    ndarray_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if(!ndarray_is_dense(self)) {
-        return 1;
-    }
-    bufinfo->len = self->itemsize * self->len;
-    bufinfo->buf = self->array;
-    bufinfo->typecode = self->dtype;
-    return 0;
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/ulab/ndarray.h~ b/apps/KhiCAS/src/micropython-1.12/ulab/ndarray.h~
deleted file mode 100644
index 04abd9659..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ulab/ndarray.h~
+++ /dev/null
@@ -1,738 +0,0 @@
-
-/*
- * This file is part of the micropython-ulab project,
- *
- * https://github.com/v923z/micropython-ulab
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019-2021 Zoltán Vörös
- *               2020 Jeff Epler for Adafruit Industries
-*/
-
-#ifndef _NDARRAY_
-#define _NDARRAY_
-
-#include "py/objarray.h"
-#include "py/binary.h"
-#include "py/objstr.h"
-#include "py/objlist.h"
-
-#include "ulab.h"
-
-#ifndef MP_PI
-#define MP_PI MICROPY_FLOAT_CONST(3.14159265358979323846)
-#endif
-#ifndef MP_E
-#define MP_E MICROPY_FLOAT_CONST(2.71828182845904523536)
-#endif
-
-#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-#define FLOAT_TYPECODE 'f'
-#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-#define FLOAT_TYPECODE 'd'
-#endif
-
-// this typedef is lifted from objfloat.c, because mp_obj_float_t is not exposed
-typedef struct _mp_obj_float_t {
-    mp_obj_base_t base;
-    mp_float_t value;
-} mp_obj_float_t;
-
-#if defined(MICROPY_VERSION_MAJOR) && MICROPY_VERSION_MAJOR == 1 && MICROPY_VERSION_MINOR == 11
-typedef struct _mp_obj_slice_t {
-    mp_obj_base_t base;
-    mp_obj_t start;
-    mp_obj_t stop;
-    mp_obj_t step;
-} mp_obj_slice_t;
-#define MP_ERROR_TEXT(x) x
-#endif
-
-#if !defined(MP_TYPE_FLAG_EXTENDED)
-#define MP_TYPE_CALL call
-#define mp_type_get_call_slot(t) t->call
-#define MP_TYPE_FLAG_EXTENDED (0)
-#define MP_TYPE_EXTENDED_FIELDS(...) __VA_ARGS__
-#endif
-
-#if !CIRCUITPY
-#define translate(x) MP_ERROR_TEXT(x)
-#define ndarray_set_value(a, b, c, d) mp_binary_set_val_array(a, b, c, d)
-#else
-void ndarray_set_value(char , void *, size_t , mp_obj_t );
-#endif
-
-#define NDARRAY_NUMERIC   0
-#define NDARRAY_BOOLEAN   1
-
-#define NDARRAY_NDARRAY_TYPE    1
-#define NDARRAY_ITERABLE_TYPE   2
-
-extern const mp_obj_type_t ulab_ndarray_type;
-
-enum NDARRAY_TYPE {
-    NDARRAY_BOOL = '?', // this must never be assigned to the dtype!
-    NDARRAY_UINT8 = 'B',
-    NDARRAY_INT8 = 'b',
-    NDARRAY_UINT16 = 'H',
-    NDARRAY_INT16 = 'h',
-    NDARRAY_FLOAT = FLOAT_TYPECODE,
-};
-
-typedef struct _ndarray_obj_t {
-    mp_obj_base_t base;
-    uint8_t dtype;
-    uint8_t itemsize;
-    uint8_t boolean;
-    uint8_t ndim;
-    size_t len;
-    size_t shape[ULAB_MAX_DIMS];
-    int32_t strides[ULAB_MAX_DIMS];
-    void *array;
-    void *origin;
-} ndarray_obj_t;
-
-#if ULAB_HAS_DTYPE_OBJECT
-extern const mp_obj_type_t ulab_dtype_type;
-
-typedef struct _dtype_obj_t {
-    mp_obj_base_t base;
-    uint8_t dtype;
-} dtype_obj_t;
-
-void ndarray_dtype_print(const mp_print_t *, mp_obj_t , mp_print_kind_t );
-
-mp_obj_t ndarray_dtype_make_new(const mp_obj_type_t *, size_t , size_t , const mp_obj_t *);
-#endif /* ULAB_HAS_DTYPE_OBJECT */
-
-extern const mp_obj_type_t ndarray_flatiter_type;
-
-mp_obj_t ndarray_new_ndarray_iterator(mp_obj_t , mp_obj_iter_buf_t *);
-
-mp_obj_t ndarray_get_item(ndarray_obj_t *, void *);
-mp_float_t ndarray_get_float_value(void *, uint8_t );
-mp_float_t ndarray_get_float_index(void *, uint8_t , size_t );
-bool ndarray_object_is_array_like(mp_obj_t );
-void fill_array_iterable(mp_float_t *, mp_obj_t );
-size_t *ndarray_shape_vector(size_t , size_t , size_t , size_t );
-
-void ndarray_print(const mp_print_t *, mp_obj_t , mp_print_kind_t );
-
-#if ULAB_HAS_PRINTOPTIONS
-mp_obj_t ndarray_set_printoptions(size_t , const mp_obj_t *, mp_map_t *);
-MP_DECLARE_CONST_FUN_OBJ_KW(ndarray_set_printoptions_obj);
-
-mp_obj_t ndarray_get_printoptions(void);
-MP_DECLARE_CONST_FUN_OBJ_0(ndarray_get_printoptions_obj);
-#endif
-
-void ndarray_assign_elements(ndarray_obj_t *, mp_obj_t , uint8_t , size_t *);
-size_t *ndarray_contract_shape(ndarray_obj_t *, uint8_t );
-int32_t *ndarray_contract_strides(ndarray_obj_t *, uint8_t );
-
-ndarray_obj_t *ndarray_new_dense_ndarray(uint8_t , size_t *, uint8_t );
-ndarray_obj_t *ndarray_new_ndarray_from_tuple(mp_obj_tuple_t *, uint8_t );
-ndarray_obj_t *ndarray_new_ndarray(uint8_t , size_t *, int32_t *, uint8_t );
-ndarray_obj_t *ndarray_new_linear_array(size_t , uint8_t );
-ndarray_obj_t *ndarray_new_view(ndarray_obj_t *, uint8_t , size_t *, int32_t *, int32_t );
-bool ndarray_is_dense(ndarray_obj_t *);
-ndarray_obj_t *ndarray_copy_view(ndarray_obj_t *);
-void ndarray_copy_array(ndarray_obj_t *, ndarray_obj_t *);
-
-MP_DECLARE_CONST_FUN_OBJ_KW(ndarray_array_constructor_obj);
-mp_obj_t ndarray_make_new(const mp_obj_type_t *, size_t , size_t , const mp_obj_t *);
-mp_obj_t ndarray_subscr(mp_obj_t , mp_obj_t , mp_obj_t );
-mp_obj_t ndarray_getiter(mp_obj_t , mp_obj_iter_buf_t *);
-bool ndarray_can_broadcast(ndarray_obj_t *, ndarray_obj_t *, uint8_t *, size_t *, int32_t *, int32_t *);
-bool ndarray_can_broadcast_inplace(ndarray_obj_t *, ndarray_obj_t *, int32_t *);
-mp_obj_t ndarray_binary_op(mp_binary_op_t , mp_obj_t , mp_obj_t );
-mp_obj_t ndarray_unary_op(mp_unary_op_t , mp_obj_t );
-
-size_t *ndarray_new_coords(uint8_t );
-void ndarray_rewind_array(uint8_t , uint8_t *, size_t *, int32_t *, size_t *);
-
-// various ndarray methods
-#if NDARRAY_HAS_BYTESWAP
-mp_obj_t ndarray_byteswap(size_t , const mp_obj_t *, mp_map_t *);
-MP_DECLARE_CONST_FUN_OBJ_KW(ndarray_byteswap_obj);
-#endif
-
-#if NDARRAY_HAS_COPY
-mp_obj_t ndarray_copy(mp_obj_t );
-MP_DECLARE_CONST_FUN_OBJ_1(ndarray_copy_obj);
-#endif
-
-#if NDARRAY_HAS_FLATTEN
-mp_obj_t ndarray_flatten(size_t , const mp_obj_t *, mp_map_t *);
-MP_DECLARE_CONST_FUN_OBJ_KW(ndarray_flatten_obj);
-#endif
-
-mp_obj_t ndarray_dtype(mp_obj_t );
-mp_obj_t ndarray_itemsize(mp_obj_t );
-mp_obj_t ndarray_size(mp_obj_t );
-mp_obj_t ndarray_shape(mp_obj_t );
-mp_obj_t ndarray_strides(mp_obj_t );
-
-#if NDARRAY_HAS_RESHAPE
-mp_obj_t ndarray_reshape_core(mp_obj_t , mp_obj_t , bool );
-mp_obj_t ndarray_reshape(mp_obj_t , mp_obj_t );
-MP_DECLARE_CONST_FUN_OBJ_2(ndarray_reshape_obj);
-#endif
-
-#if NDARRAY_HAS_TOBYTES
-mp_obj_t ndarray_tobytes(mp_obj_t );
-MP_DECLARE_CONST_FUN_OBJ_1(ndarray_tobytes_obj);
-#endif
-
-#if NDARRAY_HAS_TRANSPOSE
-mp_obj_t ndarray_transpose(mp_obj_t );
-MP_DECLARE_CONST_FUN_OBJ_1(ndarray_transpose_obj);
-#endif
-
-#if ULAB_NUMPY_HAS_NDINFO
-mp_obj_t ndarray_info(mp_obj_t );
-MP_DECLARE_CONST_FUN_OBJ_1(ndarray_info_obj);
-#endif
-
-mp_int_t ndarray_get_buffer(mp_obj_t , mp_buffer_info_t *, mp_uint_t );
-//void ndarray_attributes(mp_obj_t , qstr , mp_obj_t *);
-
-ndarray_obj_t *ndarray_from_mp_obj(mp_obj_t , uint8_t );
-
-
-#define BOOLEAN_ASSIGNMENT_LOOP(type_left, type_right, ndarray, iarray, istride, varray, vstride)\
-    type_left *array = (type_left *)(ndarray)->array;\
-    for(size_t i=0; i < (ndarray)->len; i++) {\
-        if(*(iarray)) {\
-            *array = (type_left)(*((type_right *)(varray)));\
-        }\
-        array += (ndarray)->strides[ULAB_MAX_DIMS - 1] / (ndarray)->itemsize;\
-        (iarray) += (istride);\
-        (varray) += (vstride);\
-    } while(0)
-
-#if ULAB_HAS_FUNCTION_ITERATOR
-#define BINARY_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    type_out *array = (type_out *)(results)->array;\
-    size_t *lcoords = ndarray_new_coords((results)->ndim);\
-    size_t *rcoords = ndarray_new_coords((results)->ndim);\
-    for(size_t i=0; i < (results)->len/(results)->shape[ULAB_MAX_DIMS -1]; i++) {\
-        size_t l = 0;\
-        do {\
-            *array++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        ndarray_rewind_array((results)->ndim, (larray), (results)->shape, (lstrides), lcoords);\
-        ndarray_rewind_array((results)->ndim, (rarray), (results)->shape, (rstrides), rcoords);\
-    } while(0)
-
-#define INPLACE_LOOP(results, type_left, type_right, larray, rarray, rstrides, OPERATOR)\
-    size_t *lcoords = ndarray_new_coords((results)->ndim);\
-    size_t *rcoords = ndarray_new_coords((results)->ndim);\
-    for(size_t i=0; i < (results)->len/(results)->shape[ULAB_MAX_DIMS -1]; i++) {\
-        size_t l = 0;\
-        do {\
-            *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-            (larray) += (results)->strides[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        ndarray_rewind_array((results)->ndim, (larray), (results)->shape, (results)->strides, lcoords);\
-        ndarray_rewind_array((results)->ndim, (rarray), (results)->shape, (rstrides), rcoords);\
-    } while(0)
-
-#define EQUALITY_LOOP(results, array, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    size_t *lcoords = ndarray_new_coords((results)->ndim);\
-    size_t *rcoords = ndarray_new_coords((results)->ndim);\
-    for(size_t i=0; i < (results)->len/(results)->shape[ULAB_MAX_DIMS -1]; i++) {\
-        size_t l = 0;\
-        do {\
-            *(array)++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray)) ? 1 : 0;\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        ndarray_rewind_array((results)->ndim, (larray), (results)->shape, (lstrides), lcoords);\
-        ndarray_rewind_array((results)->ndim, (rarray), (results)->shape, (rstrides), rcoords);\
-    } while(0)
-
-#define POWER_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides)\
-    type_out *array = (type_out *)(results)->array;\
-    size_t *lcoords = ndarray_new_coords((results)->ndim);\
-    size_t *rcoords = ndarray_new_coords((results)->ndim);\
-    for(size_t i=0; i < (results)->len/(results)->shape[ULAB_MAX_DIMS -1]; i++) {\
-        size_t l = 0;\
-        do {\
-            *array++ = MICROPY_FLOAT_C_FUN(pow)(*((type_left *)(larray)), *((type_right *)(rarray)));\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        ndarray_rewind_array((results)->ndim, (larray), (results)->shape, (lstrides), lcoords);\
-        ndarray_rewind_array((results)->ndim, (rarray), (results)->shape, (rstrides), rcoords);\
-    } while(0)
-
-#else
-
-#if ULAB_MAX_DIMS == 1
-#define BINARY_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    type_out *array = (type_out *)results->array;\
-    size_t l = 0;\
-    do {\
-        *array++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-        l++;\
-    } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-
-#define INPLACE_LOOP(results, type_left, type_right, larray, rarray, rstrides, OPERATOR)\
-    size_t l = 0;\
-    do {\
-        *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-        (larray) += (results)->strides[ULAB_MAX_DIMS - 1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-        l++;\
-    } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-
-#define EQUALITY_LOOP(results, array, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    size_t l = 0;\
-    do {\
-        *(array)++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray)) ? 1 : 0;\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-        l++;\
-    } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-
-#define POWER_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides)\
-    type_out *array = (type_out *)results->array;\
-    size_t l = 0;\
-    do {\
-        *array++ = MICROPY_FLOAT_C_FUN(pow)(*((type_left *)(larray)), *((type_right *)(rarray)));\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-        l++;\
-    } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-
-#endif /* ULAB_MAX_DIMS == 1 */
-
-#if ULAB_MAX_DIMS == 2
-#define BINARY_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    type_out *array = (type_out *)(results)->array;\
-    size_t k = 0;\
-    do {\
-        size_t l = 0;\
-        do {\
-            *array++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-        k++;\
-    } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-
-#define INPLACE_LOOP(results, type_left, type_right, larray, rarray, rstrides, OPERATOR)\
-    size_t k = 0;\
-    do {\
-        size_t l = 0;\
-        do {\
-            *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-            (larray) += (results)->strides[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        (larray) -= (results)->strides[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (larray) += (results)->strides[ULAB_MAX_DIMS - 2];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-        k++;\
-    } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-
-#define EQUALITY_LOOP(results, array, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    size_t k = 0;\
-    do {\
-        size_t l = 0;\
-        do {\
-            *(array)++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray)) ? 1 : 0;\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-        k++;\
-    } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-
-#define POWER_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides)\
-    type_out *array = (type_out *)(results)->array;\
-    size_t k = 0;\
-    do {\
-        size_t l = 0;\
-        do {\
-            *array++ = MICROPY_FLOAT_C_FUN(pow)(*((type_left *)(larray)), *((type_right *)(rarray)));\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-        k++;\
-    } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-
-#endif /* ULAB_MAX_DIMS == 2 */
-
-#if ULAB_MAX_DIMS == 3
-#define BINARY_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    type_out *array = (type_out *)results->array;\
-    size_t j = 0;\
-    do {\
-        size_t k = 0;\
-        do {\
-            size_t l = 0;\
-            do {\
-                *array++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                l++;\
-            } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-            k++;\
-        } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-        j++;\
-    } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-
-#define INPLACE_LOOP(results, type_left, type_right, larray, rarray, rstrides, OPERATOR)\
-    size_t j = 0;\
-    do {\
-        size_t k = 0;\
-        do {\
-            size_t l = 0;\
-            do {\
-                *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-                (larray) += (results)->strides[ULAB_MAX_DIMS - 1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                l++;\
-            } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-            (larray) -= (results)->strides[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (larray) += (results)->strides[ULAB_MAX_DIMS - 2];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-            k++;\
-        } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-        (larray) -= (results)->strides[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (larray) += (results)->strides[ULAB_MAX_DIMS - 3];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-        j++;\
-    } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-
-#define EQUALITY_LOOP(results, array, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    size_t j = 0;\
-    do {\
-        size_t k = 0;\
-        do {\
-            size_t l = 0;\
-            do {\
-                *(array)++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray)) ? 1 : 0;\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                l++;\
-            } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-            k++;\
-        } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-        j++;\
-    } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-
-#define POWER_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides)\
-    type_out *array = (type_out *)results->array;\
-    size_t j = 0;\
-    do {\
-        size_t k = 0;\
-        do {\
-            size_t l = 0;\
-            do {\
-                *array++ = MICROPY_FLOAT_C_FUN(pow)(*((type_left *)(larray)), *((type_right *)(rarray)));\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                l++;\
-            } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-            k++;\
-        } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-        j++;\
-    } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-
-#endif /* ULAB_MAX_DIMS == 3 */
-
-#if ULAB_MAX_DIMS == 4
-#define BINARY_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    type_out *array = (type_out *)results->array;\
-    size_t i = 0;\
-    do {\
-        size_t j = 0;\
-        do {\
-            size_t k = 0;\
-            do {\
-                size_t l = 0;\
-                do {\
-                    *array++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-                    (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                    (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                    l++;\
-                } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-                (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-                (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-                k++;\
-            } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-            j++;\
-        } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 4];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 4];\
-        i++;\
-    } while(i < (results)->shape[ULAB_MAX_DIMS - 4]);\
-
-#define INPLACE_LOOP(results, type_left, type_right, larray, rarray, rstrides, OPERATOR)\
-    size_t i = 0;\
-    do {\
-        size_t j = 0;\
-        do {\
-            size_t k = 0;\
-            do {\
-                size_t l = 0;\
-                do {\
-                    *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
-                    (larray) += (results)->strides[ULAB_MAX_DIMS - 1];\
-                    (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                    l++;\
-                } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-                (larray) -= (results)->strides[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (larray) += (results)->strides[ULAB_MAX_DIMS - 2];\
-                (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-                k++;\
-            } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-            (larray) -= (results)->strides[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (larray) += (results)->strides[ULAB_MAX_DIMS - 3];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-            j++;\
-        } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-        (larray) -= (results)->strides[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (larray) += (results)->strides[ULAB_MAX_DIMS - 4];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 4];\
-        i++;\
-    } while(i < (results)->shape[ULAB_MAX_DIMS - 4]);\
-
-#define EQUALITY_LOOP(results, array, type_left, type_right, larray, lstrides, rarray, rstrides, OPERATOR)\
-    size_t i = 0;\
-    do {\
-        size_t j = 0;\
-        do {\
-            size_t k = 0;\
-            do {\
-                size_t l = 0;\
-                do {\
-                    *(array)++ = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray)) ? 1 : 0;\
-                    (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                    (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                    l++;\
-                } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-                (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-                (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-                k++;\
-            } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-            j++;\
-        } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 4];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 4];\
-        i++;\
-    } while(i < (results)->shape[ULAB_MAX_DIMS - 4]);\
-
-#define POWER_LOOP(results, type_out, type_left, type_right, larray, lstrides, rarray, rstrides)\
-    type_out *array = (type_out *)results->array;\
-    size_t i = 0;\
-    do {\
-        size_t j = 0;\
-        do {\
-            size_t k = 0;\
-            do {\
-                size_t l = 0;\
-                do {\
-                    *array++ = MICROPY_FLOAT_C_FUN(pow)(*((type_left *)(larray)), *((type_right *)(rarray)));\
-                    (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                    (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                    l++;\
-                } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-                (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-                (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-                k++;\
-            } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * (results)->shape[ULAB_MAX_DIMS-2];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-            j++;\
-        } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 4];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 4];\
-        i++;\
-    } while(i < (results)->shape[ULAB_MAX_DIMS - 4]);\
-
-#endif /* ULAB_MAX_DIMS == 4 */
-#endif /* ULAB_HAS_FUNCTION_ITERATOR */
-
-
-#if ULAB_MAX_DIMS == 1
-#define ASSIGNMENT_LOOP(results, type_left, type_right, lstrides, rarray, rstrides)\
-    type_left *larray = (type_left *)(results)->array;\
-    size_t l = 0;\
-    do {\
-        *larray = (type_left)(*((type_right *)(rarray)));\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-        l++;\
-    } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-
-#endif /* ULAB_MAX_DIMS == 1 */
-
-#if ULAB_MAX_DIMS == 2
-#define ASSIGNMENT_LOOP(results, type_left, type_right, lstrides, rarray, rstrides)\
-    type_left *larray = (type_left *)(results)->array;\
-    size_t k = 0;\
-    do {\
-        size_t l = 0;\
-        do {\
-            *larray = (type_left)(*((type_right *)(rarray)));\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-            l++;\
-        } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-        k++;\
-    } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-
-#endif /* ULAB_MAX_DIMS == 2 */
-
-#if ULAB_MAX_DIMS == 3
-#define ASSIGNMENT_LOOP(results, type_left, type_right, lstrides, rarray, rstrides)\
-    type_left *larray = (type_left *)(results)->array;\
-    size_t j = 0;\
-    do {\
-        size_t k = 0;\
-        do {\
-            size_t l = 0;\
-            do {\
-                *larray = (type_left)(*((type_right *)(rarray)));\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                l++;\
-            } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-            k++;\
-        } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-        j++;\
-    } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-
-#endif /* ULAB_MAX_DIMS == 3 */
-
-#if ULAB_MAX_DIMS == 4
-#define ASSIGNMENT_LOOP(results, type_left, type_right, lstrides, rarray, rstrides)\
-    type_left *larray = (type_left *)(results)->array;\
-    size_t i = 0;\
-    do {\
-        size_t j = 0;\
-        do {\
-            size_t k = 0;\
-            do {\
-                size_t l = 0;\
-                do {\
-                    *larray = (type_left)(*((type_right *)(rarray)));\
-                    (larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
-                    (rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
-                    l++;\
-                } while(l < (results)->shape[ULAB_MAX_DIMS - 1]);\
-                (larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
-                (rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * (results)->shape[ULAB_MAX_DIMS-1];\
-                (rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
-                k++;\
-            } while(k < (results)->shape[ULAB_MAX_DIMS - 2]);\
-            (larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
-            (larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
-            (rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
-            (rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
-            j++;\
-        } while(j < (results)->shape[ULAB_MAX_DIMS - 3]);\
-        (larray) -= (lstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (larray) += (lstrides)[ULAB_MAX_DIMS - 4];\
-        (rarray) -= (rstrides)[ULAB_MAX_DIMS - 3] * (results)->shape[ULAB_MAX_DIMS-3];\
-        (rarray) += (rstrides)[ULAB_MAX_DIMS - 4];\
-        i++;\
-    } while(i < (results)->shape[ULAB_MAX_DIMS - 4]);\
-
-#endif /* ULAB_MAX_DIMS == 4 */
-
-#endif
diff --git a/apps/KhiCAS/src/micropython-1.12/ulab/scipy/signal/Makefile.am~ b/apps/KhiCAS/src/micropython-1.12/ulab/scipy/signal/Makefile.am~
deleted file mode 100644
index 47634f68c..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ulab/scipy/signal/Makefile.am~
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = *
-x
\ No newline at end of file
diff --git a/apps/KhiCAS/src/micropython-1.12/ulab/ulab.c~ b/apps/KhiCAS/src/micropython-1.12/ulab/ulab.c~
deleted file mode 100644
index 2b9ebd73f..000000000
--- a/apps/KhiCAS/src/micropython-1.12/ulab/ulab.c~
+++ /dev/null
@@ -1,177 +0,0 @@
-
-/*
- * This file is part of the micropython-ulab project,
- *
- * https://github.com/v923z/micropython-ulab
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019-2021 Zoltán Vörös
- *               2020 Jeff Epler for Adafruit Industries
-*/
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "py/runtime.h"
-#include "py/binary.h"
-#include "py/obj.h"
-#include "py/objarray.h"
-
-#include "ulab.h"
-#include "ulab_create.h"
-#include "ndarray.h"
-#include "ndarray_properties.h"
-#include "numpy/ndarray/ndarray_iter.h"
-
-#include "numpy/numpy.h"
-#include "scipy/scipy.h"
-// TODO: we should get rid of this; array.sort depends on it
-#include "numpy/numerical.h"
-
-#include "user/user.h"
-#include "utils/utils.h"
-
-#define ULAB_VERSION 3.3.8
-#define xstr(s) str(s)
-#define str(s) #s
-#define ULAB_VERSION_STRING xstr(ULAB_VERSION) xstr(-) xstr(ULAB_MAX_DIMS) xstr(D)
-
-STATIC MP_DEFINE_STR_OBJ(ulab_version_obj, ULAB_VERSION_STRING);
-
-
-STATIC const mp_rom_map_elem_t ulab_ndarray_locals_dict_table[] = {
-    #if ULAB_MAX_DIMS > 1
-        #if NDARRAY_HAS_RESHAPE
-            { MP_ROM_QSTR(MP_QSTR_reshape), MP_ROM_PTR(&ndarray_reshape_obj) },
-        #endif
-        #if NDARRAY_HAS_TRANSPOSE
-            { MP_ROM_QSTR(MP_QSTR_transpose), MP_ROM_PTR(&ndarray_transpose_obj) },
-        #endif
-    #endif
-    #if NDARRAY_HAS_BYTESWAP
-        { MP_ROM_QSTR(MP_QSTR_byteswap), MP_ROM_PTR(&ndarray_byteswap_obj) },
-    #endif
-    #if NDARRAY_HAS_COPY
-        { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&ndarray_copy_obj) },
-    #endif
-    #if NDARRAY_HAS_FLATTEN
-        { MP_ROM_QSTR(MP_QSTR_flatten), MP_ROM_PTR(&ndarray_flatten_obj) },
-    #endif
-    #if NDARRAY_HAS_TOBYTES
-        { MP_ROM_QSTR(MP_QSTR_tobytes), MP_ROM_PTR(&ndarray_tobytes_obj) },
-    #endif
-    #if NDARRAY_HAS_SORT
-        { MP_ROM_QSTR(MP_QSTR_sort), MP_ROM_PTR(&numerical_sort_inplace_obj) },
-    #endif
-    #ifdef CIRCUITPY
-        #if NDARRAY_HAS_DTYPE
-            { MP_ROM_QSTR(MP_QSTR_dtype), MP_ROM_PTR(&ndarray_dtype_obj) },
-        #endif
-        #if NDARRAY_HAS_FLATITER
-            { MP_ROM_QSTR(MP_QSTR_flat), MP_ROM_PTR(&ndarray_flat_obj) },
-        #endif
-        #if NDARRAY_HAS_ITEMSIZE
-            { MP_ROM_QSTR(MP_QSTR_itemsize), MP_ROM_PTR(&ndarray_itemsize_obj) },
-        #endif
-        #if NDARRAY_HAS_SHAPE
-            { MP_ROM_QSTR(MP_QSTR_shape), MP_ROM_PTR(&ndarray_shape_obj) },
-        #endif
-        #if NDARRAY_HAS_SIZE
-            { MP_ROM_QSTR(MP_QSTR_size), MP_ROM_PTR(&ndarray_size_obj) },
-        #endif
-        #if NDARRAY_HAS_STRIDES
-            { MP_ROM_QSTR(MP_QSTR_strides), MP_ROM_PTR(&ndarray_strides_obj) },
-        #endif
-    #endif /* CIRCUITPY */
-};
-
-STATIC MP_DEFINE_CONST_DICT(ulab_ndarray_locals_dict, ulab_ndarray_locals_dict_table);
-
-const mp_obj_type_t ulab_ndarray_type = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_EXTENDED
-    #if defined(MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE) && defined(MP_TYPE_FLAG_EQ_HAS_NEQ_TEST)
-        | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST,
-    #endif
-    .name = MP_QSTR_ndarray,
-    .print = ndarray_print,
-    .make_new = ndarray_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ulab_ndarray_locals_dict,
-    MP_TYPE_EXTENDED_FIELDS(
-    #if NDARRAY_IS_SLICEABLE
-    .subscr = ndarray_subscr,
-    #endif
-    #if NDARRAY_IS_ITERABLE
-    .getiter = ndarray_getiter,
-    #endif
-    #if NDARRAY_HAS_UNARY_OPS
-    .unary_op = ndarray_unary_op,
-    #endif
-    #if NDARRAY_HAS_BINARY_OPS
-    .binary_op = ndarray_binary_op,
-    #endif
-    #ifndef CIRCUITPY
-    .attr = ndarray_properties_attr,
-    #endif
-    .buffer_p = { .get_buffer = ndarray_get_buffer, },
-    )
-};
-
-#if ULAB_HAS_DTYPE_OBJECT
-const mp_obj_type_t ulab_dtype_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_dtype,
-    .print = ndarray_dtype_print,
-    .make_new = ndarray_dtype_make_new,
-};
-#endif
-
-#if NDARRAY_HAS_FLATITER
-const mp_obj_type_t ndarray_flatiter_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_flatiter,
-    MP_TYPE_EXTENDED_FIELDS(
-    .getiter = ndarray_get_flatiterator,
-    )
-};
-#endif
-
-STATIC const mp_map_elem_t ulab_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_ulab) },
-    { MP_ROM_QSTR(MP_QSTR___version__), MP_ROM_PTR(&ulab_version_obj) },
-    #if ULAB_HAS_DTYPE_OBJECT
-        { MP_OBJ_NEW_QSTR(MP_QSTR_dtype), (mp_obj_t)&ulab_dtype_type },
-    #else
-        #if NDARRAY_HAS_DTYPE
-        { MP_OBJ_NEW_QSTR(MP_QSTR_dtype), (mp_obj_t)&ndarray_dtype_obj },
-        #endif /* NDARRAY_HAS_DTYPE */
-    #endif /* ULAB_HAS_DTYPE_OBJECT */
-        { MP_ROM_QSTR(MP_QSTR_numpy), MP_ROM_PTR(&ulab_numpy_module) },
-    #if ULAB_HAS_SCIPY
-        { MP_ROM_QSTR(MP_QSTR_scipy), MP_ROM_PTR(&ulab_scipy_module) },
-    #endif
-    #if ULAB_HAS_USER_MODULE
-        { MP_ROM_QSTR(MP_QSTR_user), MP_ROM_PTR(&ulab_user_module) },
-    #endif
-    #if ULAB_HAS_UTILS_MODULE
-        { MP_ROM_QSTR(MP_QSTR_utils), MP_ROM_PTR(&ulab_utils_module) },
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT (
-    mp_module_ulab_globals,
-    ulab_globals_table
-);
-
-#ifdef OPENMV
-const struct _mp_obj_module_t ulab_user_cmodule = {
-#else
-const mp_obj_module_t ulab_user_cmodule = {
-#endif
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_ulab_globals,
-};
-
-MP_REGISTER_MODULE(MP_QSTR_ulab, ulab_user_cmodule, MODULE_ULAB_ENABLED);
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/Makefile.simu~ b/apps/KhiCAS/src/micropython-1.12/xcas/Makefile.simu~
deleted file mode 100644
index a4949115e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/Makefile.simu~
+++ /dev/null
@@ -1,55 +0,0 @@
-include ../py/mkenv.mk
--include mpconfigport.mk
-
-PREFIX=arm-none-eabi-
-CC = $(PREFIX)gcc
-CXX = $(PREFIX)g++
-LD = $(PREFIX)ld 
-
-# define main target
-PROG = micropython
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# OS name, for simple autoconfig
-UNAME_S := $(shell uname -s)
-
-# Disable stripping of the main executable, relocation info is needed by genzehn
-NOSTRIP := 1
-# DEBUG := 1
-
-# include py core make definitions
-include ../py/py.mk
-
-INC =  -I.
-INC += -I..
-INC += -I../py
-INC += -I$(BUILD)
-
-# Debugging/Optimization
-ifdef DEBUG
-COPT = -O0 -g
-else
-COPT = -Ofast -g #-fomit-frame-pointer -flto
-endif
-
-# compiler settings
-CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format
-CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-CFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard  -mcpu=cortex-m7 -mfpu=fpv5-sp-d16  -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive
-
-
-LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) 
-
-# source files
-SRC_C = $(shell find . -name \*.c)
-
-SRC_QSTR += $(SRC_C)
-
-OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-
-include ../py/mkrules.mk
-
-all: $(PROG)
-
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/Makefile~ b/apps/KhiCAS/src/micropython-1.12/xcas/Makefile~
deleted file mode 100644
index a4949115e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/Makefile~
+++ /dev/null
@@ -1,55 +0,0 @@
-include ../py/mkenv.mk
--include mpconfigport.mk
-
-PREFIX=arm-none-eabi-
-CC = $(PREFIX)gcc
-CXX = $(PREFIX)g++
-LD = $(PREFIX)ld 
-
-# define main target
-PROG = micropython
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# OS name, for simple autoconfig
-UNAME_S := $(shell uname -s)
-
-# Disable stripping of the main executable, relocation info is needed by genzehn
-NOSTRIP := 1
-# DEBUG := 1
-
-# include py core make definitions
-include ../py/py.mk
-
-INC =  -I.
-INC += -I..
-INC += -I../py
-INC += -I$(BUILD)
-
-# Debugging/Optimization
-ifdef DEBUG
-COPT = -O0 -g
-else
-COPT = -Ofast -g #-fomit-frame-pointer -flto
-endif
-
-# compiler settings
-CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format
-CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-CFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard  -mcpu=cortex-m7 -mfpu=fpv5-sp-d16  -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive
-
-
-LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) 
-
-# source files
-SRC_C = $(shell find . -name \*.c)
-
-SRC_QSTR += $(SRC_C)
-
-OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-
-include ../py/mkrules.mk
-
-all: $(PROG)
-
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/changes~ b/apps/KhiCAS/src/micropython-1.12/xcas/changes~
deleted file mode 100644
index 0809a6c49..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/changes~
+++ /dev/null
@@ -1,103 +0,0 @@
-cp mpconfig.h ../py/mpconfig.h 
-micropylib.tgz + ajouter dans le repertoire py de l'information sur les lignes
-
-pour gerer les erreurs de parse
-parse.h: au debut extern int parser_errorline,parser_errorcol;
-parse.c: au debut int parser_errorline=0,parser_errorcol=0; (a mettre aussi avant un appel de mp_parse, dans main.c
-ligne 1056/7 mp_obj_exception_add_traceback(exc, lex->source_name, lex->tok_line, MP_QSTR_NULL); parser_errorline=lex->tok_line; parser_errorcol=lex->tok_column;
-
-renommer urandom en random dans extmod/modurandom.c py/objmodule.c
-
-import des fichiers: ajouter .tns dans py/buildimport.c apres .py
-
-pour apply dans py/objfun.c/.h declarer et enlever STATIC
-mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-
-modification dans py/objlist.c pour indiciage par tuple
-...
-STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-  if (mp_obj_get_type(index)==&mp_type_tuple){
-    size_t len;
-    mp_obj_t * elem;
-    mp_obj_get_array(index, &len, &elem);
-    if (len==0)
-      return self_in;
-    mp_obj_t curindex=elem[0];
-    if (len>1){
-      mp_obj_t cur=list_subscr(self_in,curindex,MP_OBJ_SENTINEL);
-      mp_obj_t r=mp_obj_new_tuple(len-1, elem+1);
-      return list_subscr(cur,r,value);
-    }
-    index=curindex;
-  }
-    if (value == MP_OBJ_NULL) {
-...
-
-meme chose dans py/objtuple.c
-...
-mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-  if (mp_obj_get_type(index)==&mp_type_tuple){
-    size_t len;
-    mp_obj_t * elem;
-    mp_obj_get_array(index, &len, &elem);
-    if (len==0)
-      return self_in;
-    mp_obj_t curindex=elem[0];
-    if (len>1){
-      mp_obj_t cur=mp_obj_tuple_subscr(self_in,curindex,MP_OBJ_SENTINEL);
-      mp_obj_t r=mp_obj_new_tuple(len-1, elem+1);
-      return mp_obj_tuple_subscr(cur,r,value);
-    }
-    index=curindex;
-  }
-    if (value == MP_OBJ_SENTINEL) {
-...
-
-modification dans py/modbuiltins.c pour round
-STATIC mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) {
-...
-#if MICROPY_PY_BUILTINS_FLOAT
-    mp_int_t num_dig = 0;
-    if (n_args > 1) {
-        num_dig = mp_obj_get_int(args[1]);
-        mp_float_t val = mp_obj_get_float(o_in);
-        mp_float_t mult = 1;
-	if (num_dig>=0){
-	  for (int i=0;i<num_dig;++i)
-	    mult*=10;
-	}
-	else
-	  mult = MICROPY_FLOAT_C_FUN(pow)(10, num_dig);	  
-        // TODO may lead to overflow
-        mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val * mult) / mult;
-        return mp_obj_new_float(rounded);
-    }
-    mp_float_t val = mp_obj_get_float(o_in);
-    if (val>-2147483648.0 && val<2147483648.0){
-      int v=val;
-      return mp_obj_new_int(v);
-    }
-    mp_float_t rounded = MICROPY_FLOAT_C_FUN(nearbyint)(val);
-    return mp_obj_new_int_from_float(rounded);
-#else
-...
-
-./mklib:
-make, attendre l'erreur de link
-make V=1 >& log
-ouvrir log et modifier la ligne de link et en faire une lib avec
-arm-none-eabi-ar cru libmicropy fichiers_objs
-(au lieu de nspire-gcc micropython fichiers_objs)
-copier libmicropy.a dans un repertoire lib de ndless-sdk
-
-Fonctions exportees
-int do_file(const char *file);
-char * micropy_init();
-int micropy_eval(const char * line);
-void  mp_deinit();
-Initialisation de MicroPython 
-  char * heap=micropy_init();
-Sortie:
-  mp_deinit(); free(heap);
-
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/file.c~ b/apps/KhiCAS/src/micropython-1.12/xcas/file.c~
deleted file mode 100644
index 9b2bf3b8e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/file.c~
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "py/nlr.h"
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/builtin.h"
-#include "py/mphal.h"
-#include "../unix/fdfile.h"
-
-#if MICROPY_PY_IO
-
-#ifdef _WIN32
-#define fsync _commit
-#endif
-
-#ifdef MICROPY_CPYTHON_COMPAT
-STATIC void check_fd_is_open(const mp_obj_fdfile_t *o) {
-    if (o->fd < 0) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "I/O operation on closed file"));
-    }
-}
-#else
-#define check_fd_is_open(o)
-#endif
-
-extern const mp_obj_type_t mp_type_fileio;
-extern const mp_obj_type_t mp_type_textio;
-
-STATIC void fdfile_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    (void)kind;
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "<io.%s %d>", mp_obj_get_type_str(self_in), self->fd);
-}
-
-STATIC mp_uint_t fdfile_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-    mp_int_t r = read(o->fd, buf, size);
-    if (r == -1) {
-        *errcode = errno;
-        return MP_STREAM_ERROR;
-    }
-    return r;
-}
-
-STATIC mp_uint_t fdfile_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-#if defined MICROPY_LIB || MICROPY_PY_OS_DUPTERM
-    if (o->fd <= STDERR_FILENO) {
-        mp_hal_stdout_tx_strn(buf, size);
-        return size;
-    }
-#endif
-    mp_int_t r = write(o->fd, buf, size);
-    while (r == -1 && errno == EINTR) {
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
-        }
-        r = write(o->fd, buf, size);
-    }
-    if (r == -1) {
-        *errcode = errno;
-        return MP_STREAM_ERROR;
-    }
-    return r;
-}
-
-STATIC mp_uint_t fdfile_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
-    mp_obj_fdfile_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
-    switch (request) {
-        case MP_STREAM_SEEK: {
-            struct mp_stream_seek_t *s = (struct mp_stream_seek_t*)arg;
-            off_t off = lseek(o->fd, s->offset, s->whence);
-            if (off == (off_t)-1) {
-                *errcode = errno;
-                return MP_STREAM_ERROR;
-            }
-            s->offset = off;
-            return 0;
-        }
-        case MP_STREAM_FLUSH:
-            return 0;
-        default:
-            *errcode = EINVAL;
-            return MP_STREAM_ERROR;
-    }
-}
-
-STATIC mp_obj_t fdfile_close(mp_obj_t self_in) {
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    close(self->fd);
-#ifdef MICROPY_CPYTHON_COMPAT
-    self->fd = -1;
-#endif
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fdfile_close_obj, fdfile_close);
-
-STATIC mp_obj_t fdfile___exit__(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    return fdfile_close(args[0]);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fdfile___exit___obj, 4, 4, fdfile___exit__);
-
-STATIC mp_obj_t fdfile_fileno(mp_obj_t self_in) {
-    mp_obj_fdfile_t *self = MP_OBJ_TO_PTR(self_in);
-    check_fd_is_open(self);
-    return MP_OBJ_NEW_SMALL_INT(self->fd);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(fdfile_fileno_obj, fdfile_fileno);
-
-// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
-// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
-STATIC const mp_arg_t file_open_args[] = {
-    { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-    { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
-    { MP_QSTR_buffering, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-    { MP_QSTR_encoding, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
-};
-#define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
-
-STATIC mp_obj_t fdfile_open(const mp_obj_type_t *type, mp_arg_val_t *args) {
-    mp_obj_fdfile_t *o = m_new_obj(mp_obj_fdfile_t);
-    const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
-
-    int mode_rw = 0, mode_x = 0;
-    while (*mode_s) {
-        switch (*mode_s++) {
-            case 'r':
-                mode_rw = O_RDONLY;
-                break;
-            case 'w':
-                mode_rw = O_WRONLY;
-                mode_x = O_CREAT | O_TRUNC;
-                break;
-            case 'a':
-                mode_rw = O_WRONLY;
-                mode_x = O_CREAT | O_APPEND;
-                break;
-            case '+':
-                mode_rw = O_RDWR;
-                break;
-            #if MICROPY_PY_IO_FILEIO
-            // If we don't have io.FileIO, then files are in text mode implicitly
-            case 'b':
-                type = &mp_type_fileio;
-                break;
-            case 't':
-                type = &mp_type_textio;
-                break;
-            #endif
-        }
-    }
-
-    o->base.type = type;
-
-    mp_obj_t fid = args[0].u_obj;
-
-    if (MP_OBJ_IS_SMALL_INT(fid)) {
-        o->fd = MP_OBJ_SMALL_INT_VALUE(fid);
-        return MP_OBJ_FROM_PTR(o);
-    }
-
-    const char *fname = mp_obj_str_get_str(fid);
-    int fd = open(fname, mode_x | mode_rw, 0644);
-    if (fd == -1) {
-        mp_raise_OSError(errno);
-    }
-    o->fd = fd;
-    return MP_OBJ_FROM_PTR(o);
-}
-
-STATIC mp_obj_t fdfile_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
-    mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
-    return fdfile_open(type, arg_vals);
-}
-
-STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_fileno), MP_ROM_PTR(&fdfile_fileno_obj) },
-    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) },
-    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) },
-    { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
-    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&fdfile_close_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&fdfile___exit___obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
-
-#if MICROPY_PY_IO_FILEIO
-STATIC const mp_stream_p_t fileio_stream_p = {
-    .read = fdfile_read,
-    .write = fdfile_write,
-    .ioctl = fdfile_ioctl,
-};
-
-const mp_obj_type_t mp_type_fileio = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = fdfile_print,
-    .make_new = fdfile_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
-};
-#endif
-
-STATIC const mp_stream_p_t textio_stream_p = {
-    .read = fdfile_read,
-    .write = fdfile_write,
-    .ioctl = fdfile_ioctl,
-    .is_text = true,
-};
-
-const mp_obj_type_t mp_type_textio = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIOWrapper,
-    .print = fdfile_print,
-    .make_new = fdfile_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &textio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
-};
-
-// Factory function for I/O stream classes
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    // TODO: analyze buffering args and instantiate appropriate type
-    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
-    mp_arg_parse_all(n_args, args, kwargs, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
-    return fdfile_open(&mp_type_textio, arg_vals);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
-const mp_obj_fdfile_t mp_sys_stdin_obj  = { .base = {&mp_type_textio}, .fd = STDIN_FILENO };
-const mp_obj_fdfile_t mp_sys_stdout_obj = { .base = {&mp_type_textio}, .fd = STDOUT_FILENO };
-const mp_obj_fdfile_t mp_sys_stderr_obj = { .base = {&mp_type_textio}, .fd = STDERR_FILENO };
-
-#endif // MICROPY_PY_IO
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/graphic.c~ b/apps/KhiCAS/src/micropython-1.12/xcas/graphic.c~
deleted file mode 100644
index b30f28a83..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/graphic.c~
+++ /dev/null
@@ -1,2848 +0,0 @@
-/* -*- mode:C -*- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <math.h>
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "gc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objfun.h"
-#include "objstr.h"
-#include "objint.h"
-#include "runtime.h"
-#include "mpz.h"
-#include "lexer.h"
-#include "parse.h"
-#include "compile.h"
-extern const struct _mp_obj_module_t mp_module_graphic;
-// basic
-#ifdef NUMWORKS
-void c_sprint_double(char * s,double d);
-void strcat_double(char * s,double d){
-  for (;*s;)
-    ++s;
-  c_sprint_double(s,d);
-}
-int numworks_get_pixel(int x,int y);
-inline int os_get_pixel(int x,int y){ return numworks_get_pixel(x,y);}
-#else
-int os_get_pixel(int x,int y);
-void sync_screen();
-#endif
-void c_set_pixel(int x,int y,int c); // c_ prefixed functions run freeze=true
-void c_fill_rect(int x,int y,int w,int h,int c);
-int os_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-int os_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string_small(int x,int y,int c,int bg,const char * s,bool fake);
-int c_draw_string_medium(int x,int y,int c,int bg,const char * s,bool fake);
-// more complex paths
-void c_draw_rectangle(int x,int y,int w,int h,int c);
-void c_draw_line(int x0,int y0,int x1,int y1,int c);
-void c_draw_circle(int xc,int yc,int r,int color,bool q1,bool q2,bool q3,bool q4);
-void c_draw_filled_circle(int xc,int yc,int r,int color,bool left,bool right);
-void c_draw_polygon(int * x,int *y ,int n,int color);
-void c_draw_filled_polygon(int * x,int *y, int n,int xmin,int xmax,int ymin,int ymax,int color);
-void c_draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2);
-void c_draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,bool segment);
-//const double M_PI=3.1415926535897932;
-#define LCD_WIDTH 320
-#define LCD_HEIGHT 222
-int select_item(const char ** ptr,const char * title,bool askfor1);
-
-#define mp_rgb(r,g,b) ((((r*32)/256)<<11) | (((g*64)/256)<<5) | (b*32/256))
-
-#ifndef M_PI
-#define M_PI (3.14159265358979323846)
-#endif
-
-void raisetypeerr(){
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Bad argument type"));
-}
-bool mp_int_float(mp_obj_t e,double * d){
-  *d=0;
-  if (mp_obj_is_float(e)){
-    *d=mp_obj_get_float(e);
-    return true;
-  }
-  if (MP_OBJ_IS_INT(e)){
-    *d=mp_obj_get_int(e);
-    return true;
-  }
-  return false;
-}
-
-const char * translate_point_type(const char * s){
-  if (strcmp("+",s)==0)
-    return "plus_point";
-  if (strcmp("*",s)==0)
-    return "star_point";
-  if (strcmp("x",s)==0)
-    return "point_croix";
-  if (strcmp("o",s)==0)
-    return "square_point";
-  return s;
-}
-
-int mp_int_float2color(mp_obj_t e){
-  if (mp_obj_is_float(e)){
-    double d=mp_obj_get_float(e);
-    if (d<=0) return 0;
-    if (d>=1) return 255;
-    int r=d*256;
-    return r;
-  }
-  int r=mp_obj_get_int(e);
-  if (r<=0) return 0;
-  if (r>255) return 255;
-  return r;
-}
-
-int mp_get_color(mp_obj_t tuple){
-  if (MP_OBJ_IS_SMALL_INT(tuple)) 
-    return MP_OBJ_SMALL_INT_VALUE(tuple) & 0xffffffff;
-  if (MP_OBJ_IS_STR(tuple)){
-    const char * col=mp_obj_str_get_str(tuple);
-    if (strcmp(col,"black")==0)
-      return 0;
-    if (strcmp(col,"white")==0)
-      return 0xffff;
-    if (strcmp(col,"blue")==0)
-      return 2079;
-    if (strcmp(col,"red")==0)
-      return 63488;
-    if (strcmp(col,"green")==0)
-      return 2016;
-    if (strcmp(col,"magenta")==0)
-      return 63519;
-    if (strcmp(col,"yellow")==0)
-      return 65504;
-    if (strcmp(col,"cyan")==0)
-      return 2047;
-    return -1;
-  }
-  size_t len;
-  mp_obj_t * elem;
-
-  mp_obj_get_array(tuple, &len, &elem);
-  if (len != 3) {
-    mp_raise_TypeError("color needs 3 components");
-  }
-  int r=mp_int_float2color(elem[0]);
-  int g=mp_int_float2color(elem[1]);
-  int b=mp_int_float2color(elem[2]);
-  return mp_rgb(r,g,b);
-}
-
-static mp_obj_t graphic_clear_screen(size_t n_args, const mp_obj_t *args){
-  int c=0xffff;
-  if (n_args==1) //  && MP_OBJ_IS_SMALL_INT(args[0]))
-    c=mp_get_color(args[0]); //MP_OBJ_SMALL_INT_VALUE(args[0]);
-  c_fill_rect(0,0,LCD_WIDTH,LCD_HEIGHT,c);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_clear_screen_obj, 0, 1, graphic_clear_screen);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_clear_obj, 0, 1, graphic_clear_screen);
-
-static mp_obj_t graphic_show_screen(){
-#ifndef NUMWORKS
-  sync_screen();
-#endif
-  return mp_const_none;
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(graphic_show_screen_obj, graphic_show_screen);
-static MP_DEFINE_CONST_FUN_OBJ_0(graphic_show_obj, graphic_show_screen);
-
-mp_obj_t mp_color_tuple(int c){
-  mp_obj_tuple_t * t = (mp_obj_tuple_t *)(MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL)));
-  c &= 0xffff;
-  int r=(c>>11)&0x1f,g=(c>>5)&0x3f,b=c&0x1f;
-  r *= 8; g*=4; b*=8;
-  t->items[0] = MP_OBJ_NEW_SMALL_INT(r);
-  t->items[1] = MP_OBJ_NEW_SMALL_INT(g);
-  t->items[2] = MP_OBJ_NEW_SMALL_INT(b);
-  return MP_OBJ_FROM_PTR(t);
-}  
-
-static mp_obj_t graphic_set_pixel(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]),color=0;
-  if (n_args==3)    
-    color = mp_get_color(args[2]);
-  c_set_pixel(x,y,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_set_pixel_obj, 2, 3, graphic_set_pixel);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_pixel_obj, 2, 3, graphic_set_pixel);
-
-static mp_obj_t graphic_draw_line(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_obj_get_int(args[4]);
-  c_draw_line(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_line_obj, 4, 5, graphic_draw_line);
-
-bool mp_array2inttab(mp_obj_t l,int ** x,size_t * n,size_t * m){
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  mp_obj_get_array(elem[0],m,&line);
-  if (*m==0)
-    return false;
-  int * ptr=(int *)malloc((*n)*(*m)*sizeof(int));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(*x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      *ptr=mp_obj_get_int(line[j]);
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-static mp_obj_t graphic_draw_polygon_(size_t n_args, const mp_obj_t *args,bool filled) {
-  int color=0;
-  int * tab=0;
-  size_t n=0,m=0;
-  if (!mp_array2inttab(args[0],&tab,&n,&m))
-      return mp_const_false;
-  if (m!=2){
-    free(tab);
-    return mp_const_false;
-  }
-  int x[n],y[n];
-  for (size_t i=0;i<n;++i){
-    x[i]=*tab;
-    ++tab;
-    y[i]=*tab;
-    ++tab;
-  }
-  if (n_args==2)    
-    color = mp_obj_get_int(args[1]);
-  if (filled)
-    c_draw_filled_polygon(x,y,n,0,LCD_WIDTH,0,LCD_HEIGHT,color);
-  else
-    c_draw_polygon(x,y,n,color);
-  return mp_const_none;
-}
-static mp_obj_t graphic_draw_polygon(size_t n_args, const mp_obj_t *args) {
-  return graphic_draw_polygon_(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_polygon_obj, 1, 2, graphic_draw_polygon);
-static mp_obj_t graphic_draw_filled_polygon(size_t n_args, const mp_obj_t *args) {
-  return graphic_draw_polygon_(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_polygon_obj, 1, 2, graphic_draw_filled_polygon);
-
-static mp_obj_t graphic_draw_rectangle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_get_color(args[4]);
-  c_draw_rectangle(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_rectangle_obj, 4, 5, graphic_draw_rectangle);
-
-static mp_obj_t graphic_fill_rect(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    x2 = mp_obj_get_int(args[2]), y2 = mp_obj_get_int(args[3]),
-    color=0;
-  if (n_args==5)    
-    color = mp_get_color(args[4]);
-  c_fill_rect(x1,y1,x2,y2,color);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_fill_rect_obj, 4, 5, graphic_fill_rect);
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_rectangle_obj, 4, 5, graphic_fill_rect);
-
-static mp_obj_t graphic_draw_circle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r = mp_obj_get_int(args[2]),
-    color=0;
-  if (n_args==4)    
-    color = mp_get_color(args[3]);
-  c_draw_circle(x1,y1,r,color,true,true,true,true);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_circle_obj, 3, 4, graphic_draw_circle);
-
-static mp_obj_t graphic_draw_filled_circle(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r = mp_obj_get_int(args[2]),
-    color=0;
-  if (n_args==4)    
-    color = mp_get_color(args[3]);
-  c_draw_filled_circle(x1,y1,r,color,true,true);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_circle_obj, 3, 4, graphic_draw_filled_circle);
-
-static mp_obj_t graphic_draw_arc(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r1 = mp_obj_get_int(args[2]), r2=mp_obj_get_int(args[3]),
-    t1=0,t2=360,
-    color=0;
-  if (n_args>=6){
-    t1 = mp_obj_get_int(args[4]), t2=mp_obj_get_int(args[5]);
-  }
-  if (n_args==7)    
-    color = mp_get_color(args[6]);
-  c_draw_arc(x1,y1,r1,r2,color,t1*M_PI/180,t2*M_PI/180);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_arc_obj, 4, 7, graphic_draw_arc);
-
-static mp_obj_t graphic_draw_filled_arc(size_t n_args, const mp_obj_t *args) {
-  int x1 = mp_obj_get_int(args[0]), y1 = mp_obj_get_int(args[1]),
-    r1 = mp_obj_get_int(args[2]), r2=mp_obj_get_int(args[3]),
-    t1=0,t2=360,
-    color=0;
-  if (n_args>=6){
-    t1 = mp_obj_get_int(args[4]), t2=mp_obj_get_int(args[5]);
-  }
-  if (n_args>=7)    
-    color = mp_get_color(args[6]);
-  c_draw_filled_arc(x1,y1,r1,r2,t1,t2,color,0,LCD_WIDTH,0,LCD_HEIGHT,n_args==8);
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_filled_arc_obj, 4, 8, graphic_draw_filled_arc);
-
-static mp_obj_t graphic_get_pixel(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]);
-  if (x<0 || x>=LCD_WIDTH || y<0 || y>LCD_HEIGHT)
-    return mp_const_none;
-  int c=os_get_pixel(x,y);
-  if (n_args==3) 
-    return MP_OBJ_NEW_SMALL_INT(c);
-  return mp_color_tuple(c);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_get_pixel_obj, 2, 3, graphic_get_pixel);
-
-static mp_obj_t graphic_draw_string(size_t n_args, const mp_obj_t *args) {
-  uint16_t x = mp_obj_get_int(args[0]), y = mp_obj_get_int(args[1]),c=0,bg=0xffff;
-  const char * text = mp_obj_str_get_str(args[2]);
-  if (n_args>=4)
-    c = mp_get_color(args[3]);
-  const char * font = 0;
-  if (n_args>=5)
-    font=mp_obj_str_get_str(args[4]);
-  if (font && strcmp(font,"small")==0)
-    c_draw_string_small(x,y,c,bg,text,false);
-  else {
-    if (font && strcmp(font,"large")==0)
-      c_draw_string(x,y,c,bg,text,false);
-    else
-      c_draw_string_medium(x,y,c,bg,text,false);
-  }
-  return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(graphic_draw_string_obj, 3, 5, graphic_draw_string);
-
-//
-static const mp_map_elem_t graphic_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_get_pixel), (mp_obj_t) &graphic_get_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cyan), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_magenta), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_yellow), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_blue), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,255)) },
-    { MP_ROM_QSTR(MP_QSTR_red), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_green), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_black), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_white), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_clear_screen), (mp_obj_t) &graphic_clear_screen_obj },
-	{ MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &graphic_clear_obj },
-	{ MP_ROM_QSTR(MP_QSTR_show_screen), (mp_obj_t) &graphic_show_screen_obj },
-	{ MP_ROM_QSTR(MP_QSTR_set_pixel), (mp_obj_t) &graphic_set_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_pixel), (mp_obj_t) &graphic_draw_pixel_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_line), (mp_obj_t) &graphic_draw_line_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_polygon), (mp_obj_t) &graphic_draw_polygon_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_filled_polygon), (mp_obj_t) &graphic_draw_filled_polygon_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_rectangle), (mp_obj_t) &graphic_draw_rectangle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_fill_rect), (mp_obj_t) &graphic_fill_rect_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_filled_rectangle), (mp_obj_t) &graphic_draw_filled_rectangle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_circle), (mp_obj_t) &graphic_draw_circle_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_filled_circle), (mp_obj_t) &graphic_draw_filled_circle_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_arc), (mp_obj_t) &graphic_draw_arc_obj },
- 	{ MP_ROM_QSTR(MP_QSTR_draw_filled_arc), (mp_obj_t) &graphic_draw_filled_arc_obj },
-	{ MP_ROM_QSTR(MP_QSTR_draw_string), (mp_obj_t) &graphic_draw_string_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(graphic_locals_dict, graphic_locals_dict_table);
-
-const mp_obj_type_t graphic_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_graphic,
-    .locals_dict = (mp_obj_t)&graphic_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_graphic_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__graphic) },
-	{ MP_ROM_QSTR(MP_QSTR_cyan), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_magenta), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,255)) },
-	{ MP_ROM_QSTR(MP_QSTR_yellow), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_blue), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,255)) },
-    { MP_ROM_QSTR(MP_QSTR_red), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_green), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,255,0)) },
-    { MP_ROM_QSTR(MP_QSTR_black), MP_OBJ_NEW_SMALL_INT(mp_rgb(0,0,0)) },
-    { MP_ROM_QSTR(MP_QSTR_white), MP_OBJ_NEW_SMALL_INT(mp_rgb(255,255,255)) },
-    { MP_ROM_QSTR(MP_QSTR_set_pixel), (mp_obj_t) &graphic_set_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_pixel), (mp_obj_t) &graphic_draw_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_line), (mp_obj_t) &graphic_draw_line_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_polygon), (mp_obj_t) &graphic_draw_polygon_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_polygon), (mp_obj_t) &graphic_draw_filled_polygon_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_rectangle), (mp_obj_t) &graphic_draw_rectangle_obj },
-    { MP_ROM_QSTR(MP_QSTR_fill_rect), (mp_obj_t) &graphic_fill_rect_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_rectangle), (mp_obj_t) &graphic_draw_filled_rectangle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_circle), (mp_obj_t) &graphic_draw_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_circle), (mp_obj_t) &graphic_draw_filled_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_arc), (mp_obj_t) &graphic_draw_arc_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_filled_arc), (mp_obj_t) &graphic_draw_filled_arc_obj },
-    { MP_ROM_QSTR(MP_QSTR_get_pixel), (mp_obj_t) &graphic_get_pixel_obj },
-    { MP_ROM_QSTR(MP_QSTR_draw_string), (mp_obj_t) &graphic_draw_string_obj },
-    { MP_ROM_QSTR(MP_QSTR_show_screen), (mp_obj_t) &graphic_show_screen_obj },
-    { MP_ROM_QSTR(MP_QSTR_clear_screen), (mp_obj_t) &graphic_clear_screen_obj },
-    { MP_ROM_QSTR(MP_QSTR_clear), (mp_obj_t) &graphic_clear_obj },
-    { MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &graphic_show_obj },
-
-};
-
-STATIC const mp_obj_dict_t mp_module_graphic_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_graphic_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_graphic_globals_table),
-        .table = (mp_map_elem_t*)mp_module_graphic_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_graphic = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_graphic_globals,
-};
-
-/* ********************************
- *                  CAS           *
- * ******************************** */
-int mp_token(const char * line){ // does not work, always mp_type_fun_bc
-  mp_obj_dict_t *dict = NULL;
-  dict = mp_locals_get();//mp_globals_get();//
-  mp_map_t * m=mp_obj_dict_get_map(dict);
-  mp_obj_t index=mp_obj_new_str(line,strlen(line));
-  mp_map_elem_t *ptr=mp_map_lookup(m, index, MP_MAP_LOOKUP) ;
-  // 0 or 3
-  if (ptr)
-    return 3;
-  else
-    return 0;
-}
-
-const char * const * mp_vars();
-const char * const * mp_vars(){
-  mp_obj_dict_t *dict = NULL;
-  dict = mp_locals_get();
-
-  mp_obj_t dir = mp_obj_new_list(0, NULL);
-  if (dict != NULL) {
-    for (size_t i = 0; i < dict->map.alloc; i++) {
-      if (MP_MAP_SLOT_IS_FILLED(&dict->map, i)) {
-	//const char * ch=mp_obj_str_get_str(dict->map.table[i].key);
-	mp_obj_t v=dict->map.table[i].value;
-	mp_obj_type_t * vt=mp_obj_get_type(v);
-	if (vt!=&mp_type_fun_builtin_var
-	    && vt!=&mp_type_fun_builtin_0
-	    && vt!=&mp_type_fun_builtin_1
-	    && vt!=&mp_type_fun_builtin_2
-	    && vt!=&mp_type_fun_builtin_3
-	    )
-	  mp_obj_list_append(dir, dict->map.table[i].key);
-      }
-    }
-  }
-  mp_obj_t * line; size_t m=0;
-  mp_obj_get_array(dir,&m,&line);
-  const char ** tab=(const char **)malloc((m+1)*sizeof(char *));
-  if (!tab) return 0;
-  for (size_t i=0;i<m;++i){
-    tab[i]=mp_obj_str_get_str(line[i]);
-  }
-  tab[m]=0;
-  for (size_t i=0;i<m;++i){
-    if (strcmp(tab[i],"__name__")==0){
-      tab[i]=tab[m-1];
-      tab[m-1]="del ";
-      break;
-    }
-  }
-  return tab;
-}
-
-/* ********************************z
- *         LINALG & CAS           *
- * ******************************** */
-bool r_inv(double *,int n);
-bool r_rref(double *,int n,int m);
-double r_det(double *,int);
-struct double_pair {
-  double r,i;
-} ;
-typedef struct double_pair c_complex;
-bool c_inv(c_complex *,int n);
-bool c_rref(c_complex *,int n,int m);
-c_complex c_det(c_complex *,int);
-bool c_egv(c_complex * x,int n); // eigenvectors
-bool c_proot(c_complex * x,int n); 
-bool c_pcoeff(c_complex * x,int n); 
-bool c_fft(c_complex * x,int n,bool inverse); 
-bool c_eig(c_complex * x,c_complex * d,int n); // eigenvectors
-bool mp_get_c_complex(mp_obj_t e,c_complex * d){
-  d->r=d->i=0;
-  if (mp_obj_is_float(e)){
-    d->r=mp_obj_get_float(e);
-    return true;
-  }
-  if (MP_OBJ_IS_INT(e)){
-    d->r=mp_obj_get_int(e);
-    return true;
-  }
-  if (mp_obj_get_type(e)==&mp_type_complex){
-    mp_obj_get_complex(e,&d->r,&d->i);
-    return true;
-  }
-  return false;
-}
-
-void c_mul(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r*b.r-a.i*b.i;
-  c->i=a.r*b.i+a.i*b.r;
-}
-
-void c_sub(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r-b.r;
-  c->i=a.i-b.i;
-}
-
-void c_add(const c_complex a,const c_complex b,c_complex * c){
-  c->r=a.r+b.r;
-  c->i=a.i+b.i;
-}
-
-bool mp_array2doubletab(mp_obj_t l,double ** x,size_t * n,size_t * m){
-  if (mp_obj_get_type(l)!=&mp_type_tuple &&
-      mp_obj_get_type(l)!=&mp_type_list)
-    return false;
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  *m=0;
-  if (mp_obj_get_type(elem[0])==&mp_type_tuple ||
-      mp_obj_get_type(elem[0])==&mp_type_list)
-    mp_obj_get_array(elem[0],m,&line);
-  if (*m==0){
-    double * ptr=(double *)malloc((*n)*sizeof(double));
-    *x=ptr;
-    for (size_t i=0;i<*n;++i){
-      if (MP_OBJ_IS_SMALL_INT(elem[i])) 
-	*ptr=MP_OBJ_SMALL_INT_VALUE(elem[i]);
-      else {
-	if (mp_obj_is_float(elem[i]))
-	  *ptr=mp_obj_float_get(elem[i]);
-	else {
-	  free(*x);
-	  return false;
-	}
-      }
-      ++ptr;
-    }
-    return true;
-  }
-  double * ptr=(double *)malloc((*n)*(*m)*sizeof(double));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      if (MP_OBJ_IS_SMALL_INT(line[j])) 
-	*ptr=MP_OBJ_SMALL_INT_VALUE(line[j]);
-      else {
-	if (mp_obj_is_float(line[j]))
-	  *ptr=mp_obj_float_get(line[j]);
-	else {
-	  free(*x);
-	  return false;
-	}
-      }
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-bool mp_array2c_complextab(mp_obj_t l,c_complex ** x,size_t * n,size_t * m){
-  if (mp_obj_get_type(l)!=&mp_type_tuple &&
-      mp_obj_get_type(l)!=&mp_type_list)
-    return false;
-  mp_obj_t * elem;
-  mp_obj_get_array(l, n, &elem);
-  if (*n==0)
-    return false;
-  mp_obj_t * line;
-  *m=0;
-  if (mp_obj_get_type(elem[0])==&mp_type_tuple ||
-      mp_obj_get_type(elem[0])==&mp_type_list)
-    mp_obj_get_array(elem[0],m,&line);
-  if (*m==0){
-    c_complex * ptr=(c_complex *)malloc((*n)*sizeof(c_complex));
-    *x=ptr;
-    for (size_t i=0;i<*n;++i){
-      ptr->i=0;
-      if (MP_OBJ_IS_SMALL_INT(elem[i])) 
-	ptr->r=MP_OBJ_SMALL_INT_VALUE(elem[i]);
-      else {
-	if (mp_obj_is_float(elem[i]))
-	  ptr->r=mp_obj_float_get(elem[i]);
-	else {
-	  if (mp_obj_get_type(elem[i])==&mp_type_complex){
-	    double R,I;
-	    mp_obj_get_complex(elem[i],&R,&I);
-	    ptr->r=R;
-	    ptr->i=I;
-	  }
-	  else {
-	    free(*x);
-	    return false;
-	  }
-	}
-      }
-      ++ptr;
-    }
-    return true;
-  }
-  c_complex * ptr=(c_complex *)malloc((*n)*(*m)*sizeof(c_complex));
-  *x=ptr;
-  for (size_t i=0;i<*n;++i){
-    size_t M;
-    mp_obj_get_array(elem[i],&M,&line);
-    if (M!=*m){
-      free(x);
-      return false;
-    }
-    for (size_t j=0;j<*m;++j){
-      ptr->i=0;
-      if (MP_OBJ_IS_SMALL_INT(line[j])) 
-	ptr->r=MP_OBJ_SMALL_INT_VALUE(line[j]);
-      else {
-	if (mp_obj_is_float(line[j]))
-	  ptr->r=mp_obj_float_get(line[j]);
-	else {
-	  if (mp_obj_get_type(line[j])==&mp_type_complex){
-	    double r,i;
-	    mp_obj_get_complex(line[j],&r,&i);
-	    ptr->r=r;
-	    ptr->i=i;
-	  }
-	  else {
-	    free(*x);
-	    return false;
-	  }
-	}
-      }
-      ++ptr;
-    }
-  }
-  return true;
-}
-
-// print array, 1-d if m==0
-// returns malloc-ed string
-char * printtab(double * x,size_t n,size_t m){
-  char buf[32];
-  if (m==0){
-    char * ptr=(char *)malloc(32*n);
-    strcpy(ptr,"[");
-    for (size_t i=0;i<n;++i){
-#ifdef NUMWORKS
-      buf[0]=0;
-      strcat_double(buf,x[i]);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g,",x[i]);
-#endif
-      strcat(ptr,buf);
-    }
-    ptr[strlen(ptr)-1]=']';
-    return ptr;
-  }
-  char * ptr=(char *)malloc(32*n*m);
-  strcpy(ptr,"[");
-  for (size_t i=0;i<n;++i){
-    strcat(ptr,"[");
-    for (size_t j=0;j<m;++j){
-#ifdef NUMWORKS
-      buf[0]=0;
-      strcat_double(buf,*x);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g,",*x);
-#endif
-      strcat(ptr,buf);
-      ++x;
-    }
-    ptr[strlen(ptr)-1]=']';
-    strcat(ptr,",");
-  }
-  ptr[strlen(ptr)-1]=']';
-  return ptr;
-}
-
-char * printc_complextab(c_complex * x,size_t n,size_t m){
-  char buf[256]="";
-  if (m==0){
-    char * ptr=(char *)malloc(64*n);
-    strcpy(ptr,"[");
-    for (size_t i=0;i<n;++i){
-#ifdef NUMWORKS
-      c_sprint_double(buf,x[i].r);
-      strcat(buf,"+i*");
-      strcat_double(buf,x[i].i);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g+i*%.14g,",x[i].r,x[i].i);
-#endif
-      strcat(ptr,buf);
-    }
-    ptr[strlen(ptr)-1]=']';
-    return ptr;
-  }
-  char * ptr=(char *)malloc(64*n*m);
-  strcpy(ptr,"[");
-  for (size_t i=0;i<n;++i){
-    strcat(ptr,"[");
-    for (size_t j=0;j<m;++j){
-#ifdef NUMWORKS
-      buf[0]=0;
-      c_sprint_double(buf,x->r);
-      strcat(buf,"+i*");
-      strcat_double(buf,x->i);
-      strcat(buf,",");
-#else
-      sprintf(buf,"%.14g+i*%.14g,",x->r,x->i);
-#endif
-      strcat(ptr,buf);
-      ++x;
-    }
-    ptr[strlen(ptr)-1]=']';
-    strcat(ptr,",");
-  }
-  ptr[strlen(ptr)-1]=']';
-  return ptr;
-}
-
-mp_obj_t doubletab2mp_array(double *x,size_t n,size_t m){
-  mp_obj_t r=mp_obj_new_list(0,NULL);
-  for (size_t i=0;i<n;++i){
-    mp_obj_t l=mp_obj_new_list(0,NULL);
-    for (size_t j=0;j<m;++j){
-      mp_obj_list_append(l,mp_obj_new_float(*x));
-      ++x;
-    }
-    mp_obj_list_append(r,l);
-  }
-  return r;
-}
-
-mp_obj_t c_complextab2mp_array(c_complex *x,size_t n,size_t m){
-  mp_obj_t r=mp_obj_new_list(0,NULL);
-  if (m==0){
-    for (size_t i=0;i<n;++i){
-      if (x->i==0)
-	mp_obj_list_append(r,mp_obj_new_float(x->r));
-      else
-	mp_obj_list_append(r,mp_obj_new_complex(x->r,x->i));
-      ++x;
-    }
-    return r;
-  }
-  for (size_t i=0;i<n;++i){
-    mp_obj_t l=mp_obj_new_list(0,NULL);
-    for (size_t j=0;j<m;++j){
-      if (x->i==0)
-	mp_obj_list_append(l,mp_obj_new_float(x->r));
-      else
-	mp_obj_list_append(l,mp_obj_new_complex(x->r,x->i));
-      ++x;
-    }
-    mp_obj_list_append(r,l);
-  }
-  return r;
-}
-
-const char * caseval(const char *);
-
-static mp_obj_t cas_caseval(size_t n_args, const mp_obj_t *args) {
-  const char * text = mp_obj_str_get_str(args[0]);
-  const char * val=caseval(text);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cas_caseval_obj, 1, 2, cas_caseval);
-
-//
-static const mp_map_elem_t cas_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_caseval), (mp_obj_t) &cas_caseval_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(cas_locals_dict, cas_locals_dict_table);
-
-const mp_obj_type_t cas_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cas,
-    .locals_dict = (mp_obj_t)&cas_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_cas_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__cas) },
-    { MP_ROM_QSTR(MP_QSTR_caseval), (mp_obj_t) &cas_caseval_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_cas_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_cas_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_cas_globals_table),
-        .table = (mp_map_elem_t*)mp_module_cas_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_cas = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_cas_globals,
-};
-
-/* ARIT 
-   mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base);
- */
-
-mp_obj_t str2int(const char * s){
-  bool neg=s[0]=='-';
-  if (neg)
-    ++s;
-  return mp_obj_new_int_from_str_len(&s,strlen(s),neg,10);
-}
-
-static mp_obj_t arit(const mp_obj_t *args,int nargs,int cmd) {
-  if (
-      !MP_OBJ_IS_INT(args[0])
-      || (nargs==2 && !MP_OBJ_IS_INT(args[1]))
-      )
-    mp_raise_TypeError("integer expected");
-  if (cmd==8 && mp_obj_get_int(args[0])>2e5)
-    mp_raise_TypeError("integer too large");
-  // The size of this buffer is rather arbitrary. If it's not large
-  // enough, a dynamic one will be allocated.
-  char stack_buf[512];
-  char *buf = stack_buf;
-  size_t buf_size = sizeof(stack_buf);
-  size_t fmt_size;
-  char *str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size, args[0], 10, NULL, '\0', '\0');
-  char BUF[strlen(str)+32];
-  switch (cmd){
-  case 0:
-    sprintf(BUF,"isprime(%s)",str);
-    break;
-  case 1:
-    sprintf(BUF,"nextprime(%s)",str);
-    break;
-  case 2:
-    sprintf(BUF,"prevprime(%s)",str);
-    break;
-  case 3:
-    sprintf(BUF,"ifactor(%s)",str);
-    break;
-  case 4:
-    sprintf(BUF,"gcd(%s,",str);
-    break;
-  case 5:
-    sprintf(BUF,"lcm(%s,",str);
-    break;
-  case 6:
-    sprintf(BUF,"iegcd(%s,",str);
-    break;
-  case 7:
-    sprintf(BUF,"euler(%s)",str);
-    break;
-  case 8:
-    sprintf(BUF,"nprimes(%s)",str);
-    break;
-  }
-  if (buf != stack_buf) {
-    m_del(char, buf, buf_size);
-  }
-  const char * val=0;
-  if (nargs==2){
-    buf=stack_buf;
-    str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size, args[1], 10, NULL, '\0', '\0');
-    char BUF2[strlen(BUF)+strlen(str)+32];
-    strcpy(BUF2,BUF);
-    strcat(BUF2,str);
-    if (buf != stack_buf) {
-      m_del(char, buf, buf_size);
-    }
-    strcat(BUF2,")");
-    val=caseval(BUF2);
-  }
-  else
-    val=caseval(BUF);
-  if (cmd==0){
-    if (strcmp(val,"True")==0 || strcmp(val,"true")==0 || strcmp(val,"1")==0)
-      return mp_const_true;
-    if (strcmp(val,"False")==0 || strcmp(val,"false")==0 || strcmp(val,"0")==0)
-      return mp_const_false;
-  }
-  if (cmd==1 || cmd==2 || cmd==4 || cmd==5  || cmd==7 || cmd==8){
-    return str2int(val);
-  }
-  if (cmd==6){
-    char buf[strlen(val)+1];
-    strcpy(buf,val);
-    char * buf1=buf;
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (;*buf1;++buf1){
-      if (*buf1=='[')
-	break;
-    }
-    if (*buf1){
-      ++buf1;
-      for (int i=0;i<3;++i){
-	char * buf2=buf1;
-	for (;*buf2;++buf2){
-	  if (*buf2==',')
-	    break;
-	}
-	*buf2=0;
-	mp_obj_list_append(res,str2int(buf1));
-	buf1=buf2+1;
-      }
-    }
-    return res;
-  }
-  return mp_obj_new_str(val,strlen(val));
-}
-static mp_obj_t arit_isprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_isprime_obj, 1, 1, arit_isprime);
-
-static mp_obj_t arit_nextprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_nextprime_obj, 1, 1, arit_nextprime);
-
-static mp_obj_t arit_prevprime(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,2);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_prevprime_obj, 1, 1, arit_prevprime);
-
-static mp_obj_t arit_ifactor(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,3);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_ifactor_obj, 1, 1, arit_ifactor);
-
-static mp_obj_t arit_gcd(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,4);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_gcd_obj, 2, 2, arit_gcd);
-
-static mp_obj_t arit_lcm(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,5);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_lcm_obj, 2, 2, arit_lcm);
-
-static mp_obj_t arit_iegcd(size_t n_args, const mp_obj_t *args) {
-  return arit(args,2,6);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_iegcd_obj, 2, 2, arit_iegcd);
-
-static mp_obj_t arit_euler(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,7);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_euler_obj, 1, 1, arit_euler);
-
-static mp_obj_t arit_nprimes(size_t n_args, const mp_obj_t *args) {
-  return arit(args,1,8);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_nprimes_obj, 1, 1, arit_nprimes);
-
-static mp_obj_t arit_char(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_SMALL_INT(args[0])){
-    char buf[2]={MP_OBJ_SMALL_INT_VALUE(args[0]),0};
-    return mp_obj_new_str(buf,1);
-  }
-  mp_obj_t * tab; size_t m=0;
-  mp_obj_get_array(args[0],&m,&tab);
-  if (m==0)
-    raisetypeerr();
-  char buf[m+1];
-  for (int i=0;i<m;++i){
-    if (!MP_OBJ_IS_SMALL_INT(tab[i]))
-      raisetypeerr();
-    buf[i]=MP_OBJ_SMALL_INT_VALUE(tab[i]);
-  }
-  return mp_obj_new_str(buf,m);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_char_obj, 1, 1, arit_char);
-
-static mp_obj_t arit_asc(size_t n_args, const mp_obj_t *args) {
-  if (!mp_obj_is_str(args[0]))
-    raisetypeerr();
-  size_t len;
-  const char * s=mp_obj_str_get_data(args[0],&len);
-  mp_obj_t res = mp_obj_new_list(0, NULL);
-  for (int i=0;i<len;++i)
-    mp_obj_list_append(res,mp_obj_new_int(s[i]));
-  return res;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(arit_asc_obj, 1, 1, arit_asc);
-//
-static const mp_map_elem_t arit_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_isprime), (mp_obj_t) &arit_isprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_nextprime), (mp_obj_t) &arit_nextprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_prevprime), (mp_obj_t) &arit_prevprime_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ifactor), (mp_obj_t) &arit_ifactor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_gcd), (mp_obj_t) &arit_gcd_obj },
-	{ MP_ROM_QSTR(MP_QSTR_lcm), (mp_obj_t) &arit_lcm_obj },
-	{ MP_ROM_QSTR(MP_QSTR_iegcd), (mp_obj_t) &arit_iegcd_obj },
-	{ MP_ROM_QSTR(MP_QSTR_char), (mp_obj_t) &arit_char_obj },
-	{ MP_ROM_QSTR(MP_QSTR_asc), (mp_obj_t) &arit_asc_obj },
-        { MP_ROM_QSTR(MP_QSTR_euler), (mp_obj_t) &arit_euler_obj },
-        { MP_ROM_QSTR(MP_QSTR_nprimes), (mp_obj_t) &arit_nprimes_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(arit_locals_dict, arit_locals_dict_table);
-
-const mp_obj_type_t arit_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_arit,
-    .locals_dict = (mp_obj_t)&arit_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_arit_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__arit) },
-    { MP_ROM_QSTR(MP_QSTR_isprime), (mp_obj_t) &arit_isprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_nextprime), (mp_obj_t) &arit_nextprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_prevprime), (mp_obj_t) &arit_prevprime_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifactor), (mp_obj_t) &arit_ifactor_obj },
-    { MP_ROM_QSTR(MP_QSTR_gcd), (mp_obj_t) &arit_gcd_obj },
-    { MP_ROM_QSTR(MP_QSTR_lcm), (mp_obj_t) &arit_lcm_obj },
-    { MP_ROM_QSTR(MP_QSTR_iegcd), (mp_obj_t) &arit_iegcd_obj },
-    { MP_ROM_QSTR(MP_QSTR_char), (mp_obj_t) &arit_char_obj },
-    { MP_ROM_QSTR(MP_QSTR_asc), (mp_obj_t) &arit_asc_obj },
-    { MP_ROM_QSTR(MP_QSTR_euler), (mp_obj_t) &arit_euler_obj },
-    { MP_ROM_QSTR(MP_QSTR_nprimes), (mp_obj_t) &arit_nprimes_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_arit_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_arit_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_arit_globals_table),
-        .table = (mp_map_elem_t*)mp_module_arit_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_arit = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_arit_globals,
-};
-
-/* LINALG (with some NUMPY compatibility) */
-static mp_obj_t linalg_matrix(size_t n_args, const mp_obj_t *args) {
-  double *x=0;size_t n,m;
-  if (mp_array2doubletab(args[n_args-1],&x,&n,&m)){
-    if (n_args==1){
-      free(x);
-      return args[0];
-    }
-    if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[0]) &&  MP_OBJ_IS_SMALL_INT(args[1])){
-      int n1=MP_OBJ_SMALL_INT_VALUE(args[0]),m1=MP_OBJ_SMALL_INT_VALUE(args[1]);
-      int N=m?n*m:n,k=0;
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      for (int i=0;i<n1;++i){
-	mp_obj_t l = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m1;++j){
-	  mp_obj_list_append(l,mp_obj_new_float(k<N?x[k]:0));
-	  ++k;
-	}
-	mp_obj_list_append(r,l);
-      }
-      free(x);
-      return r;
-    }
-    if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[0]) ){
-      int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-      int N=m?n*m:n,k=0;
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      for (int i=0;i<n1;++i){
-	mp_obj_list_append(r,mp_obj_new_float(k<N?x[k]:0));
-	++k;
-      }
-      free(x);
-      return r;
-    }
-    free(x);
-  }
-  if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[0])){
-    int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      mp_obj_t arg=mp_obj_new_int(i);
-      mp_obj_list_append(r,fun_bc_call(args[1],1,0,&arg));	  
-    }
-    return r;
-  }
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_IS_SMALL_INT(args[1])){
-    int n1=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    int m1=MP_OBJ_SMALL_INT_VALUE(args[1]);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    mp_obj_t arg[2];
-    for (int i=0;i<n1;++i){
-      arg[0]=mp_obj_new_int(i);
-      mp_obj_t l = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m1;++j){
-	arg[1]=mp_obj_new_int(j);
-	mp_obj_list_append(l,fun_bc_call(args[2],2,0,arg)); 
-      }
-      mp_obj_list_append(r,l);
-    }
-    return r;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_matrix_obj, 1, 3, linalg_matrix);
-
-static mp_obj_t linalg_arange(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t l = mp_obj_new_list(0, NULL);
-  double step=1,a,b;
-  if (n_args==3)
-    mp_int_float(args[2],&step);
-  if (step>0 && mp_int_float(args[0],&a) && mp_int_float(args[1],&b)){
-    for (;a<=b;a+=step){
-      mp_obj_list_append(l,mp_obj_new_float(a));
-    }
-    return l;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_arange_obj, 2, 3, linalg_arange);
-
-static mp_obj_t linalg_linspace(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t l = mp_obj_new_list(0, NULL);
-  double a,b;
-  if (mp_int_float(args[0],&a) && mp_int_float(args[1],&b) && a!=b && MP_OBJ_IS_SMALL_INT(args[2]) && MP_OBJ_SMALL_INT_VALUE(args[2])>1){
-    double step=(b-a)/(MP_OBJ_SMALL_INT_VALUE(args[2])-1);
-    if (step*(b-a)<0)
-      step=-step;
-    for (;a<=b;a+=step){
-      mp_obj_list_append(l,mp_obj_new_float(a));
-    }
-    return l;
-  }
-  const char val[]="Bad argument value";
-  return mp_obj_new_str(val,strlen(val));  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_linspace_obj, 3, 3, linalg_linspace);
-
-void raisedimerr(){
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Dimension mismatch"));
-}
-
-mp_obj_t mp_obj_new_complex_real(double a,double b){
-  if (b==0)
-    return mp_obj_new_float(a);
-  return mp_obj_new_complex(a,b);
-}
-
-static mp_obj_t linalg_addsub(size_t n_args, const mp_obj_t *args,bool add) {
-  c_complex *x,*y;
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (n1!=n2 || m1!=m2){
-      free(x); free(y);
-      raisedimerr();
-    }
-    c_complex *x_=x,*y_=y;
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      if (m1==0){
-	if (add)
-	  mp_obj_list_append(res,mp_obj_new_complex_real(x->r+y->r,x->i+y->i));
-	else
-	  mp_obj_list_append(res,mp_obj_new_complex_real(x->r-y->r,x->i-y->i));
-	++x; ++y;
-	continue;
-      }
-      mp_obj_t line = mp_obj_new_list(0, NULL);
-      if (add){
-	for (int j=0;j<m1;++j,++x,++y){
-	  mp_obj_list_append(line,mp_obj_new_complex_real(x->r+y->r,x->i+y->i));
-	}
-      }
-      else {
-	for (int j=0;j<m1;++j,++x,++y){
-	  mp_obj_list_append(line,mp_obj_new_complex_real(x->r-y->r,x->i-y->i));
-	}
-      }
-      mp_obj_list_append(res,line);
-    }
-    free(x_); free(y_);
-    return res;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-static mp_obj_t linalg_add(size_t n_args, const mp_obj_t *args) {
-  return linalg_addsub(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_add_obj, 2, 2, linalg_add);
-static mp_obj_t linalg_sub(size_t n_args, const mp_obj_t *args) {
-  return linalg_addsub(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_sub_obj, 2, 2, linalg_sub);
-
-// scalar product of vectors x and y
-c_complex dot(c_complex *x,c_complex *y,int n){
-  c_complex r={0,0};
-  for (int i=0;i<n;++i){
-    r.r += x[i].r*y[i].r-x[i].i*y[i].i;
-    r.i += x[i].r*y[i].i+x[i].i*y[i].r;
-  }
-  return r;
-}
-
-c_complex mult(c_complex a,c_complex b){
-  c_complex c={a.r*b.r-a.i*b.i,a.r*b.i+a.i*b.r};
-  return c;
-}
-
-// transpose matrix in place
-void transpose(c_complex *x,int n,int m){
-  for (int i=1;i<n;++i){
-    for (int j=0;j<i;++j){
-      c_complex * a=x+i*m+j;
-      c_complex * b=x+j*m+i;
-      c_complex t=*a;
-      *a=*b;
-      *b=t;
-    }
-  }
-}
-
-
-static mp_obj_t linalg_dot(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*y; c_complex a;
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (mp_get_c_complex(args[1],&a)){
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      c_complex * x_=x;
-      if (m1==0){
-	for (;x_<x+n1;++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-	}
-	free(x);
-	return res;
-      }
-      for (int i=0;i<n1;++i){
-	mp_obj_t line = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m1;++j,++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-	}
-	mp_obj_list_append(res,line);
-      }
-      free(x);
-      return res;      
-    }
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (m1==0){ // v*M
-      if (m2==0 && n1==n2){
-	c_complex c={0,0};
-	c_complex * x_=x,*y_=y;
-	for (int i=0;i<n1;++i,++x_,++y_){
-	  c.r += x_->r*y_->r-x_->i*y_->i;
-	  c.i += x_->r*y_->i+x_->i*y_->r;
-	}
-	free(x);free(y);
-	return mp_obj_new_complex_real(c.r,c.i);
-      }
-      if (n1!=m2)
-	raisedimerr();
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      for (c_complex * y_=y;y_<y+n2*m2;y_+=m2){
-	c_complex c=dot(x,y_,m2);
-	mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-      }
-      free(x);free(y);
-      return res;
-    }
-    if (m2==0){ // M*v
-      if (n2!=m1)
-	raisedimerr();
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      for (c_complex * x_=x;x_<x+n1*m1;x_+=m1){
-	c_complex c=dot(x_,y,m1);
-	mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-      }
-      free(x);free(y);
-      return res;
-    }
-    if (m1!=n2){
-      free(x); free(y);
-      raisedimerr();
-    }
-    // M1*M2
-    transpose(y,n2,m2);
-    mp_obj_t res = mp_obj_new_list(0, NULL);
-    for (int i=0;i<n1;++i){
-      mp_obj_t line = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m2;++j){
-	c_complex c=dot(x+m1*i,y+m1*j,m1);
-	mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-      }
-      mp_obj_list_append(res,line);
-    }
-    free(x); free(y);
-    return res;
-  }
-  if (mp_array2c_complextab(args[1],&y,&n2,&m2)){
-    if (mp_get_c_complex(args[0],&a)){
-      mp_obj_t res = mp_obj_new_list(0, NULL);
-      c_complex * x_=y;
-      if (m2==0){
-	for (;x_<x+n2;++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(res,mp_obj_new_complex_real(c.r,c.i));
-	}
-	free(y);
-	return res;
-      }
-      for (int i=0;i<n2;++i){
-	mp_obj_t line = mp_obj_new_list(0, NULL);
-	for (int j=0;j<m2;++j,++x_){
-	  c_complex c=mult(*x_,a);
-	  mp_obj_list_append(line,mp_obj_new_complex_real(c.r,c.i));
-	}
-	mp_obj_list_append(res,line);
-      }
-      free(y);
-      return res;      
-    }
-    free(y);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_dot_obj, 2, 2, linalg_dot);
-
-static mp_obj_t linalg_cross(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*y; 
-  size_t n1,m1,n2,m2;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1) && n1==3 && m1==0){
-    if (!mp_array2c_complextab(args[1],&y,&n2,&m2)){
-      free(x);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    if (n2!=3 || m2!=0){
-      free(x);
-      free(y);
-      nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 2nd argument."));
-    }
-    c_complex tmp1,tmp2,A,B,C;
-    c_mul(x[0],y[1],&tmp1);c_mul(x[1],y[0],&tmp2); c_sub(tmp1,tmp2,&C);
-    c_mul(x[2],y[0],&tmp1);c_mul(x[0],y[2],&tmp2); c_sub(tmp1,tmp2,&B);
-    c_mul(x[1],y[2],&tmp1);c_mul(x[2],y[1],&tmp2); c_sub(tmp1,tmp2,&A);
-    free(x);
-    free(y);
-    mp_obj_t r = mp_obj_new_list(0, NULL);
-    mp_obj_list_append(r,mp_obj_new_complex_real(A.r,A.i));
-    mp_obj_list_append(r,mp_obj_new_complex_real(B.r,B.i));
-    mp_obj_list_append(r,mp_obj_new_complex_real(C.r,C.i));
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_cross_obj, 2, 2, linalg_cross);
-
-static mp_obj_t linalg_transpose(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    transpose(x,n1,m1);
-    mp_obj_t r=c_complextab2mp_array(x,m1,n1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_transpose_obj, 1, 1, linalg_transpose);
-
-static mp_obj_t linalg_rref(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (!c_rref(x,n1,m1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_rref_obj, 1, 1, linalg_rref);
-
-static mp_obj_t linalg_egv(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1 || !c_egv(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_egv_obj, 1, 1, linalg_egv);
-
-static mp_obj_t linalg_eig(size_t n_args, const mp_obj_t *args) {
-  c_complex *x,*d;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    d=(c_complex *) malloc(n1*n1*sizeof(c_complex));
-    if (n1!=m1 || !c_eig(x,d,n1)){
-      free(x); free(d);
-    }
-    else {
-      mp_obj_t items[2];
-      items[0]=c_complextab2mp_array(x,n1,m1);
-      items[1]=c_complextab2mp_array(d,n1,m1);
-      mp_obj_t r=mp_obj_new_tuple(2, items);
-      free(x); free(d);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_eig_obj, 1, 1, linalg_eig);
-
-static mp_obj_t linalg_inv(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1){
-      free(x);
-      raisedimerr();
-    }
-    if (!c_inv(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,m1,m1);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_inv_obj, 1, 1, linalg_inv);
-
-static mp_obj_t linalg_re(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return args[0];
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_float(R);
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i)
-      x[i].i=0;
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_re_obj, 1, 1, linalg_re);
-
-static mp_obj_t linalg_im(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return mp_obj_new_int(0);
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_float(I);
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].r=x[i].i;
-      x[i].i=0;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_im_obj, 1, 1, linalg_im);
-
-static mp_obj_t linalg_conj(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0]))
-    return args[0];
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    return mp_obj_new_complex(R,-I);
-  }
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].i=-x[i].i;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_conj_obj, 1, 1, linalg_conj);
-
-double c_abs(c_complex c){
-  double x=c.r<0?-c.r:c.r;
-  double y=c.i<0?-c.i:c.i;
-  if (x>y){
-    double t=x;
-    x=y;
-    y=t;
-  }
-  // now x<=y
-  if (y==0) return 0;
-  double t=x/y;
-  return y*sqrt(1+t*t);
-}
-static mp_obj_t linalg_abs(size_t n_args, const mp_obj_t *args) {
-  if (MP_OBJ_IS_SMALL_INT(args[0])){
-    long long i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-    if (i>=0)
-      return args[0];
-    return mp_obj_new_int(-i);
-  }
-  if (MP_OBJ_IS_INT(args[0]) || mp_obj_is_float(args[0])){
-    return mp_obj_new_float(fabs(mp_obj_get_float(args[0])));
-  }
-  if (mp_obj_get_type(args[0])==&mp_type_complex){
-    double R,I;
-    mp_obj_get_complex(args[0],&R,&I);
-    R=fabs(R); I=fabs(I);
-    if (R<I){
-      double t=R;
-      R=I;
-      I=t;
-    }
-    double t=I/R;
-    return mp_obj_new_float(R*sqrt(1+t*t));
-  }
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int N=m1?n1*m1:n1;
-    for (int i=0;i<N;++i){
-      x[i].r=c_abs(x[i]);
-      x[i].i=0;
-    }
-    mp_obj_t r=c_complextab2mp_array(x,n1,m1);
-    free(x);
-    return r;
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_abs_obj, 1, 1, linalg_abs);
-
-static mp_obj_t linalg_proot(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (m1!=0){
-      free(x);
-      raisedimerr();
-    }
-    if (!c_proot(x,n1))
-      free(x);
-    else {
-      mp_obj_t r=c_complextab2mp_array(x,n1-1,0);
-      free(x);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_proot_obj, 1, 1, linalg_proot);
-
-static mp_obj_t linalg_pcoeff(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (m1!=0){
-      free(x);
-      raisedimerr();
-    }
-    c_complex y[n1+1];
-    for (int i=0;i<n1;++i)
-      y[i]=x[i];
-    free(x);
-    if (c_pcoeff(y,n1)){
-      mp_obj_t r=c_complextab2mp_array(y,n1+1,0);
-      return r;
-    }
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_pcoeff_obj, 1, 1, linalg_pcoeff);
-
-static mp_obj_t linalg_fftifft(size_t n_args, const mp_obj_t *args,bool inverse) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    int n2=n1,i;
-    for (i=-1;n2;++i){
-      n2/=2;
-    }
-    if (m1!=0 || n1!=(1<<i)){
-      free(x);
-      raisedimerr();
-    }
-    if (c_fft(x,n1,inverse)){
-      mp_obj_t r=c_complextab2mp_array(x,n1,0);
-      free(x);
-      return r;
-    }
-    free(x);    
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-static mp_obj_t linalg_fft(size_t n_args, const mp_obj_t *args) {
-  return linalg_fftifft(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_fft_obj, 1, 1, linalg_fft);
-static mp_obj_t linalg_ifft(size_t n_args, const mp_obj_t *args) {
-  return linalg_fftifft(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_ifft_obj, 1, 1, linalg_ifft);
-
-/* for a more efficient linear solver, use lu inside the CAS*/
-static mp_obj_t linalg_solve(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t arg[2];
-  arg[0]=linalg_inv(1,args);
-  arg[1]=args[1];
-  return linalg_dot(2,arg);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_solve_obj, 2, 2, linalg_solve);
-
-static mp_obj_t linalg_peval(size_t n_args, const mp_obj_t *args) {
-  c_complex *P,x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&P,&n1,&m1)){
-    if (m1!=0 || !mp_get_c_complex(args[1],&x)){
-      free(P);
-      raisedimerr();
-    }
-    c_complex res={0,0};
-    for (int i=0;i<n1;++i){
-      double r=res.r*x.r-res.i*x.i+P[i].r;
-      res.i=res.r*x.i+res.i*x.r+P[i].i;
-      res.r=r;
-    }
-    if (res.i==0)
-      return mp_obj_new_float(res.r);
-    else
-      return mp_obj_new_complex(res.r,res.i);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_peval_obj, 2, 2, linalg_peval);
-
-static mp_obj_t linalg_apply(size_t n_args, const mp_obj_t *args) {
-  mp_obj_t * elem=0; size_t n=-1;
-  bool recur=false;
-  if (n_args==3 && args[2]==&linalg_matrix_obj)
-    recur=true;
-  if (MP_OBJ_IS_TYPE(args[1],&mp_type_list) || MP_OBJ_IS_TYPE(args[1],&mp_type_tuple))
-    mp_obj_get_array(args[1], &n, &elem);
-  if (MP_OBJ_IS_TYPE(args[0], &mp_type_fun_builtin_1)){
-    if (((int) n)>=0){
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      mp_obj_t args_[2];
-      args_[0]=args[0];
-      for (size_t i=0;i<n;++i){
-	if (recur){
-	  args_[1]=elem[i];
-	  mp_obj_list_append(r,linalg_apply(2,args_));
-	}
-	else
-	  mp_obj_list_append(r,fun_builtin_1_call(args[0],1,0,&elem[i]));	  
-      }
-      return r;
-    }
-    return fun_builtin_1_call(args[0],1,0,args+1);
-  }
-  else {
-    if (((int) n)>=0){
-      mp_obj_t r = mp_obj_new_list(0, NULL);
-      mp_obj_t args_[2];
-      args_[0]=args[0];
-      for (size_t i=0;i<n;++i){
-	if (recur){
-	  args_[1]=elem[i];
-	  mp_obj_list_append(r,linalg_apply(2,args_));
-	}
-	else
-	  mp_obj_list_append(r,fun_bc_call(args[0],1,0,&elem[i]));	  
-      }
-      return r;
-    }
-    return fun_bc_call(args[0],1,0,args+1);
-  }
-  //nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_apply_obj, 2, 3, linalg_apply);
-
-static mp_obj_t linalg_det(size_t n_args, const mp_obj_t *args) {
-  c_complex *x;
-  size_t n1,m1;
-  if (mp_array2c_complextab(args[0],&x,&n1,&m1)){
-    if (n1!=m1){
-      free(x);
-      raisedimerr();
-    }
-    c_complex r=c_det(x,n1);
-    free(x);
-    return mp_obj_new_complex_real(r.r,r.i);
-  }
-  nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Wrong type of 1st argument."));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_det_obj, 1, 1, linalg_det);
-
-static mp_obj_t linalg_zerosones(size_t n_args, const mp_obj_t *args,int v0,int v1) {
-  size_t n1=0,m1=0;
-  if (MP_OBJ_IS_SMALL_INT(args[0]))
-    n1= MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==2 && MP_OBJ_IS_SMALL_INT(args[1]))
-    m1= MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (v0==0 && v1==1)
-    m1=n1;
-  mp_obj_t r = mp_obj_new_list(0, NULL);
-  bool alea=v0==-1;
-  for (int i=0;i<n1;++i){
-    if (m1){
-      mp_obj_t l = mp_obj_new_list(0, NULL);
-      for (int j=0;j<m1;++j){
-	mp_obj_list_append(l, mp_obj_new_float(alea?rand()/(RAND_MAX+1.0):(i==j?v1:v0)));	
-      }
-      mp_obj_list_append(r, l);
-    }
-    else
-      mp_obj_list_append(r, mp_obj_new_float(alea?rand()/(RAND_MAX+1.0):v0));
-  }
-  return r;
-}
-static mp_obj_t linalg_zeros(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,0,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_zeros_obj, 1, 2, linalg_zeros);
-static mp_obj_t linalg_ones(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,1,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_ones_obj, 1, 2, linalg_ones);
-static mp_obj_t linalg_eye(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,0,1);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_eye_obj, 1, 1, linalg_eye);
-static mp_obj_t linalg_rand(size_t n_args, const mp_obj_t *args) {
-  return linalg_zerosones(n_args,args,-1,0);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_rand_obj, 1, 2, linalg_rand);
-
-static mp_obj_t linalg_sizeshape(size_t n_args, const mp_obj_t *args,bool shape) {
-  int l=-1,m=0;
-  if (mp_obj_get_type(args[0])==&mp_type_list){
-    mp_obj_list_t *o = MP_OBJ_TO_PTR(args[0]);
-    l=o->len;
-    if (l>0){
-      mp_obj_t obj=o->items[0];
-      if (mp_obj_get_type(obj)==&mp_type_list){
-	o = MP_OBJ_TO_PTR(obj);
-	m=o->len;
-      }
-    }
-  }
-  if (shape){
-    mp_obj_t items[2];
-    items[0]=mp_obj_new_int(l);
-    items[1]=m==0?mp_const_none:mp_obj_new_int(m);
-    mp_obj_t r=mp_obj_new_tuple(2, items);
-    return r;
-  }
-  if (m==0) m=1;
-  return mp_obj_new_int(l*m);
-}
-static mp_obj_t linalg_shape(size_t n_args, const mp_obj_t *args) {
-  return linalg_sizeshape(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_shape_obj, 1, 1, linalg_shape);
-
-static mp_obj_t linalg_size(size_t n_args, const mp_obj_t *args) {
-  return linalg_sizeshape(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(linalg_size_obj, 1, 1, linalg_size);
-
-//
-static const mp_rom_map_elem_t linalg_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
-    { MP_ROM_QSTR(MP_QSTR_matrix), (mp_obj_t) &linalg_matrix_obj },
-    { MP_ROM_QSTR(MP_QSTR_arange), (mp_obj_t) &linalg_arange_obj },
-    { MP_ROM_QSTR(MP_QSTR_linspace), (mp_obj_t) &linalg_linspace_obj },
-    { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_cross), (mp_obj_t) &linalg_cross_obj },
-    { MP_ROM_QSTR(MP_QSTR_solve), (mp_obj_t) &linalg_solve_obj },
-    { MP_ROM_QSTR(MP_QSTR_peval), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_horner), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_mul), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_transpose), (mp_obj_t) &linalg_transpose_obj },
-    { MP_ROM_QSTR(MP_QSTR_rref), (mp_obj_t) &linalg_rref_obj },
-    { MP_ROM_QSTR(MP_QSTR_egv), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eigenvects), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t) &linalg_eig_obj },
-    { MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t) &linalg_det_obj },
-    { MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t) &linalg_zeros_obj },
-    { MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t) &linalg_ones_obj },
-    { MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_identity), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_idn), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_rand), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranv), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranm), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_shape), (mp_obj_t) &linalg_shape_obj },
-    { MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t) &linalg_size_obj },
-    { MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t) &linalg_inv_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_proot), (mp_obj_t) &linalg_proot_obj },
-    { MP_ROM_QSTR(MP_QSTR_pcoeff), (mp_obj_t) &linalg_pcoeff_obj },
-    { MP_ROM_QSTR(MP_QSTR_fft), (mp_obj_t) &linalg_fft_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifft), (mp_obj_t) &linalg_ifft_obj },
-    { MP_ROM_QSTR(MP_QSTR_apply), (mp_obj_t) &linalg_apply_obj },
-    { MP_ROM_QSTR(MP_QSTR_add), (mp_obj_t) &linalg_add_obj },
-    { MP_ROM_QSTR(MP_QSTR_sub), (mp_obj_t) &linalg_sub_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_real), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_im), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_imag), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_conj), (mp_obj_t) &linalg_conj_obj },
-    { MP_ROM_QSTR(MP_QSTR_abs), (mp_obj_t) &linalg_abs_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(linalg_locals_dict, linalg_locals_dict_table);
-
-const mp_obj_type_t linalg_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_linalg,
-    .locals_dict = (mp_obj_t)&linalg_locals_dict
-};
-
-
-STATIC const mp_rom_map_elem_t mp_module_linalg_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__linalg) },
-    { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
-    { MP_ROM_QSTR(MP_QSTR_matrix), (mp_obj_t) &linalg_matrix_obj },
-    { MP_ROM_QSTR(MP_QSTR_arange), (mp_obj_t) &linalg_arange_obj },
-    { MP_ROM_QSTR(MP_QSTR_linspace), (mp_obj_t) &linalg_linspace_obj },
-    { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_cross), (mp_obj_t) &linalg_cross_obj },
-    { MP_ROM_QSTR(MP_QSTR_solve), (mp_obj_t) &linalg_solve_obj },
-    { MP_ROM_QSTR(MP_QSTR_peval), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_horner), (mp_obj_t) &linalg_peval_obj },
-    { MP_ROM_QSTR(MP_QSTR_mul), (mp_obj_t) &linalg_dot_obj },
-    { MP_ROM_QSTR(MP_QSTR_transpose), (mp_obj_t) &linalg_transpose_obj },
-    { MP_ROM_QSTR(MP_QSTR_rref), (mp_obj_t) &linalg_rref_obj },
-    { MP_ROM_QSTR(MP_QSTR_egv), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eigenvects), (mp_obj_t) &linalg_egv_obj },
-    { MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t) &linalg_eig_obj },
-    { MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t) &linalg_det_obj },
-    { MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t) &linalg_zeros_obj },
-    { MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t) &linalg_ones_obj },
-    { MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_identity), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_idn), (mp_obj_t) &linalg_eye_obj },
-    { MP_ROM_QSTR(MP_QSTR_rand), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranv), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_ranm), (mp_obj_t) &linalg_rand_obj },
-    { MP_ROM_QSTR(MP_QSTR_shape), (mp_obj_t) &linalg_shape_obj },
-    { MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t) &linalg_size_obj },
-    { MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t) &linalg_inv_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_proot), (mp_obj_t) &linalg_proot_obj },
-    { MP_ROM_QSTR(MP_QSTR_pcoeff), (mp_obj_t) &linalg_pcoeff_obj },
-    { MP_ROM_QSTR(MP_QSTR_fft), (mp_obj_t) &linalg_fft_obj },
-    { MP_ROM_QSTR(MP_QSTR_ifft), (mp_obj_t) &linalg_ifft_obj },
-    { MP_ROM_QSTR(MP_QSTR_apply), (mp_obj_t) &linalg_apply_obj },
-    { MP_ROM_QSTR(MP_QSTR_add), (mp_obj_t) &linalg_add_obj },
-    { MP_ROM_QSTR(MP_QSTR_sub), (mp_obj_t) &linalg_sub_obj },
-    { MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_real), (mp_obj_t) &linalg_re_obj },
-    { MP_ROM_QSTR(MP_QSTR_im), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_imag), (mp_obj_t) &linalg_im_obj },
-    { MP_ROM_QSTR(MP_QSTR_conj), (mp_obj_t) &linalg_conj_obj },
-    { MP_ROM_QSTR(MP_QSTR_abs), (mp_obj_t) &linalg_abs_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_linalg_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_linalg_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_linalg_globals_table),
-        .table = (mp_map_elem_t*)mp_module_linalg_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_linalg = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_linalg_globals,
-};
-
-
-/* TURTLE, using caseval */
-void turtle_freeze();
-
-mp_obj_t turtle_ret(const char * val){
-  if (strncmp(val,"\"Done",5)==0)
-    return mp_const_none;
-  return mp_obj_new_str(val,strlen(val));  
-}
-
-static mp_obj_t turtle_forward(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=10;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"avance(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_forward_obj, 0, 1, turtle_forward);
-
-static mp_obj_t turtle_backward(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=10;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"recule(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_backward_obj, 0, 1, turtle_backward);
-
-static mp_obj_t turtle_left(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  char buf[256];
-  sprintf(buf,"tourne_gauche(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_left_obj, 0, 1, turtle_left);
-
-static mp_obj_t turtle_right(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args==1 && mp_obj_is_float(args[0])) 
-    i=mp_obj_get_float(args[0]);
-  char buf[256];
-  sprintf(buf,"tourne_droite(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_right_obj, 0, 1, turtle_right);
-
-static mp_obj_t turtle_reset(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("efface(0,0):;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_reset_obj, 0, 0, turtle_reset);
-
-static mp_obj_t turtle_dessine_tortue(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("efface(0,0):;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_dessine_tortue_obj, 0, 0, turtle_dessine_tortue);
-
-static mp_obj_t turtle_circle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=0,y=0,z=360;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[2])) {
-    z=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  }
-  else {
-    if (n_args==2){
-      z=y;
-      y=0;
-    }
-  }
-  char buf[256];
-  sprintf(buf,"rond(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_circle_obj, 1, 3, turtle_circle);
-
-static mp_obj_t turtle_disque(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=0,y=0,z=360;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args==3 && MP_OBJ_IS_SMALL_INT(args[2])) {
-    z=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  }
-  else {
-    if (n_args==2){
-      z=y;
-      y=0;
-    }
-  }
-  char buf[256];
-  sprintf(buf,"disque(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_disque_obj, 1, 3, turtle_disque);
-
-static mp_obj_t turtle_rectangle_plein(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=10,y=10;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    y=x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  char buf[256];
-  sprintf(buf,"rectangle_plein(%i,%i):;",x,y);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_rectangle_plein_obj, 1, 2, turtle_rectangle_plein);
-
-static mp_obj_t turtle_triangle_plein(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=10,y=10,z=60;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    y=x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (n_args>=2 && MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  if (n_args>=3 && MP_OBJ_IS_SMALL_INT(args[2])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[2]);
-  char buf[256];
-  sprintf(buf,"triangle_plein(%i,%i,%i):;",x,y,z);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_triangle_plein_obj, 1, 3, turtle_triangle_plein);
-
-static mp_obj_t turtle_showturtle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("montre_tortue():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_showturtle_obj, 0, 0, turtle_showturtle);
-
-static mp_obj_t turtle_hideturtle(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("cache_tortue():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_hideturtle_obj, 0, 0, turtle_hideturtle);
-
-static mp_obj_t turtle_down(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("baisse_crayon():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_down_obj, 0, 0, turtle_down);
-
-static mp_obj_t turtle_up(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  const char * val=caseval("leve_crayon():;");
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_up_obj, 0, 0, turtle_up);
-
-static mp_obj_t turtle_saute(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"saute(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_saute_obj, 1, 1, turtle_saute);
-
-static mp_obj_t turtle_pas_de_cote(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=90;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"pas_de_cote(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_pas_de_cote_obj, 1, 1, turtle_pas_de_cote);
-
-static mp_obj_t turtle_setheading(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"cap(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setheading_obj, 0, 1, turtle_setheading);
-
-static mp_obj_t turtle_setposition(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int x=0,y=0;
-  if (MP_OBJ_IS_SMALL_INT(args[0])) 
-    x=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  if (MP_OBJ_IS_SMALL_INT(args[1])) 
-    y=MP_OBJ_SMALL_INT_VALUE(args[1]);
-  char buf[256];
-  sprintf(buf,"position(%i,%i):;",x,y);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setposition_obj, 2, 2, turtle_setposition);
-
-static mp_obj_t turtle_setx(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"position(%i,position()[1]):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_setx_obj, 0, 1, turtle_setx);
-
-static mp_obj_t turtle_sety(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"position(position()[0],%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_sety_obj, 0, 1, turtle_sety);
-
-static mp_obj_t turtle_write(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  char buf[256];
-  sprintf(buf,"ecris(%s):;",mp_obj_str_get_str(args[0]));
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_write_obj, 1, 1, turtle_write);
-
-static mp_obj_t turtle_pencolor(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  char buf[256]="crayon";
-  if (n_args==1){
-    if (MP_OBJ_IS_STR(args[0]))
-      sprintf(buf,"crayon(%s):;",mp_obj_str_get_str(args[0]));
-    if (MP_OBJ_IS_SMALL_INT(args[0])) {
-      i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-      sprintf(buf,"crayon(%i):;",i);
-    }
-    if (strlen(buf)==6){
-      size_t n=0; mp_obj_t * tab=0;
-      mp_obj_get_array(args[0],&n,&tab);
-      if (n==3 &&  mp_obj_is_float(tab[0]) && mp_obj_is_float(tab[1]) && mp_obj_is_float(tab[2])){
-#ifdef NUMWORKS
-	strcpy(buf,"crayon(");
-	for (int i=0;i<3;++i){
-	  strcat_double(buf,mp_obj_get_float(tab[i]));
-	  if (i<2)
-	    strcat(buf,",");
-	}
-	strcat(buf,"):;");
-#else
-	sprintf(buf,"crayon(%.3g,%.3g,%.3g):;",mp_obj_get_float(tab[0]),mp_obj_get_float(tab[1]),mp_obj_get_float(tab[2]));
-#endif
-      }
-      if (n==3 &&  MP_OBJ_IS_SMALL_INT(tab[0]) && MP_OBJ_IS_SMALL_INT(tab[1]) && MP_OBJ_IS_SMALL_INT(tab[2])){
-	sprintf(buf,"crayon(%i,%i,%i):;",(int)MP_OBJ_SMALL_INT_VALUE(tab[0]),(int)MP_OBJ_SMALL_INT_VALUE(tab[1]),(int)MP_OBJ_SMALL_INT_VALUE(tab[2]));
-      }
-    }
-  }
-  if (n_args==3 && mp_obj_is_float(args[0]) && mp_obj_is_float(args[1]) && mp_obj_is_float(args[2]) ){
-#ifdef NUMWORKS
-	strcpy(buf,"crayon(");
-	for (int i=0;i<3;++i){
-	  strcat_double(buf,mp_obj_get_float(args[i]));
-	  if (i<2)
-	    strcat(buf,",");
-	}
-	strcat(buf,"):;");
-#else
-    sprintf(buf,"crayon(%.3g,%.3g,%.3g):;",mp_obj_get_float(args[0]),mp_obj_get_float(args[1]),mp_obj_get_float(args[2]));
-#endif
-  }
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_pencolor_obj, 0, 3, turtle_pencolor);
-
-static mp_obj_t turtle_speed(size_t n_args, const mp_obj_t *args) {
-  turtle_freeze();
-  int i=0;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0])) 
-    i=MP_OBJ_SMALL_INT_VALUE(args[0]);
-  char buf[256];
-  sprintf(buf,"speed(%i):;",i);
-  const char * val=caseval(buf);
-  return turtle_ret(val);
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(turtle_speed_obj, 0, 1, turtle_speed);
-
-static const mp_map_elem_t turtle_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_forward), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_fd), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_backward), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_bk), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_left), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_lt), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_right), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rt), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_disque), (mp_obj_t) &turtle_disque_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rectangle_plein), (mp_obj_t) &turtle_rectangle_plein_obj },
-	{ MP_ROM_QSTR(MP_QSTR_triangle_plein), (mp_obj_t) &turtle_triangle_plein_obj },
-	{ MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_dessine_tortue), (mp_obj_t) &turtle_dessine_tortue_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setheading), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_seth), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setposition), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_goto), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setpos), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_setx), (mp_obj_t) &turtle_setx_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sety), (mp_obj_t) &turtle_sety_obj },
-	{ MP_ROM_QSTR(MP_QSTR_write), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_speed), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_showturtle), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_st), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_hideturtle), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ht), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_down), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_saute), (mp_obj_t) &turtle_saute_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pas_de_cote), (mp_obj_t) &turtle_pas_de_cote_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pendown), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pd), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_up), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_penup), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pu), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t) &turtle_pencolor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_avance), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_av), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_recule), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_gauche), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tg), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_droite), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_td), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rond), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_efface), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cap), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_heading), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pos), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_position), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ecris), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vitesse_tortue), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_montre_tortue), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cache_tortue), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_baisse_crayon), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_leve_crayon), (mp_obj_t) &turtle_up_obj },
-	/* { MP_ROM_QSTR(MP_QSTR_time), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sleep), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_monotonic), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_time), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_sleep), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_pensize), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_width), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_isdown), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_isvisible), (mp_obj_t) &turtle_up_obj },
-	{ MP_ROM_QSTR(MP_QSTR_color), (mp_obj_t) &turtle_up_obj },*/
-
-};
-
-
-static MP_DEFINE_CONST_DICT(turtle_locals_dict, turtle_locals_dict_table);
-
-const mp_obj_type_t turtle_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_turtle,
-    .locals_dict = (mp_obj_t)&turtle_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_turtle_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__turtle) },
-    { MP_ROM_QSTR(MP_QSTR_forward), (mp_obj_t) &turtle_forward_obj },
-    { MP_ROM_QSTR(MP_QSTR_fd), (mp_obj_t) &turtle_forward_obj },
-    { MP_ROM_QSTR(MP_QSTR_backward), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_bk), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-    { MP_ROM_QSTR(MP_QSTR_left), (mp_obj_t) &turtle_left_obj },
-    { MP_ROM_QSTR(MP_QSTR_lt), (mp_obj_t) &turtle_left_obj },
-    { MP_ROM_QSTR(MP_QSTR_right), (mp_obj_t) &turtle_right_obj },
-    { MP_ROM_QSTR(MP_QSTR_rt), (mp_obj_t) &turtle_right_obj },
-    { MP_ROM_QSTR(MP_QSTR_reset), (mp_obj_t) &turtle_reset_obj },
-    { MP_ROM_QSTR(MP_QSTR_dessine_tortue), (mp_obj_t) &turtle_dessine_tortue_obj },
-    { MP_ROM_QSTR(MP_QSTR_circle), (mp_obj_t) &turtle_circle_obj },
-    { MP_ROM_QSTR(MP_QSTR_disque), (mp_obj_t) &turtle_disque_obj },
-    { MP_ROM_QSTR(MP_QSTR_rectangle_plein), (mp_obj_t) &turtle_rectangle_plein_obj },
-    { MP_ROM_QSTR(MP_QSTR_triangle_plein), (mp_obj_t) &turtle_triangle_plein_obj },
-    { MP_ROM_QSTR(MP_QSTR_setheading), (mp_obj_t) &turtle_setheading_obj },
-    { MP_ROM_QSTR(MP_QSTR_goto), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_seth), (mp_obj_t) &turtle_setheading_obj },
-    { MP_ROM_QSTR(MP_QSTR_setposition), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_setpos), (mp_obj_t) &turtle_setposition_obj },
-    { MP_ROM_QSTR(MP_QSTR_setx), (mp_obj_t) &turtle_setx_obj },
-    { MP_ROM_QSTR(MP_QSTR_sety), (mp_obj_t) &turtle_sety_obj },
-    { MP_ROM_QSTR(MP_QSTR_write), (mp_obj_t) &turtle_write_obj },
-    { MP_ROM_QSTR(MP_QSTR_speed), (mp_obj_t) &turtle_speed_obj },
-    { MP_ROM_QSTR(MP_QSTR_showturtle), (mp_obj_t) &turtle_showturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_st), (mp_obj_t) &turtle_showturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_hideturtle), (mp_obj_t) &turtle_hideturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_ht), (mp_obj_t) &turtle_hideturtle_obj },
-    { MP_ROM_QSTR(MP_QSTR_down), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_saute), (mp_obj_t) &turtle_saute_obj },
-    { MP_ROM_QSTR(MP_QSTR_pas_de_cote), (mp_obj_t) &turtle_pas_de_cote_obj },
-    { MP_ROM_QSTR(MP_QSTR_pendown), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_pd), (mp_obj_t) &turtle_down_obj },
-    { MP_ROM_QSTR(MP_QSTR_up), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_penup), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_pu), (mp_obj_t) &turtle_up_obj },
-    { MP_ROM_QSTR(MP_QSTR_pencolor), (mp_obj_t) &turtle_pencolor_obj },
-	{ MP_ROM_QSTR(MP_QSTR_avance), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_av), (mp_obj_t) &turtle_forward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_recule), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_re), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_back), (mp_obj_t) &turtle_backward_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_gauche), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tg), (mp_obj_t) &turtle_left_obj },
-	{ MP_ROM_QSTR(MP_QSTR_tourne_droite), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_td), (mp_obj_t) &turtle_right_obj },
-	{ MP_ROM_QSTR(MP_QSTR_rond), (mp_obj_t) &turtle_circle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_efface), (mp_obj_t) &turtle_reset_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cap), (mp_obj_t) &turtle_setheading_obj },
-	{ MP_ROM_QSTR(MP_QSTR_position), (mp_obj_t) &turtle_setposition_obj },
-	{ MP_ROM_QSTR(MP_QSTR_ecris), (mp_obj_t) &turtle_write_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vitesse_tortue), (mp_obj_t) &turtle_speed_obj },
-	{ MP_ROM_QSTR(MP_QSTR_montre_tortue), (mp_obj_t) &turtle_showturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_cache_tortue), (mp_obj_t) &turtle_hideturtle_obj },
-	{ MP_ROM_QSTR(MP_QSTR_baisse_crayon), (mp_obj_t) &turtle_down_obj },
-	{ MP_ROM_QSTR(MP_QSTR_leve_crayon), (mp_obj_t) &turtle_up_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_turtle_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_turtle_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_turtle_globals_table),
-        .table = (mp_map_elem_t*)mp_module_turtle_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_turtle = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_turtle_globals,
-};
-
-/* MATPLOTL */
-static mp_obj_t matplotl_show(size_t n_args, const mp_obj_t *args) {
-  const char * val=caseval("show()");
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_show_obj, 0, 0, matplotl_show);
-
-static mp_obj_t matplotl_clf(size_t n_args, const mp_obj_t *args) {
-  const char * val=caseval("erase()");
-  return mp_obj_new_str(val,strlen(val));
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_clf_obj, 0, 0, matplotl_clf);
-
-static mp_obj_t matplotl_axis(size_t n_args, const mp_obj_t *args) {
-  if (n_args==0)
-    turtle_ret("axis: Autoscale");
-  double *x=0; size_t n=0,m=0;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    sprintf(buf,"axis(%s):;",ptr);
-    free(ptr);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  if (n_args==4){
-    double a=0,b=0,c=0,d=0;
-    if (mp_obj_is_float(args[0]))
-      a=mp_obj_get_float(args[0]);
-    if (MP_OBJ_IS_INT(args[0]))
-      a=mp_obj_get_int(args[0]);
-    if (mp_obj_is_float(args[1]))
-      b=mp_obj_get_float(args[1]);
-    if (MP_OBJ_IS_INT(args[1]))
-      b=mp_obj_get_int(args[1]);
-    if (mp_obj_is_float(args[2]))
-      c=mp_obj_get_float(args[2]);
-    if (MP_OBJ_IS_INT(args[2]))
-      c=mp_obj_get_int(args[2]);
-    if (mp_obj_is_float(args[3]))
-      d=mp_obj_get_float(args[3]);
-    if (MP_OBJ_IS_INT(args[3]))
-      d=mp_obj_get_int(args[3]);
-    if (a<b && c<d){
-      char buf[256]="";
-#ifdef NUMWORKS
-      strcat(buf,"axis(");
-      strcat_double(buf,a);
-      strcat(buf,",");
-      strcat_double(buf,b);
-      strcat(buf,",");
-      strcat_double(buf,c);
-      strcat(buf,",");
-      strcat_double(buf,d);
-      strcat(buf,"):;");
-#else      
-      sprintf(buf,"axis(%.14g,%.14g,%.14g,%.14g):;",a,b,c,d);
-#endif
-      const char * val=caseval(buf);
-      return turtle_ret(val);
-    }
-  }
-  return turtle_ret("axis: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_axis_obj, 0, 4, matplotl_axis);
-
-static mp_obj_t matplotl_text(size_t n_args, const mp_obj_t *args) {
-  double a=0,b=0;
-  if (mp_obj_is_float(args[0]))
-    a=mp_obj_get_float(args[0]);
-  if (MP_OBJ_IS_INT(args[0]))
-    a=mp_obj_get_int(args[0]);
-  if (mp_obj_is_float(args[1]))
-    b=mp_obj_get_float(args[1]);
-  if (MP_OBJ_IS_INT(args[1]))
-    b=mp_obj_get_int(args[1]);
-  if (MP_OBJ_IS_STR(args[2])){
-    char buf[256]="";
-#ifdef NUMWORKS
-    strcat(buf,"legend(point(");
-    strcat_double(buf,a);
-    strcat(buf,",");
-    strcat_double(buf,b);
-    char buf2[64];
-    sprintf(buf2,"),%s):;",mp_obj_str_get_str(args[2]));
-    strcat(buf,buf2);
-#else      
-    sprintf(buf,"legend(point(%.14g,%.14g),%s):;",a,b,mp_obj_str_get_str(args[2]));
-#endif
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("text: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_text_obj, 3, 3, matplotl_text);
-
-static mp_obj_t matplotl_plot(size_t n_args, const mp_obj_t *args) {
-  double *x=0,*y=0; size_t n=0,m=0,n1=0,m1=0;
-  int col=0;
-  if (n_args>=3)
-    col=mp_get_color(args[2]);
-  if (mp_array2doubletab(args[0],&x,&n,&m)){ 
-    char * ptrx=printtab(x,n,m);
-    free(x); 
-    char bufx[strlen(ptrx)+1];
-    strcpy(bufx,ptrx);
-    free(ptrx);
-    if (mp_array2doubletab(args[1],&y,&n1,&m1)){
-      char * ptry=printtab(y,n1,m1);
-      free(y);
-      char bufy[strlen(ptry)+1];
-      strcpy(bufy,ptry);
-      free(ptry);
-      if (n1==n && m==0 && m1==0){
-	char buf2[strlen(bufx)+strlen(bufy)+256];
-	sprintf(buf2,"polygonplot(%s,%s,color=%i):;",bufx,bufy,col>=0?col:0);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-    }
-  }
-  double xx=0,yy=0;
-  if (n_args>=2 && mp_int_float(args[0],&xx) && mp_int_float(args[1],&yy)){
-    char buf[512]="";
-#ifdef NUMWORKS
-    strcat(buf,"legend(point(");
-    strcat_double(buf,xx);
-    strcat(buf,",");
-    strcat_double(buf,yy);
-#else      
-    sprintf(buf,"point(%.14g,%.14g",xx,yy);
-#endif
-    if (col==-1)
-      sprintf(buf,",display=\"%s\"):;",translate_point_type(mp_obj_str_get_str(args[2])));
-    else
-      sprintf(buf,",color=%i):;",col);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("polygonplot: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_plot_obj, 2, 3, matplotl_plot);
-
-static mp_obj_t matplotl_bar_hist(size_t n_args, const mp_obj_t *args,bool bar) {
-  double *x=0; size_t n=0,m=0;
-  double largeur=0.8;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    if (n_args==1)
-      sprintf(buf,bar?"barplot(%s):;":"histogram(%s):;",ptr);
-    else
-      sprintf(buf,bar?"barplot(%s":"histogram(%s",ptr);
-    free(ptr);
-    if (n_args>=2){
-      if (mp_obj_is_float(args[1]))
-	largeur=mp_obj_get_float(args[1]);
-      if (n_args==3 && mp_obj_is_float(args[2]))
-	largeur=mp_obj_get_float(args[2]);
-      if (mp_array2doubletab(args[1],&x,&n,&m)){
-	ptr=printtab(x,n,m);
-	free(x);
-	char buf2[strlen(buf)+strlen(ptr)+256];
-#ifdef NUMWORKS
-	sprintf(buf2,"%s,%s,",buf,ptr);
-	strcat_double(buf2,largeur);
-	strcat(buf2,"):;");
-#else
-	sprintf(buf2,"%s,%s,%.3g):;",buf,ptr,largeur);
-#endif
-	free(ptr);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-      char buf2[strlen(buf)+256];
-#ifdef NUMWORKS
-      sprintf(buf2,"%s,",buf);
-      strcat_double(buf2,largeur);
-      strcat(buf2,"):;");
-#else
-      sprintf(buf2,"%s,%.3g):;",buf,largeur);
-#endif
-      const char * val=caseval(buf2);
-      return turtle_ret(val);
-    }
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret(bar?"barplot: Bad argument type":"histogram: Bad argument type");
-}
-static mp_obj_t matplotl_bar(size_t n_args, const mp_obj_t *args) {
-  return matplotl_bar_hist(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_bar_obj, 1, 3, matplotl_bar);
-
-static mp_obj_t matplotl_hist(size_t n_args, const mp_obj_t *args) {
-  return matplotl_bar_hist(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_hist_obj, 1, 3, matplotl_hist);
-
-static mp_obj_t matplotl_boxplot(size_t n_args, const mp_obj_t *args) {
-  double *x=0; size_t n=0,m=0;
-  int col=0;
-  if (n_args==2)
-    col=mp_get_color(args[1]);
-  if (mp_array2doubletab(args[0],&x,&n,&m)){
-    char * ptr=printtab(x,n,m);
-    free(x);
-    char buf[strlen(ptr)+256];
-    sprintf(buf,"moustache(%s,color=%i):;",ptr,col>=0?col:0);
-    free(ptr);
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("moustache: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_boxplot_obj, 1, 2, matplotl_boxplot);
-
-static mp_obj_t matplotl_arrow(size_t n_args, const mp_obj_t *args) {
-  double a=0,b=0,c=0,d=d;
-  int col=0;
-  if (n_args==5)
-    col=mp_get_color(args[4]);
-  if (mp_int_float(args[0],&a) && mp_int_float(args[1],&b) &&
-      mp_int_float(args[2],&c) && mp_int_float(args[3],&d)){
-    char buf[512]="";
-#ifdef NUMWORKS
-    strcat(buf,"vector([");
-    strcat_double(buf,a);
-    strcat(buf,",");
-    strcat_double(buf,b);
-    strcat(buf,"],[");
-    strcat_double(buf,c);
-    strcat(buf,",");
-    strcat_double(buf,d);
-    char buf2[64];
-    sprintf(buf2,"],color=%i):;",col);
-    strcat(buf,buf2);
-#else          
-    sprintf(buf,"vector([%.14g,%.14g],[%.14g,%.14g],color=%i):;",a,b,c,d,col);
-#endif
-    const char * val=caseval(buf);
-    return turtle_ret(val);
-  }
-  return turtle_ret("vector: Bad argument type");
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_arrow_obj, 4, 5, matplotl_arrow);
-
-static mp_obj_t matplotl_grid(size_t n_args, const mp_obj_t *args) {
-  bool b=true;
-  if (n_args==1 && MP_OBJ_IS_SMALL_INT(args[0]) && MP_OBJ_SMALL_INT_VALUE(args[0])==0)
-    b=false;
-  char buf[64];
-  sprintf(buf,"axes=%i",b?1:0);
-  const char * val=caseval(buf);
-  return turtle_ret(val);  
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_grid_obj, 0, 1, matplotl_grid);
-
-static mp_obj_t matplotl_scatter_reg(size_t n_args, const mp_obj_t *args,bool scatter) {
-  int col=0;
-  if (n_args==3)
-    col=mp_get_color(args[2]);
-  double *x=0,*y=0; size_t n=0,m=0,n1=0,m1=0;
-  if (mp_array2doubletab(args[0],&x,&n,&m)){ 
-    char * ptrx=printtab(x,n,m);
-    free(x); 
-    char bufx[strlen(ptrx)+1];
-    strcpy(bufx,ptrx);
-    free(ptrx);
-    if (mp_array2doubletab(args[1],&y,&n1,&m1)){
-      char * ptry=printtab(y,n1,m1);
-      free(y);
-      char bufy[strlen(ptry)+1];
-      strcpy(bufy,ptry);
-      free(ptry);
-      if (n1==n && m==0 && m1==0){
-	char buf2[strlen(bufx)+strlen(bufy)+256];
-	if (scatter)
-	  sprintf(buf2,"scatterplot(%s,%s,color=%i):;",bufx,bufy,col);
-	else
-	  sprintf(buf2,"linear_regression_plot(%s,%s,color=%i):;",bufx,bufy,col);
-	const char * val=caseval(buf2);
-	return turtle_ret(val);
-      }
-    }
-  }
-  return turtle_ret("scatterplot: Bad argument type");
-}
-static mp_obj_t matplotl_scatter(size_t n_args, const mp_obj_t *args) {
-  return matplotl_scatter_reg(n_args,args,true);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_scatter_obj, 2, 3, matplotl_scatter);
-static mp_obj_t matplotl_linear_regression_plot(size_t n_args, const mp_obj_t *args) {
-  return matplotl_scatter_reg(n_args,args,false);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(matplotl_linear_regression_plot_obj, 2, 3, matplotl_linear_regression_plot);
-
-//
-static const mp_map_elem_t matplotl_locals_dict_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &matplotl_show_obj },
-	{ MP_ROM_QSTR(MP_QSTR_clf), (mp_obj_t) &matplotl_clf_obj },
-	{ MP_ROM_QSTR(MP_QSTR_axis), (mp_obj_t) &matplotl_axis_obj },
-	{ MP_ROM_QSTR(MP_QSTR_text), (mp_obj_t) &matplotl_text_obj },
-	{ MP_ROM_QSTR(MP_QSTR_plot), (mp_obj_t) &matplotl_plot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_bar), (mp_obj_t) &matplotl_bar_obj },
-	{ MP_ROM_QSTR(MP_QSTR_hist), (mp_obj_t) &matplotl_hist_obj },
-	{ MP_ROM_QSTR(MP_QSTR_histogram), (mp_obj_t) &matplotl_hist_obj },
-	{ MP_ROM_QSTR(MP_QSTR_boxplot), (mp_obj_t) &matplotl_boxplot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_boxwhisker), (mp_obj_t) &matplotl_boxplot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_arrow), (mp_obj_t) &matplotl_arrow_obj },
-	{ MP_ROM_QSTR(MP_QSTR_grid), (mp_obj_t) &matplotl_grid_obj },
-	{ MP_ROM_QSTR(MP_QSTR_vector), (mp_obj_t) &matplotl_arrow_obj },
-	{ MP_ROM_QSTR(MP_QSTR_barplot), (mp_obj_t) &matplotl_bar_obj },
-	{ MP_ROM_QSTR(MP_QSTR_scatter), (mp_obj_t) &matplotl_scatter_obj },
-	{ MP_ROM_QSTR(MP_QSTR_linear_regression_plot), (mp_obj_t) &matplotl_linear_regression_plot_obj },
-	{ MP_ROM_QSTR(MP_QSTR_scatterplot), (mp_obj_t) &matplotl_scatter_obj },
-};
-
-
-static MP_DEFINE_CONST_DICT(matplotl_locals_dict, matplotl_locals_dict_table);
-
-const mp_obj_type_t matplotl_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_matplotl,
-    .locals_dict = (mp_obj_t)&matplotl_locals_dict
-};
-
-
-STATIC const mp_map_elem_t mp_module_matplotl_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__matplotl) },
-    { MP_ROM_QSTR(MP_QSTR_show), (mp_obj_t) &matplotl_show_obj },
-    { MP_ROM_QSTR(MP_QSTR_clf), (mp_obj_t) &matplotl_clf_obj },
-    { MP_ROM_QSTR(MP_QSTR_axis), (mp_obj_t) &matplotl_axis_obj },
-    { MP_ROM_QSTR(MP_QSTR_text), (mp_obj_t) &matplotl_text_obj },
-    { MP_ROM_QSTR(MP_QSTR_plot), (mp_obj_t) &matplotl_plot_obj },
-    { MP_ROM_QSTR(MP_QSTR_boxplot), (mp_obj_t) &matplotl_boxplot_obj },
-    { MP_ROM_QSTR(MP_QSTR_boxwhisker), (mp_obj_t) &matplotl_boxplot_obj },
-    { MP_ROM_QSTR(MP_QSTR_arrow), (mp_obj_t) &matplotl_arrow_obj },
-    { MP_ROM_QSTR(MP_QSTR_grid), (mp_obj_t) &matplotl_grid_obj },
-    { MP_ROM_QSTR(MP_QSTR_vector), (mp_obj_t) &matplotl_arrow_obj },
-    { MP_ROM_QSTR(MP_QSTR_bar), (mp_obj_t) &matplotl_bar_obj },
-    { MP_ROM_QSTR(MP_QSTR_hist), (mp_obj_t) &matplotl_hist_obj },
-    { MP_ROM_QSTR(MP_QSTR_histogram), (mp_obj_t) &matplotl_hist_obj },
-    { MP_ROM_QSTR(MP_QSTR_barplot), (mp_obj_t) &matplotl_bar_obj },
-    { MP_ROM_QSTR(MP_QSTR_scatter), (mp_obj_t) &matplotl_scatter_obj },
-    { MP_ROM_QSTR(MP_QSTR_linear_regression_plot), (mp_obj_t) &matplotl_linear_regression_plot_obj },
-    { MP_ROM_QSTR(MP_QSTR_scatterplot), (mp_obj_t) &matplotl_scatter_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_matplotl_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_matplotl_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_matplotl_globals_table),
-        .table = (mp_map_elem_t*)mp_module_matplotl_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_matplotl = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_matplotl_globals,
-};
-
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/icas.c~ b/apps/KhiCAS/src/micropython-1.12/xcas/icas.c~
deleted file mode 100644
index dcf5f16bc..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/icas.c~
+++ /dev/null
@@ -1,152 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-/* micropython alone test file */
-
-void console_output(const char * s){
-  printf("%s",s);
-}
-
-const char * console_input(){
-  static char buf[1024];
-  int i=0;
-  for (;i<sizeof(buf)-1;++i){
-    char c=getc(stdin);
-    if (c==10 || c==13)
-      break;
-    buf[i]=c;
-  }
-  buf[i]=0;
-  return buf;
-}
-
-const char * read_file(const char * filename){
-  FILE * f =fopen(filename,"r");
-  static char buf[256*1024];
-  fscanf(f,"%s",buf);
-  return buf;
-}
-
-int getkey(int allow_suspend){
-  return getc(stdin);
-}
-
-int file_exists(const char * filename){
-  if (access(filename,R_OK))
-    return 0;
-  return 1;
-}
-
-int turtle_freeze=0;
-
-void sync_screen(){
-}
-
-const char * caseval(const char * s){
-  return s;
-}
-
-void c_sprint_double(char * s,double d){
-  sprintf("%.14g",s,d);
-}
-
-void c_draw_rectangle(int x,int y,int w,int h,int c){
-}
-void c_draw_line(int x0,int y0,int x1,int y1,int c){
-}
-void c_fill_rect(int x,int y,int w,int h,int c){
-}
-int c_draw_string(int x,int y,int c,int bg,const char * s,int fake){
-  return 0;
-}
-int c_draw_string_small(int x,int y,int c,int bg,const char * s,int fake){
-  return 0;
-}
-int c_draw_string_medium(int x,int y,int c,int bg,const char * s,int fake){
-  return 0; 
-}
-void c_draw_circle(int xc,int yc,int r,int color,int q1,int q2,int q3,int q4){
-}
-void c_draw_filled_circle(int xc,int yc,int r,int color,int left,int right){
-}
-void c_draw_polygon(int * x,int *y ,int n,int color){
-}
-void c_draw_filled_polygon(int * x,int *y, int n,int xmin,int xmax,int ymin,int ymax,int color){
-}
-int os_get_pixel(int x,int y){
-  return 0; 
-}
-void c_set_pixel(int x,int y,int c){
-}
-void c_draw_arc(int xc,int yc,int rx,int ry,int color,double theta1, double theta2){
-}
-void c_draw_filled_arc(int x,int y,int rx,int ry,int theta1_deg,int theta2_deg,int color,int xmin,int xmax,int ymin,int ymax,int segment){
-}
-struct double_pair {
-  double r,i;
-} ;
-typedef struct double_pair c_complex;
-
-int c_inv(c_complex * x,int n){
-  return 0;
-}
-
-c_complex c_det(c_complex *x,int n){
-  return x[0];
-}
-
-int c_rref(c_complex * x,int n,int m){
-  return 0;
-}
-
-int c_egv(c_complex * x,int n){
-  return 0;
-}
-
-int c_eig(c_complex * x,c_complex * d,int n){
-  return 0;
-}
-
-int c_proot(c_complex * x,int n){
-  return 0;
-}
-
-int c_pcoeff(c_complex * x,int n){
-  return 0;
-}
-
-int c_fft(c_complex * x,int n,int inverse){
-  return 0;
-}
-
-#include "py/mpstate.h"
-#include "py/nlr.h"
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-#include "py/repl.h"
-#include "py/gc.h"
-#include "py/stackctrl.h"
-#include "py/mphal.h"
-#include "py/mpthread.h"
-#include "py/mperrno.h"
-#include "extmod/misc.h"
-#include "genhdr/mpversion.h"
-#include "input.h"
-
-
-MP_NOINLINE int main_(int argc, char **argv);
-
-int main(int argc, char **argv) {
-    #if MICROPY_PY_THREAD
-    mp_thread_init();
-    #endif
-    // We should capture stack top ASAP after start, and it should be
-    // captured guaranteedly before any other stack variables are allocated.
-    // For this, actual main (renamed main_) should not be inlined into
-    // this function. main_() itself may have other functions inlined (with
-    // their own stack variables), that's why we need this main/main_ split.
-    mp_stack_ctrl_init();
-    return main_(argc, argv);
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/input.c~ b/apps/KhiCAS/src/micropython-1.12/xcas/input.c~
deleted file mode 100644
index 113397341..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/input.c~
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "input.h"
-
-const char * console_input(const char * msg1,const char * msg2,bool numeric,int ypos);
-
-char *prompt(char *p) {
-  return strdup(console_input(p,"? ",false,185));
-}
-
-STATIC mp_obj_t mp_builtin_input(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 1) {
-        mp_obj_print(args[0], PRINT_STR);
-    }
-
-    char *line = prompt("");
-    if (line == NULL) {
-        nlr_raise(mp_obj_new_exception(&mp_type_EOFError));
-    }
-    mp_obj_t o = mp_obj_new_str(line, strlen(line));
-    free(line);
-    return o;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj, 0, 1, mp_builtin_input);
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/input.h~ b/apps/KhiCAS/src/micropython-1.12/xcas/input.h~
deleted file mode 100644
index 8b1378917..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/input.h~
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/main.c~ b/apps/KhiCAS/src/micropython-1.12/xcas/main.c~
deleted file mode 100644
index e1a4592eb..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/main.c~
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#include "py/mpstate.h"
-#include "py/nlr.h"
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/builtin.h"
-#include "py/repl.h"
-#include "py/gc.h"
-#include "py/stackctrl.h"
-#include "py/mphal.h"
-#include "py/mpthread.h"
-#include "py/mperrno.h"
-#include "extmod/misc.h"
-#include "genhdr/mpversion.h"
-#include "input.h"
-#ifndef PATH_MAX
-#define PATH_MAX 128
-#endif
-
-void console_output(const char *,int);
-const char * read_file(const char * filename);
-bool file_exists(const char * filename);
-
-#if 0
-const char numpy_script[]=R"(import linalg
-import math
-class array: 
-    def __init__(self, a): 
-        self.a = a 
-  
-    def __add__(self, other): 
-        return array(linalg.add(self.a , other.a))
-  
-    def __sub__(self, other): 
-        return array(linalg.sub(self.a , other.a))
-  
-    def __mul__(self, other):
-        if type(self)==array:
-            if type(other)==array:
-                return array(linalg.mul(self.a , other.a))
-            return array(linalg.mul(self.a,other))
-        return array(linalg.mul(self,other.a))
-    
-    def __rmul__(self, other): 
-        if type(self)==array:
-            if type(other)==array:
-                return array(linalg.mul(self.a , other.a))
-            return array(linalg.mul(self.a,other))
-        return array(linalg.mul(self,other.a))
-
-    def __matmul__(self, other):
-        return __mul(self,other)
-
-    def __getitem__(self,key):
-        r=(self.a)[key]
-        if type(r)==list or type(r)==tuple:
-            return array(r)
-        return r
-
-    def __setitem__(self, key, value):
-        if (type(value)==array):
-            (self.a)[key]=value.a
-        else:
-            (self.a)[key]=value
-        return None
-
-    def __len__(self):
-        return len(self.a)
-    
-    def __str__(self): 
-        return 'array('+str(self.a)+')'
-  
-    def __repr__(self): 
-        return 'array('+str(self.a)+')'
-  
-    def __neg__(self):
-        return array(-self.a)
-
-    def __pos__(self):
-        return self
-    
-    def __abs__(self):
-        return array(linalg.abs(self.a))
-
-    def __round__(self):
-        return array(linalg.apply(round,self.a,linalg.matrix))
-
-    def __trunc__(self):
-        return array(linalg.apply(trunc,self.a,linalg.matrix))
-
-    def __floor__(self):
-        return array(linalg.apply(floor,self.a,linalg.matrix))
-
-    def __ceil__(self):
-        return array(linalg.apply(ceil,self.a,linalg.matrix))
-
-    def T(self):
-        return array(linalg.transpose(self.a))
-            
-def real(x):
-    if type(x)==array:
-        return array(linalg.re(x.a))
-    return x.real
-
-def imag(x):
-    if type(x)==array:
-        return array(linalg.im(x.a))
-    return x.imag
-
-def conj(x):
-    if type(x)==array:
-        return array(linalg.conj(x.a))
-    return linalg.conj(x)
-
-def sin(x):
-    if type(x)==array:
-        return array(linalg.apply(math.sin,x.a,linalg.matrix))
-    return math.sin(x)
-
-def cos(x):
-    if type(x)==array:
-        return array(linalg.apply(math.cos,x.a,linalg.matrix))
-    return math.cos(x)
-
-def tan(x):
-    if type(x)==array:
-        return array(linalg.apply(math.tan,x.a,linalg.matrix))
-    return math.tan(x)
-
-def asin(x):
-    if type(x)==array:
-        return array(linalg.apply(math.asin,x.a,linalg.matrix))
-    return math.asin(x)
-
-def acos(x):
-    if type(x)==array:
-        return array(linalg.apply(math.acos,x.a,linalg.matrix))
-    return math.acos(x)
-
-def atan(x):
-    if type(x)==array:
-        return array(linalg.apply(math.atan,x.a,linalg.matrix))
-    return math.atan(x)
-
-def sinh(x):
-    if type(x)==array:
-        return array(linalg.apply(math.sinh,x.a,linalg.matrix))
-    return math.sinh(x)
-
-def cosh(x):
-    if type(x)==array:
-        return array(linalg.apply(math.cosh,x.a,linalg.matrix))
-    return math.cosh(x)
-
-def tanh(x):
-    if type(x)==array:
-        return array(linalg.apply(math.tanh,x.a,linalg.matrix))
-    return math.tanh(x)
-
-def exp(x):
-    if type(x)==array:
-        return array(linalg.apply(math.exp,x.a,linalg.matrix))
-    return math.exp(x)
-
-def log(x):
-    if type(x)==array:
-        return array(linalg.apply(math.log,x.a,linalg.matrix))
-    return math.log(x)
-
-def size(x):
-    if type(x)==array:
-        return linalg.size(x.a)
-    return linalg.size(x)
-
-def shape(x):
-    if type(x)==array:
-        return linalg.shape(x.a)
-
-def dot(a,b):
-    return a*b
-
-def transpose(a):
-    if type(x)==array:
-        return array(linalg.transpose(x.a))
-
-def trn(a):
-    if type(x)==array:
-        return array(linalg.conj(linalg.transpose(x.a)))
-    return linalg.conj(linalg.transpose(x.a))
-
-def zeros(n,m=0):
-    return array(linalg.zeros(n,m))
-
-def ones(n,m=0):
-    return array(linalg.ones(n,m))
-
-def eye(n):
-    return array(linalg.eye(n))
-
-def det(x):
-    if type(x)==array:
-        return linalg.det(x.a)
-    return linalg.det(x)
-
-def inv(x):
-    if type(x)==array:
-        return array(linalg.inv(x.a))
-    return linalg.inv(x)
-
-def solve(a,b):
-    if type(a)==array:
-        if type(b)==array:
-            return array(linalg.solve(a.a,b.a))
-        return array(linalg.solve(a.a,b))
-    if type(b)==array:
-        return array(linalg.solve(a,b.a))
-    return linalg.solve(a,b)
-
-def eig(a):
-    if type(a)==array:
-        r=linalg.eig(a.a)
-        return array(r[0]),array(r[1])
-    return linalg.eig(a)
-
-def linspace(a,b,c):
-    return array(linalg.linspace(a,b,c))
-
-def arange(a,b,c=1):
-    return array(linalg.arange(a,b,c))
-
-def reshape(a,n,m=0):
-    if type(n)==tuple:
-        m=n[1]
-        n=n[0]
-    if type(a)==array:
-        return array(linalg.matrix(n,m,a.a))
-    return linalg.matrix(n,m,a)
-)";
-
-mp_lexer_t * mp_lexer_new_from_file(const char * filename) {
-  const char * script=read_file(filename);
-  if (!script && strcmp(filename,"numpy.py")==0)
-    script=numpy_script;
-  if (script) 
-    return mp_lexer_new_from_str_len(qstr_from_str(filename), script, strlen(script), 0 /* size_t free_len*/);
-  else
-    mp_raise_OSError(MP_ENOENT);
-}
-#endif
-
-mp_import_stat_t mp_import_stat(const char *path) {
-  if (strcmp(path,"numpy.py")==0 || file_exists(path)) {
-    return MP_IMPORT_STAT_FILE;
-  }
-  return MP_IMPORT_STAT_NO_EXIST;
-}
-
-
-#if MICROPY_KBD_EXCEPTION
-int mp_interrupt_char=5;
-
-void mp_hal_set_interrupt_char(int c) {
-  if (c != -1) {
-    mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
-  }
-  mp_interrupt_char = c;
-}
-
-void mp_keyboard_interrupt(void) {
-  MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
-}
-
-bool back_key_pressed();
-int getkey(int allow_suspend);
-
-
-int micropython_port_vm_hook_loop() {
-  /* This function is called very frequently by the MicroPython engine. We grab
-   * this opportunity to interrupt execution and/or refresh the display on
-   * platforms that need it. */
-
-  /* Doing too many things here slows down Python execution quite a lot. So we
-   * only do things once in a while and return as soon as possible otherwise. */
-  static int c = 0;
-
-  ++c; 
-  if (c & 0x7ff ) {
-    return 0;
-  }
-
-  // Check if the user asked for an interruption from the keyboard
-  int g=getkey(mp_interrupt_char | 0x80000000);
-  if (!g) return 0;
-  mp_keyboard_interrupt();
-  return 1;
-}
-
-
-#endif
-
-// Command line options, with their defaults
-// STATIC uint emit_opt = MP_EMIT_OPT_NONE;
-
-#if MICROPY_ENABLE_GC
-// Heap size of GC heap (if enabled)
-// Make it larger on a 64 bit machine, because pointers are larger.
-long heap_size = 1024*1024 * (sizeof(mp_uint_t) / 4);
-#endif
-
-STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
-  console_output(str,len); return;
-    (void)env;
-    ssize_t dummy = write(STDERR_FILENO, str, len);
-    mp_uos_dupterm_tx_strn(str, len);
-    (void)dummy;
-}
-
-const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
-
-#define FORCED_EXIT (0x100)
-// If exc is SystemExit, return value where FORCED_EXIT bit set,
-// and lower 8 bits are SystemExit value. For all other exceptions,
-// return 1.
-STATIC int handle_uncaught_exception(mp_obj_base_t *exc) {
-    // check for SystemExit
-    if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
-        // None is an exit value of 0; an int is its value; anything else is 1
-        mp_obj_t exit_val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(exc));
-        mp_int_t val = 0;
-        if (exit_val != mp_const_none && !mp_obj_get_int_maybe(exit_val, &val)) {
-            val = 1;
-        }
-        return FORCED_EXIT | (val & 255);
-    }
-
-    // Report all other exceptions
-    mp_obj_print_exception(&mp_stderr_print, MP_OBJ_FROM_PTR(exc));
-    return 1;
-}
-
-#define LEX_SRC_STR (1)
-#define LEX_SRC_VSTR (2)
-#define LEX_SRC_FILENAME (3)
-#define LEX_SRC_STDIN (4)
-
-// Returns standard error codes: 0 for success, 1 for all other errors,
-// except if FORCED_EXIT bit is set then script raised SystemExit and the
-// value of the exit is in the lower 8 bits of the return value
-int execute_from_lexer(int source_kind, const void *source, mp_parse_input_kind_t input_kind, bool is_repl) {
-
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        // create lexer based on source kind
-        mp_lexer_t *lex;
-        if (source_kind == LEX_SRC_STR) {
-            const char *line = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, line, strlen(line), false);
-        } else if (source_kind == LEX_SRC_VSTR) {
-            const vstr_t *vstr = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, false);
-        } else if (source_kind == LEX_SRC_FILENAME) {
-            lex = mp_lexer_new_from_file((const char*)source);
-        } else { // LEX_SRC_STDIN
-            lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, 0, false);
-        }
-
-        qstr source_name = lex->source_name;
-
-        #if MICROPY_PY___FILE__
-        if (input_kind == MP_PARSE_FILE_INPUT) {
-            mp_store_global(MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
-        }
-        #endif
-	parser_errorline=0; parser_errorcol=0;
-        mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
-
-        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, is_repl);
-
-        // execute it
-        mp_call_function_0(module_fun);
-        // check for pending exception
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
-        }
-
-        nlr_pop();
-        return 0;
-    } else {
-        // uncaught exception
-        return handle_uncaught_exception(nlr.ret_val);
-    }
-}
-
-STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
-    int l1 = strlen(s1);
-    int l2 = strlen(s2);
-    char *s = malloc(l1 + l2 + 2);
-    memcpy(s, s1, l1);
-    if (sep_char != 0) {
-        s[l1] = sep_char;
-        l1 += 1;
-    }
-    memcpy(s + l1, s2, l2);
-    s[l1 + l2] = 0;
-    return s;
-}
-
-int do_repl(void) {
-    mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "\n");
-
-    // use simple readline
-
-    for (;;) {
-        char *line = prompt(">>> ");
-        if (line == NULL) {
-            // EOF
-            return 0;
-        }
-        while (mp_repl_continue_with_input(line)) {
-            char *line2 = prompt("... ");
-            if (line2 == NULL) {
-                break;
-            }
-            char *line3 = strjoin(line, '\n', line2);
-            free(line);
-            free(line2);
-            line = line3;
-        }
-
-        int ret = execute_from_lexer(LEX_SRC_STR, line, MP_PARSE_SINGLE_INPUT, true);
-        if (ret & FORCED_EXIT) {
-            return ret;
-        }
-
-        free(line);
-    }
-}
-
-#include "main.h"
-int do_file(const char *file) {
-    return execute_from_lexer(LEX_SRC_FILENAME, file, MP_PARSE_FILE_INPUT, false);
-}
-
-/*
-STATIC int do_str(const char *str) {
-    return execute_from_lexer(LEX_SRC_STR, str, MP_PARSE_FILE_INPUT, false);
-}
-*/
-
-STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
-    for (int i = start_arg; i < argc; i++) {
-        mp_obj_list_append(mp_sys_argv, MP_OBJ_NEW_QSTR(qstr_from_str(argv[i])));
-    }
-}
-
-MP_NOINLINE int main_(int argc, char **argv);
-
-
-int micropy_eval(const char * str){
-  nlr_buf_t nlr;
-  if (nlr_push(&nlr) == 0) {
-    parser_errorline=0;
-    mp_lexer_t *lex = mp_lexer_new_from_str_len(0, str, strlen(str), false);
-    mp_parse_tree_t pt = mp_parse(lex, MP_PARSE_FILE_INPUT);
-    mp_obj_t module_fun = mp_compile(&pt, lex->source_name,true);
-    // mp_hal_set_interrupt_char((int)Ion::Keyboard::Key::Back);
-    mp_call_function_0(module_fun);
-    // mp_hal_set_interrupt_char(-1); // Disable interrupt
-    nlr_pop();
-  } else { // Uncaught exception
-#if 1
-    handle_uncaught_exception(nlr.ret_val);
-#else
-    /* mp_obj_print_exception is supposed to handle error printing. However,
-     * because we want to print custom information, we copied and modified the
-     * content of mp_obj_print_exception instead of calling it. */
-    if (mp_obj_is_exception_instance((mp_obj_t)nlr.ret_val)) {
-        size_t n, *values;
-        mp_obj_exception_get_traceback((mp_obj_t)nlr.ret_val, &n, &values);
-        if (n > 0) {
-            assert(n % 3 == 0);
-            for (int i = n - 3; i >= 0; i -= 3) {
-              if (values[i] != 0 || i == 0) {
-                if (values[i] == 0) {
-                  mp_printf(&mp_plat_print, "  Last command\n");
-                } else {
-#if MICROPY_ENABLE_SOURCE_LINE
-                  mp_printf(&mp_plat_print, "  File \"%q\", line %d", values[i], (int)values[i + 1]);
-#else
-                  mp_printf(&mp_plat_print, "  File \"%q\"", values[i]);
-#endif
-                  // the block name can be NULL if it's unknown
-                  qstr block = values[i + 2];
-                  if (block == MP_QSTR_NULL) {
-                    mp_print_str(&mp_plat_print, "\n");
-                  } else {
-                    mp_printf(&mp_plat_print, ", in %q\n", block);
-                  }
-                }
-              }
-            }
-        }
-    }
-    mp_obj_print_helper(&mp_plat_print, (mp_obj_t)nlr.ret_val, PRINT_EXC);
-    mp_print_str(&mp_plat_print, "\n");
-    /* End of mp_obj_print_exception. */
-#endif
-  }
-  return 0;
-}
-
-#ifndef MICROPY_LIB
-int main(int argc, char **argv) {
-    #if MICROPY_PY_THREAD
-    mp_thread_init();
-    #endif
-    // We should capture stack top ASAP after start, and it should be
-    // captured guaranteedly before any other stack variables are allocated.
-    // For this, actual main (renamed main_) should not be inlined into
-    // this function. main_() itself may have other functions inlined (with
-    // their own stack variables), that's why we need this main/main_ split.
-    mp_stack_ctrl_init();
-    return main_(argc, argv);
-}
-#endif
-
-char * micropy_init(int stack_size,int heap_size){
-  mp_stack_set_limit(40000 * (BYTES_PER_WORD / 4));
-
-    //Disable output buffering, otherwise interactive mode becomes useless
-    setbuf(stdout, NULL);
-  
-    mp_stack_set_limit(stack_size);// (32768);
-
-#if MICROPY_ENABLE_GC
-    char *heap = malloc(heap_size);
-    if(!heap)
-    {
-	return 0;
-    }
-    gc_init(heap, heap + heap_size - 1);
-#endif
-
-    mp_init();
-
-    return heap;
-}
-
-MP_NOINLINE int main_(int argc, char **argv) {
-  
-  char * heap=micropy_init(16*1024,32*1024);
-#if MICROPY_ENABLE_GC
-  if (!heap)
-    return 1;
-#endif
-    const int NOTHING_EXECUTED = -2;
-    int ret = do_repl();
-
-    mp_deinit();
-
-    if (heap) free(heap);
-
-    return ret & 0xff;
-}
-
-void nlr_jump_fail(void *val) {
-    printf("FATAL: uncaught NLR %p\n", val);
-    exit(1);
-}
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/mklib.simu~ b/apps/KhiCAS/src/micropython-1.12/xcas/mklib.simu~
deleted file mode 100755
index 544f79968..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/mklib.simu~
+++ /dev/null
@@ -1,4 +0,0 @@
-# /bin/bash
-make
-arm-none-eabi-ar cru libmicropy.a build/py/mpstate.o build/py/nlr.o build/py/nlrx86.o build/py/nlrx64.o build/py/nlrthumb.o build/py/nlrpowerpc.o build/py/nlrxtensa.o build/py/nlrsetjmp.o build/py/malloc.o build/py/gc.o build/py/pystack.o build/py/qstr.o build/py/vstr.o build/py/mpprint.o build/py/unicode.o build/py/mpz.o build/py/reader.o build/py/lexer.o build/py/parse.o build/py/scope.o build/py/compile.o build/py/emitcommon.o build/py/emitbc.o build/py/asmbase.o build/py/asmx64.o build/py/emitnx64.o build/py/asmx86.o build/py/emitnx86.o build/py/asmthumb.o build/py/emitnthumb.o build/py/emitinlinethumb.o build/py/asmarm.o build/py/emitnarm.o build/py/asmxtensa.o build/py/emitnxtensa.o build/py/emitinlinextensa.o build/py/emitnxtensawin.o build/py/formatfloat.o build/py/parsenumbase.o build/py/parsenum.o build/py/emitglue.o build/py/persistentcode.o build/py/runtime.o build/py/runtime_utils.o build/py/scheduler.o build/py/nativeglue.o build/py/ringbuf.o build/py/stackctrl.o build/py/argcheck.o build/py/warning.o build/py/profile.o build/py/map.o build/py/obj.o build/py/objarray.o build/py/objattrtuple.o build/py/objbool.o build/py/objboundmeth.o build/py/objcell.o build/py/objclosure.o build/py/objcomplex.o build/py/objdeque.o build/py/objdict.o build/py/objenumerate.o build/py/objexcept.o build/py/objfilter.o build/py/objfloat.o build/py/objfun.o build/py/objgenerator.o build/py/objgetitemiter.o build/py/objint.o build/py/objint_longlong.o build/py/objint_mpz.o build/py/objlist.o build/py/objmap.o build/py/objmodule.o build/py/objobject.o build/py/objpolyiter.o build/py/objproperty.o build/py/objnone.o build/py/objnamedtuple.o build/py/objrange.o build/py/objreversed.o build/py/objset.o build/py/objsingleton.o build/py/objslice.o build/py/objstr.o build/py/objstrunicode.o build/py/objstringio.o build/py/objtuple.o build/py/objtype.o build/py/objzip.o build/py/opmethods.o build/py/sequence.o build/py/stream.o build/py/binary.o build/py/builtinimport.o build/py/builtinevex.o build/py/builtinhelp.o build/py/modarray.o build/py/modbuiltins.o build/py/modcollections.o build/py/modgc.o build/py/modio.o build/py/modmath.o build/py/modcmath.o build/py/modmicropython.o build/py/modstruct.o build/py/modsys.o build/py/moduerrno.o build/py/modthread.o build/py/vm.o build/py/bc.o build/py/showbc.o build/py/repl.o build/py/smallint.o build/py/frozenmod.o build/extmod/moductypes.o build/extmod/modujson.o build/extmod/modure.o build/extmod/moduzlib.o build/extmod/moduheapq.o build/extmod/modutimeq.o build/extmod/moduhashlib.o build/extmod/moducryptolib.o build/extmod/modubinascii.o build/extmod/virtpin.o build/extmod/machine_mem.o build/extmod/machine_pinbase.o build/extmod/machine_signal.o build/extmod/machine_pulse.o build/extmod/machine_i2c.o build/extmod/machine_spi.o build/extmod/modbluetooth.o build/extmod/modussl_axtls.o build/extmod/modussl_mbedtls.o build/extmod/modurandom.o build/extmod/moduselect.o build/extmod/moduwebsocket.o build/extmod/modwebrepl.o build/extmod/modframebuf.o build/extmod/vfs.o build/extmod/vfs_blockdev.o build/extmod/vfs_reader.o build/extmod/vfs_posix.o build/extmod/vfs_posix_file.o build/extmod/vfs_fat.o build/extmod/vfs_fat_diskio.o build/extmod/vfs_fat_file.o build/extmod/vfs_lfs.o build/extmod/utime_mphal.o build/extmod/uos_dupterm.o build/lib/embed/abort_.o build/lib/utils/printf.o build/./unix_mphal.o build/./modos.o build/./gccollect.o build/./modnsp.o build/./input.o build/./file.o build/./graphic.o build/./main.o
-/bin/cp libmicropy.a ~/final/nw-external-apps/apps/KhiCAS
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/mklib~ b/apps/KhiCAS/src/micropython-1.12/xcas/mklib~
deleted file mode 100755
index 215b2e49e..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/mklib~
+++ /dev/null
@@ -1,6 +0,0 @@
-# /bin/bash
-make
-ar cru libmicropython.a build/py/mpstate.o build/py/nlr.o build/py/nlrx86.o build/py/nlrx64.o build/py/nlrthumb.o build/py/nlrpowerpc.o build/py/nlrxtensa.o build/py/nlrsetjmp.o build/py/malloc.o build/py/gc.o build/py/pystack.o build/py/qstr.o build/py/vstr.o build/py/mpprint.o build/py/unicode.o build/py/mpz.o build/py/reader.o build/py/lexer.o build/py/parse.o build/py/scope.o build/py/compile.o build/py/emitcommon.o build/py/emitbc.o build/py/asmbase.o build/py/asmx64.o build/py/emitnx64.o build/py/asmx86.o build/py/emitnx86.o build/py/asmthumb.o build/py/emitnthumb.o build/py/emitinlinethumb.o build/py/asmarm.o build/py/emitnarm.o build/py/asmxtensa.o build/py/emitnxtensa.o build/py/emitinlinextensa.o build/py/emitnxtensawin.o build/py/formatfloat.o build/py/parsenumbase.o build/py/parsenum.o build/py/emitglue.o build/py/persistentcode.o build/py/runtime.o build/py/runtime_utils.o build/py/scheduler.o build/py/nativeglue.o build/py/ringbuf.o build/py/stackctrl.o build/py/argcheck.o build/py/warning.o build/py/profile.o build/py/map.o build/py/obj.o build/py/objarray.o build/py/objattrtuple.o build/py/objbool.o build/py/objboundmeth.o build/py/objcell.o build/py/objclosure.o build/py/objcomplex.o build/py/objdeque.o build/py/objdict.o build/py/objenumerate.o build/py/objexcept.o build/py/objfilter.o build/py/objfloat.o build/py/objfun.o build/py/objgenerator.o build/py/objgetitemiter.o build/py/objint.o build/py/objint_longlong.o build/py/objint_mpz.o build/py/objlist.o build/py/objmap.o build/py/objmodule.o build/py/objobject.o build/py/objpolyiter.o build/py/objproperty.o build/py/objnone.o build/py/objnamedtuple.o build/py/objrange.o build/py/objreversed.o build/py/objset.o build/py/objsingleton.o build/py/objslice.o build/py/objstr.o build/py/objstrunicode.o build/py/objstringio.o build/py/objtuple.o build/py/objtype.o build/py/objzip.o build/py/opmethods.o build/py/sequence.o build/py/stream.o build/py/binary.o build/py/builtinimport.o build/py/builtinevex.o build/py/builtinhelp.o build/py/modarray.o build/py/modbuiltins.o build/py/modcollections.o build/py/modgc.o build/py/modio.o build/py/modmath.o build/py/modcmath.o build/py/modmicropython.o build/py/modstruct.o build/py/modsys.o build/py/moduerrno.o build/py/modthread.o build/py/vm.o build/py/bc.o build/py/showbc.o build/py/repl.o build/py/smallint.o build/py/frozenmod.o build/extmod/moductypes.o build/extmod/modujson.o build/extmod/modure.o build/extmod/moduzlib.o build/extmod/moduheapq.o build/extmod/modutimeq.o build/extmod/moduhashlib.o build/extmod/moducryptolib.o build/extmod/modubinascii.o build/extmod/virtpin.o build/extmod/machine_mem.o build/extmod/machine_pinbase.o build/extmod/machine_signal.o build/extmod/machine_pulse.o build/extmod/machine_i2c.o build/extmod/machine_spi.o build/extmod/modbluetooth.o build/extmod/modussl_axtls.o build/extmod/modussl_mbedtls.o build/extmod/modurandom.o build/extmod/moduselect.o build/extmod/moduwebsocket.o build/extmod/modwebrepl.o build/extmod/modframebuf.o build/extmod/vfs.o build/extmod/vfs_blockdev.o build/extmod/vfs_reader.o build/extmod/vfs_posix.o build/extmod/vfs_posix_file.o build/extmod/vfs_fat.o build/extmod/vfs_fat_diskio.o build/extmod/vfs_fat_file.o build/extmod/vfs_lfs.o build/extmod/utime_mphal.o build/extmod/uos_dupterm.o build/lib/embed/abort_.o build/lib/utils/printf.o build/./unix_mphal.o build/./modos.o build/./gccollect.o  build/./input.o build/./file.o build/./graphic.o build/./main.o
-ranlib libmicropython.a
-/bin/cp libmicropython.a /usr/local/lib
-#/bin/cp libmicropython.a ~/final/nw-external-apps/apps/KhiCAS/src/lib/
\ No newline at end of file
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/modnsp.c~ b/apps/KhiCAS/src/micropython-1.12/xcas/modnsp.c~
deleted file mode 100644
index c05a46dff..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/modnsp.c~
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <libndls.h>
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "objtuple.h"
-
-double millis();
-
-static mp_obj_t nsp_readRTC()
-{
-  return mp_obj_new_int(millis());
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(nsp_readRTC_obj, nsp_readRTC);
-
-static mp_obj_t nsp_waitKeypress()
-{
-  getkey(1);
-  return mp_const_none;
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(nsp_waitKeypress_obj, nsp_waitKeypress);
-
-STATIC const mp_map_elem_t mp_module_nsp_globals_table[] = {
-        { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nsp) },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_Texture), (mp_obj_t) &nsp_texture_type },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_waitKeypress), (mp_obj_t) &nsp_waitKeypress_obj },
-	{ MP_OBJ_NEW_QSTR(MP_QSTR_readRTC), (mp_obj_t) &nsp_readRTC_obj }
-};
-
-STATIC const mp_obj_dict_t mp_module_nsp_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_nsp_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_nsp_globals_table),
-        .table = (mp_map_elem_t*) mp_module_nsp_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_nsp = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*) &mp_module_nsp_globals,
-};
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/modos.c~ b/apps/KhiCAS/src/micropython-1.12/xcas/modos.c~
deleted file mode 100644
index 5135a0900..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/modos.c~
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2014 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "objtuple.h"
-
-#define RAISE_ERRNO(err_flag, error_val) \
-    { if (err_flag == -1) \
-        { nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_val))); } }
-
-STATIC mp_obj_t mod_os_stat(mp_obj_t path_in) {
-    struct stat sb;
-    uint len;
-    const char *path = mp_obj_str_get_data(path_in, &len);
-
-    int res = stat(path, &sb);
-    RAISE_ERRNO(res, errno);
-
-    mp_obj_tuple_t *t = mp_obj_new_tuple(10, NULL);
-    t->items[0] = MP_OBJ_NEW_SMALL_INT(sb.st_mode);
-    t->items[1] = MP_OBJ_NEW_SMALL_INT(sb.st_ino);
-    t->items[2] = MP_OBJ_NEW_SMALL_INT(sb.st_dev);
-    t->items[3] = MP_OBJ_NEW_SMALL_INT(sb.st_nlink);
-    t->items[4] = MP_OBJ_NEW_SMALL_INT(sb.st_uid);
-    t->items[5] = MP_OBJ_NEW_SMALL_INT(sb.st_gid);
-    t->items[6] = MP_OBJ_NEW_SMALL_INT(sb.st_size);
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(sb.st_atime);
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(sb.st_mtime);
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(sb.st_ctime);
-    return t;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_stat_obj, mod_os_stat);
-
-STATIC const mp_map_elem_t mp_module_os_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR__os) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_stat), (mp_obj_t)&mod_os_stat_obj },
-};
-
-STATIC const mp_obj_dict_t mp_module_os_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .is_fixed = 1,
-        .used = MP_ARRAY_SIZE(mp_module_os_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_os_globals_table),
-        .table = (mp_map_elem_t*)mp_module_os_globals_table,
-    },
-};
-
-const mp_obj_module_t mp_module_os = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_os_globals,
-};
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/mpconfig.h~ b/apps/KhiCAS/src/micropython-1.12/xcas/mpconfig.h~
deleted file mode 100644
index 0676231d4..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/mpconfig.h~
+++ /dev/null
@@ -1,1592 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
-#define MICROPY_INCLUDED_PY_MPCONFIG_H
-
-// Current version of MicroPython
-#define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 12
-#define MICROPY_VERSION_MICRO 0
-
-// Combined version as a 32-bit number for convenience
-#define MICROPY_VERSION ( \
-    MICROPY_VERSION_MAJOR << 16 \
-    | MICROPY_VERSION_MINOR << 8 \
-    | MICROPY_VERSION_MICRO)
-
-// String version
-#define MICROPY_VERSION_STRING \
-    MP_STRINGIFY(MICROPY_VERSION_MAJOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MINOR) "." \
-    MP_STRINGIFY(MICROPY_VERSION_MICRO)
-
-// This file contains default configuration settings for MicroPython.
-// You can override any of the options below using mpconfigport.h file
-// located in a directory of your port.
-
-// mpconfigport.h is a file containing configuration settings for a
-// particular port. mpconfigport.h is actually a default name for
-// such config, and it can be overridden using MP_CONFIGFILE preprocessor
-// define (you can do that by passing CFLAGS_EXTRA='-DMP_CONFIGFILE="<file.h>"'
-// argument to make when using standard MicroPython makefiles).
-// This is useful to have more than one config per port, for example,
-// release vs debug configs, etc. Note that if you switch from one config
-// to another, you must rebuild from scratch using "-B" switch to make.
-
-#ifdef MP_CONFIGFILE
-#include MP_CONFIGFILE
-#else
-#include <mpconfigport.h>
-#endif
-
-// Any options not explicitly set in mpconfigport.h will get default
-// values below.
-
-/*****************************************************************************/
-/* Object representation                                                     */
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xxx1 : a small int, bits 1 and above are the value
-//  - xxxx...xx10 : a qstr, bits 2 and above are the value
-//  - xxxx...xx00 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_A (0)
-
-// A MicroPython object is a machine word having the following form:
-//  - xxxx...xx01 : a small int, bits 2 and above are the value
-//  - xxxx...xx11 : a qstr, bits 2 and above are the value
-//  - xxxx...xxx0 : a pointer to an mp_obj_base_t (unless a fake object)
-#define MICROPY_OBJ_REPR_B (1)
-
-// A MicroPython object is a machine word having the following form (called R):
-//  - iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int with 31-bit signed value
-//  - 01111111 1qqqqqqq qqqqqqqq qqqqq110 str with 20-bit qstr value
-//  - s1111111 10000000 00000000 00000010 +/- inf
-//  - s1111111 1xxxxxxx xxxxxxxx xxxxx010 nan, x != 0
-//  - seeeeeee efffffff ffffffff ffffff10 30-bit fp, e != 0xff
-//  - pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Str and float stored as O = R + 0x80800000, retrieved as R = O - 0x80800000.
-// This makes strs easier to encode/decode as they have zeros in the top 9 bits.
-// This scheme only works with 32-bit word size and float enabled.
-#define MICROPY_OBJ_REPR_C (2)
-
-// A MicroPython object is a 64-bit word having the following form (called R):
-//  - seeeeeee eeeeffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff 64-bit fp, e != 0x7ff
-//  - s1111111 11110000 00000000 00000000 00000000 00000000 00000000 00000000 +/- inf
-//  - 01111111 11111000 00000000 00000000 00000000 00000000 00000000 00000000 normalised nan
-//  - 01111111 11111101 iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiiii iiiiiii1 small int
-//  - 01111111 11111110 00000000 00000000 qqqqqqqq qqqqqqqq qqqqqqqq qqqqqqq1 str
-//  - 01111111 11111100 00000000 00000000 pppppppp pppppppp pppppppp pppppp00 ptr (4 byte alignment)
-// Stored as O = R + 0x8004000000000000, retrieved as R = O - 0x8004000000000000.
-// This makes pointers have all zeros in the top 32 bits.
-// Small-ints and strs have 1 as LSB to make sure they don't look like pointers
-// to the garbage collector.
-#define MICROPY_OBJ_REPR_D (3)
-
-#ifndef MICROPY_OBJ_REPR
-#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A)
-#endif
-
-/*****************************************************************************/
-/* Memory allocation policy                                                  */
-
-// Number of bytes in memory allocation/GC block. Any size allocated will be
-// rounded up to be multiples of this.
-#ifndef MICROPY_BYTES_PER_GC_BLOCK
-#define MICROPY_BYTES_PER_GC_BLOCK (4 * BYTES_PER_WORD)
-#endif
-
-// Number of words allocated (in BSS) to the GC stack (minimum is 1)
-#ifndef MICROPY_ALLOC_GC_STACK_SIZE
-#define MICROPY_ALLOC_GC_STACK_SIZE (64)
-#endif
-
-// The C-type to use for entries in the GC stack.  By default it allows the
-// heap to be as large as the address space, but the bit-width of this type can
-// be reduced to save memory when the heap is small enough.  The type must be
-// big enough to index all blocks in the heap, which is set by
-// heap-size-in-bytes / MICROPY_BYTES_PER_GC_BLOCK.
-#ifndef MICROPY_GC_STACK_ENTRY_TYPE
-#define MICROPY_GC_STACK_ENTRY_TYPE size_t
-#endif
-
-// Be conservative and always clear to zero newly (re)allocated memory in the GC.
-// This helps eliminate stray pointers that hold on to memory that's no longer
-// used.  It decreases performance due to unnecessary memory clearing.
-// A memory manager which always clears memory can set this to 0.
-// TODO Do analysis to understand why some memory is not properly cleared and
-// find a more efficient way to clear it.
-#ifndef MICROPY_GC_CONSERVATIVE_CLEAR
-#define MICROPY_GC_CONSERVATIVE_CLEAR (MICROPY_ENABLE_GC)
-#endif
-
-// Support automatic GC when reaching allocation threshold,
-// configurable by gc.threshold().
-#ifndef MICROPY_GC_ALLOC_THRESHOLD
-#define MICROPY_GC_ALLOC_THRESHOLD (1)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// interned string data.  Smaller numbers lead to more chunks being needed
-// and more wastage at the end of the chunk.  Larger numbers lead to wasted
-// space at the end when no more strings need interning.
-#ifndef MICROPY_ALLOC_QSTR_CHUNK_INIT
-#define MICROPY_ALLOC_QSTR_CHUNK_INIT (128)
-#endif
-
-// Initial amount for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXER_INDENT_INIT
-#define MICROPY_ALLOC_LEXER_INDENT_INIT (10)
-#endif
-
-// Increment for lexer indentation level
-#ifndef MICROPY_ALLOC_LEXEL_INDENT_INC
-#define MICROPY_ALLOC_LEXEL_INDENT_INC (8)
-#endif
-
-// Initial amount for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INIT
-#define MICROPY_ALLOC_PARSE_RULE_INIT (64)
-#endif
-
-// Increment for parse rule stack
-#ifndef MICROPY_ALLOC_PARSE_RULE_INC
-#define MICROPY_ALLOC_PARSE_RULE_INC (16)
-#endif
-
-// Initial amount for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INIT
-#define MICROPY_ALLOC_PARSE_RESULT_INIT (32)
-#endif
-
-// Increment for parse result stack
-#ifndef MICROPY_ALLOC_PARSE_RESULT_INC
-#define MICROPY_ALLOC_PARSE_RESULT_INC (16)
-#endif
-
-// Strings this length or less will be interned by the parser
-#ifndef MICROPY_ALLOC_PARSE_INTERN_STRING_LEN
-#define MICROPY_ALLOC_PARSE_INTERN_STRING_LEN (10)
-#endif
-
-// Number of bytes to allocate initially when creating new chunks to store
-// parse nodes.  Small leads to fragmentation, large leads to excess use.
-#ifndef MICROPY_ALLOC_PARSE_CHUNK_INIT
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (128)
-#endif
-
-// Initial amount for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INIT
-#define MICROPY_ALLOC_SCOPE_ID_INIT (4)
-#endif
-
-// Increment for ids in a scope
-#ifndef MICROPY_ALLOC_SCOPE_ID_INC
-#define MICROPY_ALLOC_SCOPE_ID_INC (6)
-#endif
-
-// Maximum length of a path in the filesystem
-// So we can allocate a buffer on the stack for path manipulation in import
-#ifndef MICROPY_ALLOC_PATH_MAX
-#define MICROPY_ALLOC_PATH_MAX (512)
-#endif
-
-// Initial size of module dict
-#ifndef MICROPY_MODULE_DICT_SIZE
-#define MICROPY_MODULE_DICT_SIZE (1)
-#endif
-
-// Whether realloc/free should be passed allocated memory region size
-// You must enable this if MICROPY_MEM_STATS is enabled
-#ifndef MICROPY_MALLOC_USES_ALLOCATED_SIZE
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (0)
-#endif
-
-// Number of bytes used to store qstr length
-// Dictates hard limit on maximum Python identifier length, but 1 byte
-// (limit of 255 bytes in an identifier) should be enough for everyone
-#ifndef MICROPY_QSTR_BYTES_IN_LEN
-#define MICROPY_QSTR_BYTES_IN_LEN (1)
-#endif
-
-// Number of bytes used to store qstr hash
-#ifndef MICROPY_QSTR_BYTES_IN_HASH
-#define MICROPY_QSTR_BYTES_IN_HASH (2)
-#endif
-
-// Avoid using C stack when making Python function calls. C stack still
-// may be used if there's no free heap.
-#ifndef MICROPY_STACKLESS
-#define MICROPY_STACKLESS (0)
-#endif
-
-// Never use C stack when making Python function calls. This may break
-// testsuite as will subtly change which exception is thrown in case
-// of too deep recursion and other similar cases.
-#ifndef MICROPY_STACKLESS_STRICT
-#define MICROPY_STACKLESS_STRICT (0)
-#endif
-
-// Don't use alloca calls. As alloca() is not part of ANSI C, this
-// workaround option is provided for compilers lacking this de-facto
-// standard function. The way it works is allocating from heap, and
-// relying on garbage collection to free it eventually. This is of
-// course much less optimal than real alloca().
-#if defined(MICROPY_NO_ALLOCA) && MICROPY_NO_ALLOCA
-#undef alloca
-#define alloca(x) m_malloc(x)
-#endif
-
-/*****************************************************************************/
-/* MicroPython emitters                                                     */
-
-// Whether to support loading of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_LOAD
-#define MICROPY_PERSISTENT_CODE_LOAD (0)
-#endif
-
-// Whether to support saving of persistent code
-#ifndef MICROPY_PERSISTENT_CODE_SAVE
-#define MICROPY_PERSISTENT_CODE_SAVE (0)
-#endif
-
-// Whether generated code can persist independently of the VM/runtime instance
-// This is enabled automatically when needed by other features
-#ifndef MICROPY_PERSISTENT_CODE
-#define MICROPY_PERSISTENT_CODE (MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether to emit x64 native code
-#ifndef MICROPY_EMIT_X64
-#define MICROPY_EMIT_X64 (0)
-#endif
-
-// Whether to emit x86 native code
-#ifndef MICROPY_EMIT_X86
-#define MICROPY_EMIT_X86 (0)
-#endif
-
-// Whether to emit thumb native code
-#ifndef MICROPY_EMIT_THUMB
-#define MICROPY_EMIT_THUMB (0)
-#endif
-
-// Whether to enable the thumb inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB
-#define MICROPY_EMIT_INLINE_THUMB (0)
-#endif
-
-// Whether to enable ARMv7-M instruction support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_ARMV7M
-#define MICROPY_EMIT_INLINE_THUMB_ARMV7M (1)
-#endif
-
-// Whether to enable float support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_FLOAT
-#define MICROPY_EMIT_INLINE_THUMB_FLOAT (1)
-#endif
-
-// Whether to emit ARM native code
-#ifndef MICROPY_EMIT_ARM
-#define MICROPY_EMIT_ARM (0)
-#endif
-
-// Whether to emit Xtensa native code
-#ifndef MICROPY_EMIT_XTENSA
-#define MICROPY_EMIT_XTENSA (0)
-#endif
-
-// Whether to enable the Xtensa inline assembler
-#ifndef MICROPY_EMIT_INLINE_XTENSA
-#define MICROPY_EMIT_INLINE_XTENSA (0)
-#endif
-
-// Whether to emit Xtensa-Windowed native code
-#ifndef MICROPY_EMIT_XTENSAWIN
-#define MICROPY_EMIT_XTENSAWIN (0)
-#endif
-
-// Convenience definition for whether any native emitter is enabled
-#define MICROPY_EMIT_NATIVE (MICROPY_EMIT_X64 || MICROPY_EMIT_X86 || MICROPY_EMIT_THUMB || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN)
-
-// Select prelude-as-bytes-object for certain emitters
-#define MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ (MICROPY_EMIT_XTENSAWIN)
-
-// Convenience definition for whether any inline assembler emitter is enabled
-#define MICROPY_EMIT_INLINE_ASM (MICROPY_EMIT_INLINE_THUMB || MICROPY_EMIT_INLINE_XTENSA)
-
-// Convenience definition for whether any native or inline assembler emitter is enabled
-#define MICROPY_EMIT_MACHINE_CODE (MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM)
-
-/*****************************************************************************/
-/* Compiler configuration                                                    */
-
-// Whether to include the compiler
-#ifndef MICROPY_ENABLE_COMPILER
-#define MICROPY_ENABLE_COMPILER (1)
-#endif
-
-// Whether the compiler is dynamically configurable (ie at runtime)
-// This will disable the ability to execute native/viper code
-#ifndef MICROPY_DYNAMIC_COMPILER
-#define MICROPY_DYNAMIC_COMPILER (0)
-#endif
-
-// Configure dynamic compiler macros
-#if MICROPY_DYNAMIC_COMPILER
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC (mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode)
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC (mp_dynamic_compiler.py_builtins_str_unicode)
-#else
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC MICROPY_PY_BUILTINS_STR_UNICODE
-#endif
-
-// Whether to enable constant folding; eg 1+2 rewritten as 3
-#ifndef MICROPY_COMP_CONST_FOLDING
-#define MICROPY_COMP_CONST_FOLDING (1)
-#endif
-
-// Whether to enable optimisations for constant literals, eg OrderedDict
-#ifndef MICROPY_COMP_CONST_LITERAL
-#define MICROPY_COMP_CONST_LITERAL (1)
-#endif
-
-// Whether to enable lookup of constants in modules; eg module.CONST
-#ifndef MICROPY_COMP_MODULE_CONST
-#define MICROPY_COMP_MODULE_CONST (0)
-#endif
-
-// Whether to enable constant optimisation; id = const(value)
-#ifndef MICROPY_COMP_CONST
-#define MICROPY_COMP_CONST (1)
-#endif
-
-// Whether to enable optimisation of: a, b = c, d
-// Costs 124 bytes (Thumb2)
-#ifndef MICROPY_COMP_DOUBLE_TUPLE_ASSIGN
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
-#endif
-
-// Whether to enable optimisation of: a, b, c = d, e, f
-// Requires MICROPY_COMP_DOUBLE_TUPLE_ASSIGN and costs 68 bytes (Thumb2)
-#ifndef MICROPY_COMP_TRIPLE_TUPLE_ASSIGN
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#endif
-
-// Whether to enable optimisation of: return a if b else c
-// Costs about 80 bytes (Thumb2) and saves 2 bytes of bytecode for each use
-#ifndef MICROPY_COMP_RETURN_IF_EXPR
-#define MICROPY_COMP_RETURN_IF_EXPR (0)
-#endif
-
-/*****************************************************************************/
-/* Internal debugging stuff                                                  */
-
-// Whether to collect memory allocation stats
-#ifndef MICROPY_MEM_STATS
-#define MICROPY_MEM_STATS (0)
-#endif
-
-// The mp_print_t printer used for debugging output
-#ifndef MICROPY_DEBUG_PRINTER
-#define MICROPY_DEBUG_PRINTER (&mp_plat_print)
-#endif
-
-// Whether to build functions that print debugging info:
-//   mp_bytecode_print
-//   mp_parse_node_print
-#ifndef MICROPY_DEBUG_PRINTERS
-#define MICROPY_DEBUG_PRINTERS (0)
-#endif
-
-// Whether to enable all debugging outputs (it will be extremely verbose)
-#ifndef MICROPY_DEBUG_VERBOSE
-#define MICROPY_DEBUG_VERBOSE (0)
-#endif
-
-// Whether to enable debugging versions of MP_OBJ_NULL/STOP_ITERATION/SENTINEL
-#ifndef MICROPY_DEBUG_MP_OBJ_SENTINELS
-#define MICROPY_DEBUG_MP_OBJ_SENTINELS (0)
-#endif
-
-// Whether to enable a simple VM stack overflow check
-#ifndef MICROPY_DEBUG_VM_STACK_OVERFLOW
-#define MICROPY_DEBUG_VM_STACK_OVERFLOW (0)
-#endif
-
-/*****************************************************************************/
-/* Optimisations                                                             */
-
-// Whether to use computed gotos in the VM, or a switch
-// Computed gotos are roughly 10% faster, and increase VM code size by a little
-// Note: enabling this will use the gcc-specific extensions of ranged designated
-// initialisers and addresses of labels, which are not part of the C99 standard.
-#ifndef MICROPY_OPT_COMPUTED_GOTO
-#define MICROPY_OPT_COMPUTED_GOTO (0)
-#endif
-
-// Whether to cache result of map lookups in LOAD_NAME, LOAD_GLOBAL, LOAD_ATTR,
-// STORE_ATTR bytecodes.  Uses 1 byte extra RAM for each of these opcodes and
-// uses a bit of extra code ROM, but greatly improves lookup speed.
-#ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
-#endif
-
-// Whether to use fast versions of bitwise operations (and, or, xor) when the
-// arguments are both positive.  Increases Thumb2 code size by about 250 bytes.
-#ifndef MICROPY_OPT_MPZ_BITWISE
-#define MICROPY_OPT_MPZ_BITWISE (0)
-#endif
-
-
-// Whether math.factorial is large, fast and recursive (1) or small and slow (0).
-#ifndef MICROPY_OPT_MATH_FACTORIAL
-#define MICROPY_OPT_MATH_FACTORIAL (0)
-#endif
-
-/*****************************************************************************/
-/* Python internal features                                                  */
-
-// Whether to enable import of external modules
-// When disabled, only importing of built-in modules is supported
-// When enabled, a port must implement mp_import_stat (among other things)
-#ifndef MICROPY_ENABLE_EXTERNAL_IMPORT
-#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
-#endif
-
-// Whether to use the POSIX reader for importing files
-#ifndef MICROPY_READER_POSIX
-#define MICROPY_READER_POSIX (0)
-#endif
-
-// Whether to use the VFS reader for importing files
-#ifndef MICROPY_READER_VFS
-#define MICROPY_READER_VFS (0)
-#endif
-
-// Whether any readers have been defined
-#ifndef MICROPY_HAS_FILE_READER
-#define MICROPY_HAS_FILE_READER (MICROPY_READER_POSIX || MICROPY_READER_VFS)
-#endif
-
-// Hook for the VM at the start of the opcode loop (can contain variable
-// definitions usable by the other hook functions)
-#ifndef MICROPY_VM_HOOK_INIT
-#define MICROPY_VM_HOOK_INIT
-#endif
-
-// Hook for the VM during the opcode loop (but only after jump opcodes)
-#ifndef MICROPY_VM_HOOK_LOOP
-#define MICROPY_VM_HOOK_LOOP
-#endif
-
-// Hook for the VM just before return opcode is finished being interpreted
-#ifndef MICROPY_VM_HOOK_RETURN
-#define MICROPY_VM_HOOK_RETURN
-#endif
-
-// Whether to include the garbage collector
-#ifndef MICROPY_ENABLE_GC
-#define MICROPY_ENABLE_GC (0)
-#endif
-
-// Whether to enable finalisers in the garbage collector (ie call __del__)
-#ifndef MICROPY_ENABLE_FINALISER
-#define MICROPY_ENABLE_FINALISER (0)
-#endif
-
-// Whether to enable a separate allocator for the Python stack.
-// If enabled then the code must call mp_pystack_init before mp_init.
-#ifndef MICROPY_ENABLE_PYSTACK
-#define MICROPY_ENABLE_PYSTACK (0)
-#endif
-
-// Number of bytes that memory returned by mp_pystack_alloc will be aligned by.
-#ifndef MICROPY_PYSTACK_ALIGN
-#define MICROPY_PYSTACK_ALIGN (8)
-#endif
-
-// Whether to check C stack usage. C stack used for calling Python functions,
-// etc. Not checking means segfault on overflow.
-#ifndef MICROPY_STACK_CHECK
-#define MICROPY_STACK_CHECK (0)
-#endif
-
-// Whether to have an emergency exception buffer
-#ifndef MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (0)
-#endif
-#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-#   ifndef MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE
-#   define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)   // 0 - implies dynamic allocation
-#   endif
-#endif
-
-// Whether to provide the mp_kbd_exception object, and micropython.kbd_intr function
-#ifndef MICROPY_KBD_EXCEPTION
-#define MICROPY_KBD_EXCEPTION (1)
-#endif
-
-// Prefer to raise KeyboardInterrupt asynchronously (from signal or interrupt
-// handler) - if supported by a particular port.
-#ifndef MICROPY_ASYNC_KBD_INTR
-#define MICROPY_ASYNC_KBD_INTR (0)
-#endif
-
-// Whether to include REPL helper function
-#ifndef MICROPY_HELPER_REPL
-#define MICROPY_HELPER_REPL (0)
-#endif
-
-// Whether to include emacs-style readline behavior in REPL
-#ifndef MICROPY_REPL_EMACS_KEYS
-#define MICROPY_REPL_EMACS_KEYS (0)
-#endif
-
-// Whether to implement auto-indent in REPL
-#ifndef MICROPY_REPL_AUTO_INDENT
-#define MICROPY_REPL_AUTO_INDENT (0)
-#endif
-
-// Whether port requires event-driven REPL functions
-#ifndef MICROPY_REPL_EVENT_DRIVEN
-#define MICROPY_REPL_EVENT_DRIVEN (0)
-#endif
-
-// Whether to include lexer helper function for unix
-#ifndef MICROPY_HELPER_LEXER_UNIX
-#define MICROPY_HELPER_LEXER_UNIX (0)
-#endif
-
-// Long int implementation
-#define MICROPY_LONGINT_IMPL_NONE (0)
-#define MICROPY_LONGINT_IMPL_LONGLONG (1)
-#define MICROPY_LONGINT_IMPL_MPZ (2)
-
-#ifndef MICROPY_LONGINT_IMPL
-#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_NONE)
-#endif
-
-#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
-typedef long long mp_longint_impl_t;
-#endif
-
-// Whether to include information in the byte code to determine source
-// line number (increases RAM usage, but doesn't slow byte code execution)
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE (0)
-#endif
-
-// Whether to include doc strings (increases RAM usage)
-#ifndef MICROPY_ENABLE_DOC_STRING
-#define MICROPY_ENABLE_DOC_STRING (0)
-#endif
-
-// Exception messages are short static strings
-#define MICROPY_ERROR_REPORTING_TERSE    (1)
-// Exception messages provide basic error details
-#define MICROPY_ERROR_REPORTING_NORMAL   (2)
-// Exception messages provide full info, e.g. object names
-#define MICROPY_ERROR_REPORTING_DETAILED (3)
-
-#ifndef MICROPY_ERROR_REPORTING
-#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL)
-#endif
-
-// Whether issue warnings during compiling/execution
-#ifndef MICROPY_WARNINGS
-#define MICROPY_WARNINGS (0)
-#endif
-
-// Whether to support warning categories
-#ifndef MICROPY_WARNINGS_CATEGORY
-#define MICROPY_WARNINGS_CATEGORY (0)
-#endif
-
-// This macro is used when printing runtime warnings and errors
-#ifndef MICROPY_ERROR_PRINTER
-#define MICROPY_ERROR_PRINTER (&mp_plat_print)
-#endif
-
-// Float and complex implementation
-#define MICROPY_FLOAT_IMPL_NONE (0)
-#define MICROPY_FLOAT_IMPL_FLOAT (1)
-#define MICROPY_FLOAT_IMPL_DOUBLE (2)
-
-#ifndef MICROPY_FLOAT_IMPL
-#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_NONE)
-#endif
-
-#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x##F
-#define MICROPY_FLOAT_C_FUN(fun) fun##f
-typedef float mp_float_t;
-#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-#define MICROPY_PY_BUILTINS_FLOAT (1)
-#define MICROPY_FLOAT_CONST(x) x
-#define MICROPY_FLOAT_C_FUN(fun) fun
-typedef double mp_float_t;
-#else
-#define MICROPY_PY_BUILTINS_FLOAT (0)
-#endif
-
-#ifndef MICROPY_PY_BUILTINS_COMPLEX
-#define MICROPY_PY_BUILTINS_COMPLEX (MICROPY_PY_BUILTINS_FLOAT)
-#endif
-
-// Whether to provide a high-quality hash for float and complex numbers.
-// Otherwise the default is a very simple but correct hashing function.
-#ifndef MICROPY_FLOAT_HIGH_QUALITY_HASH
-#define MICROPY_FLOAT_HIGH_QUALITY_HASH (0)
-#endif
-
-// Enable features which improve CPython compatibility
-// but may lead to more code size/memory usage.
-// TODO: Originally intended as generic category to not
-// add bunch of once-off options. May need refactoring later
-#ifndef MICROPY_CPYTHON_COMPAT
-#define MICROPY_CPYTHON_COMPAT (1)
-#endif
-
-// Perform full checks as done by CPython. Disabling this
-// may produce incorrect results, if incorrect data is fed,
-// but should not lead to MicroPython crashes or similar
-// grave issues (in other words, only user app should be,
-// affected, not system).
-#ifndef MICROPY_FULL_CHECKS
-#define MICROPY_FULL_CHECKS (1)
-#endif
-
-// Whether POSIX-semantics non-blocking streams are supported
-#ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK (0)
-#endif
-
-// Whether to provide stream functions with POSIX-like signatures
-// (useful for porting existing libraries to MicroPython).
-#ifndef MICROPY_STREAMS_POSIX_API
-#define MICROPY_STREAMS_POSIX_API (0)
-#endif
-
-// Whether to call __init__ when importing builtin modules for the first time
-#ifndef MICROPY_MODULE_BUILTIN_INIT
-#define MICROPY_MODULE_BUILTIN_INIT (0)
-#endif
-
-// Whether to support module-level __getattr__ (see PEP 562)
-#ifndef MICROPY_MODULE_GETATTR
-#define MICROPY_MODULE_GETATTR (0)
-#endif
-
-// Whether module weak links are supported
-#ifndef MICROPY_MODULE_WEAK_LINKS
-#define MICROPY_MODULE_WEAK_LINKS (0)
-#endif
-
-// Whether frozen modules are supported in the form of strings
-#ifndef MICROPY_MODULE_FROZEN_STR
-#define MICROPY_MODULE_FROZEN_STR (0)
-#endif
-
-// Whether frozen modules are supported in the form of .mpy files
-#ifndef MICROPY_MODULE_FROZEN_MPY
-#define MICROPY_MODULE_FROZEN_MPY (0)
-#endif
-
-// Convenience macro for whether frozen modules are supported
-#ifndef MICROPY_MODULE_FROZEN
-#define MICROPY_MODULE_FROZEN (MICROPY_MODULE_FROZEN_STR || MICROPY_MODULE_FROZEN_MPY)
-#endif
-
-// Whether you can override builtins in the builtins module
-#ifndef MICROPY_CAN_OVERRIDE_BUILTINS
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
-#endif
-
-// Whether to check that the "self" argument of a builtin method has the
-// correct type.  Such an explicit check is only needed if a builtin
-// method escapes to Python land without a first argument, eg
-// list.append([], 1).  Without this check such calls will have undefined
-// behaviour (usually segfault) if the first argument is the wrong type.
-#ifndef MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
-#endif
-
-// Whether to use internally defined errno's (otherwise system provided ones)
-#ifndef MICROPY_USE_INTERNAL_ERRNO
-#define MICROPY_USE_INTERNAL_ERRNO (0)
-#endif
-
-// Whether to use internally defined *printf() functions (otherwise external ones)
-#ifndef MICROPY_USE_INTERNAL_PRINTF
-#define MICROPY_USE_INTERNAL_PRINTF (1)
-#endif
-
-// Support for internal scheduler
-#ifndef MICROPY_ENABLE_SCHEDULER
-#define MICROPY_ENABLE_SCHEDULER (0)
-#endif
-
-// Maximum number of entries in the scheduler
-#ifndef MICROPY_SCHEDULER_DEPTH
-#define MICROPY_SCHEDULER_DEPTH (4)
-#endif
-
-// Support for generic VFS sub-system
-#ifndef MICROPY_VFS
-#define MICROPY_VFS (0)
-#endif
-
-// Support for VFS POSIX component, to mount a POSIX filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_POSIX (0)
-#endif
-
-// Support for VFS FAT component, to mount a FAT filesystem within VFS
-#ifndef MICROPY_VFS
-#define MICROPY_VFS_FAT (0)
-#endif
-
-/*****************************************************************************/
-/* Fine control over Python builtins, classes, modules, etc                  */
-
-// Whether to support multiple inheritance of Python classes.  Multiple
-// inheritance makes some C functions inherently recursive, and adds a bit of
-// code overhead.
-#ifndef MICROPY_MULTIPLE_INHERITANCE
-#define MICROPY_MULTIPLE_INHERITANCE (1)
-#endif
-
-// Whether to implement attributes on functions
-#ifndef MICROPY_PY_FUNCTION_ATTRS
-#define MICROPY_PY_FUNCTION_ATTRS (0)
-#endif
-
-// Whether to support the descriptors __get__, __set__, __delete__
-// This costs some code size and makes load/store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DESCRIPTORS
-#define MICROPY_PY_DESCRIPTORS (0)
-#endif
-
-// Whether to support class __delattr__ and __setattr__ methods
-// This costs some code size and makes store/delete of instance
-// attributes slower for the classes that use this feature
-#ifndef MICROPY_PY_DELATTR_SETATTR
-#define MICROPY_PY_DELATTR_SETATTR (0)
-#endif
-
-// Support for async/await/async for/async with
-#ifndef MICROPY_PY_ASYNC_AWAIT
-#define MICROPY_PY_ASYNC_AWAIT (1)
-#endif
-
-// Non-standard .pend_throw() method for generators, allowing for
-// Future-like behavior with respect to exception handling: an
-// exception set with .pend_throw() will activate on the next call
-// to generator's .send() or .__next__(). (This is useful to implement
-// async schedulers.)
-#ifndef MICROPY_PY_GENERATOR_PEND_THROW
-#define MICROPY_PY_GENERATOR_PEND_THROW (1)
-#endif
-
-// Issue a warning when comparing str and bytes objects
-#ifndef MICROPY_PY_STR_BYTES_CMP_WARN
-#define MICROPY_PY_STR_BYTES_CMP_WARN (0)
-#endif
-
-// Whether str object is proper unicode
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
-#endif
-
-// Whether to check for valid UTF-8 when converting bytes to str
-#ifndef MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
-#define MICROPY_PY_BUILTINS_STR_UNICODE_CHECK (MICROPY_PY_BUILTINS_STR_UNICODE)
-#endif
-
-// Whether str.center() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_CENTER
-#define MICROPY_PY_BUILTINS_STR_CENTER (0)
-#endif
-
-// Whether str.count() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_COUNT
-#define MICROPY_PY_BUILTINS_STR_COUNT (1)
-#endif
-
-// Whether str % (...) formatting operator provided
-#ifndef MICROPY_PY_BUILTINS_STR_OP_MODULO
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
-#endif
-
-// Whether str.partition()/str.rpartition() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_PARTITION
-#define MICROPY_PY_BUILTINS_STR_PARTITION (0)
-#endif
-
-// Whether str.splitlines() method provided
-#ifndef MICROPY_PY_BUILTINS_STR_SPLITLINES
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
-#endif
-
-// Whether to support bytearray object
-#ifndef MICROPY_PY_BUILTINS_BYTEARRAY
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
-#endif
-
-// Whether to support dict.fromkeys() class method
-#ifndef MICROPY_PY_BUILTINS_DICT_FROMKEYS
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
-#endif
-
-// Whether to support memoryview object
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#endif
-
-// Whether to support memoryview.itemsize attribute
-#ifndef MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (0)
-#endif
-
-// Whether to support set object
-#ifndef MICROPY_PY_BUILTINS_SET
-#define MICROPY_PY_BUILTINS_SET (1)
-#endif
-
-// Whether to support slice subscript operators and slice object
-#ifndef MICROPY_PY_BUILTINS_SLICE
-#define MICROPY_PY_BUILTINS_SLICE (1)
-#endif
-
-// Whether to support slice attribute read access,
-// i.e. slice.start, slice.stop, slice.step
-#ifndef MICROPY_PY_BUILTINS_SLICE_ATTRS
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
-#endif
-
-// Whether to support frozenset object
-#ifndef MICROPY_PY_BUILTINS_FROZENSET
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#endif
-
-// Whether to support property object
-#ifndef MICROPY_PY_BUILTINS_PROPERTY
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
-#endif
-
-// Whether to implement the start/stop/step attributes (readback) on
-// the "range" builtin type. Rarely used, and costs ~60 bytes (x86).
-#ifndef MICROPY_PY_BUILTINS_RANGE_ATTRS
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
-#endif
-
-// Whether to support binary ops [only (in)equality is defined] between range
-// objects.  With this option disabled all range objects that are not exactly
-// the same object will compare as not-equal.  With it enabled the semantics
-// match CPython and ranges are equal if they yield the same sequence of items.
-#ifndef MICROPY_PY_BUILTINS_RANGE_BINOP
-#define MICROPY_PY_BUILTINS_RANGE_BINOP (0)
-#endif
-
-// Support for callling next() with second argument
-#ifndef MICROPY_PY_BUILTINS_NEXT2
-#define MICROPY_PY_BUILTINS_NEXT2 (0)
-#endif
-
-// Whether to support rounding of integers (incl bignum); eg round(123,-1)=120
-#ifndef MICROPY_PY_BUILTINS_ROUND_INT
-#define MICROPY_PY_BUILTINS_ROUND_INT (0)
-#endif
-
-// Whether to support timeout exceptions (like socket.timeout)
-#ifndef MICROPY_PY_BUILTINS_TIMEOUTERROR
-#define MICROPY_PY_BUILTINS_TIMEOUTERROR (0)
-#endif
-
-// Whether to support complete set of special methods for user
-// classes, or only the most used ones. "Inplace" methods are
-// controlled by MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS below.
-// "Reverse" methods are controlled by
-// MICROPY_PY_REVERSE_SPECIAL_METHODS below.
-#ifndef MICROPY_PY_ALL_SPECIAL_METHODS
-#define MICROPY_PY_ALL_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support all inplace arithmetic operarion methods
-// (__imul__, etc.)
-#ifndef MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
-#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support reverse arithmetic operarion methods
-// (__radd__, etc.). Additionally gated by
-// MICROPY_PY_ALL_SPECIAL_METHODS.
-#ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#endif
-
-// Whether to support compile function
-#ifndef MICROPY_PY_BUILTINS_COMPILE
-#define MICROPY_PY_BUILTINS_COMPILE (0)
-#endif
-
-// Whether to support enumerate function(type)
-#ifndef MICROPY_PY_BUILTINS_ENUMERATE
-#define MICROPY_PY_BUILTINS_ENUMERATE (1)
-#endif
-
-// Whether to support eval and exec functions
-// By default they are supported if the compiler is enabled
-#ifndef MICROPY_PY_BUILTINS_EVAL_EXEC
-#define MICROPY_PY_BUILTINS_EVAL_EXEC (MICROPY_ENABLE_COMPILER)
-#endif
-
-// Whether to support the Python 2 execfile function
-#ifndef MICROPY_PY_BUILTINS_EXECFILE
-#define MICROPY_PY_BUILTINS_EXECFILE (0)
-#endif
-
-// Whether to support filter function(type)
-#ifndef MICROPY_PY_BUILTINS_FILTER
-#define MICROPY_PY_BUILTINS_FILTER (1)
-#endif
-
-// Whether to support reversed function(type)
-#ifndef MICROPY_PY_BUILTINS_REVERSED
-#define MICROPY_PY_BUILTINS_REVERSED (1)
-#endif
-
-// Whether to define "NotImplemented" special constant
-#ifndef MICROPY_PY_BUILTINS_NOTIMPLEMENTED
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
-#endif
-
-// Whether to provide the built-in input() function. The implementation of this
-// uses mp-readline, so can only be enabled if the port uses this readline.
-#ifndef MICROPY_PY_BUILTINS_INPUT
-#define MICROPY_PY_BUILTINS_INPUT (0)
-#endif
-
-// Whether to support min/max functions
-#ifndef MICROPY_PY_BUILTINS_MIN_MAX
-#define MICROPY_PY_BUILTINS_MIN_MAX (1)
-#endif
-
-// Support for calls to pow() with 3 integer arguments
-#ifndef MICROPY_PY_BUILTINS_POW3
-#define MICROPY_PY_BUILTINS_POW3 (0)
-#endif
-
-// Whether to provide the help function
-#ifndef MICROPY_PY_BUILTINS_HELP
-#define MICROPY_PY_BUILTINS_HELP (0)
-#endif
-
-// Use this to configure the help text shown for help().  It should be a
-// variable with the type "const char*".  A sensible default is provided.
-#ifndef MICROPY_PY_BUILTINS_HELP_TEXT
-#define MICROPY_PY_BUILTINS_HELP_TEXT mp_help_default_text
-#endif
-
-// Add the ability to list the available modules when executing help('modules')
-#ifndef MICROPY_PY_BUILTINS_HELP_MODULES
-#define MICROPY_PY_BUILTINS_HELP_MODULES (0)
-#endif
-
-// Whether to set __file__ for imported modules
-#ifndef MICROPY_PY___FILE__
-#define MICROPY_PY___FILE__ (1)
-#endif
-
-// Whether to provide mem-info related functions in micropython module
-#ifndef MICROPY_PY_MICROPYTHON_MEM_INFO
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
-#endif
-
-// Whether to provide "micropython.stack_use" function
-#ifndef MICROPY_PY_MICROPYTHON_STACK_USE
-#define MICROPY_PY_MICROPYTHON_STACK_USE (MICROPY_PY_MICROPYTHON_MEM_INFO)
-#endif
-
-// Whether to provide "array" module. Note that large chunk of the
-// underlying code is shared with "bytearray" builtin type, so to
-// get real savings, it should be disabled too.
-#ifndef MICROPY_PY_ARRAY
-#define MICROPY_PY_ARRAY (1)
-#endif
-
-// Whether to support slice assignments for array (and bytearray).
-// This is rarely used, but adds ~0.5K of code.
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (0)
-#endif
-
-// Whether to support attrtuple type (MicroPython extension)
-// It provides space-efficient tuples with attribute access
-#ifndef MICROPY_PY_ATTRTUPLE
-#define MICROPY_PY_ATTRTUPLE (1)
-#endif
-
-// Whether to provide "collections" module
-#ifndef MICROPY_PY_COLLECTIONS
-#define MICROPY_PY_COLLECTIONS (1)
-#endif
-
-// Whether to provide "ucollections.deque" type
-#ifndef MICROPY_PY_COLLECTIONS_DEQUE
-#define MICROPY_PY_COLLECTIONS_DEQUE (0)
-#endif
-
-// Whether to provide "collections.OrderedDict" type
-#ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
-#endif
-
-// Whether to provide the _asdict function for namedtuple
-#ifndef MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT
-#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (0)
-#endif
-
-// Whether to provide "math" module
-#ifndef MICROPY_PY_MATH
-#define MICROPY_PY_MATH (1)
-#endif
-
-// Whether to provide special math functions: math.{erf,erfc,gamma,lgamma}
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
-#endif
-
-// Whether to provide math.factorial function
-#ifndef MICROPY_PY_MATH_FACTORIAL
-#define MICROPY_PY_MATH_FACTORIAL (0)
-#endif
-
-// Whether to provide math.isclose function
-#ifndef MICROPY_PY_MATH_ISCLOSE
-#define MICROPY_PY_MATH_ISCLOSE (0)
-#endif
-
-// Whether to provide "cmath" module
-#ifndef MICROPY_PY_CMATH
-#define MICROPY_PY_CMATH (0)
-#endif
-
-// Whether to provide "gc" module
-#ifndef MICROPY_PY_GC
-#define MICROPY_PY_GC (1)
-#endif
-
-// Whether to return number of collected objects from gc.collect()
-#ifndef MICROPY_PY_GC_COLLECT_RETVAL
-#define MICROPY_PY_GC_COLLECT_RETVAL (0)
-#endif
-
-// Whether to provide "io" module
-#ifndef MICROPY_PY_IO
-#define MICROPY_PY_IO (1)
-#endif
-
-// Whether to provide "io.IOBase" class to support user streams
-#ifndef MICROPY_PY_IO_IOBASE
-#define MICROPY_PY_IO_IOBASE (0)
-#endif
-
-// Whether to provide "uio.resource_stream()" function with
-// the semantics of CPython's pkg_resources.resource_stream()
-// (allows to access binary resources in frozen source packages).
-// Note that the same functionality can be achieved in "pure
-// Python" by prepocessing binary resources into Python source
-// and bytecode-freezing it (with a simple helper module available
-// e.g. in micropython-lib).
-#ifndef MICROPY_PY_IO_RESOURCE_STREAM
-#define MICROPY_PY_IO_RESOURCE_STREAM (0)
-#endif
-
-// Whether to provide "io.FileIO" class
-#ifndef MICROPY_PY_IO_FILEIO
-#define MICROPY_PY_IO_FILEIO (0)
-#endif
-
-// Whether to provide "io.BytesIO" class
-#ifndef MICROPY_PY_IO_BYTESIO
-#define MICROPY_PY_IO_BYTESIO (1)
-#endif
-
-// Whether to provide "io.BufferedWriter" class
-#ifndef MICROPY_PY_IO_BUFFEREDWRITER
-#define MICROPY_PY_IO_BUFFEREDWRITER (0)
-#endif
-
-// Whether to provide "struct" module
-#ifndef MICROPY_PY_STRUCT
-#define MICROPY_PY_STRUCT (1)
-#endif
-
-// Whether to provide "sys" module
-#ifndef MICROPY_PY_SYS
-#define MICROPY_PY_SYS (1)
-#endif
-
-// Whether to provide "sys.maxsize" constant
-#ifndef MICROPY_PY_SYS_MAXSIZE
-#define MICROPY_PY_SYS_MAXSIZE (0)
-#endif
-
-// Whether to provide "sys.modules" dictionary
-#ifndef MICROPY_PY_SYS_MODULES
-#define MICROPY_PY_SYS_MODULES (1)
-#endif
-
-// Whether to provide "sys.exc_info" function
-// Avoid enabling this, this function is Python2 heritage
-#ifndef MICROPY_PY_SYS_EXC_INFO
-#define MICROPY_PY_SYS_EXC_INFO (0)
-#endif
-
-// Whether to provide "sys.exit" function
-#ifndef MICROPY_PY_SYS_EXIT
-#define MICROPY_PY_SYS_EXIT (1)
-#endif
-
-// Whether to provide "sys.atexit" function (MicroPython extension)
-#ifndef MICROPY_PY_SYS_ATEXIT
-#define MICROPY_PY_SYS_ATEXIT (0)
-#endif
-
-// Whether to provide "sys.settrace" function
-#ifndef MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PY_SYS_SETTRACE (0)
-#endif
-
-// Whether to provide "sys.getsizeof" function
-#ifndef MICROPY_PY_SYS_GETSIZEOF
-#define MICROPY_PY_SYS_GETSIZEOF (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr} objects
-#ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES (0)
-#endif
-
-// Whether to provide sys.{stdin,stdout,stderr}.buffer object
-// This is implemented per-port
-#ifndef MICROPY_PY_SYS_STDIO_BUFFER
-#define MICROPY_PY_SYS_STDIO_BUFFER (0)
-#endif
-
-// Whether to provide "uerrno" module
-#ifndef MICROPY_PY_UERRNO
-#define MICROPY_PY_UERRNO (0)
-#endif
-
-// Whether to provide the uerrno.errorcode dict
-#ifndef MICROPY_PY_UERRNO_ERRORCODE
-#define MICROPY_PY_UERRNO_ERRORCODE (1)
-#endif
-
-// Whether to provide "uselect" module (baremetal implementation)
-#ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT (0)
-#endif
-
-// Whether to provide "utime" module functions implementation
-// in terms of mp_hal_* functions.
-#ifndef MICROPY_PY_UTIME_MP_HAL
-#define MICROPY_PY_UTIME_MP_HAL (0)
-#endif
-
-// Period of values returned by utime.ticks_ms(), ticks_us(), ticks_cpu()
-// functions. Should be power of two. All functions above use the same
-// period, so if underlying hardware/API has different periods, the
-// minimum of them should be used. The value below is the maximum value
-// this parameter can take (corresponding to 30 bit tick values on 32-bit
-// system).
-#ifndef MICROPY_PY_UTIME_TICKS_PERIOD
-#define MICROPY_PY_UTIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1)
-#endif
-
-// Whether to provide "_thread" module
-#ifndef MICROPY_PY_THREAD
-#define MICROPY_PY_THREAD (0)
-#endif
-
-// Whether to make the VM/runtime thread-safe using a global lock
-// If not enabled then thread safety must be provided at the Python level
-#ifndef MICROPY_PY_THREAD_GIL
-#define MICROPY_PY_THREAD_GIL (MICROPY_PY_THREAD)
-#endif
-
-// Number of VM jump-loops to do before releasing the GIL.
-// Set this to 0 to disable the divisor.
-#ifndef MICROPY_PY_THREAD_GIL_VM_DIVISOR
-#define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32)
-#endif
-
-// Extended modules
-
-#ifndef MICROPY_PY_UCTYPES
-#define MICROPY_PY_UCTYPES (0)
-#endif
-
-// Whether to provide SHORT, INT, LONG, etc. types in addition to
-// exact-bitness types like INT16, INT32, etc.
-#ifndef MICROPY_PY_UCTYPES_NATIVE_C_TYPES
-#define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1)
-#endif
-
-#ifndef MICROPY_PY_UZLIB
-#define MICROPY_PY_UZLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UJSON
-#define MICROPY_PY_UJSON (0)
-#endif
-
-#ifndef MICROPY_PY_URE
-#define MICROPY_PY_URE (0)
-#endif
-
-#ifndef MICROPY_PY_URE_DEBUG
-#define MICROPY_PY_URE_DEBUG (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_GROUPS
-#define MICROPY_PY_URE_MATCH_GROUPS (0)
-#endif
-
-#ifndef MICROPY_PY_URE_MATCH_SPAN_START_END
-#define MICROPY_PY_URE_MATCH_SPAN_START_END (0)
-#endif
-
-#ifndef MICROPY_PY_URE_SUB
-#define MICROPY_PY_URE_SUB (0)
-#endif
-
-#ifndef MICROPY_PY_UHEAPQ
-#define MICROPY_PY_UHEAPQ (0)
-#endif
-
-// Optimized heap queue for relative timestamps
-#ifndef MICROPY_PY_UTIMEQ
-#define MICROPY_PY_UTIMEQ (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB
-#define MICROPY_PY_UHASHLIB (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_MD5
-#define MICROPY_PY_UHASHLIB_MD5 (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA1
-#define MICROPY_PY_UHASHLIB_SHA1  (0)
-#endif
-
-#ifndef MICROPY_PY_UHASHLIB_SHA256
-#define MICROPY_PY_UHASHLIB_SHA256 (1)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB
-#define MICROPY_PY_UCRYPTOLIB (0)
-#endif
-
-// Depends on MICROPY_PY_UCRYPTOLIB
-#ifndef MICROPY_PY_UCRYPTOLIB_CTR
-#define MICROPY_PY_UCRYPTOLIB_CTR (0)
-#endif
-
-#ifndef MICROPY_PY_UCRYPTOLIB_CONSTS
-#define MICROPY_PY_UCRYPTOLIB_CONSTS (0)
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII (0)
-#endif
-
-// Depends on MICROPY_PY_UZLIB
-#ifndef MICROPY_PY_UBINASCII_CRC32
-#define MICROPY_PY_UBINASCII_CRC32 (0)
-#endif
-
-#ifndef MICROPY_PY_URANDOM
-#define MICROPY_PY_URANDOM (0)
-#endif
-
-// Whether to include: randrange, randint, choice, random, uniform
-#ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE
-#define MICROPY_PY_MACHINE (0)
-#endif
-
-// Whether to include: time_pulse_us
-#ifndef MICROPY_PY_MACHINE_PULSE
-#define MICROPY_PY_MACHINE_PULSE (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_I2C
-#define MICROPY_PY_MACHINE_I2C (0)
-#endif
-
-#ifndef MICROPY_PY_MACHINE_SPI
-#define MICROPY_PY_MACHINE_SPI (0)
-#endif
-
-#ifndef MICROPY_PY_USSL
-#define MICROPY_PY_USSL (0)
-// Whether to add finaliser code to ussl objects
-#define MICROPY_PY_USSL_FINALISER (0)
-#endif
-
-#ifndef MICROPY_PY_UWEBSOCKET
-#define MICROPY_PY_UWEBSOCKET (0)
-#endif
-
-#ifndef MICROPY_PY_FRAMEBUF
-#define MICROPY_PY_FRAMEBUF (0)
-#endif
-
-#ifndef MICROPY_PY_BTREE
-#define MICROPY_PY_BTREE (0)
-#endif
-
-/*****************************************************************************/
-/* Hooks for a port to add builtins                                          */
-
-// Additional builtin function definitions - see modbuiltins.c:mp_module_builtins_globals_table for format.
-#ifndef MICROPY_PORT_BUILTINS
-#define MICROPY_PORT_BUILTINS
-#endif
-
-// Additional builtin module definitions - see objmodule.c:mp_builtin_module_table for format.
-#ifndef MICROPY_PORT_BUILTIN_MODULES
-#define MICROPY_PORT_BUILTIN_MODULES
-#endif
-
-// Additional constant definitions for the compiler - see compile.c:mp_constants_table.
-#ifndef MICROPY_PORT_CONSTANTS
-#define MICROPY_PORT_CONSTANTS
-#endif
-
-// Any root pointers for GC scanning - see mpstate.c
-#ifndef MICROPY_PORT_ROOT_POINTERS
-#define MICROPY_PORT_ROOT_POINTERS
-#endif
-
-/*****************************************************************************/
-/* Miscellaneous settings                                                    */
-
-// All uPy objects in ROM must be aligned on at least a 4 byte boundary
-// so that the small-int/qstr/pointer distinction can be made.  For machines
-// that don't do this (eg 16-bit CPU), define the following macro to something
-// like __attribute__((aligned(4))).
-#ifndef MICROPY_OBJ_BASE_ALIGNMENT
-#define MICROPY_OBJ_BASE_ALIGNMENT
-#endif
-
-// On embedded platforms, these will typically enable/disable irqs.
-#ifndef MICROPY_BEGIN_ATOMIC_SECTION
-#define MICROPY_BEGIN_ATOMIC_SECTION() (0)
-#endif
-#ifndef MICROPY_END_ATOMIC_SECTION
-#define MICROPY_END_ATOMIC_SECTION(state) (void)(state)
-#endif
-
-// Allow to override static modifier for global objects, e.g. to use with
-// object code analysis tools which don't support static symbols.
-#ifndef STATIC
-#define STATIC static
-#endif
-
-// Number of bytes in a word
-#ifndef BYTES_PER_WORD
-#define BYTES_PER_WORD (sizeof(mp_uint_t))
-#endif
-
-#define BITS_PER_BYTE (8)
-#define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD)
-// mp_int_t value with most significant bit set
-#define WORD_MSBIT_HIGH (((mp_uint_t)1) << (BYTES_PER_WORD * 8 - 1))
-
-// Make sure both MP_ENDIANNESS_LITTLE and MP_ENDIANNESS_BIG are
-// defined and that they are the opposite of each other.
-#if defined(MP_ENDIANNESS_LITTLE)
-#define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#elif defined(MP_ENDIANNESS_BIG)
-#define MP_ENDIANNESS_LITTLE (!MP_ENDIANNESS_BIG)
-#else
-  // Endianness not defined by port so try to autodetect it.
-  #if defined(__BYTE_ORDER__)
-    #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (1)
-    #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-      #define MP_ENDIANNESS_LITTLE (0)
-    #endif
-  #else
-    #include <endian.h>
-      #if defined(__BYTE_ORDER)
-        #if __BYTE_ORDER == __LITTLE_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (1)
-        #elif __BYTE_ORDER == __BIG_ENDIAN
-          #define MP_ENDIANNESS_LITTLE (0)
-        #endif
-      #endif
-  #endif
-  #ifndef MP_ENDIANNESS_LITTLE
-    #error endianness not defined and cannot detect it
-  #endif
-  #define MP_ENDIANNESS_BIG (!MP_ENDIANNESS_LITTLE)
-#endif
-
-// Make a pointer to RAM callable (eg set lower bit for Thumb code)
-// (This scheme won't work if we want to mix Thumb and normal ARM code.)
-#ifndef MICROPY_MAKE_POINTER_CALLABLE
-#define MICROPY_MAKE_POINTER_CALLABLE(p) (p)
-#endif
-
-// If these MP_PLAT_*_EXEC macros are overridden then the memory allocated by them
-// must be somehow reachable for marking by the GC, since the native code
-// generators store pointers to GC managed memory in the code.
-#ifndef MP_PLAT_ALLOC_EXEC
-#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) do { *ptr = m_new(byte, min_size); *size = min_size; } while (0)
-#endif
-
-#ifndef MP_PLAT_FREE_EXEC
-#define MP_PLAT_FREE_EXEC(ptr, size) m_del(byte, ptr, size)
-#endif
-
-// This macro is used to do all output (except when MICROPY_PY_IO is defined)
-#ifndef MP_PLAT_PRINT_STRN
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-#endif
-
-#ifndef MP_SSIZE_MAX
-#define MP_SSIZE_MAX SSIZE_MAX
-#endif
-
-// printf format spec to use for mp_int_t and friends
-#ifndef INT_FMT
-#if defined(__LP64__)
-// Archs where mp_int_t == long, long != int
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-#elif defined(_WIN64)
-#define UINT_FMT "%llu"
-#define INT_FMT "%lld"
-#else
-// Archs where mp_int_t == int
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-#endif
-#endif //INT_FMT
-
-// Modifier for function which doesn't return
-#ifndef NORETURN
-#define NORETURN __attribute__((noreturn))
-#endif
-
-// Modifier for weak functions
-#ifndef MP_WEAK
-#define MP_WEAK __attribute__((weak))
-#endif
-
-// Modifier for functions which should be never inlined
-#ifndef MP_NOINLINE
-#define MP_NOINLINE __attribute__((noinline))
-#endif
-
-// Modifier for functions which should be always inlined
-#ifndef MP_ALWAYSINLINE
-#define MP_ALWAYSINLINE __attribute__((always_inline))
-#endif
-
-// Condition is likely to be true, to help branch prediction
-#ifndef MP_LIKELY
-#define MP_LIKELY(x) __builtin_expect((x), 1)
-#endif
-
-// Condition is likely to be false, to help branch prediction
-#ifndef MP_UNLIKELY
-#define MP_UNLIKELY(x) __builtin_expect((x), 0)
-#endif
-
-// To annotate that code is unreachable
-#ifndef MP_UNREACHABLE
-#if defined(__GNUC__)
-#define MP_UNREACHABLE __builtin_unreachable();
-#else
-#define MP_UNREACHABLE for (;;);
-#endif
-#endif
-
-#ifndef MP_HTOBE16
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE16(x) ((uint16_t)( (((x) & 0xff) << 8) | (((x) >> 8) & 0xff) ))
-# define MP_BE16TOH(x) MP_HTOBE16(x)
-#else
-# define MP_HTOBE16(x) (x)
-# define MP_BE16TOH(x) (x)
-#endif
-#endif
-
-#ifndef MP_HTOBE32
-#if MP_ENDIANNESS_LITTLE
-# define MP_HTOBE32(x) ((uint32_t)( (((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) >> 8)  & 0xff00) | (((x) >> 24) & 0xff) ))
-# define MP_BE32TOH(x) MP_HTOBE32(x)
-#else
-# define MP_HTOBE32(x) (x)
-# define MP_BE32TOH(x) (x)
-#endif
-#endif
-
-// Warning categories are by default implemented as strings, though
-// hook is left for a port to define them as something else.
-#if MICROPY_WARNINGS_CATEGORY
-# ifndef MP_WARN_CAT
-# define MP_WARN_CAT(x) #x
-# endif
-#else
-# undef MP_WARN_CAT
-# define MP_WARN_CAT(x) (NULL)
-#endif
-
-// Feature dependency check.
-#if MICROPY_PY_SYS_SETTRACE
-#if !MICROPY_PERSISTENT_CODE_SAVE
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_PERSISTENT_CODE_SAVE to be enabled"
-#endif
-#if MICROPY_COMP_CONST
-#error "MICROPY_PY_SYS_SETTRACE requires MICROPY_COMP_CONST to be disabled"
-#endif
-#endif
-
-#endif // MICROPY_INCLUDED_PY_MPCONFIG_H
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/mpconfigport.h~ b/apps/KhiCAS/src/micropython-1.12/xcas/mpconfigport.h~
deleted file mode 100644
index c93821963..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/mpconfigport.h~
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// options to control how Micro Python is built
-
-#define MICROPY_ALLOC_PATH_MAX      (128)
-#define MICROPY_EMIT_ARM            (1)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_COMPILE (1)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_PLATFORM     "numworks"
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO_FILEIO        (0)
-#define MICROPY_PY_GC_COLLECT_RETVAL (1)
-#define MICROPY_COMP_MODULE_CONST   (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
-#define MICROPY_STACK_CHECK         (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_REPL_AUTO_INDENT    (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_USE_INTERNAL_PRINTF (0)
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_DESCRIPTORS      (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_SYS_EXC_INFO     (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#define MICROPY_MODULE_FROZEN       (0)
-#define MICROPY_STACKLESS           (0)
-#define MICROPY_STACKLESS_STRICT    (0)
-#define MICROPY_PY_UZLIB            (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_UHEAPQ           (1)
-#define MICROPY_PY_UHASHLIB         (1)
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_MACHINE          (1)
-#define MICROPY_WARNINGS            (1)
-
-#define MICROPY_PY_UCTYPES          (1)
-
-// Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.
-// names in exception messages (may require more RAM).
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
-// Define to 1 to use untested inefficient GC helper implementation
-// (if more efficient arch-specific one is not available).
-#ifndef MICROPY_GCREGS_SETJMP
-#define MICROPY_GCREGS_SETJMP       (0)
-#endif
-
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (128)
-int micropython_port_vm_hook_loop();
-
-#define MICROPY_VM_HOOK_LOOP micropython_port_vm_hook_loop();
-#define MICROPY_KBD_EXCEPTION (1)
-
-extern const struct _mp_obj_module_t mp_module_os;
-extern const struct _mp_obj_module_t mp_module_graphic;
-extern const struct _mp_obj_module_t mp_module_cas;
-extern const struct _mp_obj_module_t mp_module_arit;
-extern const struct _mp_obj_module_t mp_module_turtle;
-extern const struct _mp_obj_module_t mp_module_matplotl;
-extern const struct _mp_obj_module_t mp_module_linalg;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-	{ MP_ROM_QSTR(MP_QSTR__os), (mp_obj_t) &mp_module_os }, \
-	{ MP_ROM_QSTR(MP_QSTR_cas), (mp_obj_t) &mp_module_cas }, \
-	{ MP_ROM_QSTR(MP_QSTR_arit), (mp_obj_t) &mp_module_arit }, \
-	{ MP_ROM_QSTR(MP_QSTR_linalg), (mp_obj_t) &mp_module_linalg }, \
-	{ MP_ROM_QSTR(MP_QSTR_matplotl), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_matplotlib), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_pylab), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_pyplot), (mp_obj_t) &mp_module_matplotl }, \
-	{ MP_ROM_QSTR(MP_QSTR_turtle), (mp_obj_t) &mp_module_turtle }, \
-	{ MP_ROM_QSTR(MP_QSTR_casioplot), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_ROM_QSTR(MP_QSTR_kandinsky), (mp_obj_t) &mp_module_graphic }, \
-	{ MP_ROM_QSTR(MP_QSTR_graphic), (mp_obj_t) &mp_module_graphic }
-
-#ifdef __x86_64__
-typedef long mp_int_t;
-typedef unsigned long mp_uint_t;
-typedef long mp_off_t;
-#else
-typedef int mp_int_t;
-typedef unsigned int mp_uint_t;
-typedef long mp_off_t;
-#endif
-
-#define BYTES_PER_WORD sizeof(mp_int_t)
-#define MP_SSIZE_MAX INT_MAX
-
-typedef void *machine_ptr_t; // must be of pointer size
-typedef const void *machine_const_ptr_t; // must be of pointer size
-
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
-    { MP_ROM_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
-
-#include <alloca.h>
diff --git a/apps/KhiCAS/src/micropython-1.12/xcas/mphalport.h~ b/apps/KhiCAS/src/micropython-1.12/xcas/mphalport.h~
deleted file mode 100644
index b308e5e41..000000000
--- a/apps/KhiCAS/src/micropython-1.12/xcas/mphalport.h~
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#include <unistd.h>
-
-#ifndef CHAR_CTRL_C
-#define CHAR_CTRL_C (3)
-#endif
-
-static inline void mp_hal_delay_ms(mp_uint_t ms) { usleep((ms) * 1000); }
-
-#define RAISE_ERRNO(err_flag, error_val) \
-    { if (err_flag == -1) \
-        { nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_val))); } }
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ar-lib b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ar-lib
deleted file mode 120000
index d28a2981c..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ar-lib
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/ar-lib
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ar-lib b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ar-lib
new file mode 100755
index 000000000..c349042c3
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ar-lib
@@ -0,0 +1,271 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2019-07-04.01; # UTC
+
+# Copyright (C) 2010-2021 Free Software Foundation, Inc.
+# Written by Peter Rosin <peda@lysator.liu.se>.
+#
+# This program 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, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN* | MSYS*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin | msys)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+     func_error "no command.  Try '$0 --help' for more information."
+     ;;
+  -h | --h*)
+    cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "$me, version $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test $# -lt 3; then
+  func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+  case $action in
+    d*) delete=yes  ;;
+    x*) extract=yes ;;
+    t*) list=yes    ;;
+    q*) quick=yes   ;;
+    r*) replace=yes ;;
+    s*) index=yes   ;;
+    S*)             ;; # the index is always updated implicitly
+    c*) create=yes  ;;
+    u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
+    *)
+      func_error "unknown action specified"
+      ;;
+  esac
+  action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+  yes,* | ,yes)
+    ;;
+  yesyes*)
+    func_error "more than one action specified"
+    ;;
+  *)
+    func_error "no action specified"
+    ;;
+esac
+
+if test -n "$delete"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  for member
+  do
+    case $1 in
+      @*)
+        func_at_file "${1#@}" -REMOVE "$archive"
+        ;;
+      *)
+        func_file_conv "$1"
+        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+        ;;
+    esac
+  done
+
+elif test -n "$extract"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  if test $# -gt 0; then
+    for member
+    do
+      case $1 in
+        @*)
+          func_at_file "${1#@}" -EXTRACT "$archive"
+          ;;
+        *)
+          func_file_conv "$1"
+          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+          ;;
+      esac
+    done
+  else
+    $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \
+      | while read member
+        do
+          $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+        done
+  fi
+
+elif test -n "$quick$replace"; then
+  if test ! -f "$orig_archive"; then
+    if test -z "$create"; then
+      echo "$me: creating $orig_archive"
+    fi
+    orig_archive=
+  else
+    orig_archive=$archive
+  fi
+
+  for member
+  do
+    case $1 in
+    @*)
+      func_file_conv "${1#@}"
+      set x "$@" "@$file"
+      ;;
+    *)
+      func_file_conv "$1"
+      set x "$@" "$file"
+      ;;
+    esac
+    shift
+    shift
+  done
+
+  if test -n "$orig_archive"; then
+    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+  else
+    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+  fi
+
+elif test -n "$list"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  $AR -NOLOGO -LIST "$archive" || exit $?
+fi
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/compile b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/compile
deleted file mode 120000
index b6af40053..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/compile
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/compile
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/compile b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/compile
new file mode 100755
index 000000000..df363c8fb
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/compile
@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program 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, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN* | MSYS*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/* | msys/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.guess b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.guess
deleted file mode 120000
index 7c531735d..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.guess
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/config.guess
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.guess b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.guess
new file mode 100755
index 000000000..e81d3ae7c
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.guess
@@ -0,0 +1,1748 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2021 Free Software Foundation, Inc.
+
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-06-03'
+
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, see <https://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+#
+# Please send patches to <config-patches@gnu.org>.
+
+
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Options:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2021 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+# Just in case it came from the environment.
+GUESS=
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD=$driver
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if test -f /.attbin/uname ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case $UNAME_SYSTEM in
+Linux|GNU|GNU/*)
+	LIBC=unknown
+
+	set_cc_for_build
+	cat <<-EOF > "$dummy.c"
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#elif defined(__GLIBC__)
+	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
+	#endif
+	EOF
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
+
+	# Second heuristic to detect musl libc.
+	if [ "$LIBC" = unknown ] &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if [ "$LIBC" = unknown ]; then
+		LIBC=gnu
+	fi
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    echo unknown)`
+	case $UNAME_MACHINE_ARCH in
+	    aarch64eb) machine=aarch64_be-unknown ;;
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
+	    *) machine=$UNAME_MACHINE_ARCH-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently (or will in the future) and ABI.
+	case $UNAME_MACHINE_ARCH in
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# Determine ABI tags.
+	case $UNAME_MACHINE_ARCH in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case $UNAME_VERSION in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	GUESS=$machine-${os}${release}${abi-}
+	;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+	;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+	;;
+    *:SecBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+	;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+	;;
+    *:MidnightBSD:*:*)
+	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+	;;
+    *:ekkoBSD:*:*)
+	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+	;;
+    *:SolidBSD:*:*)
+	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+	;;
+    *:OS108:*:*)
+	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+	;;
+    macppc:MirBSD:*:*)
+	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+	;;
+    *:MirBSD:*:*)
+	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+	;;
+    *:Sortix:*:*)
+	GUESS=$UNAME_MACHINE-unknown-sortix
+	;;
+    *:Twizzler:*:*)
+	GUESS=$UNAME_MACHINE-unknown-twizzler
+	;;
+    *:Redox:*:*)
+	GUESS=$UNAME_MACHINE-unknown-redox
+	;;
+    mips:OSF1:*.*)
+	GUESS=mips-dec-osf1
+	;;
+    alpha:OSF1:*:*)
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	trap '' 0
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case $ALPHA_CPU_TYPE in
+	    "EV4 (21064)")
+		UNAME_MACHINE=alpha ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE=alpha ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE=alpha ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE=alphaev5 ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE=alphaev56 ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE=alphapca56 ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE=alphapca57 ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE=alphaev6 ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE=alphaev67 ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE=alphaev69 ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE=alphaev7 ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE=alphaev79 ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+	;;
+    Amiga*:UNIX_System_V:4.0:*)
+	GUESS=m68k-unknown-sysv4
+	;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	GUESS=$UNAME_MACHINE-unknown-amigaos
+	;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	GUESS=$UNAME_MACHINE-unknown-morphos
+	;;
+    *:OS/390:*:*)
+	GUESS=i370-ibm-openedition
+	;;
+    *:z/VM:*:*)
+	GUESS=s390-ibm-zvmoe
+	;;
+    *:OS400:*:*)
+	GUESS=powerpc-ibm-os400
+	;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	GUESS=arm-acorn-riscix$UNAME_RELEASE
+	;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	GUESS=arm-unknown-riscos
+	;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	GUESS=hppa1.1-hitachi-hiuxmpp
+	;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	case `(/bin/universe) 2>/dev/null` in
+	    att) GUESS=pyramid-pyramid-sysv3 ;;
+	    *)   GUESS=pyramid-pyramid-bsd   ;;
+	esac
+	;;
+    NILE*:*:*:dcosx)
+	GUESS=pyramid-pyramid-svr4
+	;;
+    DRS?6000:unix:4.0:6*)
+	GUESS=sparc-icl-nx6
+	;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) GUESS=sparc-icl-nx7 ;;
+	esac
+	;;
+    s390x:SunOS:*:*)
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+	;;
+    sun4H:SunOS:5.*:*)
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-hal-solaris2$SUN_REL
+	;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-sun-solaris2$SUN_REL
+	;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	GUESS=i386-pc-auroraux$UNAME_RELEASE
+	;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	set_cc_for_build
+	SUN_ARCH=i386
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH=x86_64
+	    fi
+	fi
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+	;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-sun-solaris3$SUN_REL
+	;;
+    sun4*:SunOS:*:*)
+	case `/usr/bin/arch -k` in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+	GUESS=sparc-sun-sunos$SUN_REL
+	;;
+    sun3*:SunOS:*:*)
+	GUESS=m68k-sun-sunos$UNAME_RELEASE
+	;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+	case `/bin/arch` in
+	    sun3)
+		GUESS=m68k-sun-sunos$UNAME_RELEASE
+		;;
+	    sun4)
+		GUESS=sparc-sun-sunos$UNAME_RELEASE
+		;;
+	esac
+	;;
+    aushp:SunOS:*:*)
+	GUESS=sparc-auspex-sunos$UNAME_RELEASE
+	;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	GUESS=m68k-milan-mint$UNAME_RELEASE
+	;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	GUESS=m68k-hades-mint$UNAME_RELEASE
+	;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	GUESS=m68k-unknown-mint$UNAME_RELEASE
+	;;
+    m68k:machten:*:*)
+	GUESS=m68k-apple-machten$UNAME_RELEASE
+	;;
+    powerpc:machten:*:*)
+	GUESS=powerpc-apple-machten$UNAME_RELEASE
+	;;
+    RISC*:Mach:*:*)
+	GUESS=mips-dec-mach_bsd4.3
+	;;
+    RISC*:ULTRIX:*:*)
+	GUESS=mips-dec-ultrix$UNAME_RELEASE
+	;;
+    VAX*:ULTRIX*:*:*)
+	GUESS=vax-dec-ultrix$UNAME_RELEASE
+	;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	GUESS=clipper-intergraph-clix$UNAME_RELEASE
+	;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	GUESS=mips-mips-riscos$UNAME_RELEASE
+	;;
+    Motorola:PowerMAX_OS:*:*)
+	GUESS=powerpc-motorola-powermax
+	;;
+    Motorola:*:4.3:PL8-*)
+	GUESS=powerpc-harris-powermax
+	;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	GUESS=powerpc-harris-powermax
+	;;
+    Night_Hawk:Power_UNIX:*:*)
+	GUESS=powerpc-harris-powerunix
+	;;
+    m88k:CX/UX:7*:*)
+	GUESS=m88k-harris-cxux7
+	;;
+    m88k:*:4*:R4*)
+	GUESS=m88k-motorola-sysv4
+	;;
+    m88k:*:3*:R3*)
+	GUESS=m88k-motorola-sysv3
+	;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
+	then
+	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	       test "$TARGET_BINARY_INTERFACE"x = x
+	    then
+		GUESS=m88k-dg-dgux$UNAME_RELEASE
+	    else
+		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
+	    fi
+	else
+	    GUESS=i586-dg-dgux$UNAME_RELEASE
+	fi
+	;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	GUESS=m88k-dolphin-sysv3
+	;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	GUESS=m88k-motorola-sysv3
+	;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	GUESS=m88k-tektronix-sysv3
+	;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	GUESS=m68k-tektronix-bsd
+	;;
+    *:IRIX*:*:*)
+	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+	GUESS=mips-sgi-irix$IRIX_REL
+	;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
+	;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	GUESS=i386-ibm-aix
+	;;
+    ia64:AIX:*:*)
+	if test -x /usr/bin/oslevel ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+	fi
+	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+	;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		set_cc_for_build
+		sed 's/^		//' << EOF > "$dummy.c"
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+		then
+			GUESS=$SYSTEM_NAME
+		else
+			GUESS=rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		GUESS=rs6000-ibm-aix3.2.4
+	else
+		GUESS=rs6000-ibm-aix3.2
+	fi
+	;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if test -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+	else
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+	fi
+	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+	;;
+    *:AIX:*:*)
+	GUESS=rs6000-ibm-aix
+	;;
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+	GUESS=romp-ibm-bsd4.4
+	;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
+	;;                                  # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	GUESS=rs6000-bull-bosx
+	;;
+    DPX/2?00:B.O.S.:*:*)
+	GUESS=m68k-bull-sysv3
+	;;
+    9000/[34]??:4.3bsd:1.*:*)
+	GUESS=m68k-hp-bsd
+	;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	GUESS=m68k-hp-bsd4.4
+	;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+	case $UNAME_MACHINE in
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/[34]??)         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if test -x /usr/bin/getconf; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case $sc_cpu_version in
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case $sc_kernel_bits in
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if test "$HP_ARCH" = ""; then
+		    set_cc_for_build
+		    sed 's/^		//' << EOF > "$dummy.c"
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if test "$HP_ARCH" = hppa2.0w
+	then
+	    set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH=hppa2.0w
+	    else
+		HP_ARCH=hppa64
+	    fi
+	fi
+	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+	;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+	GUESS=ia64-hp-hpux$HPUX_REV
+	;;
+    3050*:HI-UX:*:*)
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	GUESS=unknown-hitachi-hiuxwe2
+	;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+	GUESS=hppa1.1-hp-bsd
+	;;
+    9000/8??:4.3bsd:*:*)
+	GUESS=hppa1.0-hp-bsd
+	;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	GUESS=hppa1.0-hp-mpeix
+	;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+	GUESS=hppa1.1-hp-osf
+	;;
+    hp8??:OSF1:*:*)
+	GUESS=hppa1.0-hp-osf
+	;;
+    i*86:OSF1:*:*)
+	if test -x /usr/sbin/sysversion ; then
+	    GUESS=$UNAME_MACHINE-unknown-osf1mk
+	else
+	    GUESS=$UNAME_MACHINE-unknown-osf1
+	fi
+	;;
+    parisc*:Lites*:*:*)
+	GUESS=hppa1.1-hp-lites
+	;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	GUESS=c1-convex-bsd
+	;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	GUESS=c34-convex-bsd
+	;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	GUESS=c38-convex-bsd
+	;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	GUESS=c4-convex-bsd
+	;;
+    CRAY*Y-MP:*:*:*)
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=ymp-cray-unicos$CRAY_REL
+	;;
+    CRAY*[A-Z]90:*:*:*)
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=t90-cray-unicos$CRAY_REL
+	;;
+    CRAY*T3E:*:*:*)
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=alphaev5-cray-unicosmk$CRAY_REL
+	;;
+    CRAY*SV1:*:*:*)
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=sv1-cray-unicos$CRAY_REL
+	;;
+    *:UNICOS/mp:*:*)
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=craynv-cray-unicosmp$CRAY_REL
+	;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+	;;
+    sparc*:BSD/OS:*:*)
+	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+	;;
+    *:BSD/OS:*:*)
+	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+	;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+	else
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+	fi
+	;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case $UNAME_PROCESSOR in
+	    amd64)
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
+	esac
+	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+	;;
+    i*:CYGWIN*:*)
+	GUESS=$UNAME_MACHINE-pc-cygwin
+	;;
+    *:MINGW64*:*)
+	GUESS=$UNAME_MACHINE-pc-mingw64
+	;;
+    *:MINGW*:*)
+	GUESS=$UNAME_MACHINE-pc-mingw32
+	;;
+    *:MSYS*:*)
+	GUESS=$UNAME_MACHINE-pc-msys
+	;;
+    i*:PW*:*)
+	GUESS=$UNAME_MACHINE-pc-pw32
+	;;
+    *:Interix*:*)
+	case $UNAME_MACHINE in
+	    x86)
+		GUESS=i586-pc-interix$UNAME_RELEASE
+		;;
+	    authenticamd | genuineintel | EM64T)
+		GUESS=x86_64-unknown-interix$UNAME_RELEASE
+		;;
+	    IA64)
+		GUESS=ia64-unknown-interix$UNAME_RELEASE
+		;;
+	esac ;;
+    i*:UWIN*:*)
+	GUESS=$UNAME_MACHINE-pc-uwin
+	;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	GUESS=x86_64-pc-cygwin
+	;;
+    prep*:SunOS:5.*:*)
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=powerpcle-unknown-solaris2$SUN_REL
+	;;
+    *:GNU:*:*)
+	# the GNU system
+	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+	;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+	;;
+    *:Minix:*:*)
+	GUESS=$UNAME_MACHINE-unknown-minix
+	;;
+    aarch64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    arm*:Linux:*:*)
+	set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
+	    else
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	;;
+    avr32*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    cris:Linux:*:*)
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
+    crisv32:Linux:*:*)
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
+    e2k:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    frv:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    hexagon:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    i*86:Linux:*:*)
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+	;;
+    ia64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    k1om:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    m32r*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    m68*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	sed 's/^	//' << EOF > "$dummy.c"
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
+
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
+
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	MIPS_ENDIAN=el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	MIPS_ENDIAN=
+	#else
+	MIPS_ENDIAN=
+	#endif
+	#endif
+EOF
+	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+	eval "$cc_set_vars"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+	;;
+    mips64el:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    openrisc*:Linux:*:*)
+	GUESS=or1k-unknown-linux-$LIBC
+	;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    padre:Linux:*:*)
+	GUESS=sparc-unknown-linux-$LIBC
+	;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	GUESS=hppa64-unknown-linux-$LIBC
+	;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+	  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+	  *)    GUESS=hppa-unknown-linux-$LIBC ;;
+	esac
+	;;
+    ppc64:Linux:*:*)
+	GUESS=powerpc64-unknown-linux-$LIBC
+	;;
+    ppc:Linux:*:*)
+	GUESS=powerpc-unknown-linux-$LIBC
+	;;
+    ppc64le:Linux:*:*)
+	GUESS=powerpc64le-unknown-linux-$LIBC
+	;;
+    ppcle:Linux:*:*)
+	GUESS=powerpcle-unknown-linux-$LIBC
+	;;
+    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+	;;
+    sh64*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    sh*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    tile*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    vax:Linux:*:*)
+	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+	;;
+    x86_64:Linux:*:*)
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	    then
+		LIBCABI=${LIBC}x32
+	    fi
+	fi
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	;;
+    xtensa*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	GUESS=i386-sequent-sysv4
+	;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+	;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	GUESS=$UNAME_MACHINE-pc-os2-emx
+	;;
+    i*86:XTS-300:*:STOP)
+	GUESS=$UNAME_MACHINE-unknown-stop
+	;;
+    i*86:atheos:*:*)
+	GUESS=$UNAME_MACHINE-unknown-atheos
+	;;
+    i*86:syllable:*:*)
+	GUESS=$UNAME_MACHINE-pc-syllable
+	;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	GUESS=i386-unknown-lynxos$UNAME_RELEASE
+	;;
+    i*86:*DOS:*:*)
+	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+	;;
+    i*86:*:4.*:*)
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
+	else
+		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
+	fi
+	;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
+	else
+		GUESS=$UNAME_MACHINE-pc-sysv32
+	fi
+	;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configure will decide that
+	# this is a cross-build.
+	GUESS=i586-pc-msdosdjgpp
+	;;
+    Intel:Mach:3*:*)
+	GUESS=i386-pc-mach3
+	;;
+    paragon:*:*:*)
+	GUESS=i860-intel-osf1
+	;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
+	fi
+	;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	GUESS=m68010-convergent-sysv
+	;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	GUESS=m68k-convergent-sysv
+	;;
+    M680?0:D-NIX:5.3:*)
+	GUESS=m68k-diab-dnix
+	;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+	;;
+    mc68030:UNIX_System_V:4.*:*)
+	GUESS=m68k-atari-sysv4
+	;;
+    TSUNAMI:LynxOS:2.*:*)
+	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+	;;
+    rs6000:LynxOS:2.*:*)
+	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+	;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+	;;
+    SM[BE]S:UNIX_SV:*:*)
+	GUESS=mips-dde-sysv$UNAME_RELEASE
+	;;
+    RM*:ReliantUNIX-*:*:*)
+	GUESS=mips-sni-sysv4
+	;;
+    RM*:SINIX-*:*:*)
+	GUESS=mips-sni-sysv4
+	;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		GUESS=$UNAME_MACHINE-sni-sysv4
+	else
+		GUESS=ns32k-sni-sysv
+	fi
+	;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	GUESS=i586-unisys-sysv4
+	;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	GUESS=hppa1.1-stratus-sysv4
+	;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	GUESS=i860-stratus-sysv4
+	;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	GUESS=$UNAME_MACHINE-stratus-vos
+	;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	GUESS=hppa1.1-stratus-vos
+	;;
+    mc68*:A/UX:*:*)
+	GUESS=m68k-apple-aux$UNAME_RELEASE
+	;;
+    news*:NEWS-OS:6*:*)
+	GUESS=mips-sony-newsos6
+	;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if test -d /usr/nec; then
+		GUESS=mips-nec-sysv$UNAME_RELEASE
+	else
+		GUESS=mips-unknown-sysv$UNAME_RELEASE
+	fi
+	;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	GUESS=powerpc-be-beos
+	;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	GUESS=powerpc-apple-beos
+	;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	GUESS=i586-pc-beos
+	;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	GUESS=i586-pc-haiku
+	;;
+    x86_64:Haiku:*:*)
+	GUESS=x86_64-unknown-haiku
+	;;
+    SX-4:SUPER-UX:*:*)
+	GUESS=sx4-nec-superux$UNAME_RELEASE
+	;;
+    SX-5:SUPER-UX:*:*)
+	GUESS=sx5-nec-superux$UNAME_RELEASE
+	;;
+    SX-6:SUPER-UX:*:*)
+	GUESS=sx6-nec-superux$UNAME_RELEASE
+	;;
+    SX-7:SUPER-UX:*:*)
+	GUESS=sx7-nec-superux$UNAME_RELEASE
+	;;
+    SX-8:SUPER-UX:*:*)
+	GUESS=sx8-nec-superux$UNAME_RELEASE
+	;;
+    SX-8R:SUPER-UX:*:*)
+	GUESS=sx8r-nec-superux$UNAME_RELEASE
+	;;
+    SX-ACE:SUPER-UX:*:*)
+	GUESS=sxace-nec-superux$UNAME_RELEASE
+	;;
+    Power*:Rhapsody:*:*)
+	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+	;;
+    *:Rhapsody:*:*)
+	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+	;;
+    arm64:Darwin:*:*)
+	GUESS=aarch64-apple-darwin$UNAME_RELEASE
+	;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	if command -v xcode-select > /dev/null 2> /dev/null && \
+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
+	    # Avoid executing cc if there is no toolchain installed as
+	    # cc will be a stub that puts up a graphical alert
+	    # prompting the user to install developer tools.
+	    CC_FOR_BUILD=no_compiler_found
+	else
+	    set_cc_for_build
+	fi
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_PPC >/dev/null
+	    then
+		UNAME_PROCESSOR=powerpc
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # uname -m returns i386 or x86_64
+	    UNAME_PROCESSOR=$UNAME_MACHINE
+	fi
+	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+	;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = x86; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+	;;
+    *:QNX:*:4*)
+	GUESS=i386-pc-qnx
+	;;
+    NEO-*:NONSTOP_KERNEL:*:*)
+	GUESS=neo-tandem-nsk$UNAME_RELEASE
+	;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	GUESS=nse-tandem-nsk$UNAME_RELEASE
+	;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsr-tandem-nsk$UNAME_RELEASE
+	;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsv-tandem-nsk$UNAME_RELEASE
+	;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsx-tandem-nsk$UNAME_RELEASE
+	;;
+    *:NonStop-UX:*:*)
+	GUESS=mips-compaq-nonstopux
+	;;
+    BS2000:POSIX*:*:*)
+	GUESS=bs2000-siemens-sysv
+	;;
+    DS/*:UNIX_System_V:*:*)
+	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+	;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "${cputype-}" = 386; then
+	    UNAME_MACHINE=i386
+	elif test "x${cputype-}" != x; then
+	    UNAME_MACHINE=$cputype
+	fi
+	GUESS=$UNAME_MACHINE-unknown-plan9
+	;;
+    *:TOPS-10:*:*)
+	GUESS=pdp10-unknown-tops10
+	;;
+    *:TENEX:*:*)
+	GUESS=pdp10-unknown-tenex
+	;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	GUESS=pdp10-dec-tops20
+	;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	GUESS=pdp10-xkl-tops20
+	;;
+    *:TOPS-20:*:*)
+	GUESS=pdp10-unknown-tops20
+	;;
+    *:ITS:*:*)
+	GUESS=pdp10-unknown-its
+	;;
+    SEI:*:*:SEIUX)
+	GUESS=mips-sei-seiux$UNAME_RELEASE
+	;;
+    *:DragonFly:*:*)
+	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+	;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case $UNAME_MACHINE in
+	    A*) GUESS=alpha-dec-vms ;;
+	    I*) GUESS=ia64-dec-vms ;;
+	    V*) GUESS=vax-dec-vms ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	GUESS=i386-pc-xenix
+	;;
+    i*86:skyos:*:*)
+	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+	;;
+    i*86:rdos:*:*)
+	GUESS=$UNAME_MACHINE-pc-rdos
+	;;
+    *:AROS:*:*)
+	GUESS=$UNAME_MACHINE-unknown-aros
+	;;
+    x86_64:VMkernel:*:*)
+	GUESS=$UNAME_MACHINE-unknown-esx
+	;;
+    amd64:Isilon\ OneFS:*:*)
+	GUESS=x86_64-unknown-onefs
+	;;
+    *:Unleashed:*:*)
+	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+	;;
+esac
+
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+    echo "$GUESS"
+    exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
+echo "$0: unable to guess system type" >&2
+
+case $UNAME_MACHINE:$UNAME_SYSTEM in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
+esac
+
+cat >&2 <<EOF
+
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
+
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+and
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
+
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+   cat >&2 <<EOF
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
+EOF
+fi
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.sub b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.sub
deleted file mode 120000
index 250e61549..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.sub
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/config.sub
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.sub b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.sub
new file mode 100755
index 000000000..d74fb6dea
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/config.sub
@@ -0,0 +1,1884 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2021 Free Software Foundation, Inc.
+
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-08-14'
+
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, see <https://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+
+Canonicalize a configuration name.
+
+Options:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2021 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo "$1"
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
+
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
+		;;
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		basic_os=$field3-$field4
+		;;
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				basic_os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				basic_os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				basic_os=$field3
+				;;
+		esac
+		;;
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						basic_os=
+						;;
+					*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+				esac
+			;;
+		esac
+		;;
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				basic_os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				basic_os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				basic_os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				basic_os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				basic_os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				basic_os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				basic_os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				basic_os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				basic_os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				basic_os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				basic_os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				basic_os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				basic_os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				basic_os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				basic_os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				basic_os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				basic_os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				basic_os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				basic_os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				basic_os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				basic_os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				basic_os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				basic_os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				basic_os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				basic_os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				basic_os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				basic_os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				basic_os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				basic_os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				basic_os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				basic_os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				basic_os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				basic_os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				basic_os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				basic_os=sysv3
+				;;
+			hp300 | hp300hpux)
+				basic_machine=m68k-hp
+				basic_os=hpux
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				basic_os=bsd
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				basic_os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				basic_os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				basic_os=mach
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				basic_os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				basic_os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				basic_os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				basic_os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				basic_os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				basic_os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				basic_os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				basic_os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				basic_os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				basic_os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				basic_os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				basic_os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				basic_os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				basic_os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				basic_os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				basic_os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				basic_os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				basic_os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				basic_os=cxux
+				;;
+			nh[45]000)
+				basic_machine=m88k-harris
+				basic_os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				basic_os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				basic_os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				basic_os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				basic_os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				basic_os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				basic_os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				basic_os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				basic_os=linux
+				;;
+			psp)
+				basic_machine=mipsallegrexel-sony
+				basic_os=psp
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				basic_os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				basic_os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				basic_os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				basic_os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				basic_os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				basic_os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				basic_os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				basic_os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				basic_os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				basic_os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				basic_os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				basic_os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				basic_os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				basic_os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				basic_os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				basic_os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				basic_os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				basic_os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				basic_os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				basic_os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				basic_os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				basic_os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				basic_os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				basic_os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				basic_os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				basic_os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				basic_os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				basic_os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				basic_os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				basic_os=vsta
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				basic_os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				basic_os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				basic_os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				basic_os=unicos
+				;;
+			*)
+				basic_machine=$1
+				basic_os=
+				;;
+		esac
+		;;
+esac
+
+# Decode 1-component or ad-hoc basic machines
+case $basic_machine in
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
+		;;
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
+		;;
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
+		;;
+	ibm*)
+		cpu=i370
+		vendor=ibm
+		;;
+	orion105)
+		cpu=clipper
+		vendor=highlevel
+		;;
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
+		;;
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
+		;;
+
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		cpu=m68000
+		vendor=att
+		;;
+	3b*)
+		cpu=we32k
+		vendor=att
+		;;
+	bluegene*)
+		cpu=powerpc
+		vendor=ibm
+		basic_os=cnk
+		;;
+	decsystem10* | dec10*)
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops10
+		;;
+	decsystem20* | dec20*)
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		cpu=m68k
+		vendor=motorola
+		;;
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		basic_os=sysv3
+		;;
+	encore | umax | mmax)
+		cpu=ns32k
+		vendor=encore
+		;;
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		basic_os=${basic_os:-bsd}
+		;;
+	fx2800)
+		cpu=i860
+		vendor=alliant
+		;;
+	genix)
+		cpu=ns32k
+		vendor=ns
+		;;
+	h3050r* | hiux*)
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		cpu=m68000
+		vendor=hp
+		;;
+	hp9k3[2-9][0-9])
+		cpu=m68k
+		vendor=hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	i*86v32)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv32
+		;;
+	i*86v4*)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv4
+		;;
+	i*86v)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv
+		;;
+	i*86sol2)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=solaris2
+		;;
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		basic_os=${basic_os:-unicos}
+		;;
+	iris | iris4d)
+		cpu=mips
+		vendor=sgi
+		case $basic_os in
+		    irix*)
+			;;
+		    *)
+			basic_os=irix4
+			;;
+		esac
+		;;
+	miniframe)
+		cpu=m68000
+		vendor=convergent
+		;;
+	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		cpu=m68k
+		vendor=atari
+		basic_os=mint
+		;;
+	news-3600 | risc-news)
+		cpu=mips
+		vendor=sony
+		basic_os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $basic_os in
+		    openstep*)
+		        ;;
+		    nextstep*)
+			;;
+		    ns2*)
+		      basic_os=nextstep2
+			;;
+		    *)
+		      basic_os=nextstep3
+			;;
+		esac
+		;;
+	np1)
+		cpu=np1
+		vendor=gould
+		;;
+	op50n-* | op60c-*)
+		cpu=hppa1.1
+		vendor=oki
+		basic_os=proelf
+		;;
+	pa-hitachi)
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
+		;;
+	pbd)
+		cpu=sparc
+		vendor=tti
+		;;
+	pbb)
+		cpu=m68k
+		vendor=tti
+		;;
+	pc532)
+		cpu=ns32k
+		vendor=pc532
+		;;
+	pn)
+		cpu=pn
+		vendor=gould
+		;;
+	power)
+		cpu=power
+		vendor=ibm
+		;;
+	ps2)
+		cpu=i386
+		vendor=ibm
+		;;
+	rm[46]00)
+		cpu=mips
+		vendor=siemens
+		;;
+	rtpc | rtpc-*)
+		cpu=romp
+		vendor=ibm
+		;;
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		basic_os=${basic_os:-elf}
+		;;
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		basic_os=vxworks
+		;;
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
+		;;
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
+		;;
+	w65)
+		cpu=w65
+		vendor=wdc
+		;;
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		basic_os=proelf
+		;;
+	none)
+		cpu=none
+		vendor=none
+		;;
+	leon|leon[3-9])
+		cpu=sparc
+		vendor=$basic_machine
+		;;
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+		;;
+
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+		IFS=$saved_IFS
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
+		;;
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
+		;;
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
+		;;
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
+		;;
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		basic_os=${basic_os:-unicosmp}
+		;;
+	c90-unknown | c90-cray)
+		vendor=cray
+		basic_os=${Basic_os:-unicos}
+		;;
+	fx80-unknown)
+		vendor=alliant
+		;;
+	romp-unknown)
+		vendor=ibm
+		;;
+	mmix-unknown)
+		vendor=knuth
+		;;
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
+		;;
+	rs6000-unknown)
+		vendor=ibm
+		;;
+	vax-unknown)
+		vendor=dec
+		;;
+	pdp11-unknown)
+		vendor=dec
+		;;
+	we32k-unknown)
+		vendor=att
+		;;
+	cydra-unknown)
+		vendor=cydrome
+		;;
+	i370-ibm*)
+		vendor=ibm
+		;;
+	orion-unknown)
+		vendor=highlevel
+		;;
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
+		;;
+
+	# Here we normalize CPU types with a missing or matching vendor
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		basic_os=${basic_os:-bosx}
+		;;
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
+		;;
+	blackfin-*)
+		cpu=bfin
+		basic_os=linux
+		;;
+	c54x-*)
+		cpu=tic54x
+		;;
+	c55x-*)
+		cpu=tic55x
+		;;
+	c6x-*)
+		cpu=tic6x
+		;;
+	e500v[12]-*)
+		cpu=powerpc
+		basic_os=${basic_os}"spe"
+		;;
+	mips3*-*)
+		cpu=mips64
+		;;
+	ms1-*)
+		cpu=mt
+		;;
+	m68knommu-*)
+		cpu=m68k
+		basic_os=linux
+		;;
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
+		;;
+	openrisc-*)
+		cpu=or32
+		;;
+	parisc-*)
+		cpu=hppa
+		basic_os=linux
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
+		;;
+	pentium4-*)
+		cpu=i786
+		;;
+	pc98-*)
+		cpu=i386
+		;;
+	ppc-* | ppcbe-*)
+		cpu=powerpc
+		;;
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
+		;;
+	ppc64-*)
+		cpu=powerpc64
+		;;
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
+		;;
+	sb1-*)
+		cpu=mipsisa64sb1
+		;;
+	sb1el-*)
+		cpu=mipsisa64sb1el
+		;;
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+		;;
+	spur-*)
+		cpu=spur
+		;;
+	strongarm-* | thumb-*)
+		cpu=arm
+		;;
+	tx39-*)
+		cpu=mipstx39
+		;;
+	tx39el-*)
+		cpu=mipstx39el
+		;;
+	x64-*)
+		cpu=x86_64
+		;;
+	xscale-* | xscalee[bl]-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+		;;
+	arm64-*)
+		cpu=aarch64
+		;;
+
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		basic_os=${basic_os:-elf}
+		;;
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
+		;;
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
+		;;
+	crx-*)
+		basic_os=${basic_os:-elf}
+		;;
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
+		;;
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
+		;;
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
+		;;
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
+		;;
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
+		;;
+	mipsallegrexel-sony)
+		cpu=mipsallegrexel
+		vendor=sony
+		;;
+	tile*-*)
+		basic_os=${basic_os:-linux-gnu}
+		;;
+
+	*)
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb | arc32 | arc64 \
+			| arm | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bpf | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| loongarch32 | loongarch64 | loongarchx32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r3 | mipsisa32r3el \
+			| mipsisa32r5 | mipsisa32r5el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r3 | mipsisa64r3el \
+			| mipsisa64r5 | mipsisa64r5el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
+			| score \
+			| sh | shl \
+			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| thumbv7* \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $vendor in
+	digital*)
+		vendor=dec
+		;;
+	commodore*)
+		vendor=cbm
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if test x$basic_os != x
+then
+
+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+	gnu/linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+		;;
+	os2-emx)
+		kernel=os2
+		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+		;;
+	nto-qnx*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+		;;
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+		IFS=$saved_IFS
+		;;
+	# Default OS when just kernel was specified
+	nto*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+		;;
+	linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
+		;;
+	*)
+		kernel=
+		os=$basic_os
+		;;
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
+case $os in
+	# First match some system type aliases that might get confused
+	# with valid system types.
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
+		;;
+	bluegene*)
+		os=cnk
+		;;
+	solaris1 | solaris1.*)
+		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
+		;;
+	solaris)
+		os=solaris2
+		;;
+	unixware*)
+		os=sysv4.2uw
+		;;
+	# es1800 is here to avoid being matched by es* (a different OS)
+	es1800*)
+		os=ose
+		;;
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
+		;;
+	isc)
+		os=isc2.2
+		;;
+	sco6)
+		os=sco5v6
+		;;
+	sco5)
+		os=sco3.2v5
+		;;
+	sco4)
+		os=sco3.2v4
+		;;
+	sco3.2.[4-9]*)
+		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
+		;;
+	sco*v* | scout)
+		# Don't match below
+		;;
+	sco*)
+		os=sco3.2v2
+		;;
+	psos*)
+		os=psos
+		;;
+	qnx*)
+		os=qnx
+		;;
+	hiux*)
+		os=hiuxwe2
+		;;
+	lynx*178)
+		os=lynxos178
+		;;
+	lynx*5)
+		os=lynxos5
+		;;
+	lynxos*)
+		# don't get caught up in next wildcard
+		;;
+	lynx*)
+		os=lynxos
+		;;
+	mac[0-9]*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
+		;;
+	opened*)
+		os=openedition
+		;;
+	os400*)
+		os=os400
+		;;
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+		;;
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+		;;
+	wince*)
+		os=wince
+		;;
+	utek*)
+		os=bsd
+		;;
+	dynix*)
+		os=bsd
+		;;
+	acis*)
+		os=aos
+		;;
+	atheos*)
+		os=atheos
+		;;
+	syllable*)
+		os=syllable
+		;;
+	386bsd)
+		os=bsd
+		;;
+	ctix* | uts*)
+		os=sysv
+		;;
+	nova*)
+		os=rtmk-nova
+		;;
+	ns2)
+		os=nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	sinix5.*)
+		os=`echo "$os" | sed -e 's|sinix|sysv|'`
+		;;
+	sinix*)
+		os=sysv4
+		;;
+	tpf*)
+		os=tpf
+		;;
+	triton*)
+		os=sysv3
+		;;
+	oss*)
+		os=sysv3
+		;;
+	svr4*)
+		os=sysv4
+		;;
+	svr3)
+		os=sysv3
+		;;
+	sysvr4)
+		os=sysv4
+		;;
+	ose*)
+		os=ose
+		;;
+	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+		os=mint
+		;;
+	dicos*)
+		os=dicos
+		;;
+	pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $cpu in
+		    arm*)
+			os=eabi
+			;;
+		    *)
+			os=elf
+			;;
+		esac
+		;;
+	*)
+		# No normalization, but not necessarily accepted, that comes below.
+		;;
+esac
+
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+kernel=
+case $cpu-$vendor in
+	score-*)
+		os=elf
+		;;
+	spu-*)
+		os=elf
+		;;
+	*-acorn)
+		os=riscix1.2
+		;;
+	arm*-rebel)
+		kernel=linux
+		os=gnu
+		;;
+	arm*-semi)
+		os=aout
+		;;
+	c4x-* | tic4x-*)
+		os=coff
+		;;
+	c8051-*)
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
+		;;
+	hexagon-*)
+		os=elf
+		;;
+	tic54x-*)
+		os=coff
+		;;
+	tic55x-*)
+		os=coff
+		;;
+	tic6x-*)
+		os=coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=tops20
+		;;
+	pdp11-*)
+		os=none
+		;;
+	*-dec | vax-*)
+		os=ultrix4.2
+		;;
+	m68*-apollo)
+		os=domain
+		;;
+	i386-sun)
+		os=sunos4.0.2
+		;;
+	m68000-sun)
+		os=sunos3
+		;;
+	m68*-cisco)
+		os=aout
+		;;
+	mep-*)
+		os=elf
+		;;
+	mips*-cisco)
+		os=elf
+		;;
+	mips*-*)
+		os=elf
+		;;
+	or32-*)
+		os=coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=sysv3
+		;;
+	sparc-* | *-sun)
+		os=sunos4.1.1
+		;;
+	pru-*)
+		os=elf
+		;;
+	*-be)
+		os=beos
+		;;
+	*-ibm)
+		os=aix
+		;;
+	*-knuth)
+		os=mmixware
+		;;
+	*-wec)
+		os=proelf
+		;;
+	*-winbond)
+		os=proelf
+		;;
+	*-oki)
+		os=proelf
+		;;
+	*-hp)
+		os=hpux
+		;;
+	*-hitachi)
+		os=hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=sysv
+		;;
+	*-cbm)
+		os=amigaos
+		;;
+	*-dg)
+		os=dgux
+		;;
+	*-dolphin)
+		os=sysv3
+		;;
+	m68k-ccur)
+		os=rtu
+		;;
+	m88k-omron*)
+		os=luna
+		;;
+	*-next)
+		os=nextstep
+		;;
+	*-sequent)
+		os=ptx
+		;;
+	*-crds)
+		os=unos
+		;;
+	*-ns)
+		os=genix
+		;;
+	i370-*)
+		os=mvs
+		;;
+	*-gould)
+		os=sysv
+		;;
+	*-highlevel)
+		os=bsd
+		;;
+	*-encore)
+		os=bsd
+		;;
+	*-sgi)
+		os=irix
+		;;
+	*-siemens)
+		os=sysv4
+		;;
+	*-masscomp)
+		os=rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=uxpv
+		;;
+	*-rom68k)
+		os=coff
+		;;
+	*-*bug)
+		os=coff
+		;;
+	*-apple)
+		os=macos
+		;;
+	*-atari*)
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
+		;;
+	*)
+		os=none
+		;;
+esac
+
+fi
+
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+	# Sometimes we do "kernel-libc", so those need to count as OSes.
+	musl* | newlib* | relibc* | uclibc*)
+		;;
+	# Likewise for "kernel-abi"
+	eabi* | gnueabi*)
+		;;
+	# VxWorks passes extra cpu info in the 4th filed.
+	simlinux | simwindows | spe)
+		;;
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+	     | hiux* | abug | nacl* | netware* | windows* \
+	     | os9* | macos* | osx* | ios* \
+	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* | serenity* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | mint* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+		;;
+	# This one is extra strict with allowed versions
+	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	none)
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+		   | linux-musl* | linux-relibc* | linux-uclibc* )
+		;;
+	uclinux-uclibc* )
+		;;
+	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+		# These are just libc implementations, not actual OSes, and thus
+		# require a kernel.
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
+		;;
+	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+		;;
+	nto-qnx*)
+		;;
+	os2-emx)
+		;;
+	*-eabi* | *-gnueabi*)
+		;;
+	-*)
+		# Blank kernel with real OS is always fine.
+		;;
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		exit 1
+		;;
+esac
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+case $vendor in
+	unknown)
+		case $cpu-$os in
+			*-riscix*)
+				vendor=acorn
+				;;
+			*-sunos*)
+				vendor=sun
+				;;
+			*-cnk* | *-aix*)
+				vendor=ibm
+				;;
+			*-beos*)
+				vendor=be
+				;;
+			*-hpux*)
+				vendor=hp
+				;;
+			*-mpeix*)
+				vendor=hp
+				;;
+			*-hiux*)
+				vendor=hitachi
+				;;
+			*-unos*)
+				vendor=crds
+				;;
+			*-dgux*)
+				vendor=dg
+				;;
+			*-luna*)
+				vendor=omron
+				;;
+			*-genix*)
+				vendor=ns
+				;;
+			*-clix*)
+				vendor=intergraph
+				;;
+			*-mvs* | *-opened*)
+				vendor=ibm
+				;;
+			*-os400*)
+				vendor=ibm
+				;;
+			s390-* | s390x-*)
+				vendor=ibm
+				;;
+			*-ptx*)
+				vendor=sequent
+				;;
+			*-tpf*)
+				vendor=ibm
+				;;
+			*-vxsim* | *-vxworks* | *-windiss*)
+				vendor=wrs
+				;;
+			*-aux*)
+				vendor=apple
+				;;
+			*-hms*)
+				vendor=hitachi
+				;;
+			*-mpw* | *-macos*)
+				vendor=apple
+				;;
+			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
+				vendor=atari
+				;;
+			*-vos*)
+				vendor=stratus
+				;;
+		esac
+		;;
+esac
+
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+exit
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/depcomp b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/depcomp
deleted file mode 120000
index 4ed246b49..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/depcomp
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/depcomp
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/depcomp b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/depcomp
new file mode 100755
index 000000000..715e34311
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+
+# This program 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, or (at your option)
+# any later version.
+
+# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/install-sh b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/install-sh
deleted file mode 120000
index ae5e89b40..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/install-sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/install-sh
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/install-sh b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/install-sh
new file mode 100755
index 000000000..ec298b537
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/install-sh
@@ -0,0 +1,541 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2020-11-14.01; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='	'
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
+  -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -p) cpprog="$cpprog -p";;
+
+    -s) stripcmd=$stripprog;;
+
+    -S) backupsuffix="$2"
+        shift;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	else
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	fi
+	trap '' 0;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask $mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ltmain.sh b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ltmain.sh
deleted file mode 120000
index 8cff389ad..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ltmain.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/libtool/build-aux/ltmain.sh
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ltmain.sh b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ltmain.sh
new file mode 100644
index 000000000..592919a1f
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/ltmain.sh
@@ -0,0 +1,11436 @@
+#! /usr/bin/env sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2019-02-19.15
+
+# libtool (GNU libtool) 2.4.7-dirty
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.7-dirty
+package_revision=2.4.7
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2019-02-19.15; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2004-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
+
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
+fi
+
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+	fi"
+done
+# These NLS vars are set unconditionally (bootstrap issue #24).  Unset those
+# in case the environment reset is needed later and the $save_* variant is not
+# defined (see the code above).
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# func_unset VAR
+# --------------
+# Portably unset VAR.
+# In some shells, an 'unset VAR' statement leaves a non-zero return
+# status if VAR is already unset, which might be problematic if the
+# statement is used at the end of a function (thus poisoning its return
+# value) or when 'set -e' is active (causing even a spurious abort of
+# the script in this case).
+func_unset ()
+{
+    { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
+}
+
+
+# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
+func_unset CDPATH
+
+# Make sure ${,E,F}GREP behave sanely.
+func_unset GREP_OPTIONS
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+# require_check_ifs_backslash
+# ---------------------------
+# Check if we can use backslash as IFS='\' separator, and set
+# $check_ifs_backshlash_broken to ':' or 'false'.
+require_check_ifs_backslash=func_require_check_ifs_backslash
+func_require_check_ifs_backslash ()
+{
+  _G_save_IFS=$IFS
+  IFS='\'
+  _G_check_ifs_backshlash='a\\b'
+  for _G_i in $_G_check_ifs_backshlash
+  do
+  case $_G_i in
+  a)
+    check_ifs_backshlash_broken=false
+    ;;
+  '')
+    break
+    ;;
+  *)
+    check_ifs_backshlash_broken=:
+    break
+    ;;
+  esac
+  done
+  IFS=$_G_save_IFS
+  require_check_ifs_backslash=:
+}
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_arg pretty "$2"
+    eval "$1+=\\ \$func_quote_arg_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_arg pretty "$2"
+    eval "$1=\$$1\\ \$func_quote_arg_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $debug_cmd
+
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
+    else
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+    fi
+
+    $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_portable EVAL ARG
+# ----------------------------
+# Internal function to portably implement func_quote_arg.  Note that we still
+# keep attention to performance here so we as much as possible try to avoid
+# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
+func_quote_portable ()
+{
+    $debug_cmd
+
+    $require_check_ifs_backslash
+
+    func_quote_portable_result=$2
+
+    # one-time-loop (easy break)
+    while true
+    do
+      if $1; then
+        func_quote_portable_result=`$ECHO "$2" | $SED \
+          -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
+        break
+      fi
+
+      # Quote for eval.
+      case $func_quote_portable_result in
+        *[\\\`\"\$]*)
+          # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
+          # contains the shell wildcard characters.
+          case $check_ifs_backshlash_broken$func_quote_portable_result in
+            :*|*[\[\*\?]*)
+              func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
+                  | $SED "$sed_quote_subst"`
+              break
+              ;;
+          esac
+
+          func_quote_portable_old_IFS=$IFS
+          for _G_char in '\' '`' '"' '$'
+          do
+            # STATE($1) PREV($2) SEPARATOR($3)
+            set start "" ""
+            func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
+            IFS=$_G_char
+            for _G_part in $func_quote_portable_result
+            do
+              case $1 in
+              quote)
+                func_append func_quote_portable_result "$3$2"
+                set quote "$_G_part" "\\$_G_char"
+                ;;
+              start)
+                set first "" ""
+                func_quote_portable_result=
+                ;;
+              first)
+                set quote "$_G_part" ""
+                ;;
+              esac
+            done
+          done
+          IFS=$func_quote_portable_old_IFS
+          ;;
+        *) ;;
+      esac
+      break
+    done
+
+    func_quote_portable_unquoted_result=$func_quote_portable_result
+    case $func_quote_portable_result in
+      # double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and variable expansion
+      # for a subsequent eval.
+      # many bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_portable_result=\"$func_quote_portable_result\"
+        ;;
+    esac
+}
+
+
+# func_quotefast_eval ARG
+# -----------------------
+# Quote one ARG (internal).  This is equivalent to 'func_quote_arg eval ARG',
+# but optimized for speed.  Result is stored in $func_quotefast_eval.
+if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
+  printf -v _GL_test_printf_tilde %q '~'
+  if test '\~' = "$_GL_test_printf_tilde"; then
+    func_quotefast_eval ()
+    {
+      printf -v func_quotefast_eval_result %q "$1"
+    }
+  else
+    # Broken older Bash implementations.  Make those faster too if possible.
+    func_quotefast_eval ()
+    {
+      case $1 in
+        '~'*)
+          func_quote_portable false "$1"
+          func_quotefast_eval_result=$func_quote_portable_result
+          ;;
+        *)
+          printf -v func_quotefast_eval_result %q "$1"
+          ;;
+      esac
+    }
+  fi
+else
+  func_quotefast_eval ()
+  {
+    func_quote_portable false "$1"
+    func_quotefast_eval_result=$func_quote_portable_result
+  }
+fi
+
+
+# func_quote_arg MODEs ARG
+# ------------------------
+# Quote one ARG to be evaled later.  MODEs argument may contain zero or more
+# specifiers listed below separated by ',' character.  This function returns two
+# values:
+#   i) func_quote_arg_result
+#      double-quoted (when needed), suitable for a subsequent eval
+#  ii) func_quote_arg_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.  Available only if 'unquoted' is specified.
+#
+# Available modes:
+# ----------------
+# 'eval' (default)
+#       - escape shell special characters
+# 'expand'
+#       - the same as 'eval';  but do not quote variable references
+# 'pretty'
+#       - request aesthetic output, i.e. '"a b"' instead of 'a\ b'.  This might
+#         be used later in func_quote to get output like: 'echo "a b"' instead
+#         of 'echo a\ b'.  This is slower than default on some shells.
+# 'unquoted'
+#       - produce also $func_quote_arg_unquoted_result which does not contain
+#         wrapping double-quotes.
+#
+# Examples for 'func_quote_arg pretty,unquoted string':
+#
+#   string      | *_result              | *_unquoted_result
+#   ------------+-----------------------+-------------------
+#   "           | \"                    | \"
+#   a b         | "a b"                 | a b
+#   "a b"       | "\"a b\""             | \"a b\"
+#   *           | "*"                   | *
+#   z="${x-$y}" | "z=\"\${x-\$y}\""     | z=\"\${x-\$y}\"
+#
+# Examples for 'func_quote_arg pretty,unquoted,expand string':
+#
+#   string        |   *_result          |  *_unquoted_result
+#   --------------+---------------------+--------------------
+#   z="${x-$y}"   | "z=\"${x-$y}\""     | z=\"${x-$y}\"
+func_quote_arg ()
+{
+    _G_quote_expand=false
+    case ,$1, in
+      *,expand,*)
+        _G_quote_expand=:
+        ;;
+    esac
+
+    case ,$1, in
+      *,pretty,*|*,expand,*|*,unquoted,*)
+        func_quote_portable $_G_quote_expand "$2"
+        func_quote_arg_result=$func_quote_portable_result
+        func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
+        ;;
+      *)
+        # Faster quote-for-eval for some shells.
+        func_quotefast_eval "$2"
+        func_quote_arg_result=$func_quotefast_eval_result
+        ;;
+    esac
+}
+
+
+# func_quote MODEs ARGs...
+# ------------------------
+# Quote all ARGs to be evaled later and join them into single command.  See
+# func_quote_arg's description for more info.
+func_quote ()
+{
+    $debug_cmd
+    _G_func_quote_mode=$1 ; shift
+    func_quote_result=
+    while test 0 -lt $#; do
+      func_quote_arg "$_G_func_quote_mode" "$1"
+      if test -n "$func_quote_result"; then
+        func_append func_quote_result " $func_quote_arg_result"
+      else
+        func_append func_quote_result "$func_quote_arg_result"
+      fi
+      shift
+    done
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_arg pretty,expand "$_G_cmd"
+    eval "func_notquiet $func_quote_arg_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_arg expand,pretty "$_G_cmd"
+      eval "func_echo $func_quote_arg_result"
+    }
+
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2010-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
+
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
+
+# Set a version string for this script.
+scriptversion=2019-02-19.15; # UTC
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# Copyright'.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug in processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# in the main code.  A hook is just a list of function names that can be
+# run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of hook functions to be called by
+# FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_propagate_result FUNC_NAME_A FUNC_NAME_B
+# ---------------------------------------------
+# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
+# *_result variable of FUNC_NAME_B.
+func_propagate_result ()
+{
+    $debug_cmd
+
+    func_propagate_result_result=:
+    if eval "test \"\${${1}_result+set}\" = set"
+    then
+      eval "${2}_result=\$${1}_result"
+    else
+      func_propagate_result_result=false
+    fi
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It's assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook functions." ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      func_unset "${_G_hook}_result"
+      eval $_G_hook '${1+"$@"}'
+      func_propagate_result $_G_hook func_run_hooks
+      if $func_propagate_result_result; then
+        eval set dummy "$func_run_hooks_result"; shift
+      fi
+    done
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list from your hook function.  You may remove
+# or edit any options that you action, and then pass back the remaining
+# unprocessed options in '<hooked_function_name>_result', escaped
+# suitably for 'eval'.
+#
+# The '<hooked_function_name>_result' variable is automatically unset
+# before your hook gets called; for best performance, only set the
+# *_result variable when necessary (i.e. don't call the 'func_quote'
+# function unnecessarily because it can be an expensive operation on some
+# machines).
+#
+# Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#        # No change in '$@' (ignored completely by this hook).  Leave
+#        # my_options_prep_result variable intact.
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        args_changed=false
+#
+#        # Note that, for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=:
+#                         args_changed=:
+#                         ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         args_changed=:
+#                         ;;
+#            *)           # Make sure the first unrecognised option "$_G_opt"
+#                         # is added back to "$@" in case we need it later,
+#                         # if $args_changed was set to 'true'.
+#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+#          esac
+#        done
+#
+#        # Only call 'func_quote' here if we processed at least one argument.
+#        if $args_changed; then
+#          func_quote eval ${1+"$@"}
+#          my_silent_option_result=$func_quote_result
+#        fi
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll also need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options_finish [ARG]...
+# ----------------------------
+# Finishing the option parse loop (call 'func_options' hooks ATM).
+func_options_finish ()
+{
+    $debug_cmd
+
+    func_run_hooks func_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_options_finish
+}
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    _G_options_quoted=false
+
+    for my_func in options_prep parse_options validate_options options_finish
+    do
+      func_unset func_${my_func}_result
+      func_unset func_run_hooks_result
+      eval func_$my_func '${1+"$@"}'
+      func_propagate_result func_$my_func func_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_options_result"; shift
+        _G_options_quoted=:
+      fi
+    done
+
+    $_G_options_quoted || {
+      # As we (func_options) are top-level options-parser function and
+      # nobody quoted "$@" for us yet, we need to do it explicitly for
+      # caller.
+      func_quote eval ${1+"$@"}
+      func_options_result=$func_quote_result
+    }
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propagate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+    func_propagate_result func_run_hooks func_options_prep
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    _G_parse_options_requote=false
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+      func_propagate_result func_run_hooks func_parse_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_parse_options_result"; shift
+        # Even though we may have changed "$@", we passed the "$@" array
+        # down into the hook and it quoted it for us (because we are in
+        # this if-branch).  No need to quote it again.
+        _G_parse_options_requote=false
+      fi
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      # We expect that one of the options parsed in this function matches
+      # and thus we remove _G_opt from "$@" and need to re-quote.
+      _G_match_parse_options=:
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode" >&2
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      if test $# = 0 && func_missing_arg $_G_opt; then
+                        _G_parse_options_requote=:
+                        break
+                      fi
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           _G_parse_options_requote=: ; break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift
+                      _G_match_parse_options=false
+                      break
+                      ;;
+      esac
+
+      if $_G_match_parse_options; then
+        _G_parse_options_requote=:
+      fi
+    done
+
+    if $_G_parse_options_requote; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      func_parse_options_result=$func_quote_result
+    fi
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_validate_options
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
+    exit_cmd=exit
+}
+
+
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables
+# after splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      if test "x$func_split_equals_lhs" = "x$1"; then
+        func_split_equals_rhs=
+      fi
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs=" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+# The version message is extracted from the calling file's header
+# comments, with leading '# ' stripped:
+#   1. First display the progname and version
+#   2. Followed by the header comment line matching  /^# Written by /
+#   3. Then a blank line followed by the first following line matching
+#      /^# Copyright /
+#   4. Immediately followed by any lines between the previous matches,
+#      except lines preceding the intervening completely blank line.
+# For example, see the header comments of this file.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /^# Written by /!b
+        s|^# ||; p; n
+
+        :fwd2blnk
+        /./ {
+          n
+          b fwd2blnk
+        }
+        p; n
+
+        :holdwrnt
+        s|^# ||
+        s|^# *$||
+        /^Copyright /!{
+          /./H
+          n
+          b holdwrnt
+        }
+
+        s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+        G
+        s|\(\n\)\n*|\1|g
+        p; q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.7-dirty'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.7-dirty
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
+}
+
+
+# func_config
+# -----------
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+
+# func_features
+# -------------
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+
+# func_enable_tag TAGNAME
+# -----------------------
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+    # Global variable:
+    tagname=$1
+
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
+
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
+    *)
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
+
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
+}
+
+
+# func_check_version_match
+# ------------------------
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
+    fi
+}
+
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    _G_rc_lt_options_prep=:
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    *)
+      _G_rc_lt_options_prep=false
+      ;;
+    esac
+
+    if $_G_rc_lt_options_prep; then
+      # Pass back the list of options.
+      func_quote eval ${1+"$@"}
+      libtool_options_prep_result=$func_quote_result
+    fi
+}
+func_add_hook func_options_prep libtool_options_prep
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    _G_rc_lt_parse_options=false
+
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_match_lt_parse_options=:
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        # An option not handled by this hook function:
+        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
+                        _G_match_lt_parse_options=false
+                        break
+                        ;;
+      esac
+      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
+    done
+
+    if $_G_rc_lt_parse_options; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      libtool_parse_options_result=$func_quote_result
+    fi
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if 'file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case $lalib_p_line in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test yes = "$lalib_p"
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $debug_cmd
+
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
+      IFS=$save_ifs
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# 'FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $debug_cmd
+
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $debug_cmd
+
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with '--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $debug_cmd
+
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg=$arg
+	arg_mode=normal
+	;;
+
+      target )
+	libobj=$arg
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify '-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs=$IFS; IFS=,
+	  for arg in $args; do
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS=$save_ifs
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg=$srcfile
+	  srcfile=$arg
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with '-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj=$func_basename_result
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from '$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_arg pretty "$libobj"
+    test "X$libobj" != "X$func_quote_arg_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test yes = "$build_old_libs"; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test yes = "$need_locks"; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test warn = "$need_locks"; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_arg pretty "$srcfile"
+    qsrcfile=$func_quote_arg_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test yes = "$build_libtool_libs"; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test no != "$pic_mode"; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test yes = "$suppress_opt"; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test no != "$need_locks"; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG
+  -Xcompiler FLAG   pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to '-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the '--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the 'install' or 'cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wa,FLAG
+  -Xassembler FLAG  pass linker-specific FLAG directly to the assembler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with '-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in '.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
+
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode '$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $debug_cmd
+
+    # The first argument is the command name.
+    cmd=$nonopt
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "'$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "'$file' was not linked with '-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+	;;
+
+      *)
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir=$absdir
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic=$magic
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd=\$cmd$args
+    fi
+}
+
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $debug_cmd
+
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_quiet && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $debug_cmd
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
+      # Aesthetically quote it.
+      func_quote_arg pretty "$nonopt"
+      install_prog="$func_quote_arg_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_arg pretty "$arg"
+    func_append install_prog "$func_quote_arg_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=false
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=: ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_arg pretty "$arg"
+      func_append install_prog " $func_quote_arg_result"
+      if test -n "$arg2"; then
+	func_quote_arg pretty "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_arg_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_arg pretty "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_arg_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir=$func_dirname_result
+      destname=$func_basename_result
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "'$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "'$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir=$func_dirname_result
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking '$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname=$1
+	  shift
+
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme=$stripme
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib=$destdir/$realname
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name=$func_basename_result
+	instname=$dir/${name}i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest=$destfile
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test yes = "$build_old_libs"; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=.exe
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+	  finalize=:
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test no = "$fast_install" && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if $finalize; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_quiet || {
+	          func_quote_arg expand,pretty "$relink_command"
+		  eval "func_echo $func_quote_arg_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink '$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file=$outputname
+	      else
+	        func_warning "cannot relink '$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name=$func_basename_result
+
+      # Set up the ranlib parameters.
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run '$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms=${my_outputname}S.c
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist=$output_objdir/$my_outputname.nm
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols=$output_objdir/$outputname.exp
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from '$dlprefile'"
+	  func_basename "$dlprefile"
+	  name=$func_basename_result
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname"; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj=$output_objdir/${my_outputname}S.$objext
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $debug_cmd
+
+  win32_libid_type=unknown
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
+	    1,100{
+		/ I /{
+		    s|.*|import|
+		    p
+		    q
+		}
+	    }'`
+	;;
+      esac
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $debug_cmd
+
+    my_gentop=$1; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib=$func_basename_result
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result=$my_oldobjs
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    func_quote_arg pretty "$ECHO"
+    qECHO=$func_quote_arg_result
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=$qECHO
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test yes = "$fast_install"; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	\$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
+# define LT_PATHMAX PATH_MAX
+#elif defined MAXPATHLEN
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free (stale); stale = 0; } \
+} while (0)
+
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test yes = "$fast_install"; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  int rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (STREQ (argv[i], dumpscript_opt))
+	{
+EOF
+	    case $host in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (STREQ (argv[i], debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (STREQ (argv[i], ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  size_t tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = (size_t) (q - p);
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (STREQ (str, pat))
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[--len] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $debug_cmd
+
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # what system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll that has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    os2dllname=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=false
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module=$wl-single_module
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg=$1
+      shift
+      func_quote_arg pretty,unquoted "$arg"
+      qarg=$func_quote_arg_unquoted_result
+      func_append libtool_args " $func_quote_arg_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  $preload || {
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=:
+	  }
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test no = "$dlself"; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test dlprefiles = "$prev"; then
+	      dlself=yes
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols=$arg
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file '$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir=$func_dirname_result
+
+		if test none != "$pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object=$xdir$pic_object
+
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test dlprefiles = "$prev"; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg=$pic_object
+		fi
+
+		# Non-PIC object.
+		if test none != "$non_pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object=$xdir$non_pic_object
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object=$pic_object
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir=$func_dirname_result
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "'$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file '$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release=-$arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test rpath = "$prev"; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds=$arg
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xassembler)
+	  func_append compiler_flags " -Xassembler $qarg"
+	  prev=
+	  func_append compile_command " -Xassembler $qarg"
+	  func_append finalize_command " -Xassembler $qarg"
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg=$arg
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test X-export-symbols = "X$arg"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between '-L' and '$1'"
+	  else
+	    func_fatal_error "need path for '-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  esac
+	elif test X-lc_r = "X$arg"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+     # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.
+     -pthread)
+	case $host in
+	  *solaris2*) ;;
+	  *)
+	    case "$new_inherited_linker_flags " in
+	        *" $arg "*) ;;
+	        * ) func_append new_inherited_linker_flags " $arg" ;;
+	    esac
+	  ;;
+	esac
+	continue
+	;;
+      -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module=$wl-multi_module
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_arg pretty "$flag"
+	  func_append arg " $func_quote_arg_result"
+	  func_append compiler_flags " $func_quote_arg_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_arg pretty "$flag"
+	  func_append arg " $wl$func_quote_arg_result"
+	  func_append compiler_flags " $wl$func_quote_arg_result"
+	  func_append linker_flags " $func_quote_arg_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xassembler)
+        prev=xassembler
+        continue
+        ;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
+      # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
+      # -fuse-ld=*           Linker select flags for GCC
+      # -Wa,*                Pass flags directly to the assembler
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_arg pretty "$arg"
+	  arg=$func_quote_arg_result
+        fi
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir=$func_dirname_result
+
+	  test none = "$pic_object" || {
+	    # Prepend the subdirectory the object is found in.
+	    pic_object=$xdir$pic_object
+
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test dlprefiles = "$prev"; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg=$pic_object
+	  }
+
+	  # Non-PIC object.
+	  if test none != "$non_pic_object"; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object=$xdir$non_pic_object
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object=$pic_object
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir=$func_dirname_result
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "'$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test dlprefiles = "$prev"; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
+    func_dirname "$output" "/" ""
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test lib = "$linkmode"; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=false
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test lib,link = "$linkmode,$pass"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs=$tmp_deplibs
+      fi
+
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
+	deplibs=
+      fi
+      if test prog = "$linkmode"; then
+	case $pass in
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test lib,dlpreopen = "$linkmode,$pass"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs=$dlprefiles
+      fi
+      if test dlopen = "$pass"; then
+	# Collect dlpreopened libraries
+	save_deplibs=$deplibs
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=false
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test lib = "$linkmode"; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib=$searchdir/lib$name$search_ext
+	      if test -f "$lib"; then
+		if test .la = "$search_ext"; then
+		  found=:
+		else
+		  found=false
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if $found; then
+	    # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll=$l
+		  done
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
+		    func_dirname "$lib" "" "."
+		    ladir=$func_dirname_result
+		    lib=$ladir/$old_library
+		    if test prog,link = "$linkmode,$pass"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test conv = "$pass" && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test conv = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test scan = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "'-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test link = "$pass"; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=false
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=:
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=:
+		;;
+	      esac
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test link != "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=:
+	  continue
+	  ;;
+	esac # case $deplib
+
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir=$func_dirname_result
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test conv = "$pass"; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for '$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib=$l
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for '$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
+	  if test -z "$dlname" ||
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of '$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir=$ladir
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname=$func_basename_result
+
+	# Find the relevant object directory and library name.
+	if test yes = "$installed"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
+	  else
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
+	  fi
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
+	  fi
+	  case $host in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test lib = "$linkmode"; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if $linkalldeplibs; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test prog,link = "$linkmode,$pass"; then
+	  if test -n "$library_names" &&
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
+	      # Make sure the rpath contains only unique directories.
+	      case $temp_rpath: in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test built = "$use_static_libs" && test yes = "$installed"; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule=$dlpremoduletest
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    if test prog = "$linkmode"; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname=$1
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname=$dlname
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc* | *os2*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix=-$major
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname=$realname
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot=$soname
+	    func_basename "$soroot"
+	    soname=$func_basename_result
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from '$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for '$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir=-L$dir ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we cannot
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add=$dir/$old_library
+			fi
+		      elif test -n "$old_library"; then
+			add=$dir/$old_library
+		      fi
+		    fi
+		esac
+	      elif test no = "$hardcode_minus_L"; then
+		case $host in
+		*-*-sunos*) add_shlibpath=$dir ;;
+		esac
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test yes != "$lib_linked"; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
+	      else
+		add=$libdir/$linklib
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir=-L$libdir
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add=-l$name
+	    fi
+
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test prog = "$linkmode"; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test yes = "$build_libtool_libs"; then
+	  # Not a shared library
+	  if test pass_all != "$deplibs_check_method"; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test yes = "$module"; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test no = "$build_old_libs"; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test lib = "$linkmode"; then
+	  if test -n "$dependency_libs" &&
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs=$temp_deplibs
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test no != "$link_all_deplibs"; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path=$deplib ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path=-L$absdir/$objdir
+		  ;;
+		esac
+		else
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "'$deplib' seems to be moved"
+
+		  path=-L$absdir
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	}
+
+	if test prog,link = "$linkmode,$pass"; then
+	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | $SED 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=
+	  ;;
+	esac
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
+    fi
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "'-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs=$output
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form 'libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+	if test no != "$need_lib_prefix"; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test yes = "$build_libtool_libs"; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a '.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "'-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs=$IFS; IFS=:
+	set dummy $vinfo 0 0 0
+	shift
+	IFS=$save_ifs
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to '-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # that has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_revision
+	    ;;
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_minor
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current=$1
+	  revision=$2
+	  age=$3
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
+	  ;;
+
+	freebsd-aout)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	freebsd-elf | midnightbsd-elf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	irix | nonstopux)
+	  if test no = "$lt_irix_increment"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring=$verstring_prefix$major.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test 0 -ne "$loop"; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring_prefix$major.$iface:$verstring
+	  done
+
+	  # Before this point, $major must not contain '.'.
+	  major=.$major
+	  versuffix=$major.$revision
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test 0 -ne "$loop"; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring:$iface.0
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":$current.0"
+	  ;;
+
+	qnx)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sunos)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 file systems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix=-$major
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type '$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring=0.0
+	    ;;
+	  esac
+	  if test no = "$need_version"; then
+	    versuffix=
+	  else
+	    versuffix=.0.0
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test yes,no = "$avoid_version,$need_version"; then
+	  major=
+	  versuffix=
+	  verstring=
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag=$no_undefined_flag
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
+
+      if test relink != "$opt_mode"; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles=$dlfiles
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles=$dlprefiles
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test yes = "$build_libtool_libs"; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=
+	versuffix=
+	major=
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=
+		    ;;
+		  esac
+		fi
+		if test -n "$i"; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i"; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib=$potent_lib
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test none = "$deplibs_check_method"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test no = "$allow_undefined"; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs=$new_libs
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test yes = "$hardcode_into_libs"; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs=$libdir
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname=$1
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname=$realname
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib=$output_objdir/$realname
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    func_dll_def_p "$export_symbols" || {
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols=$export_symbols
+	      export_symbols=
+	      always_export_symbols=yes
+	    }
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs=$IFS; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS=$save_ifs
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=$output_objdir/$output_la.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs=$tmp_deplibs
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test yes = "$compiler_needs_object" &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test yes = "$module" && test -n "$module_cmds"; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test : != "$skipped_export" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test yes = "$compiler_needs_object"; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-$k.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test -z "$objlist" ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test 1 -eq "$k"; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-$k.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    }
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs=$IFS; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS=$save_ifs
+	      $opt_quiet || {
+		  func_quote_arg expand,pretty "$cmd"
+		  eval "func_echo $func_quote_arg_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test relink = "$opt_mode"; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS=$save_ifs
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          ${skipped_export-false} && {
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  }
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test yes = "$module" && test -n "$module_cmds"; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs=$IFS; IFS='~'
+	for cmd in $cmds; do
+	  IFS=$sp$nl
+	  eval cmd=\"$cmd\"
+	  IFS=$save_ifs
+	  $opt_quiet || {
+	    func_quote_arg expand,pretty "$cmd"
+	    eval "func_echo $func_quote_arg_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test relink = "$opt_mode"; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS=$save_ifs
+
+	# Restore the uninstalled library and exit
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test yes = "$module" || test yes = "$export_dynamic"; then
+	  # On all known operating systems, these are identical.
+	  dlname=$soname
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj=$output
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
+	else
+	  gentop=$output_objdir/${obj}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
+      # Create the old-style object.
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
+
+      output=$obj
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      test yes = "$build_libtool_libs" || {
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      }
+
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output=$libobj
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for programs"
+
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test CXX = "$tagname"; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs=$new_libs
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath=$rpath
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath=$rpath
+
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=:
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
+        ;;
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
+        ;;
+      *)
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
+        fi
+        ;;
+      esac
+      $wrappers_required || {
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
+	fi
+
+	exit $exit_status
+      }
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test yes = "$no_install"; then
+	# We don't need to create a wrapper script.
+	link_command=$compile_var$compile_command$compile_rpath
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_arg pretty "$var_value"
+	    relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
+	  fi
+	done
+	func_quote eval cd "`pwd`"
+	func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
+	relink_command=$func_quote_arg_unquoted_result
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host"; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
+	  build_libtool_libs=no
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
+
+      if test -n "$addlibs"; then
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase=$func_basename_result
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj"; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test -z "$oldobjs"; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test yes = "$build_old_libs" && old_library=$libname.$libext
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_arg pretty,unquoted "$var_value"
+	  relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      func_quote eval cd "`pwd`"
+      relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      func_quote_arg pretty,unquoted "$relink_command"
+      relink_command=$func_quote_arg_unquoted_result
+      if test yes = "$hardcode_automatic"; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test yes = "$installed"; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output=$output_objdir/${outputname}i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name=$func_basename_result
+		func_resolve_sysroot "$deplib"
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs=$newdependency_libs
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles=$newdlprefiles
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles=$newdlprefiles
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test no,yes = "$installed,$need_relink"; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $debug_cmd
+
+    RM=$nonopt
+    files=
+    rmforce=false
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
+      else
+	odir=$dir/$objdir
+      fi
+      func_basename "$file"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif $rmforce; then
+	continue
+      fi
+
+      rmfiles=$file
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case $opt_mode in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" && test none != "$pic_object"; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test clean = "$opt_mode"; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the $objdir's in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
+
+test -z "$opt_mode" && {
+  help=$generic_help
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode '$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# where we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/missing b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/missing
deleted file mode 120000
index 60599889a..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/missing
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/missing
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/missing b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/missing
new file mode 100755
index 000000000..1fe1611f1
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program 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, or (at your option)
+# any later version.
+
+# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/test-driver b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/test-driver
deleted file mode 120000
index ce2380d8a..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/test-driver
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/test-driver
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/build-aux/test-driver b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/test-driver
new file mode 100755
index 000000000..be73b80ad
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/build-aux/test-driver
@@ -0,0 +1,153 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+#
+# This program 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, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name NAME --log-file PATH --trs-file PATH
+              [--expect-failure {yes|no}] [--color-tests {yes|no}]
+              [--enable-hard-errors {yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+See the GNU Automake documentation for information.
+END
+}
+
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+   *) break;;
+  esac
+  shift
+done
+
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
+estatus=$?
+
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+
+case $tweaked_estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/configure~ b/apps/KhiCAS/src/mpfi-1.5.4/configure~
deleted file mode 100755
index c720c5af6..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/configure~
+++ /dev/null
@@ -1,16675 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for mpfi 1.5.4.
-#
-# Report bugs to <mpfi-users@lists.gforge.inria.fr>.
-#
-#
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
-# Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
-as_nl='
-'
-export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
-
-# The user is always right.
-if ${PATH_SEPARATOR+false} :; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else \$as_nop
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" )
-then :
-
-else \$as_nop
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-blah=\$(echo \$(echo blah))
-test x\"\$blah\" = xblah || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null
-then :
-  as_have_required=yes
-else $as_nop
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
-then :
-
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
-then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else $as_nop
-  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi
-fi
-
-
-      if test "x$CONFIG_SHELL" != x
-then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno
-then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
-  if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
-$0: mpfi-users@lists.gforge.inria.fr about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else $as_nop
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else $as_nop
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  printf "%s\n" "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='mpfi'
-PACKAGE_TARNAME='mpfi'
-PACKAGE_VERSION='1.5.4'
-PACKAGE_STRING='mpfi 1.5.4'
-PACKAGE_BUGREPORT='mpfi-users@lists.gforge.inria.fr'
-PACKAGE_URL='https://gforge.inria.fr/projects/mpfi/'
-
-ac_unique_file="src/mpfi.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stddef.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_header_c_list=
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-LT_SYS_LIBRARY_PATH
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-DLLTOOL
-OBJDUMP
-FILECMD
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-ac_ct_AR
-AR
-LN_S
-CPP
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-CSCOPE
-ETAGS
-CTAGS
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__include
-DEPDIR
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-runstatedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL
-am__quote'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_dependency_tracking
-enable_silent_rules
-enable_maintainer_mode
-with_mpfr_include
-with_mpfr_lib
-with_mpfr
-with_gmp_include
-with_gmp_lib
-with_gmp
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_aix_soname
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-LT_SYS_LIBRARY_PATH'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures mpfi 1.5.4 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/mpfi]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of mpfi 1.5.4:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-mpfr-include=DIR MPFR include directory
-  --with-mpfr-lib=DIR     MPFR lib directory
-  --with-mpfr=DIR         MPFR install directory
-  --with-gmp-include=DIR  GMP include directory
-  --with-gmp-lib=DIR      GMP lib directory
-  --with-gmp=DIR          GMP install directory
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-aix-soname=aix|svr4|both
-                          shared library versioning (aka "SONAME") variant to
-                          provide on AIX, [default=aix].
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
-                          compiler's sysroot if not specified).
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  LT_SYS_LIBRARY_PATH
-              User-defined run-time library search path.
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <mpfi-users@lists.gforge.inria.fr>.
-mpfi home page: <https://gforge.inria.fr/projects/mpfi/>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for configure.gnu first; this name is used for a wrapper for
-    # Metaconfig's "Configure" on case-insensitive file systems.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-mpfi configure 1.5.4
-generated by GNU Autoconf 2.71
-
-Copyright (C) 2021 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
-  ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  eval "$3=yes"
-else $as_nop
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }
-then :
-  ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }
-then :
-  ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (); below.  */
-
-#include <limits.h>
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main (void)
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  eval "$3=yes"
-else $as_nop
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main (void)
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main (void)
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-
-else $as_nop
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-ac_configure_args_raw=
-for ac_arg
-do
-  case $ac_arg in
-  *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  as_fn_append ac_configure_args_raw " '$ac_arg'"
-done
-
-case $ac_configure_args_raw in
-  *$as_nl*)
-    ac_safe_unquote= ;;
-  *)
-    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
-    ac_unsafe_a="$ac_unsafe_z#~"
-    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
-esac
-
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by mpfi $as_me 1.5.4, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
-
-  $ $0$ac_configure_args_raw
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    printf "%s\n" "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    printf "%s\n" "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-printf "%s\n" "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
-
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
-
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
-
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
-
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
-
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  ac_site_files="$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
-else
-  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-fi
-
-for ac_site_file in $ac_site_files
-do
-  case $ac_site_file in #(
-  */*) :
-     ;; #(
-  *) :
-    ac_site_file=./$ac_site_file ;;
-esac
-  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-# Test code for whether the C compiler supports C89 (global declarations)
-ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
-
-#include <stddef.h>
-#include <stdarg.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
-struct buf { int x; };
-struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not \xHH hex character constants.
-   These do not provoke an error unfortunately, instead are silently treated
-   as an "x".  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
-   array size at least.  It is necessary to write \x00 == 0 to get something
-   that is true only with -std.  */
-int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) '\''x'\''
-int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
-               int, int);'
-
-# Test code for whether the C compiler supports C89 (body of main).
-ac_c_conftest_c89_main='
-ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
-'
-
-# Test code for whether the C compiler supports C99 (global declarations)
-ac_c_conftest_c99_globals='
-// Does the compiler advertise C99 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-# error "Compiler does not advertise C99 conformance"
-#endif
-
-#include <stdbool.h>
-extern int puts (const char *);
-extern int printf (const char *, ...);
-extern int dprintf (int, const char *, ...);
-extern void *malloc (size_t);
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-// dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
-#define debug(...) dprintf (2, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  #error "your preprocessor is broken"
-#endif
-#if BIG_OK
-#else
-  #error "your preprocessor is broken"
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data[];
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // See if C++-style comments work.
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str = "";
-  int number = 0;
-  float fnumber = 0;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case '\''s'\'': // string
-	  str = va_arg (args_copy, const char *);
-	  break;
-	case '\''d'\'': // int
-	  number = va_arg (args_copy, int);
-	  break;
-	case '\''f'\'': // float
-	  fnumber = va_arg (args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end (args_copy);
-  va_end (args);
-
-  return *str && number && fnumber;
-}
-'
-
-# Test code for whether the C compiler supports C99 (body of main).
-ac_c_conftest_c99_main='
-  // Check bool.
-  _Bool success = false;
-  success |= (argc != 0);
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->data[i] = i * 1.234;
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
-
-  // work around unused variable warnings
-  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
-'
-
-# Test code for whether the C compiler supports C11 (global declarations)
-ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "Compiler does not advertise C11 conformance"
-#endif
-
-// Check _Alignas.
-char _Alignas (double) aligned_as_double;
-char _Alignas (0) no_special_alignment;
-extern char aligned_as_int;
-char _Alignas (0) _Alignas (int) aligned_as_int;
-
-// Check _Alignof.
-enum
-{
-  int_alignment = _Alignof (int),
-  int_array_alignment = _Alignof (int[100]),
-  char_alignment = _Alignof (char)
-};
-_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
-
-// Check _Noreturn.
-int _Noreturn does_not_return (void) { for (;;) continue; }
-
-// Check _Static_assert.
-struct test_static_assert
-{
-  int x;
-  _Static_assert (sizeof (int) <= sizeof (long int),
-                  "_Static_assert does not work in struct");
-  long int y;
-};
-
-// Check UTF-8 literals.
-#define u8 syntax error!
-char const utf8_literal[] = u8"happens to be ASCII" "another string";
-
-// Check duplicate typedefs.
-typedef long *long_ptr;
-typedef long int *long_ptr;
-typedef long_ptr long_ptr;
-
-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
-struct anonymous
-{
-  union {
-    struct { int i; int j; };
-    struct { int k; long int l; } w;
-  };
-  int m;
-} v1;
-'
-
-# Test code for whether the C compiler supports C11 (body of main).
-ac_c_conftest_c11_main='
-  _Static_assert ((offsetof (struct anonymous, i)
-		   == offsetof (struct anonymous, w.k)),
-		  "Anonymous union alignment botch");
-  v1.i = 2;
-  v1.w.k = 5;
-  ok |= v1.i != 5;
-'
-
-# Test code for whether the C compiler supports C11 (complete).
-ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-${ac_c_conftest_c11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  ${ac_c_conftest_c11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C99 (complete).
-ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C89 (complete).
-ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  return ok;
-}
-"
-
-as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
-as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
-as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
-as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
-as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
-as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
-as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
-as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
-as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
-
-# Auxiliary files required by this configure script.
-ac_aux_files="config.guess config.sub ltmain.sh ar-lib missing install-sh compile"
-
-# Locations in which to look for auxiliary files.
-ac_aux_dir_candidates="${srcdir}/build-aux"
-
-# Search for a directory containing all of the required auxiliary files,
-# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
-# If we don't find one directory that contains all the files we need,
-# we report the set of missing files from the *first* directory in
-# $ac_aux_dir_candidates and give up.
-ac_missing_aux_files=""
-ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in $ac_aux_dir_candidates
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-  as_found=:
-
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
-  ac_aux_dir_found=yes
-  ac_install_sh=
-  for ac_aux in $ac_aux_files
-  do
-    # As a special case, if "install-sh" is required, that requirement
-    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
-    # and $ac_install_sh is set appropriately for whichever one is found.
-    if test x"$ac_aux" = x"install-sh"
-    then
-      if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
-        ac_install_sh="${as_dir}install-sh -c"
-      elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
-        ac_install_sh="${as_dir}install.sh -c"
-      elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
-        ac_install_sh="${as_dir}shtool install -c"
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
-        else
-          break
-        fi
-      fi
-    else
-      if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
-        else
-          break
-        fi
-      fi
-    fi
-  done
-  if test "$ac_aux_dir_found" = yes; then
-    ac_aux_dir="$as_dir"
-    break
-  fi
-  ac_first_candidate=false
-
-  as_found=false
-done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else $as_nop
-  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
-fi
-
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-if test -f "${ac_aux_dir}config.guess"; then
-  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
-fi
-if test -f "${ac_aux_dir}config.sub"; then
-  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
-fi
-if test -f "$ac_aux_dir/configure"; then
-  ac_configure="$SHELL ${ac_aux_dir}configure"
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
-	    and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers mpfi_config.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
-set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "clang", so it can be a program name with args.
-set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-
-
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else $as_nop
-  ac_file=''
-fi
-if test -z "$ac_file"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-printf %s "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main (void)
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-printf %s "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-printf %s "checking for suffix of object files... " >&6; }
-if test ${ac_cv_objext+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+y}
-ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_g=yes
-else $as_nop
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-
-else $as_nop
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c11=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c11_program
-_ACEOF
-for ac_arg in '' -std=gnu11
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
-
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c99_program
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
-
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c99" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c89_program
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
-
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c89" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
-fi
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-printf %s "checking whether $CC understands -c and -o together... " >&6; }
-if test ${am_cv_prog_cc_c_o+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
-  if test $ac_cache; then
-    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
-    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
-    fi
-    ac_header= ac_cache=
-  elif test $ac_header; then
-    ac_cache=$ac_item
-  else
-    ac_header=$ac_item
-  fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test ${ac_cv_safe_to_define___extensions__+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#         define __EXTENSIONS__ 1
-          $ac_includes_default
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_safe_to_define___extensions__=yes
-else $as_nop
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
-printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if test ${ac_cv_should_define__xopen_source+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_should_define__xopen_source=no
-    if test $ac_cv_header_wchar_h = yes
-then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-          #include <wchar.h>
-          mbstate_t x;
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-            #define _XOPEN_SOURCE 500
-            #include <wchar.h>
-            mbstate_t x;
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_should_define__xopen_source=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
-
-  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
-
-  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
-
-  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
-
-  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
-
-  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
-
-  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
-
-  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
-
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
-
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
-
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
-
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
-
-  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
-
-  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
-
-  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-  if test $ac_cv_header_minix_config_h = yes
-then :
-  MINIX=yes
-    printf "%s\n" "#define _MINIX 1" >>confdefs.h
-
-    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
-
-    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-else $as_nop
-  MINIX=
-fi
-  if test $ac_cv_safe_to_define___extensions__ = yes
-then :
-  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
-
-fi
-  if test $ac_cv_should_define__xopen_source = yes
-then :
-  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
-
-fi
-
-am__api_version='1.16'
-
-
-  # Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-printf %s "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test ${ac_cv_path_install+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    # Account for fact that we put trailing slashes in our PATH walk.
-case $as_dir in #((
-  ./ | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test ${ac_cv_path_install+y}; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-printf %s "checking whether build environment is sane... " >&6; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
-
-
-  if test x"${MISSING+set}" != xset; then
-  MISSING="\${SHELL} '$am_aux_dir/missing'"
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
-printf %s "checking for a race-free mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test ${ac_cv_path_mkdir+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir ('*'coreutils) '* | \
-	     'BusyBox '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test ${ac_cv_path_mkdir+y}; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AWK+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval test \${ac_cv_prog_make_${ac_make}_set+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-  SET_MAKE=
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
-printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
-   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-  case $?:`cat confinc.out 2>/dev/null` in #(
-  '0:this is the am__doit target') :
-    case $s in #(
-  BSD) :
-    am__include='.include' am__quote='"' ;; #(
-  *) :
-    am__include='include' am__quote='' ;;
-esac ;; #(
-  *) :
-     ;;
-esac
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
-
-# Check whether --enable-dependency-tracking was given.
-if test ${enable_dependency_tracking+y}
-then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-# Check whether --enable-silent-rules was given.
-if test ${enable_silent_rules+y}
-then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-printf %s "checking whether $am_make supports nested variables... " >&6; }
-if test ${am_cv_make_support_nested_variables+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if printf "%s\n" 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='mpfi'
- VERSION='1.5.4'
-
-
-printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
-
-
-printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-printf %s "checking dependency style of $depcc... " >&6; }
-if test ${am_cv_CC_dependencies_compiler_type+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-# Variables for tags utilities; see am/tags.am
-if test -z "$CTAGS"; then
-  CTAGS=ctags
-fi
-
-if test -z "$ETAGS"; then
-  ETAGS=etags
-fi
-
-if test -z "$CSCOPE"; then
-  CSCOPE=cscope
-fi
-
-
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
-
-# Check whether --enable-silent-rules was given.
-if test ${enable_silent_rules+y}
-then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-printf %s "checking whether $am_make supports nested variables... " >&6; }
-if test ${am_cv_make_support_nested_variables+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if printf "%s\n" 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test ${enable_maintainer_mode+y}
-then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else $as_nop
-  USE_MAINTAINER_MODE=no
-fi
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-printf "%s\n" "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-
-# Check whether --with-mpfr_include was given.
-if test ${with_mpfr_include+y}
-then :
-  withval=$with_mpfr_include; CPPFLAGS="-I$withval $CPPFLAGS"
-fi
-
-
-# Check whether --with-mpfr_lib was given.
-if test ${with_mpfr_lib+y}
-then :
-  withval=$with_mpfr_lib; LDFLAGS="-L$withval $LDFLAGS"
-fi
-
-
-# Check whether --with-mpfr was given.
-if test ${with_mpfr+y}
-then :
-  withval=$with_mpfr;
-            if test -z "$with_mpfr_include" -a -z "$with_mpfr_lib" ; then
-               CPPFLAGS="-I$withval/include $CPPFLAGS"
-               LDFLAGS="-L$withval/lib $LDFLAGS"
-            else
-               { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Do not use --with-mpfr and --with-mpfr-include/--with-mpfr-lib options simultaneously.
-See \`config.log' for more details" "$LINENO" 5; }
-            fi
-
-fi
-
-
-# Check whether --with-gmp_include was given.
-if test ${with_gmp_include+y}
-then :
-  withval=$with_gmp_include; CPPFLAGS="-I$withval $CPPFLAGS"
-fi
-
-
-# Check whether --with-gmp_lib was given.
-if test ${with_gmp_lib+y}
-then :
-  withval=$with_gmp_lib; LDFLAGS="-L$withval $LDFLAGS"
-fi
-
-
-# Check whether --with-gmp was given.
-if test ${with_gmp+y}
-then :
-  withval=$with_gmp;
-            if test -z "$with_gmp_lib" -a -z "$with_gmp_include" ; then
-               CPPFLAGS="-I$withval/include $CPPFLAGS"
-               LDFLAGS="-L$withval/lib $LDFLAGS"
-            else
-               { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Do not use --with-gmp and --with-gmp-include/--with-gmp-lib options simultaneously.
-See \`config.log' for more details" "$LINENO" 5; }
-            fi
-
-fi
-
-
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
-set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "clang", so it can be a program name with args.
-set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-
-
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+y}
-ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_g=yes
-else $as_nop
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-
-else $as_nop
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c11=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c11_program
-_ACEOF
-for ac_arg in '' -std=gnu11
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
-
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c99_program
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
-
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c99" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c89_program
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
-
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c89" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
-fi
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-printf %s "checking whether $CC understands -c and -o together... " >&6; }
-if test ${am_cv_prog_cc_c_o+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-printf %s "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test ${ac_cv_prog_CPP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-      # Double quotes because $CC needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-
-else $as_nop
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-  # Broken: success on invalid input.
-continue
-else $as_nop
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-
-else $as_nop
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-  # Broken: success on invalid input.
-continue
-else $as_nop
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
-
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-printf %s "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval test \${ac_cv_prog_make_${ac_make}_set+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-  SET_MAKE=
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar lib "link -lib"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar lib "link -lib"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_AR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
-printf %s "checking the archiver ($AR) interface... " >&6; }
-if test ${am_cv_ar_interface+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-   am_cv_ar_interface=ar
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int some_variable = 0;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
-  (eval $am_ar_try) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-        am_cv_ar_interface=ar
-      else
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
-  (eval $am_ar_try) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        if test "$ac_status" -eq 0; then
-          am_cv_ar_interface=lib
-        else
-          am_cv_ar_interface=unknown
-        fi
-      fi
-      rm -f conftest.lib libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
-printf "%s\n" "$am_cv_ar_interface" >&6; }
-
-case $am_cv_ar_interface in
-ar)
-  ;;
-lib)
-  # Microsoft lib, so override with the ar-lib wrapper script.
-  # FIXME: It is wrong to rewrite AR.
-  # But if we don't then we get into trouble of one sort or another.
-  # A longer-term fix would be to have automake use am__AR in this case,
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
-  # similar.
-  AR="$am_aux_dir/ar-lib $AR"
-  ;;
-unknown)
-  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
-  ;;
-esac
-
-case `pwd` in
-  *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.7-dirty'
-macro_revision='2.4.7'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-
-
-  # Make sure we can run config.sub.
-$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-printf %s "checking build system type... " >&6; }
-if test ${ac_cv_build+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-printf %s "checking host system type... " >&6; }
-if test ${ac_cv_host+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-printf %s "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-printf %s "checking for a sed that does not truncate output... " >&6; }
-if test ${ac_cv_path_SED+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in sed gsed
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in grep ggrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in egrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-printf %s "checking for fgrep... " >&6; }
-if test ${ac_cv_path_FGREP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in fgrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test ${with_gnu_ld+y}
-then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else $as_nop
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-printf %s "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-printf %s "checking for GNU ld... " >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-printf %s "checking for non-GNU ld... " >&6; }
-fi
-if test ${lt_cv_path_LD+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
-fi
-
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
-if test ${lt_cv_prog_gnu_ld+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test ${lt_cv_path_NM+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DUMPBIN+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-printf %s "checking the name lister ($NM) interface... " >&6; }
-if test ${lt_cv_nm_interface+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
-
-# find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-printf %s "checking the maximum length of command line arguments... " >&6; }
-if test ${lt_cv_sys_max_cmd_len+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-    i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-printf %s "checking how to convert $build file names to $host format... " >&6; }
-if test ${lt_cv_to_host_file_cmd+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-printf %s "checking how to convert $build file names to toolchain format... " >&6; }
-if test ${lt_cv_to_tool_file_cmd+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-printf %s "checking for $LD option to reload object files... " >&6; }
-if test ${lt_cv_ld_reload_flag+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_reload_flag='-r'
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
-set dummy ${ac_tool_prefix}file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_FILECMD+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$FILECMD"; then
-  ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FILECMD="${ac_tool_prefix}file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-FILECMD=$ac_cv_prog_FILECMD
-if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_FILECMD"; then
-  ac_ct_FILECMD=$FILECMD
-  # Extract the first word of "file", so it can be a program name with args.
-set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_FILECMD+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_FILECMD"; then
-  ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
-if test -n "$ac_ct_FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
-printf "%s\n" "$ac_ct_FILECMD" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_FILECMD" = x; then
-    FILECMD=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    FILECMD=$ac_ct_FILECMD
-  fi
-else
-  FILECMD="$ac_cv_prog_FILECMD"
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_OBJDUMP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-printf %s "checking how to recognize dependent libraries... " >&6; }
-if test ${lt_cv_deplibs_check_method+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='$FILECMD -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly* | midnightbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=$FILECMD
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=$FILECMD
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=$FILECMD
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DLLTOOL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-printf %s "checking how to associate runtime and link libraries... " >&6; }
-if test ${lt_cv_sharedlib_from_linklib_cmd+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_AR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-
-
-
-
-
-
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-
-
-
-
-
-
-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-printf %s "checking for archiver @FILE support... " >&6; }
-if test ${lt_cv_ar_at_file+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-printf %s "checking command to parse $NM output from $compiler object... " >&6; }
-if test ${lt_cv_sys_global_symbol_pipe+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-printf %s "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test ${with_sysroot+y}
-then :
-  withval=$with_sysroot;
-else $as_nop
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-printf %s "checking for a working dd... " >&6; }
-if test ${ac_cv_path_lt_DD+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-if test -z "$lt_DD"; then
-  ac_path_lt_DD_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in dd
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_lt_DD" || continue
-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi
-      $ac_path_lt_DD_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_lt_DD"; then
-    :
-  fi
-else
-  ac_cv_path_lt_DD=$lt_DD
-fi
-
-rm -f conftest.i conftest2.i conftest.out
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-printf %s "checking how to truncate binary pipes... " >&6; }
-if test ${lt_cv_truncate_bin+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
-
-
-
-
-
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-# Check whether --enable-libtool-lock was given.
-if test ${enable_libtool_lock+y}
-then :
-  enableval=$enable_libtool_lock;
-fi
-
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `$FILECMD conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `$FILECMD conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `$FILECMD conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    emul=elf
-    case `$FILECMD conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `$FILECMD conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `$FILECMD conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `$FILECMD conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `$FILECMD conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-printf %s "checking whether the C compiler needs -belf... " >&6; }
-if test ${lt_cv_cc_needs_belf+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  lt_cv_cc_needs_belf=yes
-else $as_nop
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `$FILECMD conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MANIFEST_TOOL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if test ${lt_cv_path_mainfest_tool+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DSYMUTIL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_NMEDIT+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_NMEDIT+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_LIPO+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_LIPO+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_OTOOL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_OTOOL+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_OTOOL64+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_OTOOL64+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-printf %s "checking for -single_module linker flag... " >&6; }
-if test ${lt_cv_apple_cc_single_mod+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-printf %s "checking for -exported_symbols_list linker flag... " >&6; }
-if test ${lt_cv_ld_exported_symbols_list+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  lt_cv_ld_exported_symbols_list=yes
-else $as_nop
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS=$save_LDFLAGS
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-printf %s "checking for -force_load linker flag... " >&6; }
-if test ${lt_cv_ld_force_load+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
-      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*)
-      case $MACOSX_DEPLOYMENT_TARGET,$host in
-        10.[012],*|,*powerpc*-darwin[5-8]*)
-          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-        *)
-          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
-
-fi
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test ${enable_shared+y}
-then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else $as_nop
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test ${enable_static+y}
-then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else $as_nop
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test ${with_pic+y}
-then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else $as_nop
-  pic_mode=default
-fi
-
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test ${enable_fast_install+y}
-then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else $as_nop
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-  shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-printf %s "checking which variant of shared library versioning to provide... " >&6; }
-
-# Check whether --with-aix-soname was given.
-if test ${with_aix_soname+y}
-then :
-  withval=$with_aix_soname; case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname
-else $as_nop
-  if test ${lt_cv_with_aix_soname+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_with_aix_soname=aix
-fi
-
-    with_aix_soname=$lt_cv_with_aix_soname
-fi
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-printf %s "checking for objdir... " >&6; }
-if test ${lt_cv_objdir+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-func_cc_basename $compiler
-cc_basename=$func_cc_basename_result
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-printf %s "checking for ${ac_tool_prefix}file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/${ac_tool_prefix}file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-printf %s "checking for file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC=$CC
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test ${lt_cv_prog_compiler_rtti_exceptions+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test yes = "$GCC"; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        lt_prog_compiler_wl='-Wl,-Wl,,'
-        lt_prog_compiler_pic='-PIC'
-        lt_prog_compiler_static='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | $SED 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-printf %s "checking for $compiler option to produce PIC... " >&6; }
-if test ${lt_cv_prog_compiler_pic+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test ${lt_cv_prog_compiler_pic_works+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_pic_works"; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test ${lt_cv_prog_compiler_static_works+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_static_works"; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links=nottested
-if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-printf %s "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
-  if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++ or Intel C++ Compiler.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-    export_dynamic_flag_spec='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='$wl--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      file_list_spec='@'
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-      export_dynamic_flag_spec='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | $SED 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  export_dynamic_flag_spec='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test no = "$ld_shlibs"; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	hardcode_direct=no
-	hardcode_direct_absolute=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      export_dynamic_flag_spec='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if test ${lt_cv_aix_libpath_+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if test ${lt_cv_aix_libpath_+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' $wl-bernotok'
-	  allow_undefined_flag=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++ or Intel C++ Compiler.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC and ICC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly* | midnightbsd*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-printf %s "checking if $CC understands -b... " >&6; }
-if test ${lt_cv_prog_compiler__b+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
-
-if test yes = "$lt_cv_prog_compiler__b"; then
-    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if test ${lt_cv_irix_exported_symbol+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  lt_cv_irix_exported_symbol=yes
-else $as_nop
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS=$save_LDFLAGS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	ld_shlibs=yes
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	  export_dynamic_flag_spec='$wl-E'
-	else
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      file_list_spec='@'
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='$wl-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='$wl-z,text'
-      allow_undefined_flag='$wl-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
-test no = "$ld_shlibs" && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-printf %s "checking whether -lc should be explicitly linked in... " >&6; }
-if test ${lt_cv_archive_cmds_need_lc+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-printf %s "checking dynamic linker characteristics... " >&6; }
-
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC and ICC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly* | midnightbsd*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  hardcode_libdir_flag_spec='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if test ${lt_cv_shlibpath_overrides_runpath+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null
-then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-printf %s "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test yes = "$hardcode_automatic"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$hardcode_direct" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
-     test no != "$hardcode_minus_L"; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
-
-if test relink = "$hardcode_action" ||
-   test yes = "$inherit_rpath"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main (void)
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_dl_dlopen=yes
-else $as_nop
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
-
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes
-then :
-  lt_cv_dlopen=shl_load
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-printf %s "checking for shl_load in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_shl_load+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main (void)
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_dld_shl_load=yes
-else $as_nop
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes
-then :
-  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else $as_nop
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes
-then :
-  lt_cv_dlopen=dlopen
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main (void)
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_dl_dlopen=yes
-else $as_nop
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-printf %s "checking for dlopen in -lsvld... " >&6; }
-if test ${ac_cv_lib_svld_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main (void)
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_svld_dlopen=yes
-else $as_nop
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes
-then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-printf %s "checking for dld_link in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_dld_link+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main (void)
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_dld_dld_link=yes
-else $as_nop
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes
-then :
-  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-printf %s "checking whether a program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self_static+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-printf %s "checking whether stripping libraries is possible... " >&6; }
-if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-else
-  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-    old_striplib="$STRIP --strip-debug"
-    striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-  else
-    case $host_os in
-    darwin*)
-      # FIXME - insert some real tests, host_os isn't really good enough
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-      ;;
-    freebsd*)
-      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
-        old_striplib="$STRIP --strip-debug"
-        striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-      else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-      fi
-      ;;
-    *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-      ;;
-    esac
-  fi
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-printf %s "checking whether to build shared libraries... " >&6; }
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-printf %s "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-# Checks for libraries.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmp.h" >&5
-printf %s "checking for gmp.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include "gmp.h"
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- as_fn_error $? "gmp.h can't be found, or is unusable." "$LINENO" 5
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5
-printf %s "checking for __gmpz_init in -lgmp... " >&6; }
-if test ${ac_cv_lib_gmp___gmpz_init+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgmp  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char __gmpz_init ();
-int
-main (void)
-{
-return __gmpz_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_gmp___gmpz_init=yes
-else $as_nop
-  ac_cv_lib_gmp___gmpz_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_init" >&5
-printf "%s\n" "$ac_cv_lib_gmp___gmpz_init" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_init" = xyes
-then :
-  LIBS="-lgmp $LIBS"
-else $as_nop
-  as_fn_error $? "libgmp not found." "$LINENO" 5
-fi
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valid GMP" >&5
-printf %s "checking for valid GMP... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include "gmp.h"
-#if (__GNU_MP_VERSION*100+__GNU_MP_VERSION_MINOR*10 < 410)
-# error "min: GMP 4.1.0"
-#endif
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- as_fn_error $? "GMP 4.1.0 min required" "$LINENO" 5
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mpfr.h" >&5
-printf %s "checking for mpfr.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include "mpfr.h"
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- as_fn_error $? "mpfr.h can't be found, or is unusable." "$LINENO" 5
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mpfr_init in -lmpfr" >&5
-printf %s "checking for mpfr_init in -lmpfr... " >&6; }
-if test ${ac_cv_lib_mpfr_mpfr_init+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpfr  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char mpfr_init ();
-int
-main (void)
-{
-return mpfr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_mpfr_mpfr_init=yes
-else $as_nop
-  ac_cv_lib_mpfr_mpfr_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpfr_mpfr_init" >&5
-printf "%s\n" "$ac_cv_lib_mpfr_mpfr_init" >&6; }
-if test "x$ac_cv_lib_mpfr_mpfr_init" = xyes
-then :
-  LIBS="-lmpfr $LIBS"
-else $as_nop
-  as_fn_error $? "libmpfr not found." "$LINENO" 5
-fi
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valid MPFR" >&5
-printf %s "checking for valid MPFR... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include "mpfr.h"
-#if (MPFR_VERSION < MPFR_VERSION_NUM(2,4,2))
-# error "min: MPFR 2.4.2"
-#endif
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-else $as_nop
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- as_fn_error $? "MPFR 2.4.2 min required" "$LINENO" 5
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-# Checks for header files.
-ac_fn_c_check_header_compile "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
-if test "x$ac_cv_header_float_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FLOAT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
-if test "x$ac_cv_header_limits_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
-if test "x$ac_cv_header_string_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_header_compile "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdarg_h" = xyes
-then :
-
-printf "%s\n" "#define HAVE_STDARG 1" >>confdefs.h
-
-else $as_nop
-  ac_fn_c_check_header_compile "$LINENO" "varargs.h" "ac_cv_header_varargs_h" "$ac_includes_default"
-if test "x$ac_cv_header_varargs_h" = xyes
-then :
-
-else $as_nop
-  as_fn_error $? "stdarg.h or varargs.h not found" "$LINENO" 5
-fi
-
-fi
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes
-then :
-
-else $as_nop
-
-printf "%s\n" "#define size_t unsigned int" >>confdefs.h
-
-fi
-
-
-# Checks for library functions.
-ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
-if test "x$ac_cv_func_dup2" = xyes
-then :
-  printf "%s\n" "#define HAVE_DUP2 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_func "$LINENO" "mpfr_q_sub" "ac_cv_func_mpfr_q_sub"
-if test "x$ac_cv_func_mpfr_q_sub" = xyes
-then :
-  printf "%s\n" "#define HAVE_MPFR_Q_SUB 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mpfr_z_sub" "ac_cv_func_mpfr_z_sub"
-if test "x$ac_cv_func_mpfr_z_sub" = xyes
-then :
-  printf "%s\n" "#define HAVE_MPFR_Z_SUB 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mpfr_z_div" "ac_cv_func_mpfr_z_div"
-if test "x$ac_cv_func_mpfr_z_div" = xyes
-then :
-  printf "%s\n" "#define HAVE_MPFR_Z_DIV 1" >>confdefs.h
-
-fi
-
-
-case $1.5.4 in
-  *-dev)
-
-printf "%s\n" "#define WARN_IF_REVERTED_ENDPOINTS 1" >>confdefs.h
-;;
-esac
-
-ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile tests/Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-printf %s "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
-as_nl='
-'
-export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
-
-# The user is always right.
-if ${PATH_SEPARATOR+false} :; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  printf "%s\n" "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else $as_nop
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else $as_nop
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by mpfi $as_me 1.5.4, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <mpfi-users@lists.gforge.inria.fr>.
-mpfi home page: <https://gforge.inria.fr/projects/mpfi/>."
-
-_ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config='$ac_cs_config_escaped'
-ac_cs_version="\\
-mpfi config.status 1.5.4
-configured by $0, generated by GNU Autoconf 2.71,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2021 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  printf "%s\n" "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
-configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-FILECMD \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_import \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-lt_cv_nm_interface \
-nm_file_list_spec \
-lt_cv_truncate_bin \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-configure_time_dlsearch_path \
-configure_time_lt_sys_library_path; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "mpfi_config.h") CONFIG_HEADERS="$CONFIG_HEADERS mpfi_config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
-  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
-  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      printf "%s\n" "/* $configure_input  */" >&1 \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    printf "%s\n" "/* $configure_input  */" >&1 \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  case $CONFIG_FILES in #(
-  *\'*) :
-    eval set x "$CONFIG_FILES" ;; #(
-  *) :
-    set x $CONFIG_FILES ;; #(
-  *) :
-     ;;
-esac
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`$as_dirname -- "$am_mf" ||
-$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$am_mf" : 'X\(//\)[^/]' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    am_filepart=`$as_basename -- "$am_mf" ||
-$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { echo "$as_me:$LINENO: cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles" >&5
-   (cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  If GNU make was not used, consider
-    re-running the configure script with MAKE=\"gmake\" (or whatever is
-    necessary).  You can also try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-  { am_dirpart=; unset am_dirpart;}
-  { am_filepart=; unset am_filepart;}
-  { am_mf=; unset am_mf;}
-  { am_rc=; unset am_rc;}
-  rm -f conftest-deps.mk
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool 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 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=''
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shared archive member basename,for filename based shared library versioning on AIX.
-shared_archive_member_spec=$shared_archive_member_spec
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# A file(cmd) program that detects file types.
-FILECMD=$lt_FILECMD
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
-
-# Flags to create an archive.
-AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm into a list of symbols to manually relocate.
-global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name lister interface.
-nm_interface=$lt_lt_cv_nm_interface
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and where our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# Command to truncate a binary pipe.
-lt_truncate_bin=$lt_lt_cv_truncate_bin
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
-
-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  $SED '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/doc/mpfi.info b/apps/KhiCAS/src/mpfi-1.5.4/doc/mpfi.info
index a0d50f891..703306054 100644
--- a/apps/KhiCAS/src/mpfi-1.5.4/doc/mpfi.info
+++ b/apps/KhiCAS/src/mpfi-1.5.4/doc/mpfi.info
@@ -1,4 +1,4 @@
-This is mpfi.info, produced by makeinfo version 6.7 from mpfi.texi.
+This is mpfi.info, produced by makeinfo version 6.8 from mpfi.texi.
 
 INFO-DIR-SECTION Software libraries
 START-INFO-DIR-ENTRY
@@ -322,7 +322,7 @@ behavior with non-valid intervals as input is undefined.
    * A "valid interval" can have finite or infinite endpoints, but its
      left endpoint is not larger than its right endpoint and cannot be
      +infinity or -0 (respectively, the right endpoint cannot be
-     -infinity or +0).  (1) As a consequence, the unique representation
+     -infinity or +0).  (1)  As a consequence, the unique representation
      of the zero singleton is [+0, -0].
 
    MPFI functions may return intervals that are not valid as input
@@ -1674,28 +1674,28 @@ Node: Introduction to MPFI4128
 Node: Installing MPFI5453
 Node: Reporting Bugs9317
 Node: MPFI Basics10693
-Ref: MPFI Basics-Footnote-115002
-Node: Interval Functions15329
-Node: Return Values16569
-Node: Precision Handling17532
-Node: Initializing and Assigning Intervals20397
-Node: Initializing Intervals20737
-Node: Assigning Intervals24770
-Node: Simultaneous Interval Init & Assign26988
-Node: Floating-point Quantities28254
-Node: Converting Intervals32316
-Node: Interval Arithmetic32791
-Node: Special Functions40109
-Node: Interval Comparison44933
-Node: I/O of Intervals47764
-Node: Operating on the Endpoints51126
-Node: Set Operations53600
-Node: Miscellaneous Interval Functions55511
-Node: Error Handling56746
-Node: Contributors57354
-Node: References57709
-Node: Concept Index59157
-Node: Function Index61857
+Ref: MPFI Basics-Footnote-115003
+Node: Interval Functions15330
+Node: Return Values16570
+Node: Precision Handling17533
+Node: Initializing and Assigning Intervals20398
+Node: Initializing Intervals20738
+Node: Assigning Intervals24771
+Node: Simultaneous Interval Init & Assign26989
+Node: Floating-point Quantities28255
+Node: Converting Intervals32317
+Node: Interval Arithmetic32792
+Node: Special Functions40110
+Node: Interval Comparison44934
+Node: I/O of Intervals47765
+Node: Operating on the Endpoints51127
+Node: Set Operations53601
+Node: Miscellaneous Interval Functions55512
+Node: Error Handling56747
+Node: Contributors57355
+Node: References57710
+Node: Concept Index59158
+Node: Function Index61858
 
 End Tag Table
 
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/libtool.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/libtool.m4
deleted file mode 120000
index f3504e92b..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/m4/libtool.m4
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/aclocal/libtool.m4
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/libtool.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/libtool.m4
new file mode 100644
index 000000000..717e76978
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/m4/libtool.m4
@@ -0,0 +1,8399 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 59 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_DECL_FILECMD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  $SED '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    m4_if([$1], [CXX],
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `$FILECMD conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `$FILECMD conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `$FILECMD conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `$FILECMD conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `$FILECMD conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+_LT_DECL([], [AR], [1], [The archiver])
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
+         [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -z "$STRIP"; then
+  AC_MSG_RESULT([no])
+else
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    AC_MSG_RESULT([yes])
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+      fi
+      ;;
+    *)
+      AC_MSG_RESULT([no])
+      ;;
+    esac
+  fi
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC and ICC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='$FILECMD -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=$FILECMD
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=$FILECMD
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=$FILECMD
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly* | midnightbsd*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | $SED 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test yes = "$GCC"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl* | icl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++ or Intel C++ Compiler.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++ or Intel C++ Compiler.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl* | icl*)
+	# Native MSVC or ICC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC and ICC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly* | midnightbsd*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report what library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl* | ,icl* | no,icl*)
+	  # Native MSVC or ICC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly* | midnightbsd*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | $SED 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_FILECMD
+# ----------------
+# Check for a file(cmd) program that can be used to detect file type and magic
+m4_defun([_LT_DECL_FILECMD],
+[AC_CHECK_TOOL([FILECMD], [file], [:])
+_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])
+])# _LD_DECL_FILECMD
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltoptions.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltoptions.m4
deleted file mode 120000
index b81279e34..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltoptions.m4
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/aclocal/ltoptions.m4
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltoptions.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltoptions.m4
new file mode 100644
index 000000000..b0b5e9c21
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltoptions.m4
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free
+#   Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 8 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltsugar.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltsugar.m4
deleted file mode 120000
index 4d76cc709..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltsugar.m4
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/aclocal/ltsugar.m4
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltsugar.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltsugar.m4
new file mode 100644
index 000000000..902508bd9
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltsugar.m4
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltversion.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltversion.m4
deleted file mode 120000
index 5eb474fd2..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltversion.m4
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/aclocal/ltversion.m4
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/ltversion.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltversion.m4
new file mode 100644
index 000000000..98337d9b5
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/m4/ltversion.m4
@@ -0,0 +1,24 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation,
+#   Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 4245 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.7-dirty])
+m4_define([LT_PACKAGE_REVISION], [2.4.7])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.7-dirty'
+macro_revision='2.4.7'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/lt~obsolete.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/lt~obsolete.m4
deleted file mode 120000
index de0b9f949..000000000
--- a/apps/KhiCAS/src/mpfi-1.5.4/m4/lt~obsolete.m4
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/aclocal/lt~obsolete.m4
\ No newline at end of file
diff --git a/apps/KhiCAS/src/mpfi-1.5.4/m4/lt~obsolete.m4 b/apps/KhiCAS/src/mpfi-1.5.4/m4/lt~obsolete.m4
new file mode 100644
index 000000000..0f7a8759d
--- /dev/null
+++ b/apps/KhiCAS/src/mpfi-1.5.4/m4/lt~obsolete.m4
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free
+#   Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])