diff --git a/tutorial/c++/t1.cpp b/tutorial/c++/t1.cpp
index 823c3b3232710b9c06ae0780b003fe4af9aad340..20fe92dd21721db4c0e8bc61eb911d83465ed491 100644
--- a/tutorial/c++/t1.cpp
+++ b/tutorial/c++/t1.cpp
@@ -1,11 +1,11 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 1
- *
- * Elementary entities (points, curves, surfaces), physical groups (points,
- * curves, surfaces)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 1
+//
+// Elementary entities (points, curves, surfaces), physical groups (points,
+// curves, surfaces)
+//
+// -----------------------------------------------------------------------------
// The Gmsh C++ API is entirely defined in the `gmsh.h' header (which contains
// the full documentation of all the functions in the API):
diff --git a/tutorial/c++/t10.cpp b/tutorial/c++/t10.cpp
index bebefee5c5326694aec344530266e5a8b52ea525..5a0829bda4f9c98d3e44a4fbb40aaa5af9fd0f71 100644
--- a/tutorial/c++/t10.cpp
+++ b/tutorial/c++/t10.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 10
- *
- * General mesh size fields
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 10
+//
+// General mesh size fields
+//
+// -----------------------------------------------------------------------------
// In addition to specifying target mesh sizes at the points of the geometry
// (see `t1.cpp') or using a background mesh (see `t7.cppq'), you can use
diff --git a/tutorial/c++/t11.cpp b/tutorial/c++/t11.cpp
index 18889509e5e0f63dd3013c6695203eac7c61c640..3a723f35c9e9fac84b1a7211423376ddaf125d31 100644
--- a/tutorial/c++/t11.cpp
+++ b/tutorial/c++/t11.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 11
- *
- * Unstructured quadrangular meshes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 11
+//
+// Unstructured quadrangular meshes
+//
+// -----------------------------------------------------------------------------
#include <gmsh.h>
diff --git a/tutorial/c++/t12.cpp b/tutorial/c++/t12.cpp
index 9ce5596deb19f2e9f83de1ea224e8eb481f776fc..6a50a3378a7fc5bce758fecde0e483f39b822fcb 100644
--- a/tutorial/c++/t12.cpp
+++ b/tutorial/c++/t12.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 12
- *
- * Cross-patch meshing with compounds
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 12
+//
+// Cross-patch meshing with compounds
+//
+// -----------------------------------------------------------------------------
// "Compound" meshing constraints allow to generate meshes across surface
// boundaries, which can be useful e.g. for imported CAD models (e.g. STEP) with
diff --git a/tutorial/c++/t13.cpp b/tutorial/c++/t13.cpp
index 2a9d78623dbfd3da81fced5094268581e8ed8d33..859d5faa2be5c0086f8e22add992aa7d695ddb7d 100644
--- a/tutorial/c++/t13.cpp
+++ b/tutorial/c++/t13.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 13
- *
- * Remeshing without an underlying CAD model
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 13
+//
+// Remeshing without an underlying CAD model
+//
+// -----------------------------------------------------------------------------
#include <gmsh.h>
#include <math.h>
diff --git a/tutorial/c++/t14.cpp b/tutorial/c++/t14.cpp
index c051fac582bd3ddcd44880a1b52496b40cd42749..2bbad4f70dcc52c060f6dca07c7b0fb8c319f5de 100644
--- a/tutorial/c++/t14.cpp
+++ b/tutorial/c++/t14.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 14
- *
- * Homology and cohomology computation
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 14
+//
+// Homology and cohomology computation
+//
+// -----------------------------------------------------------------------------
// Homology computation in Gmsh finds representative chains of (relative)
// (co)homology space bases using a mesh of a model. The representative basis
diff --git a/tutorial/c++/t15.cpp b/tutorial/c++/t15.cpp
index 300d103b2502cc5909c401528e92003300e565cf..e753519f92d39b6d0a7e2d7c35d75fef3a26a254 100644
--- a/tutorial/c++/t15.cpp
+++ b/tutorial/c++/t15.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 15
- *
- * Embedded points, lines and surfaces
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 15
+//
+// Embedded points, lines and surfaces
+//
+// -----------------------------------------------------------------------------
// By default, across geometrical dimensions meshes generated by Gmsh are only
// conformal if lower dimensional entities are on the boundary of higher
diff --git a/tutorial/c++/t16.cpp b/tutorial/c++/t16.cpp
index b249fc20957d0b7d1e6eeff6f9349b3651a0d7c1..176108759b309e4799ca07eaa6b17490b49cc633 100644
--- a/tutorial/c++/t16.cpp
+++ b/tutorial/c++/t16.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 16
- *
- * Constructive Solid Geometry, OpenCASCADE geometry kernel
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 16
+//
+// Constructive Solid Geometry, OpenCASCADE geometry kernel
+//
+// -----------------------------------------------------------------------------
// Instead of constructing a model in a bottom-up fashion with Gmsh's built-in
// geometry kernel, starting with version 3 Gmsh allows you to directly use
diff --git a/tutorial/c++/t17.cpp b/tutorial/c++/t17.cpp
index 5bcd7c4ea7f6d97faf7df94da452d1db232755dc..80ab1217dd2a3ff93483c82d3ab9ebe276fa38a2 100644
--- a/tutorial/c++/t17.cpp
+++ b/tutorial/c++/t17.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 17
- *
- * Anisotropic background mesh
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 17
+//
+// Anisotropic background mesh
+//
+// -----------------------------------------------------------------------------
// Characteristic lengths can be specified very accurately by providing a
// background mesh, i.e., a post-processing view that contains the target mesh
diff --git a/tutorial/c++/t18.cpp b/tutorial/c++/t18.cpp
index b95f1194e566f81e5db17ca10933eb889cea4e20..5792725675224c0e136e5bc303cec7357c36fbce 100644
--- a/tutorial/c++/t18.cpp
+++ b/tutorial/c++/t18.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 18
- *
- * Periodic meshes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 18
+//
+// Periodic meshes
+//
+// -----------------------------------------------------------------------------
// Periodic meshing constraints can be imposed on surfaces and curves.
diff --git a/tutorial/c++/t19.cpp b/tutorial/c++/t19.cpp
index 8bce0ce45d10de197fe8b7de5eb4c9f6207ee28a..6de926daeff623a17eb7341d19958be56ac60239 100644
--- a/tutorial/c++/t19.cpp
+++ b/tutorial/c++/t19.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 19
- *
- * Thrusections, fillets, pipes, mesh size from curvature
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 19
+//
+// Thrusections, fillets, pipes, mesh size from curvature
+//
+// -----------------------------------------------------------------------------
// The OpenCASCADE geometry kernel supports several useful features for solid
// modelling.
diff --git a/tutorial/c++/t2.cpp b/tutorial/c++/t2.cpp
index eccaa7ce2c9ad97bbd573e343138a82e231f8e8f..07e9256c6fda73af7fb211891664def103489b49 100644
--- a/tutorial/c++/t2.cpp
+++ b/tutorial/c++/t2.cpp
@@ -1,11 +1,11 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 2
- *
- * Geometrical transformations, extruded geometries, elementary entities
- * (volumes), physical groups (volumes)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 2
+//
+// Geometrical transformations, extruded geometries, elementary entities
+// (volumes), physical groups (volumes)
+//
+// -----------------------------------------------------------------------------
#include <gmsh.h>
diff --git a/tutorial/c++/t3.cpp b/tutorial/c++/t3.cpp
index 5fb4e9ed67a60dd1cc7fe3c0432dfeb1b5add844..97aace0c7d6fff38707f5a2392cd6cf374ecb75f 100644
--- a/tutorial/c++/t3.cpp
+++ b/tutorial/c++/t3.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 3
- *
- * Extruded meshes, options
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 3
+//
+// Extruded meshes, options
+//
+// -----------------------------------------------------------------------------
#include <cmath>
#include <gmsh.h>
diff --git a/tutorial/c++/t4.cpp b/tutorial/c++/t4.cpp
index 26412f5a12f2586334929e315132f8b82bbecafe..2bc86f762ab5c17e8bebb4b03e044f06ac4518a0 100644
--- a/tutorial/c++/t4.cpp
+++ b/tutorial/c++/t4.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 4
- *
- * Holes in surfaces, annotations, entity colors
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 4
+//
+// Holes in surfaces, annotations, entity colors
+//
+// -----------------------------------------------------------------------------
#include <math.h>
#include <gmsh.h>
diff --git a/tutorial/c++/t5.cpp b/tutorial/c++/t5.cpp
index 2cede4f98b17630b230808d0c1a86de478319030..79b25d6ab1768aad8e5be4d9b21da8389284972c 100644
--- a/tutorial/c++/t5.cpp
+++ b/tutorial/c++/t5.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 5
- *
- * Characteristic lengths, holes in volumes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 5
+//
+// Characteristic lengths, holes in volumes
+//
+// -----------------------------------------------------------------------------
#include <gmsh.h>
#include <cstdio>
diff --git a/tutorial/c++/t6.cpp b/tutorial/c++/t6.cpp
index 9461debb7764cb11b75da2001099ddbb847c5039..3e8d27392bf85c2c07cbb1445453ea4494022628 100644
--- a/tutorial/c++/t6.cpp
+++ b/tutorial/c++/t6.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 6
- *
- * Transfinite meshes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 6
+//
+// Transfinite meshes
+//
+// -----------------------------------------------------------------------------
#include <gmsh.h>
diff --git a/tutorial/c++/t7.cpp b/tutorial/c++/t7.cpp
index 43914abd9fe392c1062109d2713a8aab07f98968..ff5abf7b4d55be1803d39a26ab7e4fc5059d7b7b 100644
--- a/tutorial/c++/t7.cpp
+++ b/tutorial/c++/t7.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 7
- *
- * Background mesh
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 7
+//
+// Background mesh
+//
+// -----------------------------------------------------------------------------
#include <gmsh.h>
diff --git a/tutorial/c++/t8.cpp b/tutorial/c++/t8.cpp
index 96944b5faeff170cdc3967e0c6d5e999e914b028..2d7fe5efe28304a575a8196ff3f049e0e503a049 100644
--- a/tutorial/c++/t8.cpp
+++ b/tutorial/c++/t8.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 8
- *
- * Post-processing, animations, options
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 8
+//
+// Post-processing, animations, options
+//
+// -----------------------------------------------------------------------------
#include <gmsh.h>
diff --git a/tutorial/c++/t9.cpp b/tutorial/c++/t9.cpp
index a2071b86708a23fa751f5b77f3ccc853fd956809..52514a17344a3cfb685d6a41a0b774a2e8f77be5 100644
--- a/tutorial/c++/t9.cpp
+++ b/tutorial/c++/t9.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 9
- *
- * Post-processing plugins (levelsets, sections, annotations)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ tutorial 9
+//
+// Post-processing plugins (levelsets, sections, annotations)
+//
+// -----------------------------------------------------------------------------
// Plugins can be added to Gmsh in order to extend its capabilities. For
// example, post-processing plugins can modify views, or create new views based
diff --git a/tutorial/c++/x1.cpp b/tutorial/c++/x1.cpp
index c44ffe4486ddb48f8ae87170077fe357a43b892c..b6a5a0f790f4fec4e20666e331a6f1959ef509cb 100644
--- a/tutorial/c++/x1.cpp
+++ b/tutorial/c++/x1.cpp
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh C++ extended tutorial 1
- *
- * Accessing geometrical and mesh data
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh C++ extended tutorial 1
+//
+// Accessing geometrical and mesh data
+//
+// -----------------------------------------------------------------------------
// The C++ API allows to do much more than what can be done in .geo files. These
// additional features are introduced gradually in the extended tutorials,
diff --git a/tutorial/c/t1.c b/tutorial/c/t1.c
index 4be9ce9d13c069f0c28fa6ee2ee00df3ba6c4ce8..8435c419fffc58189e07ec93ba7a6e12c2602c01 100644
--- a/tutorial/c/t1.c
+++ b/tutorial/c/t1.c
@@ -1,11 +1,11 @@
-/*******************************************************************************
- *
- * Gmsh C++ tutorial 1
- *
- * Elementary entities (points, curves, surfaces), physical groups (points,
- * curves, surfaces)
- *
- *******************************************************************************/
+/* ---------------------------------------------------------------------------
+
+ Gmsh C tutorial 1
+
+ Elementary entities (points, curves, surfaces), physical groups (points,
+ curves, surfaces)
+
+ --------------------------------------------------------------------------- */
/* The Gmsh C API is entirely defined in the `gmshc.h' header (which contains
the full documentation of all the functions in the API): */
diff --git a/tutorial/t1.geo b/tutorial/t1.geo
index 69061da7a0ba7bfd680fcf2eba07e138391ba986..777ddddd6caabbcac502d7bc1bb62871bf47c4d9 100644
--- a/tutorial/t1.geo
+++ b/tutorial/t1.geo
@@ -1,11 +1,11 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 1
- *
- * Variables, elementary entities (points, curves, surfaces), physical groups
- * (points, curves, surfaces)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 1
+//
+// Variables, elementary entities (points, curves, surfaces), physical groups
+// (points, curves, surfaces)
+//
+// -----------------------------------------------------------------------------
// The simplest construction in Gmsh's scripting language is the
// `affectation'. The following command defines a new variable `lc':
diff --git a/tutorial/t10.geo b/tutorial/t10.geo
index d241c4ca2b5e5bda9ca7d8c80cf2d9277e8abc0d..cd699f0f0e3869eef1da7f8d6b04227cb3084d23 100644
--- a/tutorial/t10.geo
+++ b/tutorial/t10.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 10
- *
- * General mesh size fields
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 10
+//
+// General mesh size fields
+//
+// -----------------------------------------------------------------------------
// In addition to specifying target mesh sizes at the points of the geometry
// (see `t1.geo') or using a background mesh (see `t7.geo'), you can use general
diff --git a/tutorial/t11.geo b/tutorial/t11.geo
index 73f05f6db54525ea82cf00ea109f3ff7634b4bcb..55eb82f09912b5a4aa5e52c3e77acb9f7ff9a123 100644
--- a/tutorial/t11.geo
+++ b/tutorial/t11.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 11
- *
- * Unstructured quadrangular meshes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 11
+//
+// Unstructured quadrangular meshes
+//
+// -----------------------------------------------------------------------------
// We have seen in tutorials `t3.geo' and `t6.geo' that extruded and transfinite
// meshes can be "recombined" into quads/prisms/hexahedra by using the
diff --git a/tutorial/t12.geo b/tutorial/t12.geo
index ff2e727e41d3fb3fcf74fcea1cbe09d8c989be7d..c285dd788c99f473d63bd034af82ddd4278ed844 100644
--- a/tutorial/t12.geo
+++ b/tutorial/t12.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 12
- *
- * Cross-patch meshing with compounds
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 12
+//
+// Cross-patch meshing with compounds
+//
+// -----------------------------------------------------------------------------
// "Compound" meshing constraints allow to generate meshes across surface
// boundaries, which can be useful e.g. for imported CAD models (e.g. STEP) with
diff --git a/tutorial/t13.geo b/tutorial/t13.geo
index 474518442673fec27bfdb4097754f3fd4472fd75..68f1bfa49fc53e2ad5c0bab9af7204c53d3aa067 100644
--- a/tutorial/t13.geo
+++ b/tutorial/t13.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 13
- *
- * Remeshing without an underlying CAD model
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 13
+//
+// Remeshing without an underlying CAD model
+//
+// -----------------------------------------------------------------------------
// Let's merge an STL mesh that we would like to remesh.
Merge "t13_data.stl";
diff --git a/tutorial/t14.geo b/tutorial/t14.geo
index dbc203d401e275f87a993d4dc85a6af5af75b9cc..8b05e83f6ca346f387b504e6fad1288e8d14b6d9 100644
--- a/tutorial/t14.geo
+++ b/tutorial/t14.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 14
- *
- * Homology and cohomology computation
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 14
+//
+// Homology and cohomology computation
+//
+// -----------------------------------------------------------------------------
// Homology computation in Gmsh finds representative chains of (relative)
// (co)homology space bases using a mesh of a model. The representative basis
diff --git a/tutorial/t15.geo b/tutorial/t15.geo
index 4112adba08a8bd46141202af1aafb5719bd70ee3..6c04979ee53b7e96558e2937a7c534a2ff6feb44 100644
--- a/tutorial/t15.geo
+++ b/tutorial/t15.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 15
- *
- * Embedded points, lines and surfaces
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 15
+//
+// Embedded points, lines and surfaces
+//
+// -----------------------------------------------------------------------------
// By default, across geometrical dimensions meshes generated by Gmsh are only
// conformal if lower dimensional entities are on the boundary of higher
diff --git a/tutorial/t16.geo b/tutorial/t16.geo
index 596667cf92549626329c079a486b2cc2422d3326..16663c8f7c79bb2050795307a7b1c0637033d4cb 100644
--- a/tutorial/t16.geo
+++ b/tutorial/t16.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 16
- *
- * Constructive Solid Geometry, OpenCASCADE geometry kernel
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 16
+//
+// Constructive Solid Geometry, OpenCASCADE geometry kernel
+//
+// -----------------------------------------------------------------------------
// Instead of constructing a model in a bottom-up fashion with Gmsh's built-in
// geometry kernel, starting with version 3 Gmsh allows you to directly use
diff --git a/tutorial/t17.geo b/tutorial/t17.geo
index c892dc9501a020fa449125c24527f23e15826191..6ff9e6acbcef1c86a2286ed7e3f5cdc4f50d24e2 100644
--- a/tutorial/t17.geo
+++ b/tutorial/t17.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 17
- *
- * Anisotropic background mesh
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 17
+//
+// Anisotropic background mesh
+//
+// -----------------------------------------------------------------------------
// Characteristic lengths can be specified very accurately by providing a
// background mesh, i.e., a post-processing view that contains the target mesh
diff --git a/tutorial/t17_bgmesh.pos b/tutorial/t17_bgmesh.pos
index 2a9389208bbecb3a6fe101f717b4e5afa167e9c7..0db0bf0a3a39532a7857df983096302f254c4244 100644
--- a/tutorial/t17_bgmesh.pos
+++ b/tutorial/t17_bgmesh.pos
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh tutorial 17 - appendix
- *
- * 2D tensorial background mesh (in parsed format)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh tutorial 17 - appendix
+//
+// 2D tensorial background mesh (in parsed format)
+//
+// -----------------------------------------------------------------------------
View "nodalMetric" {
TT(0.980881,0.6673,0,0.95919,0.664142,0,0.969955,0.647382,0){846.074,423.287,0, 423.287,545.094,0, 0,0,1.0,1077.66,582.948,0, 582.948,636.635,0, 0,0,1.0,1138.83,577.146,0, 577.146,646.44,0, 0,0,1.0};
diff --git a/tutorial/t18.geo b/tutorial/t18.geo
index 02a454fc6e6e38d469de8f9b448eb45a0850dbb0..d9e316eb989790054fa6388445bbc1145664886e 100644
--- a/tutorial/t18.geo
+++ b/tutorial/t18.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 18
- *
- * Periodic meshes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 18
+//
+// Periodic meshes
+//
+// -----------------------------------------------------------------------------
// Periodic meshing constraints can be imposed on surfaces and curves.
diff --git a/tutorial/t19.geo b/tutorial/t19.geo
index 86ec2e70fe3c7dccc1d00b40dc2a037cf74da4bb..838ace22c9c73095d37fab61a6f6697d5cdedb17 100644
--- a/tutorial/t19.geo
+++ b/tutorial/t19.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 19
- *
- * Thrusections, fillets, pipes, mesh size from curvature
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 19
+//
+// Thrusections, fillets, pipes, mesh size from curvature
+//
+// -----------------------------------------------------------------------------
// The OpenCASCADE geometry kernel supports several useful features for solid
// modelling.
diff --git a/tutorial/t2.geo b/tutorial/t2.geo
index 43470841995b8ba8d12f540c7330e9abfedea081..39863e799e73c76e89c045f49e876a441783953a 100644
--- a/tutorial/t2.geo
+++ b/tutorial/t2.geo
@@ -1,11 +1,11 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 2
- *
- * Includes, geometrical transformations, extruded geometries, elementary
- * entities (volumes), physical groups (volumes)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 2
+//
+// Includes, geometrical transformations, extruded geometries, elementary
+// entities (volumes), physical groups (volumes)
+//
+// -----------------------------------------------------------------------------
// We first include the previous tutorial file, in order to use it as a basis
// for this one. Including a file is equivalent to copy-pasting its contents:
diff --git a/tutorial/t3.geo b/tutorial/t3.geo
index baaac2b54fb90818c18f5e4c91e747df6c59038c..aff0d5cccbc69c82517c8fa091786869f056ea29 100644
--- a/tutorial/t3.geo
+++ b/tutorial/t3.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 3
- *
- * Extruded meshes, parameters, options
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 3
+//
+// Extruded meshes, parameters, options
+//
+// -----------------------------------------------------------------------------
// Again, we start by including the first tutorial:
diff --git a/tutorial/t4.geo b/tutorial/t4.geo
index 595e88c4391c28a0b8e77b13520f6d1dde13711e..d1822712ef93fc427dd69419c99373319aa0cf72 100644
--- a/tutorial/t4.geo
+++ b/tutorial/t4.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 4
- *
- * Built-in functions, holes in surfaces, annotations, entity colors
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 4
+//
+// Built-in functions, holes in surfaces, annotations, entity colors
+//
+// -----------------------------------------------------------------------------
// As usual, we start by defining some variables:
diff --git a/tutorial/t5.geo b/tutorial/t5.geo
index afb839969a0e833ffc4419325224120b7ef9b919..23efcceb17d82cfac2d9787e40b5d169c12c8467 100644
--- a/tutorial/t5.geo
+++ b/tutorial/t5.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 5
- *
- * Characteristic lengths, macros, loops, holes in volumes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 5
+//
+// Characteristic lengths, macros, loops, holes in volumes
+//
+// -----------------------------------------------------------------------------
// We start by defining some target mesh sizes:
diff --git a/tutorial/t6.geo b/tutorial/t6.geo
index 9accfee7ed2d211523bd2a57f31611052399c426..1b95f47addcf886a85c31d0897f619a334aba90e 100644
--- a/tutorial/t6.geo
+++ b/tutorial/t6.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 6
- *
- * Transfinite meshes
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 6
+//
+// Transfinite meshes
+//
+// -----------------------------------------------------------------------------
// Let's use the geometry from the first tutorial as a basis for this one:
Include "t1.geo";
diff --git a/tutorial/t7.geo b/tutorial/t7.geo
index 3d6d4d53ff995499343a81b1d3d9609e333f52bf..2d38addcfca76b6b5c208ec2a1824acaed0998ce 100644
--- a/tutorial/t7.geo
+++ b/tutorial/t7.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 7
- *
- * Background mesh
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 7
+//
+// Background mesh
+//
+// -----------------------------------------------------------------------------
// Mesh sizes can be specified very accurately by providing a background mesh,
// i.e., a post-processing view that contains the target characteristic lengths.
diff --git a/tutorial/t7_bgmesh.pos b/tutorial/t7_bgmesh.pos
index 07df46f3b183e659276042c4ca5a6db58885082f..764074f82560155f5c0c7389d85e2af48bd3382d 100644
--- a/tutorial/t7_bgmesh.pos
+++ b/tutorial/t7_bgmesh.pos
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh tutorial 7 - appendix
- *
- * 2D scalar background mesh (in parsed format)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh tutorial 7 - appendix
+//
+// 2D scalar background mesh (in parsed format)
+//
+// -----------------------------------------------------------------------------
// This post-processing view contains scalar triangles. The values represent the
// target characteristic mesh element sizes to be applied to the first tutorial,
diff --git a/tutorial/t8.geo b/tutorial/t8.geo
index 7ce8df980d27bbe4384343e2d55c10fc0ee0650b..995e34cb764c55138b7524f486a3b226c5cfee5c 100644
--- a/tutorial/t8.geo
+++ b/tutorial/t8.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 8
- *
- * Post-processing, scripting, animations, options
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 8
+//
+// Post-processing, scripting, animations, options
+//
+// -----------------------------------------------------------------------------
// In addition to creating geometries and meshes, GEO scripts can also be used
// to manipulate post-processing datasets (called "views" in Gmsh).
diff --git a/tutorial/t9.geo b/tutorial/t9.geo
index 6bfb71e3fcfdf284c6e96ce2b5bc03f63a420893..e5dd81aea64b2b3dca4e5bb311cb4a94bbdd73bd 100644
--- a/tutorial/t9.geo
+++ b/tutorial/t9.geo
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh GEO tutorial 9
- *
- * Post-processing plugins (levelsets, sections, annotations)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh GEO tutorial 9
+//
+// Post-processing plugins (levelsets, sections, annotations)
+//
+// -----------------------------------------------------------------------------
// Plugins can be added to Gmsh in order to extend its capabilities. For
// example, post-processing plugins can modify views, or create new views based
diff --git a/tutorial/view1.pos b/tutorial/view1.pos
index 670936914b8de17c77fb160af6cda211cbf4e4df..39dc65b3f6d145b4dd8dcf8b25ca69a7feb2b801 100644
--- a/tutorial/view1.pos
+++ b/tutorial/view1.pos
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh tutorial 1 - appendix 1
- *
- * Scalar post-processing view (in parsed format)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh tutorial 1 - appendix 1
+//
+// Scalar post-processing view (in parsed format)
+//
+// -----------------------------------------------------------------------------
// This view contains a scalar field defined on triangles. There are 5 time
// steps, i.e. 3*5 = 15 values for each triangle.
diff --git a/tutorial/view2.pos b/tutorial/view2.pos
index 43639ea69564fb849d16667e2f7ca2fcd9ede384..b8f28f4d46b0b211c4b6eec2e453cb1eb414d1ed 100644
--- a/tutorial/view2.pos
+++ b/tutorial/view2.pos
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh tutorial 1 - appendix 2
- *
- * Vector post-processing view (in parsed format)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh tutorial 1 - appendix 2
+//
+// Vector post-processing view (in parsed format)
+//
+// -----------------------------------------------------------------------------
// This view contains a vector field defined on points, with 5 time steps.
diff --git a/tutorial/view3.pos b/tutorial/view3.pos
index 3ea4b8cf41769e1b5bb11bc21aefed34ec04667c..aaf2b7ead2ab29b9277c0062d30fe6b00783d74d 100644
--- a/tutorial/view3.pos
+++ b/tutorial/view3.pos
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh tutorial 1 - appendix 3
- *
- * Scalar 3D post-processing view (in parsed format)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh tutorial 1 - appendix 3
+//
+// Scalar 3D post-processing view (in parsed format)
+//
+// -----------------------------------------------------------------------------
// This view contains a scalar field defined on tetrahedra.
diff --git a/tutorial/view4.pos b/tutorial/view4.pos
index 3ab9ac3aa44d9c91f09077fb8f8d1e5797a8a040..2723dbac96508f58134bab6613c57101fd18b0c1 100644
--- a/tutorial/view4.pos
+++ b/tutorial/view4.pos
@@ -1,10 +1,10 @@
-/*******************************************************************************
- *
- * Gmsh tutorial 1 - appendix 4
- *
- * 2D graphs, text annotations (in parsed format)
- *
- *******************************************************************************/
+// -----------------------------------------------------------------------------
+//
+// Gmsh tutorial 1 - appendix 4
+//
+// 2D graphs, text annotations (in parsed format)
+//
+// -----------------------------------------------------------------------------
View "e" {
SP(0.05,0,0){3878262,3878766.4,3880412.5,3882811.2,3885521.1};