diff --git a/Common/Options.cpp b/Common/Options.cpp
index 521c4ecc116226ec9953ad492c3739cf085705a9..4a8312e251400919c9bcae46ff55fcf52380c465 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.105 2003-04-14 21:34:52 geuzaine Exp $
+// $Id: Options.cpp,v 1.106 2003-04-15 18:32:01 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -666,7 +666,7 @@ void Print_ColorOptionsDoc(StringXColor s[], char *prefix, FILE * file)
UNPACK_RED(s[i].function(0, GMSH_GET, 0)),
UNPACK_GREEN(s[i].function(0, GMSH_GET, 0)),
UNPACK_BLUE(s[i].function(0, GMSH_GET, 0)));
- fprintf(file, "Saved in: @code{%s})\n\n", Get_OptionSaveLevel(s[i].level));
+ fprintf(file, "Saved in: @code{%s}\n\n", Get_OptionSaveLevel(s[i].level));
i++;
}
}
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index cafa4920e2e1516ed77960dfa6865f818ba6b924..04103d8a41442d192b01e0fdaf3eb03d9af91e0a 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.19 2003-04-15 15:49:03 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.20 2003-04-15 18:32:01 geuzaine Exp $
@c
@c Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
@c
@@ -579,8 +579,8 @@ ASCII files, parser, blabla
@cindex Comments
@cindex File, comment
-@tindex /*, */
-@tindex //
+@findex /*, */
+@findex //
Both C and C++ style comments are supported and can be used in the input
data file to comment selected text regions:
@@ -615,15 +615,7 @@ inside all Gmsh expressions.
@cindex Numbers, integer
@cindex String
-@tindex Pi
-@tindex MPI_Rank
-@tindex MPI_Size
-@tindex newp
-@tindex newc
-@tindex news
-@tindex newv
-@tindex newreg
-@tindex =
+@findex =
The two constant types used in Gmsh are @var{real} and @var{string} (there
is no integer type). These types have the same meaning and syntax as in the
@@ -682,23 +674,41 @@ expressions. The syntax for the definition of expression identifiers is:
@example
@var{expression-id}:
- @var{string} |
- Pi |
- MPI_Rank | MPI_Size |
- newp | newl | news | newv | newreg
+ @var{string}
@var{expression-def}:
@var{expression-list-item} |
@{ @var{expression-list} @}
@end example
-The only expressions predefined in Gmsh are @code{Pi} (=
-3.1415926535897932), @code{MPI_Size} (which returns the number of processors
-on which Gmsh is running), @code{MPI_Rank} (which returns the rank of the
-current processor), @code{newp} (returns the next available point number),
-@code{newc} (returns the next available curve number), @code{news} (returns
-the next available surface number), @code{newv} (returns the next available
-volume number) and @code{newreg} (returns the next available region number).
+Several @var{expression-id} are predefined:
+@ftable @code
+@item Pi
+returns 3.1415926535897932.
+
+@item MPI_Size
+returns the number of processors on which Gmsh is running.
+
+@item MPI_Rank
+returns the rank of the current processor.
+
+@item newp
+returns the next available point number.
+
+@item newl
+returns the next available curvet number.
+
+@item news
+returns the next available surface number.
+
+@item newv
+returns the next available volume number.
+
+@item newreg
+returns the next available region number (that is, the max of @code{newp},
+@code{newc}, @code{news}, @code{newv} and all physical entity numbers).
+
+@end ftable
Character expressions can also be defined (but there exists no character
expression identifier at the moment):
@@ -706,9 +716,9 @@ expression identifier at the moment):
@example
@var{expression-char}:
"@var{string}" |
- StrPrefix[ @var{expression-char} ] |
- StrCat[ @var{expression-char} , @var{expression-char} ] |
- Sprintf[ @var{expression-char} , @var{expression-list} ]
+ StrPrefix ( @var{expression-char} ) |
+ StrCat ( @var{expression-char} , @var{expression-char} ) |
+ Sprintf ( @var{expression-char} , @var{expression-list} )
@end example
@noindent The third casein this definition permits to take the
@@ -755,8 +765,6 @@ Exponentiation. The evaluation of the both arguments must result in a scalar
value.
@item *
Multiplication or scalar product, depending on the type of the arguments.
-@item /\
-Cross product. The evaluation of both arguments must result in vectors.
@item /
Division.
@item %
@@ -821,22 +829,25 @@ argument (located after @code{:}) is evaluated and returned.
@cindex Operation, priorities
@cindex Priorities, operations
-@tindex ()
+@findex ()
The evaluation priorities are summarized below (from stronger to weaker,
-i.e.@: @code{^} has the highest evaluation priority). Parentheses
-@code{()} may be used anywhere to change the order of evaluation.
+i.e.@: @code{*} has a highest evaluation priority than
+@code{+}). Parentheses @code{()} may be used anywhere to change the order of
+evaluation:
@table @code
+@item ()
@item ^
-@item - (unary), !
-@item /\
-@item *, /, %
-@item +, -
-@item <, >, <=, >=
-@item !=, ==
-@item &&, ||
+@item ! ++ -- -unary
+@item * / %
+@item + -
+@item < <= > >=
+@item == !=
+@item &&
+@item ||
@item ?:
+@item = += -= *= /=
@end table
@@ -861,69 +872,69 @@ implemented:
@ftable @code
-@item Acos[ @var{expression} ]
+@item Acos ( @var{expression} )
Arc cosine (inverse cosine) of @var{expression} in [0,Pi], @var{expression} in [-1,1].
-@item Asin[ @var{expression} ]
+@item Asin ( @var{expression} )
Arc sine (inverse sine) of @var{expression} in [-Pi/2,Pi/2], @var{expression} in [-1,1].
-@item Atan[ @var{expression} ]
+@item Atan ( @var{expression} )
Arc tangent (inverse tangent) of @var{expression} in [-Pi/2,Pi/2].
-@item Atan2[ @var{expression}, @var{expression} ]
+@item Atan2 ( @var{expression}, @var{expression} )
Arc tangent (inverse tangent) of the first @var{expression} divided by the
second, in [-Pi,Pi].
-@item Ceil[ @var{expression} ]
+@item Ceil ( @var{expression} )
XXX
-@item Cos[ @var{expression} ]
+@item Cos ( @var{expression} )
Cosine of @var{expression}.
-@item Cosh[ @var{expression} ]
+@item Cosh ( @var{expression} )
Hyperbolic cosine of @var{expression}.
-@item Exp[ @var{expression} ]
+@item Exp ( @var{expression} )
Exponential function: e^@var{expression}.
-@item Fabs[ @var{expression} ]
+@item Fabs ( @var{expression} )
Absolute value of @var{expression}.
-@item Fmod[ @var{expression}, @var{expression} ]
+@item Fmod ( @var{expression}, @var{expression} )
Remainder of the division of the first @var{expression} by the second, with
the sign of the first.
-@item Floor[ @var{expression} ]
+@item Floor ( @var{expression} )
XXX
-@item Hypot[ @var{expression}, @var{expression} ]
+@item Hypot ( @var{expression}, @var{expression} )
XXX
-@item Log[ @var{expression} ]
+@item Log ( @var{expression} )
Natural logarithm: ln(@var{expression}), @var{expression}>0.
-@item Log10[ @var{expression} ]
+@item Log10 ( @var{expression} )
Base 10 logarithm: log10(@var{expression}), @var{expression}>0.
-@item Modulo[ @var{expression} ]
+@item Modulo ( @var{expression} )
XXX
@item Rand
XXX
-@item Sqrt[ @var{expression} ]
+@item Sqrt ( @var{expression} )
Square root, @var{expression}>=0.
-@item Sin[ @var{expression} ]
+@item Sin ( @var{expression} )
Sine of @var{expression}.
-@item Sinh[ @var{expression} ]
+@item Sinh ( @var{expression} )
Hyperbolic sine of @var{expression}.
-@item Tan[ @var{expression} ]
+@item Tan ( @var{expression} )
Tangent of @var{expression}.
-@item Tanh[ @var{expression} ]
+@item Tanh ( @var{expression} )
Hyperbolic tangent of @var{expression}.
@end ftable
@@ -999,7 +1010,7 @@ The body enclised between @code{If} and @code{Endif} is evaluated if
@item Exit;
Aborts the current script.
-@item Printf[ @var{expression-char} , @var{expression-list} ]
+@item Printf ( @var{expression-char} , @var{expression-list} );
Equivalent of the @code{printf} C function (@var{expression-char} is a
format string that can contain floating point formatting characters:
@code{%f}, @code{%e}, etc.).
@@ -1007,7 +1018,7 @@ format string that can contain floating point formatting characters:
@item Merge @var{expression-char};
To merge a file.
-@item MergeWithBoundingBox string;
+@item MergeWithBoundingBox @var{expression-char};
To merge a file and force the recalculation of the scene's bounding box.
@item Draw;
@@ -1096,7 +1107,7 @@ To include the file @var{expression-char}.
@item Duplicata
@item Ellipsis
-(synonym: Ellipse)
+(synonym: @code{Ellipse})
@item Intersect
@@ -1135,7 +1146,7 @@ To include the file @var{expression-char}.
@item Trimmed
@item Volume
-(synonym: Complex Volume)
+(synonym: @code{Complex Volume})
@end ftable
diff --git a/doc/texinfo/gpl.texi b/doc/texinfo/gpl.texi
index 3f3765f91adbbdd5bdae74320c7e8e0c0e84e226..3b2cbf2790ff0ba4e8f08082dbe38d63ad128e11 100644
--- a/doc/texinfo/gpl.texi
+++ b/doc/texinfo/gpl.texi
@@ -60,7 +60,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-@heading TERMS AND CONDITIONS FOR COPYING,@* DISTRIBUTION AND MODIFICATION
+@heading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@enumerate 0
@item
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 22affede3c94ee737979e136ae68743096f8258f..4f50d87d6f012e9a129dc4828cca9c858ad5910c 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -612,26 +612,26 @@ Saved in: @code{General.OptionsFileName}
@item General.Color.Background
Background color@*
Default value: @code{@{0,0,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item General.Color.Foreground
Foreground color@*
Default value: @code{@{255,255,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item General.Color.Text
Text color@*
Default value: @code{@{255,255,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item General.Color.Axes
Axes color@*
Default value: @code{@{255,255,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item General.Color.SmallAxes
Small axes color@*
Default value: @code{@{255,255,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@end ftable
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index cd6efda3a9cb780a6bcad28697b25bc64f8f2b1c..58bebdd54175a0b897a864a722be6d57bc6494d5 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -127,71 +127,71 @@ Saved in: @code{General.OptionsFileName}
@item Geometry.Color.Points
Normal geometry point color@*
Default value: @code{@{178,182,129@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.Lines
Normal geometry curve color@*
Default value: @code{@{0,0,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.Surfaces
Normal geometry surface color@*
Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.Volumes
Normal geometry volume color@*
Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.PointsSelect
Selected geometry point color@*
Default value: @code{@{255,0,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.LinesSelect
Selected geometry curve color@*
Default value: @code{@{255,0,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.SurfacesSelect
Selected geometry surface color@*
Default value: @code{@{255,0,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.VolumesSelect
Selected geometry volume color@*
Default value: @code{@{255,0,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.PointsHighlight
Highlighted geometry point color@*
Default value: @code{@{0,255,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.LinesHighlight
Highlighted geometry curve color@*
Default value: @code{@{0,0,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.SurfacesHighlight
Highlighted geometry surface color@*
Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.VolumesHighlight
Highlighted geometry volume color@*
Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.Tangents
Tangent geometry vectors color@*
Default value: @code{@{255,255,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Geometry.Color.Normals
Normal geometry vectors color@*
Default value: @code{@{255,0,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@end ftable
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 5e35895ea3ba35f8295ad234659afe5fd00a280a..190f76838880d619e326bfc6c0e5e7c86fbe58b4 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -262,106 +262,106 @@ Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Points
Mesh vertex color@*
Default value: @code{@{0,123,59@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.PointsSupp
Mesh high order vertex color@*
Default value: @code{@{255,0,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Lines
Mesh line color@*
Default value: @code{@{0,255,0@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Triangles
Mesh triangle color (if ColorCarousel=0)@*
Default value: @code{@{160,150,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Quadrangles
Mesh quadrangle color (if ColorCarousel=0)@*
Default value: @code{@{130,120,225@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Tetrahedra
Mesh tetrahedron color (if ColorCarousel=0)@*
Default value: @code{@{160,150,255@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Hexahedra
Mesh hexahedron color (if ColorCarousel=0)@*
Default value: @code{@{130,120,225@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Prisms
Mesh prism color (if ColorCarousel=0)@*
Default value: @code{@{232,210,23@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Pyramids
Mesh pyramid color (if ColorCarousel=0)@*
Default value: @code{@{217,113,38@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Tangents
Tangent mesh vector color@*
Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Normals
Normal mesh vector color@*
Default value: @code{@{128,128,128@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.One
First color in color carousel@*
Default value: @code{@{232,210,23@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Two
Second color in color carousel@*
Default value: @code{@{226,167,29@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Three
Third color in color carousel@*
Default value: @code{@{217,113,38@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Four
Fourth color in color carousel@*
Default value: @code{@{201,54,54@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Five
Fifth color in color carousel@*
Default value: @code{@{169,12,86@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Six
Sixth color in color carousel@*
Default value: @code{@{114,2,141@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Seven
Seventh color in color carousel@*
Default value: @code{@{67,30,188@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Eight
Eighth color in color carousel@*
Default value: @code{@{44,86,211@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Nine
Ninth color in color carousel@*
Default value: @code{@{32,145,223@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Ten
tenth color in color carousel@*
Default value: @code{@{25,193,230@}}@*
-Saved in: @code{General.OptionsFileName})
+Saved in: @code{General.OptionsFileName}
@end ftable
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index 0b3b868e31b8b7c3b69feb3ed8f2c8ca2aeb1c3e..9fd73afaf36be4a7e1bf95ece87b3af682bac00e 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -6,9 +6,9 @@ Saved in: @code{General.OptionsFileName}
@item Solver.Help0
Help string for solver 0@*
-Default value: @code{"A General environment for the treatment of Discrete
-Problems. Copyright (c) 1997-2003 Patrick Dular and Christophe
-Geuzaine. Visit http://www.geuz.org/getdp/ for more info"}@*
+Default value: @code{"A General environment for the treatment of
+Discrete Problems. Copyright (c) 1997-2003 Patrick Dular and Christophe Geuzaine.
+Visit http://www.geuz.org/getdp/ for more info"}@*
Saved in: @code{General.OptionsFileName}
@item Solver.Executable0