[xcas-cvs] SF.net SVN: xcas:[758] trunk/giac-xcas/giac/src

[<pa...@us...>]

Revision: 758
          http://xcas.svn.sourceforge.net/xcas/?rev=758&view=rev
Author:   parisse
Date:     2009-07-03 07:44:00 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------


Modified Paths:
--------------
    trunk/giac-xcas/giac/src/Makefile.am
    trunk/giac-xcas/giac/src/Xcas1.cc
    trunk/giac-xcas/giac/src/gen.cc
    trunk/giac-xcas/giac/src/help.cc
    trunk/giac-xcas/giac/src/hist.cxx
    trunk/giac-xcas/giac/src/hist.fl

Modified: trunk/giac-xcas/giac/src/Makefile.am
===================================================================
--- trunk/giac-xcas/giac/src/Makefile.am	2009-06-30 08:48:33 UTC (rev 757)
+++ trunk/giac-xcas/giac/src/Makefile.am	2009-07-03 07:44:00 UTC (rev 758)
@@ -64,7 +64,7 @@
 	xcasfr.sh xcases.sh xcasen.sh mkstat mkhist updatecas update.bat \
 	giac.pl cas2html.cc all_global_var find_global_var.cc static_init \
 	Fl_GDI_Printer.cxx  Fl_PS_Printer.cxx \
-	casce.cc xcasce.cc xcasctrl.cc casctrl.cc Makefile.vcc config.h.vcc
+	casce.cc xcasce.cc xcasctrl.cc casctrl.cc Makefile.vcc config.h.vcc giac_oo.cpp giaclib.vcproj
 
 bin_SCRIPTS = xgiac pgiac updatecas
 

Modified: trunk/giac-xcas/giac/src/Xcas1.cc
===================================================================
--- trunk/giac-xcas/giac/src/Xcas1.cc	2009-06-30 08:48:33 UTC (rev 757)
+++ trunk/giac-xcas/giac/src/Xcas1.cc	2009-07-03 07:44:00 UTC (rev 758)
@@ -2606,7 +2606,7 @@
   }
 
   // FIXME: forms should work under win32!!
