diff --git a/Documentation/BaseDoxyfile.in b/Documentation/BaseDoxyfile.in
index 74842281282..69465a16b9f 100644
--- a/Documentation/BaseDoxyfile.in
+++ b/Documentation/BaseDoxyfile.in
@@ -210,23 +210,23 @@ ALIASES += "CC=*C++*"
 ALIASES += "cgalExample{1}=<br><b>File</b> \ref \1 \include \1"
 ALIASES += "cgalFigureAnchor{1}=\anchor fig__\1"
 ALIASES += "cgalFigureRef{1}=\ref fig__\1"
-ALIASES += "cgalFigureBegin{2}=\anchor fig__\1 \n \image html \2 \n \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1   "
+ALIASES += "cgalFigureBegin{2}=\anchor fig__\1 \n \image html \2 \n \image latex \2 \"\" width=15cm \n \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \latexonly \n \endlatexonly \n \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{3}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{3}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=7.5cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=7.5cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{4}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> <TD> \image html \4 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{4}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=5cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=5cm \n </TD> <TD> \image html \4 \n \image latex \4 \"\" width=5cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{5}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> <TD> \image html \4 \n </TD> <TD> \image html \5 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{5}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=3.75cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=3.75cm \n </TD> <TD> \image html \4 \n \image latex \4 \"\" width=3.75cm \n </TD> <TD> \image html \5 \n \image latex \5 \"\" width=3.75cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{6}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> <TD> \image html \4 \n </TD> <TD> \image html \5 \n </TD> <TD> \image html \6 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{6}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=3cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=3cm \n </TD> <TD> \image html \4 \n \image latex \4 \"\" width=3cm \n </TD> <TD> \image html \5 \n \image latex \5 \"\" width=3cm \n </TD> <TD> \image html \6 \n \image latex \6 \"\" width=3cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{7}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> <TD> \image html \4 \n </TD> <TD> \image html \5 \n </TD> <TD> \image html \6 \n </TD> <TD> \image html \7 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{7}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=2.5cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=2.5cm \n </TD> <TD> \image html \4 \n \image latex \4 \"\" width=2.5cm \n </TD> <TD> \image html \5 \n \image latex \5 \"\" width=2.5cm \n </TD> <TD> \image html \6 \n \image latex \6 \"\" width=2.5cm \n </TD> <TD> \image html \7 \n \image latex \7 \"\" width=2.5cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{8}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> <TD> \image html \4 \n </TD> <TD> \image html \5 \n </TD> <TD> \image html \6 \n </TD> <TD> \image html \7 \n </TD> <TD> \image html \8 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{8}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=2.1cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=2.1cm \n </TD> <TD> \image html \4 \n \image latex \4 \"\" width=2.1cm \n </TD> <TD> \image html \5 \n \image latex \5 \"\" width=2.1cm \n </TD> <TD> \image html \6 \n \image latex \6 \"\" width=2.1cm \n </TD> <TD> \image html \7 \n \image latex \7 \"\" width=2.1cm \n </TD> <TD> \image html \8 \n \image latex \8 \"\" width=2.1cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{9}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> <TD> \image html \4 \n </TD> <TD> \image html \5 \n </TD> <TD> \image html \6 \n </TD> <TD> \image html \7 \n </TD> <TD> \image html \8 \n </TD> <TD> \image html \9 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{9}=\anchor fig__\1 \n  <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=1.9cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=1.9cm \n </TD> <TD> \image html \4 \n \image latex \4 \"\" width=1.9cm \n </TD> <TD> \image html \5 \n \image latex \5 \"\" width=1.9cm \n </TD> <TD> \image html \6 \n \image latex \6 \"\" width=1.9cm \n </TD> <TD> \image html \7 \n \image latex \7 \"\" width=1.9cm \n </TD> <TD> \image html \8 \n \image latex \8 \"\" width=1.9cm \n </TD> <TD> \image html \9 \n \image latex \9 \"\" width=1.9cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
-ALIASES += "cgalFigureBegin{10}=\anchor fig__\1 \n <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n </TD> <TD> \image html \3 \n </TD> <TD> \image html \4 \n </TD> <TD> \image html \5 \n </TD> <TD> \image html \6 \n </TD> <TD> \image html \7 \n </TD> <TD> \image html \8 \n </TD> <TD> \image html \9 \n </TD> <TD> \image html \10 \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"
+ALIASES += "cgalFigureBegin{10}=\anchor fig__\1 \n <CENTER> <TABLE border=0> <TR> <TD> \image html \2 \n \image latex \2 \"\" width=1.6cm \n </TD> <TD> \image html \3 \n \image latex \3 \"\" width=1.6cm \n </TD> <TD> \image html \4 \n \image latex \4 \"\" width=1.6cm \n </TD> <TD> \image html \5 \n \image latex \5 \"\" width=1.6cm \n </TD> <TD> \image html \6 \n \image latex \6 \"\" width=1.6cm \n </TD> <TD> \image html \7 \n \image latex \7 \"\" width=1.6cm \n </TD> <TD> \image html \8 \n \image latex \8 \"\" width=1.6cm \n </TD> <TD> \image html \9 \n \image latex \9 \"\" width=1.6cm \n </TD> <TD> \image html \10 \n \image latex \10 \"\" width=1.6cm \n </TD> </TR> </TABLE> </CENTER> \htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \n \latexonly \n \endlatexonly \ref fig__\1"
 
 ALIASES += "cgalFigureEnd=\htmlonly </div> \endhtmlonly <br>"
 ALIASES += "cgalFigureCaptionBegin{1}=\htmlonly <div class=\"cgal_figure_caption\"> \endhtmlonly \ref fig__\1"