diff --git a/doc/gmsh.html b/doc/gmsh.html
index 553836bcdeb24ec618dd0a448f3ea65fbd3f7e10..435a63c3e46add20a0d67475c1fa2ee50204c891 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -66,7 +66,8 @@ capabilities</a>.
(also available in
<a href="/gmsh/doc/texinfo/gmsh.ps">postscript</a>,
<a href="/gmsh/doc/texinfo/gmsh.pdf">pdf</a>,
- <a href="/gmsh/doc/texinfo/gmsh.txt">text</a> and
+ <a href="/gmsh/doc/texinfo/gmsh.txt">text</a>,
+ <a href="/gmsh/doc/texinfo/gmsh-full.html">html</a> and
<a href="/gmsh/doc/texinfo/gmsh-info.tgz">info</a> formats)
<li><a href="/gmsh/doc/FAQ">Frequently asked questions (FAQ)</a>
<li><a href="/gmsh/doc/VERSIONS">Version history</a>
diff --git a/doc/texinfo/Makefile b/doc/texinfo/Makefile
index 3413b0952b11c6bc2356f812e15f0cd087c90e32..0a1292bde027cbb3edeb36255641594dd5bbec81 100644
--- a/doc/texinfo/Makefile
+++ b/doc/texinfo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2003-04-15 21:49:43 geuzaine Exp $
+# $Id: Makefile,v 1.5 2003-04-19 17:24:28 geuzaine Exp $
#
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
#
@@ -33,6 +33,9 @@ html:
rm -f index.html
ln -s gmsh.html index.html
+html1:
+ ./texi2html -prefix gmsh-full -init_file gmsh-full.t2h gmsh.texi
+
html2:
makeinfo --html gmsh.texi
@@ -47,9 +50,11 @@ infoz: info
gtar zcvf gmsh-info.tgz gmsh.info*
txt:
- makeinfo --no-headers gmsh.texi > gmsh.txt
+ makeinfo --no-headers gmsh.texi |\
+ sed -n '/...Table of Contents.../,$$p' |\
+ sed 's/...Table of Contents...//' > gmsh.txt
-all: ps pdf html infoz txt
+all: ps pdf html html1 infoz txt
clean:
rm -f *.cp* *.fn* *.ky* *.pg* *.tp* *.vr* *.mv*\
diff --git a/doc/texinfo/gmsh-full.t2h b/doc/texinfo/gmsh-full.t2h
new file mode 100644
index 0000000000000000000000000000000000000000..eaf00cff3221f524679af1e12e1328379fa7ba1a
--- /dev/null
+++ b/doc/texinfo/gmsh-full.t2h
@@ -0,0 +1,4 @@
+
+# The following can only be set in the init file
+
+$T2H_INDEX_CHAPTER = 'Concept index';
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index bf800d3a6c7a6e3c02a5ef153ec4063b8ca3666d..a1351dab9d03de4b85987769dced28c30346fdba 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.32 2003-04-19 16:34:44 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.33 2003-04-19 17:24:28 geuzaine Exp $
@c
@c Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
@c
@@ -1112,8 +1112,9 @@ 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. Note that eight
-expression identifiers are predefined (hard coded in Gmsh's parser):
+@var{expression} to an existing expression identifier. Eight expression
+identifiers are predefined (hard coded in Gmsh's parser):
+
@ftable @code
@item Pi
Returns 3.1415926535897932.
@@ -1703,10 +1704,10 @@ 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 will be saved ``as is''. That is, all the elements in the grid are
-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:
+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:
@itemize @bullet
@item
@@ -1729,7 +1730,7 @@ 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
-the interfacing with external solvers. See @ref{t1.geo}, for an example.
+the interfacing with external solvers.
@c -------------------------------------------------------------------------
@c Mesh commands
@@ -1770,6 +1771,7 @@ options; see @ref{Running Gmsh} and @ref{Command-line options}).
There are three main ways to specify the size of the mesh elements for a
given geometry:
+
@enumerate
@item
You can specify characteristic lengths at the points of the geometrical
@@ -1848,8 +1850,8 @@ extruded and has the following syntax:
@example
@var{layers}:
- Layer @{ @{ @var{expression-list} @}, @{ @var{expression-list} @},
- @{ @var{expression-list} @} @}; | Recombine;
+ Layer @{ @{ @var{expression-list} @}, @{ @var{expression-list} @}, @{ @var{expression-list} @} @}; |
+ Recombine;
@end example
The first @var{expression-list} defines how many elements should be created
@@ -1866,11 +1868,11 @@ into prisms, hexahedra or pyramids.
@item Extrude Point | Line | Surface @{ @var{expression}, @{ @var{expression-list} @}, @{ @var{expression-list} @}, @var{expression} @} @{ @var{layers}; @dots{} @};
Extrudes both the geometry and the mesh using a rotation
-(@pxref{Extrusions}). The @var{layers} parameters are defined as above.
+(@pxref{Extrusions}). The @var{layers} option is defined as above.
@item Extrude Point | Line | Surface @{ @var{expression}, @{ @var{expression-list} @}, @{ @var{expression-list} @}, @{ @var{expression-list} @}, @var{expression} @} @{ @var{layers}; @dots{} @};
Extrudes both the geometry and the mesh using a combined translation and
-rotation (@pxref{Extrusions}). The @var{layers} parameters are defined as
+rotation (@pxref{Extrusions}). The @var{layers} option is defined as
above.
@item Transfinite Line @{ @var{expression-list} @} = @var{expression} < Using Progression | Bump @var{expression} >
@@ -2101,12 +2103,13 @@ file format} and @ref{Gmsh binary post-processing file format}.
General post-processing option names have the form
@code{PostProcessing.@var{string}}. Options peculiar to post-processing
views take two forms:
+
@enumerate
@item options that should apply to all views can be set through
@code{View.@var{string}}, @emph{before any view is loaded};
@item options that should apply only to the @var{n}-th
view take the form @code{View[@var{n}].@var{string}} (@var{n} = 0, 1, 2,
-@dots{}).
+@dots{}), @emph{after the @var{n}-th view is loaded}.
@end enumerate
See @ref{t9.geo} for some examples.
@@ -2130,10 +2133,10 @@ See @ref{t9.geo} for some examples.
@cindex Examples
@cindex Tutorial
-Here are the examples in the Gmsh tutorial. These examples are commented
-(both C and C++-style comments can be used in Gmsh input files: see
-@ref{Comments}) and should introduce new features gradually, starting with
-@file{t1.geo}.
+Here are the examples in the Gmsh tutorial. These examples are commented and
+should introduce new features gradually, starting with @file{t1.geo}. The
+files corresponding to these examples are available in the @file{tutorial}
+directory of the Gmsh distribution.
This tutorial does not explain the mesh and post-processing file
formats. See @ref{File formats} for this.