=================================================================== RCS file: /home/cvs/OpenXM/src/util/oxgentexi.c,v retrieving revision 1.16 retrieving revision 1.19 diff -u -p -r1.16 -r1.19 --- OpenXM/src/util/oxgentexi.c 2017/03/18 01:17:44 1.16 +++ OpenXM/src/util/oxgentexi.c 2020/10/03 08:24:14 1.19 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.15 2013/08/31 08:16:02 ohara Exp $ */ +/* $OpenXM: OpenXM/src/util/oxgentexi.c,v 1.18 2017/03/28 12:00:04 takayama Exp $ */ #include #include @@ -462,11 +462,10 @@ struct item *getItem() { } } }else{ - fprintf(stderr,"Error: unknown keyword << %s >> at %s.\n",key, it->name); + fprintf(stderr,"Warning: unknown keyword << %s >> at %s.\n",key, it->name); fprintf(stderr," The error occurs around "); for (i=pp ; i < p; i++) fputc(S[i],stderr); fprintf(stderr,"\n\n"); - exit(1); p = nextToken(key,LIMIT); } }while (p >= 0); @@ -515,6 +514,7 @@ printTexi(FILE *fp, struct item *it) { void printTexi_common(FILE *fp,struct item *it) { int i; + int elen; if ((it->shortDescription != NULL) || (it->refc >0) || (it->examplec > 0)) { if (it->description != NULL) { @@ -544,7 +544,9 @@ printTexi_common(FILE *fp,struct item *it) { if (GenExample) { outputOfExample(it->examplev[i]); } - fprintf(fp,"@end example\n"); + elen=strlen(it->examplev[i]); + if ((it->examplev[i])[elen-1] == '\n') fprintf(fp,"@end example\n"); + else fprintf(fp,"\n@end example\n"); if (it->exampleDescv[i] != NULL && strlen(it->exampleDescv[i]) > 0) { fprintf(fp,"%s\n\n",it->exampleDescv[i]); } @@ -703,18 +705,19 @@ void outputOfExample(char *com) { FILE *fp2; int c; + int r; fp2 = fopen("gentexi-in.tmp","w"); if (fp2 == NULL) { fprintf(stderr,"Cannot open tentexi-in.tmp\n"); exit(10); } - system("rm -f gentexi-out.tmp"); + r=system("rm -f gentexi-out.tmp"); fprintf(fp2,"output(\"gentexi-out.tmp\")$\n"); fprintf(fp2,"%s\n",com); fprintf(fp2,"output()$\n"); fprintf(fp2,"quit;"); fclose(fp2); - system("asir /dev/null"); + r=system("asir /dev/null"); fp2 = fopen("gentexi-out.tmp","r"); if (fp2 == NULL) {