diff --git a/Packages/Triangulation_2/TODO b/Packages/Triangulation_2/TODO index 43267a334c1..5e7e3bbccd5 100644 --- a/Packages/Triangulation_2/TODO +++ b/Packages/Triangulation_2/TODO @@ -1,4 +1,5 @@ - +- remove the Direction_2 from the requirements for the traits class + of Delaunay and Regular triangulations - change the return of get_conflicts and find_conflict to an output iterator ? - doc de le triangulation reguliere a mettre a jour diff --git a/Packages/Triangulation_2/doc_tex/Triangulation_2/main.tex b/Packages/Triangulation_2/doc_tex/Triangulation_2/main.tex index eb897fe83df..4e900944b8f 100644 --- a/Packages/Triangulation_2/doc_tex/Triangulation_2/main.tex +++ b/Packages/Triangulation_2/doc_tex/Triangulation_2/main.tex @@ -1,4 +1,4 @@ -\input{triangulation_user} +\input{triangulation_user.tex} %\input{Triangulation_2_ref/main.tex} diff --git a/Packages/Triangulation_2/doc_tex/basic/Makefile b/Packages/Triangulation_2/doc_tex/basic/Makefile index 93ffeaa8e13..b7772eda9d1 100644 --- a/Packages/Triangulation_2/doc_tex/basic/Makefile +++ b/Packages/Triangulation_2/doc_tex/basic/Makefile @@ -1,4 +1,5 @@ -TEXINPUTS=.:/0/prisme_util/latex:/u/abeille/0/prisme/yvinec/tex/inputs:Triangulation_2:TDS_2::../../examples: +LATEX_CONV_INPUTS=.:../../examples:Triangulation_2:TDS_2: +TEXINPUTS=.:/0/prisme_util/latex:/u/abeille/0/prisme/yvinec/tex/inputs:Triangulation_2:TDS_2:../../examples: doc: latex wrapper; @@ -8,9 +9,5 @@ doc: dvips wrapper -o Doc_html : - cd Triangulation_2; \ - cc_manual_to_html -title Triangulation_2 \ - -o ../../../doc_html/basic/Triangulation_2 main.tex - cd doc_tex/basic/TDS_2; \ - cc_manual_to_html -title Triangulation_data_structure_2 \ - -o ../../../doc_html/basic/TDS_2 main.tex \ No newline at end of file + cc_manual_to_html \ + -o ../../doc_html/basic/Triangulation_2 wrapper.tex diff --git a/Packages/Triangulation_2/doc_tex/basic/Triangulation_2/main.tex b/Packages/Triangulation_2/doc_tex/basic/Triangulation_2/main.tex index eb897fe83df..4e900944b8f 100644 --- a/Packages/Triangulation_2/doc_tex/basic/Triangulation_2/main.tex +++ b/Packages/Triangulation_2/doc_tex/basic/Triangulation_2/main.tex @@ -1,4 +1,4 @@ -\input{triangulation_user} +\input{triangulation_user.tex} %\input{Triangulation_2_ref/main.tex} diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h index d7a64c26597..a81b8be6375 100644 --- a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h +++ b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h @@ -35,6 +35,8 @@ template < class TDS = void > class Triangulation_ds_vertex_base_2 { typedef typename TDS::Face_handle Face_handle; + typedef typename TDS::Vertex_handle Vertex_handle; + public: typedef TDS Triangulation_data_structure;