Commit 061c7617 authored by Ximin Luo's avatar Ximin Luo

Merge tag 'upstream/1.2.3.53+dfsg1'

Upstream version 1.2.3.53+dfsg1

# gpg: Signature made Tue 27 Jun 2017 12:40:35 CEST
# gpg:                using RSA key 3667486A326DB2766D255546860DEF3B8F650B79
# gpg: Good signature from "Ximin Luo <infinity0@pwned.gg>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@torproject.org>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@freenetproject.org>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@debian.org>" [ultimate]
# gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin@gmx.com>" [ultimate]
parents caba9d69 0065e458
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -100,7 +100,7 @@ AC_ARG_ENABLE(png,
[ if test "x$enableval" = "xno"; then CONFIG_PNG="no"; fi], [])
if test "x$CONFIG_PNG" = "xyes"; then
AC_CHECK_HEADERS(png.h, AC_CHECK_LIB(png,main))
AC_CHECK_HEADERS(png.h, AC_CHECK_LIB(png,main)) dnl AC_CHECK_LIBS(main,[png16,png14,png12,png]))
fi
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -4693,7 +4693,7 @@ namespace xcas {
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 (point.type==_VECT && point._VECTptr->size()>2){
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)){
......@@ -5785,7 +5785,7 @@ namespace xcas {
Fl_Group::current(0);
w=new Fl_Window(dx,dy);
int l=spread_ptr->labelsize();
ltres = new Line_Type(2,2,l,l,_MAGENTA+_FILL_POLYGON);
ltres = new Line_Type(2,2,l,l,_MAGENTA+_CAP_FLAT_LINE);
ltres->show_pnt(true);
ltres->show_poly(true);
do_plotfield= new Fl_Check_Button (l+2,2,dx/6-4-l,dy/lignes-4,"Field");
......
......@@ -3355,10 +3355,8 @@ namespace xcas {
// FIXME user_data()
giac::kill_thread(true,context0);
}
#endif
bool has_graph3d(Fl_Widget * widget){
#ifdef HAVE_LIBFLTK
Fl_Group * g=dynamic_cast<Fl_Group *>(widget);
if (!g)
return false;
......@@ -3372,9 +3370,9 @@ namespace xcas {
if (Graph3d * gr3=dynamic_cast<Graph3d * >(wid))
return true;
}
#endif
return false;
}
#endif
void quit_idle_function(void * widget){
static int t=0;
......
......@@ -24,7 +24,7 @@
//#include <stdint.h>
#ifdef __x86_64__
#define x86_64
#define x86_64 1
#endif
// Thanks to Jason Papadopoulos, author of msieve
......
......@@ -70,12 +70,15 @@
{"adaptive" ,1,_ADAPTIVE , _INT_PLOT ,T_NUMBER},
{"algebraic" ,0, _SYMB, _INT_TYPE, T_TYPE_ID},
{"args",1,0,0,T_ARGS},
{"arrow_line" ,1, _CAP_FLAT_LINE, _INT_COLOR ,T_NUMBER},
{"axes" ,1,_AXES , _INT_PLOT ,T_NUMBER},
{"axesfont" ,1,_AXESFONT , _INT_PLOT ,T_NUMBER},
{"bareiss" ,1, _BAREISS, _INT_SOLVER,T_NUMBER},
{"base" ,1,_BASE , _INT_MAPLECONVERSION ,T_NUMBER},
{"begin",0,0,0,T_BLOC_BEGIN},
{"bisection_solver" ,1, _BISECTION_SOLVER, _INT_SOLVER,T_NUMBER},
{"blanc" ,1, _WHITE, _INT_COLOR ,T_NUMBER},
{"bleu" ,1, _BLUE, _INT_COLOR ,T_NUMBER},
{"brent_solver" ,1, _BRENT_SOLVER, _INT_SOLVER,T_NUMBER},
{"by",1,0,0,T_BY},
{"cap_flat_line" ,1, _CAP_FLAT_LINE, _INT_COLOR ,T_NUMBER},
......@@ -88,6 +91,7 @@
{"continue",0,0,0,T_CONTINUE},
{"coords" ,1, _COORDS, _INT_PLOT ,T_NUMBER},
{"cross_point" ,1, 0 , _INT_COLOR ,T_NUMBER},
{"cyan" ,1, _CYAN, _INT_COLOR ,T_NUMBER},
{"dash_line" ,1, _DASH_LINE, _INT_COLOR ,T_NUMBER},
{"dashdot_line" ,1, _DASHDOT_LINE, _INT_COLOR ,T_NUMBER},
{"dashdotdot_line" ,1, _DASHDOTDOT_LINE, _INT_COLOR ,T_NUMBER},
......@@ -226,6 +230,7 @@
{"intersect",0,0,0,T_INTERSECT},
{"invisible_point" ,1, _POINT_INVISIBLE , _INT_COLOR ,T_NUMBER},
{"jacobi_decomp" ,1, _JACOBI_DECOMP, _INT_SOLVER,T_NUMBER},
{"jaune" ,1, _YELLOW, _INT_COLOR ,T_NUMBER},
{"jusqu_a",0,0,0,T_UNTIL},
{"jusqua",0,0,0,T_UNTIL},
{"keep_pivot" ,1, _KEEP_PIVOT, _INT_SOLVER,T_NUMBER},
......@@ -253,6 +258,7 @@
{"linestyle" ,1, _LINESTYLE, _INT_PLOT ,T_NUMBER},
{"local",0,0,0,T_LOCAL},
{"localbloc",0,0,0,T_LOCALBLOC},
{"magenta" ,1, _MAGENTA, _INT_COLOR ,T_NUMBER},
{"middle_point" ,1, _POINT_MILIEU, _INT_SOLVER,T_NUMBER},
{"minor_det" ,1, _MINOR_DET, _INT_SOLVER,T_NUMBER},
{"minus",0,0,0,T_MINUS},
......@@ -261,6 +267,7 @@
{"newton_solver" ,1, _NEWTON_SOLVER, _INT_SOLVER,T_NUMBER},
{"newtonj_solver" ,1, _NEWTONJ_SOLVER, _INT_SOLVER,T_NUMBER},
{"next",0,0,0,T_CONTINUE},
{"noir" ,1, _BLACK, _INT_COLOR ,T_NUMBER},
{"nonnegint" ,0, _NONNEGINT, _INT_MAPLECONVERSION, T_TYPE_ID},
{"nonposint" ,0, _NONPOSINT, _INT_MAPLECONVERSION, T_TYPE_ID},
{"nstep" ,1, _NSTEP , _INT_PLOT ,T_NUMBER},
......@@ -308,6 +315,7 @@
{"right_rectangle" ,1, _RECTANGLE_DROIT, _INT_SOLVER,T_NUMBER},
{"rombergm" ,1, _ROMBERGM, _INT_SOLVER,T_NUMBER},
{"rombergt" ,1, _ROMBERGT, _INT_SOLVER,T_NUMBER},
{"rouge" ,1, _RED, _INT_COLOR ,T_NUMBER},
{"rur" ,1,_RUR_REVLEX , _INT_GROEBNER ,T_NUMBER},
{"sample" ,1, _SAMPLE, _INT_PLOT ,T_NUMBER},
{"sans_factoriser" ,1, _UNFACTORED, _INT_SOLVER,T_NUMBER},
......@@ -347,6 +355,7 @@
{"until",0,0,0,T_UNTIL},
{"ustep" ,1, _USTEP , _INT_PLOT ,T_NUMBER},
{"var",0,0,0,T_LOCAL},
{"vert" ,1, _GREEN, _INT_COLOR ,T_NUMBER},
{"view" ,1, _VIEW, _INT_PLOT ,T_NUMBER},
{"vrai",1,1,_INT_BOOLEAN,T_NUMBER},
{"vstep" ,1, _VSTEP , _INT_PLOT ,T_NUMBER},
......
......@@ -922,8 +922,8 @@ namespace giac {
return svg_segment(center-dx-i*dy,center+dx-i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_segment(center+dx-i*dy,center+dx+i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_segment(center-dx+i*dy,center+dx+i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_segment(center-dx+i*dy,center-dx-i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_text(center,legende,attr,xmin,xmax,ymin,ymax,contextptr);
case _POINT_TRIANGLE:
return svg_segment(center-dx-i*dy,center-dx+i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_segment(center-dx-i*dy,center+i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_segment(center-dx+i*dy,center+i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_text(center,legende,attr,xmin,xmax,ymin,ymax,contextptr);
case _POINT_POINT:
return svg_segment(center,center,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_text(center,legende,attr,xmin,xmax,ymin,ymax,contextptr);
case _POINT_POINT: // must make a small segment otherwise nothing visible
return svg_segment(center-dx/2,center+dx/2,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_text(center,legende,attr,xmin,xmax,ymin,ymax,contextptr);
}
return svg_segment(center-dx-i*dy,center+dx+i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_segment(center-dx+i*dy,center+dx-i*dy,attr,"",xmin,xmax,ymin,ymax,contextptr)+svg_text(center,legende,attr,xmin,xmax,ymin,ymax,contextptr);
}
......@@ -1117,7 +1117,7 @@ namespace giac {
//CERR << attr.ysurx << endl;
gen curve=figure.feuille[1];
string s;
if (curve.type==_VECT && curve._VECTptr->size()>2){
if (type_line>4 && curve.type==_VECT && curve._VECTptr->size()>2){
vecteur & v = *curve._VECTptr;
s=svg_vecteur(v[v.size()/2],v[v.size()/2+1],attr,"",xmin,xmax,ymin,ymax,contextptr);
}
......
This diff is collapsed.
#define giac_html_location "/usr/local/share/giac/doc/"
#define giac_aide_location "/usr/local/share/giac/aide_cas"
#define giac_html_location "/usr/share/giac/doc/"
#define giac_aide_location "/usr/share/giac/aide_cas"
#ifdef __APPLE__
#define giac_locale_location "/Applications/usr/share/locale/"
#else
#define giac_locale_location "/usr/local/share/locale/"
#define giac_locale_location "/usr/share/locale/"
#endif
#define giac_gnuplot_location ""
......@@ -11068,7 +11068,12 @@ namespace giac {
define_unary_function_ptr5( at_unarchive ,alias_at_unarchive,&__unarchive,0,true);
#endif // NSPIRE
bool geo_setup(const vecteur & w,GIAC_CONTEXT){
bool geo_setup(const vecteur & w_,GIAC_CONTEXT){
vecteur w(w_);
for (size_t i=0;i<w.size();++i){
if (w[i].type==_VECT && w[i]._VECTptr->size()==2)
w[i]=w[i]._VECTptr->back();
}
if (w.size()<12)
return false; // setsizeerr(contextptr);
if (w.size()>12) {
......@@ -11144,7 +11149,20 @@ namespace giac {
return interactive_op_tab[8](args,contextptr);
if ( args.type==_STRNG && args.subtype==-1) return args;
if (args.type!=_VECT || args._VECTptr->size()<4)
return gensizeerr(contextptr);
return makevecteur(
makevecteur(string2gen("x-",false),gnuplot_xmin),
makevecteur(string2gen("x+",false),gnuplot_xmax),
makevecteur(string2gen("y-",false),gnuplot_ymin),
makevecteur(string2gen("y+",false),gnuplot_ymax),
makevecteur(string2gen("z-",false),gnuplot_zmin),
makevecteur(string2gen("z+",false),gnuplot_zmax),
makevecteur(string2gen("t-",false),gnuplot_tmin),
makevecteur(string2gen("t+",false),gnuplot_tmax),
makevecteur(string2gen("wx-",false),global_window_xmin),
makevecteur(string2gen("wx+",false),global_window_xmax),
makevecteur(string2gen("wy-",false),global_window_ymin),
makevecteur(string2gen("wy+",false),global_window_ymax)
); //gensizeerr(contextptr);
vecteur w=*args._VECTptr;
int s = int(w.size());
if (s<12){
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment