Backmerge of trunk

Add alpha complex in bibtex


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@929 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: c8975be439b3e9e91d1fd6ad988db12c75d0395b

2 files changed, 13 insertions, 15 deletions

diff --git a/src/common/doc/main_page.h b/src/common/doc/main_page.h
index 0fd9a93e..3edcbd0b 100644
--- a/src/common/doc/main_page.h
+++ b/src/common/doc/main_page.h
@@ -56,6 +56,7 @@
  * The following example requires the <a target="_blank" href="http://gmplib.org/">GNU Multiple Precision Arithmetic
  * Library</a> (GMP) and will not be built if GMP is not installed:
  * \li Persistent_cohomology/rips_multifield_persistence
+ *
  * Having GMP version 4.2 or higher installed is recommended.
  * 
  * \subsection cgal CGAL:
@@ -74,19 +75,15 @@
  * 
  * \subsection demos Demos and examples
  * To build the demos and libraries, run the following commands in a terminal:
- * \verbatim
- * cd /path-to-gudhi/
- * mkdir build
- * cd build/
- * cmake ..
- * make
- * \endverbatim
+\verbatim  cd /path-to-gudhi/
+mkdir build
+cd build/
+cmake ..
+make \endverbatim
  * 
  * \subsection testsuites Test suites
  * To test your build, run the following command in a terminal:
- * \verbatim
- * make test
- * \endverbatim
+ * \verbatim  make test \endverbatim
  * 
  * \section Contributions Bug reports and contributions
  * Please help us improving the quality of the GUDHI library. You may report bugs or suggestions to:
diff --git a/src/common/include/gudhi/Delaunay_triangulation_off_io.h b/src/common/include/gudhi/Delaunay_triangulation_off_io.h
index 4d26bb71..6335d243 100644
--- a/src/common/include/gudhi/Delaunay_triangulation_off_io.h
+++ b/src/common/include/gudhi/Delaunay_triangulation_off_io.h
@@ -70,11 +70,11 @@ class Delaunay_triangulation_off_visitor_reader {
 #endif  // DEBUG_TRACES
     if (num_faces > 0) {
       std::cerr << "Delaunay_triangulation_off_visitor_reader::init faces are not taken into account from OFF " <<
-          "file for Delaunay triangulation - faces are computed." << std::endl;
+          "file for Delaunay triangulation - faces are computed.\n";
     }
     if (num_edges > 0) {
       std::cerr << "Delaunay_triangulation_off_visitor_reader::init edges are not taken into account from OFF " <<
-          "file for Delaunay triangulation - edges are computed." << std::endl;
+          "file for Delaunay triangulation - edges are computed.\n";
     }
     // Complex construction with dimension from file
     complex_ = new Complex(dim);
@@ -163,13 +163,14 @@ class Delaunay_triangulation_off_reader {
       if (valid_) {
         complex_ = off_visitor.get_complex();
         if (complex_ == nullptr) {
-          std::cerr << "Delaunay_triangulation_off_reader::Delaunay_triangulation_off_reader off_visitor returns an empty pointer" << std::endl;
+          std::cerr << "Delaunay_triangulation_off_reader::Delaunay_triangulation_off_reader off_visitor returns " <<
+              "an empty pointer\n";
           valid_ = false;
         }
       }
     } else {
       std::cerr << "Delaunay_triangulation_off_reader::Delaunay_triangulation_off_reader could not open file " <<
-          name_file << std::endl;
+          name_file << "\n";
     }
 
   }
@@ -285,7 +286,7 @@ class Delaunay_triangulation_off_writer {
       valid_ = true;
     } else {
       std::cerr << "Delaunay_triangulation_off_writer::Delaunay_triangulation_off_writer could not open file " <<
-          name_file << std::endl;
+          name_file << "\n";
     }
   }