-#ifdef WIN32
+#if defined WIN32 || defined __APPLE__
   giac::gen Xcas_fltk_input(const giac::gen & arg,const giac::context * contextptr){
     Fl::lock();
     if (Xcas_DispG) Xcas_DispG->waiting_click_value=arg;

Modified: trunk/giac-xcas/giac/src/gen.cc
===================================================================
--- trunk/giac-xcas/giac/src/gen.cc	2009-06-30 08:48:33 UTC (rev 757)
+++ trunk/giac-xcas/giac/src/gen.cc	2009-07-03 07:44:00 UTC (rev 758)
@@ -3106,7 +3106,7 @@
 	if ((i._SYMBptr->feuille._VECTptr->front().type==_INT_) && (i._SYMBptr->feuille._VECTptr->back().type==_INT_) ){
 	  int debut=i._SYMBptr->feuille._VECTptr->front().val,fin=i._SYMBptr->feuille._VECTptr->back().val;
 	  if (fin<debut)
-	    return gen(vecteur(0),subtype); // swap(debut,fin);
+	    return (type==_STRNG)?string2gen("",false):gen(vecteur(0),subtype); // swap(debut,fin);
 	  if (type==_STRNG)
 	    return string2gen('"'+_STRNGptr->substr(debut,fin-debut+1)+'"');
 	  if (type==_VECT){

Modified: trunk/giac-xcas/giac/src/help.cc
===================================================================
--- trunk/giac-xcas/giac/src/help.cc	2009-06-30 08:48:33 UTC (rev 757)
+++ trunk/giac-xcas/giac/src/help.cc	2009-07-03 07:44:00 UTC (rev 758)
@@ -476,7 +476,7 @@
     }
   }
 
-  string subdir_strings[]={"casref","casgeo","casrouge","cassim","castor","tutoriel","casinter"};
+  string subdir_strings[]={"cascmd","casgeo","casrouge","cassim","castor","tutoriel","casinter"};
   int subdir_taille=7;
   int equalposcomp(string * tab,const string & s){
     int i=s.size()-1;
@@ -729,7 +729,7 @@
       cerr << "Unable to open HTML doc directory " << html_help_dir << endl;
     html_help_dir += find_lang_prefix(language);
 #ifdef WIN32
-   html_help_dir +="casref_"+find_lang_prefix(giac::language(context0)); // temporary workaround
+   html_help_dir +="cascmd_"+find_lang_prefix(giac::language(context0)); // temporary workaround
 #endif
     html_mtt.clear();
     html_mall.clear();

Modified: trunk/giac-xcas/giac/src/hist.cxx
===================================================================
--- trunk/giac-xcas/giac/src/hist.cxx	2009-06-30 08:48:33 UTC (rev 757)
+++ trunk/giac-xcas/giac/src/hist.cxx	2009-07-03 07:44:00 UTC (rev 758)
@@ -119,6 +119,7 @@
   s += "This documentation is freely redistribuable for non commercial purpose\n";
   s += "Math ML support, xcas online: Jean-Pierre Branchard\n";
   s += "Java interface: Loic Le Coq\n";
+  s += "OpenOffice interface: Christophe Devalland, Serge Moutou\n";
   s += "Tutorial (dxcas) with B. Ycart\n";
   s += "Spanish localization, J. Manrique Lopez\n";
   s += "Debian package: Carlos Enrique Carleos Artime\n";
@@ -718,7 +719,8 @@
      configfile.close();
      if (giac::language(giac::context0)==1)
        xcas::system_browser(giac::browser_command(doc_prefix+"tutoriel/index.html").c_str());
-     xcas::system_browser(giac::browser_command(doc_prefix+"casinter/index.html").c_str());
+     else
+       xcas::system_browser(giac::browser_command(doc_prefix+"casinter/index.html").c_str());
      // fl_alert(("Configuration written to "+configname + "\nUse the Cfg menu to modify.\nLaunching tutorial.").c_str());
      // n=fl_ask(gettext("Launch tutorial?"));
      // if (n==1)
@@ -1290,10 +1292,10 @@
 static void cb_Xcas_help_CAS(Fl_Menu_*, void*) {
   const giac::context * contextptr=Xcas_get_context();
 if (xcas::use_external_browser)
-           xcas::system_browser(giac::browser_command(doc_prefix+"casref_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
+           xcas::system_browser(giac::browser_command(doc_prefix+"cascmd_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
         else {
          if (xcas::Xcas_help_window){
-           xcas::Xcas_help_window->load((giac::giac_aide_dir()+doc_prefix+"casref_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
+           xcas::Xcas_help_window->load((giac::giac_aide_dir()+doc_prefix+"cascmd_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
            xcas::Xcas_help_window->show();
           }
          };

Modified: trunk/giac-xcas/giac/src/hist.fl
===================================================================
--- trunk/giac-xcas/giac/src/hist.fl	2009-06-30 08:48:33 UTC (rev 757)
+++ trunk/giac-xcas/giac/src/hist.fl	2009-07-03 07:44:00 UTC (rev 758)
@@ -188,6 +188,7 @@
   s += "This documentation is freely redistribuable for non commercial purpose\\n";
   s += "Math ML support, xcas online: Jean-Pierre Branchard\\n";
   s += "Java interface: Loic Le Coq\\n";
+  s += "OpenOffice interface: Christophe Devalland, Serge Moutou\\n";
   s += "Tutorial (dxcas) with B. Ycart\\n";
   s += "Spanish localization, J. Manrique Lopez\\n";
   s += "Debian package: Carlos Enrique Carleos Artime\\n";
@@ -796,7 +797,8 @@
      configfile.close();
      if (giac::language(giac::context0)==1)
        xcas::system_browser(giac::browser_command(doc_prefix+"tutoriel/index.html").c_str());
-     xcas::system_browser(giac::browser_command(doc_prefix+"casinter/index.html").c_str());
+     else
+       xcas::system_browser(giac::browser_command(doc_prefix+"casinter/index.html").c_str());
      // fl_alert(("Configuration written to "+configname + "\\nUse the Cfg menu to modify.\\nLaunching tutorial.").c_str());
      // n=fl_ask(gettext("Launch tutorial?"));
      // if (n==1)
@@ -1529,10 +1531,10 @@
             label {CAS reference}
             callback {const giac::context * contextptr=Xcas_get_context();
 if (xcas::use_external_browser)
-           xcas::system_browser(giac::browser_command(doc_prefix+"casref_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
+           xcas::system_browser(giac::browser_command(doc_prefix+"cascmd_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
         else {
          if (xcas::Xcas_help_window){
-           xcas::Xcas_help_window->load((giac::giac_aide_dir()+doc_prefix+"casref_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
+           xcas::Xcas_help_window->load((giac::giac_aide_dir()+doc_prefix+"cascmd_"+giac::find_lang_prefix(giac::language(contextptr))+"index.html").c_str());
            xcas::Xcas_help_window->show();
           }
          }}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.