diff --git a/Manual_tools/TO_DO b/Manual_tools/TO_DO
index 8805d62b228..084a101868a 100644
--- a/Manual_tools/TO_DO
+++ b/Manual_tools/TO_DO
@@ -112,6 +112,10 @@ OPEN:
 
 -- flex problem with version > 2.5.4 (yytext_ptr)
 
+-- \footnote{aaa \bbb ccc} : html converter does not expand \bbb if there
+   are characters in front of it, so if \bbb happens to be not defined at 
+   footnote painting time, an error occurs
+
 Feature Requests
 ============================================================================
 
diff --git a/Manual_tools/src/cpp_formatting.C b/Manual_tools/src/cpp_formatting.C
index 798d6f3ab1a..3e5267ab95c 100644
--- a/Manual_tools/src/cpp_formatting.C
+++ b/Manual_tools/src/cpp_formatting.C
@@ -1532,9 +1532,13 @@ void format_nested_type( const char* nested_type_name) {
          is_index_enabled() ) 
     {
         // index
-        if ( ! template_class_name.empty())
-           make_index(string(nested_type_name),string(class_name),"",
+        if ( ! template_class_name.empty()) {
+          make_index(string(nested_type_name),string(class_name),"",
                    nested_type_name,'n');
+          *current_ostream << "<A NAME=\"Nested_type_";
+          filter_for_index_anchor( *current_ostream, nested_type_name);
+          *current_ostream << "\"></A>" << endl;
+        }
         // end index
     }
 
diff --git a/Manual_tools/src/latex_converter_config/html/cc_manual.sty b/Manual_tools/src/latex_converter_config/html/cc_manual.sty
index 30d30ac2130..75507e0b42f 100644
--- a/Manual_tools/src/latex_converter_config/html/cc_manual.sty
+++ b/Manual_tools/src/latex_converter_config/html/cc_manual.sty
@@ -258,8 +258,8 @@
 % | \leda, \cgal, \protocgal, \plageo
 % +--------------------------------------------------------------------------
 % selfmade
-\newcommand{\CC}{C++}
-\newcommand{\gcc}{g++}
+\newcommand{\CC}{C{\tt ++}}
+\newcommand{\gcc}{g{\tt ++}}
 \newcommand{\nat}{{\mathbb N}}
 \newcommand{\real}{{\mathbb R}}
 \newcommand{\R}{{\mathbb R}}  %% zusammen mit usepackage{amssymb}
diff --git a/Manual_tools/sty/test.tex b/Manual_tools/sty/test.tex
index 74dd5a970f9..ebd79ea3dd9 100644
--- a/Manual_tools/sty/test.tex
+++ b/Manual_tools/sty/test.tex
@@ -131,6 +131,8 @@ void Sqrt3(Polyhedron_3& p, Mask<Polyhedron_3> mask, int step = 1);
 applies the $\sqrt{3}$ triangulation on the control mesh \ccc{p} \ccc{step} times.
 The geometry of the refined mesh is computed by the geometry policy \ccc{mask}.
 This function overwrites the control mesh \ccc{p} with the refined mesh.
+
+aa
 }
              
 \footnotetext{Another footnote in this class file,