Merge Last trunk modifications

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

Former-commit-id: 737b10fe34bcc842a1e64522f1eb14c16c7cfec0

2 files changed, 43 insertions, 14 deletions

diff --git a/src/common/doc/header.html b/src/common/doc/header.html
index a6f3ed9c..94e641b2 100644
--- a/src/common/doc/header.html
+++ b/src/common/doc/header.html
@@ -9,7 +9,7 @@
 <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
 <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
 <!-- GUDHI website css for header BEGIN -->
-<link rel="stylesheet" type="text/css" href="http://gudhi.gforge.inria.fr/assets/css/styles_feeling_responsive.css" />
+<link rel="stylesheet" type="text/css" href="http://pages.saclay.inria.fr/vincent.rouvreau/gudhi/gudhi-doc-2.0.0/assets/css/styles_feeling_responsive.css" />
 <!-- GUDHI website css for header END -->
 <link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="$relpath^jquery.js"></script>
@@ -25,6 +25,13 @@ $extrastylesheet
 <!-- GUDHI website header BEGIN -->
 <div id="navigation" class="sticky">
   <nav class="top-bar" role="navigation" data-topbar>
+    <ul class="title-area">
+      <li class="name">
+      <h1 class="show-for-small-only"><a href="http://gudhi.gforge.inria.fr" class="icon-tree"> GUDHI C++ library</a></h1>
+    </li>
+       <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Navigation</span></a></li>
+    </ul>
     <section class="top-bar-section">
       <ul class="right">
               <li class="divider"></li>
@@ -37,7 +44,7 @@ $extrastylesheet
                 <a href="#">Project</a>
                   <ul class="dropdown">
                       <li><a href="http://gudhi.gforge.inria.fr/people/">People</a></li>
-                      <li><a href="http://gudhi.gforge.inria.fr/getinvolved/">Get involved</a></li>
+                      <li><a href="http://gudhi.gforge.inria.fr/keepintouch/">Keep in touch</a></li>
                       <li><a href="http://gudhi.gforge.inria.fr/partners/">Partners and Funding</a></li>
                       <li><a href="http://gudhi.gforge.inria.fr/relatedprojects/">Related projects</a></li>
                       <li><a href="http://gudhi.gforge.inria.fr/theyaretalkingaboutus/">They are talking about us</a></li>
@@ -49,11 +56,18 @@ $extrastylesheet
                   <ul class="dropdown">
                       <li><a href="http://gudhi.gforge.inria.fr/licensing/">Licensing</a></li>
                       <li><a href="https://gforge.inria.fr/frs/?group_id=3865" target="_blank">Get the sources</a></li>
-                      <li><a href="http://gudhi.gforge.inria.fr/doc/latest/installation.html">Installation manual</a></li>
                   </ul>
               </li>
               <li class="divider"></li>
-              <li><a href="http://gudhi.gforge.inria.fr/doc/latest/">Documentation</a></li>
+              <li class="has-dropdown">
+                <a href="#">Documentation</a>
+                  <ul class="dropdown">
+                      <li><a href="http://gudhi.gforge.inria.fr/doc/latest/">C++ documentation</a></li>
+                      <li><a href="http://gudhi.gforge.inria.fr/doc/latest/installation.html">C++ installation manual</a></li>
+                      <li><a href="http://gudhi.gforge.inria.fr/cython/latest/">Cython documentation</a></li>
+                      <li><a href="http://gudhi.gforge.inria.fr/cython/latest/installation.html">Cython installation manual</a></li>
+                  </ul>
+              </li>
               <li class="divider"></li>
               <li><a href="http://gudhi.gforge.inria.fr/interfaces/">Interfaces</a></li>
               <li class="divider"></li>
@@ -62,7 +76,7 @@ $extrastylesheet
   </nav>
 </div><!-- /#navigation -->
 <!-- GUDHI website header BEGIN -->
-    
+
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
 <!--BEGIN TITLEAREA-->
diff --git a/src/common/doc/main_page.h b/src/common/doc/main_page.h
index 0338d3b1..593faea5 100644
--- a/src/common/doc/main_page.h
+++ b/src/common/doc/main_page.h
@@ -3,7 +3,9 @@
  * \image html "Gudhi_banner.png" "" width=20cm
  * 
  * \section Introduction Introduction
- * The Gudhi library (Geometry Understanding in Higher Dimensions) is a generic open source C++ library for
+ * The GUDHI library (Geometry Understanding in Higher Dimensions) is a generic open source
+ * <a class="el" target="_blank" href="http://gudhi.gforge.inria.fr/doc/latest/">C++ library</a>, with a
+ * <a class="el" target="_blank" href="http://gudhi.gforge.inria.fr/cython/latest/">Cython interface</a>, for
  * Computational Topology and Topological Data Analysis
  * (<a class="el" target="_blank" href="https://en.wikipedia.org/wiki/Topological_data_analysis">TDA</a>).
  * The GUDHI library intends  to help the development of new algorithmic solutions in TDA and their transfer to
