From 3830e126843165d10257914495538aa20a8aa71c Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 24 May 2011 12:48:07 +0000 Subject: [PATCH 01/18] Add a check that isfinite is *not* a macro, otherwise #error --- Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp index 871e7db876c..1f495cd0170 100644 --- a/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp +++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp @@ -24,6 +24,11 @@ #include #include +#ifdef isfinite +# error isfinite cannot be a macro if one want to use C++0x std::isfinite +// On Intel Compiler 12, isfinite is a macro in :-( +#endif + template < typename T > void use(T) {} From 1ad7bac55b842340bb631256651542d544986741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 24 May 2011 13:03:39 +0000 Subject: [PATCH 02/18] change license from QPL to LGPL --- STL_Extension/include/CGAL/Modifiable_priority_queue.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/STL_Extension/include/CGAL/Modifiable_priority_queue.h b/STL_Extension/include/CGAL/Modifiable_priority_queue.h index c0bd11df492..c11f695e4b7 100644 --- a/STL_Extension/include/CGAL/Modifiable_priority_queue.h +++ b/STL_Extension/include/CGAL/Modifiable_priority_queue.h @@ -1,8 +1,9 @@ -// Copyright (c) 2006 GeometryFactory (France). All rights reserved. +// Copyright (c) 2006-2011 GeometryFactory (France). All rights reserved. // -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. From 3b92a391002572075ae58be7488a4d96001daf76 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 24 May 2011 14:06:13 +0000 Subject: [PATCH 03/18] Fix a bug in the branch build: put CGAL_INSTALLATION_PACKAGE_DIR in CGALConfig.cmake If CGAL_INSTALLATION_PACKAGE_DIR is not set in CGALConfig.cmake, then when one compile a demo/example on Windows, Installation/auxiliary (where precompiled version of some third party libraries should be put) cannot be found and used. That replaces the old CMake variable CGAL_SOURCE_DIRECTORY (before branch-build). --- Installation/cmake/modules/CGALConfig_binary.cmake.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in index ee2a7c4c1e3..ac6f6725760 100644 --- a/Installation/cmake/modules/CGALConfig_binary.cmake.in +++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in @@ -8,6 +8,9 @@ set(CGAL_CONFIG_LOADED TRUE) +set(CGAL_INSTALLATION_PACKAGE_DIR "@CGAL_INSTALLATION_PACKAGE_DIR@") +set(CGAL_CORE_PACKAGE_DIR "@CGAL_CORE_PACKAGE_DIR@") + set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" ) set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" ) set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" ) From cdb9ca77ff7f18f8754205c44f402a77dc34f07e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 24 May 2011 14:24:44 +0000 Subject: [PATCH 04/18] Backport a fix for Windows from the Mesh_3-with-protecting ball branch --- Polyhedron/demo/Polyhedron/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index 517ae78daef..a3636982302 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -203,7 +203,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) else() set(other_sources ${ARGN_TAIL}) endif() - qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc ) + qt4_generate_moc( ${plugin_implementation_base_name}.cpp "${CMAKE_CURRENT_BINARY_DIR}/${moc_file_name}" ) add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ) add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources}) From 8460d827264210153b8eb49767749a4960602bb7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 25 May 2011 13:32:55 +0000 Subject: [PATCH 05/18] Fix my patch of yesterday, which was obviously wrong! Yesterday, I did a partial import of a patch from /branches/experimental-packages/Mesh_3-protecting_balls-branch/Polyhedron/demo/Polyhedron/CMakeLists.txt but my patch was wrong! I should have tested! --- Polyhedron/demo/Polyhedron/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index a3636982302..076e343bed6 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -203,7 +203,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) else() set(other_sources ${ARGN_TAIL}) endif() - qt4_generate_moc( ${plugin_implementation_base_name}.cpp "${CMAKE_CURRENT_BINARY_DIR}/${moc_file_name}" ) + qt4_generate_moc( ${plugin_implementation_base_name}.cpp "${CMAKE_CURRENT_BINARY_DIR}/${plugin_implementation_base_name}.moc" ) add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ) add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources}) From a8b69a49cda49a2d943b569e9431363f016b1a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 27 May 2011 11:26:40 +0000 Subject: [PATCH 06/18] bug in simplify in case a sloop is created when an edge is simplified. For details see comments added --- Nef_3/include/CGAL/Nef_3/SNC_simplify.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Nef_3/include/CGAL/Nef_3/SNC_simplify.h b/Nef_3/include/CGAL/Nef_3/SNC_simplify.h index 9cfbf8ae5f2..b764dfacf03 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_simplify.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_simplify.h @@ -590,7 +590,22 @@ class SNC_simplify_base : public SNC_decorator { SHalfloop_handle sl; CGAL_forall_shalfloops(sl, *this->sncp()) { SM_decorator SD(&*sl->incident_sface()->center_vertex()); - SD.store_sm_boundary_object( sl, sl->incident_sface()); + //I added the following 'if' because even if the map has been cleared, when merging edges + //if one sloop is created and the vertex not simplified, then the map is updated. + //In the example below, the edge e is removed and a sloop is create on the sphere map + //of a vertex v. But since three edges are still incident to v, v is not simplified. + //There is one point where the distance between two non-edge-adjacent facets is 0. + // + // | | + // | | \ | / | | + // | / \ | / | / + // | / \|/ | / + // | / / | / + // | / / e | / + // |/______/_______|/ + // + if (!SD.map()->is_sm_boundary_object(sl)) + SD.store_sm_boundary_object( sl, sl->incident_sface()); } } From ccb1b1e39f88541329a5a77e5c43eec38c287461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 30 May 2011 09:15:46 +0000 Subject: [PATCH 07/18] document wrappers added --- STL_Extension/doc_tex/STL_Extension_ref/tuple.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex b/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex index 8774bc4963a..87c8cee049a 100644 --- a/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex +++ b/STL_Extension/doc_tex/STL_Extension_ref/tuple.tex @@ -33,7 +33,7 @@ is taken from Boost. Some free functions part of the standard interface of \ccc{tuple} are also brought in namespace \ccc{CGAL::cpp0x} with using declarations. These are \ccc{make_tuple}, -\ccc{get} and \ccc{tie}. +\ccc{get}, \ccc{tie}, \ccc{tuple_size} and \ccc{tuple_element}. \end{ccRefClass} From 1666c4fd57b0dc36b7d61e9eacb06b2d45db43d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 30 May 2011 09:16:37 +0000 Subject: [PATCH 08/18] use ccDeprecated environment of deprecation of classes --- .../STL_Extension_ref/stl_extension.tex | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex b/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex index f3183e2fa79..e7171bccc57 100644 --- a/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex +++ b/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex @@ -1434,16 +1434,16 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Twotuple} - + This class is DEPRECATED, and will be removed in some future CGAL release. + Please use \ccc{CGAL::cpp0x::array} instead. + + \begin{ccDeprecated} \ccDefinition The \ccRefName\ class stores a homogeneous (same type) pair of objects of type \ccc{T}. A \ccRefName\ is much like a container, in that it "owns" its elements. It is not actually a model of container, though, because it does not support the standard methods (such as iterators) for accessing the elements of a container. - This class is DEPRECATED, and will be removed in some future CGAL release. - Please use \ccc{CGAL::cpp0x::array} instead. - \ccInclude{CGAL/Twotuple.h} \ccRequirements \ccc{T} must be \ccc{Assignable}. @@ -1468,22 +1468,22 @@ \ccConstructor{Twotuple(T x, T y);}{constructs a \ccRefName\ such that \ccc{e0} is constructed from \ccc{x} and \ccc{e1} is constructed from \ccc{y}.} - + \end{ccDeprecated} \end{ccRefClass} %% +--------------------------------------------------------+ \begin{ccRefClass}{Threetuple} + This class is DEPRECATED, and will be removed in some future CGAL release. + Please use \ccc{CGAL::cpp0x::array} instead. + \begin{ccDeprecated} \ccDefinition The \ccRefName\ class stores a homogeneous (same type) triple of objects of type \ccc{T}. A \ccRefName\ is much like a container, in that it "owns" its elements. It is not actually a model of container, though, because it does not support the standard methods (such as iterators) for accessing the elements of a container. - This class is DEPRECATED, and will be removed in some future CGAL release. - Please use \ccc{CGAL::cpp0x::array} instead. - \ccInclude{CGAL/Threetuple.h} \ccRequirements \ccc{T} must be \ccc{Assignable}. @@ -1510,22 +1510,22 @@ \ccConstructor{Threetuple(T x, T y, T z);}{constructs a \ccRefName\ such that \ccc{e0} is constructed from \ccc{x}, \ccc{e1} is constructed from \ccc{y} and \ccc{e2} is constructed from \ccc{z}.} - + \end{ccDeprecated} \end{ccRefClass} %% +--------------------------------------------------------+ \begin{ccRefClass}{Fourtuple} + This class is DEPRECATED, and will be removed in some future CGAL release. + Please use \ccc{CGAL::cpp0x::array} instead. + \begin{ccDeprecated} \ccDefinition The \ccRefName\ class stores a homogeneous (same type) fourtuple of objects of type \ccc{T}. A \ccRefName\ is much like a container, in that it "owns" its elements. It is not actually a model of container, though, because it does not support the standard methods (such as iterators) for accessing the elements of a container. - This class is DEPRECATED, and will be removed in some future CGAL release. - Please use \ccc{CGAL::cpp0x::array} instead. - \ccInclude{CGAL/Fourtuple.h} \ccRequirements \ccc{T} must be \ccc{Assignable}. @@ -1554,22 +1554,22 @@ \ccConstructor{Fourtuple(T x, T y, T z, T t);}{constructs a \ccRefName\ such that \ccc{e0} is constructed from \ccc{x}, \ccc{e1} from \ccc{y}, \ccc{e2} from \ccc{z} and \ccc{e3} from \ccc{t}.} - + \end{ccDeprecated} \end{ccRefClass} %% +--------------------------------------------------------+ \begin{ccRefClass}{Sixtuple} - + This class is DEPRECATED, and will be removed in some future CGAL release. + Please use \ccc{CGAL::cpp0x::array} instead. + + \begin{ccDeprecated} \ccDefinition The \ccRefName\ class stores a homogeneous (same type) sixtuple of objects of type \ccc{T}. A \ccRefName\ is much like a container, in that it "owns" its elements. It is not actually a model of container, though, because it does not support the standard methods (such as iterators) for accessing the elements of a container. - This class is DEPRECATED, and will be removed in some future CGAL release. - Please use \ccc{CGAL::cpp0x::array} instead. - \ccInclude{CGAL/Sixtuple.h} \ccRequirements \ccc{T} must be \ccc{Assignable}. @@ -1603,6 +1603,7 @@ \ccRefName\ such that \ccc{e0} is constructed from \ccc{x}, \ccc{e1} from \ccc{y}, \ccc{e2} from \ccc{z}, \ccc{e3} from \ccc{t}, \ccc{e4} from \ccc{u} and \ccc{e5} from \ccc{v}.} + \end{ccDeprecated} \end{ccRefClass} From 9ad023eeb2818cc827304adc9f4d148c734b6ab7 Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Mon, 30 May 2011 10:12:38 +0000 Subject: [PATCH 09/18] Don't include compiler_config.h directly. --- CGALimageIO/include/CGAL/ImageIO.h | 2 +- iostream/include/CGAL/IO/io_tags.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h index a6a1538650b..78e08fbca59 100644 --- a/CGALimageIO/include/CGAL/ImageIO.h +++ b/CGALimageIO/include/CGAL/ImageIO.h @@ -21,7 +21,7 @@ #ifndef IMAGEIO_H #define IMAGEIO_H -#include +#include #include diff --git a/iostream/include/CGAL/IO/io_tags.h b/iostream/include/CGAL/IO/io_tags.h index 6f7a59e5bcd..92d9a7e3da7 100644 --- a/iostream/include/CGAL/IO/io_tags.h +++ b/iostream/include/CGAL/IO/io_tags.h @@ -26,7 +26,7 @@ #define CGAL_IO_TAGS_H #include -#include +#include namespace CGAL { From e5aee57eabe334caa09fb946545d25005b04cdf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 30 May 2011 11:26:56 +0000 Subject: [PATCH 10/18] use lower-case for deprecated --- STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex b/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex index e7171bccc57..47ac447c6f4 100644 --- a/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex +++ b/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex @@ -1434,7 +1434,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Twotuple} - This class is DEPRECATED, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future CGAL release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} @@ -1474,7 +1474,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Threetuple} - This class is DEPRECATED, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future CGAL release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} @@ -1516,7 +1516,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Fourtuple} - This class is DEPRECATED, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future CGAL release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} @@ -1560,7 +1560,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Sixtuple} - This class is DEPRECATED, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future CGAL release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} From 6c0a2019baa2cf7f264bc6d566f5a242f7505f1e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 30 May 2011 11:28:15 +0000 Subject: [PATCH 11/18] MS: auto-link for psapi.lib, instead of having an explicit link command. --- Installation/cmake/modules/CGAL_SetupDependencies.cmake | 5 ----- Profiling_tools/include/CGAL/Memory_sizer.h | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Installation/cmake/modules/CGAL_SetupDependencies.cmake b/Installation/cmake/modules/CGAL_SetupDependencies.cmake index ce5c31fa041..c40deb88b46 100644 --- a/Installation/cmake/modules/CGAL_SetupDependencies.cmake +++ b/Installation/cmake/modules/CGAL_SetupDependencies.cmake @@ -30,8 +30,3 @@ if ( WITH_NTL ) endif( WITH_NTL ) include(CGAL_SetupBoost) - -if ( MSVC ) - add_to_cached_list(CGAL_3RD_PARTY_LIBRARIES "psapi.lib" ) -endif( MSVC ) - diff --git a/Profiling_tools/include/CGAL/Memory_sizer.h b/Profiling_tools/include/CGAL/Memory_sizer.h index ab667543f75..c18cdb6797e 100644 --- a/Profiling_tools/include/CGAL/Memory_sizer.h +++ b/Profiling_tools/include/CGAL/Memory_sizer.h @@ -43,6 +43,12 @@ struct Memory_sizer #if defined _MSC_VER # include # include "psapi.h" + +// auto-link with psapi.lib +# define CGAL_LIB_NAME psapi +# define CGAL_AUTO_LINK_NOMANGLE +# include + #elif defined __linux__ # include # include From 0bed78feda80d293272ba73aa5047ab50ef180f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 30 May 2011 11:38:24 +0000 Subject: [PATCH 12/18] use ccDeprecated for the whole class --- .../Convex_hull_projective_xy_traits_2.tex | 6 ++++-- .../Convex_hull_projective_xz_traits_2.tex | 4 ++-- .../Convex_hull_projective_yz_traits_2.tex | 4 ++-- .../Triangulation_euclidean_traits_xy_3.tex | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xy_traits_2.tex b/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xy_traits_2.tex index a510892a702..5449d6d4733 100644 --- a/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xy_traits_2.tex +++ b/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xy_traits_2.tex @@ -12,12 +12,13 @@ \ccIndexTraitsClassBegin{Convex_hull_projective_xy_traits_2}{}{convex hull, 2D} -\begin{ccDeprecated} + The functionality of this class has been generalized to other packages than 2D convex hulls. The more general class \ccc{Projection_traits_xy_3} can be found in the 2D and 3D Linear Geometric Kernel. Note that the deprecated class was templated by a point class, whereas the new class is templated by a geometric kernel. -\end{ccDeprecated} + +\begin{ccDeprecated} \ccDefinition @@ -85,6 +86,7 @@ $xy$ plane (\textit{i.e.}, by ignoring the $z$ coordinate). \ccIndexTraitsClassEnd \ccAutoIndexingOff +\end{ccDeprecated} \end{ccRefClass} \ccAutoIndexingOn diff --git a/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xz_traits_2.tex b/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xz_traits_2.tex index 342f6f2f675..0455b2c3605 100644 --- a/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xz_traits_2.tex +++ b/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_xz_traits_2.tex @@ -12,13 +12,12 @@ \ccIndexTraitsClassBegin{Convex_hull_projective_xz_traits_2}{}{convex hull, 2D} -\begin{ccDeprecated} The functionality of this class has been generalized to other packages than 2D convex hulls. The more general class \ccc{Projection_traits_xy_3} can be found in the 2D and 3D Linear Geometric Kernel. Note that the deprecated class was templated by a point class, whereas the new class is templated by a geometric kernel. -\end{ccDeprecated} +\begin{ccDeprecated} \ccDefinition The class \ccRefName\ serves as a traits class for all the two-dimensional @@ -83,6 +82,7 @@ _distance_to_line_2}{} \ccIndexTraitsClassEnd \ccAutoIndexingOff +\end{ccDeprecated} \end{ccRefClass} \ccAutoIndexingOn diff --git a/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_yz_traits_2.tex b/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_yz_traits_2.tex index a230ba16f4b..ce5ec5cecfb 100644 --- a/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_yz_traits_2.tex +++ b/Convex_hull_2/doc_tex/Convex_hull_2_ref/Convex_hull_projective_yz_traits_2.tex @@ -12,13 +12,12 @@ \ccIndexTraitsClassBegin{Convex_hull_projective_yz_traits_2}{}{convex hull, 2D} -\begin{ccDeprecated} The functionality of this class has been generalized to other packages than 2D convex hulls. The more general class \ccc{Projection_traits_xy_3} can be found in the 2D and 3D Linear Geometric Kernel. Note that the deprecated class was templated by a point class, whereas the new class is templated by a geometric kernel. -\end{ccDeprecated} +\begin{ccDeprecated} \ccDefinition The class \ccRefName\ serves as a traits class for all the two-dimensional @@ -85,6 +84,7 @@ _distance_to_line_2}{} \ccIndexTraitsClassEnd \ccAutoIndexingOff +\end{ccDeprecated} \end{ccRefClass} \ccAutoIndexingOn diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_euclidean_traits_xy_3.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_euclidean_traits_xy_3.tex index 433ea547421..33064402f41 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_euclidean_traits_xy_3.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Triangulation_euclidean_traits_xy_3.tex @@ -13,10 +13,10 @@ \begin{ccRefClass}{Triangulation_euclidean_traits_xy_3} %% add template arg's if necessary -\begin{ccDeprecated} The functionality of this class has been generalized to other packages than 2D triangulations. The more general class \ccc{Projection_traits_xy_3} can be found in the 2D and 3D Linear Geometric Kernel. -\end{ccDeprecated} + +\begin{ccDeprecated} %% \ccHtmlCrossLink{} %% add further rules for cross referencing links %% \ccHtmlIndexC[class]{} %% add further index entries @@ -198,7 +198,7 @@ respectively. \ccInclude{CGAL/Triangulation_euclidean_traits_xz_3.h}\\ \ccInclude{CGAL/Triangulation_euclidean_traits_yz_3.h} - +\end{ccDeprecated} \end{ccRefClass} % +------------------------------------------------------------------------+ From ca1339288016be437c436644b4548d226468f83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 30 May 2011 12:36:57 +0000 Subject: [PATCH 13/18] CGAL -> \cgal\ --- AABB_tree/doc_tex/AABB_tree/examples.tex | 2 +- AABB_tree/doc_tex/AABB_tree/performances.tex | 2 +- .../doc_tex/Algebraic_foundations/history.tex | 2 +- .../doc_tex/Algebraic_foundations/real_number_types.tex | 2 +- Algebraic_kernel_d/doc_tex/Algebraic_kernel_d/models.tex | 2 +- .../doc_tex/Algebraic_kernel_for_circles_ref/intro.tex | 8 ++++---- Convex_hull_d/doc_tex/Convex_hull_d_ref/Delaunay_d.tex | 2 +- .../doc_tex/Developers_manual/directory_structure.tex | 4 ++-- .../doc_tex/Developers_manual/memory_management.tex | 2 +- .../doc_tex/Developers_manual/namespaces.tex | 2 +- Developers_manual/doc_tex/Developers_manual/testing.tex | 2 +- Developers_manual/doc_tex/Developers_manual/tools.tex | 2 +- Installation/doc_tex/Installation/appendix.tex | 2 +- Installation/doc_tex/Installation/installation.tex | 6 +++--- Kernel_23/doc_tex/Kernel_23/kernel_representation.tex | 6 +++--- Kernel_23/doc_tex/Kernel_23_ref/Kernel.tex | 2 +- Kernel_d/doc_tex/Kernel_d/history.tex | 2 +- Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex | 4 ++-- .../doc_tex/Kinetic_framework/architecture.tex | 4 ++-- .../doc_tex/Kinetic_framework/overview.tex | 4 ++-- .../Kinetic_framework_ref/Cartesian_kinetic_kernel.tex | 2 +- .../doc_tex/Kinetic_framework_ref/KineticKernel.tex | 2 +- Manual_tools/doc_tex/cc_manual.tex | 8 ++++---- .../ConformingDelaunayTriangulationTraits_2.tex | 2 +- Mesh_2/doc_tex/Mesh_2_ref/DelaunayMeshTraits_2.tex | 2 +- Mesh_3/doc_tex/Mesh_3/mesh_3_user.tex | 4 ++-- Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex | 2 +- Nef_2/doc_tex/Nef_2/user.tex | 2 +- Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex | 2 +- .../doc_tex/NumberTypeSupport_ref/Interval_nt.tex | 2 +- Number_types/doc_tex/NumberTypeSupport_ref/open.tex | 2 +- .../doc_tex/Point_set_processing_3/introduction.tex | 2 +- .../doc_tex/Principal_component_analysis/introduction.tex | 2 +- STL_Extension/doc_tex/STL_Extension_ref/Uncertain.tex | 2 +- STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex | 8 ++++---- .../Create_exterior_skeleton_and_offset_polygons_2.tex | 4 ++-- .../Create_exterior_straight_skeleton_2.tex | 2 +- .../Create_interior_skeleton_and_offset_polygons_2.tex | 4 ++-- .../Create_interior_straight_skeleton_2.tex | 2 +- .../Straight_skeleton_2_ref/Create_offset_polygons_2.tex | 2 +- .../Straight_skeleton_builder_traits_2.tex | 2 +- .../doc_tex/Stream_lines_2_ref/StreamLinesTraits_2.tex | 2 +- .../Parameterization_polyhedron_adaptor_3.tex | 2 +- .../Complex_2_in_triangulation_3.tex | 2 +- .../Surface_mesher_ref/ImplicitSurfaceTraits_3.tex | 2 +- .../Surface_reconstruction_points_3/case_studies.tex | 2 +- .../doc_tex/Triangulation_2/triangulation_user.tex | 4 ++-- .../Triangulation_2_ref/Constrained_triangulation_2.tex | 2 +- .../doc_tex/Triangulation_2_ref/TriangulationTraits_2.tex | 2 +- Triangulation_3/doc_tex/Triangulation_3/Triang3.tex | 2 +- 50 files changed, 71 insertions(+), 71 deletions(-) diff --git a/AABB_tree/doc_tex/AABB_tree/examples.tex b/AABB_tree/doc_tex/AABB_tree/examples.tex index f302144f425..a0e9fc71438 100644 --- a/AABB_tree/doc_tex/AABB_tree/examples.tex +++ b/AABB_tree/doc_tex/AABB_tree/examples.tex @@ -6,7 +6,7 @@ In the following example a set of 3D triangles is stored in a list. The AABB pri \ccIncludeExampleCode{AABB_tree/AABB_triangle_3_example.cpp} \subsection{Tree of Polyhedron Triangle Facets for Intersection Queries} -In the following example the AABB primitive wraps a facet handle of a triangle polyhedral surface as \ccc{id} and the corresponding 3D triangle as geometric object. From a segment query we test the intersections, then compute the number of intersections, compute the first encountered intersection (generally a point), compute all intersections (where each intersection is a pair of one CGAL object and one primitive id - here a face handle) and compute all intersected primitives. The latter involves only tests and no predicates and is hence faster than computing all intersections. We also compute the first encountered intersection with a plane query, which is generally a segment. +In the following example the AABB primitive wraps a facet handle of a triangle polyhedral surface as \ccc{id} and the corresponding 3D triangle as geometric object. From a segment query we test the intersections, then compute the number of intersections, compute the first encountered intersection (generally a point), compute all intersections (where each intersection is a pair of one \cgal\ object and one primitive id - here a face handle) and compute all intersected primitives. The latter involves only tests and no predicates and is hence faster than computing all intersections. We also compute the first encountered intersection with a plane query, which is generally a segment. \ccIncludeExampleCode{AABB_tree/AABB_polyhedron_facet_intersection_example.cpp} \subsection{Tree of Polyhedron Triangle Facets for Distance Queries} diff --git a/AABB_tree/doc_tex/AABB_tree/performances.tex b/AABB_tree/doc_tex/AABB_tree/performances.tex index b2498bffe7a..b118c086ddf 100644 --- a/AABB_tree/doc_tex/AABB_tree/performances.tex +++ b/AABB_tree/doc_tex/AABB_tree/performances.tex @@ -115,7 +115,7 @@ The experiments described above are neither exhaustive nor conclusive as we have \begin{itemize} -\item Kernel: The type of CGAL kernel turns out to dominate the final execution times, the maximum performances being obtained with the simple Cartesian kernel parameterized with the double precision number type. In applications where the intersection and distance execution times are crucial it is possible to use this kernel for the AABB tree in combination with a more robust kernel for the main data structure. +\item Kernel: The type of \cgal\ kernel turns out to dominate the final execution times, the maximum performances being obtained with the simple Cartesian kernel parameterized with the double precision number type. In applications where the intersection and distance execution times are crucial it is possible to use this kernel for the AABB tree in combination with a more robust kernel for the main data structure. \item Primitives: Although the number of input primitives plays an obvious role in the final performance, their distribution in space is at least equally important in order to obtain a well-balanced AABB tree. Ideally the primitives must be evenly distributed in space and the long primitives spanning the bounding box of the tree root node must be avoided as much as possible. It is often beneficial to split these long primitives into smaller ones before constructing the tree, e.g., through recursive longest edge bisection for triangle surface meshes. diff --git a/Algebraic_foundations/doc_tex/Algebraic_foundations/history.tex b/Algebraic_foundations/doc_tex/Algebraic_foundations/history.tex index 58791662fb3..45047da4c93 100644 --- a/Algebraic_foundations/doc_tex/Algebraic_foundations/history.tex +++ b/Algebraic_foundations/doc_tex/Algebraic_foundations/history.tex @@ -1,6 +1,6 @@ \section{Design and Implementation History} -The package is part of CGAL since release 3.3. Of course the package is based +The package is part of \cgal\ since release 3.3. Of course the package is based on the former Number type support of CGAL. This goes back to Stefan Schirra and Andreas Fabri. But on the other hand the package is to a large extend influenced by the experience with the number type support in \exacus~\cite{beh+-eeeafcs-05}, which in the main goes back to diff --git a/Algebraic_foundations/doc_tex/Algebraic_foundations/real_number_types.tex b/Algebraic_foundations/doc_tex/Algebraic_foundations/real_number_types.tex index 0b8fcb0b6d1..ccbcf368511 100644 --- a/Algebraic_foundations/doc_tex/Algebraic_foundations/real_number_types.tex +++ b/Algebraic_foundations/doc_tex/Algebraic_foundations/real_number_types.tex @@ -1,5 +1,5 @@ \section{Real Number Types} -Every CGAL \ccc{Kernel} comes with two \emph{real number types} +Every \cgal\ \ccc{Kernel} comes with two \emph{real number types} (number types embeddable into the real numbers). One of them is a \ccc{FieldNumberType}, and the other a \ccc{RingNumberType}. The coordinates of the basic kernel objects (points, vectors, etc.) come diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d/models.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d/models.tex index 3cea3d4e7ce..d93791c04ce 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d/models.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d/models.tex @@ -79,7 +79,7 @@ interfaces between layers. Specifically, working with only one number type allows to optimize some polynomial operations as well as memory handling. The implementation of these kernels make heavy use of the \mpfr~\cite{cgal:mt-mpfr} and \mpfi~\cite{cgal:r-mpfi} -libraries, and of their CGAL interfaces, \ccc{Gmpfr} and \ccc{Gmpfi}. +libraries, and of their \cgal\ interfaces, \ccc{Gmpfr} and \ccc{Gmpfi}. The algebraic numbers (roots of the polynomials) are represented in the two \rs~kernels by a \ccc{Gmpfi} interval and a pointer to the polynomial of which they are roots. See \cite{cgal:lpt-wea-09} diff --git a/Algebraic_kernel_for_circles/doc_tex/Algebraic_kernel_for_circles_ref/intro.tex b/Algebraic_kernel_for_circles/doc_tex/Algebraic_kernel_for_circles_ref/intro.tex index 1cc73da4619..9dfa385f7fd 100644 --- a/Algebraic_kernel_for_circles/doc_tex/Algebraic_kernel_for_circles_ref/intro.tex +++ b/Algebraic_kernel_for_circles/doc_tex/Algebraic_kernel_for_circles_ref/intro.tex @@ -4,7 +4,7 @@ \begin{ccAdvanced} As in Curved-kernel, I use the ``Advanced'' environment in this -document to distinguish between my current submission to the CGAL +document to distinguish between my current submission to the \cgal\ editorial board and plans for the future, related to ACS. The ``Advanced'' parts will disappear if/when this is released. \end{ccAdvanced} @@ -33,10 +33,10 @@ Polynomial-2-2's gives Root-of-4's...) General remark about the suffix \ccc{_d_v}: \ccc{_d} stands for the degree of the polynomials and the algebraic numbers, and \ccc{_v} stands for the number of variables, which is analogous to the -dimension for CGAL geometric objects. I had already mentioned this in an -earlier version of this document (presented at the CGAL meeting at +dimension for \cgal\ geometric objects. I had already mentioned this in an +earlier version of this document (presented at the \cgal\ meeting at INRIA in march 05), and it is consistent with what Menelaos proposed -later (CGAL meeting in Pisa in june 05) for a hierarchy of algebraic kernels. +later (\cgal\ meeting in Pisa in june 05) for a hierarchy of algebraic kernels. \end{ccAdvanced} \subsubsection*{Functors} diff --git a/Convex_hull_d/doc_tex/Convex_hull_d_ref/Delaunay_d.tex b/Convex_hull_d/doc_tex/Convex_hull_d_ref/Delaunay_d.tex index da2ec05c72b..87afeef28e5 100644 --- a/Convex_hull_d/doc_tex/Convex_hull_d_ref/Delaunay_d.tex +++ b/Convex_hull_d/doc_tex/Convex_hull_d_ref/Delaunay_d.tex @@ -246,7 +246,7 @@ point set $S$ and the convex hull of \ccc{lift(S)}: The nearest site Delaunay triangulation is the projection of the lower hull and the furthest site Delaunay triangulation is the upper hull. For implementation details we refer the reader to the implementation -report available from the CGAL server. +report available from the \cgal\ server. The space requirement is the same as for convex hulls. The time requirement for an insert is the time to insert the lifted point diff --git a/Developers_manual/doc_tex/Developers_manual/directory_structure.tex b/Developers_manual/doc_tex/Developers_manual/directory_structure.tex index cbf788ed008..b086f4c5961 100644 --- a/Developers_manual/doc_tex/Developers_manual/directory_structure.tex +++ b/Developers_manual/doc_tex/Developers_manual/directory_structure.tex @@ -110,10 +110,10 @@ The directory structure of a package named Package should be as follows: instance, GMP goes here when using the Windows installer. The average package won't have this directory. \item[{\tt scripts}]\index{scripts directory@{\tt scripts} - directory} contains scripts that are of interest to CGAL users. + directory} contains scripts that are of interest to \cgal\ users. \item[{\tt developer\_scripts}]\index{developers\_scripts directory@{\tt developers\_scripts} directory} contains - scripts that are of interest to CGAL developers. This directory + scripts that are of interest to \cgal\ developers. This directory is included in internal releases only, not in public releases. \item[{\tt dont\_submit}]% \ccIndexMainItem{\tt dont\_submit} specifies files and directories diff --git a/Developers_manual/doc_tex/Developers_manual/memory_management.tex b/Developers_manual/doc_tex/Developers_manual/memory_management.tex index 0ea5128f482..79da282c295 100644 --- a/Developers_manual/doc_tex/Developers_manual/memory_management.tex +++ b/Developers_manual/doc_tex/Developers_manual/memory_management.tex @@ -44,7 +44,7 @@ The macro \ccc{CGAL_ALLOCATOR}\ccIndexMainItem{\ccFont CGAL_ALLOCATOR} is defined in the file \ccc{} to be the standard allocator from \ccc{}. However, the user can redefine it, for example, if \leda\ is present, -he can define it (before including any CGAL header file) this way : +he can define it (before including any \cgal\ header file) this way : \begin{verbatim} #include diff --git a/Developers_manual/doc_tex/Developers_manual/namespaces.tex b/Developers_manual/doc_tex/Developers_manual/namespaces.tex index fa5ff42c67b..b6ee43aa8d8 100644 --- a/Developers_manual/doc_tex/Developers_manual/namespaces.tex +++ b/Developers_manual/doc_tex/Developers_manual/namespaces.tex @@ -105,7 +105,7 @@ Requirements: (including namespaces nested in namespace \ccc{CGAL}). \item explicitly prefix calls to template functions of CGAL (such as \ccc{square}, \ccc{sign}, \ccc{abs}, \dots) by \ccc{CGAL::} -to ensure the functions used are the one from CGAL and not one from another +to ensure the functions used are the one from \cgal\ and not one from another library. If you want to allow an optimized function from another library to be used, then you should not qualify the call and document it explicitly (if appropriate). diff --git a/Developers_manual/doc_tex/Developers_manual/testing.tex b/Developers_manual/doc_tex/Developers_manual/testing.tex index 8d838ab040f..92f5af20563 100644 --- a/Developers_manual/doc_tex/Developers_manual/testing.tex +++ b/Developers_manual/doc_tex/Developers_manual/testing.tex @@ -46,7 +46,7 @@ It is strongly recommended for a test suite of a package to should be called at least once. (See Section~\ref{sec:gcov} for a description of a tool you can use to test for code coverage.) \item Use more than one instantiation of templated functions or classes. -\item A lot of classes in CGAL can be parametrized by traits classes, so +\item A lot of classes in \cgal\ can be parametrized by traits classes, so that they are usable with different kernels. In such cases more than one kernel should be used for testing. \item Use pre- and postcondition checkers wherever it is possible in the diff --git a/Developers_manual/doc_tex/Developers_manual/tools.tex b/Developers_manual/doc_tex/Developers_manual/tools.tex index d36a2ca44ce..9664ec3efcc 100644 --- a/Developers_manual/doc_tex/Developers_manual/tools.tex +++ b/Developers_manual/doc_tex/Developers_manual/tools.tex @@ -37,7 +37,7 @@ Most of these scripts can be in at least two places. The script \ccAnchor{https://gforge.inria.fr/plugins/scmsvn/viewcvs.php/trunk/Scripts/developer_scripts/create_new_release?root=cgal&view=markup} -{{\tt create\_new\_release}} builds a tarball of CGAL from an SVN working +{{\tt create\_new\_release}} builds a tarball of \cgal\ from an SVN working copy of the trunk (or a branch). The command \begin{verse} diff --git a/Installation/doc_tex/Installation/appendix.tex b/Installation/doc_tex/Installation/appendix.tex index c1120726340..46f1dfc24b0 100644 --- a/Installation/doc_tex/Installation/appendix.tex +++ b/Installation/doc_tex/Installation/appendix.tex @@ -58,7 +58,7 @@ The Bourne-shell script \texttt{cgal\_create\_cmake\_script} is contained in the \texttt{cgal\_create\_cmake\_script} in an application directory creates a \texttt{CMakeLists.txt} containing rules for every \texttt{*.cpp} file there. Currently, that script only works for applications that only need -the CGAL and CGALCore libraries. +the \cgal\ and CGALCore libraries. %% diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index ba2e8fad975..509fa385861 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -803,9 +803,9 @@ cmake -DCGAL_DIR=CGAL-3.8 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=-O2 -DCGAL_ For relatively simple programs the Bourne-shell script \texttt{cgal\_create\_cmake\_script} can be used (a short description of this file is provided in Appendix \ref{sec:create_cgal_cmake_script}). -More generally, within a cmake script, once CGAL has been found using \texttt{find\_package} +More generally, within a cmake script, once \cgal\ has been found using \texttt{find\_package} the variable \texttt{CGAL\_USE\_FILE} is set to a compilation environment CMake file. Including -this file within a cmake script sets up include paths and libraries to link with of CGAL and third party libraries. +this file within a cmake script sets up include paths and libraries to link with of \cgal\ and third party libraries. \section{Summary of Configuration Variables} @@ -984,7 +984,7 @@ Under Linux, the GMPXX is also searched for, and you may specify the following v \index{cgal!general-config-cmake-vars-dep-mpfi}\index{cgal configuration cmake variables - dependencies - mpfi} \subsubsection{MPFI library} -CGAL provides a number type based on this library, but the CGAL library +\cgal\ provides a number type based on this library, but the \cgal\ library itself does not depend on MPFI. This means that this library must be configured when compiling an application that uses the above number type. diff --git a/Kernel_23/doc_tex/Kernel_23/kernel_representation.tex b/Kernel_23/doc_tex/Kernel_23/kernel_representation.tex index 9afef9fc85a..3ac71180ddc 100644 --- a/Kernel_23/doc_tex/Kernel_23/kernel_representation.tex +++ b/Kernel_23/doc_tex/Kernel_23/kernel_representation.tex @@ -44,7 +44,7 @@ kernel concept. For all kernel objects types, the types \ccHtmlNoLinksFrom{\ccc{CGAL::Type}} and \ccHtmlNoLinksFrom{\ccc{Kernel::Type}} are identical. -CGAL offers four families of concrete models for the concept Kernel, +\cgal\ offers four families of concrete models for the concept Kernel, two based on the \ccHtmlNoLinksFrom{Cartesian} representation of points and two based on the homogeneous representation of points. The interface of the kernel objects is designed such that it works well @@ -92,7 +92,7 @@ this case. With \ccc{Cartesian}, both \ccc{FieldNumberType}. \ccc{Cartesian} uses reference counting internally to -save copying costs. CGAL also provides +save copying costs. \cgal\ also provides \ccc{Simple_cartesian}, a kernel that uses \ccHtmlNoLinksFrom{Cartesian} representation but no reference counting. Debugging is easier with @@ -131,7 +131,7 @@ quotients, i.e., a numerator and a denominator. With \ccc{RingNumberType}. \ccc{Homogeneous} uses reference counting internally -to save copying costs. CGAL also provides +to save copying costs. \cgal\ also provides \ccc{Simple_homogeneous}, a kernel that uses \ccHtmlNoLinksFrom{homogeneous} representation but no reference counting. Debugging is easier with diff --git a/Kernel_23/doc_tex/Kernel_23_ref/Kernel.tex b/Kernel_23/doc_tex/Kernel_23_ref/Kernel.tex index 7a4dd81b9f8..0ce9097582a 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/Kernel.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/Kernel.tex @@ -35,7 +35,7 @@ especially for equality testing. \ccNestedType{RT}{a model of \ccc{RingNumberType}} The following types describe the return types of predicates. They typically -map to \ccc{bool} and CGAL kernel enum types, except when an interval arithmetic +map to \ccc{bool} and \cgal\ kernel enum types, except when an interval arithmetic number type is used such as within the filtering kernels, in which case it is \ccc{Uncertain} or similar. diff --git a/Kernel_d/doc_tex/Kernel_d/history.tex b/Kernel_d/doc_tex/Kernel_d/history.tex index b58196ac372..ca5e0360faf 100644 --- a/Kernel_d/doc_tex/Kernel_d/history.tex +++ b/Kernel_d/doc_tex/Kernel_d/history.tex @@ -7,7 +7,7 @@ original design was driven by the realization of a d-dimensional convex hull data type developed at the \ccHtmlNoLinksFrom{Max-Planck Institut f\"ur Informatik}. -The code base was discussed and reviewed within the CGAL kernel group +The code base was discussed and reviewed within the \cgal\ kernel group (of the low-dimensional kernel). This led to the identification of the concept interfaces and in parallel to adaptations according to the evolution of the low-dimensional kernel. The kernel was revised diff --git a/Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex b/Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex index 27606345321..bd0daf32851 100644 --- a/Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex +++ b/Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex @@ -41,7 +41,7 @@ class provides the actual implementations of the kernel objects. For all kernel objects \ccc{Kernel_object}, the types \ccc{CGAL::Kernel_object} and \ccc{R::Kernel_object} are identical. -CGAL offers two families of concrete models for the concept +\cgal\ offers two families of concrete models for the concept representation class, one based on the \ccHtmlNoLinksFrom{Cartesian} representation of points and one based on the homogeneous representation of points. The interface of the kernel objects is @@ -153,7 +153,7 @@ makes all \cgal\ classes very uniform. They {\bf always} consist of: \subsection{Kernel as a Traits Class} -Algorithms and data structures in the basic library of CGAL are +Algorithms and data structures in the basic library of \cgal\ are parameterized by a traits class that subsumes the objects on which the algorithm or data structure operates as well as the operations to do so. For most of the algorithms and data structures in the basic diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework/architecture.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework/architecture.tex index 4c80101d1e0..d945d2883c3 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework/architecture.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework/architecture.tex @@ -211,7 +211,7 @@ structure. \subsection{The Kinetic::InstantaneousKernel\label{sec:kds_instantaneous_kernel}} -The \ccc{Kinetic::InstantaneousKernel} allows existing CGAL data structures +The \ccc{Kinetic::InstantaneousKernel} allows existing \cgal\ data structures to be used on moving data as it appears at some instant of time. Models of this concept are, by definition, models of a CGAL Kernel or a traits class, and, therefore, can then be used as @@ -227,7 +227,7 @@ initialization, as well as at times during the simulation when we want to insert a point to the kinetic Delaunay triangulation, a static version of the Delaunay triangulation is conceptually instantiated. More precisely, the time for the copy of the model of the -\ccc{Kinetic::InstantaneousKernel} stored in the CGAL triangulation is set +\ccc{Kinetic::InstantaneousKernel} stored in the \cgal\ triangulation is set to be the current time (or rather, as discussed in the introduction, a more convenient time determined by the \ccc{Kinetic::Simulator} combinatorially equivalent to the current time). The kinetic data diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework/overview.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework/overview.tex index 6ee62f45f41..708c1c1f531 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework/overview.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework/overview.tex @@ -32,7 +32,7 @@ structure interacts with the various parts. The main concepts are the correct order and audit kinetic data structures. There should be one instance of a model of this concept per simulation. \item the \ccc{Kinetic::Kernel}. The structure of a - \ccc{Kinetic::Kernel} is analogous to the static CGAL (i.e., + \ccc{Kinetic::Kernel} is analogous to the static \cgal\ (i.e., non-kinetic) kernels in that it defines a set of primitives and functors which generate certificates from the primitives. \item the \ccc{Kinetic::ActiveObjectsTable}. Models of this concept hold a @@ -42,7 +42,7 @@ structure interacts with the various parts. The main concepts are primitives are added or primitives are deleted. There is generally one instance of a model of this concept per simulation. \item the \ccc{Kinetic::InstantaneousKernel}. Models of this concept allow - existing non-kinetic CGAL data structures to be used on a snapshot + existing non-kinetic \cgal\ data structures to be used on a snapshot of kinetic data. As a result, pre-existing static structures can be used to initialize and audit kinetic data structures. \item the \ccc{Kinetic::FunctionKernel}. This concept is the computational diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex index 4058d8e5982..21224a35bbb 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/Cartesian_kinetic_kernel.tex @@ -20,7 +20,7 @@ This class provides a model of \ccc{Kinetic::Kernel} for use with general Cartesian geometry. -The IO format for points is currently $p_0$, $p_1$, ... $w$. $p_i$ and $w$ are instances of Function. There IO format is typically $c_0+c_1t+c_2t^2+...$. Beware of issues with CGAL IO of the coeffients as exact number typles often require that the coefficents be expressed as $a/b$ even when $b$ is 1. +The IO format for points is currently $p_0$, $p_1$, ... $w$. $p_i$ and $w$ are instances of Function. There IO format is typically $c_0+c_1t+c_2t^2+...$. Beware of issues with \cgal\ IO of the coeffients as exact number typles often require that the coefficents be expressed as $a/b$ even when $b$ is 1. \ccInclude{CGAL/Kinetic/Cartesian.h} diff --git a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex index 52ee2717745..091274ccc54 100644 --- a/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex +++ b/Kinetic_data_structures/doc_tex/Kinetic_framework_ref/KineticKernel.tex @@ -18,7 +18,7 @@ \ccDefinition -The concept \ccRefName\ acts as the kinetic analog of a CGAL kernel. +The concept \ccRefName\ acts as the kinetic analog of a \cgal\ kernel. It provides some set of primitives and predicats acting on them. The predicates are instances of \ccc{Kinetic::CertificateGenerator} and can be used to either create \ccc{Certificate}s or to evaluate diff --git a/Manual_tools/doc_tex/cc_manual.tex b/Manual_tools/doc_tex/cc_manual.tex index 824c200b042..3c448390afe 100644 --- a/Manual_tools/doc_tex/cc_manual.tex +++ b/Manual_tools/doc_tex/cc_manual.tex @@ -1440,8 +1440,8 @@ Notably still missing are \verb+\left|+ and similar constructs for arrays. \section{CGAL Related Macros} \subsection{Package Description} -The HTML version of the CGAL Manual allows to give short descriptions for -each CGAL package. It is considered good practice to put the package +The HTML version of the \cgal\ Manual allows to give short descriptions for +each \cgal\ package. It is considered good practice to put the package description in a file called \verb+PkgDescription.tex+. This file has to be included explicitly from the main tex file. @@ -1455,7 +1455,7 @@ enclosed in At least there has to be a summary text given by \verb+\ccPkgSummary{+{\em text}\verb+}+. For the hurried user, small illustrations provide a nice graphical overview of -CGAL packages. It is strongly encouraged to provide such illustrations. +\cgal\ packages. It is strongly encouraged to provide such illustrations. Thumbnails are rendered to the left of the summary and can be clicked to reveal a larger, more detailled image: @@ -1484,7 +1484,7 @@ Packages may have individual licenses. To indicate which one, use \item \verb+\ccLicenseCommercial+ \end{itemize} -Finally, you have the opportunity to let other researchers cite your CGAL package using +Finally, you have the opportunity to let other researchers cite your \cgal\ package using \verb+\ccPkgHowToCiteCgal{+{\em bibkey}\verb+}+. A typical package description may look like this: diff --git a/Mesh_2/doc_tex/Mesh_2_ref/ConformingDelaunayTriangulationTraits_2.tex b/Mesh_2/doc_tex/Mesh_2_ref/ConformingDelaunayTriangulationTraits_2.tex index dd9600803fe..3c885c9b2d5 100644 --- a/Mesh_2/doc_tex/Mesh_2_ref/ConformingDelaunayTriangulationTraits_2.tex +++ b/Mesh_2/doc_tex/Mesh_2_ref/ConformingDelaunayTriangulationTraits_2.tex @@ -61,7 +61,7 @@ points on constrained edges. \ccMethod{Angle_2 angle_2_object();}{} \ccHasModels -Any model of \ccc{Kernel} concept. In particular, all CGAL kernels. +Any model of \ccc{Kernel} concept. In particular, all \cgal\ kernels. \end{ccRefConcept} diff --git a/Mesh_2/doc_tex/Mesh_2_ref/DelaunayMeshTraits_2.tex b/Mesh_2/doc_tex/Mesh_2_ref/DelaunayMeshTraits_2.tex index 9d0f753fde1..538356c76da 100644 --- a/Mesh_2/doc_tex/Mesh_2_ref/DelaunayMeshTraits_2.tex +++ b/Mesh_2/doc_tex/Mesh_2_ref/DelaunayMeshTraits_2.tex @@ -36,7 +36,7 @@ object \ccc{Construct_circumcenter_2}. \ccMethod{Compute_area_2 compute_area_2_object();}{} \ccHasModels -Any model of the \ccc{Kernel} concept. In particular, all CGAL kernels. +Any model of the \ccc{Kernel} concept. In particular, all \cgal\ kernels. \end{ccRefConcept} diff --git a/Mesh_3/doc_tex/Mesh_3/mesh_3_user.tex b/Mesh_3/doc_tex/Mesh_3/mesh_3_user.tex index 65a4bc687dc..c4c49e136d2 100644 --- a/Mesh_3/doc_tex/Mesh_3/mesh_3_user.tex +++ b/Mesh_3/doc_tex/Mesh_3/mesh_3_user.tex @@ -865,7 +865,7 @@ with 32GB of RAM. The program has been compiled with g++ v4.3.2 with the -O3 opt Note that our implementation does not take advantage of multi-core architectures. -Those benchmarks have been done using CGAL v3.8. +Those benchmarks have been done using \cgal\ v3.8. \subsection{Delaunay refinement} @@ -969,7 +969,7 @@ shows the mesh obtained for size set to 4. \subsubsection{Theoretical foundations} -The CGAL mesh generation package implements a meshing engine based +The \cgal\ mesh generation package implements a meshing engine based on the method of Delaunay refinement introduced by Chew~\cite{c-gqmgc-93} and Ruppert~\cite{r-draq2d-95} and pioneered in 3D by Shewchuk~\cite{s-tmgdr-98}. It uses the notion of restricted Delaunay triangulation diff --git a/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex b/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex index 9dd0524bbae..073155208b8 100644 --- a/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex +++ b/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex @@ -128,7 +128,7 @@ $O(n^3m^3)$ time. Since the computation of the Minkowski sum takes quite some time, we give the running times of some Minkowski sum computations. They were -computed with CGAL 3.3 on a machine with a 2.4 GHz AMD Opteron +computed with \cgal\ 3.3 on a machine with a 2.4 GHz AMD Opteron processor and 4 GB RAM. The code was compiled with g++ 3.2 and compiler options -O2. The \ccc{Nef\_polyhedron\_3} class was instantiated with the geometric diff --git a/Nef_2/doc_tex/Nef_2/user.tex b/Nef_2/doc_tex/Nef_2/user.tex index 4a7499c0d5b..2fa423bfe87 100644 --- a/Nef_2/doc_tex/Nef_2/user.tex +++ b/Nef_2/doc_tex/Nef_2/user.tex @@ -62,7 +62,7 @@ operations. In the following examples skip the typedefs at the beginning at first and take the types \ccc{Point} and \ccc{Line} to be models of the -standard two-dimensional CGAL kernel (\ccc{CGAL::Point_2} +standard two-dimensional \cgal\ kernel (\ccc{CGAL::Point_2} and \ccc{CGAL::Line_2}). Their user interface is thus defined in the corresponding reference pages. diff --git a/Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex b/Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex index ce16f0c8a3d..95329faa7e1 100644 --- a/Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex +++ b/Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex @@ -264,7 +264,7 @@ construct the intersection of two halfspaces. After line (*) \ccc{N3} is the intersection of \ccc{N1} and \ccc{N2}. The member types of \ccc{Nef_polyhedron_2< Extended_homogeneous >} -map to corresponding types of the standard CGAL geometry kernel +map to corresponding types of the standard \cgal\ geometry kernel (type equality in pseudo-code notation): \begin{ccExampleCode} CGAL::Nef_polyhedron_2< CGAL::Extended_cartesian >::Point diff --git a/Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex b/Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex index 46ada328b55..7659a4da152 100644 --- a/Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex +++ b/Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex @@ -159,7 +159,7 @@ type \ccc{unsafe_comparison}. \ccFunction{Uncertain sign(Interval_nt i);}{} \ccTypedef{typedef Interval_nt Interval_nt_advanced;} -{This typedef (at namespace CGAL scope) exists for backward compatibility, +{This typedef (at namespace \cgal\ scope) exists for backward compatibility, as well as removing the need to remember the Boolean value for the template parameter.} diff --git a/Number_types/doc_tex/NumberTypeSupport_ref/open.tex b/Number_types/doc_tex/NumberTypeSupport_ref/open.tex index 2d8e1abc26c..b382c668ae1 100644 --- a/Number_types/doc_tex/NumberTypeSupport_ref/open.tex +++ b/Number_types/doc_tex/NumberTypeSupport_ref/open.tex @@ -53,7 +53,7 @@ Keep in mind: \item \ccc{mpz_class}:\\ Implementation supports expression templates, - up to the same level as the old CGAL implementation. + up to the same level as the old \cgal\ implementation. i.e. it is possible to call CGAL::square(x+x) but the result is \ccc{mpz_class } and not the according expression template. diff --git a/Point_set_processing_3/doc_tex/Point_set_processing_3/introduction.tex b/Point_set_processing_3/doc_tex/Point_set_processing_3/introduction.tex index 4a8913f7e37..312d9edbb78 100644 --- a/Point_set_processing_3/doc_tex/Point_set_processing_3/introduction.tex +++ b/Point_set_processing_3/doc_tex/Point_set_processing_3/introduction.tex @@ -37,7 +37,7 @@ In the context of surface reconstruction we can position the elements of this co \begin{figure}[h] \caption{Point set processing pipeline for surface reconstruction. The algorithms listed in gray are available from other - CGAL components (bounding volumes and principal + \cgal\ components (bounding volumes and principal component analysis).} \label{Point_set_processing_3-fig-pipeline} \end{figure} diff --git a/Principal_component_analysis/doc_tex/Principal_component_analysis/introduction.tex b/Principal_component_analysis/doc_tex/Principal_component_analysis/introduction.tex index 4965d29886d..3789c71156c 100644 --- a/Principal_component_analysis/doc_tex/Principal_component_analysis/introduction.tex +++ b/Principal_component_analysis/doc_tex/Principal_component_analysis/introduction.tex @@ -1,4 +1,4 @@ -This package provides functions to analyze sets of objects in 2D and 3D. It provides the computation of axis-aligned bounding boxes, centers of mass and principal component analysis for all bounded objects, as well as barycenters for sets of weighted points. Note that unlike most of the CGAL packages, this package uses approximation methods (in particular for linear least squares fitting) and is not intended to provide an exact canonical result in any sense. +This package provides functions to analyze sets of objects in 2D and 3D. It provides the computation of axis-aligned bounding boxes, centers of mass and principal component analysis for all bounded objects, as well as barycenters for sets of weighted points. Note that unlike most of the \cgal\ packages, this package uses approximation methods (in particular for linear least squares fitting) and is not intended to provide an exact canonical result in any sense. \section{Definitions} diff --git a/STL_Extension/doc_tex/STL_Extension_ref/Uncertain.tex b/STL_Extension/doc_tex/STL_Extension_ref/Uncertain.tex index 472242ad514..fdb6d0a686f 100644 --- a/STL_Extension/doc_tex/STL_Extension_ref/Uncertain.tex +++ b/STL_Extension/doc_tex/STL_Extension_ref/Uncertain.tex @@ -28,7 +28,7 @@ provides overloaded operators and functions to naturally extend the Boolean operations for \ccc{Uncertain} for example, or the operations on enumeration types. -\ccc{Uncertain} is used in CGAL as the return type of geometric predicates +\ccc{Uncertain} is used in \cgal\ as the return type of geometric predicates when the number type used is interval arithmetic like \ccc{Interval_nt}. End users typically do not see it, as it is hidden in the implementation of the filtered predicates provided by the various filtered kernels, but it is diff --git a/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex b/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex index 47ac447c6f4..f085905948b 100644 --- a/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex +++ b/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex @@ -1434,7 +1434,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Twotuple} - This class is deprecated, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future \cgal\ release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} @@ -1474,7 +1474,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Threetuple} - This class is deprecated, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future \cgal\ release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} @@ -1516,7 +1516,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Fourtuple} - This class is deprecated, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future \cgal\ release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} @@ -1560,7 +1560,7 @@ %% +--------------------------------------------------------+ \begin{ccRefClass}{Sixtuple} - This class is deprecated, and will be removed in some future CGAL release. + This class is deprecated, and will be removed in some future \cgal\ release. Please use \ccc{CGAL::cpp0x::array} instead. \begin{ccDeprecated} diff --git a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_skeleton_and_offset_polygons_2.tex b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_skeleton_and_offset_polygons_2.tex index 5f5b7581584..79912be07b8 100644 --- a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_skeleton_and_offset_polygons_2.tex +++ b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_skeleton_and_offset_polygons_2.tex @@ -59,10 +59,10 @@ This is equivalent to \ccc{arrange_offset_polygons_2(create_exterior_skeleton_an \ccRequirements \begin{enumerate} - \item \ccc{OffsettingK} is the CGAL kernel used to instantiate + \item \ccc{OffsettingK} is the \cgal\ kernel used to instantiate \ccc{Polygon_offset_builder_traits_2} for constructing the offset polygons. - \item \ccc{SkeletonK} is the CGAL kernel used to instantiate + \item \ccc{SkeletonK} is the \cgal\ kernel used to instantiate \ccc{Straight_skeleton_builder_traits_2} for constructing the straight skeleton. If \ccc{SkeletonK != OffsettingK} the constructed straight skeleton diff --git a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_straight_skeleton_2.tex b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_straight_skeleton_2.tex index 25954a13ab9..7c7e76e43d7 100644 --- a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_straight_skeleton_2.tex +++ b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_exterior_straight_skeleton_2.tex @@ -60,7 +60,7 @@ $d$ is a margin sufficiently large to allow an outer offset at dinstance \ccc{ma \ccHeading{Requirements} \begin{enumerate} - \item \ccc{K} is any CGAL kernel. + \item \ccc{K} is any \cgal\ kernel. \item \ccc{PointIterator::value_type} is equivalent to \ccc{K2::Point_2}. A cartesian converter is used to convert from \ccc{K2::Point_2} to \ccc{K::Point_2} \item \ccc{Polygon} is \ccc{Polygon_2} or a standard container of \ccc{K2::Point_2} elements diff --git a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_skeleton_and_offset_polygons_2.tex b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_skeleton_and_offset_polygons_2.tex index c999ddbcd35..7b56cdf530f 100644 --- a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_skeleton_and_offset_polygons_2.tex +++ b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_skeleton_and_offset_polygons_2.tex @@ -103,10 +103,10 @@ create_interior_skeleton_and_offset_polygons_with_holes_2 This is equivalent to \ccc{arrange_offset_polygons_2(create_interior_skeleton_and_offset_polygons_2(offset,poly_with_holes,okk,ssk))}.} \begin{enumerate} - \item \ccc{OffsettingK} is the CGAL kernel used to instantiate + \item \ccc{OffsettingK} is the \cgal\ kernel used to instantiate \ccc{Polygon_offset_builder_traits_2} for constructing the offset polygons. - \item \ccc{SkeletonK} is the CGAL kernel used to instantiate + \item \ccc{SkeletonK} is the \cgal\ kernel used to instantiate \ccc{Straight_skeleton_builder_traits_2} for constructing the straight skeleton. If \ccc{SkeletonK != OffsettingK} the constructed straight skeleton diff --git a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_straight_skeleton_2.tex b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_straight_skeleton_2.tex index 3a78b729025..a5590c305f5 100644 --- a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_straight_skeleton_2.tex +++ b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_interior_straight_skeleton_2.tex @@ -63,7 +63,7 @@ create_interior_straight_skeleton_2 ( Polygon const& outer_contour \begin{enumerate} - \item \ccc{K} is any CGAL kernel. + \item \ccc{K} is any \cgal\ kernel. \item \ccc{PointIterator::value_type} is equivalent to \ccc{K2::Point_2}. A cartesian converter is used to convert from \ccc{K2::Point_2} to \ccc{K::Point_2} \item \ccc{HoleIterator::value_type} and \ccc{Polygon} are \ccc{Polygon_2} diff --git a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_offset_polygons_2.tex b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_offset_polygons_2.tex index f82a0c84fa7..02ecb48c6d7 100644 --- a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_offset_polygons_2.tex +++ b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Create_offset_polygons_2.tex @@ -41,7 +41,7 @@ the straight skeleton $s$. \begin{enumerate} - \item \ccc{K} is any CGAL kernel. + \item \ccc{K} is any \cgal\ kernel. \item \ccc{FT} is any number type implicitly convertible to \ccc{K::FT}. \item \ccc{Straight_skeleton} is \ccc{Straight_skeleton_2}. If $K != K2$ the straight skeleton is converted to \ccc{Straight_skeleton_2}. diff --git a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Straight_skeleton_builder_traits_2.tex b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Straight_skeleton_builder_traits_2.tex index 395006f1951..a05a7d13b6d 100644 --- a/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Straight_skeleton_builder_traits_2.tex +++ b/Straight_skeleton_2/doc_tex/Straight_skeleton_2_ref/Straight_skeleton_builder_traits_2.tex @@ -26,7 +26,7 @@ The class \ccRefName\ provides a model for the \ccc{StraightSkeletonBuilderTraits_2} concept which is the traits class required by the \ccc{Straight_skeleton_builder_2} algorithm class. The class -\ccRefName\ has one template argument: a 2D CGAL Kernel. This parameter must be a model for the \ccc{Kernel} concept, such as the \ccc{Exact_predicates_inexact_constructions_kernel}, which is the recommended one.\\ +\ccRefName\ has one template argument: a 2D \cgal\ Kernel. This parameter must be a model for the \ccc{Kernel} concept, such as the \ccc{Exact_predicates_inexact_constructions_kernel}, which is the recommended one.\\ It is unspecified which subset of the kernel is used into the output sequence and the returned iterator will be equal to \ccc{out}. For any given input polygon, it in this traits class (and by extension in the builder class). This is to avoid restricting the choices in the implementation. diff --git a/Stream_lines_2/doc_tex/Stream_lines_2_ref/StreamLinesTraits_2.tex b/Stream_lines_2/doc_tex/Stream_lines_2_ref/StreamLinesTraits_2.tex index 4e39ba2addb..391e5146fd4 100644 --- a/Stream_lines_2/doc_tex/Stream_lines_2_ref/StreamLinesTraits_2.tex +++ b/Stream_lines_2/doc_tex/Stream_lines_2_ref/StreamLinesTraits_2.tex @@ -34,7 +34,7 @@ This concept provides the types handled by the \ccHasModels -The kernels of CGAL are models for this traits class. \\ +The kernels of \cgal\ are models for this traits class. \\ diff --git a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterization_polyhedron_adaptor_3.tex b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterization_polyhedron_adaptor_3.tex index 10b428627c4..970e1554acf 100644 --- a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterization_polyhedron_adaptor_3.tex +++ b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterization_polyhedron_adaptor_3.tex @@ -25,7 +25,7 @@ \ccc{Parameterization_polyhedron_adaptor_3} is an adaptor class to access to a Polyhedron 3D mesh using the \ccc{ParameterizationPatchableMesh_3} interface. Among other things, this concept defines the accessor to the (u, v) values computed by parameterizations methods. -Note that these interfaces are decorators that add {\em on the fly} the necessary fields to unmodified CGAL data structures (using STL maps). For performance reasons, it is recommended to use CGAL data structures enriched with the proper fields. +Note that these interfaces are decorators that add {\em on the fly} the necessary fields to unmodified \cgal\ data structures (using STL maps). For performance reasons, it is recommended to use \cgal\ data structures enriched with the proper fields. A \ccc{ParameterizationMesh_3} surface consists of vertices, facets and an incidence relation on them. No notion of edge is requested. diff --git a/Surface_mesher/doc_tex/Complex_2_in_triangulation_3_ref/Complex_2_in_triangulation_3.tex b/Surface_mesher/doc_tex/Complex_2_in_triangulation_3_ref/Complex_2_in_triangulation_3.tex index c985eb4e20a..5a8336156c6 100644 --- a/Surface_mesher/doc_tex/Complex_2_in_triangulation_3_ref/Complex_2_in_triangulation_3.tex +++ b/Surface_mesher/doc_tex/Complex_2_in_triangulation_3_ref/Complex_2_in_triangulation_3.tex @@ -45,7 +45,7 @@ facets of the 2D complex and to antenna edges or marked edges. \ccParameters The class \ccRefName\ is parametrized by the underlying 3D triangulation. -Any triangulation can of CGAL can be used to instantiate this parameter. +Any triangulation can of \cgal\ can be used to instantiate this parameter. The parameters \ccc{Facet_info} and \ccc{Edge_info} provide the types of the information the wishes to attached respectively to the facets of the 2D complex or to the marked diff --git a/Surface_mesher/doc_tex/Surface_mesher_ref/ImplicitSurfaceTraits_3.tex b/Surface_mesher/doc_tex/Surface_mesher_ref/ImplicitSurfaceTraits_3.tex index b22195bba69..bfb41fe8d39 100644 --- a/Surface_mesher/doc_tex/Surface_mesher_ref/ImplicitSurfaceTraits_3.tex +++ b/Surface_mesher/doc_tex/Surface_mesher_ref/ImplicitSurfaceTraits_3.tex @@ -139,7 +139,7 @@ objects: \ccHasModels -Any CGAL Kernel. +Any \cgal\ Kernel. \ccSeeAlso diff --git a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/case_studies.tex b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/case_studies.tex index a3ff1fbc7e0..9737793d9dc 100644 --- a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/case_studies.tex +++ b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/case_studies.tex @@ -81,7 +81,7 @@ The algorithm is in general not robust to outliers, although a few outliers do n \end{center} -The algorithm works well even when the inferred surface is composed of several connected components, provided that both all normals are properly estimated and oriented (the current CGAL normal orienter algorithm may fail in some cases, see \ccc{CGAL::mst_orient_normals()}), and that the final contouring algorithm is properly seeded for each component. When the inferred surface is composed of several nested connected components care should be taken to orient the normals of each component in alternation (inward/outward) so that the final contouring stage picks a proper contouring value. +The algorithm works well even when the inferred surface is composed of several connected components, provided that both all normals are properly estimated and oriented (the current \cgal\ normal orienter algorithm may fail in some cases, see \ccc{CGAL::mst_orient_normals()}), and that the final contouring algorithm is properly seeded for each component. When the inferred surface is composed of several nested connected components care should be taken to orient the normals of each component in alternation (inward/outward) so that the final contouring stage picks a proper contouring value. \subsubsection{Contouring Parameters} diff --git a/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex b/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex index fa2de8380ad..32f397f444b 100644 --- a/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex +++ b/Triangulation_2/doc_tex/Triangulation_2/triangulation_user.tex @@ -832,7 +832,7 @@ instance of the \ccc{Filtered_kernel} template. The base vertex type of a regular triangulation includes a Boolean data member to mark the hidden state of the vertex. -Therefore CGAL defines the concept +Therefore \cgal\ defines the concept \ccc{RegularTriangulationVertexBase_2} which refine the concept \ccc{TriangulationVertexBase_2} and provides a default model @@ -919,7 +919,7 @@ constraints and its constrained triangulation"> \end{ccHtmlOnly} -A constrained triangulation is represented in the CGAL library as an +A constrained triangulation is represented in the \cgal\ library as an object of the class \ccc{Constrained_triangulation_2}. The third parameter \ccc{Itag} is the intersection tag which serves to choose how intersecting constraints diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex index eb209a5b0a9..257163fd6f4 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex @@ -79,7 +79,7 @@ constraints and its constrained triangulation"> \end{ccHtmlOnly} -The class \ccRefName\ of the CGAL library +The class \ccRefName\ of the \cgal\ library implements constrained triangulations. The template parameter \ccc{Traits} stands for a geometric traits class. It has to be a model diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/TriangulationTraits_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/TriangulationTraits_2.tex index 40d1165176c..f7495e86b42 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/TriangulationTraits_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/TriangulationTraits_2.tex @@ -141,7 +141,7 @@ called.} \ccHasModels -All the CGAL Kernels \\ +All the \cgal\ Kernels \\ \ccRefIdfierPage{CGAL::Triangulation_euclidean_traits_2} \\ \ccRefIdfierPage{CGAL::Projection_traits_xy_3}\\ \ccc{CGAL::Projection_traits_yz_3}\\ diff --git a/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex b/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex index 6f65dff391a..2433bc154e2 100644 --- a/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex +++ b/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex @@ -847,7 +847,7 @@ In 2011, Pedro de Castro and Olivier Devillers implemented in release 3.8 the structural filtering method, improving the efficiency of point location. -A new demo of this package was introduced in CGAL 3.8, coded by Fei +A new demo of this package was introduced in \cgal\ 3.8, coded by Fei (Sophie) Che, who was co-mentored by Manuel Caroli and Monique Teillaud in the framework of the Google Summer of Code, 2010. From dd2aba7fe6a0cd5fbfd56a05f61f37e7d7aebce8 Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Mon, 30 May 2011 15:27:09 +0000 Subject: [PATCH 14/18] The goal was to be able to use iterator_traits safely, so we don't want arrays... --- STL_Extension/include/CGAL/is_iterator.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/STL_Extension/include/CGAL/is_iterator.h b/STL_Extension/include/CGAL/is_iterator.h index a094078ed8a..f7da841103c 100644 --- a/STL_Extension/include/CGAL/is_iterator.h +++ b/STL_Extension/include/CGAL/is_iterator.h @@ -42,17 +42,14 @@ template struct is_iterator_type_ : boost::is_convertible::iterator_category,U> {}; -template struct decay_array { typedef T type; }; -template struct decay_array { typedef T* type; }; -template struct decay_array { typedef T* type; }; } // NOTE: we don't want the real std::decay or functions are included template struct is_iterator : - internal::is_iterator_::type>::type>::type> {}; + internal::is_iterator_::type>::type> {}; template struct is_iterator_type : - internal::is_iterator_type_::type>::type>::type,Tag> {}; + internal::is_iterator_type_::type>::type,Tag> {}; } From 8fbfa4bae1fabb9362638e061e1414721378e0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 30 May 2011 15:43:56 +0000 Subject: [PATCH 15/18] typo --- Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex b/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex index 073155208b8..fd2b6c50427 100644 --- a/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex +++ b/Minkowski_sum_3/doc_tex/Minkowski_sum_3/main.tex @@ -234,7 +234,7 @@ selection mark without spoiling the correctness of the Minkowski sum. \section{Usage} The function \ccc{minkowski_sum_3} should be used with the -\ccc{Extact_predicates_exact_constructions_kernel}, which often is +\ccc{Exact_predicates_exact_constructions_kernel}, which often is the most efficient choice and allows floating-point input. Consult Section~\label{sectionNef_3IO} for more details. From dee65b63f54cb85be1f670b6e4dc2ac12dd113ca Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 31 May 2011 07:50:41 +0000 Subject: [PATCH 16/18] Min and Max only construct a new node in the DAG, if the intervals overlap --- Number_types/include/CGAL/Lazy_exact_nt.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h index ce1374e28b6..7c77077fec8 100644 --- a/Number_types/include/CGAL/Lazy_exact_nt.h +++ b/Number_types/include/CGAL/Lazy_exact_nt.h @@ -1226,8 +1226,15 @@ struct Min > Lazy_exact_nt operator()( const Lazy_exact_nt& x, const Lazy_exact_nt& y) const { - CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION)); - return new Lazy_exact_Min(x, y); + if (x.identical(y)){ + return x; + } + Uncertain res = x.approx() < y.approx(); + if(is_certain(res)){ + return res.make_certain() ? x : y; ; + } + CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION)); + return new Lazy_exact_Min(x, y); } }; @@ -1237,6 +1244,13 @@ struct Max > Lazy_exact_nt operator()( const Lazy_exact_nt& x, const Lazy_exact_nt& y) const { + if (x.identical(y)){ + return x; + } + Uncertain res = x.approx() > y.approx(); + if(is_certain(res)){ + return res.make_certain() ? x : y; + } CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION)); return new Lazy_exact_Max(x, y); } From cd46479c2503fe30d720fb1e1789407a267b9c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 31 May 2011 08:00:57 +0000 Subject: [PATCH 17/18] remove extra; --- Number_types/include/CGAL/Lazy_exact_nt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h index 7c77077fec8..31005ec9251 100644 --- a/Number_types/include/CGAL/Lazy_exact_nt.h +++ b/Number_types/include/CGAL/Lazy_exact_nt.h @@ -1231,7 +1231,7 @@ struct Min > } Uncertain res = x.approx() < y.approx(); if(is_certain(res)){ - return res.make_certain() ? x : y; ; + return res.make_certain() ? x : y; } CGAL_PROFILER(std::string("calls to : ") + std::string(CGAL_PRETTY_FUNCTION)); return new Lazy_exact_Min(x, y); From 768159d119a804b7321ec6786ce52abbdf644812 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 31 May 2011 09:38:31 +0000 Subject: [PATCH 18/18] Remove a CMake warning about RUNNING_CGAL_AUTO_TEST that is not always used. --- Installation/cmake/modules/CGAL_Common.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake index 5b21a32ceba..7aacd7846cb 100644 --- a/Installation/cmake/modules/CGAL_Common.cmake +++ b/Installation/cmake/modules/CGAL_Common.cmake @@ -9,6 +9,10 @@ endif() include(CGAL_Macros) +if(RUNNING_CGAL_AUTO_TEST) +# Just to avoid a warning from CMake if that variable is set on the command line... +endif() + # Common settings for CGAL cmake scripts if( NOT CGAL_COMMON_FILE_INCLUDED ) set(CGAL_COMMON_FILE_INCLUDED 1 )