diff --git a/Box/Box.cpp b/Box/Box.cpp
index 91dfed413afec88ebe42dc7adc943b27f6a933f6..3f8a4536453f29ad3701c7e149847b7e46c52c2e 100644
--- a/Box/Box.cpp
+++ b/Box/Box.cpp
@@ -1,4 +1,4 @@
-/* $Id: Box.cpp,v 1.15 2000-12-20 12:17:03 geuzaine Exp $ */
+/* $Id: Box.cpp,v 1.16 2000-12-21 08:02:05 geuzaine Exp $ */
#include <signal.h>
@@ -22,7 +22,7 @@ char *ThePathForIncludes=NULL, *TheBgmFileName=NULL;
int VERBOSE = 0 ;
char gmsh_progname[] = "This is Gmsh (non-interactive)" ;
-char gmsh_copyright[] = "Copyright (C) 1997-2000 J.-F. Remacle, C. Geuzaine";
+char gmsh_copyright[] = "Copyright (C) 1997-2001 J.-F. Remacle, C. Geuzaine";
char gmsh_version[] = "Version : " ;
char gmsh_os[] = "Operating System : " GMSH_OS ;
char gmsh_date[] = "Build Date : " GMSH_DATE ;
@@ -77,10 +77,10 @@ void Info (int level, char *arg0){
fprintf(stderr, gmsh_help, arg0);
exit(1);
case 1:
- fprintf(stderr, "%.3f\n", GMSH_VERSION);
+ fprintf(stderr, "%.2f\n", GMSH_VERSION);
exit(1) ;
case 2:
- fprintf(stderr, "%s%.3f\n", gmsh_version, GMSH_VERSION);
+ fprintf(stderr, "%s%.2f\n", gmsh_version, GMSH_VERSION);
fprintf(stderr, "%s\n", gmsh_os);
fprintf(stderr, "%s\n", gmsh_date);
fprintf(stderr, "%s\n", gmsh_host);
diff --git a/Common/Options.h b/Common/Options.h
index 12be4804b37843f878f7a617170a4da49eaddf06..df9a2108d22582f8e44a539f0a11432d7d96ade4 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -1,4 +1,4 @@
-/* $Id: Options.h,v 1.8 2000-12-20 15:28:42 geuzaine Exp $ */
+/* $Id: Options.h,v 1.9 2000-12-21 08:02:05 geuzaine Exp $ */
#ifndef _OPTIONS_H_
#define _OPTIONS_H_
@@ -196,7 +196,7 @@ StringXNumber PostProcessingOptions_Number[] = {
StringXNumber PrintOptions_Number[] = {
{ "Format" , GMSH_INT, (void*)&CTX.print.format , FORMAT_AUTO },
{ "EpsQuality" , GMSH_INT, (void*)&CTX.print.eps_quality , 1 },
- { "JpegQuality" , GMSH_INT, (void*)&CTX.print.jpeg_quality , 100 },
+ { "JpegQuality" , GMSH_INT, (void*)&CTX.print.jpeg_quality , 75 },
{ "FontSize" , GMSH_INT, (void*)&CTX.print.font_size , 12. },
{ NULL , GMSH_DOUBLE, NULL , 0. }
} ;
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 8eb73afff5fd77be68264677b564f1f21e5a24a0..db83f8f7a05eb5d45030769279e9a712f71617fb 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 2000-12-20 10:40:52 geuzaine Exp $
+# $Id: Makefile,v 1.8 2000-12-21 08:02:05 geuzaine Exp $
#
# Makefile for "libGraphics.a"
#
@@ -36,7 +36,8 @@ SRC = Draw.cpp \
Axes.cpp \
gl2ps.cpp\
gl2gif.cpp\
- gl2jpeg.cpp
+ gl2jpeg.cpp\
+ gl2ppm.cpp
OBJ = $(SRC:.cpp=.o)
diff --git a/Makefile b/Makefile
index 28ef3e18d9db9551501cd45e613c591749cd875d..1ae840e45155d253fcca77433e9277dec5634428 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-# $Id: Makefile,v 1.29 2000-12-20 16:03:37 geuzaine Exp $
+# $Id: Makefile,v 1.30 2000-12-21 08:02:05 geuzaine Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
- GMSH_RELEASE = 0.999
+ GMSH_RELEASE = 1.00
MAKE = make
CC = g++
diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h
index 974cd63bc291ad2a081c22c951bd4f41cd811e29..bd9a331ada9dc9d8e105ea9f9735c056c9d9edac 100644
--- a/Mesh/Mesh.h
+++ b/Mesh/Mesh.h
@@ -1,4 +1,4 @@
-/* $Id: Mesh.h,v 1.9 2000-12-20 12:17:08 geuzaine Exp $ */
+/* $Id: Mesh.h,v 1.10 2000-12-21 08:02:05 geuzaine Exp $ */
#ifndef _MESH_H_
#define _MESH_H_
@@ -17,6 +17,7 @@
#define FORMAT_GEO 8
#define FORMAT_JPEG 9
#define FORMAT_AUTO 10
+#define FORMAT_PPM 11
#define CONV_VALUE 0.8
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index dc8f995024b081e7bbdb3bc991da16d089967679..66b557070ea7ed1c8fceb71f99f376cc2614bcd4 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -1,174 +1,173 @@
/* A Bison parser, made from Gmsh.y
- by GNU Bison version 1.25
- */
+ by GNU Bison version 1.28 */
#define YYBISON 1 /* Identify Bison output. */
-#define tDOUBLE 258
-#define tSTRING 259
-#define tBIGSTR 260
-#define tEND 261
-#define tAFFECT 262
-#define tDOTS 263
-#define tPi 264
-#define tExp 265
-#define tLog 266
-#define tLog10 267
-#define tSqrt 268
-#define tSin 269
-#define tAsin 270
-#define tCos 271
-#define tAcos 272
-#define tTan 273
-#define tRand 274
-#define tAtan 275
-#define tAtan2 276
-#define tSinh 277
-#define tCosh 278
-#define tTanh 279
-#define tFabs 280
-#define tFloor 281
-#define tCeil 282
-#define tFmod 283
-#define tModulo 284
-#define tHypot 285
-#define tPrintf 286
-#define tSprintf 287
-#define tDraw 288
-#define tPoint 289
-#define tCircle 290
-#define tEllipsis 291
-#define tLine 292
-#define tSurface 293
-#define tSpline 294
-#define tVolume 295
-#define tCharacteristic 296
-#define tLength 297
-#define tParametric 298
-#define tElliptic 299
-#define tPlane 300
-#define tRuled 301
-#define tTransfinite 302
-#define tComplex 303
-#define tPhysical 304
-#define tUsing 305
-#define tBump 306
-#define tProgression 307
-#define tRotate 308
-#define tTranslate 309
-#define tSymmetry 310
-#define tDilate 311
-#define tExtrude 312
-#define tDuplicata 313
-#define tLoop 314
-#define tRecombine 315
-#define tDelete 316
-#define tCoherence 317
-#define tIntersect 318
-#define tView 319
-#define tAttractor 320
-#define tLayers 321
-#define tScalarTetrahedron 322
-#define tVectorTetrahedron 323
-#define tTensorTetrahedron 324
-#define tScalarTriangle 325
-#define tVectorTriangle 326
-#define tTensorTriangle 327
-#define tScalarLine 328
-#define tVectorLine 329
-#define tTensorLine 330
-#define tScalarPoint 331
-#define tVectorPoint 332
-#define tTensorPoint 333
-#define tBSpline 334
-#define tNurbs 335
-#define tOrder 336
-#define tWith 337
-#define tBounds 338
-#define tKnots 339
-#define tColor 340
-#define tFor 341
-#define tIn 342
-#define tEndFor 343
-#define tIf 344
-#define tEndIf 345
-#define tExit 346
-#define tReturn 347
-#define tCall 348
-#define tFunction 349
-#define tMesh 350
-#define tB_SPLINE_SURFACE_WITH_KNOTS 351
-#define tB_SPLINE_CURVE_WITH_KNOTS 352
-#define tCARTESIAN_POINT 353
-#define tTRUE 354
-#define tFALSE 355
-#define tUNSPECIFIED 356
-#define tU 357
-#define tV 358
-#define tEDGE_CURVE 359
-#define tVERTEX_POINT 360
-#define tORIENTED_EDGE 361
-#define tPLANE 362
-#define tFACE_OUTER_BOUND 363
-#define tEDGE_LOOP 364
-#define tADVANCED_FACE 365
-#define tVECTOR 366
-#define tDIRECTION 367
-#define tAXIS2_PLACEMENT_3D 368
-#define tISO 369
-#define tENDISO 370
-#define tENDSEC 371
-#define tDATA 372
-#define tHEADER 373
-#define tFILE_DESCRIPTION 374
-#define tFILE_SCHEMA 375
-#define tFILE_NAME 376
-#define tMANIFOLD_SOLID_BREP 377
-#define tCLOSED_SHELL 378
-#define tADVANCED_BREP_SHAPE_REPRESENTATION 379
-#define tFACE_BOUND 380
-#define tCYLINDRICAL_SURFACE 381
-#define tCONICAL_SURFACE 382
-#define tCIRCLE 383
-#define tTRIMMED_CURVE 384
-#define tGEOMETRIC_SET 385
-#define tCOMPOSITE_CURVE_SEGMENT 386
-#define tCONTINUOUS 387
-#define tCOMPOSITE_CURVE 388
-#define tTOROIDAL_SURFACE 389
-#define tPRODUCT_DEFINITION 390
-#define tPRODUCT_DEFINITION_SHAPE 391
-#define tSHAPE_DEFINITION_REPRESENTATION 392
-#define tELLIPSE 393
-#define tTrimmed 394
-#define tSolid 395
-#define tEndSolid 396
-#define tVertex 397
-#define tFacet 398
-#define tNormal 399
-#define tOuter 400
-#define tLoopSTL 401
-#define tEndLoop 402
-#define tEndFacet 403
-#define tAFFECTPLUS 404
-#define tAFFECTMINUS 405
-#define tAFFECTTIMES 406
-#define tAFFECTDIVIDE 407
-#define tOR 408
-#define tAND 409
-#define tEQUAL 410
-#define tNOTEQUAL 411
-#define tAPPROXEQUAL 412
-#define tLESSOREQUAL 413
-#define tGREATEROREQUAL 414
-#define tCROSSPRODUCT 415
-#define tPLUSPLUS 416
-#define tMINUSMINUS 417
-#define UNARYPREC 418
+#define tDOUBLE 257
+#define tSTRING 258
+#define tBIGSTR 259
+#define tEND 260
+#define tAFFECT 261
+#define tDOTS 262
+#define tPi 263
+#define tExp 264
+#define tLog 265
+#define tLog10 266
+#define tSqrt 267
+#define tSin 268
+#define tAsin 269
+#define tCos 270
+#define tAcos 271
+#define tTan 272
+#define tRand 273
+#define tAtan 274
+#define tAtan2 275
+#define tSinh 276
+#define tCosh 277
+#define tTanh 278
+#define tFabs 279
+#define tFloor 280
+#define tCeil 281
+#define tFmod 282
+#define tModulo 283
+#define tHypot 284
+#define tPrintf 285
+#define tSprintf 286
+#define tDraw 287
+#define tPoint 288
+#define tCircle 289
+#define tEllipsis 290
+#define tLine 291
+#define tSurface 292
+#define tSpline 293
+#define tVolume 294
+#define tCharacteristic 295
+#define tLength 296
+#define tParametric 297
+#define tElliptic 298
+#define tPlane 299
+#define tRuled 300
+#define tTransfinite 301
+#define tComplex 302
+#define tPhysical 303
+#define tUsing 304
+#define tBump 305
+#define tProgression 306
+#define tRotate 307
+#define tTranslate 308
+#define tSymmetry 309
+#define tDilate 310
+#define tExtrude 311
+#define tDuplicata 312
+#define tLoop 313
+#define tRecombine 314
+#define tDelete 315
+#define tCoherence 316
+#define tIntersect 317
+#define tView 318
+#define tAttractor 319
+#define tLayers 320
+#define tScalarTetrahedron 321
+#define tVectorTetrahedron 322
+#define tTensorTetrahedron 323
+#define tScalarTriangle 324
+#define tVectorTriangle 325
+#define tTensorTriangle 326
+#define tScalarLine 327
+#define tVectorLine 328
+#define tTensorLine 329
+#define tScalarPoint 330
+#define tVectorPoint 331
+#define tTensorPoint 332
+#define tBSpline 333
+#define tNurbs 334
+#define tOrder 335
+#define tWith 336
+#define tBounds 337
+#define tKnots 338
+#define tColor 339
+#define tFor 340
+#define tIn 341
+#define tEndFor 342
+#define tIf 343
+#define tEndIf 344
+#define tExit 345
+#define tReturn 346
+#define tCall 347
+#define tFunction 348
+#define tMesh 349
+#define tB_SPLINE_SURFACE_WITH_KNOTS 350
+#define tB_SPLINE_CURVE_WITH_KNOTS 351
+#define tCARTESIAN_POINT 352
+#define tTRUE 353
+#define tFALSE 354
+#define tUNSPECIFIED 355
+#define tU 356
+#define tV 357
+#define tEDGE_CURVE 358
+#define tVERTEX_POINT 359
+#define tORIENTED_EDGE 360
+#define tPLANE 361
+#define tFACE_OUTER_BOUND 362
+#define tEDGE_LOOP 363
+#define tADVANCED_FACE 364
+#define tVECTOR 365
+#define tDIRECTION 366
+#define tAXIS2_PLACEMENT_3D 367
+#define tISO 368
+#define tENDISO 369
+#define tENDSEC 370
+#define tDATA 371
+#define tHEADER 372
+#define tFILE_DESCRIPTION 373
+#define tFILE_SCHEMA 374
+#define tFILE_NAME 375
+#define tMANIFOLD_SOLID_BREP 376
+#define tCLOSED_SHELL 377
+#define tADVANCED_BREP_SHAPE_REPRESENTATION 378
+#define tFACE_BOUND 379
+#define tCYLINDRICAL_SURFACE 380
+#define tCONICAL_SURFACE 381
+#define tCIRCLE 382
+#define tTRIMMED_CURVE 383
+#define tGEOMETRIC_SET 384
+#define tCOMPOSITE_CURVE_SEGMENT 385
+#define tCONTINUOUS 386
+#define tCOMPOSITE_CURVE 387
+#define tTOROIDAL_SURFACE 388
+#define tPRODUCT_DEFINITION 389
+#define tPRODUCT_DEFINITION_SHAPE 390
+#define tSHAPE_DEFINITION_REPRESENTATION 391
+#define tELLIPSE 392
+#define tTrimmed 393
+#define tSolid 394
+#define tEndSolid 395
+#define tVertex 396
+#define tFacet 397
+#define tNormal 398
+#define tOuter 399
+#define tLoopSTL 400
+#define tEndLoop 401
+#define tEndFacet 402
+#define tAFFECTPLUS 403
+#define tAFFECTMINUS 404
+#define tAFFECTTIMES 405
+#define tAFFECTDIVIDE 406
+#define tOR 407
+#define tAND 408
+#define tEQUAL 409
+#define tNOTEQUAL 410
+#define tAPPROXEQUAL 411
+#define tLESSOREQUAL 412
+#define tGREATEROREQUAL 413
+#define tCROSSPRODUCT 414
+#define tPLUSPLUS 415
+#define tMINUSMINUS 416
+#define UNARYPREC 417
#line 1 "Gmsh.y"
- /* $Id: Gmsh.tab.cpp,v 1.54 2000-12-20 15:28:45 geuzaine Exp $ */
+ /* $Id: Gmsh.tab.cpp,v 1.55 2000-12-21 08:02:05 geuzaine Exp $ */
#include <stdarg.h>
@@ -256,7 +255,7 @@ typedef union {
#define YYFLAG -32768
#define YYNTBASE 182
-#define YYTRANSLATE(x) ((unsigned)(x) <= 418 ? yytranslate[x] : 261)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 417 ? yytranslate[x] : 261)
static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -284,23 +283,23 @@ static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 147, 148, 149, 150, 151, 152, 154, 155, 156,
- 157, 158, 160, 162, 168, 170, 171, 172
+ 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 154, 155, 156, 157,
+ 158, 160, 162, 168, 170, 171, 172
};
#if YYDEBUG != 0
@@ -2498,7 +2497,8 @@ static const short yycheck[] = { 23,
166, 167, -1, -1, -1, -1, -1, 173, -1, 175
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/local/share/bison.simple"
+#line 3 "/usr/lib/bison.simple"
+/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -2515,46 +2515,66 @@ static const short yycheck[] = { 23,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
-#ifndef alloca
+/* This is the parser code that is written into each bison parser
+ when the %semantic_parser declaration is not specified in the grammar.
+ It was written by Richard Stallman by simplifying the hairy parser
+ used when %semantic_parser is specified. */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not GNU C. */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
#include <alloca.h>
#else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* We think this test detects Watcom and Microsoft C. */
+/* This used to test MSDOS, but that is a bad idea
+ since that symbol is in the user namespace. */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+ instead, just don't use alloca. */
#include <malloc.h>
+#endif
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-#include <malloc.h>
+/* I don't know what this was needed for, but it pollutes the namespace.
+ So I turned it off. rms, 2 May 1997. */
+/* #include <malloc.h> */
#pragma alloca
-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+ and on HPUX 10. Eventually we can turn this on. */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
#endif /* __hpux */
+#endif
#endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc. */
-#endif /* not GNU C. */
-#endif /* alloca not defined. */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
-/* This is the parser code that is written into each bison parser
- when the %semantic_parser declaration is not specified in the grammar.
- It was written by Richard Stallman by simplifying the hairy parser
- used when %semantic_parser is specified. */
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
@@ -2564,8 +2584,8 @@ void *alloca ();
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
-#define YYACCEPT return(0)
-#define YYABORT return(1)
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
#define YYERROR goto yyerrlab1
/* Like YYERROR except do call yyerror.
This remains here temporarily to ease the
@@ -2646,12 +2666,12 @@ int yydebug; /* nonzero means print parse trace */
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 10000
#endif
-
-/* Prevent warning if -Wstrict-prototypes. */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
+/* Define __yy_memcpy. Note that the size argument
+ should be passed with type unsigned int, because that is what the non-GCC
+ definitions require. With GCC, __builtin_memcpy takes an arg
+ of type size_t, but it can handle unsigned int. */
+
#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
#else /* not GNU C or C++ */
@@ -2663,7 +2683,7 @@ static void
__yy_memcpy (to, from, count)
char *to;
char *from;
- int count;
+ unsigned int count;
{
register char *f = from;
register char *t = to;
@@ -2678,10 +2698,10 @@ __yy_memcpy (to, from, count)
/* This is the most reliable way to avoid incompatibilities
in available built-in functions on various systems. */
static void
-__yy_memcpy (char *to, char *from, int count)
+__yy_memcpy (char *to, char *from, unsigned int count)
{
- register char *f = from;
register char *t = to;
+ register char *f = from;
register int i = count;
while (i-- > 0)
@@ -2691,7 +2711,7 @@ __yy_memcpy (char *to, char *from, int count)
#endif
#endif
-#line 196 "/usr/local/share/bison.simple"
+#line 217 "/usr/lib/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -2712,6 +2732,15 @@ __yy_memcpy (char *to, char *from, int count)
#define YYPARSE_PARAM_DECL
#endif /* not YYPARSE_PARAM */
+/* Prevent warning if -Wstrict-prototypes. */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
int
yyparse(YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
@@ -2740,6 +2769,7 @@ yyparse(YYPARSE_PARAM_ARG)
#endif
int yystacksize = YYINITDEPTH;
+ int yyfree_stacks = 0;
#ifdef YYPURE
int yychar;
@@ -2824,18 +2854,32 @@ yynewstate:
if (yystacksize >= YYMAXDEPTH)
{
yyerror("parser stack overflow");
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
return 2;
}
yystacksize *= 2;
if (yystacksize > YYMAXDEPTH)
yystacksize = YYMAXDEPTH;
- yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
- __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
- yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
- __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
+#ifndef YYSTACK_USE_ALLOCA
+ yyfree_stacks = 1;
+#endif
+ yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+ __yy_memcpy ((char *)yyss, (char *)yyss1,
+ size * (unsigned int) sizeof (*yyssp));
+ yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+ __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+ size * (unsigned int) sizeof (*yyvsp));
#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
+ yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+ __yy_memcpy ((char *)yyls, (char *)yyls1,
+ size * (unsigned int) sizeof (*yylsp));
#endif
#endif /* no yyoverflow */
@@ -4609,7 +4653,7 @@ case 203:
}
else if(!strcmp(yyvsp[-2].c, "System")){
- Msg(PARSER_INFO, "Executing System Call \"%s\"");
+ Msg(PARSER_INFO, "Executing System Call \"%s\"", yyvsp[-1].c);
system(yyvsp[-1].c);
}
@@ -5867,7 +5911,7 @@ case 342:
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/local/share/bison.simple"
+#line 543 "/usr/lib/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
@@ -6062,6 +6106,30 @@ yyerrhandle:
yystate = yyn;
goto yynewstate;
+
+ yyacceptlab:
+ /* YYACCEPT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 0;
+
+ yyabortlab:
+ /* YYABORT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 1;
}
#line 2685 "Gmsh.y"
diff --git a/Parser/Gmsh.tab.cpp.h b/Parser/Gmsh.tab.cpp.h
index ac1bce85bd14f6ee22c6058c6681188269542609..4a4d722c1b66665aab40ec8d45bedb6bea28d804 100644
--- a/Parser/Gmsh.tab.cpp.h
+++ b/Parser/Gmsh.tab.cpp.h
@@ -7,167 +7,167 @@ typedef union {
Shape s;
List_T *l;
} YYSTYPE;
-#define tDOUBLE 258
-#define tSTRING 259
-#define tBIGSTR 260
-#define tEND 261
-#define tAFFECT 262
-#define tDOTS 263
-#define tPi 264
-#define tExp 265
-#define tLog 266
-#define tLog10 267
-#define tSqrt 268
-#define tSin 269
-#define tAsin 270
-#define tCos 271
-#define tAcos 272
-#define tTan 273
-#define tRand 274
-#define tAtan 275
-#define tAtan2 276
-#define tSinh 277
-#define tCosh 278
-#define tTanh 279
-#define tFabs 280
-#define tFloor 281
-#define tCeil 282
-#define tFmod 283
-#define tModulo 284
-#define tHypot 285
-#define tPrintf 286
-#define tSprintf 287
-#define tDraw 288
-#define tPoint 289
-#define tCircle 290
-#define tEllipsis 291
-#define tLine 292
-#define tSurface 293
-#define tSpline 294
-#define tVolume 295
-#define tCharacteristic 296
-#define tLength 297
-#define tParametric 298
-#define tElliptic 299
-#define tPlane 300
-#define tRuled 301
-#define tTransfinite 302
-#define tComplex 303
-#define tPhysical 304
-#define tUsing 305
-#define tBump 306
-#define tProgression 307
-#define tRotate 308
-#define tTranslate 309
-#define tSymmetry 310
-#define tDilate 311
-#define tExtrude 312
-#define tDuplicata 313
-#define tLoop 314
-#define tRecombine 315
-#define tDelete 316
-#define tCoherence 317
-#define tIntersect 318
-#define tView 319
-#define tAttractor 320
-#define tLayers 321
-#define tScalarTetrahedron 322
-#define tVectorTetrahedron 323
-#define tTensorTetrahedron 324
-#define tScalarTriangle 325
-#define tVectorTriangle 326
-#define tTensorTriangle 327
-#define tScalarLine 328
-#define tVectorLine 329
-#define tTensorLine 330
-#define tScalarPoint 331
-#define tVectorPoint 332
-#define tTensorPoint 333
-#define tBSpline 334
-#define tNurbs 335
-#define tOrder 336
-#define tWith 337
-#define tBounds 338
-#define tKnots 339
-#define tColor 340
-#define tFor 341
-#define tIn 342
-#define tEndFor 343
-#define tIf 344
-#define tEndIf 345
-#define tExit 346
-#define tReturn 347
-#define tCall 348
-#define tFunction 349
-#define tMesh 350
-#define tB_SPLINE_SURFACE_WITH_KNOTS 351
-#define tB_SPLINE_CURVE_WITH_KNOTS 352
-#define tCARTESIAN_POINT 353
-#define tTRUE 354
-#define tFALSE 355
-#define tUNSPECIFIED 356
-#define tU 357
-#define tV 358
-#define tEDGE_CURVE 359
-#define tVERTEX_POINT 360
-#define tORIENTED_EDGE 361
-#define tPLANE 362
-#define tFACE_OUTER_BOUND 363
-#define tEDGE_LOOP 364
-#define tADVANCED_FACE 365
-#define tVECTOR 366
-#define tDIRECTION 367
-#define tAXIS2_PLACEMENT_3D 368
-#define tISO 369
-#define tENDISO 370
-#define tENDSEC 371
-#define tDATA 372
-#define tHEADER 373
-#define tFILE_DESCRIPTION 374
-#define tFILE_SCHEMA 375
-#define tFILE_NAME 376
-#define tMANIFOLD_SOLID_BREP 377
-#define tCLOSED_SHELL 378
-#define tADVANCED_BREP_SHAPE_REPRESENTATION 379
-#define tFACE_BOUND 380
-#define tCYLINDRICAL_SURFACE 381
-#define tCONICAL_SURFACE 382
-#define tCIRCLE 383
-#define tTRIMMED_CURVE 384
-#define tGEOMETRIC_SET 385
-#define tCOMPOSITE_CURVE_SEGMENT 386
-#define tCONTINUOUS 387
-#define tCOMPOSITE_CURVE 388
-#define tTOROIDAL_SURFACE 389
-#define tPRODUCT_DEFINITION 390
-#define tPRODUCT_DEFINITION_SHAPE 391
-#define tSHAPE_DEFINITION_REPRESENTATION 392
-#define tELLIPSE 393
-#define tTrimmed 394
-#define tSolid 395
-#define tEndSolid 396
-#define tVertex 397
-#define tFacet 398
-#define tNormal 399
-#define tOuter 400
-#define tLoopSTL 401
-#define tEndLoop 402
-#define tEndFacet 403
-#define tAFFECTPLUS 404
-#define tAFFECTMINUS 405
-#define tAFFECTTIMES 406
-#define tAFFECTDIVIDE 407
-#define tOR 408
-#define tAND 409
-#define tEQUAL 410
-#define tNOTEQUAL 411
-#define tAPPROXEQUAL 412
-#define tLESSOREQUAL 413
-#define tGREATEROREQUAL 414
-#define tCROSSPRODUCT 415
-#define tPLUSPLUS 416
-#define tMINUSMINUS 417
-#define UNARYPREC 418
+#define tDOUBLE 257
+#define tSTRING 258
+#define tBIGSTR 259
+#define tEND 260
+#define tAFFECT 261
+#define tDOTS 262
+#define tPi 263
+#define tExp 264
+#define tLog 265
+#define tLog10 266
+#define tSqrt 267
+#define tSin 268
+#define tAsin 269
+#define tCos 270
+#define tAcos 271
+#define tTan 272
+#define tRand 273
+#define tAtan 274
+#define tAtan2 275
+#define tSinh 276
+#define tCosh 277
+#define tTanh 278
+#define tFabs 279
+#define tFloor 280
+#define tCeil 281
+#define tFmod 282
+#define tModulo 283
+#define tHypot 284
+#define tPrintf 285
+#define tSprintf 286
+#define tDraw 287
+#define tPoint 288
+#define tCircle 289
+#define tEllipsis 290
+#define tLine 291
+#define tSurface 292
+#define tSpline 293
+#define tVolume 294
+#define tCharacteristic 295
+#define tLength 296
+#define tParametric 297
+#define tElliptic 298
+#define tPlane 299
+#define tRuled 300
+#define tTransfinite 301
+#define tComplex 302
+#define tPhysical 303
+#define tUsing 304
+#define tBump 305
+#define tProgression 306
+#define tRotate 307
+#define tTranslate 308
+#define tSymmetry 309
+#define tDilate 310
+#define tExtrude 311
+#define tDuplicata 312
+#define tLoop 313
+#define tRecombine 314
+#define tDelete 315
+#define tCoherence 316
+#define tIntersect 317
+#define tView 318
+#define tAttractor 319
+#define tLayers 320
+#define tScalarTetrahedron 321
+#define tVectorTetrahedron 322
+#define tTensorTetrahedron 323
+#define tScalarTriangle 324
+#define tVectorTriangle 325
+#define tTensorTriangle 326
+#define tScalarLine 327
+#define tVectorLine 328
+#define tTensorLine 329
+#define tScalarPoint 330
+#define tVectorPoint 331
+#define tTensorPoint 332
+#define tBSpline 333
+#define tNurbs 334
+#define tOrder 335
+#define tWith 336
+#define tBounds 337
+#define tKnots 338
+#define tColor 339
+#define tFor 340
+#define tIn 341
+#define tEndFor 342
+#define tIf 343
+#define tEndIf 344
+#define tExit 345
+#define tReturn 346
+#define tCall 347
+#define tFunction 348
+#define tMesh 349
+#define tB_SPLINE_SURFACE_WITH_KNOTS 350
+#define tB_SPLINE_CURVE_WITH_KNOTS 351
+#define tCARTESIAN_POINT 352
+#define tTRUE 353
+#define tFALSE 354
+#define tUNSPECIFIED 355
+#define tU 356
+#define tV 357
+#define tEDGE_CURVE 358
+#define tVERTEX_POINT 359
+#define tORIENTED_EDGE 360
+#define tPLANE 361
+#define tFACE_OUTER_BOUND 362
+#define tEDGE_LOOP 363
+#define tADVANCED_FACE 364
+#define tVECTOR 365
+#define tDIRECTION 366
+#define tAXIS2_PLACEMENT_3D 367
+#define tISO 368
+#define tENDISO 369
+#define tENDSEC 370
+#define tDATA 371
+#define tHEADER 372
+#define tFILE_DESCRIPTION 373
+#define tFILE_SCHEMA 374
+#define tFILE_NAME 375
+#define tMANIFOLD_SOLID_BREP 376
+#define tCLOSED_SHELL 377
+#define tADVANCED_BREP_SHAPE_REPRESENTATION 378
+#define tFACE_BOUND 379
+#define tCYLINDRICAL_SURFACE 380
+#define tCONICAL_SURFACE 381
+#define tCIRCLE 382
+#define tTRIMMED_CURVE 383
+#define tGEOMETRIC_SET 384
+#define tCOMPOSITE_CURVE_SEGMENT 385
+#define tCONTINUOUS 386
+#define tCOMPOSITE_CURVE 387
+#define tTOROIDAL_SURFACE 388
+#define tPRODUCT_DEFINITION 389
+#define tPRODUCT_DEFINITION_SHAPE 390
+#define tSHAPE_DEFINITION_REPRESENTATION 391
+#define tELLIPSE 392
+#define tTrimmed 393
+#define tSolid 394
+#define tEndSolid 395
+#define tVertex 396
+#define tFacet 397
+#define tNormal 398
+#define tOuter 399
+#define tLoopSTL 400
+#define tEndLoop 401
+#define tEndFacet 402
+#define tAFFECTPLUS 403
+#define tAFFECTMINUS 404
+#define tAFFECTTIMES 405
+#define tAFFECTDIVIDE 406
+#define tOR 407
+#define tAND 408
+#define tEQUAL 409
+#define tNOTEQUAL 410
+#define tAPPROXEQUAL 411
+#define tLESSOREQUAL 412
+#define tGREATEROREQUAL 413
+#define tCROSSPRODUCT 414
+#define tPLUSPLUS 415
+#define tMINUSMINUS 416
+#define UNARYPREC 417
extern YYSTYPE yylval;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index f227a095f98535a1dbf5b3a95deeffa28abdab4b..8e1a22bea73d14b3e7913e16ba19972b354bdae2 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.54 2000-12-20 15:28:46 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.55 2000-12-21 08:02:06 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1165,7 +1165,7 @@ YY_MALLOC_DECL
YY_DECL
{
register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
+ register char *yy_cp = NULL, *yy_bp = NULL;
register int yy_act;
#line 60 "Gmsh.l"
diff --git a/Unix/CbFile.cpp b/Unix/CbFile.cpp
index 02a38f859aec84c557ed39f2b4c9339888b2e202..103a5026c08c5919aee59e428bcc09eb06d851e7 100644
--- a/Unix/CbFile.cpp
+++ b/Unix/CbFile.cpp
@@ -1,4 +1,4 @@
-/* $Id: CbFile.cpp,v 1.14 2000-12-20 12:17:13 geuzaine Exp $ */
+/* $Id: CbFile.cpp,v 1.15 2000-12-21 08:02:06 geuzaine Exp $ */
#include <unistd.h>
@@ -18,6 +18,7 @@
#include "gl2ps.h"
#include "gl2gif.h"
#include "gl2jpeg.h"
+#include "gl2ppm.h"
extern Context_T CTX;
extern XContext_T XCTX;
@@ -77,6 +78,7 @@ void CreateFile (char *name, int format) {
else if(!strcmp(ext,".jpg")) CreateFile(name, FORMAT_JPEG);
else if(!strcmp(ext,".eps")) CreateFile(name, FORMAT_EPS);
else if(!strcmp(ext,".xpm")) CreateFile(name, FORMAT_XPM);
+ else if(!strcmp(ext,".ppm")) CreateFile(name, FORMAT_PPM);
else {
if(strlen(name) < 5)
Msg(ERROR, "Unknown Extension for Automatic Format Detection");
@@ -148,6 +150,20 @@ void CreateFile (char *name, int format) {
fclose(fp);
break;
+ case FORMAT_PPM :
+ if(!(fp = fopen(name,"wb"))) {
+ Msg(WARNING, "Unable to Open File '%s'", name);
+ WARNING_OVERRIDE = 0;
+ return;
+ }
+ Replot();
+ create_ppm(fp, CTX.viewport[2]-CTX.viewport[0],
+ CTX.viewport[3]-CTX.viewport[1]);
+ Msg(INFOS, "PPM Creation Complete '%s'", name);
+ Msg (INFO, "Wrote File '%s'", name);
+ fclose(fp);
+ break;
+
case FORMAT_EPS :
switch(CTX.print.eps_quality){
diff --git a/Unix/CbOptions.cpp b/Unix/CbOptions.cpp
index a539698e12cab227f5c780915c8b5b335b4e5ecb..ff03847e04a3457aef24f1f0220ba7d00d3e11e7 100644
--- a/Unix/CbOptions.cpp
+++ b/Unix/CbOptions.cpp
@@ -1,4 +1,4 @@
-/* $Id: CbOptions.cpp,v 1.14 2000-12-20 12:17:13 geuzaine Exp $ */
+/* $Id: CbOptions.cpp,v 1.15 2000-12-21 08:02:06 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -131,20 +131,21 @@ void OptionsCb (Widget w, XtPointer client_data, XtPointer call_data){
/* save */
- case OPTIONS_SAVE_MSH : CTX.print.format = CTX.mesh.format = FORMAT_MSH; break;
- case OPTIONS_SAVE_UNV : CTX.print.format = CTX.mesh.format = FORMAT_UNV; break;
- case OPTIONS_SAVE_GREF : CTX.print.format = CTX.mesh.format = FORMAT_GREF; break;
- case OPTIONS_SAVE_GEO : CTX.print.format = FORMAT_GEO; break;
- case OPTIONS_SAVE_AUTO : CTX.print.format = FORMAT_AUTO; break;
- case OPTIONS_SAVE_XDUMP : CTX.print.format = FORMAT_XPM; break;
- case OPTIONS_SAVE_GL2GIF : CTX.print.format = FORMAT_GIF; break;
- case OPTIONS_SAVE_GL2JPEG : CTX.print.format = FORMAT_JPEG; break;
- case OPTIONS_SAVE_GL2PS_SIMPLE : CTX.print.format = FORMAT_EPS;
- CTX.print.eps_quality = 1; break;
- case OPTIONS_SAVE_GL2PS_COMPLEX: CTX.print.format = FORMAT_EPS;
- CTX.print.eps_quality = 2; break;
- case OPTIONS_SAVE_GL2PS_IMAGE : CTX.print.format = FORMAT_EPS;
- CTX.print.eps_quality = 0; break;
+ case OPTIONS_SAVE_MSH : CTX.print.format = CTX.mesh.format = FORMAT_MSH; break;
+ case OPTIONS_SAVE_UNV : CTX.print.format = CTX.mesh.format = FORMAT_UNV; break;
+ case OPTIONS_SAVE_GREF : CTX.print.format = CTX.mesh.format = FORMAT_GREF; break;
+ case OPTIONS_SAVE_GEO : CTX.print.format = FORMAT_GEO; break;
+ case OPTIONS_SAVE_AUTO : CTX.print.format = FORMAT_AUTO; break;
+ case OPTIONS_SAVE_XPM : CTX.print.format = FORMAT_XPM; break;
+ case OPTIONS_SAVE_GIF : CTX.print.format = FORMAT_GIF; break;
+ case OPTIONS_SAVE_JPEG : CTX.print.format = FORMAT_JPEG; break;
+ case OPTIONS_SAVE_PPM : CTX.print.format = FORMAT_PPM; break;
+ case OPTIONS_SAVE_EPS_SIMPLE : CTX.print.format = FORMAT_EPS;
+ CTX.print.eps_quality = 1; break;
+ case OPTIONS_SAVE_EPS_COMPLEX: CTX.print.format = FORMAT_EPS;
+ CTX.print.eps_quality = 2; break;
+ case OPTIONS_SAVE_EPS_IMAGE : CTX.print.format = FORMAT_EPS;
+ CTX.print.eps_quality = 0; break;
/* geometrie */
diff --git a/Unix/CbOptions.h b/Unix/CbOptions.h
index 8005f9f2b140d6dea5189589e687a155db22612d..477d091e6dfd5bc5d92ff97099f1c503bd211f6e 100644
--- a/Unix/CbOptions.h
+++ b/Unix/CbOptions.h
@@ -1,4 +1,4 @@
-/* $Id: CbOptions.h,v 1.10 2000-12-20 12:17:13 geuzaine Exp $ */
+/* $Id: CbOptions.h,v 1.11 2000-12-21 08:02:06 geuzaine Exp $ */
#ifndef _CB_OPTIONS_H_
#define _CB_OPTIONS_H_
@@ -99,13 +99,14 @@
#define OPTIONS_SAVE_MSH 401
#define OPTIONS_SAVE_UNV 402
#define OPTIONS_SAVE_GREF 403
-#define OPTIONS_SAVE_XDUMP 404
-#define OPTIONS_SAVE_GL2PS_SIMPLE 405
-#define OPTIONS_SAVE_GL2PS_COMPLEX 406
-#define OPTIONS_SAVE_GL2PS_IMAGE 407
-#define OPTIONS_SAVE_GL2GIF 408
+#define OPTIONS_SAVE_XPM 404
+#define OPTIONS_SAVE_EPS_SIMPLE 405
+#define OPTIONS_SAVE_EPS_COMPLEX 406
+#define OPTIONS_SAVE_EPS_IMAGE 407
+#define OPTIONS_SAVE_GIF 408
#define OPTIONS_SAVE_GEO 409
-#define OPTIONS_SAVE_GL2JPEG 410
+#define OPTIONS_SAVE_JPEG 410
+#define OPTIONS_SAVE_PPM 411
diff --git a/Unix/Main.cpp b/Unix/Main.cpp
index c4eeeb1f86fea549cbc97d2b89c4aad9c930061d..c3265532af657d6e21f4a0f741ed84af58e14786 100644
--- a/Unix/Main.cpp
+++ b/Unix/Main.cpp
@@ -1,4 +1,4 @@
-/* $Id: Main.cpp,v 1.31 2000-12-20 15:28:48 geuzaine Exp $ */
+/* $Id: Main.cpp,v 1.32 2000-12-21 08:02:06 geuzaine Exp $ */
#include <signal.h>
@@ -31,7 +31,7 @@
#include "Version.h"
char gmsh_progname[] = "This is Gmsh" ;
-char gmsh_copyright[] = "Copyright (C) 1997-2000 J.-F. Remacle, C. Geuzaine";
+char gmsh_copyright[] = "Copyright (C) 1997-2001 J.-F. Remacle, C. Geuzaine";
char gmsh_version[] = "Version : " ;
char gmsh_os[] = "Operating System : " GMSH_OS ;
char gmsh_date[] = "Build Date : " GMSH_DATE ;
@@ -466,12 +466,12 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
}
else if(!strcmp(argv[i]+1, "version") ||
!strcmp(argv[i]+1, "-version")){
- fprintf(stderr, "%.3f\n", GMSH_VERSION);
+ fprintf(stderr, "%.2f\n", GMSH_VERSION);
exit(1);
}
else if(!strcmp(argv[i]+1, "info") ||
!strcmp(argv[i]+1, "-info")){
- fprintf(stderr, "%s%.3f\n", gmsh_version, GMSH_VERSION);
+ fprintf(stderr, "%s%.2f\n", gmsh_version, GMSH_VERSION);
fprintf(stderr, "%s\n", gmsh_os);
fprintf(stderr, "%s\n", gmsh_date);
fprintf(stderr, "%s\n", gmsh_host);
@@ -537,7 +537,7 @@ int main(int argc, char *argv[]){
Get_Options(argc, argv, &nbf);
if(CTX.verbosity)
- fprintf(stderr, "%s, Version %.3f\n", gmsh_progname, GMSH_VERSION);
+ fprintf(stderr, "%s, Version %.2f\n", gmsh_progname, GMSH_VERSION);
/* Initialize the static Mesh */
@@ -593,7 +593,7 @@ int main(int argc, char *argv[]){
/* Text for about window */
- sprintf(TextAbout, "%s\n \n%s%.3f\n%s\n%s\n%s\n%s\n%s\n%s\n \n%s\n \n"
+ sprintf(TextAbout, "%s\n \n%s%.2f\n%s\n%s\n%s\n%s\n%s\n%s\n \n%s\n \n"
"Type 'gmsh -help' for command line options",
gmsh_progname, gmsh_version, GMSH_VERSION,
gmsh_os, gmsh_date, gmsh_host, gmsh_packager,
@@ -855,7 +855,7 @@ int main(int argc, char *argv[]){
TextBuffer = (char*)Malloc(1024*sizeof(char));
Msg(STATUS, "Ready");
- Msg(SELECT, "Gmsh %.3f", GMSH_VERSION);
+ Msg(SELECT, "Gmsh %.2f", GMSH_VERSION);
/* Open input file */
diff --git a/Unix/Register.cpp b/Unix/Register.cpp
index 11b6bfed25df80b18b8dc5e7b9ae4095f5f07c32..df30134ee886a13ccab2647ae8b7e6636add9e71 100644
--- a/Unix/Register.cpp
+++ b/Unix/Register.cpp
@@ -1,4 +1,4 @@
-/* $Id: Register.cpp,v 1.15 2000-12-20 12:17:13 geuzaine Exp $ */
+/* $Id: Register.cpp,v 1.16 2000-12-21 08:02:06 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -142,11 +142,12 @@ void RegisterCallbacks_FD(Widgets_T *w){
register_activate_cb (w->FD.saveAsButt[2], OptionsCb, OPTIONS_SAVE_MSH);
register_activate_cb (w->FD.saveAsButt[3], OptionsCb, OPTIONS_SAVE_UNV);
register_activate_cb (w->FD.saveAsButt[4], OptionsCb, OPTIONS_SAVE_GREF);
- register_activate_cb (w->FD.saveAsButt[5], OptionsCb, OPTIONS_SAVE_GL2PS_SIMPLE);
- register_activate_cb (w->FD.saveAsButt[6], OptionsCb, OPTIONS_SAVE_GL2PS_COMPLEX);
- register_activate_cb (w->FD.saveAsButt[7], OptionsCb, OPTIONS_SAVE_XDUMP);
- register_activate_cb (w->FD.saveAsButt[8], OptionsCb, OPTIONS_SAVE_GL2JPEG);
- register_activate_cb (w->FD.saveAsButt[9], OptionsCb, OPTIONS_SAVE_GL2GIF);
+ register_activate_cb (w->FD.saveAsButt[5], OptionsCb, OPTIONS_SAVE_EPS_SIMPLE);
+ register_activate_cb (w->FD.saveAsButt[6], OptionsCb, OPTIONS_SAVE_EPS_COMPLEX);
+ register_activate_cb (w->FD.saveAsButt[7], OptionsCb, OPTIONS_SAVE_XPM);
+ register_activate_cb (w->FD.saveAsButt[8], OptionsCb, OPTIONS_SAVE_JPEG);
+ register_activate_cb (w->FD.saveAsButt[9], OptionsCb, OPTIONS_SAVE_GIF);
+ register_activate_cb (w->FD.saveAsButt[10], OptionsCb, OPTIONS_SAVE_PPM);
register_ok_cb (w->FD.saveOptionsAsDialog, FileCb, FILE_SAVE_OPTIONS_AS);
register_cancel_cb (w->FD.saveOptionsAsDialog, ManageCb, w->FD.saveOptionsAsDialog);
diff --git a/Unix/Widgets.cpp b/Unix/Widgets.cpp
index be853e15766463342541304dac96b7d308efda1b..5824ece389bd6f57dc7c3f0015a3d67a3562ee0d 100644
--- a/Unix/Widgets.cpp
+++ b/Unix/Widgets.cpp
@@ -1,4 +1,4 @@
-/* $Id: Widgets.cpp,v 1.21 2000-12-20 15:28:48 geuzaine Exp $ */
+/* $Id: Widgets.cpp,v 1.22 2000-12-21 08:02:06 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -667,6 +667,10 @@ void CreateWidgets_FD(Widgets_T *w){
XtSetArg(arg[i], XmNlabelString, XmStringCreateSimple("GIF")); i++;
w->FD.saveAsButt[9] = XmCreatePushButton(w->FD.saveAsPane[0], "MsaveAsButt9", arg, i);
XtManageChild(w->FD.saveAsButt[9]);
+ i=0;
+ XtSetArg(arg[i], XmNlabelString, XmStringCreateSimple("PPM")); i++;
+ w->FD.saveAsButt[10] = XmCreatePushButton(w->FD.saveAsPane[0], "MsaveAsButt10", arg, i);
+ XtManageChild(w->FD.saveAsButt[10]);
i=0;
XtSetArg(arg[i], XmNsubMenuId, w->FD.saveAsPane[0]); i++;
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index 4590a17e4c8ced345f8efcd261d6a3bf7a3b7ea3..09c52b047d91ee5509f9f26d495d864d111a142d 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -2,10 +2,10 @@
.\"
.\" This is the manual page for Gmsh
.\"
-.\" Copyright (c) 2000 J.-F. Remacle, C. Geuzaine
+.\" Copyright (c) 2000-2001 J.-F. Remacle, C. Geuzaine
.\"
.\" ======================================================================
-.TH Gmsh 0.999 "20 December 2000"
+.TH Gmsh 1.00 "1 January 2001"
.UC 4
.\" ======================================================================
.SH NAME
@@ -209,7 +209,7 @@ Remacle (Remacle@scorec.rpi.edu).
.SH SEE ALSO
Gmsh homepage at \fIhttp://www.geuz.org/gmsh/\fR
.PP
-Gmsh example files in \fI/usr/doc/gmsh-0.999/\fR
+Gmsh example files in \fI/usr/doc/gmsh-1.00/\fR
.PP
GetDP (a scientific computation software for the numerical solution of
integro-differential equations, using finite element and integral type
diff --git a/utils/gmsh.spec b/utils/gmsh.spec
index 8e0aaff9699fe0b028e177f1352cb18b0287f23b..737a08c86e1974977e5c82a29b81dde0c2bed5c9 100644
--- a/utils/gmsh.spec
+++ b/utils/gmsh.spec
@@ -1,7 +1,7 @@
Summary: A 3D mesh generator with pre- and post-processing facilities
Name: gmsh
-Version: 0.999
-Source: gmsh-0.999.tar.gz
+Version: 1.00
+Source: gmsh-1.00.tar.gz
Release: 1
Copyright: distributable
Group: Applications/Engineering
diff --git a/www/gmsh.html b/www/gmsh.html
index 4202277838be422bbdb16998ef1a435f990771c0..42eef1214e92e1a8cf4f0943d204d5c6f45285eb 100644
--- a/www/gmsh.html
+++ b/www/gmsh.html
@@ -48,8 +48,8 @@ cat << EOM
page requests since May 24, 1998<br><br>
ENDSCRIPT--->
- Last updated <b>December 20, 2000</b><br><br>
- © 1998-2000 C. Geuzaine, J.-F. Remacle<br>
+ Last updated <b>January 1, 2001</b><br><br>
+ © 1998-2001 C. Geuzaine, J.-F. Remacle<br>
</font></td>
@@ -261,11 +261,11 @@ files.
under Linux) or modify the LD_LIBRARY_PATH (or SHLIB_PATH on HP)
in order for Gmsh to find these libraries.
<p>
- Version 0.999 (20 December 2000):
+ Version 1.00 (1 January 2001):
<ul>
<li>Red Hat package with man page and examples
<ul>
- <li><A href="/gmsh/latest/gmsh-0.999-1.i386.rpm">Linux RPM for Red Hat 6.2 and compatible (i386, glibc 2.1)</A>
+ <li><A href="/gmsh/latest/gmsh-1.00-1.i386.rpm">Linux RPM for Red Hat 6.2 and compatible (i386, glibc 2.1)</A>
</ul>
<li>Tarballs
<ul>
@@ -299,6 +299,8 @@ files.
<td><font face="Helvetica, Arial" size=-1>
+New in 1.00: PPM output;
+<p>
New in 0.999: JPEG output and easy MPEG generation (see t8.geo in the
tutorial); Clean up of export functions; small fixes; Linux versions
are now compiled with gcc 2.95.2, which should fix the problems