@@ -62,7 +64,7 @@
   <tr>
     <td width="25%">
       <b>Author:</b> Cl&eacute;ment Maria, Pawel Dlotko, Vincent Rouvreau<br>
-      <b>Introduced in:</b> GUDHI 1.4.0<br>
+      <b>Introduced in:</b> GUDHI 2.0.0<br>
       <b>Copyright:</b> GPL v3<br>
     </td>
     <td width="75%">
@@ -118,7 +120,7 @@
   <tr>
     <td width="25%">
       <b>Author:</b> Cl&eacute;ment Jamin<br>
-      <b>Introduced in:</b> GUDHI 1.4.0<br>
+      <b>Introduced in:</b> GUDHI 2.0.0<br>
       <b>Copyright:</b> GPL v3<br>
       <b>Requires:</b> \ref cgal &ge; 4.8.0 and \ref eigen3
     </td>
@@ -157,7 +159,7 @@
   <tr>
     <td width="25%">
       <b>Author:</b> Fran&ccedil;ois Godi<br>
-      <b>Introduced in:</b> GUDHI 1.4.0<br>
+      <b>Introduced in:</b> GUDHI 2.0.0<br>
       <b>Copyright:</b> GPL v3<br>
       <b>Requires:</b> \ref cgal &ge; 4.8.0 and \ref eigen3
     </td>
@@ -213,11 +215,11 @@
 </table>
 */
 
-/*! \page installation Gudhi installation
+/*! \page installation GUDHI installation
  *  \tableofcontents
- * As Gudhi is a header only library, there is no need to install the library.
+ * As GUDHI is a header only library, there is no need to install the library.
  * 
- * Examples of Gudhi headers inclusion can be found in \ref demos.
+ * Examples of GUDHI headers inclusion can be found in \ref demos.
  * 
  * \section compiling Compiling
  * The library uses c++11 and requires <a target="_blank" href="http://www.boost.org/">Boost</a> with version 1.48.0 or
@@ -236,6 +238,15 @@ make \endverbatim
  * To test your build, run the following command in a terminal:
  * \verbatim  make test \endverbatim
  * 
+ * \subsection documentationgeneration Documentation
+ * To generate the documentation, <a target="_blank" href="http://www.doxygen.org/">Doxygen</a> is required.
+ * Run the following command in a terminal:
+\verbatim
+make doxygen
+# Documentation will be generated in the folder YYYY-MM-DD-hh-mm-ss_GUDHI_X.Y.Z/doc/html/
+# You can customize the directory name by calling `cmake -DUSER_VERSION_DIR=/my/custom/folder`
+\endverbatim
+ *
  * \section optionallibrary Optional third-party library
  * \subsection gmp GMP
  * The multi-field persistent homology algorithm requires GMP which is a free library for arbitrary-precision
@@ -251,6 +262,10 @@ make \endverbatim
  * \subsection cgal CGAL
  * The \ref alpha_complex data structure, \ref bottleneck_distance, and few examples requires CGAL, which is a C++
  * library which provides easy access to efficient and reliable geometric algorithms.
+ *
+ * \note There is no need to install CGAL, you can just <CODE>cmake . && make</CODE> CGAL (or even
+ * <CODE>cmake -DCGAL_HEADER_ONLY=ON .</CODE> for CGAL version &ge; 4.8.0), thereafter you will be able to compile
+ * GUDHI by calling <CODE>cmake -DCGAL_DIR=/your/path/to/CGAL-X.Y .. && make</CODE>
  * 
  * Having CGAL version 4.4.0 or higher installed is recommended. The procedure to install this library according to
  * your operating system is detailed here http://doc.cgal.org/latest/Manual/installation.html
@@ -371,7 +386,7 @@ make \endverbatim
  * Please help us improving the quality of the GUDHI library. You may report bugs or suggestions to:
  * \verbatim  Contact: gudhi-users@lists.gforge.inria.fr \endverbatim
  * 
- * Gudhi is open to external contributions. If you want to join our development team, please contact us.
+ * GUDHI is open to external contributions. If you want to join our development team, please contact us.
  * 
 */
 
@@ -386,7 +401,7 @@ make \endverbatim
  * \verbinclude  biblio/how_to_cite_gudhi.bib
 */
 
-// List of Gudhi examples - Doxygen needs at least a file tag to analyse comments
+// List of GUDHI examples - Doxygen needs at least a file tag to analyse comments
 /*! @file Examples
  * @example Alpha_complex/Alpha_complex_from_off.cpp
  * @example Alpha_complex/Alpha_complex_from_points.cpp