diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index e068f1c53acabad7164c14500d992e26a2590e80..9b43390f1499c4c606049182ad75e2c58efc1d5a 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,4 +1,4 @@
-// $Id: CommandLine.cpp,v 1.17 2003-04-14 22:37:07 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.18 2003-04-19 22:11:42 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -96,7 +96,7 @@ void Print_Usage(char *name){
Msg(DIRECT, "Display options:");
Msg(DIRECT, " -nodb disable double buffering");
Msg(DIRECT, " -fontsize int specify the font size for the GUI (default: 12)");
- Msg(DIRECT, " -theme string specify GUI theme");
+ Msg(DIRECT, " -scheme string specify FLTK scheme");
Msg(DIRECT, " -alpha enable alpha blending");
Msg(DIRECT, " -notrack don't use trackball mode for rotations");
Msg(DIRECT, " -display string specify display");
@@ -574,7 +574,7 @@ void Get_Options(int argc, char *argv[], int *nbfiles)
exit(1);
}
}
- else if(!strcmp(argv[i] + 1, "theme")) {
+ else if(!strcmp(argv[i] + 1, "scheme")) {
i++;
if(argv[i] != NULL) {
CTX.theme = argv[i];
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 6b1b86a71f3adb49acb23230b10af6f464fed0cb..b61a4a34ccbb113954968eea26841f91165086fe 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -49,21 +49,21 @@ StringXString GeneralOptions_String[] = {
"File into which the log is saved if a fatal error occurs" },
{ F|S, "OptionsFileName" , opt_general_options_filename , ".gmsh-options" ,
- "File created in your home directory with `Tools->Options->Save', and which is read on startup" },
+ "Option file created with `Tools->Options->Save'; automatically read on startup" },
{ 0, "SessionFileName" , opt_general_session_filename , ".gmshrc" ,
- "File into which session specific information is saved, and which is read on startup" },
+ "Option file into which session specific information is saved; automatically read on startup" },
#if defined(WIN32)
{ F|O, "TextEditor" , opt_general_editor , "notepad.exe %s" ,
#else
{ F|O, "TextEditor" , opt_general_editor , "emacs %s &" ,
#endif
- "System command to launch a text editor" },
+ "System command to launch a text editor (OS-dependent)" },
{ F|O, "Theme" , opt_general_theme , "" ,
- "Graphical user interface theme (try e.g. plastic)" },
+ "FLTK graphical user interface theme (try e.g. plastic)" },
{ F|S, "TmpFileName" , opt_general_tmp_filename , ".gmsh-tmp" ,
- "Temporary file (created in your home directory)" },
+ "Temporary file used by the geometry module" },
{ 0, NULL , NULL , NULL , NULL }
} ;
@@ -90,7 +90,7 @@ StringXString SolverOptions_String[] = {
#else
"getdp" ,
#endif
- "System command to launch solver 0 (should _not_ contain the `&' character)" },
+ "System command to launch solver 0 (should not contain the `&' character)" },
{ F|O, "Extension0" , opt_solver_extension0 , ".pro" ,
"Default file name extension for solver 0" },
{ F|O, "MeshName0" , opt_solver_mesh_name0 , "" ,
@@ -135,7 +135,7 @@ StringXString SolverOptions_String[] = {
{ F|O, "Help1" , opt_solver_help1 , "" ,
"Help string for solver 1" },
{ F|O, "Executable1" , opt_solver_executable1 , "" ,
- "System command to launch solver 1 (should _not_ contain the `&' character)" },
+ "System command to launch solver 1 (should not contain the `&' character)" },
{ F|O, "Extension1" , opt_solver_extension1 , "" ,
"Default file name extension for solver 1" },
{ F|O, "MeshName1" , opt_solver_mesh_name1 , "" ,
@@ -180,7 +180,7 @@ StringXString SolverOptions_String[] = {
{ F|O, "Help2" , opt_solver_help2 , "" ,
"Help string for solver 2" },
{ F|O, "Executable2" , opt_solver_executable2 , "" ,
- "System command to launch solver 2 (should _not_ contain the `&' character)" },
+ "System command to launch solver 2 (should not contain the `&' character)" },
{ F|O, "Extension2" , opt_solver_extension2 , "" ,
"Default file name extension for solver 2" },
{ F|O, "MeshName2" , opt_solver_mesh_name2 , "" ,
@@ -225,7 +225,7 @@ StringXString SolverOptions_String[] = {
{ F|O, "Help3" , opt_solver_help3 , "" ,
"Help string for solver 3" },
{ F|O, "Executable3" , opt_solver_executable3 , "" ,
- "System command to launch solver 3 (should _not_ contain the `&' character)" },
+ "System command to launch solver 3 (should not contain the `&' character)" },
{ F|O, "Extension3" , opt_solver_extension3 , "" ,
"Default file name extension for solver 3" },
{ F|O, "MeshName3" , opt_solver_mesh_name3 , "" ,
@@ -270,7 +270,7 @@ StringXString SolverOptions_String[] = {
{ F|O, "Help4" , opt_solver_help4 , "" ,
"Help string for solver 4" },
{ F|O, "Executable4" , opt_solver_executable4 , "" ,
- "System command to launch solver 4 (should _not_ contain the `&' character)" },
+ "System command to launch solver 4 (should not contain the `&' character)" },
{ F|O, "Extension4" , opt_solver_extension4 , "" ,
"Default file name extension for solver 4" },
{ F|O, "MeshName4" , opt_solver_mesh_name4 , "" ,
@@ -324,12 +324,12 @@ StringXString ViewOptions_String[] = {
"Abscissa number format for 2D graphs (in standard C form)" },
{ F, "FileName" , opt_view_filename , "" ,
- "Default file name to assign to the post-processing view" },
+ "Default post-processing view file name" },
{ F|O, "Format" , opt_view_format , "%.3e" ,
"Number format (in standard C form)" },
{ F, "Name" , opt_view_name , "" ,
- "Default name to assign to the post-processing view" },
+ "Default post-processing view name" },
{ 0, NULL , NULL , NULL , NULL }
} ;
@@ -420,7 +420,7 @@ StringXNumber GeneralOptions_Number[] = {
"Use a double buffered graphic window (on Unix, should be set to 0 when working on a remote host without GLX)" },
{ F|O, "FastRedraw" , opt_general_fast_redraw , 1. ,
- "Fast redraw (no mesh or view display) when moving the model" },
+ "Fast redraw (no mesh or view display) when interacting with the model" },
{ F|S, "FontSize" , opt_general_fontsize , 12. ,
"Size of the font in the graphical user interface" },
@@ -533,9 +533,9 @@ StringXNumber GeneralOptions_Number[] = {
"Z coordinate of the center of rotation" },
{ F|S, "SaveOptions" , opt_general_options_save, 0. ,
- "Automatically save all current options each time you quit Gmsh?" },
+ "Automatically save current options in General.OptionsFileName each time you quit Gmsh?" },
{ F|S, "SaveSession" , opt_general_session_save, 1. ,
- "Automatically save session specific information each time you quit Gmsh?" },
+ "Automatically save session specific information in General.SessionFileName each time you quit Gmsh?" },
{ F, "ScaleX" , opt_general_scale0 , 1.0 ,
"X-axis scale factor" },
{ F, "ScaleY" , opt_general_scale1 , 1.0 ,
@@ -547,9 +547,9 @@ StringXNumber GeneralOptions_Number[] = {
{ F|O, "SmallAxes" , opt_general_small_axes , 1. ,
"Display the small axes" },
{ F|O, "SmallAxesPositionX" , opt_general_small_axes_position0 , -45. ,
- "X position of small axes (negative values for right alignment)" },
+ "X position of small axes (use negative values for right alignment)" },
{ F|O, "SmallAxesPositionY" , opt_general_small_axes_position1 , -35. ,
- "Y position of small axes (negative values for bottom alignment)" },
+ "Y position of small axes (use negative values for bottom alignment)" },
{ F|S, "StatisticsPositionX" , opt_general_statistics_position0 , 650. ,
"Horizontal position (in pixels) of the upper left corner of the statistic window" },
{ F|S, "StatisticsPositionY" , opt_general_statistics_position1 , 150. ,
@@ -566,13 +566,13 @@ StringXNumber GeneralOptions_Number[] = {
{ F|O, "Trackball" , opt_general_trackball , 1. ,
"Use trackball rotation mode" },
{ F, "TrackballQuaternion0" , opt_general_quaternion0 , 0.0 ,
- "First trackball quaternion component (used if Trackball=1)" },
+ "First trackball quaternion component (used if General.Trackball=1)" },
{ F, "TrackballQuaternion1" , opt_general_quaternion1 , 0.0 ,
- "Second trackball quaternion component (used if Trackball=1)" },
+ "Second trackball quaternion component (used if General.Trackball=1)" },
{ F, "TrackballQuaternion2" , opt_general_quaternion2 , 0.0 ,
- "Third trackball quaternion component (used if Trackball=1)" },
+ "Third trackball quaternion component (used if General.Trackball=1)" },
{ F, "TrackballQuaternion3" , opt_general_quaternion3 , 1.0 ,
- "Fourth trackball quaternion component (used if Trackball=1)" },
+ "Fourth trackball quaternion component (used if General.Trackball=1)" },
{ F, "TranslationX" , opt_general_translation0 , 0.0 ,
"X-axis translation (in model units)" },
{ F, "TranslationY" , opt_general_translation1 , 0.0 ,
@@ -618,7 +618,7 @@ StringXNumber GeometryOptions_Number[] = {
{ F|O, "LineSelectWidth" , opt_geometry_line_sel_width , 2. ,
"Display width of selected lines (in pixels)" },
{ F|O, "LineType" , opt_geometry_line_type , 0. ,
- "Display lines as solid color segments or 3D cylinders" },
+ "Display lines as solid color segments (0) or 3D cylinders (1)" },
{ F|O, "LineWidth" , opt_geometry_line_width , 1.0 ,
"Display width of lines (in pixels)" },
@@ -639,7 +639,7 @@ StringXNumber GeometryOptions_Number[] = {
{ F|O, "PointSize" , opt_geometry_point_size , 3. ,
"Display size of points (in pixels)" },
{ F|O, "PointType" , opt_geometry_point_type , 0. ,
- "Display points as solid color dots or 3D spheres" },
+ "Display points as solid color dots (0) or 3D spheres (1)" },
{ F|O, "ScalingFactor" , opt_geometry_scaling_factor , 1.0 ,
"Global geometry scaling factor" },
@@ -670,7 +670,7 @@ StringXNumber MeshOptions_Number[] = {
{ F|O, "CharacteristicLengthFactor" , opt_mesh_lc_factor , 1.0 ,
"Factor applied to all characteristic lengths (and background meshes)" },
{ F|O, "ColorCarousel" , opt_mesh_color_carousel , 1. ,
- "Use a `color by region number' scheme" },
+ "Use a `color by region number' coloring scheme" },
{ F|O, "ColorScheme" , opt_mesh_color_scheme , 0. ,
"Default mesh color scheme (0, 1 or 2)" },
{ F|O, "ConstrainedBackgroundMesh" , opt_mesh_constrained_bgmesh, 0. ,
@@ -707,14 +707,14 @@ StringXNumber MeshOptions_Number[] = {
"Only display elements whose Gamma factor is smaller than GammaSup" },
{ F|O, "Interactive" , opt_mesh_interactive , 0. ,
- "Show the construction of the 2D mesh in real time (only with the anisotropic algorithm)" },
+ "Show the construction of the 2D mesh in real time (only with the 2D anisotropic algorithm)" },
{ F|O, "Lines" , opt_mesh_lines , 1. ,
"Display mesh vertices on curves?" },
{ F|O, "LinesNumbers" , opt_mesh_lines_num , 0. ,
"Display mesh line numbers?" },
{ F|O, "LineType" , opt_mesh_line_type , 0. ,
- "Display lines as solid color segments or 3D cylinders" },
+ "Display lines as solid color segments (0) or 3D cylinders (1)" },
{ F|O, "LineWidth" , opt_mesh_line_width , 1.0 ,
"Display width of lines (in pixels)" },
@@ -741,13 +741,13 @@ StringXNumber MeshOptions_Number[] = {
{ F|O, "Points" , opt_mesh_points , 1. ,
"Display mesh vertices?" },
{ F|O, "PointInsertion" , opt_mesh_point_insertion, CENTER_CIRCCIRC ,
- "Point insertion method for isotropic 2D algorithm (1=center of circ. circle, 2=voronoi, 3=cog)" },
+ "Point insertion method for isotropic 2D algorithm (1=center of circumscribed circle, 2=voronoi, 3=cog)" },
{ F|O, "PointsNumbers" , opt_mesh_points_num , 0. ,
- "Display mesh vertices numbers?" },
+ "Display mesh vertex numbers?" },
{ F|O, "PointSize" , opt_mesh_point_size , 2. ,
"Display size of points (in pixels)" },
{ F|O, "PointType" , opt_mesh_point_type , 0. ,
- "Display points as solid color dots or 3D spheres" },
+ "Display points as solid color dots (0) or 3D spheres (1)" },
{ F|O, "Quality" , opt_mesh_quality , 0.0 ,
"Target quality for tetrahedral elements (not fully functional)" },
@@ -828,9 +828,9 @@ StringXNumber SolverOptions_Number[] = {
StringXNumber PostProcessingOptions_Number[] = {
{ F|O, "AnimationDelay" , opt_post_anim_delay , 0.25 ,
- "Delay (in seconds) between to animation frames" },
+ "Delay (in seconds) between frames in automatic animation mode" },
{ F|O, "AnimationCycle" , opt_post_anim_cycle , 0. ,
- "Cycle through views instead of time steps for the animation" },
+ "Cycle through views instead of time steps in automatic animation mode" },
{ F|O, "DisplayLists" , opt_post_display_lists , 0. ,
"Use OpenGL display lists for drawing post-processing views" },
@@ -851,23 +851,23 @@ StringXNumber PostProcessingOptions_Number[] = {
StringXNumber ViewOptions_Number[] = {
{ F|O, "AngleSmoothNormals" , opt_view_angle_smooth_normals , 15. ,
- "Threshold angle below which we do not smooth the normals" },
+ "Threshold angle below which normals are not smoothed" },
{ F|O, "ArrowLocation" , opt_view_arrow_location , DRAW_POST_LOCATE_COG ,
"Arrow location (1=cog, 2=vertex)" },
{ F|O, "ArrowScale" , opt_view_arrow_scale , 50. ,
- "Size of the vector (e.g. arrow size in pixels)" },
+ "Size of vectors (arrow size in pixels or displacement factor)" },
{ F|O, "ArrowType" , opt_view_arrow_type , DRAW_POST_ARROW ,
"Vector display type (1=segment, 2=arrow, 3=pyramid, 4=cone, 5=displacement)" },
{ F|O, "AutoPosition" , opt_view_auto_position , 1. ,
"Position the scale or the 2D graph automatically to avoid overlaps" },
{ F|O, "Boundary" , opt_view_boundary , 0 ,
- "Draw the N-b dimensional boundary of the simplex (N=dimension, b=option value)" },
+ "Draw the `N minus b'-dimensional boundary of the simplex (N=simplex dimension, b=option value)" },
{ F, "CustomMax" , opt_view_custom_max , 0. ,
- "User defined maximum value to be displayed" },
+ "User-defined maximum value to be displayed" },
{ F, "CustomMin" , opt_view_custom_min , 0. ,
- "User defined minimum value to be displayed" },
+ "User-defined minimum value to be displayed" },
{ F|O, "DrawHexahedra" , opt_view_draw_hexahedra , 1. ,
"Display post-processing hexahedra?" },
@@ -909,21 +909,21 @@ StringXNumber ViewOptions_Number[] = {
{ F|O, "Light" , opt_view_light , 0. ,
"Enable light sources?" },
{ F|O, "LineType" , opt_view_line_type , 0. ,
- "Display lines as solid color segments or 3D cylinders" },
+ "Display lines as solid color segments (0) or 3D cylinders (1)" },
{ F|O, "LineWidth" , opt_view_line_width , 1.0 ,
"Display width of lines (in pixels)" },
{ F, "Max" , opt_view_max , -1.e200 ,
- "Maximum value in the view (do _not_ change this!)" },
+ "Maximum value in the view (do not change this!)" },
{ F, "Min" , opt_view_min , 1.e200 ,
- "Minimum value in the view (do _not_ change this!)" },
+ "Minimum value in the view (do not change this!)" },
{ F|O, "NbAbscissa" , opt_view_nb_abscissa , 5. ,
"Number of abscissa intervals for 2D graphs" },
{ F|O, "NbIso" , opt_view_nb_iso , 15. ,
"Number of intervals" },
{ F, "NbTimeStep" , opt_view_nb_timestep , 1. ,
- "Number of time steps in the view (do _not_ change this!)" },
+ "Number of time steps in the view (do not change this!)" },
{ F, "OffsetX" , opt_view_offset0 , 0. ,
"Translation of the view along X-axis (in model coordinates)" },
@@ -935,7 +935,7 @@ StringXNumber ViewOptions_Number[] = {
{ F|O, "PointSize" , opt_view_point_size , 2. ,
"Display size of points (in pixels)" },
{ F|O, "PointType" , opt_view_point_type , 0. ,
- "Display points as solid color dots or 3D spheres" },
+ "Display points as solid color dots (0) or 3D spheres (1)" },
{ F|O, "PositionX" , opt_view_position0 , 80. ,
"Horizontal position (in pixels) of the upper left corner of the scale or 2D graph" },
{ F|O, "PositionY" , opt_view_position1 , 50. ,
@@ -1154,17 +1154,17 @@ StringXColor MeshOptions_Color[] = {
PACK_COLOR(0, 0, 0, 255),
"Mesh line color" },
{ F|O, "Triangles" , opt_mesh_color_triangles ,
- COLT, COLT, COLW, "Mesh triangle color (if ColorCarousel=0)" },
+ COLT, COLT, COLW, "Mesh triangle color (if Mesh.ColorCarousel=0)" },
{ F|O, "Quadrangles" , opt_mesh_color_quadrangles ,
- COLQ, COLQ, COLW, "Mesh quadrangle color (if ColorCarousel=0)" },
+ COLQ, COLQ, COLW, "Mesh quadrangle color (if Mesh.ColorCarousel=0)" },
{ F|O, "Tetrahedra" , opt_mesh_color_tetrahedra ,
- COLT, COLT, COLW, "Mesh tetrahedron color (if ColorCarousel=0)" },
+ COLT, COLT, COLW, "Mesh tetrahedron color (if Mesh.ColorCarousel=0)" },
{ F|O, "Hexahedra" , opt_mesh_color_hexahedra ,
- COLQ, COLQ, COLW, "Mesh hexahedron color (if ColorCarousel=0)" },
+ COLQ, COLQ, COLW, "Mesh hexahedron color (if Mesh.ColorCarousel=0)" },
{ F|O, "Prisms" , opt_mesh_color_prisms ,
- COLP, COLP, COLW, "Mesh prism color (if ColorCarousel=0)" },
+ COLP, COLP, COLW, "Mesh prism color (if Mesh.ColorCarousel=0)" },
{ F|O, "Pyramids" , opt_mesh_color_pyramid ,
- COLY, COLY, COLW, "Mesh pyramid color (if ColorCarousel=0)" },
+ COLY, COLY, COLW, "Mesh pyramid color (if Mesh.ColorCarousel=0)" },
{ F|O, "Tangents" , opt_mesh_color_tangents ,
PACK_COLOR(128, 128, 128, 255),
PACK_COLOR(128, 128, 128, 255),
diff --git a/doc/texinfo/command_line.texi b/doc/texinfo/command_line.texi
index 983057d4e5a0e00fb402db93e34c25d191d602e6..8d9f9e763de1380f4c0f4abda47edbe68c5843aa 100644
--- a/doc/texinfo/command_line.texi
+++ b/doc/texinfo/command_line.texi
@@ -61,8 +61,8 @@ convert an ascii view into a binary one
disable double buffering
@item -fontsize int
specify the font size for the GUI (default: 12)
-@item -theme string
-specify GUI theme
+@item -scheme string
+specify FLTK scheme
@item -alpha
enable alpha blending
@item -notrack
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index a1351dab9d03de4b85987769dced28c30346fdba..c53c9e024f4726d9eb0881945dfc16d624a84f73 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.33 2003-04-19 17:24:28 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.34 2003-04-19 22:11:42 geuzaine Exp $
@c
@c Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
@c
@@ -375,7 +375,7 @@ hexahedra and pyramids), arranged in such a way that if two of them
intersect, they do so along a face, an edge or a node, and never
otherwise. All the finite element meshes produced by Gmsh are considered as
``unstructured'', even if they were generated in a ``structured'' way
-(e.g. by extrusion). This implies that the elementary geometrical elements
+(e.g.@: by extrusion). This implies that the elementary geometrical elements
are defined only by an ordered list of their vertices but that no predefined
order relation is assumed between any two elements.
@@ -441,7 +441,7 @@ section computation, offset, elevation, boundary extraction, color map and
range modification, animation, vector graphic output, etc. All
post-processing options can be accessed either interactively or through the
input ASCII text files. Scripting permits to automate all post-processing
-operations, e.g. for the creation of animations. User-defined operations can
+operations, e.g.@: for the creation of animations. User-defined operations can
also be performed on post-processing views through dynamically loadable
plugins.
@@ -468,7 +468,7 @@ parameterize these geometries. Gmsh's scripting language enables all
commands and command arguments to depend on previous calculations (see
@ref{Expressions}, and @ref{Geometry commands});
@item
-generate 1D, 2D and 3D simplicial (i.e. using line segments, triangles and
+generate 1D, 2D and 3D simplicial (i.e.@: using line segments, triangles and
tetrahedra) finite element meshes. The performance of the 1D and 2D
algorithms is pretty good; the 3D algorithm is still somewhat experimental
and slow (see @ref{Mesh module}, and @ref{Tutorial});
@@ -579,7 +579,8 @@ Optional rules are enclosed in @code{<} @code{>} pairs.
@item
Multiple choices are separated by @code{|}.
@item
-Three dots (@dots{}) indicate a possible repetition of the preceding rule.
+Three dots (@dots{}) indicate a possible (multiple) repetition of the
+preceding rule.
@end enumerate
@c -------------------------------------------------------------------------
@@ -732,9 +733,9 @@ those corresponding to the indices provided by the
@var{expression-list}). To see the practical use of such expressions, have a
look at the first couple of examples in @ref{Tutorial}.
-In order to lighten the syntax, you can always ommit the braces @code{@{@}}
-enclosing an @var{expression-list} if this @var{expression-list} contains a
-single item.
+Note that, in order to lighten the syntax, you can always ommit the braces
+@code{@{@}} enclosing an @var{expression-list} if this @var{expression-list}
+only contains a single item.
@c .........................................................................
@c Character expressions
@@ -758,7 +759,7 @@ Character expressions are defined as:
@end example
@noindent The second case in this definition permits to take the
-prefix of a string (e.g. for removing the extension from a file name). The
+prefix of a string (e.g.@: for removing the extension from a file name). The
third case permits to concatenate two character expressions, and the fourth
is an equivalent of the @code{sprintf} C function (where
@var{char-expression} is a format string that can contain floating point
@@ -795,15 +796,15 @@ Colors expressions are hybrids between fixed-length braced
@noindent The first case permits to use the X Windows names to refer to colors,
e.g., @code{Red}, @code{SpringGreen}, @code{LavenderBlush3},@w{ }@dots{}
-(see @file{Common/Colors.h} in Gmsh's source tree). The second case permits
-to define colors by using three expressions to specify their red, green and
-blue components (with values comprised between 0 and 255). The third case
-permits to define colors by using the red, green and blue color components
-as well as the alpha channel. The last case permits to use the value of a
-@var{color-option} as a @var{color-expression}. The various
-@w{@var{color-option}s} are listed in @ref{General options}, @ref{Geometry
-options}, @ref{Mesh options}, @ref{Solver options}, and @ref{Post-processing
-options}.
+(see @file{Common/Colors.h} in Gmsh's source tree for a complete list). The
+second case permits to define colors by using three expressions to specify
+their red, green and blue components (with values comprised between 0 and
+255). The third case permits to define colors by using their red, green and
+blue color components as well as their alpha channel. The last case permits
+to use the value of a @var{color-option} as a @var{color-expression}. The
+various @w{@var{color-option}s} are listed in @ref{General options},
+@ref{Geometry options}, @ref{Mesh options}, @ref{Solver options}, and
+@ref{Post-processing options}.
See @ref{t3.geo}, for an example of the use of color expressions.
@@ -1113,7 +1114,7 @@ The following commands can be used anywhere in a Gmsh ASCII text input file:
@item @var{string} = @var{expression};
Defines a new expression identifier @var{string}, or affects
@var{expression} to an existing expression identifier. Eight expression
-identifiers are predefined (hard coded in Gmsh's parser):
+identifiers are predefined (hardcoded in Gmsh's parser):
@ftable @code
@item Pi
@@ -1131,8 +1132,9 @@ Returns the next available point number. As we will see in @ref{Geometry
module}, a unique number is associated with every geometrical point:
@code{newp} permits to know the highest number already attributed. This is
mostly useful when writing user-defined functions (@pxref{User-defined
-functions}) or general geometric primitives, when one does not know a priori
-which numbers are already attributed, and which ones are still available.
+functions}) or general geometric primitives, when one does not know @emph{a
+priori} which numbers are already attributed, and which ones are still
+available.
@item newl
Returns the next available line number.
@@ -1222,9 +1224,7 @@ that only valid floating point formatting characters make sense in
@item Merge @var{char-expression};
Merges a file named @var{char-expression}. This command is equivalent to the
-`File->Merge' menu in the graphical user interface. If the path in
-@var{char-expression} is not absolute, @var{char-expression} is appended to
-the directory where the current opened project resides.
+`File->Merge' menu in the graphical user interface.
@item MergeWithBoundingBox @var{char-expression};
Merges a file and forces the recalculation of the scene's bounding box.
@@ -1243,9 +1243,10 @@ Suspends the execution of Gmsh during @var{expression} seconds.
Executes a system call.
@item Include @var{char-expression};
-@item #include @var{char-expression};
Includes the file named @var{char-expression} at the current position in the
-input file. Both include commands should be given on a line of their own.
+input file. The include command should be given on a line of its own. If
+the path in @var{char-expression} is not absolute, @var{char-expression} is
+appended to the path of the including file.
@end ftable
@c -------------------------------------------------------------------------
@@ -1265,11 +1266,12 @@ resize the graphical window in a script, or to interact with animations in
the script and in the GUI at the same time.
Gmsh's default behavior is to save some of these options in a per-user
-``session resource'' file (@code{General.SessionFileName}) each time Gmsh is
-shut down. This permits for example to automatically remember the size and
-location of the windows or which fonts to use. Other options can be saved in
-a per-user ``option'' file (@code{General.OptionsFileName}), automatically
-loaded by Gmsh during startup, by using the `Tools->Options->Save' menu.
+``session resource'' file (@code{General.SessionFileName}) every time Gmsh
+is shut down. This permits for example to automatically remember the size
+and location of the windows or which fonts to use. Other options can be
+saved in a per-user ``option'' file (@code{General.OptionsFileName}),
+automatically loaded by Gmsh every time it starts up, by using the
+`Tools->Options->Save' menu.
@c All the opt_XXX.texi files are generated automatically with `gmsh -doc'
@@ -1303,9 +1305,9 @@ are assigned identification numbers when they are created:
@item each elementary surface must possess a unique identification number;
@item each elementary volume must possess a unique identification number.
@end enumerate
-Elementary geometrical entities can be manipulated in various ways, using
-the @code{Translate}, @code{Rotate}, @code{Scale} or @code{Symmetry}
-commands.
+Elementary geometrical entities can then be manipulated in various ways, for
+example using the @code{Translate}, @code{Rotate}, @code{Scale} or
+@code{Symmetry} commands.
Compound groups of elementary geometrical entities can also be defined and
are called ``physical'' entities. These physical entities cannot be modified
@@ -1313,7 +1315,7 @@ by geometry commands: their only purpose is to assemble elementary entities
into larger groups, possibly modifying their orientation, so that they can
be referred to by the mesh module as single entities. Each physical entity
is assigned a unique identification number when it is created. That is, no
-two physical entities (even of different type, like a physical line and a
+two physical entities (even of different types, like a physical line and a
physical surface) can share identical identification numbers. See @ref{Mesh
module}, for more information about how physical entities affect the way
meshes are saved.
@@ -1335,10 +1337,10 @@ meshes are saved.
The next subsections describe all the available geometry commands. These
commands can be used anywhere in a Gmsh ASCII text input file. Note that the
-following general syntax rule is applied for the definition of geometrical
-entities: ``If a number defines a new entity, it is enclosed between
-parentheses. If a number refers to a previously defined entity, it is
-enclosed between braces.''
+following general syntax rule is followed for the definition of geometrical
+entities: ``If an @var{expression} defines a new entity, it is enclosed
+between parentheses. If an @var{expression} refers to a previously defined
+entity, it is enclosed between braces.''
@menu
* Points::
@@ -1365,18 +1367,18 @@ enclosed between braces.''
@ftable @code
@item Point ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression}, @var{expression} @};
Creates an elementary point. The @var{expression} inside the parentheses is
-the point number; the three first @w{@var{expression}s} inside the braces on
-the right hand side give the three X, Y and Z coordinates of the point in
-the three-dimensional Euclidean space; the last @var{expression} sets the
-characteristic mesh length at that point. See @ref{Characteristic lengths}, for
-more information about how this characteristic length information is used in
-the meshing process.
+the point's identification number; the three first @w{@var{expression}s}
+inside the braces on the right hand side give the three X, Y and Z
+coordinates of the point in the three-dimensional Euclidean space; the last
+@var{expression} sets the characteristic mesh length at that point. See
+@ref{Characteristic lengths}, for more information about how this
+characteristic length information is used in the meshing process.
@item Physical Point ( @var{expression} ) = @{ @var{expression-list} @};
Creates a physical point. The @var{expression} inside the parentheses is the
-physical point number; the @var{expression-list} on the right hand side
-should contain the numbers of all the elementary points that you want to
-group into the physical point.
+physical point's identification number; the @var{expression-list} on the
+right hand side should contain the identification numbers of all the
+elementary points that need to be grouped inside the physical point.
@end ftable
@c .........................................................................
@@ -1393,23 +1395,25 @@ group into the physical point.
@ftable @code
@item Bezier ( @var{expression} ) = @{ @var{expression-list} @};
-Creates a Bezier curve. The @var{expression} inside the parentheses is
-the Bezier curve number; the @var{expression-list} on the right hand side
-should contain the numbers of all the curve's control points.
+Creates a Bezier curve. The @var{expression} inside the parentheses is the
+Bezier curve's identification number; the @var{expression-list} on the right
+hand side should contain the identification numbers of all the curve's
+control points.
@item BSpline ( @var{expression} ) = @{ @var{expression-list} @};
Creates a B-spline curve. The @var{expression} inside the parentheses is the
-B-spline curve number; the @var{expression-list} on the right hand side
-should contain the numbers of all the B-spline's control points. Repeated
-control points have the expected effect.
+B-spline curve's identification number; the @var{expression-list} on the
+right hand side should contain the identification numbers of all the
+B-spline's control points. Repeating control points has the expected effect.
@item Circle ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression} @};
Creates a circle arc (strictly) smaller than Pi. The @var{expression} inside
-the parentheses is the circle arc number; the first @var{expression} inside
-the braces on the right hand side gives the number of the start point of the
-arc; the second @var{expression} gives the point number of the center of the
-circle; the last @var{expression} gives the number of the end point of the
-arc.
+the parentheses is the circle arc's identification number; the first
+@var{expression} inside the braces on the right hand side gives the
+identification number of the start point of the arc; the second
+@var{expression} gives the identification number of the center of the
+circle; the last @var{expression} gives the identification number of the end
+point of the arc.
@c todo:
@c @item Circle ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression} @} Plane @{ @var{expression}, @var{expression}, @var{expression} @};
@@ -1419,50 +1423,54 @@ arc.
@item Ellipse ( @var{expression} ) = @{ @var{expression}, @var{expression}, @var{expression}, @var{expression} @};
Creates an ellipse arc. The @var{expression} inside the parentheses is the
-ellipse arc number; the first @var{expression} inside the braces on the
-right hand side gives the number of the start point of the arc; the second
-@var{expression} gives the point number of the center of the ellipse; the
-third @var{expression} gives the number of any point located on the major
-axis of the ellipse; the last @var{expression} gives the number of the end
-point of the arc. (A deprecated synonym for @code{Ellipse} is
-@code{Ellipsis}.)
+ellipse arc's identification number; the first @var{expression} inside the
+braces on the right hand side gives the identification number of the start
+point of the arc; the second @var{expression} gives the identification
+number of the center of the ellipse; the third @var{expression} gives the
+identification number of any point located on the major axis of the ellipse;
+the last @var{expression} gives the identification number of the end point
+of the arc. (A deprecated synonym for @code{Ellipse} is @code{Ellipsis}.)
@item Line ( @var{expression} ) = @{ @var{expression}, @var{expression} @};
Creates a straight line segment. The @var{expression} inside the parentheses
-is the line segment number; the two @w{@var{expression}s} inside the braces
-on the right hand side give the start and end point numbers of the segment.
+is the line segment's identification number; the two @w{@var{expression}s}
+inside the braces on the right hand side give identification numbers of the
+start and end points of the segment.
@c todo: multi-lines not authorized yet
-@item Line Loop ( @var{expression} ) = @{ @var{expression-list} @};
-Creates an oriented line loop. The @var{expression} inside the parentheses
-is the line loop number; the @var{expression-list} on the right hand side
-should contain the numbers of all the elementary lines that constitute the
-line loop. A line loop must be a closed loop, and the elementary lines
-should be ordered and oriented (using a negative line number to specify
-reverse orientation). If the orientation is correct, but the ordering is
-wrong, Gmsh will actually reorder the list internally to create a consistent
-loop. Although Gmsh supports it, it is not recommended to specify multiple
-line loops (or subloops) in a single @code{Line Loop} command. (Line loops
-are used to create surfaces: see @ref{Surfaces}.)
-
@c todo:
@c @item Nurbs ( @var{expression} ) = @{ @var{expression-list} @};
@c todo:
@c @item Parametric ( @var{expression} ) = @{ @var{expression}, @var{expression}, "@var{string}", "@var{string}", "@var{string}" @};
-@item Physical Line ( @var{expression} ) = @{ @var{expression-list} @};
-Creates a physical line. The @var{expression} inside the parentheses is the
-physical line number; the @var{expression-list} on the right hand side
-should contain the numbers of all the elementary lines that you want to
-group into the physical line. Specifying negative numbers in the
-@var{expression-list} will reverse the orientation of the mesh elements in
-the saved mesh output file.
-
@item Spline ( @var{expression} ) = @{ @var{expression-list} @};
Creates a spline curve. The @var{expression} inside the parentheses is the
-spline number; the @var{expression-list} on the right hand side should
-contain the numbers of all the spline's control points.
+spline's identification number; the @var{expression-list} on the right hand
+side should contain the identification numbers of all the spline's control
+points.
+
+@item Line Loop ( @var{expression} ) = @{ @var{expression-list} @};
+Creates an oriented line loop. The @var{expression} inside the parentheses
+is the line loop's identification number; the @var{expression-list} on the
+right hand side should contain the identification numbers of all the
+elementary lines that constitute the line loop. A line loop must be a closed
+loop, and the elementary lines should be ordered and oriented (using
+negative identification numbers to specify reverse orientation). If the
+orientation is correct, but the ordering is wrong, Gmsh will actually
+reorder the list internally to create a consistent loop. Although Gmsh
+supports it, it is not recommended to specify multiple line loops (or
+subloops) in a single @code{Line Loop} command. (Line loops are used to
+create surfaces: see @ref{Surfaces}.)
+
+@item Physical Line ( @var{expression} ) = @{ @var{expression-list} @};
+Creates a physical line. The @var{expression} inside the parentheses is the
+physical line's identification number; the @var{expression-list} on the
+right hand side should contain the identification numbers of all the
+elementary lines that need to be grouped inside the physical
+line. Specifying negative identification numbers in the
+@var{expression-list} will reverse the orientation of the mesh elements
+belonging to the corresponding elementary lines in the saved mesh.
@end ftable
@c .........................................................................
@@ -1486,31 +1494,42 @@ contain the numbers of all the spline's control points.
@item Plane Surface ( @var{expression} ) = @{ @var{expression-list} @};
Creates a plane surface. The @var{expression} inside the parentheses is the
-plane surface number; the @var{expression-list} on the right hand side
-should contain the numbers of all the line loops defining the surface. The
-first line loop defines the exterior boundary of the surface; all other line
-loops define holes in the surface.
+plane surface's identification number; the @var{expression-list} on the
+right hand side should contain the identification numbers of all the line
+loops defining the surface. The first line loop defines the exterior
+boundary of the surface; all other line loops define holes in the surface.
-@item Ruled Surface ( @var{expression} ) = @{ @var{expression} @};
-Creates a ruled surface, i.e. a surface that can be interpolated using
+@item Ruled Surface ( @var{expression} ) = @{ @var{expression-list} @};
+Creates a ruled surface, i.e.@: a surface that can be interpolated using
transfinite interpolation. The @var{expression} inside the parentheses is
-the ruled surface number; the @var{expression} on the right hand side should
-a single line loop, composed of either three or four elementary lines.
-
-@item Surface Loop ( @var{expression} ) = @{ @var{expression-list} @};
-Creates a surface loop (a shell). The @var{expression} inside the
-parentheses is the surface loop number; the @var{expression-list} on the
-right hand side should contain the numbers of all the elementary surfaces
-that constitute the surface loop. A surface loop must always represent a
-closed shell, and the elementary surfaces should be oriented consistently
-(using a negative surface number to specify reverse orientation). (Surface
-loops are used to create volumes: see @ref{Volumes}.)
+the ruled surface's identification number; the @var{expression-list} on the
+right hand side should the identification number of a single line loop,
+composed of either three or four elementary lines.
@c todo:
@c @item Triangulation Surface ( @var{expression} ) = ( @var{expression}, @var{expression} ) @{ @var{expression-list} @} @{ @var{expression-list} @};
@c todo:
@c @item Trimmed Surface ( @var{expression} ) = @{ @var{expression}, @{ @var{expression-list} @} @};
+
+@item Surface Loop ( @var{expression} ) = @{ @var{expression-list} @};
+Creates a surface loop (a shell). The @var{expression} inside the
+parentheses is the surface loop's identification number; the
+@var{expression-list} on the right hand side should contain the
+identification numbers of all the elementary surfaces that constitute the
+surface loop. A surface loop must always represent a closed shell, and the
+elementary surfaces should be oriented consistently (using negative
+identification numbers to specify reverse orientation). (Surface loops are
+used to create volumes: see @ref{Volumes}.)
+
+@item Physical Surface ( @var{expression} ) = @{ @var{expression-list} @};
+Creates a physical surface. The @var{expression} inside the parentheses is
+the physical surface's identification number; the @var{expression-list} on
+the right hand side should contain the identification numbers of all the
+elementary surfaces that need to be grouped inside the physical
+surface. Specifying negative identification numbers in the
+@var{expression-list} will reverse the orientation of the mesh elements
+belonging to the corresponding elementary surfaces in the saved mesh.
@end ftable
@c .........................................................................
@@ -1527,12 +1546,19 @@ loops are used to create volumes: see @ref{Volumes}.)
@ftable @code
@item Volume ( @var{expression} ) = @{ @var{expression-list} @};
-Creates a volume. The @var{expression} inside the parentheses is the volume
-number; the @var{expression-list} on the right hand side should contain the
-numbers of all the surface loops defining the volume. The first surface loop
-defines the exterior boundary of the volume; all other surface loops define
-holes in the volume. (A deprecated synonym for @code{Volume} is
-@code{Complex Volume}.)
+Creates a volume. The @var{expression} inside the parentheses is the
+volume's identification number; the @var{expression-list} on the right hand
+side should contain the identification numbers of all the surface loops
+defining the volume. The first surface loop defines the exterior boundary of
+the volume; all other surface loops define holes in the volume. (A
+deprecated synonym for @code{Volume} is @code{Complex Volume}.)
+
+@item Physical Volume ( @var{expression} ) = @{ @var{expression-list} @};
+Creates a physical volume. The @var{expression} inside the parentheses is
+the physical volume's identification number; the @var{expression-list} on
+the right hand side should contain the identification numbers of all the
+elementary volumes that need to be grouped inside the physical
+volume.
@end ftable
@c .........................................................................
@@ -1552,14 +1578,14 @@ can be extended in order to also extrude the mesh):
@ftable @code
@item Extrude Point | Line | Surface @{ @var{expression}, @{ @var{expression-list} @} @} ;
-Extrudes the @var{expression}-th point, line or surface using a translation
-transformation. The @var{expression-list} should contain three
+Extrudes the @var{expression}-th point, line or surface using a
+translation. The @var{expression-list} should contain three
@w{@var{expression}s} giving the X, Y and Z components of the translation
vector.
@item Extrude Point | Line | Surface @{ @var{expression}, @{ @var{expression-list} @}, @{ @var{expression-list} @}, @var{expression} @};
-Extrudes the @var{expression}-th point, line or surface using a rotation
-transformation. The first @var{expression-list} should contain three
+Extrudes the @var{expression}-th point, line or surface using a
+rotation. The first @var{expression-list} should contain three
@w{@var{expression}s} giving the X, Y and Z direction of the rotation axis;
the second @var{expression-list} should contain three @w{@var{expression}s}
giving the X, Y and Z components of any point on this axis; the last
@@ -1611,8 +1637,8 @@ should contain three @w{@var{expression}s} giving the X, Y and Z components
of any point on this axis.
@item Symmetry @{ @var{expression-list} @} @{ @var{transform-list} @}
-Transforms all elementary entities (points, lines or surfaces) by symmetry
-in respect to a plane. The @var{expression-list} should contain four
+Transforms all elementary entities (points, lines or surfaces) symmetrically
+to a plane. The @var{expression-list} should contain four
@w{@var{expression}s} giving the coefficients of the plane's equation.
@item Translate @{ @var{expression-list} @} @{ @var{transform-list} @}
@@ -1642,14 +1668,14 @@ Here is a list of all other geometry commands currently available:
@ftable @code
@item Coherence;
-Removes all duplicate elementary geometrical entities (e.g. points having
+Removes all duplicate elementary geometrical entities (e.g.@: points having
identical coordinates). Note that Gmsh executes the @code{Coherence} command
automatically after each geometrical transformation, unless the
@code{Geometry.AutoCoherence} is set to zero (@pxref{Geometry options}).
@item Delete @{ Point | Line | Surface @{ @var{expression-list} @}; @dots{} @};
-Deletes all elementary entities (points, lines or surfaces) whose numbers
-are given in @var{expression-list}.
+Deletes all elementary entities (points, lines or surfaces) whose
+identification numbers are given in @var{expression-list}.
@c todo:
@c @item Intersect;
@@ -1705,9 +1731,9 @@ geometry module (@pxref{Geometry module}).
If only elementary geometrical entities are defined (or if the option
@code{Mesh.SaveAll} is set; see @ref{Mesh options}), the grid produced by
the mesh module will be saved ``as is''. That is, all the elements in the
-grid will be saved to disk using the number of the elementary region they
-discretize as their region number (@pxref{Gmsh mesh file format}). However,
-this can sometimes be impractical or even insufficient:
+grid will be saved to disk using the identification number of the elementary
+region they discretize as their region number (@pxref{Gmsh mesh file
+format}). However, this can sometimes be impractical or even insufficient:
@itemize @bullet
@item
@@ -1718,7 +1744,7 @@ determined entirely by the orientation of their ``parent'' elementary
entity, and cannot be modified;
@item
it is impossible to group multiple elementary entities into larger groups
-carrying some common characteristic (e.g. `Left wing', `Metal', `Dirichlet
+carrying some common characteristic (e.g.@: `Left wing', `Metal', `Dirichlet
boundary condition', @dots{}).
@end itemize
@@ -1729,7 +1755,7 @@ overlapping groups, and to control the orientation of the elements in these
groups. If physical entities are defined, the output mesh only contains
those elements that belong to physical entities. The introduction of such
physical entities in large models usually greatly facilitates the
-manipulation of the model (e.g. using `Tools->Visibility' in the GUI) and
+manipulation of the model (e.g.@: using `Tools->Visibility' in the GUI) and
the interfacing with external solvers.
@c -------------------------------------------------------------------------
@@ -1784,7 +1810,7 @@ element sizes.
This method works with all the algorithms implemented in the mesh module,
but is constrained by the structured algorithms for which the element size
-is explicitly specified (e.g. transfinite and extrusion grids: see
+is explicitly specified (e.g.@: transfinite and extrusion grids: see
@ref{Structured grids}).
@item
You can use geometrical ``attractors'', an elaborated version of the
@@ -1954,20 +1980,20 @@ Five external solvers can be interfaced simultaneously with Gmsh.
If you just want to start a solver from the solver module, with no further
interactions between the solver and Gmsh, just edit the options relative to
-one of the five available solvers (e.g. @code{Solver.Name0},
+one of the five available solvers (e.g.@: @code{Solver.Name0},
@code{Solver.Executable0}, @dots{}; see @ref{Solver options}), and set the
corresponding ``client-server'' option to zero
-(e.g. @code{Solver.ClientServer0 = 0}). This doesn't require any
+(e.g.@: @code{Solver.ClientServer0 = 0}). This doesn't require any
modification to be made to the solver.
If you want the solver to interact with Gmsh (for error messages, option
definitions, post-processing, etc.), you need to link your solver with the
@file{GmshClient.c} file and add the appropriate function calls inside your
program. You can then proceed as in the previous case, but this time you
-should set the client-server option to 1 (e.g. @code{Solver.ClientServer0 =
+should set the client-server option to 1 (e.g.@: @code{Solver.ClientServer0 =
1}), so that Gmsh and the solver can communicate through a Unix socket. See
@ref{Solver example} for an example of how to interface a C solver. Bindings
-for solvers written in other languages (e.g. Perl) are available on
+for solvers written in other languages (e.g.@: Perl) are available on
@value{GMSH-WEB}.
@menu
@@ -2041,7 +2067,7 @@ the @code{PostProcessing.LinkView} option below).
Though most of any visualization process is inherently interactive, Gmsh
exposes all post-processing commands and options to the user to permit a
complete scripting of the full post-processing process (see
-e.g. @ref{t8.geo}, and @ref{t9.geo}).
+e.g.@: @ref{t8.geo}, and @ref{t9.geo}).
The two following sections summarize all available post-processing commands
and options.
@@ -2071,7 +2097,7 @@ Duplicates the @var{expression}-th post-processing view.
@item Plugin (@var{string}) . @var{string};
Executes a plugin function. The plugin name is given between the parentheses.
-Several plugins are loaded by default: see e.g. @ref{t9.geo}.
+Several plugins are loaded by default: see e.g.@: @ref{t9.geo}.
@item Plugin (@var{string}) . @var{string} = @var{expression} | @var{char-expression};
Sets a floating point (@var{expression}) or a character
@@ -2082,7 +2108,7 @@ example.
Creates a new post-processing view, named @code{"@var{string}"}. This is the
easiest way to create a post-processing view, but also the least efficient
(the view is read through Gmsh's script parser, which can become quite slow
-if the view is large---e.g. with more than 100000 elements). Though, this
+if the view is large---e.g.@: with more than 100000 elements). Though, this
``parsed'' post-processing format (explained in detail in @ref{Gmsh parsed
post-processing file format}) is very powerful for testing proposes, since
all the values are @var{expressions}. Two other formats, better adapted for
@@ -2302,7 +2328,7 @@ example with:
Note that, even if it is often handy to define the variables and the points
directly in the input files (you may use any text editor for this purpose,
-e.g. Wordpad on Windows, or Emacs on Unix), it is almost always more simple
+e.g.@: Wordpad on Windows, or Emacs on Unix), it is almost always more simple
to define the lines, the surfaces and the volumes interactively. To do so,
just follow the context dependent buttons in the Geometry module. For
example, to create a spline, select `Geometry' in the module menu, and then
@@ -2315,7 +2341,7 @@ opened project file.
The second operating mode for Gmsh is the non-interactive mode. In this
mode, there is no graphical user interface, and all operations are performed
without any user interaction@footnote{If you compile Gmsh without the
-graphical user interface, i.e. with @code{./configure --disable-gui}, this
+graphical user interface, i.e.@: with @code{./configure --disable-gui}, this
is the only mode you;ll have access to.}. To mesh the first tutorial in
non-interactive mode, just type:
@@ -2786,7 +2812,7 @@ the same for all other kinds of values.
For relatively small data sets Gmsh provides an additional post-processing
format, which is parsed by the same grammar analyzer as the Gmsh script
language. You can thus, for example, embed small post-processing views
-directly into your geometrical descriptions (see e.g. @ref{t4.geo}). This
+directly into your geometrical descriptions (see e.g.@: @ref{t4.geo}). This
format is also useful for testing purposes: its syntax is very permissive,
and you can easily generate it by hand or on the fly. The format of the
parsed post-processing file is the following:
@@ -3021,14 +3047,14 @@ to make the code easy to read/debug/maintain:
@enumerate
@item
-please enable full warnings for your compiler (e.g. add @code{-Wall} to
+please enable full warnings for your compiler (e.g.@: add @code{-Wall} to
@code{FLAGS} in the @file{variable} file);
@item
always use the @code{Msg()} function to print information, errors, @dots{};
@item
indent your files using @file{utils/indent.sh};
@item
-if working on Windows, don't leave tabs in your files (e.g. untabify them
+if working on Windows, don't leave tabs in your files (e.g.@: untabify them
with @file{utils/untabify}).
@end enumerate
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 25566566d101ef9663a15df989c78364040305d0..2b0faa4358f4c4366fe560ea5ae2d93f00da501b 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -15,27 +15,27 @@ Default value: @code{".gmsh-errors"}@*
Saved in: @code{General.SessionFileName}
@item General.OptionsFileName
-File created in your home directory with `Tools->Options->Save', and which is read on startup@*
+Option file created with `Tools->Options->Save'; automatically read on startup@*
Default value: @code{".gmsh-options"}@*
Saved in: @code{General.SessionFileName}
@item General.SessionFileName
-File into which session specific information is saved, and which is read on startup@*
+Option file into which session specific information is saved; automatically read on startup@*
Default value: @code{".gmshrc"}@*
Saved in: @code{-}
@item General.TextEditor
-System command to launch a text editor@*
+System command to launch a text editor (OS-dependent)@*
Default value: @code{"emacs %s &"}@*
Saved in: @code{General.OptionsFileName}
@item General.Theme
-Graphical user interface theme (try e.g. plastic)@*
+FLTK graphical user interface theme (try e.g. plastic)@*
Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@item General.TmpFileName
-Temporary file (created in your home directory)@*
+Temporary file used by the geometry module@*
Default value: @code{".gmsh-tmp"}@*
Saved in: @code{General.SessionFileName}
@@ -225,7 +225,7 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item General.FastRedraw
-Fast redraw (no mesh or view display) when moving the model@*
+Fast redraw (no mesh or view display) when interacting with the model@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@@ -485,12 +485,12 @@ Default value: @code{0}@*
Saved in: @code{-}
@item General.SaveOptions
-Automatically save all current options each time you quit Gmsh?@*
+Automatically save current options in General.OptionsFileName each time you quit Gmsh?@*
Default value: @code{0}@*
Saved in: @code{General.SessionFileName}
@item General.SaveSession
-Automatically save session specific information each time you quit Gmsh?@*
+Automatically save session specific information in General.SessionFileName each time you quit Gmsh?@*
Default value: @code{1}@*
Saved in: @code{General.SessionFileName}
@@ -520,12 +520,12 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item General.SmallAxesPositionX
-X position of small axes (negative values for right alignment)@*
+X position of small axes (use negative values for right alignment)@*
Default value: @code{-45}@*
Saved in: @code{General.OptionsFileName}
@item General.SmallAxesPositionY
-Y position of small axes (negative values for bottom alignment)@*
+Y position of small axes (use negative values for bottom alignment)@*
Default value: @code{-35}@*
Saved in: @code{General.OptionsFileName}
@@ -555,22 +555,22 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item General.TrackballQuaternion0
-First trackball quaternion component (used if Trackball=1)@*
+First trackball quaternion component (used if General.Trackball=1)@*
Default value: @code{0}@*
Saved in: @code{-}
@item General.TrackballQuaternion1
-Second trackball quaternion component (used if Trackball=1)@*
+Second trackball quaternion component (used if General.Trackball=1)@*
Default value: @code{0}@*
Saved in: @code{-}
@item General.TrackballQuaternion2
-Third trackball quaternion component (used if Trackball=1)@*
+Third trackball quaternion component (used if General.Trackball=1)@*
Default value: @code{0}@*
Saved in: @code{-}
@item General.TrackballQuaternion3
-Fourth trackball quaternion component (used if Trackball=1)@*
+Fourth trackball quaternion component (used if General.Trackball=1)@*
Default value: @code{1}@*
Saved in: @code{-}
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index 58bebdd54175a0b897a864a722be6d57bc6494d5..880211d4f02190964cad7aa858fc9f9ee96f0cd4 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -45,7 +45,7 @@ Default value: @code{2}@*
Saved in: @code{General.OptionsFileName}
@item Geometry.LineType
-Display lines as solid color segments or 3D cylinders@*
+Display lines as solid color segments (0) or 3D cylinders (1)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@@ -90,7 +90,7 @@ Default value: @code{3}@*
Saved in: @code{General.OptionsFileName}
@item Geometry.PointType
-Display points as solid color dots or 3D spheres@*
+Display points as solid color dots (0) or 3D spheres (1)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index e8e566df45dc4d8ddf2077768ffcba3eb50964a9..650b1278a67a0cbe04c86cd91687f76d87ebda82 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -20,7 +20,7 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.ColorCarousel
-Use a `color by region number' scheme@*
+Use a `color by region number' coloring scheme@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@@ -100,7 +100,7 @@ Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.Interactive
-Show the construction of the 2D mesh in real time (only with the anisotropic algorithm)@*
+Show the construction of the 2D mesh in real time (only with the 2D anisotropic algorithm)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@@ -115,7 +115,7 @@ Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.LineType
-Display lines as solid color segments or 3D cylinders@*
+Display lines as solid color segments (0) or 3D cylinders (1)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@@ -175,12 +175,12 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.PointInsertion
-Point insertion method for isotropic 2D algorithm (1=center of circ. circle, 2=voronoi, 3=cog)@*
+Point insertion method for isotropic 2D algorithm (1=center of circumscribed circle, 2=voronoi, 3=cog)@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.PointsNumbers
-Display mesh vertices numbers?@*
+Display mesh vertex numbers?@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@@ -190,7 +190,7 @@ Default value: @code{2}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.PointType
-Display points as solid color dots or 3D spheres@*
+Display points as solid color dots (0) or 3D spheres (1)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@@ -275,32 +275,32 @@ Default value: @code{@{0,255,0@}}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Triangles
-Mesh triangle color (if ColorCarousel=0)@*
+Mesh triangle color (if Mesh.ColorCarousel=0)@*
Default value: @code{@{160,150,255@}}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Quadrangles
-Mesh quadrangle color (if ColorCarousel=0)@*
+Mesh quadrangle color (if Mesh.ColorCarousel=0)@*
Default value: @code{@{130,120,225@}}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Tetrahedra
-Mesh tetrahedron color (if ColorCarousel=0)@*
+Mesh tetrahedron color (if Mesh.ColorCarousel=0)@*
Default value: @code{@{160,150,255@}}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Hexahedra
-Mesh hexahedron color (if ColorCarousel=0)@*
+Mesh hexahedron color (if Mesh.ColorCarousel=0)@*
Default value: @code{@{130,120,225@}}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Prisms
-Mesh prism color (if ColorCarousel=0)@*
+Mesh prism color (if Mesh.ColorCarousel=0)@*
Default value: @code{@{232,210,23@}}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.Color.Pyramids
-Mesh pyramid color (if ColorCarousel=0)@*
+Mesh pyramid color (if Mesh.ColorCarousel=0)@*
Default value: @code{@{217,113,38@}}@*
Saved in: @code{General.OptionsFileName}
diff --git a/doc/texinfo/opt_post.texi b/doc/texinfo/opt_post.texi
index c261fd3dc361537e4138bdcae7b9d8eb06d65b13..b229e3dda8ca7240b56bdb43d384c915d5fe1e15 100644
--- a/doc/texinfo/opt_post.texi
+++ b/doc/texinfo/opt_post.texi
@@ -1,11 +1,11 @@
@ftable @code
@item PostProcessing.AnimationDelay
-Delay (in seconds) between to animation frames@*
+Delay (in seconds) between frames in automatic animation mode@*
Default value: @code{0.25}@*
Saved in: @code{General.OptionsFileName}
@item PostProcessing.AnimationCycle
-Cycle through views instead of time steps for the animation@*
+Cycle through views instead of time steps in automatic animation mode@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index 97fe4c5acd81e495bf04cba3ed2b1cc9b839bd32..fc70ab3d68fed26514bf2c03cbffff445d3759d2 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -14,7 +14,7 @@ Visit http://www.geuz.org/getdp/ for more info"}@*
Saved in: @code{General.OptionsFileName}
@item Solver.Executable0
-System command to launch solver 0 (should _not_ contain the `&' character)@*
+System command to launch solver 0 (should not contain the `&' character)@*
Default value: @code{"getdp"}@*
Saved in: @code{General.OptionsFileName}
@@ -124,7 +124,7 @@ Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@item Solver.Executable1
-System command to launch solver 1 (should _not_ contain the `&' character)@*
+System command to launch solver 1 (should not contain the `&' character)@*
Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@@ -234,7 +234,7 @@ Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@item Solver.Executable2
-System command to launch solver 2 (should _not_ contain the `&' character)@*
+System command to launch solver 2 (should not contain the `&' character)@*
Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@@ -344,7 +344,7 @@ Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@item Solver.Executable3
-System command to launch solver 3 (should _not_ contain the `&' character)@*
+System command to launch solver 3 (should not contain the `&' character)@*
Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@@ -454,7 +454,7 @@ Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
@item Solver.Executable4
-System command to launch solver 4 (should _not_ contain the `&' character)@*
+System command to launch solver 4 (should not contain the `&' character)@*
Default value: @code{""}@*
Saved in: @code{General.OptionsFileName}
diff --git a/doc/texinfo/opt_view.texi b/doc/texinfo/opt_view.texi
index dd8fa13ca6862ac16f2a87fad96ad851b1a97fc8..e118c1fee78960cd0e9ae221415473a162717966 100644
--- a/doc/texinfo/opt_view.texi
+++ b/doc/texinfo/opt_view.texi
@@ -10,7 +10,7 @@ Default value: @code{"%.3e"}@*
Saved in: @code{General.OptionsFileName}
@item View.FileName
-Default file name to assign to the post-processing view@*
+Default post-processing view file name@*
Default value: @code{""}@*
Saved in: @code{-}
@@ -20,12 +20,12 @@ Default value: @code{"%.3e"}@*
Saved in: @code{General.OptionsFileName}
@item View.Name
-Default name to assign to the post-processing view@*
+Default post-processing view name@*
Default value: @code{""}@*
Saved in: @code{-}
@item View.AngleSmoothNormals
-Threshold angle below which we do not smooth the normals@*
+Threshold angle below which normals are not smoothed@*
Default value: @code{15}@*
Saved in: @code{General.OptionsFileName}
@@ -35,7 +35,7 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item View.ArrowScale
-Size of the vector (e.g. arrow size in pixels)@*
+Size of vectors (arrow size in pixels or displacement factor)@*
Default value: @code{50}@*
Saved in: @code{General.OptionsFileName}
@@ -50,17 +50,17 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item View.Boundary
-Draw the N-b dimensional boundary of the simplex (N=dimension, b=option value)@*
+Draw the `N minus b'-dimensional boundary of the simplex (N=simplex dimension, b=option value)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@item View.CustomMax
-User defined maximum value to be displayed@*
+User-defined maximum value to be displayed@*
Default value: @code{0}@*
Saved in: @code{-}
@item View.CustomMin
-User defined minimum value to be displayed@*
+User-defined minimum value to be displayed@*
Default value: @code{0}@*
Saved in: @code{-}
@@ -150,7 +150,7 @@ Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@item View.LineType
-Display lines as solid color segments or 3D cylinders@*
+Display lines as solid color segments (0) or 3D cylinders (1)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@@ -160,12 +160,12 @@ Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item View.Max
-Maximum value in the view (do _not_ change this!)@*
+Maximum value in the view (do not change this!)@*
Default value: @code{-1e+200}@*
Saved in: @code{-}
@item View.Min
-Minimum value in the view (do _not_ change this!)@*
+Minimum value in the view (do not change this!)@*
Default value: @code{1e+200}@*
Saved in: @code{-}
@@ -180,7 +180,7 @@ Default value: @code{15}@*
Saved in: @code{General.OptionsFileName}
@item View.NbTimeStep
-Number of time steps in the view (do _not_ change this!)@*
+Number of time steps in the view (do not change this!)@*
Default value: @code{1}@*
Saved in: @code{-}
@@ -205,7 +205,7 @@ Default value: @code{2}@*
Saved in: @code{General.OptionsFileName}
@item View.PointType
-Display points as solid color dots or 3D spheres@*
+Display points as solid color dots (0) or 3D spheres (1)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}