diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 4e4e58cf82fdfdfaebdf355d4e97cc703aae1b0c..955900e307055d477485486d6f8b8f26c7654d88 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -188,7 +188,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.149 2003-02-12 20:27:13 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.150 2003-03-02 16:24:18 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
@@ -233,51 +233,51 @@
#include "CreateFile.h"
#include "STL.h"
-List_T *Symbol_L=NULL;
-
-extern Context_T CTX;
-extern Mesh *THEM;
-
-static FILE *yyinTab[MAX_OPEN_FILES];
-static int yylinenoTab[MAX_OPEN_FILES];
-static fpos_t yyposImbricatedLoopsTab[MAX_OPEN_FILES];
-static int yylinenoImbricatedLoopsTab[MAX_OPEN_FILES];
-static double LoopControlVariablesTab[MAX_OPEN_FILES][3];
-static char* LoopControlVariablesNameTab[MAX_OPEN_FILES];
-static char yynameTab[MAX_OPEN_FILES][256];
-static char tmpstring[1024];
-static Symbol TheSymbol, *pSymbol;
-static Surface *STL_Surf;
-static Shape TheShape;
-static int i,j,k,flag,RecursionLevel=0,ImbricatedLoop = 0;
-static int Last_NumberOfPoints = 0;
-static double d, *pd;
-static ExtrudeParams extr;
-static char *str;
-static StringXString *pStrCat;
-static StringXNumber *pNumCat;
-static StringXColor *pColCat;
-static double (*pNumOpt)(int num, int action, double value);
-static char* (*pStrOpt)(int num, int action, char *value);
-static unsigned int (*pColOpt)(int num, int action, unsigned int value);
-static Post_View *View;
-
-char *strsave(char *ptr);
-void yyerror (char *s);
-void yymsg (int type, char *fmt, ...);
-void skip_until (char *skip, char *until);
-int PrintListOfDouble(char *format, List_T *list, char *buffer);
+List_T *Symbol_L = NULL;
+
+extern Context_T CTX;
+extern Mesh *THEM;
+
+static FILE *yyinTab[MAX_OPEN_FILES];
+static int yylinenoTab[MAX_OPEN_FILES];
+static fpos_t yyposImbricatedLoopsTab[MAX_OPEN_FILES];
+static int yylinenoImbricatedLoopsTab[MAX_OPEN_FILES];
+static double LoopControlVariablesTab[MAX_OPEN_FILES][3];
+static char *LoopControlVariablesNameTab[MAX_OPEN_FILES];
+static char yynameTab[MAX_OPEN_FILES][256];
+static char tmpstring[1024];
+static Symbol TheSymbol, *pSymbol;
+static Surface *STL_Surf;
+static Shape TheShape;
+static int i, j, k, flag, RecursionLevel = 0, ImbricatedLoop = 0;
+static int Last_NumberOfPoints = 0;
+static double d, *pd;
+static ExtrudeParams extr;
+static char *str;
+static StringXString *pStrCat;
+static StringXNumber *pNumCat;
+static StringXColor *pColCat;
+static double (*pNumOpt)(int num, int action, double value);
+static char* (*pStrOpt)(int num, int action, char *value);
+static unsigned int (*pColOpt)(int num, int action, unsigned int value);
+static Post_View *View;
+
+char *strsave (char *ptr);
+void yyerror (char *s);
+void yymsg (int type, char *fmt, ...);
+void skip_until (char *skip, char *until);
+int PrintListOfDouble (char *format, List_T *list, char *buffer);
#line 84 "Gmsh.y"
#ifndef YYSTYPE
typedef union {
- char *c;
- int i;
+ char *c;
+ int i;
unsigned int u;
- double d;
- double v[5];
- Shape s;
- List_T *l;
+ double d;
+ double v[5];
+ Shape s;
+ List_T *l;
} yystype;
# define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1
@@ -4929,8 +4929,8 @@ case 53:
case 54:
#line 392 "Gmsh.y"
{
- yymsg(INFO, "Gmsh file format read");
- ;
+ yymsg(INFO, "Gmsh file format read");
+ ;
break;}
case 55:
#line 398 "Gmsh.y"
diff --git a/Parser/Gmsh.tab.hpp b/Parser/Gmsh.tab.hpp
index 2dd3263ec4c3ae00db0b8c84de265ea01124b04d..6d01a9e92d2645dfebbc84cad2d5637a75aac817 100644
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@ -3,13 +3,13 @@
#ifndef YYSTYPE
typedef union {
- char *c;
- int i;
+ char *c;
+ int i;
unsigned int u;
- double d;
- double v[5];
- Shape s;
- List_T *l;
+ double d;
+ double v[5];
+ Shape s;
+ List_T *l;
} yystype;
# define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 4b57a2608893a2956a1cdc40a55979c6ade3e6ce..39ce2ecdac401865759456d335afcdf5b85f5d56 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,6 +1,6 @@
%{
-// $Id: Gmsh.y,v 1.130 2003-02-12 20:27:14 geuzaine Exp $
+// $Id: Gmsh.y,v 1.131 2003-03-02 16:24:18 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
@@ -45,50 +45,50 @@
#include "CreateFile.h"
#include "STL.h"
-List_T *Symbol_L=NULL;
-
-extern Context_T CTX;
-extern Mesh *THEM;
-
-static FILE *yyinTab[MAX_OPEN_FILES];
-static int yylinenoTab[MAX_OPEN_FILES];
-static fpos_t yyposImbricatedLoopsTab[MAX_OPEN_FILES];
-static int yylinenoImbricatedLoopsTab[MAX_OPEN_FILES];
-static double LoopControlVariablesTab[MAX_OPEN_FILES][3];
-static char* LoopControlVariablesNameTab[MAX_OPEN_FILES];
-static char yynameTab[MAX_OPEN_FILES][256];
-static char tmpstring[1024];
-static Symbol TheSymbol, *pSymbol;
-static Surface *STL_Surf;
-static Shape TheShape;
-static int i,j,k,flag,RecursionLevel=0,ImbricatedLoop = 0;
-static int Last_NumberOfPoints = 0;
-static double d, *pd;
-static ExtrudeParams extr;
-static char *str;
-static StringXString *pStrCat;
-static StringXNumber *pNumCat;
-static StringXColor *pColCat;
-static double (*pNumOpt)(int num, int action, double value);
-static char* (*pStrOpt)(int num, int action, char *value);
-static unsigned int (*pColOpt)(int num, int action, unsigned int value);
-static Post_View *View;
-
-char *strsave(char *ptr);
-void yyerror (char *s);
-void yymsg (int type, char *fmt, ...);
-void skip_until (char *skip, char *until);
-int PrintListOfDouble(char *format, List_T *list, char *buffer);
+List_T *Symbol_L = NULL;
+
+extern Context_T CTX;
+extern Mesh *THEM;
+
+static FILE *yyinTab[MAX_OPEN_FILES];
+static int yylinenoTab[MAX_OPEN_FILES];
+static fpos_t yyposImbricatedLoopsTab[MAX_OPEN_FILES];
+static int yylinenoImbricatedLoopsTab[MAX_OPEN_FILES];
+static double LoopControlVariablesTab[MAX_OPEN_FILES][3];
+static char *LoopControlVariablesNameTab[MAX_OPEN_FILES];
+static char yynameTab[MAX_OPEN_FILES][256];
+static char tmpstring[1024];
+static Symbol TheSymbol, *pSymbol;
+static Surface *STL_Surf;
+static Shape TheShape;
+static int i, j, k, flag, RecursionLevel = 0, ImbricatedLoop = 0;
+static int Last_NumberOfPoints = 0;
+static double d, *pd;
+static ExtrudeParams extr;
+static char *str;
+static StringXString *pStrCat;
+static StringXNumber *pNumCat;
+static StringXColor *pColCat;
+static double (*pNumOpt)(int num, int action, double value);
+static char* (*pStrOpt)(int num, int action, char *value);
+static unsigned int (*pColOpt)(int num, int action, unsigned int value);
+static Post_View *View;
+
+char *strsave (char *ptr);
+void yyerror (char *s);
+void yymsg (int type, char *fmt, ...);
+void skip_until (char *skip, char *until);
+int PrintListOfDouble (char *format, List_T *list, char *buffer);
%}
%union {
- char *c;
- int i;
+ char *c;
+ int i;
unsigned int u;
- double d;
- double v[5];
- Shape s;
- List_T *l;
+ double d;
+ double v[5];
+ Shape s;
+ List_T *l;
}
%token <d> tDOUBLE
@@ -307,8 +307,8 @@ StepDataItem :
| tDOUBLE tAFFECT tVECTOR '(' tBIGSTR ',' tDOUBLE ',' FExpr ')' tEND
{
}
- | tDOUBLE tAFFECT tAXIS2_PLACEMENT_3D '(' tBIGSTR ',' tDOUBLE ','
- tDOUBLE ',' tDOUBLE ')' tEND
+ | tDOUBLE tAFFECT tAXIS2_PLACEMENT_3D '(' tBIGSTR ',' tDOUBLE ','
+ tDOUBLE ',' tDOUBLE ')' tEND
{
Add_Axis2_Placement3D ( (int)$1, (int)$9, (int)$11, (int)$7);
}
@@ -390,8 +390,8 @@ GeomFormatList :
}
| GeomFormatList GeomFormat
{
- yymsg(INFO, "Gmsh file format read");
- }
+ yymsg(INFO, "Gmsh file format read");
+ }
;
GeomFormat :
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 7dbd0eef59bfe6d98c076333a1e938735a3240ea..973bbdde4a2d20dc69d3376e12e51c4791bb988f 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.148 2003-02-12 20:27:14 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.149 2003-03-02 16:24:19 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1007,7 +1007,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.148 2003-02-12 20:27:14 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.149 2003-03-02 16:24:19 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
diff --git a/doc/FAQ b/doc/FAQ
index 39b13f34814ce96b6b8e511a0ac816faee3e5c22..46257c2ec6f619cee6003f12be05d8360f7f6053 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,4 +1,4 @@
-This is the Gmsh FAQ - $Date: 2003-03-02 16:10:28 $
+This is the Gmsh FAQ - $Date: 2003-03-02 16:24:19 $
********************************************************************
@@ -8,8 +8,8 @@ Section 1: The basics
Gmsh is an automatic three-dimensional finite element mesh generator,
primarily Delaunay, with built-in pre- and post-processing
-facilities. Its primal design goal was to provide a simple meshing
-tool for academic test cases with parametric input and up to date
+facilities. Its primal design goal is to provide a simple meshing tool
+for academic test cases with parametric input and up to date
visualization capabilities. One of the strengths of Gmsh is its
ability to respect a characteristic length field for the generation of
adapted meshes on lines, surfaces and volumes.
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index 72a23aa45583de9f468f4be172b9a446820b8479..9648cbcb877d14675ac45d89d060b4e6f9c1fc1d 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -1,4 +1,4 @@
-.\" $Id: gmsh.1,v 1.44 2003-01-25 20:31:54 geuzaine Exp $
+.\" $Id: gmsh.1,v 1.45 2003-03-02 16:24:19 geuzaine Exp $
.\" ======================================================================
.TH Gmsh 1 "12 November 2001" "Gmsh > 1.30" "Gmsh Manual Pages"
.UC 4
@@ -11,16 +11,15 @@ with built-in pre- and post-processing facilities
.B gmsh [file(s)] [option(s)]
.\" ======================================================================
.SH DESCRIPTION
-.\" \fIGmsh\fR (pronounced "Gnu-mesh") is an automatic three-dimensional
-\fIGmsh\fR is an automatic three-dimensional
-finite element mesh generator, primarily Delaunay, with built-in pre-
-and post-processing facilities. Its primal goal is to provide a simple
-meshing tool for academic test cases with parametric input and up to
-date visualization capabilities. One of the strengths of \fIGmsh\fR is
-its ability to respect a characteristic length field for the
-generation of adapted meshes on lines, surfaces and volumes. These
-adapted meshes can be mixed with simple structured (transfinite,
-elliptic, etc.) meshes in order to augment the flexibility.
+\fIGmsh\fR is an automatic three-dimensional finite element mesh
+generator, primarily Delaunay, with built-in pre- and post-processing
+facilities. Its primal design goal is to provide a simple meshing tool
+for academic test cases with parametric input and up to date
+visualization capabilities. One of the strengths of \fIGmsh\fR is its
+ability to respect a characteristic length field for the generation of
+adapted meshes on lines, surfaces and volumes. These adapted meshes
+can be mixed with simple structured (transfinite, elliptic, etc.)
+meshes in order to augment the flexibility.
.SS Geometrical entity definition
Parameterized geometries are created by successively defining points,
oriented curves (segments, circles, ellipsis, splines, etc.), oriented
diff --git a/doc/gmsh.html b/doc/gmsh.html
index 80d4e2ac9f242856c7a435c2c7df673badffea21..6bcf45f8a3391264aab201da5ec949e314f1ab3e 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -44,7 +44,7 @@ Gmsh (pronounced "<em>Gnu-mesh</em>") is a <a
href="http://www.gnu.org/copyleft/gpl-faq.html">free</a> automatic
three-dimensional finite element mesh generator, primarily Delaunay,
with built-in pre- and post-processing facilities. Its primal design
-goal was to provide a simple meshing tool for academic test cases with
+goal is to provide a simple meshing tool for academic test cases with
parametric input and up to date visualization capabilities. One of the
strengths of Gmsh is its ability to respect a characteristic length
field for the generation of adapted meshes on lines, surfaces and
diff --git a/utils/gmsh.spec b/utils/gmsh.spec
index 48d077d7fdb49facb7ae6ad7e9b616a1822b9a8a..04a98f770dc2166163e802c02d29dadf8960cef5 100644
--- a/utils/gmsh.spec
+++ b/utils/gmsh.spec
@@ -15,12 +15,12 @@ Prefix: /usr
%description
Gmsh is an automatic three-dimensional finite element mesh generator,
primarily Delaunay, with built-in pre- and post-processing
-facilities. Its primal goal is to provide a simple meshing tool for
-academic test cases with parametric input and up to date visualization
-capabilities. One of the strengths of Gmsh is its ability to respect
-a characteristic length field for the generation of adapted meshes on
-lines, surfaces and volumes. Gmsh requires OpenGL (or Mesa) to be
-installed on your system.
+facilities. Its primal design goal is to provide a simple meshing tool
+for academic test cases with parametric input and up to date
+visualization capabilities. One of the strengths of Gmsh is its
+ability to respect a characteristic length field for the generation of
+adapted meshes on lines, surfaces and volumes. Gmsh requires OpenGL
+(or Mesa) to be installed on your system.
Install Gmsh if you need a simple 3D finite element mesh generator
and/or post-processor.