From 81c8c662d6ccc6328e0130f5bd6e3d4ae7f537eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Thu, 18 Oct 2012 16:31:12 +0000 Subject: [PATCH] Fix some PkgDependsOn to stay inside the package overview, fix an off-by-one in hacks.js, add a missing dependency --- .../doc/Alpha_shapes_2/PackageDescription.txt | 2 +- .../doc/Alpha_shapes_3/PackageDescription.txt | 2 +- .../doc/Apollonius_graph_2/PackageDescription.txt | 12 ++++++------ .../Combinatorial_map/Concepts/CombinatorialMap.h | 2 +- .../doc/Convex_hull_3/PackageDescription.txt | 2 +- Documentation/doxyassist.xml | 2 ++ Documentation/hacks.js | 2 +- .../Kinetic_data_structures/PackageDescription.txt | 2 +- Mesh_3/doc/Mesh_3/PackageDescription.txt | 2 +- .../PackageDescription.txt | 2 +- Point_set_2/doc/Point_set_2/PackageDescription.txt | 2 +- .../Segment_Delaunay_graph_2/PackageDescription.txt | 2 +- .../doc/Skin_surface_3/PackageDescription.txt | 2 +- .../doc/Stream_lines_2/PackageDescription.txt | 2 +- .../PackageDescription.txt | 4 ++-- 15 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt b/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt index 7c42c870339..3ab31090357 100644 --- a/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt +++ b/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt @@ -10,7 +10,7 @@ \PkgAuthors{Tran Kai Frank Da} \PkgDesc{This package offers a data structure encoding the whole family of alpha-complexes related to a given 2D Delaunay or regular triangulation. In particular, the data structure allows to retrieve the alpha-complex for any alpha value, the whole spectrum of critical alpha values and a filtration on the triangulation faces (this filtration is based on the first alpha value for which each face is included on the alpha-complex).} \PkgSince{2.1} -\PkgDependsOn{\ref PkgTriangulation2} +\PkgDependsOn{\ref PkgTriangulation2Summary} \PkgBib{cgal:d-as2} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{2D Alpha Shapes,alpha_shapes_2.zip} diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt b/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt index d821b17cff4..4288e93a596 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt @@ -8,7 +8,7 @@ \PkgAuthors{Tran Kai Frank Da, Sébastien Loriot, and Mariette Yvinec} \PkgDesc{This package offers a data structure encoding either one alpha-complex or the whole family of alpha-complexes related to a given 3D Delaunay or regular triangulation. In the latter case, the data structure allows to retrieve the alpha-complex for any alpha value, the whole spectrum of critical alpha values and a filtration on the triangulation faces (this filtration is based on the first alpha value for which each face is included on the alpha-complex). } \PkgSince{2.3} -\PkgDependsOn{\ref PkgTriangulation3} +\PkgDependsOn{\ref PkgTriangulation3Summary} \PkgBib{cgal:dy-as3} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{3D Alpha Shapes,alpha_shape_3.zip} diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt b/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt index 3c090c28b48..7561c58d28e 100644 --- a/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt +++ b/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt @@ -9,7 +9,7 @@ \PkgAuthors{Menelaos Karavelas and Mariette Yvinec} \PkgDesc{Algorithms for computing the Apollonius graph in two dimensions. The Apollonius graph is the dual of the Apollonius diagram, also known as the additively weighted Voronoi diagram. The latter can be thought of as the Voronoi diagram of a set of disks under the Euclidean metric, and it is a generalization of the standard Voronoi diagram for points. The algorithms provided are dynamic.} \PkgSince{3.0} -\PkgDependsOn{\ref PkgTDS2} +\PkgDependsOn{\ref PkgTDS2Summary} \PkgBib{cgal:ky-ag2} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{2D Apollonius Graph,apollonius_graph_2.zip} @@ -23,15 +23,15 @@ point of the plane from a disk is defined as the Euclidean distance of the point and the center of the circle, minus the radius of the disk. -\cgal provides the class `CGAL::Apollonius_graph_2` for +\cgal provides the class `CGAL::Apollonius_graph_2` for computing the 2D Apollonius graph. The two template parameters must be -models of the `ApolloniusGraphTraits_2` and -`ApolloniusGraphDataStructure_2` concepts. The first concept is +models of the `ApolloniusGraphTraits_2` and +`ApolloniusGraphDataStructure_2` concepts. The first concept is related to the geometric objects and predicates associated with Apollonius graphs, whereas the second concept refers to the data structure used to represent the Apollonius graph. The classes -`Apollonius_graph_traits_2` and -`Triangulation_data_structure_2` are models of the +`Apollonius_graph_traits_2` and +`Triangulation_data_structure_2` are models of the aforementioned concepts. */ diff --git a/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h b/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h index eb027467a08..a91cc8ec996 100644 --- a/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h +++ b/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h @@ -96,7 +96,7 @@ struct Attribute_type \pre 0\f$ \leq\f$i\f$ \leq\f$dimension and i-attributes are non void. */ template -typedef Hidden_type Attribute_type::type; +typedef Attribute_type::type; template struct Attribute_handle { diff --git a/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt b/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt index ad9a346ada0..bed28ad4e80 100644 --- a/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt +++ b/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt @@ -21,7 +21,7 @@ \PkgAuthors{Susan Hert and Stefan Schirra} \PkgDesc{This package provides functions for computing convex hulls in three dimensions as well as functions for checking if sets of points are strongly convex or not. One can compute the convex hull of a set of points in three dimensions in one of three ways: using a static algorithm, using an incremental construction algorithm, or using a triangulation to get a fully dynamic computation.} \PkgSince{1.1} -\PkgDependsOn{All algorithms produce as output a \ref PkgPolyhedronSummary "Polyhedron". The dynamic algorithms depend on \ref PkgTriangulation3Summary.} "3D Triangulations". +\PkgDependsOn{All algorithms produce as output a \ref PkgPolyhedronSummary "Polyhedron". The dynamic algorithms depend on \ref PkgTriangulation3Summary "3D Triangulations".} \PkgBib{cgal:hs-ch3} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{See Polyhedral Surface,polyhedron_3.zip} diff --git a/Documentation/doxyassist.xml b/Documentation/doxyassist.xml index 4a2a2e398f7..43704570cbf 100644 --- a/Documentation/doxyassist.xml +++ b/Documentation/doxyassist.xml @@ -1046,6 +1046,8 @@ namespace for the XML file to be processed properly. --> ../Circulator/doc/Circulator/fig ../Circulator/examples + ./tags/Manual.tag=../../CGAL.CGAL/html + ./tags/STL_Extension.tag=../../CGAL.CGAL.STL-Extensions-for-CGAL/html diff --git a/Documentation/hacks.js b/Documentation/hacks.js index ebcd2d78cd7..55397728706 100644 --- a/Documentation/hacks.js +++ b/Documentation/hacks.js @@ -1,6 +1,6 @@ function generate_autotoc() { var toc = $("#autotoc").append('
    '); - if(toc.length > 1) { // an autotoc has been requested + if(toc.length > 0) { // an autotoc has been requested toc = toc.find('ul'); $("h1, h2, h3").each(function(i) { var current = $(this); diff --git a/Kinetic_data_structures/doc/Kinetic_data_structures/PackageDescription.txt b/Kinetic_data_structures/doc/Kinetic_data_structures/PackageDescription.txt index c3ac677cc01..905c116e1ef 100644 --- a/Kinetic_data_structures/doc/Kinetic_data_structures/PackageDescription.txt +++ b/Kinetic_data_structures/doc/Kinetic_data_structures/PackageDescription.txt @@ -24,7 +24,7 @@ \PkgAuthor{Daniel Russel} \PkgDesc{Kinetic data structures allow combinatorial structures to be maintained as the primitives move. The package provides implementations of kinetic data structures for Delaunay triangulations in two and three dimensions, sorting of points in one dimension and regular triangulations in three dimensions. The package supports exact or inexact operations on primitives which move along polynomial trajectories. } \PkgSince{3.2} -\PkgDependsOn{\ref PkgKdsFramework. Two dimensional visualization depends on \ref thirdpartyQt\, three dimensional visualization depends on \ref thirdpartyCoin.} +\PkgDependsOn{\ref PkgKdsFrameworkSummary. Two dimensional visualization depends on \ref thirdpartyQt\, three dimensional visualization depends on \ref thirdpartyCoin.} \PkgBib{cgal:r-kds} \PkgLicense{\ref licensesLGPL "LGPL"} \PkgManuals{Chapter_Kinetic_Data_Structures,PkgKds} diff --git a/Mesh_3/doc/Mesh_3/PackageDescription.txt b/Mesh_3/doc/Mesh_3/PackageDescription.txt index ec063e996a9..73aaa9acfc6 100644 --- a/Mesh_3/doc/Mesh_3/PackageDescription.txt +++ b/Mesh_3/doc/Mesh_3/PackageDescription.txt @@ -36,7 +36,7 @@ \PkgAuthors{Pierre Alliez, Laurent Rineau, Stéphane Tayeb, Jane Tournois, Mariette Yvinec} \PkgDesc{This package is devoted to the generation of isotropic simplicial meshes discretizing 3D domains. The domain to be meshed is a region of 3D space that has to be bounded. The region may be connected or composed of multiple components and/or subdivided in several subdomains. The domain is input as an oracle able to answer queries, of a few different types, on the domain. Boundary and subdivision surfaces are either smooth or piecewise smooth surfaces, formed with planar or curved surface patches. Surfaces may exhibit 1-dimensional features (e.g. crease edges) and 0-dimensional features (e.g. singular points as corners tips, cusps or darts), that have to be fairly approximated in the mesh. } \PkgSince{3.5} -\PkgDependsOn{\ref PkgTriangulation3} +\PkgDependsOn{\ref PkgTriangulation3Summary} \PkgBib{cgal:rty-m3} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{3D Mesh Generation,mesh_3.zip} diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt index 853856fcfba..6b22c4b68ff 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt @@ -19,7 +19,7 @@ \PkgAuthors{Manuel Caroli and Monique Teillaud} \PkgDesc{This package allows to build and handle triangulations of point sets in the three dimensional flat torus. Triangulations are built incrementally and can be modified by insertion or removal of vertices. They offer point location facilities. The package provides Delaunay triangulations and offers nearest neighbor queries and primitives to build the dual Voronoi diagrams.} \PkgSince{3.5} -\PkgDependsOn{\ref PkgTriangulation3 and \ref PkgTDS3} +\PkgDependsOn{\ref PkgTriangulation3Summary and \ref PkgTDS3Summary} \PkgBib{cgal:ct-pt3} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{Periodic Delaunay Triangulation,periodic_3_triangulation_3.zip} diff --git a/Point_set_2/doc/Point_set_2/PackageDescription.txt b/Point_set_2/doc/Point_set_2/PackageDescription.txt index 31c3a40d7f6..6bba4c8d856 100644 --- a/Point_set_2/doc/Point_set_2/PackageDescription.txt +++ b/Point_set_2/doc/Point_set_2/PackageDescription.txt @@ -13,7 +13,7 @@ \PkgAuthor{Matthias Bäsken} \PkgDesc{This package supports circular, triangular, and isorectangular range search queries as well as (k) nearest neighbor search queries on 2D point sets. In contrast to the spatial searching package, this package uses a Delaunay triangulation as underlying data structure.} \PkgSince{2.1} -\PkgDependsOn{\ref PkgTriangulation2} +\PkgDependsOn{\ref PkgTriangulation2Summary} \PkgBib{cgal:b-ss2} \PkgLicense{\ref licensesGPL "GPL"} \PkgManuals{Chapter_2D_Range_and_Neighbor_Search,PkgPointSet2} diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt index 30013e14499..c5107ed3452 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt @@ -9,7 +9,7 @@ \PkgAuthor{Menelaos Karavelas} \PkgDesc{An algorithm for computing the dual of a Voronoi diagram of a set of segments under the Euclidean metric. It is a generalization of the standard Voronoi diagram for points. The algorithms provided are dynamic.} \PkgSince{3.1} -\PkgDependsOn{\ref PkgTDS2} +\PkgDependsOn{\ref PkgTDS2Summary} \PkgBib{cgal:k-sdg2} \PkgLicense{\ref licensesGPL} \PkgDemo{2D Segment Voronoi Diagram,segment_voronoi_diagram_2.zip} diff --git a/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt b/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt index 9bdd50a6c83..1754d30f140 100644 --- a/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt +++ b/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt @@ -10,7 +10,7 @@ \PkgAuthor{Nico Kruithof} \PkgDesc{This package allows to build a triangular mesh of a skin surface. Skin surfaces are used for modeling large molecules in biological computing. The surface is defined by a set of balls, representing the atoms of the molecule, and a shrink factor that determines the size of the smooth patches gluing the balls together. The construction of a triangular mesh of a smooth skin surface is often necessary for further analysis and for fast visualization. This package provides functions to construct a triangular mesh approximating the skin surface from a set of balls and a shrink factor. It also contains code to subdivide the mesh efficiently. } \PkgSince{3.3} -\PkgDependsOn{\ref PkgTriangulation3 and \ref PkgPolyhedron} +\PkgDependsOn{\ref PkgTriangulation3Summary and \ref PkgPolyhedronSummary} \PkgBib{cgal:k-ssm3} \PkgLicense{\ref licensesGPL "GPL"} \PkgManuals{Chapter_3D_Skin_Surface_Meshing,PkgSkinSurface3} diff --git a/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt b/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt index a653550a8b0..2f71a51fbfe 100644 --- a/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt +++ b/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt @@ -9,7 +9,7 @@ \PkgAuthor{Abdelkrim Mebarki} \PkgDesc{Visualizing vector fields is important for many application domains. A good way to do it is to generate streamlines that describe the flow behavior. This package implements the "Farthest Point Seeding" algorithm for placing streamlines in 2D vector fields. It generates a list of streamlines corresponding to an input flow using a specified separating distance. The algorithm uses a Delaunay triangulation to model objects and address different queries, and relies on choosing the centers of the biggest empty circles to start the integration of the streamlines.} \PkgSince{3.2} -\PkgDependsOn{\ref PkgTriangulation2} +\PkgDependsOn{\ref PkgTriangulation2Summary} \PkgBib{cgal:m-ps} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{2D Stream Lines,streamlines.zip} diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt b/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt index 918292e346e..589e7ec311c 100644 --- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt +++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt @@ -9,8 +9,8 @@ \PkgAuthor{Fernando Cacciola} \PkgDesc{This package provides an algorithm to simplify a triangulated surface mesh by edge collapsing. It is an implementation of the Turk/Lindstrom memoryless mesh simplification algorithm.} \PkgSince{3.3} -\PkgDependsOn{\ref PkgBGL} -\PkgDependsOn{\ref PkgPolyhedron} +\PkgDependsOn{\ref PkgBGLSummary} +\PkgDependsOn{\ref PkgPolyhedronSummary} \PkgBib{cgal:c-tsms-12} \PkgLicense{\ref licensesGPL "GPL"} \PkgDemo{Operations on Polyhedra,polyhedron_3.zip}