Subversion Repositories wimsdev

Compare Revisions

Ignore whitespace Rev 11131 → Rev 11132

/trunk/wims/src/Flydraw/objects.c
238,8 → 238,7
void obj_dline(objparm *pm)
{
scale(pm->pd,pm->p,2);
myDashedLine(image,pm->p[0],pm->p[1],pm->p[2],pm->p[3],
pm->color[0]);
myDashedLine(image,pm->p[0],pm->p[1],pm->p[2],pm->p[3], pm->color[0]);
}
 
/* parallel lines.
/trunk/wims/src/Lib/evalue.c
365,7 → 365,7
d=evalname[i].val;
if(evalname[i].f1!=NULL) {
if(d==0) d=NAN;
if(d==1) d=HUGE_VAL;
if(d==1) d=HUGE_VAL;
}
break;
}
/trunk/wims/src/Misc/dicsort.c
69,7 → 69,7
pp++;
gopt: for(p2=pp; isspace(*p2) && *p2!='\n'; p2++);
if(p2>pp) ovlstrcpy(pp,p2);
pp--;
pp--;
}
else {
pp++; if(!isspace(*pp) || *pp=='\n') continue;
/trunk/wims/src/Misc/mathexp/extract.c
82,7 → 82,7
l=opalpha[i].lvl; if(l>expl2) {
if(got) extrout(p1,p2,dist+p1-p,commas,&commacnt);
if(expl1>0) got=0;
p1=find_word_start(p3);
p1=find_word_start(p3);
}
if(l>=expl1 && l<=expl2) {
got=1;
/trunk/wims/src/Misc/phtmltext.c
67,7 → 67,7
cont2: p=find_word_start(p);
if(*p=='!' || *p==':') {
if(lastc!=' ') printf(". ");
lastc=' ';
lastc=' ';
cont1: p=strchr(p,'\n');
if(p==NULL) return;
if(*(p-1)=='\\') {p++; goto cont1;}
/trunk/wims/src/Misc/translator.c
108,7 → 108,7
pp++;
gopt: for(p2=pp; isspace(*p2) && *p2!='\n'; p2++);
if(p2>pp) ovlstrcpy(pp,p2);
pp--;
pp--;
}
else {
pp++; if(!isspace(*pp) || *pp=='\n') continue;
/trunk/wims/src/Misc/translator_.c
94,7 → 94,7
pp++;
gopt: for(p2=pp; isspace(*p2) && *p2!='\n'; p2++);
if(p2>pp) ovlstrcpy(pp,p2);
pp--;
pp--;
}
else {
pp++; if(!isspace(*pp) || *pp=='\n') continue;
/trunk/wims/src/OefMsg2wims/oeflines.c
198,7 → 198,7
if(parenth>0 || brak>0 || brace>0) return NULL;
if(*pp!=c) {
if(badpar==NULL) badpar=pp;
return NULL;
return NULL;
}
else break;
}
/trunk/wims/src/OefMsg2wims/process.c
241,7 → 241,7
tt=find_word_start(p[i]+strlen("type"));
if(*tt=='=') {
for(j=i;j<6;j++) p[j]=p[j+1];
i--;
i--;
tt=find_word_start(tt+1); *find_word_end(tt)=0;
k=search_list(anstype,anstype_no,sizeof(anstype[0]),tt);
/* unknown type is now substituted */
264,7 → 264,7
tt=find_word_start(tt);
if(*tt=='=') {
for(j=i;j<6;j++) p[j]=p[j+1];
i--;
i--;
snprintf(nbuf,sizeof(nbuf),"%s",tt+1); subst(nbuf);
for(tv=nbuf; *tv; tv++) if(*tv==',' || *tv==';') *tv=' ';
strip_trailing_spaces(nbuf);
279,7 → 279,7
tt=find_word_start(tt);
if(*tt=='=') {
for(j=i;j<6;j++) p[j]=p[j+1];
i--;
i--;
snprintf(nbuf,sizeof(nbuf),"%s",tt+1); subst(nbuf);
strip_trailing_spaces(nbuf);
fprintf(outf,"replyweight%d=%s \n",answercnt,
364,7 → 364,7
tt=find_word_start(tt);
if(*tt=='=') {
for(j=i;j<6;j++) p[j]=p[j+1];
i--;
i--;
snprintf(nbuf,sizeof(nbuf),"%s",tt+1); subst(nbuf);
for(tv=nbuf; *tv; tv++) if(*tv==',' || *tv==';') *tv=' ';
strip_trailing_spaces(nbuf);
379,7 → 379,7
tt=find_word_start(tt);
if(*tt=='=') {
for(j=i;j<6;j++) p[j]=p[j+1];
i--;
i--;
snprintf(nbuf,sizeof(nbuf),"%s",tt+1); subst(nbuf);
strip_trailing_spaces(nbuf);
fprintf(outf,"choiceweight%d=%s \n",choicecnt,
606,7 → 606,7
tt=find_word_start(tt);
if(*tt=='=') {
for(j=i;j<6;j++) p[j]=p[j+1];
i--;
i--;
snprintf(buf1,sizeof(buf1),"%s",tt+1); subst(buf1);
for(tv=buf1; *tv; tv++) if(*tv==',' || *tv==';') *tv=' ';
strip_trailing_spaces(buf1);
621,7 → 621,7
tt=find_word_start(tt);
if(*tt=='=') {
for(j=i;j<6;j++) p[j]=p[j+1];
i--;
i--;
snprintf(buf1,sizeof(buf1),"%s",tt+1); subst(buf1);
strip_trailing_spaces(buf1);
fprintf(outf,"condweight%d=%s \n",conditioncnt,
/trunk/wims/src/config.c
816,7 → 816,7
nbuf=mkfname(NULL,"%s/%s/css",class_base,pc);
th=getvar("class_theme");ti=getvar("class_theme_icon") ;
if(th==NULL || *th==0) th=getvar("wims_theme");
st=1;
st=1;
if(ti==NULL || *ti==0) ti=getvar("wims_theme_icon");
}
else {/* Il faut peut-être changer là aussi pour direction */
/trunk/wims/src/exec.c
371,7 → 371,7
if(outputing) phtml_put(p,cache); else var_proc(p,cache);
readnest--; untrust=t;
memmove(&m_file,&save,sizeof(WORKING_FILE));
if (trace_file)
if (trace_file)
{
int i;
putc('\n',trace_file);
749,7 → 749,7
memmove(buf1,pp,pe-pp); buf1[pe-pp]=0; substit(buf1);
if(strncasecmp(buf1,"target=wims_mhelp",strlen("target=wims_mhelp"))==0) {
if(*pe!=0) *pe++=0;
ovlstrcpy(href_target,"wims_help");
ovlstrcpy(href_target,"wims_help");
ref_mhelp=1;
}
else {
1988,10 → 1988,10
switch(exec_routine[i].tag & 0xffff) {
case EXEC_WHILE:
if(!isif) loop++;
break;
break;
case EXEC_IF:
if(isif) loop++;
break;
break;
case EXEC_ELSE: {
if(!isif) break;
if(loop<=0) return; else break;
/trunk/wims/src/texmath.c
361,7 → 361,7
case '>': {
rel++; p++; if(*p!='=') {tprint(" > "); rel=1; break;} // >
while(*p=='=') p++;
tprint("\\ge "); // >=
tprint("\\ge "); // >=
break;
}
case '-': {
/trunk/wims/src/wims.c
637,7 → 637,7
p=memstr(p2,b1,var_str+len-p2); if(p>=p3) continue;
p+=lb; if(p3<var_str+len) {
while(*p3!='\n' && p3>p2) p3--;
*p3=0;
*p3=0;
p3--; if(*p3=='\r') *p3=0;
}
dlen=p3-p;
663,7 → 663,7
p5>=p4 && !isspace(*p5) && strchr("/\\:",*p5)==NULL;
p5--);
if(p5>=p4) p4=p5+1;
if(*p4==0) goto noname;
if(*p4==0) goto noname;
if(strstr(p4,"..")!=NULL || *p4=='.')
p4="noname.file";
setvar("wims_deposit",p4);
1238,8 → 1238,7
parse_ro_names();
manager_check();
access_check(0);
/* this gives some bug on some servers... so desactivated
it is really for developing in wims, so no use in general */
/* it is really for developing in wims, so no use in general */
if (1==1) {
if(strstr(tmp_debug,"yes")!=NULL && checkhost(manager_site)>=1)
trace_file = fopen(mkfname(NULL,"%s/%s",tmp_dir,"trace.txt"),"a");