Les options sont maintenant accessibles partout

Parser/Gmsh.l

-%{ /* $Id: Gmsh.l,v 1.11 2000-12-07 00:55:16 geuzaine Exp $ */
+%{ /* $Id: Gmsh.l,v 1.12 2000-12-07 08:46:27 geuzaine Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -142,7 +142,6 @@ Modulo                  return tModulo ;
 Nurbs			return tNurbs;
 
 Order			return tOrder;
-Options                 return tOptions;
 
 Physical                return tPhysical;
 Pi                      return tPi;

Parser/Gmsh.tab.cpp.h

@@ -7,87 +7,86 @@ typedef union {
   Shape    s;
   List_T  *l;
 } YYSTYPE;
-#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	tAtan	273
-#define	tAtan2	274
-#define	tSinh	275
-#define	tCosh	276
-#define	tTanh	277
-#define	tFabs	278
-#define	tFloor	279
-#define	tCeil	280
-#define	tFmod	281
-#define	tModulo	282
-#define	tHypot	283
-#define	tPrintf	284
-#define	tPoint	285
-#define	tCircle	286
-#define	tEllipsis	287
-#define	tLine	288
-#define	tSurface	289
-#define	tSpline	290
-#define	tVolume	291
-#define	tCharacteristic	292
-#define	tLength	293
-#define	tParametric	294
-#define	tElliptic	295
-#define	tPlane	296
-#define	tRuled	297
-#define	tTransfinite	298
-#define	tComplex	299
-#define	tPhysical	300
-#define	tUsing	301
-#define	tBump	302
-#define	tProgression	303
-#define	tRotate	304
-#define	tTranslate	305
-#define	tSymmetry	306
-#define	tDilate	307
-#define	tExtrude	308
-#define	tDuplicata	309
-#define	tLoop	310
-#define	tInclude	311
-#define	tRecombine	312
-#define	tDelete	313
-#define	tCoherence	314
-#define	tView	315
-#define	tAttractor	316
-#define	tLayers	317
-#define	tScalarTetrahedron	318
-#define	tVectorTetrahedron	319
-#define	tTensorTetrahedron	320
-#define	tScalarTriangle	321
-#define	tVectorTriangle	322
-#define	tTensorTriangle	323
-#define	tScalarLine	324
-#define	tVectorLine	325
-#define	tTensorLine	326
-#define	tScalarPoint	327
-#define	tVectorPoint	328
-#define	tTensorPoint	329
-#define	tBSpline	330
-#define	tNurbs	331
-#define	tOrder	332
-#define	tWith	333
-#define	tBounds	334
-#define	tKnots	335
-#define	tColor	336
-#define	tOptions	337
+#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	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	tPoint	286
+#define	tCircle	287
+#define	tEllipsis	288
+#define	tLine	289
+#define	tSurface	290
+#define	tSpline	291
+#define	tVolume	292
+#define	tCharacteristic	293
+#define	tLength	294
+#define	tParametric	295
+#define	tElliptic	296
+#define	tPlane	297
+#define	tRuled	298
+#define	tTransfinite	299
+#define	tComplex	300
+#define	tPhysical	301
+#define	tUsing	302
+#define	tBump	303
+#define	tProgression	304
+#define	tRotate	305
+#define	tTranslate	306
+#define	tSymmetry	307
+#define	tDilate	308
+#define	tExtrude	309
+#define	tDuplicata	310
+#define	tLoop	311
+#define	tInclude	312
+#define	tRecombine	313
+#define	tDelete	314
+#define	tCoherence	315
+#define	tView	316
+#define	tAttractor	317
+#define	tLayers	318
+#define	tScalarTetrahedron	319
+#define	tVectorTetrahedron	320
+#define	tTensorTetrahedron	321
+#define	tScalarTriangle	322
+#define	tVectorTriangle	323
+#define	tTensorTriangle	324
+#define	tScalarLine	325
+#define	tVectorLine	326
+#define	tTensorLine	327
+#define	tScalarPoint	328
+#define	tVectorPoint	329
+#define	tTensorPoint	330
+#define	tBSpline	331
+#define	tNurbs	332
+#define	tOrder	333
+#define	tWith	334
+#define	tBounds	335
+#define	tKnots	336
+#define	tColor	337
 #define	tFor	338
 #define	tEndFor	339
 #define	tScript	340

Parser/Makefile

-# $Id: Makefile,v 1.5 2000-12-05 15:23:57 geuzaine Exp $
+# $Id: Makefile,v 1.6 2000-12-07 08:46:27 geuzaine Exp $
 #
 # Makefile for "libParser.a"
 #
@@ -68,4 +68,4 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Geo/DataBase.h \
  ../Mesh/Create.h ../Common/Views.h ../Graphics/ColorTable.h \
  ../Geo/StepGeomDatabase.h ../Common/Options.h ../Graphics/Draw.h \
- ../Common/Colors.h Parser.h
+ ../Common/Colors.h Parser.h ../Unix/Main.h

demos/demo-02.geo

@@ -41,9 +41,7 @@ Physical Volume (1) = {41} ;
    main window, print the file in 'geo' format, or add '-0' on the command
    line to get the full list of available options. */
 
-Options{
-  General.Rotation0 = 10;
-  General.Color.Background = Red;
-  Geometry.Color.Points = Orange;
-}
+General.Rotation0 = 10;
+General.Color.Background = Red;
+Geometry.Color.Points = Orange;
 

demos/demo-06.geo

@@ -160,45 +160,32 @@ Physical Surface (711) = {66} ;
    widget). GUI colors and fonts can be changed in a standard X
    resource file (.gmshrc in your home directory). */
 
-Options{
-  General{
-    Color{
-      Background = {39, 64, 139} ;
-      Axes =  OrangeRed1; // Color names are the classical X11 names
-      SmallAxes = LightGray;
-      Text = Gray88 ;
-    }
-  }
-  Geometry{
-    Color{
-      Points = Yellow;
-      Lines = {255, 255, 255, 128} ; // semi-transparent white
-      Surfaces = {Orange, 60} ; // almost transparent orange
-      Volumes = Green ;
-      PointsSelect = White ;
-      LinesSelect = White ;
-      SurfacesSelect = White ;
-    }
-  }
-  Mesh{
-    Color{
-      Points = Black;
-      PointsSupp = Orchid;
-      Lines = Black;
-      // Color cycle for volume mesh
-      One = Gray10 ;
-      Two = Gray20 ;
-      Three = Gray30 ;
-      Four = Gray40 ;
-      Five = Gray50 ;
-      Six = Gray60 ;
-      Seven = Gray70 ;
-      Eight = Gray80 ;
-      Nine = Gray90 ;
-      Ten = Black ;
-    }
-  }
-}
+General.Color.Background = {39, 64, 139} ;
+General.Color.Axes =  OrangeRed1; // Color names are the classical X11 names
+General.Color.SmallAxes = LightGray;
+General.Color.Text = Gray88 ;
+
+Geometry.Color.Points = Yellow;
+Geometry.Color.Lines = {255, 255, 255, 128} ; // semi-transparent white
+Geometry.Color.Surfaces = {Orange, 60} ; // almost transparent orange
+Geometry.Color.Volumes = Green ;
+Geometry.Color.PointsSelect = White ;
+Geometry.Color.LinesSelect = White ;
+Geometry.Color.SurfacesSelect = White ;
+
+Mesh.Color.Points = Black;
+Mesh.Color.PointsSupp = Orchid;
+Mesh.Color.Lines = Black;
+Mesh.Color.One = Gray10 ;
+Mesh.Color.Two = Gray20 ;
+Mesh.Color.Three = Gray30 ;
+Mesh.Color.Four = Gray40 ;
+Mesh.Color.Five = Gray50 ;
+Mesh.Color.Six = Gray60 ;
+Mesh.Color.Seven = Gray70 ;
+Mesh.Color.Eight = Gray80 ;
+Mesh.Color.Nine = Gray90 ;
+Mesh.Color.Ten = Black ;
 
 /* README: X resources can be specified in a '.gmshrc' in your home
    directory or app-defaults directory, or in your .Xdefaults file.