From 4e5578d46900fa4dacab38298c640b58c47cfbfc Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 15 Jul 2023 13:12:15 +0200 Subject: [PATCH] issue #7395 Improvement of layout of model relations - based on review --- .../doc/AABB_tree/Concepts/AABBGeomTraits.h | 2 + .../doc/AABB_tree/Concepts/AABBPrimitive.h | 11 ++-- .../Concepts/AABBPrimitiveWithSharedData.h | 7 +- .../Concepts/AABBRayIntersectionGeomTraits.h | 2 + .../Concepts/AABBRayIntersectionTraits.h | 3 +- AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h | 3 +- ...ancingFrontSurfaceReconstructionTraits_3.h | 2 + .../Concepts/AlgebraicStructureTraits.h | 3 +- .../Concepts/FieldNumberType.h | 21 +++--- .../Concepts/FractionTraits.h | 3 +- .../Concepts/FromIntConstructible.h | 7 +- .../Concepts/RealEmbeddableTraits.h | 3 +- .../Concepts/RingNumberType.h | 26 ++++---- .../Concepts/AlgebraicKernel_d_1.h | 5 +- .../Concepts/AlphaShapeFace_2.h | 3 +- .../Concepts/AlphaShapeTraits_2.h | 5 +- .../Concepts/AlphaShapeVertex_2.h | 2 + .../Concepts/WeightedAlphaShapeTraits_2.h | 5 +- .../Concepts/AlphaShapeCell_3.h | 2 + .../Concepts/AlphaShapeTraits_3.h | 2 + .../Concepts/AlphaShapeVertex_3.h | 2 + .../Concepts/FixedAlphaShapeCell_3.h | 2 + .../Concepts/FixedAlphaShapeTraits_3.h | 2 + .../Concepts/FixedAlphaShapeVertex_3.h | 2 + .../FixedWeightedAlphaShapeTraits_3.h | 2 + .../Concepts/WeightedAlphaShapeTraits_3.h | 2 + .../Alpha_wrap_3/Concepts/AlphaWrapOracle.h | 9 +-- .../Alpha_wrap_3/Concepts/AlphaWrapTraits_3.h | 2 + .../Concepts/ApolloniusGraphDataStructure_2.h | 3 +- .../ApolloniusGraphHierarchyVertexBase_2.h | 3 +- .../Concepts/ApolloniusGraphTraits_2.h | 5 +- .../Concepts/ApolloniusGraphVertexBase_2.h | 3 +- .../Concepts/ArrTraits--Approximate_2.h | 3 +- .../Concepts/ArrTraits--AreMergeable_2.h | 3 +- .../ArrTraits--CompareXNearBoundary_2.h | 3 +- ...rrTraits--CompareXOnBoundaryOfCurveEnd_2.h | 7 +- .../ArrTraits--CompareXOnBoundary_2.h | 7 +- .../Concepts/ArrTraits--CompareX_2.h | 3 +- .../Concepts/ArrTraits--CompareXy_2.h | 3 +- .../Concepts/ArrTraits--CompareYAtXLeft_2.h | 3 +- .../Concepts/ArrTraits--CompareYAtXRight_2.h | 3 +- .../Concepts/ArrTraits--CompareYAtX_2.h | 3 +- .../ArrTraits--CompareYNearBoundary_2.h | 3 +- .../ArrTraits--CompareYOnBoundary_2.h | 9 +-- .../Concepts/ArrTraits--ConstructCurve_2.h | 3 +- .../ArrTraits--ConstructMaxVertex_2.h | 3 +- .../ArrTraits--ConstructMinVertex_2.h | 3 +- .../ArrTraits--ConstructXMonotoneCurve_2.h | 3 +- .../Concepts/ArrTraits--Curve_2.h | 3 +- .../Concepts/ArrTraits--Equal_2.h | 3 +- .../Concepts/ArrTraits--Intersect_2.h | 3 +- .../ArrTraits--IsOnXIdentification_2.h | 3 +- .../ArrTraits--IsOnYIdentification_2.h | 3 +- .../Concepts/ArrTraits--IsVertical_2.h | 3 +- .../Concepts/ArrTraits--MakeXMonotone_2.h | 3 +- .../Concepts/ArrTraits--Merge_2.h | 3 +- .../Concepts/ArrTraits--ParameterSpaceInX_2.h | 7 +- .../Concepts/ArrTraits--ParameterSpaceInY_2.h | 7 +- .../Concepts/ArrTraits--Point_2.h | 3 +- .../Concepts/ArrTraits--Split_2.h | 3 +- .../Concepts/ArrTraits--XMonotoneCurve_2.h | 3 +- .../Concepts/ArrangementApproximateTraits_2.h | 17 ++--- .../Concepts/ArrangementBasicTopologyTraits.h | 3 +- .../Concepts/ArrangementBasicTraits_2.h | 31 ++++----- .../ArrangementConstructCurveTraits_2.h | 15 +++-- ...rangementConstructXMonotoneCurveTraits_2.h | 15 +++-- .../Concepts/ArrangementDcel.h | 9 +-- .../Concepts/ArrangementDcelWithRebind.h | 7 +- .../ArrangementHorizontalSideTraits_2.h | 9 +-- .../Concepts/ArrangementInputFormatter.h | 7 +- .../Concepts/ArrangementLandmarkTraits_2.h | 17 ++--- .../ArrangementOpenBoundaryTraits_2.h | 11 ++-- .../Concepts/ArrangementOutputFormatter.h | 7 +- .../Concepts/ArrangementPointLocation_2.h | 9 +-- .../ArrangementSphericalBoundaryTraits_2.h | 3 +- .../Concepts/ArrangementTopologyTraits.h | 7 +- .../Concepts/ArrangementTraits_2.h | 29 +++++---- .../Concepts/ArrangementVerticalRayShoot_2.h | 9 +-- .../ArrangementVerticalSideTraits_2.h | 9 +-- .../ArrangementWithHistoryInputFormatter.h | 3 +- .../ArrangementWithHistoryOutputFormatter.h | 3 +- .../Concepts/ArrangementXMonotoneTraits_2.h | 29 +++++---- .../Concepts/OverlayTraits.h | 5 +- BGL/doc/BGL/Concepts/EdgeListGraph.h | 2 + BGL/doc/BGL/Concepts/FaceGraph.h | 2 + BGL/doc/BGL/Concepts/FaceListGraph.h | 2 + BGL/doc/BGL/Concepts/HalfedgeGraph.h | 2 + BGL/doc/BGL/Concepts/HalfedgeListGraph.h | 2 + BGL/doc/BGL/Concepts/MutableFaceGraph.h | 2 + BGL/doc/BGL/Concepts/MutableHalfedgeGraph.h | 2 + BGL/doc/BGL/Concepts/VertexListGraph.h | 2 + .../Concepts/BarycentricCoordinates_2.h | 7 +- .../Concepts/BarycentricTraits_2.h | 10 +-- .../Concepts/DiscretizedDomain_2.h | 3 +- .../ArrDirectionalTraits--AreMergeable_2.h | 3 +- ...rDirectionalTraits--CompareEndpointsXy_2.h | 3 +- ...rrDirectionalTraits--ConstructOpposite_2.h | 3 +- .../ArrDirectionalTraits--Intersect_2.h | 3 +- .../Concepts/ArrDirectionalTraits--Merge_2.h | 3 +- .../Concepts/ArrDirectionalTraits--Split_2.h | 3 +- .../ArrangementDirectionalXMonotoneTraits_2.h | 15 +++-- .../Concepts/GeneralPolygonSetDcel.h | 3 +- .../Concepts/GeneralPolygonSetDcelFace.h | 3 +- .../Concepts/GeneralPolygonSetDcelHalfedge.h | 3 +- .../Concepts/GeneralPolygonSetTraits_2.h | 7 +- .../Concepts/GeneralPolygon_2.h | 3 +- .../GpsTraitsGeneralPolygonWithHoles_2.h | 3 +- .../Concepts/GpsTraitsGeneralPolygon_2.h | 5 +- .../ApproximateMinEllipsoid_d_Traits_d.h | 7 +- .../Concepts/MinCircle2Traits.h | 3 +- .../Concepts/MinEllipse2Traits.h | 3 +- .../Concepts/MinQuadrilateralTraits_2.h | 3 +- .../Concepts/MinSphereAnnulusDTraits.h | 7 +- .../Concepts/MinSphereOfSpheresTraits.h | 13 ++-- .../Concepts/RectangularPCenterTraits_2.h | 3 +- .../Concepts/BoxIntersectionBox_d.h | 5 +- .../Concepts/BoxIntersectionTraits_d.h | 3 +- ...rnelForCircles--PolynomialForCircles_2_2.h | 3 +- ...lgebraicKernelForCircles--Polynomial_1_2.h | 3 +- ...raicKernelForCircles--RootForCircles_2_2.h | 3 +- .../Concepts/AlgebraicKernelForCircles.h | 3 +- .../CircularKernel--CircularArcPoint_2.h | 3 +- .../Concepts/CircularKernel--CircularArc_2.h | 3 +- .../Concepts/CircularKernel--LineArc_2.h | 3 +- .../Concepts/CircularKernel.h | 5 +- ...rnelForSpheres--PolynomialForSpheres_2_3.h | 3 +- ...lgebraicKernelForSpheres--Polynomial_1_3.h | 3 +- ...cKernelForSpheres--PolynomialsForLines_3.h | 3 +- ...raicKernelForSpheres--RootForSpheres_2_3.h | 3 +- .../Concepts/AlgebraicKernelForSpheres.h | 3 +- .../SphericalKernel--CircularArcPoint_3.h | 3 +- .../Concepts/SphericalKernel--CircularArc_3.h | 3 +- .../Concepts/SphericalKernel--LineArc_3.h | 3 +- .../Concepts/SphericalKernel.h | 5 +- .../doc/Circulator/Concepts/ConstHandle.h | 3 +- .../doc/Circulator/Concepts/ConstRange.h | 5 +- Circulator/doc/Circulator/Concepts/Handle.h | 9 +-- Circulator/doc/Circulator/Concepts/Range.h | 2 + .../doc/Classification/Concepts/Classifier.h | 7 +- .../Classification/Concepts/NeighborQuery.h | 9 +-- .../Concepts/CellAttribute.h | 2 + .../Concepts/CombinatorialMap.h | 2 + .../Combinatorial_map/Concepts/GenericMap.h | 6 +- .../Concepts/GenericMapItems.h | 2 + .../Concepts/ConvexHullTraits_2.h | 13 ++-- .../Concepts/ConvexHullTraits_3.h | 5 +- .../Concepts/IsStronglyConvexTraits_3.h | 4 +- .../Concepts/ConvexHullTraits_d.h | 7 +- .../Concepts/DelaunayLiftedTraits_d.h | 5 +- .../Convex_hull_d/Concepts/DelaunayTraits_d.h | 5 +- .../doc/resources/1.8.13/BaseDoxyfile.in | 10 ++- .../doc/resources/1.9.6/BaseDoxyfile.in | 10 ++- .../Envelope_3/Concepts/EnvelopeTraits_3.h | 9 +-- .../Generalized_map/Concepts/GeneralizedMap.h | 2 + .../Generator/Concepts/CombinationElement.h | 8 ++- .../doc/Generator/Concepts/PointGenerator.h | 29 +++++---- .../Concepts/RandomConvexHullTraits_2.h | 2 + .../Concepts/RandomConvexSetTraits_2.h | 3 +- .../Concepts/RandomPolygonTraits_2.h | 2 + .../doc/HalfedgeDS/Concepts/HalfedgeDS.h | 7 +- .../doc/HalfedgeDS/Concepts/HalfedgeDSFace.h | 5 +- .../HalfedgeDS/Concepts/HalfedgeDSHalfedge.h | 5 +- .../doc/HalfedgeDS/Concepts/HalfedgeDSItems.h | 7 +- .../HalfedgeDS/Concepts/HalfedgeDSVertex.h | 5 +- .../Concepts/HeatMethodTraits_3.h | 2 + .../HyperbolicDelaunayTriangulationTraits_2.h | 5 +- .../HyperbolicTriangulationFaceBase_2.h | 3 +- .../Concepts/ExtremalPolygonTraits_2.h | 5 +- .../LargestEmptyIsoRectangleTraits_2.h | 5 +- .../Concepts/GradientFittingTraits.h | 3 +- .../Concepts/InterpolationTraits.h | 5 +- .../Interval_skip_list/Concepts/Interval.h | 5 +- .../doc/Jet_fitting_3/Concepts/DataKernel.h | 5 +- .../doc/Jet_fitting_3/Concepts/LocalKernel.h | 5 +- .../doc/Kernel_23/Concepts/GeomObjects.h | 65 ++++++++++++------- Kernel_23/doc/Kernel_23/Concepts/Kernel.h | 17 ++--- .../Kernel_d/Concepts/KernelWithLifting_d.h | 5 +- Kernel_d/doc/Kernel_d/Concepts/Kernel_d.h | 9 +-- .../Kernel_d/Concepts/LinearAlgebraTraits_d.h | 5 +- .../Concepts/CellAttributeWithPoint.h | 2 + .../Concepts/LinearCellComplex.h | 6 +- .../Concepts/LinearCellComplexItems.h | 3 +- .../Concepts/LinearCellComplexTraits.h | 2 + .../doc/Matrix_search/Concepts/BasicMatrix.h | 3 +- .../Concepts/MonotoneMatrixSearchTraits.h | 3 +- .../Concepts/SortedMatrixSearchTraits.h | 3 +- .../ConformingDelaunayTriangulationTraits_2.h | 4 +- .../Mesh_2/Concepts/DelaunayMeshFaceBase_2.h | 3 +- .../Mesh_2/Concepts/DelaunayMeshTraits_2.h | 4 +- .../Concepts/DelaunayMeshVertexBase_2.h | 3 +- .../doc/Mesh_2/Concepts/MeshingCriteria_2.h | 5 +- .../Concepts/BisectionGeometricTraits_3.h | 2 + .../Concepts/IntersectionGeometricTraits_3.h | 2 + Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h | 5 +- .../doc/Mesh_3/Concepts/MeshCellCriteria_3.h | 3 +- .../Concepts/MeshCriteriaWithFeatures_3.h | 3 +- Mesh_3/doc/Mesh_3/Concepts/MeshCriteria_3.h | 3 +- .../doc/Mesh_3/Concepts/MeshDomainField_3.h | 3 +- .../Concepts/MeshDomainWithFeatures_3.h | 5 +- Mesh_3/doc/Mesh_3/Concepts/MeshDomain_3.h | 5 +- .../doc/Mesh_3/Concepts/MeshEdgeCriteria_3.h | 3 +- .../doc/Mesh_3/Concepts/MeshFacetCriteria_3.h | 3 +- Mesh_3/doc/Mesh_3/Concepts/MeshPolyline_3.h | 2 + .../Concepts/MeshTriangulationTraits_3.h | 2 + Mesh_3/doc/Mesh_3/Concepts/MeshVertexBase_3.h | 3 +- .../doc/Mesh_3/Concepts/TriangleAccessor_3.h | 3 +- .../Concepts/PolygonConvexDecomposition_2.h | 11 ++-- .../PolygonWithHolesConvexDecomposition_2.h | 5 +- .../Miscellany/Concepts/UniqueHashFunction.h | 3 +- .../Concepts/ModularTraits.h | 3 +- .../Concepts/Modularizable.h | 20 +++--- .../Nef_2/Concepts/ExtendedKernelTraits_2.h | 7 +- .../doc/Number_types/Concepts/RootOf_2.h | 4 +- .../Concepts/OrientedBoundingBoxTraits.h | 3 +- ...imalTransportationReconstructionTraits_2.h | 6 +- .../doc/Orthtree/Concepts/OrthtreeTraits.h | 7 +- .../doc/Orthtree/Concepts/OrthtreeTraversal.h | 9 +-- .../Concepts/ConvexPartitionIsValidTraits_2.h | 3 +- .../Concepts/IsYMonotoneTraits_2.h | 5 +- .../Concepts/OptimalConvexPartitionTraits_2.h | 3 +- .../Concepts/PartitionIsValidTraits_2.h | 3 +- .../Partition_2/Concepts/PartitionTraits_2.h | 3 +- .../doc/Partition_2/Concepts/PolygonIsValid.h | 5 +- .../YMonotonePartitionIsValidTraits_2.h | 3 +- .../Periodic_2DelaunayTriangulationTraits_2.h | 3 +- .../Concepts/Periodic_2Offset_2.h | 3 +- .../Periodic_2TriangulationFaceBase_2.h | 3 +- .../Periodic_2TriangulationTraits_2.h | 3 +- .../Periodic_2TriangulationVertexBase_2.h | 3 +- .../Periodic_3MeshDomainWithFeatures_3.h | 3 +- .../Concepts/Periodic_3MeshDomain_3.h | 3 +- .../Periodic_3DelaunayTriangulationTraits_3.h | 3 +- .../Concepts/Periodic_3Offset_3.h | 3 +- ...riodic_3RegularTriangulationDSCellBase_3.h | 5 +- ...odic_3RegularTriangulationDSVertexBase_3.h | 3 +- .../Periodic_3RegularTriangulationTraits_3.h | 3 +- .../Periodic_3TriangulationDSCellBase_3.h | 3 +- .../Periodic_3TriangulationDSVertexBase_3.h | 3 +- .../Periodic_3TriangulationTraits_3.h | 3 +- ...4HyperbolicDelaunayTriangulationTraits_2.h | 3 +- ...iodic_4HyperbolicTriangulationFaceBase_2.h | 3 +- ...dic_4HyperbolicTriangulationVertexBase_2.h | 3 +- .../Concepts/GeneralPolygonWithHoles_2.h | 5 +- .../doc/Polygon/Concepts/PolygonTraits_2.h | 8 ++- .../Concepts/PMPCorefinementVisitor.h | 3 +- .../Concepts/PMPDistanceTraits.h | 2 + .../Concepts/PMPHolefillingVisitor.h | 3 +- .../PMPPolygonSoupOrientationVisitor.h | 3 +- .../Concepts/PMPTriangulateFaceVisitor.h | 3 +- .../Polyhedron/Concepts/PolyhedronItems_3.h | 7 +- .../Polyhedron/Concepts/PolyhedronTraits_3.h | 6 +- .../PolylineSimplificationCostFunction.h | 7 +- .../PolylineSimplificationStopPredicate.h | 7 +- .../PolylineSimplificationVertexBase_2.h | 3 +- .../Polynomial/Concepts/PolynomialTraits_d.h | 3 +- .../doc/Polynomial/Concepts/Polynomial_d.h | 3 +- .../Concepts/AllFurthestNeighborsTraits_2.h | 9 +-- .../Concepts/PolytopeDistanceDTraits.h | 7 +- .../Concepts/WidthTraits_3.h | 3 +- .../doc/QP_solver/Concepts/LinearProgram.h | 7 +- .../Concepts/NonnegativeLinearProgram.h | 14 ++-- .../Concepts/NonnegativeQuadraticProgram.h | 7 +- .../doc/QP_solver/Concepts/QuadraticProgram.h | 7 +- ...shComplexWithFeatures_3InTriangulation_3.h | 3 +- .../Concepts/MeshComplex_3InTriangulation_3.h | 3 +- .../Concepts/SimplicialMeshCellBase_3.h | 9 +-- .../Concepts/SimplicialMeshVertexBase_3.h | 7 +- .../doc/STL_Extension/Concepts/Descriptor.h | 5 +- .../doc/STL_Extension/Concepts/Hashable.h | 6 +- .../doc/STL_Extension/Concepts/Index.h | 5 +- .../STL_Extension/Concepts/ProjectionObject.h | 27 ++++---- .../Concepts/SurjectiveLockDataStructure.h | 3 +- .../Concepts/ScaleSpaceMesher.h | 5 +- .../Concepts/ScaleSpaceSmoother.h | 5 +- .../Concepts/RangeSegmentTreeTraits_k.h | 13 ++-- .../SegmentDelaunayGraphDataStructure_2.h | 3 +- .../Concepts/SegmentDelaunayGraphFaceBase_2.h | 3 +- ...egmentDelaunayGraphHierarchyVertexBase_2.h | 3 +- .../Concepts/SegmentDelaunayGraphSite_2.h | 3 +- .../SegmentDelaunayGraphStorageSite_2.h | 3 +- .../SegmentDelaunayGraphStorageTraits_2.h | 3 +- .../Concepts/SegmentDelaunayGraphTraits_2.h | 9 +-- .../SegmentDelaunayGraphVertexBase_2.h | 3 +- .../SegmentDelaunayGraphLinfTraits_2.h | 9 +-- .../Concepts/CastingTraits_2.h | 2 + .../Concepts/EfficientRANSACTraits.h | 3 +- .../Shape_detection/Concepts/NeighborQuery.h | 9 +-- .../doc/Shape_detection/Concepts/RegionType.h | 15 +++-- .../Concepts/ContourDirections.h | 7 +- .../Concepts/NeighborQuery.h | 3 +- .../Concepts/RegularizationType.h | 5 +- .../Concepts/SkinSurfaceTraits_3.h | 3 +- .../Skin_surface_3/Concepts/SkinSurface_3.h | 5 +- .../Concepts/SnapRoundingTraits_2.h | 21 +++++- .../Concepts/DiagonalizeTraits.h | 3 +- .../Concepts/MixedIntegerProgramTraits.h | 16 +++-- ...ormalEquationSparseLinearAlgebraTraits_d.h | 3 +- .../Concepts/QuadraticProgramTraits.h | 3 +- .../Concepts/SparseLinearAlgebraTraits_d.h | 11 ++-- .../SparseLinearAlgebraWithFactorTraits_d.h | 3 +- .../doc/Solver_interface/Concepts/SvdTraits.h | 9 ++- .../Concepts/FuzzyQueryItem.h | 5 +- .../Concepts/GeneralDistance.h | 5 +- .../Concepts/OrthogonalDistance.h | 5 +- .../Concepts/RangeSearchTraits.h | 13 ++-- .../Concepts/SearchGeomTraits_2.h | 2 + .../Concepts/SearchGeomTraits_3.h | 2 + .../Spatial_searching/Concepts/SearchTraits.h | 17 ++--- .../Concepts/SpatialSeparator.h | 3 +- .../Spatial_searching/Concepts/SpatialTree.h | 3 +- .../doc/Spatial_searching/Concepts/Splitter.h | 15 +++-- .../Concepts/SpatialSortingTraits_2.h | 4 +- .../Concepts/SpatialSortingTraits_3.h | 4 +- .../Concepts/SpatialSortingTraits_d.h | 4 +- .../Concepts/PolygonOffsetBuilderTraits_2.h | 3 +- .../StraightSkeletonBuilderTraits_2.h | 3 +- .../StraightSkeletonBuilder_2_Visitor.h | 3 +- .../Concepts/StraightSkeletonFace_2.h | 3 +- .../Concepts/StraightSkeletonHalfedge_2.h | 3 +- .../StraightSkeletonItemsConverter_2.h | 3 +- .../Concepts/StraightSkeletonVertex_2.h | 3 +- .../Concepts/StraightSkeleton_2.h | 3 +- .../Stream_lines_2/Concepts/Integrator_2.h | 5 +- .../Concepts/StreamLinesTraits_2.h | 2 + .../Stream_lines_2/Concepts/VectorField_2.h | 5 +- .../Subdivision_method_3/Concepts/DQQMask_3.h | 3 +- .../Subdivision_method_3/Concepts/PQQMask_3.h | 3 +- .../Subdivision_method_3/Concepts/PTQMask_3.h | 3 +- .../Concepts/Sqrt3Mask_3.h | 3 +- .../Concepts/ErrorMetricProxy.h | 5 +- .../DeformationClosestRotationTraits_3.h | 5 +- .../Concepts/Parameterizer_3.h | 21 +++--- .../Concepts/SegmentationGeomTraits.h | 2 + .../Concepts/SurfaceMeshShortestPathTraits.h | 3 +- .../Concepts/GetCost.h | 7 +- .../Concepts/GetPlacement.h | 11 ++-- .../Concepts/PlacementFilter.h | 5 +- .../Concepts/StopPredicate.h | 11 ++-- .../MeanCurvatureSkeletonizationTraits.h | 2 + .../Concepts/PolygonalSchema.h | 6 +- .../Concepts/PolygonalSchemaItems.h | 2 + .../Concepts/WeightFunctor.h | 6 +- .../Concepts/ImplicitFunction.h | 4 +- .../Concepts/ImplicitSurfaceTraits_3.h | 2 + .../Concepts/SurfaceMeshCellBase_3.h | 5 +- .../SurfaceMeshComplex_2InTriangulation_3.h | 3 +- .../Concepts/SurfaceMeshFacetsCriteria_3.h | 3 +- .../Concepts/SurfaceMeshTraits_3.h | 3 +- .../Concepts/SurfaceMeshTriangulation_3.h | 2 + .../Concepts/SurfaceMeshVertexBase_3.h | 5 +- .../doc/Surface_mesher/Concepts/Surface_3.h | 3 +- .../Concepts/TriangulationDSFaceBase_2.h | 3 +- .../Concepts/TriangulationDSVertexBase_2.h | 3 +- .../Concepts/TriangulationDataStructure_2.h | 9 ++- .../Concepts/TriangulationDSCellBase_3.h | 3 +- .../Concepts/TriangulationDSVertexBase_3.h | 3 +- .../Concepts/TriangulationDataStructure_3.h | 3 +- .../Concepts/RemeshingCellBase_3.h | 3 +- .../Concepts/RemeshingTriangulationTraits_3.h | 2 + .../Concepts/RemeshingVertexBase_3.h | 3 +- .../Concepts/DelaunayTriangulationTraits.h | 5 +- .../Concepts/RegularTriangulationTraits.h | 5 +- .../Concepts/TriangulationDSFace.h | 3 +- .../Concepts/TriangulationDSFullCell.h | 5 +- .../Concepts/TriangulationDSVertex.h | 5 +- .../Concepts/TriangulationDataStructure.h | 13 ++-- .../Concepts/TriangulationFullCell.h | 3 +- .../Concepts/TriangulationTraits.h | 5 +- .../Concepts/TriangulationVertex.h | 3 +- ...ConstrainedDelaunayTriangulationTraits_2.h | 8 ++- .../ConstrainedTriangulationFaceBase_2.h | 3 +- .../ConstrainedTriangulationTraits_2.h | 10 +-- .../Concepts/DelaunayTriangulationTraits_2.h | 14 ++-- .../Concepts/RegularTriangulationFaceBase_2.h | 3 +- .../Concepts/RegularTriangulationTraits_2.h | 2 + .../RegularTriangulationVertexBase_2.h | 3 +- .../Concepts/TriangulationFaceBase_2.h | 3 +- .../TriangulationHierarchyVertexBase_2.h | 3 +- .../Concepts/TriangulationTraits_2.h | 10 +-- .../TriangulationVertexBaseWithInfo_2.h | 3 +- .../Concepts/TriangulationVertexBase_2.h | 3 +- .../DelaunayTriangulationCellBase_3.h | 5 +- .../Concepts/DelaunayTriangulationTraits_3.h | 15 +++-- ...lationCellBaseWithWeightedCircumcenter_3.h | 3 +- .../Concepts/RegularTriangulationCellBase_3.h | 3 +- .../Concepts/RegularTriangulationTraits_3.h | 2 + .../RegularTriangulationVertexBase_3.h | 3 +- .../TriangulationCellBaseWithInfo_3.h | 3 +- .../Concepts/TriangulationCellBase_3.h | 5 +- .../Concepts/TriangulationTraits_3.h | 2 + .../TriangulationVertexBaseWithInfo_3.h | 3 +- .../Concepts/TriangulationVertexBase_3.h | 5 +- .../DelaunayTriangulationOnSphereTraits_2.h | 5 +- .../TriangulationOnSphereFaceBase_2.h | 3 +- .../Concepts/TriangulationOnSphereTraits_2.h | 5 +- .../TriangulationOnSphereVertexBase_2.h | 3 +- .../doc/Visibility_2/Concepts/Visibility_2.h | 7 +- .../Concepts/AdaptationPolicy_2.h | 19 +++--- .../Concepts/AdaptationTraits_2.h | 9 +-- .../Concepts/DelaunayGraph_2.h | 14 ++-- .../Weights/Concepts/AnalyticWeightTraits_2.h | 8 ++- .../Weights/Concepts/AnalyticWeightTraits_3.h | 2 + .../Weights/Concepts/BarycentricWeights_2.h | 7 +- 403 files changed, 1354 insertions(+), 831 deletions(-) mode change 100644 => 100755 Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h mode change 100644 => 100755 Spatial_searching/doc/Spatial_searching/Concepts/FuzzyQueryItem.h diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBGeomTraits.h b/AABB_tree/doc/AABB_tree/Concepts/AABBGeomTraits.h index 75823eb238ae..c01a0008bee3 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBGeomTraits.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBGeomTraits.h @@ -11,7 +11,9 @@ and the primitives stored in the AABB tree. \cgalRefines{SearchGeomTraits_3} +\cgalHasModelsBegin \cgalHasModelsBare{All models of the concept `Kernel`} +\cgalHasModelsEnd \sa `CGAL::AABB_traits` \sa `CGAL::AABB_tree` diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h index 4a987a58cbb2..cee0dc902966 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h @@ -12,11 +12,12 @@ The concept `AABBPrimitive` describes the requirements for the primitives stored The `Primitive` type can be, e.g., a wrapper around a `Handle`. Assume for instance that the input objects are the triangle faces of a mesh stored as a `CGAL::Polyhedron_3`. The `Datum` would be a `Triangle_3` and the `Id` would be a polyhedron `Face_handle`. Method `datum()` can return either a `Triangle_3` constructed on the fly from the face handle or a `Triangle_3` stored internally. This provides a way for the user to trade memory for efficiency. -\cgalHasModelsBegin CGAL::AABB_primitive -\cgalHasModels CGAL::AABB_segment_primitive -\cgalHasModels CGAL::AABB_triangle_primitive -\cgalHasModels CGAL::AABB_halfedge_graph_segment_primitive -\cgalHasModels CGAL::AABB_face_graph_triangle_primitive +\cgalHasModelsBegin +\cgalModels{CGAL::AABB_primitive} +\cgalModels{CGAL::AABB_segment_primitive} +\cgalModels{CGAL::AABB_triangle_primitive} +\cgalModels{CGAL::AABB_halfedge_graph_segment_primitive} +\cgalModels{CGAL::AABB_face_graph_triangle_primitive} \cgalHasModelsEnd */ diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h index 8ec9a103acdc..27f6805cbca1 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h @@ -21,9 +21,10 @@ The `Datum` would be a `Triangle_3` and the `Id` a `std::size_t`. The shared dat `std::vector`. The method `datum(const Shared_data&)` then returns a triangle from the vector. -\cgalHasModelsBegin CGAL::AABB_primitive -\cgalHasModels CGAL::AABB_halfedge_graph_segment_primitive -\cgalHasModels CGAL::AABB_face_graph_triangle_primitive +\cgalHasModelsBegin +\cgalModels{CGAL::AABB_primitive} +\cgalModels{CGAL::AABB_halfedge_graph_segment_primitive} +\cgalModels{CGAL::AABB_face_graph_triangle_primitive} \cgalHasModelsEnd */ diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits.h b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits.h index f47f1e9464bc..c34d88be491e 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits.h @@ -9,7 +9,9 @@ define the Intersection_distance functor. \cgalRefines{AABBGeomTraits} +\cgalHasModelsBegin \cgalHasModelsBare{All models of the concept `Kernel`} +\cgalHasModelsEnd \sa `CGAL::AABB_traits` \sa `CGAL::AABB_tree` diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h index 87d139973b5c..1df2c9802b25 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h @@ -7,7 +7,8 @@ The concept `AABBRayIntersectionTraits` is a refinement of the concept `AABBTraits` it also requires function objects to calculate the distance of an intersection along a ray. -\cgalHasModelsBegin CGAL::AABB_traits +\cgalHasModelsBegin +\cgalModels{CGAL::AABB_traits} \cgalHasModelsEnd \sa `CGAL::AABB_tree` diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h b/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h index f5e5846322e3..5dfba2998c86 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h @@ -5,7 +5,8 @@ The concept `AABBTraits` provides the geometric primitive types and methods for the class `CGAL::AABB_tree`. -\cgalHasModelsBegin CGAL::AABB_traits +\cgalHasModelsBegin +\cgalModels{CGAL::AABB_traits} \cgalHasModelsEnd \cgalRefines{SearchGeomTraits_3} diff --git a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Concepts/AdvancingFrontSurfaceReconstructionTraits_3.h b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Concepts/AdvancingFrontSurfaceReconstructionTraits_3.h index a56096bcb197..e31759b1f3de 100644 --- a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Concepts/AdvancingFrontSurfaceReconstructionTraits_3.h +++ b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Concepts/AdvancingFrontSurfaceReconstructionTraits_3.h @@ -11,7 +11,9 @@ together with a few geometric predicates and constructions on these objects. \cgalRefines{DelaunayTriangulationTraits_3} +\cgalHasModelsBegin \cgalHasModelsBare{All models of the concept `Kernel`} +\cgalHasModelsEnd */ class AdvancingFrontSurfaceReconstructionTraits_3 { diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h index 0fbc4ea6f174..d21861c1c288 100644 --- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h +++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h @@ -28,7 +28,8 @@ algebraic operations within that structure. \sa `CGAL::Field_with_kth_root_tag` \sa `CGAL::Field_with_root_of_tag` -\cgalHasModelsBegin CGAL::Algebraic_structure_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Algebraic_structure_traits} \cgalHasModelsEnd */ diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h index a53ac500cbf9..5cd89e524e60 100644 --- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h +++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h @@ -9,16 +9,17 @@ for Cartesian kernels. \cgalRefines{Field,RealEmbeddable} -\cgalHasModelsBegin float -\cgalHasModels double -\cgalHasModels CGAL::Gmpq -\cgalHasModels CGAL::Interval_nt -\cgalHasModels CGAL::Interval_nt_advanced -\cgalHasModels CGAL::Lazy_exact_nt -\cgalHasModels CGAL::Quotient -\cgalHasModels leda_rational -\cgalHasModels leda_bigfloat -\cgalHasModels leda_real +\cgalHasModelsBegin +\cgalModels{float} +\cgalModels{double} +\cgalModels{CGAL::Gmpq} +\cgalModels{CGAL::Interval_nt} +\cgalModels{CGAL::Interval_nt_advanced} +\cgalModels{CGAL::Lazy_exact_nt} +\cgalModels{CGAL::Quotient} +\cgalModels{leda_rational} +\cgalModels{leda_bigfloat} +\cgalModels{leda_real} \cgalHasModelsEnd \sa `RingNumberType` diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h index 35d4b408a679..f1248606d90c 100644 --- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h +++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h @@ -8,7 +8,8 @@ A model of `FractionTraits` is associated with a type `Type`. In case the associated type is a `Fraction`, a model of `FractionTraits` provides the relevant functionality for decomposing and re-composing as well as the numerator and denominator type. -\cgalHasModelsBegin CGAL::Fraction_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Fraction_traits} \cgalHasModelsEnd \sa `FractionTraits_::Decompose` diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h index f8f2f3f8749d..f31912ba5d85 100644 --- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h +++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h @@ -6,9 +6,10 @@ A model of the concept `FromIntConstructible` is required to be constructible from int. -\cgalHasModelsBegin int -\cgalHasModels long -\cgalHasModels double +\cgalHasModelsBegin +\cgalModels{int} +\cgalModels{long} +\cgalModels{double} \cgalHasModelsEnd */ diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h index 1cd155d7ccff..312eff6326f8 100644 --- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h +++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h @@ -7,7 +7,8 @@ A model of `RealEmbeddableTraits` is associated to a number type `Type` and reflects the properties of this type with respect to the concept `RealEmbeddable`. -\cgalHasModelsBegin CGAL::Real_embeddable_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Real_embeddable_traits} \cgalHasModelsEnd */ diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h index 462030682589..f3ee8c4ba58d 100644 --- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h +++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h @@ -10,18 +10,20 @@ for Homogeneous kernels. \cgalRefines{IntegralDomainWithoutDivision,RealEmbeddable} -\cgalHasModelsBareBegin{\cpp built-in number types} CGAL::Gmpq -\cgalHasModels CGAL::Gmpz -\cgalHasModels CGAL::Interval_nt -\cgalHasModels CGAL::Interval_nt_advanced -\cgalHasModels CGAL::Lazy_exact_nt -\cgalHasModels CGAL::MP_Float -\cgalHasModels CGAL::Gmpzf -\cgalHasModels CGAL::Quotient -\cgalHasModels leda_integer -\cgalHasModels leda_rational -\cgalHasModels leda_bigfloat -\cgalHasModels leda_real +\cgalHasModelsBegin +\cgalHasModelsBare{\cpp built-in number types} +\cgalHasModels{CGAL::Gmpq} +\cgalHasModels{CGAL::Gmpz} +\cgalHasModels{CGAL::Interval_nt} +\cgalHasModels{CGAL::Interval_nt_advanced} +\cgalHasModels{CGAL::Lazy_exact_nt} +\cgalHasModels{CGAL::MP_Float} +\cgalHasModels{CGAL::Gmpzf} +\cgalHasModels{CGAL::Quotient} +\cgalHasModels{leda_integer} +\cgalHasModels{leda_rational} +\cgalHasModels{leda_bigfloat} +\cgalHasModels{leda_real} \cgalHasModelsEnd \sa `FieldNumberType` diff --git a/Algebraic_kernel_d/doc/Algebraic_kernel_d/Concepts/AlgebraicKernel_d_1.h b/Algebraic_kernel_d/doc/Algebraic_kernel_d/Concepts/AlgebraicKernel_d_1.h index f9b702d436be..4bc59c9e3886 100644 --- a/Algebraic_kernel_d/doc/Algebraic_kernel_d/Concepts/AlgebraicKernel_d_1.h +++ b/Algebraic_kernel_d/doc/Algebraic_kernel_d/Concepts/AlgebraicKernel_d_1.h @@ -8,8 +8,9 @@ algebraic functionalities on univariate polynomials of general degree \f$ d\f$. \cgalRefines{CopyConstructible,Assignable} -\cgalHasModelsBegin CGAL::Algebraic_kernel_rs_gmpz_d_1 -\cgalHasModels CGAL::Algebraic_kernel_rs_gmpq_d_1 +\cgalHasModelsBegin +\cgalModels{CGAL::Algebraic_kernel_rs_gmpz_d_1} +\cgalModels{CGAL::Algebraic_kernel_rs_gmpq_d_1} \cgalHasModelsEnd \sa `AlgebraicKernel_d_2` diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeFace_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeFace_2.h index 562a6aaaa195..498eaed26d73 100644 --- a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeFace_2.h +++ b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeFace_2.h @@ -9,7 +9,8 @@ The concept `AlphaShapeFace_2` describes the requirements for the base face of a RegularTriangulationFaceBase_2 if the underlying triangulation of the alpha shape is a regular triangulation, Periodic_2TriangulationFaceBase_2 if the underlying triangulation of the alpha shape is a periodic triangulation} -\cgalHasModelsBegin CGAL::Alpha_shape_face_base_2 (templated with the appropriate triangulation face base class) +\cgalHasModelsBegin +\cgalModels{CGAL::Alpha_shape_face_base_2 (templated with the appropriate triangulation face base class)} \cgalHasModelsEnd */ diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeTraits_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeTraits_2.h index 28ad270b7441..669fdf61f195 100644 --- a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeTraits_2.h +++ b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeTraits_2.h @@ -9,7 +9,10 @@ class of the underlying Delaunay triangulation of a basic alpha shape. \cgalRefines{DelaunayTriangulationTraits_2 if the underlying triangulation of the alpha shape is a Delaunay triangulation, Periodic_2DelaunayTriangulationTraits_2 if the underlying triangulation of the alpha shape is a periodic Delaunay triangulation} -\cgalHasModelsBare{All models of `Kernel`,Projection traits such as `CGAL::Projection_traits_xy_3`} +\cgalHasModelsBegin +\cgalHasModelsBare{All models of `Kernel`} +\cgalHasModelsBare{Projection traits such as `CGAL::Projection_traits_xy_3`} +\cgalHasModelsEnd \sa `CGAL::Exact_predicates_inexact_constructions_kernel` (recommended kernel) */ diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h index 5116683d78b3..649ed3970d0e 100644 --- a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h +++ b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h @@ -9,7 +9,9 @@ The concept `AlphaShapeVertex_2` describes the requirements for the base vertex RegularTriangulationVertexBase_2 if the underlying triangulation of the alpha shape is a regular triangulation, Periodic_2TriangulationVertexBase_2 if the underlying triangulation of the alpha shape is a periodic triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{`CGAL::Alpha_shape_vertex_base_2` (templated with the appropriate triangulation vertex base class)} +\cgalHasModelsEnd */ class AlphaShapeVertex_2 { public: diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h index 05be16ee5596..b88db2cd67be 100644 --- a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h +++ b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h @@ -9,7 +9,10 @@ of the underlying regular triangulation of a weighted alpha shape. \cgalRefines{RegularTriangulationTraits_2 if the underlying triangulation of the alpha shape is a regular triangulation.} -\cgalHasModelsBare{All models of `Kernel`,Projection traits such as `CGAL::Projection_traits_xy_3`} +\cgalHasModelsBegin +\cgalHasModelsBare{All models of `Kernel`,} +\cgalHasModelsBare{Projection traits such as `CGAL::Projection_traits_xy_3`} +\cgalHasModelsEnd \sa `CGAL::Exact_predicates_inexact_constructions_kernel` (recommended kernel) */ diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeCell_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeCell_3.h index de5c0aacd622..fa4ba33da2d8 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeCell_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeCell_3.h @@ -9,7 +9,9 @@ The concept `AlphaShapeCell_3` describes the requirements for the base cell of a RegularTriangulationCellBase_3 if the underlying triangulation of the alpha shape is a regular triangulation, Periodic_3TriangulationDSCellBase_3 if the underlying triangulation of the alpha shape is a periodic triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{`CGAL::Alpha_shape_cell_base_3` (templated with the appropriate triangulation cell base class)} +\cgalHasModelsEnd \sa `CGAL::Alpha_status` diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeTraits_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeTraits_3.h index 4a5fe7a8bfd0..cff0a2f3c522 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeTraits_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeTraits_3.h @@ -10,7 +10,9 @@ of the underlying Delaunay triangulation of a basic alpha shape. \cgalRefines{DelaunayTriangulationTraits_3 if the underlying triangulation of the alpha shape is a Delaunay triangulation, Periodic_3DelaunayTriangulationTraits_3 if the underlying triangulation of the alpha shape is a periodic Delaunay triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{All models of `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Exact_predicates_inexact_constructions_kernel` (recommended kernel) */ diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeVertex_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeVertex_3.h index 65f490141802..3c81217e2ab8 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeVertex_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/AlphaShapeVertex_3.h @@ -9,7 +9,9 @@ The concept `AlphaShapeVertex_3` describes the requirements for the base vertex RegularTriangulationVertexBase_3 if the underlying triangulation of the alpha shape is a regular triangulation. Periodic_3TriangulationDSVertexBase_3 if the underlying triangulation of the alpha shape is a periodic triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{`CGAL::Alpha_shape_vertex_base_3` (templated with the appropriate triangulation vertex base class)} +\cgalHasModelsEnd \sa `CGAL::Alpha_status` diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeCell_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeCell_3.h index 7707ed14ce16..8d4a59f29ee1 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeCell_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeCell_3.h @@ -9,7 +9,9 @@ The concept `FixedAlphaShapeCell_3` describes the requirements for the base cell RegularTriangulationCellBase_3 if the underlying triangulation of the alpha shape is a regular triangulation, Periodic_3TriangulationDSCellBase_3 if the underlying triangulation of the alpha shape is a periodic triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{`CGAL::Fixed_alpha_shape_cell_base_3` (templated with the appropriate triangulation cell base class)} +\cgalHasModelsEnd */ class FixedAlphaShapeCell_3 { public: diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeTraits_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeTraits_3.h index 4c63e9618fa0..4c0d409f5245 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeTraits_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeTraits_3.h @@ -10,7 +10,9 @@ of the underlying Delaunay triangulation of a basic alpha shape with a fixed val \cgalRefines{DelaunayTriangulationTraits_3 if the underlying triangulation of the alpha shape is a Delaunay triangulation, Periodic_3DelaunayTriangulationTraits_3 if the underlying triangulation of the alpha shape is a periodic Delaunay triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{All models of `Kernel`} +\cgalHasModelsEnd \sa CGAL::Exact_predicates_inexact_constructions_kernel (recommended kernel) */ diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeVertex_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeVertex_3.h index 7b152f16e2e5..dd4db3fecea7 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeVertex_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedAlphaShapeVertex_3.h @@ -9,7 +9,9 @@ The concept `FixedAlphaShapeVertex_3` describes the requirements for the base ve RegularTriangulationVertexBase_3 if the underlying triangulation of the alpha shape is a regular triangulation, Periodic_3TriangulationDSVertexBase_3 if the underlying triangulation of the alpha shape is a periodic triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{`CGAL::Fixed_alpha_shape_vertex_base_3` (templated with the appropriate triangulation vertex base class)} +\cgalHasModelsEnd */ class FixedAlphaShapeVertex_3 { diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h index 8b7694d5643c..73d46de6261a 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h @@ -9,7 +9,9 @@ for the geometric traits class of the underlying regular triangulation of a weig \cgalRefines{RegularTriangulationTraits_3 if the underlying triangulation of the alpha shape is a regular triangulation, Periodic_3RegularTriangulationTraits_3 if the underlying triangulation of the alpha shape is a periodic regular triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{All models of `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Exact_predicates_inexact_constructions_kernel` (recommended kernel) */ diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h index 10c8009e6c26..f91afc7cdb2c 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h @@ -10,7 +10,9 @@ of the underlying regular triangulation of a weighted alpha shape. \cgalRefines{RegularTriangulationTraits_3 if the underlying triangulation of the alpha shape is a regular triangulation, Periodic_3RegularTriangulationTraits_3 if the underlying triangulation of the alpha shape is a periodic regular triangulation} +\cgalHasModelsBegin \cgalHasModelsBare{All models of `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Exact_predicates_inexact_constructions_kernel` (recommended kernel) */ diff --git a/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapOracle.h b/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapOracle.h index 145349567d2f..bf8076c97946 100644 --- a/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapOracle.h +++ b/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapOracle.h @@ -9,10 +9,11 @@ The concept `AlphaWrapOracle` defines the requirements for an Alpha Wrap Ora that answers a number of queries over the input of the algorithm. The oracle is the template parameter of the class `CGAL::Alpha_wraps_3_::Alpha_wrap_3`. -\cgalHasModelsBegin CGAL::Alpha_wraps_3_::Point_set_oracle -\cgalHasModels CGAL::Alpha_wraps_3_::Segment_soup_oracle -\cgalHasModels CGAL::Alpha_wraps_3_::Triangle_mesh_oracle -\cgalHasModels CGAL::Alpha_wraps_3_::Triangle_soup_oracle +\cgalHasModelsBegin +\cgalModels{CGAL::Alpha_wraps_3_::Point_set_oracle} +\cgalModels{CGAL::Alpha_wraps_3_::Segment_soup_oracle} +\cgalModels{CGAL::Alpha_wraps_3_::Triangle_mesh_oracle} +\cgalModels{CGAL::Alpha_wraps_3_::Triangle_soup_oracle} \cgalHasModelsEnd */ diff --git a/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapTraits_3.h b/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapTraits_3.h index 916aa5aa3daf..c4d7308d5117 100644 --- a/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapTraits_3.h +++ b/Alpha_wrap_3/doc/Alpha_wrap_3/Concepts/AlphaWrapTraits_3.h @@ -11,7 +11,9 @@ you require Kernel. Stitch_borders doesn't even have clear geometric traits requ The concept `AlphaWrapTraits_3` defines the requirements for the geometric traits class of an alpha wrap oracle. +\cgalHasModelsBegin \cgalHasModelsBare{Any 3D %kernel is a model of this traits concept} +\cgalHasModelsEnd */ class AlphaWrapTraits_3 diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphDataStructure_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphDataStructure_2.h index e494faa898c8..78e8ce69c6ad 100644 --- a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphDataStructure_2.h +++ b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphDataStructure_2.h @@ -27,7 +27,8 @@ We only describe the additional requirements with respect to the \cgalRefines{TriangulationDataStructure_2} -\cgalHasModelsBegin CGAL::Triangulation_data_structure_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_data_structure_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphHierarchyVertexBase_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphHierarchyVertexBase_2.h index 4cfc7a99223a..354d27f68bfe 100644 --- a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphHierarchyVertexBase_2.h +++ b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphHierarchyVertexBase_2.h @@ -19,7 +19,8 @@ next and previous level graphs. `ApolloniusGraphHierarchyVertexBase_2` does not introduce any types in addition to those of `ApolloniusGraphVertexBase_2`. -\cgalHasModelsBegin CGAL::Apollonius_graph_hierarchy_vertex_base_2 > +\cgalHasModelsBegin +\cgalModels{CGAL::Apollonius_graph_hierarchy_vertex_base_2 >} \cgalHasModelsEnd \sa `ApolloniusGraphDataStructure_2` diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphTraits_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphTraits_2.h index 1517dd4fe17f..d62bc56484e5 100644 --- a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphTraits_2.h +++ b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphTraits_2.h @@ -12,8 +12,9 @@ it provides a type `Site_2`, which must be a model of the concept constructions for sites and several function object types for the predicates. -\cgalHasModelsBegin CGAL::Apollonius_graph_traits_2 -\cgalHasModels CGAL::Apollonius_graph_filtered_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Apollonius_graph_traits_2} +\cgalModels{CGAL::Apollonius_graph_filtered_traits_2} \cgalHasModelsEnd \sa `CGAL::Apollonius_graph_2` diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphVertexBase_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphVertexBase_2.h index cac31092bafe..45e4bd357458 100644 --- a/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphVertexBase_2.h +++ b/Apollonius_graph_2/doc/Apollonius_graph_2/Concepts/ApolloniusGraphVertexBase_2.h @@ -12,7 +12,8 @@ sites. The container stores the hidden sites related to the vertex. \cgalRefines{TriangulationVertexBase_2} -\cgalHasModelsBegin CGAL::Apollonius_graph_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Apollonius_graph_vertex_base_2} \cgalHasModelsEnd \sa `ApolloniusGraphDataStructure_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Approximate_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Approximate_2.h index 671d83a69674..8b105f4dab97 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Approximate_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Approximate_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementApproximateTraits_2::Approximate_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementApproximateTraits_2::Approximate_2} * \cgalHasModelsEnd */ class Approximate_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--AreMergeable_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--AreMergeable_2.h index 56ec39093c7e..a5c401dc85fe 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--AreMergeable_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--AreMergeable_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementXMonotoneTraits_2::Are_mergeable_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementXMonotoneTraits_2::Are_mergeable_2} * \cgalHasModelsEnd */ class AreMergeable_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXNearBoundary_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXNearBoundary_2.h index 9031f72a9bdb..0d85b1f0ae7d 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXNearBoundary_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXNearBoundary_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableTernaryFunction} * - * \cgalHasModelsBegin ArrangementOpenBoundaryTraits_2::Compare_x_near_boundary_ + * \cgalHasModelsBegin + * \cgalModels{ArrangementOpenBoundaryTraits_2::Compare_x_near_boundary_} * \cgalHasModelsEnd */ class CompareXNearBoundary_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundaryOfCurveEnd_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundaryOfCurveEnd_2.h index 45fd98fa2d6b..8fccd1309061 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundaryOfCurveEnd_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundaryOfCurveEnd_2.h @@ -5,9 +5,10 @@ namespace ArrTraits { * * \cgalRefines{AdaptableFunctor} * - * \cgalHasModelsBegin ArrangementHorizontalSideTraits_2::Compare_x_on_boundary_2 - * \cgalHasModels ArrangementOpenBoundaryTraits_2::Compare_x_on_boundary_2 - * \cgalHasModels ArrangementSphericalBoundaryTraits_2::Compare_x_on_boundary_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementHorizontalSideTraits_2::Compare_x_on_boundary_2} + * \cgalModels{ArrangementOpenBoundaryTraits_2::Compare_x_on_boundary_2} + * \cgalModels{ArrangementSphericalBoundaryTraits_2::Compare_x_on_boundary_2} * \cgalHasModelsEnd */ class CompareXOnBoundaryOfCurveEnd_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundary_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundary_2.h index b02a736b31d3..77eea00561d8 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundary_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXOnBoundary_2.h @@ -5,9 +5,10 @@ namespace ArrTraits { * * \cgalRefines{AdaptableFunctor} * - * \cgalHasModelsBegin ArrangementClosedBottomTraits_2::Compare_x_on_boundary_2 - * \cgalHasModels ArrangementClosedTopTraits_2::Compare_x_on_boundary_2 - * \cgalHasModels ArrangementIdentifiedHorizontalTraits_2::Compare_x_on_boundary_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementClosedBottomTraits_2::Compare_x_on_boundary_2} + * \cgalModels{ArrangementClosedTopTraits_2::Compare_x_on_boundary_2} + * \cgalModels{ArrangementIdentifiedHorizontalTraits_2::Compare_x_on_boundary_2} * \cgalHasModelsEnd */ class CompareXOnBoundary_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareX_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareX_2.h index fe5d8a4d5059..9e9e4fe45cde 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareX_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareX_2.h @@ -4,7 +4,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableBinaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Compare_x_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Compare_x_2} * \cgalHasModelsEnd */ class CompareX_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXy_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXy_2.h index f571e844bdbd..7e423c1d5cdc 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXy_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareXy_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableBinaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Compare_xy_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Compare_xy_2} * \cgalHasModelsEnd */ class CompareXy_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXLeft_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXLeft_2.h index eeb409061462..871add8868c7 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXLeft_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXLeft_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableTernaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Compare_y_at_x_left_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Compare_y_at_x_left_2} * \cgalHasModelsEnd */ class CompareYAtXLeft_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXRight_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXRight_2.h index 1308a75c5bda..4959f78d530f 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXRight_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtXRight_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableTernaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Compare_y_at_x_right_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Compare_y_at_x_right_2} * \cgalHasModelsEnd */ class CompareYAtXRight_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtX_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtX_2.h index e1e0d6714418..55ae2fc00faf 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtX_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYAtX_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableBinaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Compare_y_at_x_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Compare_y_at_x_2} * \cgalHasModelsEnd */ class CompareYAtX_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYNearBoundary_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYNearBoundary_2.h index df0c66fae012..e2ab7e9cae92 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYNearBoundary_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYNearBoundary_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableTernaryFunction} * - * \cgalHasModelsBegin ArrangementOpenBoundaryTraits_2::Compare_y_near_boundary_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementOpenBoundaryTraits_2::Compare_y_near_boundary_2} * \cgalHasModelsEnd */ class CompareYNearBoundary_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYOnBoundary_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYOnBoundary_2.h index 8f5c89d89fef..38a9090fd535 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYOnBoundary_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--CompareYOnBoundary_2.h @@ -5,10 +5,11 @@ namespace ArrTraits { * * \cgalRefines{AdaptableBinaryFunction} * - * \cgalHasModelsBegin ArrangementClosedLeftTraits_2::Compare_y_on_boundary_2 - * \cgalHasModels ArrangementClosedRightTraits_2::Compare_y_on_boundary_2 - * \cgalHasModels ArrangementIdentifiedVerticalTraits_2::Compare_y_on_boundary_2 - * \cgalHasModels ArrangementSphericalBoundaryTraits_2::Compare_y_on_boundary_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementClosedLeftTraits_2::Compare_y_on_boundary_2} + * \cgalModels{ArrangementClosedRightTraits_2::Compare_y_on_boundary_2} + * \cgalModels{ArrangementIdentifiedVerticalTraits_2::Compare_y_on_boundary_2} + * \cgalModels{ArrangementSphericalBoundaryTraits_2::Compare_y_on_boundary_2} * \cgalHasModelsEnd */ class CompareYOnBoundary_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructCurve_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructCurve_2.h index d6a0c5b1208a..75306891423f 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructCurve_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructCurve_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementConstructCurveTraits_2::Construct_curve_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementConstructCurveTraits_2::Construct_curve_2} * \cgalHasModelsEnd */ class ConstructCurve_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMaxVertex_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMaxVertex_2.h index e94c601aa7a6..85b5f9a7fe29 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMaxVertex_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMaxVertex_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableUnaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Construct_max_vertex_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Construct_max_vertex_2} * \cgalHasModelsEnd */ class ConstructMaxVertex_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMinVertex_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMinVertex_2.h index 00a000f41ced..a434876ac15f 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMinVertex_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructMinVertex_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableUnaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Construct_min_vertex_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Construct_min_vertex_2} * \cgalHasModelsEnd */ class ConstructMinVertex_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructXMonotoneCurve_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructXMonotoneCurve_2.h index d25d94e43713..73a5a007b91a 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructXMonotoneCurve_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ConstructXMonotoneCurve_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementConstructXMonotoneCurveTraits_2::Construct_x_monotone_curve_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementConstructXMonotoneCurveTraits_2::Construct_x_monotone_curve_2} * \cgalHasModelsEnd */ class ConstructXMonotoneCurve_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h index 3994e674cfb7..6ecf52458326 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h @@ -6,7 +6,8 @@ namespace ArrTraits { * represents a general planar curve. * * \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - * \cgalHasModelsBegin ArrangementTraits_2::Curve_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementTraits_2::Curve_2} * \cgalHasModelsEnd */ class Curve_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Equal_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Equal_2.h index 71c6da87afcc..ca9e3d1a098a 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Equal_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Equal_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableBinaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Equal_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Equal_2} * \cgalHasModelsEnd */ class Equal_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Intersect_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Intersect_2.h index 7a6d7e307390..df17bc89d084 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Intersect_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Intersect_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementXMonotoneTraits_2::Intersect_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementXMonotoneTraits_2::Intersect_2} * \cgalHasModelsEnd */ class Intersect_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnXIdentification_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnXIdentification_2.h index f2850203499e..6ead4d30e3fb 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnXIdentification_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnXIdentification_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableUnaryFunction} * - * \cgalHasModelsBegin ArrangementIdentifiedHorizontalTraits_2::Is_on_x_identification_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementIdentifiedHorizontalTraits_2::Is_on_x_identification_2} * \cgalHasModelsEnd */ class IsOnXIdentification_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnYIdentification_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnYIdentification_2.h index e07b550923f1..9da39191b062 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnYIdentification_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsOnYIdentification_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableUnaryFunction} * - * \cgalHasModelsBegin ArrangementIdentifiedVerticalTraits_2::Is_on_y_identification_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementIdentifiedVerticalTraits_2::Is_on_y_identification_2} * \cgalHasModelsEnd */ class IsOnYIdentification_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsVertical_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsVertical_2.h index e9bbf29d0c8a..1df66d52a0b3 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsVertical_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--IsVertical_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{AdaptableUnaryFunction} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Is_vertical_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Is_vertical_2} * \cgalHasModelsEnd */ class IsVertical_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--MakeXMonotone_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--MakeXMonotone_2.h index 46d0e1b5baea..2731e990a2fa 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--MakeXMonotone_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--MakeXMonotone_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementTraits_2::Make_x_monotone_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementTraits_2::Make_x_monotone_2} * \cgalHasModelsEnd */ class MakeXMonotone_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Merge_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Merge_2.h index 17e8573bea21..b2ec195a1484 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Merge_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Merge_2.h @@ -5,7 +5,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementXMonotoneTraits_2::Merge_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementXMonotoneTraits_2::Merge_2} * \cgalHasModelsEnd */ class Merge_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInX_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInX_2.h index 4e6a66ede1b1..1973f4a5371f 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInX_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInX_2.h @@ -5,9 +5,10 @@ namespace ArrTraits { * * \cgalRefines{AdaptableBinaryFunction} * - * \cgalHasModelsBegin ArrangementVerticalSideTraits_2::Parameter_space_in_x_2 - * \cgalHasModels ArrangementOpenBoundaryTraits_2::Parameter_space_in_x_2 - * \cgalHasModels ArrangementSphericalBoundaryTraits_2::Parameter_space_in_x_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementVerticalSideTraits_2::Parameter_space_in_x_2} + * \cgalModels{ArrangementOpenBoundaryTraits_2::Parameter_space_in_x_2} + * \cgalModels{ArrangementSphericalBoundaryTraits_2::Parameter_space_in_x_2} * \cgalHasModelsEnd */ class ParameterSpaceInX_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInY_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInY_2.h index e443f0498da4..19dae4f4cde1 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInY_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--ParameterSpaceInY_2.h @@ -5,9 +5,10 @@ namespace ArrTraits { * * \cgalRefines{AdaptableBinaryFunction} * - * \cgalHasModelsBegin ArrangementHorizontalSideTraits_2::Parameter_space_in_y_2 - * \cgalHasModels ArrangementOpenBoundaryTraits_2::Parameter_space_in_y_2 - * \cgalHasModels ArrangementSphericalBoundaryTraits_2::Parameter_space_in_y_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementHorizontalSideTraits_2::Parameter_space_in_y_2} + * \cgalModels{ArrangementOpenBoundaryTraits_2::Parameter_space_in_y_2} + * \cgalModels{ArrangementSphericalBoundaryTraits_2::Parameter_space_in_y_2} * \cgalHasModelsEnd */ class ParameterSpaceInY_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h index 182f0a059bad..cc53c3b9467d 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h @@ -7,7 +7,8 @@ namespace ArrTraits { * * \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::Point_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::Point_2} * \cgalHasModelsEnd */ class Point_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Split_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Split_2.h index ff6bcb382cbf..71519a41aea9 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Split_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Split_2.h @@ -4,7 +4,8 @@ namespace ArrTraits { * * \cgalRefines{Functor} * - * \cgalHasModelsBegin ArrangementXMonotoneTraits_2::Split_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementXMonotoneTraits_2::Split_2} * \cgalHasModelsEnd */ class Split_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h index f74e74bf150d..cf004f92dd04 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h @@ -6,7 +6,8 @@ namespace ArrTraits { * * \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} * - * \cgalHasModelsBegin ArrangementBasicTraits_2::X_monotone_curve_2 + * \cgalHasModelsBegin + * \cgalModels{ArrangementBasicTraits_2::X_monotone_curve_2} * \cgalHasModelsEnd */ class XMonotoneCurve_2 { diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementApproximateTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementApproximateTraits_2.h index b4720036574e..a6940b050c1a 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementApproximateTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementApproximateTraits_2.h @@ -8,14 +8,15 @@ point. \cgalRefines{ArrangementBasicTraits_2} -\cgalHasModelsBegin CGAL::Arr_conic_traits_2 -\cgalHasModels CGAL::Arr_geodesic_arc_on_sphere_traits_2 -\cgalHasModels CGAL::Arr_linear_traits_2 -\cgalHasModels CGAL::Arr_non_caching_segment_traits_2 -\cgalHasModels CGAL::Arr_segment_traits_2 -\cgalHasModels CGAL::Arr_polycurve_traits_2 -\cgalHasModels CGAL::Arr_polyline_traits_2 -\cgalHasModels CGAL::Arr_rational_function_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_conic_traits_2} +\cgalModels{CGAL::Arr_geodesic_arc_on_sphere_traits_2} +\cgalModels{CGAL::Arr_linear_traits_2} +\cgalModels{CGAL::Arr_non_caching_segment_traits_2} +\cgalModels{CGAL::Arr_segment_traits_2} +\cgalModels{CGAL::Arr_polycurve_traits_2} +\cgalModels{CGAL::Arr_polyline_traits_2} +\cgalModels{CGAL::Arr_rational_function_traits_2} \cgalHasModelsEnd \sa `ArrangementConstructXMonotoneCurveTraits_2`, diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTopologyTraits.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTopologyTraits.h index 3e8c60735722..6edbb7820d6d 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTopologyTraits.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTopologyTraits.h @@ -9,7 +9,8 @@ * represent the arrangement cells (i.e., vertices, edges, and facets) and the * incident relations between them. * - * \cgalHasModelsBegin CGAL::Arr_spherical_topology_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_spherical_topology_traits_2} * \cgalHasModelsEnd */ diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTraits_2.h index e521ef28b065..530aac71c9c5 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBasicTraits_2.h @@ -27,21 +27,22 @@ * * \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} * - * \cgalHasModelsBegin CGAL::Arr_segment_traits_2 - * \cgalHasModels CGAL::Arr_non_caching_segment_basic_traits_2 - * \cgalHasModels CGAL::Arr_non_caching_segment_traits_2 - * \cgalHasModels CGAL::Arr_linear_traits_2 - * \cgalHasModels CGAL::Arr_polyline_traits_2 - * \cgalHasModels CGAL::Arr_circle_segment_traits_2 - * \cgalHasModels CGAL::Arr_line_arc_traits_2 - * \cgalHasModels CGAL::Arr_circular_arc_traits_2 - * \cgalHasModels CGAL::Arr_circular_line_arc_traits_2 - * \cgalHasModels CGAL::Arr_conic_traits_2 - * \cgalHasModels CGAL::Arr_rational_function_traits_2 - * \cgalHasModels CGAL::Arr_Bezier_curve_traits_2 - * \cgalHasModels CGAL::Arr_algebraic_segment_traits_2 - * \cgalHasModels CGAL::Arr_curve_data_traits_2 - * \cgalHasModels CGAL::Arr_consolidated_curve_data_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_segment_traits_2} + * \cgalModels{CGAL::Arr_non_caching_segment_basic_traits_2} + * \cgalModels{CGAL::Arr_non_caching_segment_traits_2} + * \cgalModels{CGAL::Arr_linear_traits_2} + * \cgalModels{CGAL::Arr_polyline_traits_2} + * \cgalModels{CGAL::Arr_circle_segment_traits_2} + * \cgalModels{CGAL::Arr_line_arc_traits_2} + * \cgalModels{CGAL::Arr_circular_arc_traits_2} + * \cgalModels{CGAL::Arr_circular_line_arc_traits_2} + * \cgalModels{CGAL::Arr_conic_traits_2} + * \cgalModels{CGAL::Arr_rational_function_traits_2} + * \cgalModels{CGAL::Arr_Bezier_curve_traits_2} + * \cgalModels{CGAL::Arr_algebraic_segment_traits_2} + * \cgalModels{CGAL::Arr_curve_data_traits_2} + * \cgalModels{CGAL::Arr_consolidated_curve_data_traits_2} * \cgalHasModelsEnd */ diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructCurveTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructCurveTraits_2.h index 176810a0793e..c0f8193d057a 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructCurveTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructCurveTraits_2.h @@ -7,13 +7,14 @@ * * \cgalRefines{ArrangementTraits_2} * - * \cgalHasModelsBegin CGAL::Arr_conic_traits_2 - * \cgalHasModels CGAL::Arr_geodesic_arc_on_sphere_traits_2 - * \cgalHasModels CGAL::Arr_linear_traits_2 - * \cgalHasModels CGAL::Arr_non_caching_segment_traits_2 - * \cgalHasModels CGAL::Arr_segment_traits_2 - * \cgalHasModels CGAL::Arr_polyline_traits_2 - * \cgalHasModels CGAL::Arr_rational_function_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_conic_traits_2} + * \cgalModels{CGAL::Arr_geodesic_arc_on_sphere_traits_2} + * \cgalModels{CGAL::Arr_linear_traits_2} + * \cgalModels{CGAL::Arr_non_caching_segment_traits_2} + * \cgalModels{CGAL::Arr_segment_traits_2} + * \cgalModels{CGAL::Arr_polyline_traits_2} + * \cgalModels{CGAL::Arr_rational_function_traits_2} * \cgalHasModelsEnd * * \sa `ArrangementConstructXMonotoneCurveTraits_2`, and diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructXMonotoneCurveTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructXMonotoneCurveTraits_2.h index 99ca431cd467..7bfebe4906f7 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructXMonotoneCurveTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementConstructXMonotoneCurveTraits_2.h @@ -7,13 +7,14 @@ * * \cgalRefines{ArrangementBasicTraits_2} * - * \cgalHasModelsBegin CGAL::Arr_conic_traits_2 - * \cgalHasModels CGAL::Arr_geodesic_arc_on_sphere_traits_2 - * \cgalHasModels CGAL::Arr_linear_traits_2 - * \cgalHasModels CGAL::Arr_non_caching_segment_traits_2 - * \cgalHasModels CGAL::Arr_segment_traits_2 - * \cgalHasModels CGAL::Arr_polyline_traits_2 - * \cgalHasModels CGAL::Arr_rational_function_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_conic_traits_2} + * \cgalModels{CGAL::Arr_geodesic_arc_on_sphere_traits_2} + * \cgalModels{CGAL::Arr_linear_traits_2} + * \cgalModels{CGAL::Arr_non_caching_segment_traits_2} + * \cgalModels{CGAL::Arr_segment_traits_2} + * \cgalModels{CGAL::Arr_polyline_traits_2} + * \cgalModels{CGAL::Arr_rational_function_traits_2} * \cgalHasModelsEnd * * \sa `ArrangementApproximateTraits_2`, diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcel.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcel.h index 81984c4699eb..b750989c9ffe 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcel.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcel.h @@ -14,10 +14,11 @@ * `ArrangementDcelHalfedge`, `ArrangementDcelFace`, `ArrangementDcelOuterCcb`, * `ArrangementDcelInnerCcb`, and `ArrangementDcelIsolatedVertex` respectively.) * - * \cgalHasModelsBegin CGAL::Arr_dcel_base - * \cgalHasModels CGAL::Arr_default_dcel - * \cgalHasModels CGAL::Arr_face_extended_dcel - * \cgalHasModels CGAL::Arr_extended_dcel + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_dcel_base} + * \cgalModels{CGAL::Arr_default_dcel} + * \cgalModels{CGAL::Arr_face_extended_dcel} + * \cgalModels{CGAL::Arr_extended_dcel} * \cgalHasModelsEnd * * \sa `ArrangementDcelVertex` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcelWithRebind.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcelWithRebind.h index d4f263cf01f1..c3d607c6e98e 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcelWithRebind.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementDcelWithRebind.h @@ -10,9 +10,10 @@ Instantiate a dcel class with many different possible types without ad-hoc limit \cgalRefines{ArrangementDcel} -\cgalHasModelsBegin CGAL::Arr_default_dcel -\cgalHasModels CGAL::Arr_face_extended_dcel -\cgalHasModels CGAL::Arr_extended_dcel +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_default_dcel} +\cgalModels{CGAL::Arr_face_extended_dcel} +\cgalModels{CGAL::Arr_extended_dcel} \cgalHasModelsEnd */ diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementHorizontalSideTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementHorizontalSideTraits_2.h index 60e28710d01a..8dfbfb227075 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementHorizontalSideTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementHorizontalSideTraits_2.h @@ -11,10 +11,11 @@ * * \cgalRefines{ArrangementBasicTraits_2} * - * \cgalHasModelsBegin CGAL::Arr_linear_traits_2 - * \cgalHasModels CGAL::Arr_rational_function_traits_2 - * \cgalHasModels CGAL::Arr_algebraic_segment_traits_2 - * \cgalHasModels CGAL::Arr_geodesic_arc_on_sphere_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_linear_traits_2} + * \cgalModels{CGAL::Arr_rational_function_traits_2} + * \cgalModels{CGAL::Arr_algebraic_segment_traits_2} + * \cgalModels{CGAL::Arr_geodesic_arc_on_sphere_traits_2} * \cgalHasModelsEnd * * \sa `ArrangementVerticalSideTraits_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementInputFormatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementInputFormatter.h index 53469ded7bd2..07c14685f6e9 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementInputFormatter.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementInputFormatter.h @@ -5,9 +5,10 @@ * functions that enable reading an arrangement from an input stream using a * specific format. * - * \cgalHasModelsBegin CGAL::Arr_text_formatter - * \cgalHasModels CGAL::Arr_face_extended_text_formatter - * \cgalHasModels CGAL::Arr_extended_dcel_text_formatter + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_text_formatter} + * \cgalModels{CGAL::Arr_face_extended_text_formatter} + * \cgalModels{CGAL::Arr_extended_dcel_text_formatter} * \cgalHasModelsEnd * */ diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLandmarkTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLandmarkTraits_2.h index b014807650ae..79624fa82380 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLandmarkTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLandmarkTraits_2.h @@ -11,14 +11,15 @@ * * \cgalRefines{ArrangementApproximateTraits_2,ArrangementConstructXMonotoneCurveTraits_2} * - * \cgalHasModelsBegin CGAL::Arr_conic_traits_2 - * \cgalHasModels CGAL::Arr_geodesic_arc_on_sphere_traits_2 - * \cgalHasModels CGAL::Arr_linear_traits_2 - * \cgalHasModels CGAL::Arr_non_caching_segment_traits_2 - * \cgalHasModels CGAL::Arr_segment_traits_2 - * \cgalHasModels CGAL::Arr_polycurve_traits_2 - * \cgalHasModels CGAL::Arr_polyline_traits_2 - * \cgalHasModels CGAL::Arr_rational_function_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_conic_traits_2} + * \cgalModels{CGAL::Arr_geodesic_arc_on_sphere_traits_2} + * \cgalModels{CGAL::Arr_linear_traits_2} + * \cgalModels{CGAL::Arr_non_caching_segment_traits_2} + * \cgalModels{CGAL::Arr_segment_traits_2} + * \cgalModels{CGAL::Arr_polycurve_traits_2} + * \cgalModels{CGAL::Arr_polyline_traits_2} + * \cgalModels{CGAL::Arr_rational_function_traits_2} * \cgalHasModelsEnd * * \sa `ArrangementXMonotoneTraits_2` and diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBoundaryTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBoundaryTraits_2.h index 16f3ffa51951..3bf6b089be6f 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBoundaryTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBoundaryTraits_2.h @@ -39,11 +39,12 @@ * * \cgalRefines{ArrangementBasicTraits_2} * - * \cgalHasModelsBegin CGAL::Arr_linear_traits_2 - * \cgalHasModels CGAL::Arr_rational_function_traits_2 - * \cgalHasModels CGAL::Arr_algebraic_segment_traits_2 - * \cgalHasModels CGAL::Arr_curve_data_traits_2 - * \cgalHasModels CGAL::Arr_consolidated_curve_data_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_linear_traits_2} + * \cgalModels{CGAL::Arr_rational_function_traits_2} + * \cgalModels{CGAL::Arr_algebraic_segment_traits_2} + * \cgalModels{CGAL::Arr_curve_data_traits_2} + * \cgalModels{CGAL::Arr_consolidated_curve_data_traits_2} * \cgalHasModelsEnd * * \sa `ArrangementBasicTraits_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOutputFormatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOutputFormatter.h index bee9cba77204..eb6c67a142b5 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOutputFormatter.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOutputFormatter.h @@ -6,9 +6,10 @@ A model for the `ArrangementOutputFormatter` concept supports a set of functions that enable writing an arrangement to an output stream using a specific format. -\cgalHasModelsBegin CGAL::Arr_text_formatter -\cgalHasModels CGAL::Arr_face_extended_text_formatter -\cgalHasModels CGAL::Arr_extended_dcel_text_formatter +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_text_formatter} +\cgalModels{CGAL::Arr_face_extended_text_formatter} +\cgalModels{CGAL::Arr_extended_dcel_text_formatter} \cgalHasModelsEnd */ diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h index 31e4bf302320..782af5d25cd5 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h @@ -20,10 +20,11 @@ the old style without any overhead, the macro `CGAL_ARR_POINT_LOCATION_VERSION` can be defined to 1 before any \cgal header is included. -\cgalHasModelsBegin CGAL::Arr_naive_point_location -\cgalHasModels CGAL::Arr_walk_along_line_point_location -\cgalHasModels CGAL::Arr_trapezoid_ric_point_location -\cgalHasModels CGAL::Arr_landmarks_point_location +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_naive_point_location} +\cgalModels{CGAL::Arr_walk_along_line_point_location} +\cgalModels{CGAL::Arr_trapezoid_ric_point_location} +\cgalModels{CGAL::Arr_landmarks_point_location} \cgalHasModelsEnd \sa `CGAL::Arr_naive_point_location` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementSphericalBoundaryTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementSphericalBoundaryTraits_2.h index fe9137b5696a..2c2d0ad0208d 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementSphericalBoundaryTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementSphericalBoundaryTraits_2.h @@ -11,7 +11,8 @@ * \cgalRefines{ArrangementBasicTraits_2,ArrangementIdentifiedVerticalTraits_2, * ArrangementContractedBottomTraits_2,ArrangementContractedTopTraits_2} * - * \cgalHasModelsBegin CGAL::Arr_geodesic_arc_on_sphere_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_geodesic_arc_on_sphere_traits_2} * \cgalHasModelsEnd * * \sa `ArrangementOpenBoundaryTraits_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopologyTraits.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopologyTraits.h index 80660fcda14d..defff744a976 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopologyTraits.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopologyTraits.h @@ -20,9 +20,10 @@ * * At this point we do not expose all the requirements of this concept. * - * \cgalHasModelsBegin CGAL::Arr_bounded_planar_topology_traits_2 - * \cgalHasModels CGAL::Arr_unb_planar_topology_traits_2 - * \cgalHasModels CGAL::Arr_spherical_topology_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_bounded_planar_topology_traits_2} + * \cgalModels{CGAL::Arr_unb_planar_topology_traits_2} + * \cgalModels{CGAL::Arr_spherical_topology_traits_2} * \cgalHasModelsEnd * * \sa `Arrangement_on_surface_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTraits_2.h index e9bca5d3dc96..897ede7f25a3 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTraits_2.h @@ -30,20 +30,21 @@ that accept such curves, such as `intsert()`. \cgalRefines{ArrangementXMonotoneTraits_2} -\cgalHasModelsBegin CGAL::Arr_segment_traits_2 -\cgalHasModels CGAL::Arr_non_caching_segment_traits_2 -\cgalHasModels CGAL::Arr_linear_traits_2 -\cgalHasModels CGAL::Arr_polyline_traits_2 -\cgalHasModels CGAL::Arr_circle_segment_traits_2 -\cgalHasModels CGAL::Arr_line_arc_traits_2 -\cgalHasModels CGAL::Arr_circular_arc_traits_2 -\cgalHasModels CGAL::Arr_circular_line_arc_traits_2 -\cgalHasModels CGAL::Arr_conic_traits_2 -\cgalHasModels CGAL::Arr_rational_function_traits_2 -\cgalHasModels CGAL::Arr_Bezier_curve_traits_2 -\cgalHasModels CGAL::Arr_algebraic_segment_traits_2 -\cgalHasModels CGAL::Arr_curve_data_traits_2 -\cgalHasModels CGAL::Arr_consolidated_curve_data_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_segment_traits_2} +\cgalModels{CGAL::Arr_non_caching_segment_traits_2} +\cgalModels{CGAL::Arr_linear_traits_2} +\cgalModels{CGAL::Arr_polyline_traits_2} +\cgalModels{CGAL::Arr_circle_segment_traits_2} +\cgalModels{CGAL::Arr_line_arc_traits_2} +\cgalModels{CGAL::Arr_circular_arc_traits_2} +\cgalModels{CGAL::Arr_circular_line_arc_traits_2} +\cgalModels{CGAL::Arr_conic_traits_2} +\cgalModels{CGAL::Arr_rational_function_traits_2} +\cgalModels{CGAL::Arr_Bezier_curve_traits_2} +\cgalModels{CGAL::Arr_algebraic_segment_traits_2} +\cgalModels{CGAL::Arr_curve_data_traits_2} +\cgalModels{CGAL::Arr_consolidated_curve_data_traits_2} \cgalHasModelsEnd \sa `ArrangementBasicTraits_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h index eb1b893f460e..0b7c89be1586 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h @@ -28,10 +28,11 @@ is recommended. To enable the old style without any overhead, the macro `CGAL_ARR_POINT_LOCATION_VERSION` can be defined to 1 before any \cgal header is included. -\cgalHasModelsBegin CGAL::Arr_naive_point_location -\cgalHasModels CGAL::Arr_walk_along_line_point_location -\cgalHasModels CGAL::Arr_trapezoid_ric_point_location -\cgalHasModels CGAL::Arr_landmarks_point_location +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_naive_point_location} +\cgalModels{CGAL::Arr_walk_along_line_point_location} +\cgalModels{CGAL::Arr_trapezoid_ric_point_location} +\cgalModels{CGAL::Arr_landmarks_point_location} \cgalHasModelsEnd \sa `CGAL::Arr_naive_point_location` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalSideTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalSideTraits_2.h index e12fda8a889f..2b9d1c9f6c16 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalSideTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalSideTraits_2.h @@ -11,10 +11,11 @@ * * \cgalRefines{ArrangementBasicTraits_2} * - * \cgalHasModelsBegin CGAL::Arr_linear_traits_2 - * \cgalHasModels CGAL::Arr_rational_function_traits_2 - * \cgalHasModels CGAL::Arr_algebraic_segment_traits_2 - * \cgalHasModels CGAL::Arr_geodesic_arc_on_sphere_traits_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::Arr_linear_traits_2} + * \cgalModels{CGAL::Arr_rational_function_traits_2} + * \cgalModels{CGAL::Arr_algebraic_segment_traits_2} + * \cgalModels{CGAL::Arr_geodesic_arc_on_sphere_traits_2} * \cgalHasModelsEnd * * \sa `ArrangementVerticalSideTraits_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryInputFormatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryInputFormatter.h index 4b31986adfb5..601725e3c065 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryInputFormatter.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryInputFormatter.h @@ -9,7 +9,8 @@ specific format. \cgalRefines{ArrangementInputFormatter} -\cgalHasModelsBegin CGAL::Arr_with_history_text_formatter +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_with_history_text_formatter} \cgalHasModelsEnd */ diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryOutputFormatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryOutputFormatter.h index 8ff0dc5eda48..287a3a9f7ebd 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryOutputFormatter.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementWithHistoryOutputFormatter.h @@ -9,7 +9,8 @@ specific format. \cgalRefines{ArrangementOutputFormatter} -\cgalHasModelsBegin CGAL::Arr_with_history_text_formatter +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_with_history_text_formatter} \cgalHasModelsEnd */ diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementXMonotoneTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementXMonotoneTraits_2.h index 99e34f2ae6d1..32e49f947dcd 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementXMonotoneTraits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementXMonotoneTraits_2.h @@ -18,20 +18,21 @@ curve splitting. \cgalRefines{ArrangementBasicTraits_2} -\cgalHasModelsBegin CGAL::Arr_segment_traits_2 -\cgalHasModels CGAL::Arr_non_caching_segment_traits_2 -\cgalHasModels CGAL::Arr_linear_traits_2 -\cgalHasModels CGAL::Arr_polyline_traits_2 -\cgalHasModels CGAL::Arr_circle_segment_traits_2 -\cgalHasModels CGAL::Arr_line_arc_traits_2 -\cgalHasModels CGAL::Arr_circular_arc_traits_2 -\cgalHasModels CGAL::Arr_circular_line_arc_traits_2 -\cgalHasModels CGAL::Arr_conic_traits_2 -\cgalHasModels CGAL::Arr_rational_function_traits_2 -\cgalHasModels CGAL::Arr_Bezier_curve_traits_2 -\cgalHasModels CGAL::Arr_algebraic_segment_traits_2 -\cgalHasModels CGAL::Arr_curve_data_traits_2 -\cgalHasModels CGAL::Arr_consolidated_curve_data_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_segment_traits_2} +\cgalModels{CGAL::Arr_non_caching_segment_traits_2} +\cgalModels{CGAL::Arr_linear_traits_2} +\cgalModels{CGAL::Arr_polyline_traits_2} +\cgalModels{CGAL::Arr_circle_segment_traits_2} +\cgalModels{CGAL::Arr_line_arc_traits_2} +\cgalModels{CGAL::Arr_circular_arc_traits_2} +\cgalModels{CGAL::Arr_circular_line_arc_traits_2} +\cgalModels{CGAL::Arr_conic_traits_2} +\cgalModels{CGAL::Arr_rational_function_traits_2} +\cgalModels{CGAL::Arr_Bezier_curve_traits_2} +\cgalModels{CGAL::Arr_algebraic_segment_traits_2} +\cgalModels{CGAL::Arr_curve_data_traits_2} +\cgalModels{CGAL::Arr_consolidated_curve_data_traits_2} \cgalHasModelsEnd \sa `ArrangementBasicTraits_2` diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/OverlayTraits.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/OverlayTraits.h index 2a90dfee44dc..678d26425c4d 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/OverlayTraits.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/OverlayTraits.h @@ -11,8 +11,9 @@ Models for the concept are used by the global `overlay()` function to maintain the auxiliary data stored with the \dcel records of the resulting overlaid arrangement, based on the contents of the input records. -\cgalHasModelsBegin CGAL::Arr_default_overlay_traits -\cgalHasModels CGAL::Arr_face_overlay_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_default_overlay_traits} +\cgalModels{CGAL::Arr_face_overlay_traits} \cgalHasModelsEnd \sa `overlay` diff --git a/BGL/doc/BGL/Concepts/EdgeListGraph.h b/BGL/doc/BGL/Concepts/EdgeListGraph.h index 93b23b76748a..f1a0412db76c 100644 --- a/BGL/doc/BGL/Concepts/EdgeListGraph.h +++ b/BGL/doc/BGL/Concepts/EdgeListGraph.h @@ -11,7 +11,9 @@ and adds the requirement for traversal of all edges in a graph. \cgalRefines{Graph} +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/BGL/doc/BGL/Concepts/FaceGraph.h b/BGL/doc/BGL/Concepts/FaceGraph.h index a8b8bbe18935..0320f5b7b76f 100644 --- a/BGL/doc/BGL/Concepts/FaceGraph.h +++ b/BGL/doc/BGL/Concepts/FaceGraph.h @@ -20,7 +20,9 @@ A face descriptor must be `DefaultConstructible`, `Assignable`, `EqualityCompara \cgalRefines{HalfedgeGraph} +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/BGL/doc/BGL/Concepts/FaceListGraph.h b/BGL/doc/BGL/Concepts/FaceListGraph.h index 046015b67d2f..40339f34e8f4 100644 --- a/BGL/doc/BGL/Concepts/FaceListGraph.h +++ b/BGL/doc/BGL/Concepts/FaceListGraph.h @@ -16,7 +16,9 @@ face iterator must be the same as the face descriptor of the graph. \cgalRefines{FaceGraph} +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/BGL/doc/BGL/Concepts/HalfedgeGraph.h b/BGL/doc/BGL/Concepts/HalfedgeGraph.h index 7be2d2220d71..15600e021759 100644 --- a/BGL/doc/BGL/Concepts/HalfedgeGraph.h +++ b/BGL/doc/BGL/Concepts/HalfedgeGraph.h @@ -38,7 +38,9 @@ An edge descriptor must be `DefaultConstructible`, `Assignable`, `EqualityCompar A model of `HalfedgeGraph` must have the interior property `vertex_point` attached to its vertices. +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/BGL/doc/BGL/Concepts/HalfedgeListGraph.h b/BGL/doc/BGL/Concepts/HalfedgeListGraph.h index c5f8eeff6898..a709aadaa8be 100644 --- a/BGL/doc/BGL/Concepts/HalfedgeListGraph.h +++ b/BGL/doc/BGL/Concepts/HalfedgeListGraph.h @@ -16,7 +16,9 @@ halfedge iterator must be the same as the halfedge descriptor of the graph. \cgalRefines{HalfedgeGraph} +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/BGL/doc/BGL/Concepts/MutableFaceGraph.h b/BGL/doc/BGL/Concepts/MutableFaceGraph.h index 1f0f86c6a863..f47bf7de8163 100644 --- a/BGL/doc/BGL/Concepts/MutableFaceGraph.h +++ b/BGL/doc/BGL/Concepts/MutableFaceGraph.h @@ -7,7 +7,9 @@ the requirement for operations to add faces and to modify face-halfedge relation \cgalRefines{FaceGraph,MutableHalfedgeGraph} +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/BGL/doc/BGL/Concepts/MutableHalfedgeGraph.h b/BGL/doc/BGL/Concepts/MutableHalfedgeGraph.h index 86bd650fc867..c5d8c66ec568 100644 --- a/BGL/doc/BGL/Concepts/MutableHalfedgeGraph.h +++ b/BGL/doc/BGL/Concepts/MutableHalfedgeGraph.h @@ -8,7 +8,9 @@ update the incidence information between vertices and halfedges. \cgalRefines{HalfedgeGraph} +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/BGL/doc/BGL/Concepts/VertexListGraph.h b/BGL/doc/BGL/Concepts/VertexListGraph.h index 009fe00dac1b..f6e65cf72000 100644 --- a/BGL/doc/BGL/Concepts/VertexListGraph.h +++ b/BGL/doc/BGL/Concepts/VertexListGraph.h @@ -11,7 +11,9 @@ and adds the requirement for traversal of all vertices in a graph. \cgalRefines{Graph} +\cgalHasModelsBegin \cgalHasModelsBare{See \link PkgBGLTraits Boost Graph Traits Specializations \endlink} +\cgalHasModelsEnd \sa \link PkgBGLConcepts Graph Concepts \endlink */ diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricCoordinates_2.h b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricCoordinates_2.h index 9fd9c19943b5..35818aa505d6 100644 --- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricCoordinates_2.h +++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricCoordinates_2.h @@ -8,9 +8,10 @@ namespace Barycentric_coordinates { A concept that describes the set of methods that should be defined for all coordinate models used to parameterize the class `Generalized_barycentric_coordinates_2`. -\cgalHasModelsBegin Wachspress_2 -\cgalHasModels Mean_value_2 -\cgalHasModels Discrete_harmonic_2 +\cgalHasModelsBegin +\cgalModels{Wachspress_2} +\cgalModels{Mean_value_2} +\cgalModels{Discrete_harmonic_2} \cgalHasModelsEnd \deprecated This part of the package is deprecated since the version 5.4 of \cgal. diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricTraits_2.h b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricTraits_2.h index bf07127b14db..6fb0823a7446 100644 --- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricTraits_2.h +++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/BarycentricTraits_2.h @@ -9,10 +9,12 @@ A concept that describes the set of requirements of the template parameter `GeomTraits` used to parameterize all classes and functions with 2D barycentric coordinates from the namespace `CGAL::Barycentric_coordinates`. -\cgalHasModelsBareBegin{All models of `Kernel`} CGAL::Projection_traits_3 -\cgalHasModels CGAL::Projection_traits_xy_3 -\cgalHasModels CGAL::Projection_traits_yz_3 -\cgalHasModels CGAL::Projection_traits_xz_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of `Kernel`} +\cgalHasModels{CGAL::Projection_traits_3} +\cgalHasModels{CGAL::Projection_traits_xy_3} +\cgalHasModels{CGAL::Projection_traits_yz_3} +\cgalHasModels{CGAL::Projection_traits_xz_3} \cgalHasModelsEnd */ class BarycentricTraits_2 { diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h index 9ace050c0d8b..b1613da6b02c 100644 --- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h +++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h @@ -13,7 +13,8 @@ elements, which share common edges and vertices. These finite elements are then used to approximate certain types of generalized barycentric coordinate functions. The domain is bounded by the polygon. -\cgalHasModelsBegin Delaunay_domain_2 +\cgalHasModelsBegin +\cgalModels{Delaunay_domain_2} \cgalHasModelsEnd */ class DiscretizedDomain_2 { diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--AreMergeable_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--AreMergeable_2.h index 409316c5a4e6..bc3fa2117d32 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--AreMergeable_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--AreMergeable_2.h @@ -5,7 +5,8 @@ namespace ArrDirectionalTraits { \cgalRefines{AdaptableBinaryFunction} -\cgalHasModelsBegin ArrangementDirectionalXMonotoneTraits_2::Are_mergeable_2 +\cgalHasModelsBegin +\cgalModels{ArrangementDirectionalXMonotoneTraits_2::Are_mergeable_2} \cgalHasModelsEnd */ diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--CompareEndpointsXy_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--CompareEndpointsXy_2.h index f4fcfa096e92..a2e684be6263 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--CompareEndpointsXy_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--CompareEndpointsXy_2.h @@ -6,7 +6,8 @@ namespace ArrDirectionalTraits { \cgalRefines{AdaptableUnaryFunction} -\cgalHasModelsBegin ArrangementDirectionalXMonotoneTraits_2::Compare_endpoints_xy_2 +\cgalHasModelsBegin +\cgalModels{ArrangementDirectionalXMonotoneTraits_2::Compare_endpoints_xy_2} \cgalHasModelsEnd */ diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--ConstructOpposite_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--ConstructOpposite_2.h index 719878346a5c..bac19b870721 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--ConstructOpposite_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--ConstructOpposite_2.h @@ -6,7 +6,8 @@ namespace ArrDirectionalTraits { \cgalRefines{AdaptableUnaryFunction} -\cgalHasModelsBegin ArrangementDirectionalXMonotoneTraits_2::Construct_opposite_2 +\cgalHasModelsBegin +\cgalModels{ArrangementDirectionalXMonotoneTraits_2::Construct_opposite_2} \cgalHasModelsEnd */ diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Intersect_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Intersect_2.h index 1e98facf71d9..f82f215155a4 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Intersect_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Intersect_2.h @@ -5,7 +5,8 @@ namespace ArrDirectionalTraits { \cgalRefines{AdaptableBinaryFunction} -\cgalHasModelsBegin ArrangementDirectionalXMonotoneTraits_2::Intersect_2 +\cgalHasModelsBegin +\cgalModels{ArrangementDirectionalXMonotoneTraits_2::Intersect_2} \cgalHasModelsEnd */ diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Merge_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Merge_2.h index 2064a3ba0797..a2b89befdec1 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Merge_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Merge_2.h @@ -5,7 +5,8 @@ namespace ArrDirectionalTraits { \cgalRefines{AdaptableBinaryFunction} -\cgalHasModelsBegin ArrangementDirectionalXMonotoneTraits_2::Merge_2 +\cgalHasModelsBegin +\cgalModels{ArrangementDirectionalXMonotoneTraits_2::Merge_2} \cgalHasModelsEnd */ diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Split_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Split_2.h index 91f8903728c8..7bca25154fd4 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Split_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrDirectionalTraits--Split_2.h @@ -5,7 +5,8 @@ namespace ArrDirectionalTraits { \cgalRefines{AdaptableUnaryFunction} -\cgalHasModelsBegin ArrangementDirectionalXMonotoneTraits_2::Split_2 +\cgalHasModelsBegin +\cgalModels{ArrangementDirectionalXMonotoneTraits_2::Split_2} \cgalHasModelsEnd */ diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrangementDirectionalXMonotoneTraits_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrangementDirectionalXMonotoneTraits_2.h index 6b66a66997bb..15aaffd07888 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrangementDirectionalXMonotoneTraits_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/ArrangementDirectionalXMonotoneTraits_2.h @@ -16,13 +16,14 @@ as its source and the other as its target. \cgalRefines{ArrangementXMonotoneTraits_2} -\cgalHasModelsBegin CGAL::Arr_segment_traits_2 -\cgalHasModels CGAL::Arr_non_caching_segment_traits_2 -\cgalHasModels CGAL::Arr_circle_segment_traits_2 -\cgalHasModels CGAL::Arr_conic_traits_2 -\cgalHasModels CGAL::Arr_rational_function_traits_2 -\cgalHasModels CGAL::Arr_Bezier_curve_traits_2 -\cgalHasModels CGAL::Arr_algebraic_segment_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Arr_segment_traits_2} +\cgalModels{CGAL::Arr_non_caching_segment_traits_2} +\cgalModels{CGAL::Arr_circle_segment_traits_2} +\cgalModels{CGAL::Arr_conic_traits_2} +\cgalModels{CGAL::Arr_rational_function_traits_2} +\cgalModels{CGAL::Arr_Bezier_curve_traits_2} +\cgalModels{CGAL::Arr_algebraic_segment_traits_2} \cgalHasModelsEnd \sa `ArrangementXMonotoneTraits_2` diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcel.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcel.h index 9264a822bff7..3151c6eb0746 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcel.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcel.h @@ -16,7 +16,8 @@ respectively \cgalRefines{ArrangementDcel} -\cgalHasModelsBegin CGAL::Gps_default_dcel +\cgalHasModelsBegin +\cgalModels{CGAL::Gps_default_dcel} \cgalHasModelsEnd \sa `GeneralPolygonSetDcelFace` diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelFace.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelFace.h index 029f24e7b3f0..123f3b883cfb 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelFace.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelFace.h @@ -9,7 +9,8 @@ to represent the underlying internal `Arrangement_2` data structure. \cgalRefines{ArrangementDcelFace} -\cgalHasModelsBegin CGAL::Gps_face_base +\cgalHasModelsBegin +\cgalModels{CGAL::Gps_face_base} \cgalHasModelsEnd \sa `ArrangementDcel` diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelHalfedge.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelHalfedge.h index 900f52372298..3f254f685a28 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelHalfedge.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetDcelHalfedge.h @@ -8,7 +8,8 @@ to represent the underlying internal `Arrangement_2` data structure. \cgalRefines{ArrangementDcelHalfedge} -\cgalHasModelsBegin CGAL::Gps_face_halfedge +\cgalHasModelsBegin +\cgalModels{CGAL::Gps_face_halfedge} \cgalHasModelsEnd \sa `ArrangementDcel` diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetTraits_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetTraits_2.h index 5271a7807440..bd1afb8ed78e 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetTraits_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonSetTraits_2.h @@ -13,9 +13,10 @@ types. \cgalRefines{ArrangementDirectionalXMonotoneTraits_2} -\cgalHasModelsBegin CGAL::Gps_segment_traits_2 -\cgalHasModels CGAL::Gps_circle_segment_traits_2 -\cgalHasModels CGAL::Gps_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Gps_segment_traits_2} +\cgalModels{CGAL::Gps_circle_segment_traits_2} +\cgalModels{CGAL::Gps_traits_2} \cgalHasModelsEnd \sa `ArrangementDirectionalXMonotoneTraits_2` diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygon_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygon_2.h index d9103ae6839a..b9e255935261 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygon_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygon_2.h @@ -16,7 +16,8 @@ accordingly. Only counterclockwise oriented polygons are valid operands of Boolean set-operations. General polygon that represent holes must be clockwise oriented. -\cgalHasModelsBegin CGAL::General_polygon_2 +\cgalHasModelsBegin +\cgalModels{CGAL::General_polygon_2} \cgalHasModelsEnd */ diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h index c9d62f6cef64..2515be1d0e7f 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h @@ -9,7 +9,8 @@ A model of this concept represents a general polygon with holes. \cgalGeneralizes `GeneralPolygonWithHoles_2` -\cgalHasModelsBegin GeneralPolygonSetTraits_2::Polygon_with_holes2 +\cgalHasModelsBegin +\cgalModels{GeneralPolygonSetTraits_2::Polygon_with_holes2} \cgalHasModelsEnd \sa `GeneralPolygonWithHoles_2` diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h index a9999735b0e7..dc6486a1a31c 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h @@ -9,8 +9,9 @@ A model of this concept represents a simple general polygon. \cgalGeneralizes `GeneralPolygon_2` -\cgalHasModelsBegin GeneralPolygonSetTraits_2::Polygon_2 -\cgalHasModels CGAL::Polygon_2 +\cgalHasModelsBegin +\cgalModels{GeneralPolygonSetTraits_2::Polygon_2} +\cgalModels{CGAL::Polygon_2} \cgalHasModelsEnd \sa `GeneralPolygon_2` diff --git a/Bounding_volumes/doc/Bounding_volumes/Concepts/ApproximateMinEllipsoid_d_Traits_d.h b/Bounding_volumes/doc/Bounding_volumes/Concepts/ApproximateMinEllipsoid_d_Traits_d.h index 05721090917e..0ce3d2249b9f 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Concepts/ApproximateMinEllipsoid_d_Traits_d.h +++ b/Bounding_volumes/doc/Bounding_volumes/Concepts/ApproximateMinEllipsoid_d_Traits_d.h @@ -8,9 +8,10 @@ This concept defines the requirements for traits classes of \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Approximate_min_ellipsoid_d_traits_2 -\cgalHasModels CGAL::Approximate_min_ellipsoid_d_traits_3 -\cgalHasModels CGAL::Approximate_min_ellipsoid_d_traits_d +\cgalHasModelsBegin +\cgalModels{CGAL::Approximate_min_ellipsoid_d_traits_2} +\cgalModels{CGAL::Approximate_min_ellipsoid_d_traits_3} +\cgalModels{CGAL::Approximate_min_ellipsoid_d_traits_d} \cgalHasModelsEnd \sa `CGAL::Min_ellipse_2` diff --git a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinCircle2Traits.h b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinCircle2Traits.h index 71cb832881ed..3e25f230aebf 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinCircle2Traits.h +++ b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinCircle2Traits.h @@ -6,7 +6,8 @@ This concept defines the requirements for traits classes of `CGAL::Min_circle_2`. -\cgalHasModelsBegin CGAL::Min_circle_2_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Min_circle_2_traits_2} \cgalHasModelsEnd \sa `CGAL::Min_circle_2` diff --git a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinEllipse2Traits.h b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinEllipse2Traits.h index d6cfac02a1fb..853c32438132 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinEllipse2Traits.h +++ b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinEllipse2Traits.h @@ -6,7 +6,8 @@ This concept defines the requirements for traits classes of `CGAL::Min_ellipse_2`. -\cgalHasModelsBegin CGAL::Min_ellipse_2_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Min_ellipse_2_traits_2} \cgalHasModelsEnd \sa `CGAL::Min_ellipse_2` diff --git a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinQuadrilateralTraits_2.h b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinQuadrilateralTraits_2.h index 17da54b77741..592d52d69d9c 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinQuadrilateralTraits_2.h +++ b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinQuadrilateralTraits_2.h @@ -8,7 +8,8 @@ needed to compute minimum enclosing quadrilaterals of a planar point set using the functions `min_rectangle_2()`, `min_parallelogram_2()` and `min_strip_2()`. -\cgalHasModelsBegin CGAL::Min_quadrilateral_default_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Min_quadrilateral_default_traits_2} \cgalHasModelsEnd \sa `CGAL::min_rectangle_2()` diff --git a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereAnnulusDTraits.h b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereAnnulusDTraits.h index ddd404f13c6b..0d812dd559b0 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereAnnulusDTraits.h +++ b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereAnnulusDTraits.h @@ -6,9 +6,10 @@ This concept defines the requirements for traits classes of \f$ d\f$-dimensional min sphere and min annulus algorithms. -\cgalHasModelsBegin CGAL::Min_sphere_annulus_d_traits_2 -\cgalHasModels CGAL::Min_sphere_annulus_d_traits_3 -\cgalHasModels CGAL::Min_sphere_annulus_d_traits_d +\cgalHasModelsBegin +\cgalModels{CGAL::Min_sphere_annulus_d_traits_2} +\cgalModels{CGAL::Min_sphere_annulus_d_traits_3} +\cgalModels{CGAL::Min_sphere_annulus_d_traits_d} \cgalHasModelsEnd \sa `CGAL::Min_sphere_d` diff --git a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereOfSpheresTraits.h b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereOfSpheresTraits.h index 345beddeb9cf..2e19511b8103 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereOfSpheresTraits.h +++ b/Bounding_volumes/doc/Bounding_volumes/Concepts/MinSphereOfSpheresTraits.h @@ -6,12 +6,13 @@ A model of concept `MinSphereOfSpheresTraits` must provide the following constants, types, predicates and operations. -\cgalHasModelsBegin CGAL::Min_sphere_of_spheres_d_traits_2 -\cgalHasModels CGAL::Min_sphere_of_spheres_d_traits_3 -\cgalHasModels CGAL::Min_sphere_of_spheres_d_traits_d -\cgalHasModels CGAL::Min_sphere_of_points_d_traits_2 -\cgalHasModels CGAL::Min_sphere_of_points_d_traits_3 -\cgalHasModels CGAL::Min_sphere_of_points_d_traits_d +\cgalHasModelsBegin +\cgalModels{CGAL::Min_sphere_of_spheres_d_traits_2} +\cgalModels{CGAL::Min_sphere_of_spheres_d_traits_3} +\cgalModels{CGAL::Min_sphere_of_spheres_d_traits_d} +\cgalModels{CGAL::Min_sphere_of_points_d_traits_2} +\cgalModels{CGAL::Min_sphere_of_points_d_traits_3} +\cgalModels{CGAL::Min_sphere_of_points_d_traits_d} \cgalHasModelsEnd */ diff --git a/Bounding_volumes/doc/Bounding_volumes/Concepts/RectangularPCenterTraits_2.h b/Bounding_volumes/doc/Bounding_volumes/Concepts/RectangularPCenterTraits_2.h index 2c9c9ba44d50..b72e77f91d34 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Concepts/RectangularPCenterTraits_2.h +++ b/Bounding_volumes/doc/Bounding_volumes/Concepts/RectangularPCenterTraits_2.h @@ -7,7 +7,8 @@ The concept `RectangularPCenterTraits_2` defines types and operations needed to compute rectilinear \f$ p\f$-centers of a planar point set using the function `CGAL::rectangular_p_center_2()`. -\cgalHasModelsBegin CGAL::Rectangular_p_center_default_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Rectangular_p_center_default_traits_2} \cgalHasModelsEnd \sa `CGAL::rectangular_p_center_2()` diff --git a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h index 594f4c94ebb9..d41ffd3d8425 100644 --- a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h +++ b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h @@ -10,8 +10,9 @@ the dimension, the `id`-number, and the boundaries of the box. \cgalRefines{Assignable} -\cgalHasModelsBegin CGAL::Box_intersection_d::Box_d -\cgalHasModels CGAL::Box_intersection_d::Box_with_handle_d +\cgalHasModelsBegin +\cgalModels{CGAL::Box_intersection_d::Box_d} +\cgalModels{CGAL::Box_intersection_d::Box_with_handle_d} \cgalHasModelsEnd \sa \link PkgBoxIntersectionD_box_intersection_d `CGAL::box_intersection_d()` \endlink diff --git a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h index cf6dfcb546dc..98cb8e4a34f9 100644 --- a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h +++ b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h @@ -9,7 +9,8 @@ the boxes manipulated in these algorithms. \cgalRefines{Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Box_intersection_d::Box_traits_d +\cgalHasModelsBegin +\cgalModels{CGAL::Box_intersection_d::Box_traits_d} \cgalHasModelsEnd \sa \link PkgBoxIntersectionD_box_intersection_d `CGAL::box_intersection_d()` \endlink diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--PolynomialForCircles_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--PolynomialForCircles_2_2.h index f5a18c372206..05175484ac24 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--PolynomialForCircles_2_2.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--PolynomialForCircles_2_2.h @@ -11,7 +11,8 @@ are of a type that is a model of the concept \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Polynomial_for_circles_2_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Polynomial_for_circles_2_2} \cgalHasModelsEnd \sa `AlgebraicKernelForCircles` diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h index b01eedc5a49c..ee376204999c 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h @@ -9,7 +9,8 @@ coefficients are of a type that is a model of the concept \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Polynomial_1_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Polynomial_1_2} \cgalHasModelsEnd \sa `AlgebraicKernelForCircles` diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--RootForCircles_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--RootForCircles_2_2.h index d17715759643..13cdb5119351 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--RootForCircles_2_2.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--RootForCircles_2_2.h @@ -7,7 +7,8 @@ Concept to represent the roots of a system of two equations of degree 2 in two variables `x` and `y` that are models of concept `AlgebraicKernelForCircles::PolynomialForCircles_2_2` -\cgalHasModelsBegin CGAL::Root_for_circles_2_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Root_for_circles_2_2} \cgalHasModelsEnd \sa `AlgebraicKernelForCircles` diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles.h index e0d50ab1b572..9b259e047c3c 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles.h @@ -7,7 +7,8 @@ The `AlgebraicKernelForCircles` concept is meant to provide the curved kernel with all the algebraic functionalities required for the manipulation of circular arcs. -\cgalHasModelsBegin CGAL::Algebraic_kernel_for_circles_2_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Algebraic_kernel_for_circles_2_2} \cgalHasModelsEnd \sa `CircularKernel` diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h index 603867502f9f..82cf9487e871 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h @@ -7,7 +7,8 @@ Concept for points on circles, circular arcs or line arcs. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Circular_arc_point_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Circular_arc_point_2} \cgalHasModelsEnd */ class CircularKernel::CircularArcPoint_2 { diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArc_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArc_2.h index bd5586d0035c..d5833dfa55d1 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArc_2.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArc_2.h @@ -7,7 +7,8 @@ Concept for arcs of circles. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Circular_arc_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Circular_arc_2} \cgalHasModelsEnd */ diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--LineArc_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--LineArc_2.h index 7f82890c16ae..e92230b10a02 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--LineArc_2.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--LineArc_2.h @@ -9,7 +9,8 @@ Concept for line segments supported by a line that is a model of \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Line_arc_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Line_arc_2} \cgalHasModelsEnd */ diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel.h index a151ed891918..d5c912468c6f 100644 --- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel.h +++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel.h @@ -5,8 +5,9 @@ \cgalRefines{Kernel} -\cgalHasModelsBegin CGAL::Circular_kernel_2 -\cgalHasModels CGAL::Exact_circular_kernel_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Circular_kernel_2} +\cgalModels{CGAL::Exact_circular_kernel_2} \cgalHasModelsEnd \sa `Kernel` diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialForSpheres_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialForSpheres_2_3.h index 0dbd299b9cd7..70aa9278d6b7 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialForSpheres_2_3.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialForSpheres_2_3.h @@ -11,7 +11,8 @@ are of a type that is a model of the concept \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin GAL::Polynomial_for_spheres_2_ +\cgalHasModelsBegin +\cgalModels{GAL::Polynomial_for_spheres_2_} \cgalHasModelsEnd \sa `AlgebraicKernelForSpheres` diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h index 8cf947c04bae..6423e3805a0b 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h @@ -9,7 +9,8 @@ coefficients are of a type that is a model of the concept \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Polynomial_1_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Polynomial_1_3} \cgalHasModelsEnd \sa `AlgebraicKernelForSpheres` diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h index 70866c01e37d..99d40b5860a0 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h @@ -8,7 +8,8 @@ capable of storing equations of lines. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Polynomials_for_lines_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Polynomials_for_lines_3} \cgalHasModelsEnd \sa `AlgebraicKernelForSpheres` diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--RootForSpheres_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--RootForSpheres_2_3.h index 2754b94e0913..cb25b3d6244f 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--RootForSpheres_2_3.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--RootForSpheres_2_3.h @@ -7,7 +7,8 @@ Concept to represent the roots of a system of three equations of degree 2 in three variables `x`, `y` and `z` that are models of concept `AlgebraicKernelForSpheres::PolynomialForSpheres_2_3`. -\cgalHasModelsBegin CGAL::Root_for_spheres_2_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Root_for_spheres_2_3} \cgalHasModelsEnd \sa `AlgebraicKernelForSpheres` diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres.h index e83eca8300dd..585101b73df1 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres.h @@ -7,7 +7,8 @@ The `AlgebraicKernelForSpheres` concept is meant to provide the curved kernel with all the algebraic functionalities required for the manipulation of spheres, circles, and circular arcs in 3D. -\cgalHasModelsBegin CGAL::Algebraic_kernel_for_spheres_2_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Algebraic_kernel_for_spheres_2_3} \cgalHasModelsEnd \sa `SphericalKernel` diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArcPoint_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArcPoint_3.h index 81128f2844ee..8c932d227124 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArcPoint_3.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArcPoint_3.h @@ -7,7 +7,8 @@ Concept for points on spheres, circles, circular arcs or line arcs. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Circular_arc_point_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Circular_arc_point_3} \cgalHasModelsEnd */ diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArc_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArc_3.h index 5a8498f28243..644a50773840 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArc_3.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--CircularArc_3.h @@ -7,7 +7,8 @@ Concept for arcs of circles. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Circular_arc_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Circular_arc_3} \cgalHasModelsEnd */ diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h index 07946ba0f146..ca26700179f0 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h @@ -9,7 +9,8 @@ Concept for line segments supported by a line that is a model of \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Line_arc_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Line_arc_3} \cgalHasModelsEnd */ diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel.h index 3bafc8659d0b..22b389149611 100644 --- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel.h +++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel.h @@ -5,8 +5,9 @@ \cgalRefines{Kernel} -\cgalHasModelsBegin CGAL::Spherical_kernel_3 -\cgalHasModels CGAL::Exact_spherical_kernel_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Spherical_kernel_3} +\cgalModels{CGAL::Exact_spherical_kernel_3} \cgalHasModelsEnd \sa `Kernel` diff --git a/Circulator/doc/Circulator/Concepts/ConstHandle.h b/Circulator/doc/Circulator/Concepts/ConstHandle.h index 9ff3bea6b33d..b15f9c6fd0c0 100644 --- a/Circulator/doc/Circulator/Concepts/ConstHandle.h +++ b/Circulator/doc/Circulator/Concepts/ConstHandle.h @@ -7,7 +7,8 @@ A constant handle. Refer to the `Handle` concept for more details. \cgalRefines{Descriptor} -\cgalHasModelsBegin const T* (const pointers) +\cgalHasModelsBegin +\cgalModels{const T* (const pointers)} \cgalHasModelsEnd \sa `Handle` diff --git a/Circulator/doc/Circulator/Concepts/ConstRange.h b/Circulator/doc/Circulator/Concepts/ConstRange.h index 643dc47c83be..a0a6751737c2 100644 --- a/Circulator/doc/Circulator/Concepts/ConstRange.h +++ b/Circulator/doc/Circulator/Concepts/ConstRange.h @@ -7,7 +7,10 @@ A constant iterator range. Refer to the `Range` concept for more details. \cgalRefinesBare{Boost's %Range concept} -\cgalHasModelsBare{STL containers,`boost::iterator_range`} +\cgalHasModelsBegin +\cgalHasModelsBare{STL containers} +\cgalHasModelsBare{`boost::iterator_range`} +\cgalHasModelsEnd \sa `Range` diff --git a/Circulator/doc/Circulator/Concepts/Handle.h b/Circulator/doc/Circulator/Concepts/Handle.h index a5fade1d46fa..0e531736bcf0 100644 --- a/Circulator/doc/Circulator/Concepts/Handle.h +++ b/Circulator/doc/Circulator/Concepts/Handle.h @@ -23,10 +23,11 @@ operator is concerned (this serves the same purpose as NULL for pointers). (Note that this is not a generally supported feature of iterators of standard containers.) -\cgalHasModelsBegin T* (pointer) -\cgalHasModels const T* (const pointers) -\cgalHasModels Iterator -\cgalHasModels Circulator +\cgalHasModelsBegin +\cgalModels{T* (pointer)} +\cgalModels{const T* (const pointers)} +\cgalModels{Iterator} +\cgalModels{Circulator} \cgalHasModelsEnd */ class Handle { diff --git a/Circulator/doc/Circulator/Concepts/Range.h b/Circulator/doc/Circulator/Concepts/Range.h index ef6cfd56d58b..afd4b4271825 100644 --- a/Circulator/doc/Circulator/Concepts/Range.h +++ b/Circulator/doc/Circulator/Concepts/Range.h @@ -31,7 +31,9 @@ difference with iterators which are typically passed by value. \cgalRefinesBare{ConstRange,Boost's %Range concept} +\cgalHasModelsBegin \cgalHasModelsBare{STL containers} +\cgalHasModelsEnd */ diff --git a/Classification/doc/Classification/Concepts/Classifier.h b/Classification/doc/Classification/Concepts/Classifier.h index 9a3505997949..fefec08fcebe 100644 --- a/Classification/doc/Classification/Concepts/Classifier.h +++ b/Classification/doc/Classification/Concepts/Classifier.h @@ -12,9 +12,10 @@ Concept describing a classifier used by classification functions (see `CGAL::Classification::classify()`, `CGAL::Classification::classify_with_local_smoothing()` and `CGAL::Classification::classify_with_graphcut()`). -\cgalHasModelsBegin CGAL::Classification::Sum_of_weighted_features_classifier -\cgalHasModels CGAL::Classification::ETHZ::Random_forest_classifier -\cgalHasModels CGAL::Classification::OpenCV::Random_forest_classifier +\cgalHasModelsBegin +\cgalModels{CGAL::Classification::Sum_of_weighted_features_classifier} +\cgalModels{CGAL::Classification::ETHZ::Random_forest_classifier} +\cgalModels{CGAL::Classification::OpenCV::Random_forest_classifier} \cgalHasModelsEnd */ diff --git a/Classification/doc/Classification/Concepts/NeighborQuery.h b/Classification/doc/Classification/Concepts/NeighborQuery.h index 99aeb76cb2f6..4db42f7b4b8a 100644 --- a/Classification/doc/Classification/Concepts/NeighborQuery.h +++ b/Classification/doc/Classification/Concepts/NeighborQuery.h @@ -10,10 +10,11 @@ namespace Classification Concept describing a neighbor query used for classification. -\cgalHasModelsBegin CGAL::Classification::Point_set_neighborhood::K_neighbor_query -\cgalHasModels CGAL::Classification::Point_set_neighborhood::Sphere_neighbor_query -\cgalHasModels CGAL::Classification::Mesh_neighborhood::One_ring_neighbor_query -\cgalHasModels CGAL::Classification::Mesh_neighborhood::N_ring_neighbor_query +\cgalHasModelsBegin +\cgalModels{CGAL::Classification::Point_set_neighborhood::K_neighbor_query} +\cgalModels{CGAL::Classification::Point_set_neighborhood::Sphere_neighbor_query} +\cgalModels{CGAL::Classification::Mesh_neighborhood::One_ring_neighbor_query} +\cgalModels{CGAL::Classification::Mesh_neighborhood::N_ring_neighbor_query} \cgalHasModelsEnd */ diff --git a/Combinatorial_map/doc/Combinatorial_map/Concepts/CellAttribute.h b/Combinatorial_map/doc/Combinatorial_map/Concepts/CellAttribute.h index ad331c7bc22b..ec2f990abf1b 100644 --- a/Combinatorial_map/doc/Combinatorial_map/Concepts/CellAttribute.h +++ b/Combinatorial_map/doc/Combinatorial_map/Concepts/CellAttribute.h @@ -5,7 +5,9 @@ The concept `CellAttribute` represents a non void attribute associated with a cell of a generic map. It can keep a descriptor to one dart of its associated cell, and can contain any information. +\cgalHasModelsBegin \cgalHasModelsBare{\link CGAL::Cell_attribute `CGAL::Cell_attribute`\endlink} +\cgalHasModelsEnd \sa `GenericMap` \sa `GenericMapItems` diff --git a/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h b/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h index ecf28bda596e..251d424bc029 100644 --- a/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h +++ b/Combinatorial_map/doc/Combinatorial_map/Concepts/CombinatorialMap.h @@ -6,7 +6,9 @@ The concept `CombinatorialMap` defines a d-dimensional combinatorial map. \cgalRefines{GenericMap} +\cgalHasModelsBegin \cgalHasModelsBare{\link CGAL::Combinatorial_map `CGAL::Combinatorial_map`\endlink} +\cgalHasModelsEnd For a combinatorial map, the function \link GenericMap::next `next`\endlink is equal to \f$ \beta_1\f$, \link GenericMap::previous `previous`\endlink is equal to \f$ \beta_0\f$ and the function \link GenericMap::opposite `opposite`\endlink is equal to \f$ \beta_i\f$. */ diff --git a/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMap.h b/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMap.h index 87113f9aa211..9e09eb5dea8d 100644 --- a/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMap.h +++ b/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMap.h @@ -8,8 +8,10 @@ The concept `GenericMap` defines a d-dimensional generic map. This concep A generic map has a set of darts D, and functions \f$ f_0\f$,\f$ \ldots\f$,\f$ f_{d}\f$ that link these darts between them. -\cgalHasModelsBare{\link CGAL::Combinatorial_map `CGAL::Combinatorial_map`\endlink\n - \link CGAL::Generalized_map `CGAL::Generalized_map`\endlink} +\cgalHasModelsBegin +\cgalHasModelsBare{\link CGAL::Combinatorial_map `CGAL::Combinatorial_map`\endlink} +\cgalHasModelsBare{\link CGAL::Generalized_map `CGAL::Generalized_map`\endlink} +\cgalHasModelsEnd \sa `CombinatorialMap` \sa `GeneralizedMap` diff --git a/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h b/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h index 6fd24033a72b..4117f134ecc6 100644 --- a/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h +++ b/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h @@ -4,7 +4,9 @@ The concept `GenericMapItems` allows to customize a dD generic map by choosing the information associated with darts, by enabling and disabling some attributes, and by choosing to use indices or handles. For that, it defines an inner class template named \link GenericMapItems::Dart_wrapper `Dart_wrapper`\endlink, with one template parameter, `Map`, a model of the `GenericMap` concept. This inner class can define the two types `%Dart_info` and `%Attributes`. +\cgalHasModelsBegin \cgalHasModelsBare{\link CGAL::Generic_map_min_items `CGAL::Generic_map_min_items`\endlink} +\cgalHasModelsEnd \sa `GenericMap` diff --git a/Convex_hull_2/doc/Convex_hull_2/Concepts/ConvexHullTraits_2.h b/Convex_hull_2/doc/Convex_hull_2/Concepts/ConvexHullTraits_2.h index 251e12f7fb91..f5e1d3a6f365 100644 --- a/Convex_hull_2/doc/Convex_hull_2/Concepts/ConvexHullTraits_2.h +++ b/Convex_hull_2/doc/Convex_hull_2/Concepts/ConvexHullTraits_2.h @@ -9,12 +9,13 @@ primitives (objects and predicates) that the convex hull algorithms use. functions. The specific subset of these primitives required by each function is specified with each function. -\cgalHasModelsBegin CGAL::Convex_hull_constructive_traits_2 -\cgalHasModels CGAL::Convex_hull_traits_2 -\cgalHasModels CGAL::Convex_hull_traits_adapter_2 -\cgalHasModels CGAL::Projection_traits_xy_3 -\cgalHasModels CGAL::Projection_traits_yz_3 -\cgalHasModels CGAL::Projection_traits_xz_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Convex_hull_constructive_traits_2} +\cgalModels{CGAL::Convex_hull_traits_2} +\cgalModels{CGAL::Convex_hull_traits_adapter_2} +\cgalModels{CGAL::Projection_traits_xy_3} +\cgalModels{CGAL::Projection_traits_yz_3} +\cgalModels{CGAL::Projection_traits_xz_3} \cgalHasModelsEnd */ diff --git a/Convex_hull_3/doc/Convex_hull_3/Concepts/ConvexHullTraits_3.h b/Convex_hull_3/doc/Convex_hull_3/Concepts/ConvexHullTraits_3.h index 711efc4d8aa4..b9fd8dac2302 100644 --- a/Convex_hull_3/doc/Convex_hull_3/Concepts/ConvexHullTraits_3.h +++ b/Convex_hull_3/doc/Convex_hull_3/Concepts/ConvexHullTraits_3.h @@ -4,8 +4,9 @@ Requirements of the traits class of the function `CGAL::convex_hull_3()`. -\cgalHasModelsBegin CGAL::Convex_hull_traits_3 -\cgalHasModels CGAL::Extreme_points_traits_adapter_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Convex_hull_traits_3} +\cgalModels{CGAL::Extreme_points_traits_adapter_3} \cgalHasModelsEnd */ diff --git a/Convex_hull_3/doc/Convex_hull_3/Concepts/IsStronglyConvexTraits_3.h b/Convex_hull_3/doc/Convex_hull_3/Concepts/IsStronglyConvexTraits_3.h index 6f3bad1286ed..5b03c77793f4 100644 --- a/Convex_hull_3/doc/Convex_hull_3/Concepts/IsStronglyConvexTraits_3.h +++ b/Convex_hull_3/doc/Convex_hull_3/Concepts/IsStronglyConvexTraits_3.h @@ -6,7 +6,9 @@ Requirements of the traits class used by the function `CGAL::is_strongly_convex_3()`, which is used for postcondition checking by `CGAL::convex_hull_3()`. -\cgalHasModelsBareBegin{All models of `Kernel`} CGAL::Convex_hull_traits_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of `Kernel`} +\cgalHasModels{CGAL::Convex_hull_traits_3} \cgalHasModelsEnd \sa `ConvexHullTraits_3` diff --git a/Convex_hull_d/doc/Convex_hull_d/Concepts/ConvexHullTraits_d.h b/Convex_hull_d/doc/Convex_hull_d/Concepts/ConvexHullTraits_d.h index 78e06df722d3..fce2c1aa3200 100644 --- a/Convex_hull_d/doc/Convex_hull_d/Concepts/ConvexHullTraits_d.h +++ b/Convex_hull_d/doc/Convex_hull_d/Concepts/ConvexHullTraits_d.h @@ -7,9 +7,10 @@ Requirements of the traits class to be used with the class `CGAL::Convex_hull_d`. -\cgalHasModelsBegin CGAL::Cartesian_d -\cgalHasModels CGAL::Homogeneous_d -\cgalHasModels CGAL::Convex_hull_d_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian_d} +\cgalModels{CGAL::Homogeneous_d} +\cgalModels{CGAL::Convex_hull_d_traits_3} \cgalHasModelsEnd */ diff --git a/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayLiftedTraits_d.h b/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayLiftedTraits_d.h index 23352fbe2e6e..0937e25239c1 100644 --- a/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayLiftedTraits_d.h +++ b/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayLiftedTraits_d.h @@ -7,8 +7,9 @@ Requirements of the second traits class to be used with the class `CGAL::Delaunay_d`. -\cgalHasModelsBegin CGAL::Cartesian_d -\cgalHasModels CGAL::Homogeneous_d +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian_d} +\cgalModels{CGAL::Homogeneous_d} \cgalHasModelsEnd */ diff --git a/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayTraits_d.h b/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayTraits_d.h index b8e91a96aa9a..2f91bbf7d823 100644 --- a/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayTraits_d.h +++ b/Convex_hull_d/doc/Convex_hull_d/Concepts/DelaunayTraits_d.h @@ -7,8 +7,9 @@ Requirements of the first traits class to be used with the class `CGAL::Delaunay_d`. -\cgalHasModelsBegin CGAL::Cartesian_d -\cgalHasModels CGAL::Homogeneous_d +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian_d} +\cgalModels{CGAL::Homogeneous_d} \cgalHasModelsEnd */ diff --git a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in index 0521a19e26d5..d25c24605aec 100644 --- a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in @@ -146,12 +146,10 @@ ALIASES = "cgal=%CGAL" \ "cgalModelsBare{2}=
@cgalModelsHeader
\1
\2
" \ "cgalGeneralizes=\xrefitem generalizes \"Generalizes\" \"Generalization Relationships\"" \ "cgalHasModelsHeader=Has models" \ - "cgalHasModelsBegin=
@cgalHasModelsHeader
`" \ - "cgalHasModels=`
`" \ - "cgalHasModelsEnd=`
" \ - "cgalHasModelsBare{1}=
@cgalHasModelsHeader
\1
" \ - "cgalHasModelsBare{2}=
@cgalHasModelsHeader
\1
\2
" \ - "cgalHasModelsBareBegin{1}=
@cgalHasModelsHeader
\1
`" \ + "cgalHasModelsBegin=
@cgalHasModelsHeader
" \ + "cgalHasModels{1}=
`\1`
" \ + "cgalHasModelsBare{1}=
\1
" \ + "cgalHasModelsEnd=
" \ "cgalDebugBegin=\htmlonly
Debugging Support
\endhtmlonly \n" \ "cgalDebugEnd=\htmlonly
\endhtmlonly" \ "cgalDebugFunction=This is a function for debugging purpose." \ diff --git a/Documentation/doc/resources/1.9.6/BaseDoxyfile.in b/Documentation/doc/resources/1.9.6/BaseDoxyfile.in index 11e0fa1ae9a6..6b2dbc6ae722 100644 --- a/Documentation/doc/resources/1.9.6/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.9.6/BaseDoxyfile.in @@ -155,12 +155,10 @@ ALIASES = "cgal=%CGAL" \ "cgalModelsBare{2}=
@cgalModelsHeader
\1
\2
" \ "cgalGeneralizes=\xrefitem generalizes \"Generalizes\" \"Generalization Relationships\"" \ "cgalHasModelsHeader=Has models" \ - "cgalHasModelsBegin=
@cgalHasModelsHeader
`" \ - "cgalHasModels=`
`" \ - "cgalHasModelsEnd=`
" \ - "cgalHasModelsBare{1}=
@cgalHasModelsHeader
\1
" \ - "cgalHasModelsBare{2}=
@cgalHasModelsHeader
\1
\2
" \ - "cgalHasModelsBareBegin{1}=
@cgalHasModelsHeader
\1
`" \ + "cgalHasModelsBegin=
@cgalHasModelsHeader
" \ + "cgalHasModels{1}=
`\1`
" \ + "cgalHasModelsBare{1}=
\1
" \ + "cgalHasModelsEnd=
" \ "cgalDebugBegin=\htmlonly[block]
Debugging Support
\endhtmlonly ^^" \ "cgalDebugEnd=\htmlonly[block]
\endhtmlonly" \ "cgalDebugFunction=This is a function for debugging purpose." \ diff --git a/Envelope_3/doc/Envelope_3/Concepts/EnvelopeTraits_3.h b/Envelope_3/doc/Envelope_3/Concepts/EnvelopeTraits_3.h index 66b3c1f34772..02ae3ebf7cf3 100644 --- a/Envelope_3/doc/Envelope_3/Concepts/EnvelopeTraits_3.h +++ b/Envelope_3/doc/Envelope_3/Concepts/EnvelopeTraits_3.h @@ -16,10 +16,11 @@ Note however, that these operations usually involve the projection of \cgalRefines{ArrangementXMonotoneTraits_2} -\cgalHasModelsBegin CGAL::Env_triangle_traits_3 -\cgalHasModels CGAL::Env_sphere_traits_3 -\cgalHasModels CGAL::Env_plane_traits_3 -\cgalHasModels CGAL::Env_surface_data_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Env_triangle_traits_3} +\cgalModels{CGAL::Env_sphere_traits_3} +\cgalModels{CGAL::Env_plane_traits_3} +\cgalModels{CGAL::Env_surface_data_traits_3} \cgalHasModelsEnd */ diff --git a/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h b/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h index f43d4b8944dd..16fa1e40eabd 100644 --- a/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h +++ b/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h @@ -6,7 +6,9 @@ The concept `GeneralizedMap` defines a d-dimensional generalized map. \cgalRefines{GenericMap} +\cgalHasModelsBegin \cgalHasModelsBare{\link CGAL::Generalized_map `CGAL::Generalized_map`\endlink} +\cgalHasModelsEnd For a generalized map, the function \link GenericMap::next `next`\endlink is equal to \f$ \alpha_1\circ\alpha_0\f$, \link GenericMap::previous `previous`\endlink is equal to \f$ \alpha_0\circ\alpha_1\f$ and the function \link GenericMap::opposite `opposite`\endlink is equal to \f$ \alpha_i\circ\alpha_0\f$. */ diff --git a/Generator/doc/Generator/Concepts/CombinationElement.h b/Generator/doc/Generator/Concepts/CombinationElement.h index 8e4747e08392..53872f44809d 100644 --- a/Generator/doc/Generator/Concepts/CombinationElement.h +++ b/Generator/doc/Generator/Concepts/CombinationElement.h @@ -4,9 +4,11 @@ A CombinationElement can be used as template parameter for the class `Combination_enumerator`. -\cgalHasModelsBare{Any integer type (`char`, `short`, `int`, `long`, etc.)\n - Pointers\n - Random access iterators} +\cgalHasModelsBegin +\cgalHasModelsBare{Any integer type (`char`, `short`, `int`, `long`, etc.)} +\cgalHasModelsBare{Pointers} +\cgalHasModelsBare{Random access iterators} +\cgalHasModelsEnd \sa `CGAL::Combination_enumerator` diff --git a/Generator/doc/Generator/Concepts/PointGenerator.h b/Generator/doc/Generator/Concepts/PointGenerator.h index 2f96e53167d9..5a70e5f0ebdc 100644 --- a/Generator/doc/Generator/Concepts/PointGenerator.h +++ b/Generator/doc/Generator/Concepts/PointGenerator.h @@ -5,20 +5,21 @@ The concept `PointGenerator` defines the requirements for a point generator, which can be used in places where input iterators are called for. -\cgalHasModelsBegin CGAL::Random_points_in_ball_d -\cgalHasModels CGAL::Random_points_in_disc_2 -\cgalHasModels CGAL::Random_points_in_square_2 -\cgalHasModels CGAL::Random_points_in_triangle_2 -\cgalHasModels CGAL::Random_points_on_circle_2 -\cgalHasModels CGAL::Random_points_on_segment_2 -\cgalHasModels CGAL::Random_points_on_square_2 -\cgalHasModels CGAL::Random_points_in_cube_3 -\cgalHasModels CGAL::Random_points_in_cube_d -\cgalHasModels CGAL::Random_points_in_sphere_3 -\cgalHasModels CGAL::Random_points_in_triangle_3 -\cgalHasModels CGAL::Random_points_in_tetrahedron_3 -\cgalHasModels CGAL::Random_points_on_sphere_3 -\cgalHasModels CGAL::Random_points_on_sphere_d +\cgalHasModelsBegin +\cgalModels{CGAL::Random_points_in_ball_d} +\cgalModels{CGAL::Random_points_in_disc_2} +\cgalModels{CGAL::Random_points_in_square_2} +\cgalModels{CGAL::Random_points_in_triangle_2} +\cgalModels{CGAL::Random_points_on_circle_2} +\cgalModels{CGAL::Random_points_on_segment_2} +\cgalModels{CGAL::Random_points_on_square_2} +\cgalModels{CGAL::Random_points_in_cube_3} +\cgalModels{CGAL::Random_points_in_cube_d} +\cgalModels{CGAL::Random_points_in_sphere_3} +\cgalModels{CGAL::Random_points_in_triangle_3} +\cgalModels{CGAL::Random_points_in_tetrahedron_3} +\cgalModels{CGAL::Random_points_on_sphere_3} +\cgalModels{CGAL::Random_points_on_sphere_d} \cgalHasModelsEnd */ diff --git a/Generator/doc/Generator/Concepts/RandomConvexHullTraits_2.h b/Generator/doc/Generator/Concepts/RandomConvexHullTraits_2.h index 424119d49b9b..61949762078f 100644 --- a/Generator/doc/Generator/Concepts/RandomConvexHullTraits_2.h +++ b/Generator/doc/Generator/Concepts/RandomConvexHullTraits_2.h @@ -5,7 +5,9 @@ The concept `RandomConvexHullTraits_2` describes the requirements for the traits class used by the function `random_convex_hull_in_disc_2()`. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the concept `Kernel`} +\cgalHasModelsEnd \cgalHeading{Operations} diff --git a/Generator/doc/Generator/Concepts/RandomConvexSetTraits_2.h b/Generator/doc/Generator/Concepts/RandomConvexSetTraits_2.h index 630b93345d17..669f54809b32 100644 --- a/Generator/doc/Generator/Concepts/RandomConvexSetTraits_2.h +++ b/Generator/doc/Generator/Concepts/RandomConvexSetTraits_2.h @@ -5,7 +5,8 @@ The concept `RandomConvexSetTraits_2` describes the requirements of the traits class for the function `random_convex_set_2()`. -\cgalHasModelsBegin CGAL::Random_convex_set_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Random_convex_set_traits_2} \cgalHasModelsEnd */ diff --git a/Generator/doc/Generator/Concepts/RandomPolygonTraits_2.h b/Generator/doc/Generator/Concepts/RandomPolygonTraits_2.h index be8badeb6410..c996e2053609 100644 --- a/Generator/doc/Generator/Concepts/RandomPolygonTraits_2.h +++ b/Generator/doc/Generator/Concepts/RandomPolygonTraits_2.h @@ -5,7 +5,9 @@ The concept `RandomPolygonTraits_2` describes the requirements for the traits class used by the function `random_polygon_2()`. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the concept `Kernel`} +\cgalHasModelsEnd \cgalHeading{Operations} diff --git a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDS.h b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDS.h index 227ae11cc406..6b99d22b415c 100644 --- a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDS.h +++ b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDS.h @@ -67,9 +67,10 @@ allocators internally. A default argument is mandatory for from the `` header file can be used as default allocator. -\cgalHasModelsBegin CGAL::HalfedgeDS_default -\cgalHasModels CGAL::HalfedgeDS_list -\cgalHasModels CGAL::HalfedgeDS_vector +\cgalHasModelsBegin +\cgalModels{CGAL::HalfedgeDS_default} +\cgalModels{CGAL::HalfedgeDS_list} +\cgalModels{CGAL::HalfedgeDS_vector} \cgalHasModelsEnd \sa `HalfedgeDSItems` diff --git a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSFace.h b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSFace.h index cacaac7459aa..fb3c3e05d2ac 100644 --- a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSFace.h +++ b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSFace.h @@ -23,8 +23,9 @@ can be bypassed by the user, but not by accident.) \cgalRefines{CopyConstructible,DefaultConstructible} -\cgalHasModelsBegin CGAL::HalfedgeDS_face_base -\cgalHasModels CGAL::HalfedgeDS_face_min_base +\cgalHasModelsBegin +\cgalModels{CGAL::HalfedgeDS_face_base} +\cgalModels{CGAL::HalfedgeDS_face_min_base} \cgalHasModelsEnd \sa `HalfedgeDS` diff --git a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSHalfedge.h b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSHalfedge.h index 5dae57935e8d..f726b2c43833 100644 --- a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSHalfedge.h +++ b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSHalfedge.h @@ -33,8 +33,9 @@ more protection is provided for the `set_opposite()` member function. The base class `Base_base` provides access to it. (The protection could be bypassed also by an user, but not by accident.) -\cgalHasModelsBegin ::CGAL::HalfedgeDS_halfedge_base -\cgalHasModels ::CGAL::HalfedgeDS_halfedge_min_base +\cgalHasModelsBegin +\cgalModels{::CGAL::HalfedgeDS_halfedge_base} +\cgalModels{::CGAL::HalfedgeDS_halfedge_min_base} \cgalHasModelsEnd \sa `HalfedgeDS` diff --git a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSItems.h b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSItems.h index 51a99908bc04..3b52eeb48a51 100644 --- a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSItems.h +++ b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSItems.h @@ -16,9 +16,10 @@ and `Face` respectively. The requirements on these types are described on the manual pages of the concepts `HalfedgeDSVertex`, `HalfedgeDSHalfedge`, and `HalfedgeDSFace` respectively. -\cgalHasModelsBegin CGAL::HalfedgeDS_min_items -\cgalHasModels CGAL::HalfedgeDS_items_2 -\cgalHasModels CGAL::Polyhedron_items_3 +\cgalHasModelsBegin +\cgalModels{CGAL::HalfedgeDS_min_items} +\cgalModels{CGAL::HalfedgeDS_items_2} +\cgalModels{CGAL::Polyhedron_items_3} \cgalHasModelsEnd \sa `HalfedgeDS` diff --git a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSVertex.h b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSVertex.h index 38f5afab43c4..ce5766136308 100644 --- a/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSVertex.h +++ b/HalfedgeDS/doc/HalfedgeDS/Concepts/HalfedgeDSVertex.h @@ -23,8 +23,9 @@ could be bypassed by an user, but not by accident.) \cgalRefines{CopyConstructible,DefaultConstructible} -\cgalHasModelsBegin CGAL::HalfedgeDS_vertex_base -\cgalHasModels CGAL::HalfedgeDS_vertex_min_base +\cgalHasModelsBegin +\cgalModels{CGAL::HalfedgeDS_vertex_base} +\cgalModels{CGAL::HalfedgeDS_vertex_min_base} \cgalHasModelsEnd \sa `HalfedgeDS` diff --git a/Heat_method_3/doc/Heat_method_3/Concepts/HeatMethodTraits_3.h b/Heat_method_3/doc/Heat_method_3/Concepts/HeatMethodTraits_3.h index cf4b6f8d9d70..9670eee46e68 100644 --- a/Heat_method_3/doc/Heat_method_3/Concepts/HeatMethodTraits_3.h +++ b/Heat_method_3/doc/Heat_method_3/Concepts/HeatMethodTraits_3.h @@ -7,7 +7,9 @@ The concept `HeatMethodTraits_3` describes the types, predicates, and constructions required by the traits class parameter of `CGAL::Heat_method_3::Surface_mesh_geodesic_distances_3`. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd */ diff --git a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicDelaunayTriangulationTraits_2.h b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicDelaunayTriangulationTraits_2.h index 3299b6f89e3b..39a254eec7e1 100644 --- a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicDelaunayTriangulationTraits_2.h +++ b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicDelaunayTriangulationTraits_2.h @@ -16,8 +16,9 @@ constructions on these objects. This concept refines `DelaunayTriangulationTraits_2` because the class `CGAL::Hyperbolic_Delaunay_triangulation_2` internally relies on the class `CGAL::Delaunay_triangulation_2`. -\cgalHasModelsBegin CGAL::Hyperbolic_Delaunay_triangulation_traits_2 -\cgalHasModels CGAL::Hyperbolic_Delaunay_triangulation_CK_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Hyperbolic_Delaunay_triangulation_traits_2} +\cgalModels{CGAL::Hyperbolic_Delaunay_triangulation_CK_traits_2} \cgalHasModelsEnd */ diff --git a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicTriangulationFaceBase_2.h b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicTriangulationFaceBase_2.h index 9f57d33da117..51a984a3c985 100644 --- a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicTriangulationFaceBase_2.h +++ b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Concepts/HyperbolicTriangulationFaceBase_2.h @@ -41,7 +41,8 @@ This concept provides an interface for the functionality needed in faces to comp Delaunay triangulations in the hyperbolic plane. The function `tds_data()` is used internally by the triangulation class during the insertion of points in the triangulation. -\cgalHasModelsBegin CGAL::Hyperbolic_triangulation_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Hyperbolic_triangulation_face_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Inscribed_areas/doc/Inscribed_areas/Concepts/ExtremalPolygonTraits_2.h b/Inscribed_areas/doc/Inscribed_areas/Concepts/ExtremalPolygonTraits_2.h index f6de632e04c0..407337905ef1 100644 --- a/Inscribed_areas/doc/Inscribed_areas/Concepts/ExtremalPolygonTraits_2.h +++ b/Inscribed_areas/doc/Inscribed_areas/Concepts/ExtremalPolygonTraits_2.h @@ -15,8 +15,9 @@ inscribed into a given convex polygon. precondition checking only. Therefore, they need not to be specified, in case that precondition checking is disabled. -\cgalHasModelsBegin CGAL::Extremal_polygon_area_traits_2 -\cgalHasModels CGAL::Extremal_polygon_perimeter_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Extremal_polygon_area_traits_2} +\cgalModels{CGAL::Extremal_polygon_perimeter_traits_2} \cgalHasModelsEnd \sa `CGAL::maximum_area_inscribed_k_gon_2()` diff --git a/Inscribed_areas/doc/Inscribed_areas/Concepts/LargestEmptyIsoRectangleTraits_2.h b/Inscribed_areas/doc/Inscribed_areas/Concepts/LargestEmptyIsoRectangleTraits_2.h index d3e1374d7715..796290481046 100644 --- a/Inscribed_areas/doc/Inscribed_areas/Concepts/LargestEmptyIsoRectangleTraits_2.h +++ b/Inscribed_areas/doc/Inscribed_areas/Concepts/LargestEmptyIsoRectangleTraits_2.h @@ -10,8 +10,9 @@ This concept provides the types of the geometric primitives used in this class and some function object types for the required predicates on those primitives. -\cgalHasModelsBegin CGAL::Cartesian -\cgalHasModels CGAL::Homogeneous +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian} +\cgalModels{CGAL::Homogeneous} \cgalHasModelsEnd \sa `CGAL::Largest_empty_iso_rectangle_2` diff --git a/Interpolation/doc/Interpolation/Concepts/GradientFittingTraits.h b/Interpolation/doc/Interpolation/Concepts/GradientFittingTraits.h index 4cb824c031b1..0cdbc888f217 100644 --- a/Interpolation/doc/Interpolation/Concepts/GradientFittingTraits.h +++ b/Interpolation/doc/Interpolation/Concepts/GradientFittingTraits.h @@ -7,7 +7,8 @@ traits class that defines the primitives used by the algorithm. The concept `GradientFittingTraits` defines this common set of requirements. -\cgalHasModelsBegin CGAL::Interpolation_gradient_fitting_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Interpolation_gradient_fitting_traits_2} \cgalHasModelsEnd \sa `InterpolationTraits` diff --git a/Interpolation/doc/Interpolation/Concepts/InterpolationTraits.h b/Interpolation/doc/Interpolation/Concepts/InterpolationTraits.h index a07eb526d3c7..18b806952cb5 100644 --- a/Interpolation/doc/Interpolation/Concepts/InterpolationTraits.h +++ b/Interpolation/doc/Interpolation/Concepts/InterpolationTraits.h @@ -7,8 +7,9 @@ Most interpolation functions are parameterized by a traits class that defines the primitives used in the interpolation algorithms. The concept `InterpolationTraits` defines this common set of requirements. -\cgalHasModelsBegin CGAL::Interpolation_traits_2 -\cgalHasModels CGAL::Interpolation_gradient_fitting_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Interpolation_traits_2} +\cgalModels{CGAL::Interpolation_gradient_fitting_traits_2} \cgalHasModelsEnd \sa `GradientFittingTraits` diff --git a/Interval_skip_list/doc/Interval_skip_list/Concepts/Interval.h b/Interval_skip_list/doc/Interval_skip_list/Concepts/Interval.h index 1bc267a684eb..fe7cbbd266ed 100644 --- a/Interval_skip_list/doc/Interval_skip_list/Concepts/Interval.h +++ b/Interval_skip_list/doc/Interval_skip_list/Concepts/Interval.h @@ -9,8 +9,9 @@ The concept does not specify, whether the interval is open or closed. It is up to the implementer of a model for this concept to define that. -\cgalHasModelsBegin CGAL::Interval_skip_list_interval -\cgalHasModels CGAL::Level_interval +\cgalHasModelsBegin +\cgalModels{CGAL::Interval_skip_list_interval} +\cgalModels{CGAL::Level_interval} \cgalHasModelsEnd \sa `Interval_skip_list` diff --git a/Jet_fitting_3/doc/Jet_fitting_3/Concepts/DataKernel.h b/Jet_fitting_3/doc/Jet_fitting_3/Concepts/DataKernel.h index 9276d91c6b32..93d2ee819e5a 100644 --- a/Jet_fitting_3/doc/Jet_fitting_3/Concepts/DataKernel.h +++ b/Jet_fitting_3/doc/Jet_fitting_3/Concepts/DataKernel.h @@ -13,8 +13,9 @@ the class Only constructors (from 3 scalars and copy constructors) and access methods to coordinates `x()`, `y()`, `z()` are needed. -\cgalHasModelsBegin CGAL::Cartesian -\cgalHasModels CGAL::Simple_cartesian +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian} +\cgalModels{CGAL::Simple_cartesian} \cgalHasModelsEnd \sa `LocalKernel` diff --git a/Jet_fitting_3/doc/Jet_fitting_3/Concepts/LocalKernel.h b/Jet_fitting_3/doc/Jet_fitting_3/Concepts/LocalKernel.h index 75629fb37f15..d4981cf4f846 100644 --- a/Jet_fitting_3/doc/Jet_fitting_3/Concepts/LocalKernel.h +++ b/Jet_fitting_3/doc/Jet_fitting_3/Concepts/LocalKernel.h @@ -29,8 +29,9 @@ Only constructors (from 3 scalars and copy constructors) and access methods to coordinates `x()`, `y()`, `z()` are needed for the point and vector types. -\cgalHasModelsBegin CGAL::Cartesian -\cgalHasModels CGAL::Simple_cartesian +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian} +\cgalModels{CGAL::Simple_cartesian} \cgalHasModelsEnd \sa `DataKernel` diff --git a/Kernel_23/doc/Kernel_23/Concepts/GeomObjects.h b/Kernel_23/doc/Kernel_23/Concepts/GeomObjects.h index a732c7891a3c..9433ac9dd058 100644 --- a/Kernel_23/doc/Kernel_23/Concepts/GeomObjects.h +++ b/Kernel_23/doc/Kernel_23/Concepts/GeomObjects.h @@ -8,7 +8,8 @@ namespace Kernel { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Circle_2 + \cgalHasModelsBegin + \cgalModels{CGAL::Circle_2} \cgalHasModelsEnd \sa `Kernel::BoundedSide_2` @@ -39,7 +40,8 @@ class Circle_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Circle_3 + \cgalHasModelsBegin + \cgalModels{CGAL::Circle_3} \cgalHasModelsEnd \sa `Kernel::ComputeApproximateArea_3` @@ -69,7 +71,7 @@ class Circle_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Direction_2 + \cgalModels{CGAL::Direction_2} \cgalHasModelsEnd \sa `Kernel::CompareAngleWithXAxis_2` @@ -94,7 +96,7 @@ class Direction_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Direction_3 + \cgalModels{CGAL::Direction_3} \cgalHasModelsEnd \sa `Kernel::ConstructDirection_3` @@ -115,7 +117,8 @@ A type representing isocuboids in three dimensions. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Iso_cuboid_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Iso_cuboid_3} \cgalHasModelsEnd \sa `Kernel::BoundedSide_3` @@ -141,7 +144,7 @@ class IsoCuboid_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Iso_rectangle_2 + \cgalModels{CGAL::Iso_rectangle_2} \cgalHasModelsEnd \sa `Kernel::ConstructIsoRectangle_2` @@ -174,7 +177,7 @@ class IsoRectangle_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Line_2 + \cgalModels{CGAL::Line_2} \cgalHasModelsEnd \sa `Kernel::CompareXAtY_2` @@ -211,7 +214,7 @@ class Line_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Line_3 + \cgalModels{CGAL::Line_3} \cgalHasModelsEnd \sa `Kernel::ComputeSquaredDistance_3` @@ -243,7 +246,7 @@ class Line_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Object + \cgalModels{CGAL::Object} \cgalHasModelsEnd \sa `Kernel::Assign_2` @@ -265,7 +268,7 @@ class Object_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Object + \cgalModels{CGAL::Object} \cgalHasModelsEnd \sa `Kernel::Assign_3` @@ -285,7 +288,7 @@ class Object_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Plane_3 + \cgalModels{CGAL::Plane_3} \cgalHasModelsEnd \sa `Kernel::ComputeSquaredDistance_3` @@ -323,7 +326,7 @@ class Plane_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Point_2 + \cgalModels{CGAL::Point_2} \cgalHasModelsEnd \sa `Kernel::Angle_2` @@ -383,7 +386,7 @@ class Point_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModels CGAL::Point_3 + \cgalModels{CGAL::Point_3} \cgalHasModelsEnd \sa `Kernel::Angle_3` @@ -445,7 +448,8 @@ A type representing rays in two dimensions. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Ray_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Ray_2} \cgalHasModelsEnd \sa `Kernel::CollinearHasOn_2` @@ -478,7 +482,8 @@ class Ray_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Ray_3 + \cgalHasModelsBegin + \cgalModels{CGAL::Ray_3} \cgalHasModelsEnd \sa `Kernel::ComputeSquaredDistance_3` @@ -507,7 +512,8 @@ class Ray_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Segment_2 + \cgalHasModelsBegin + \cgalModels{CGAL::Segment_2} \cgalHasModelsEnd \sa `Kernel::CollinearHasOn_2` @@ -542,7 +548,8 @@ class Segment_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Segment_3 + \cgalHasModelsBegin + \cgalModels{CGAL::Segment_3} \cgalHasModelsEnd \sa `Kernel::ComputeSquaredDistance_3` @@ -573,7 +580,8 @@ class Segment_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Sphere_3 + \cgalHasModelsBegin + \cgalModels{CGAL::Sphere_3} \cgalHasModelsEnd \sa `Kernel::BoundedSide_3` @@ -604,7 +612,8 @@ class Sphere_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Tetrahedron_3 + \cgalHasModelsBegin + \cgalModels{CGAL::Tetrahedron_3} \cgalHasModelsEnd \sa `Kernel::BoundedSide_3` @@ -636,7 +645,8 @@ class Tetrahedron_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Triangle_2 + \cgalHasModelsBegin + \cgalModels{CGAL::Triangle_2} \cgalHasModelsEnd \sa `Kernel::BoundedSide_2` @@ -670,7 +680,8 @@ class Triangle_2 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Triangle_3 + \cgalHasModelsBegin + \cgalModels{CGAL::Triangle_3} \cgalHasModelsEnd \sa `Kernel::ComputeSquaredArea_3` @@ -696,7 +707,8 @@ class Triangle_3 { \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} - \cgalHasModelsBegin CGAL::Vector_2 + \cgalHasModelsBegin + \cgalModels{CGAL::Vector_2} \cgalHasModelsEnd \sa `Kernel::ComputeDeterminant_2` @@ -730,7 +742,8 @@ A type representing vectors in three dimensions. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Vector_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Vector_3} \cgalHasModelsEnd \sa `Kernel::CompareDihedralAngle_3` @@ -767,7 +780,8 @@ A type representing weighted points in two dimensions. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Weighted_point_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Weighted_point_2} \cgalHasModelsEnd \sa `Kernel::ConstructWeightedPoint_2` @@ -795,7 +809,8 @@ A type representing weighted points in three dimensions. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Weighted_point_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Weighted_point_3} \cgalHasModelsEnd \sa `Kernel::ConstructWeightedPoint_3` diff --git a/Kernel_23/doc/Kernel_23/Concepts/Kernel.h b/Kernel_23/doc/Kernel_23/Concepts/Kernel.h index ad4a0782765f..2da2b9d8fb9f 100644 --- a/Kernel_23/doc/Kernel_23/Concepts/Kernel.h +++ b/Kernel_23/doc/Kernel_23/Concepts/Kernel.h @@ -20,14 +20,15 @@ `Construct_`. If the result type is a number type, the name is prefixed by `Compute_`. When the result type is not determined, no prefix is used. - \cgalHasModelsBegin galHasModel `CGAL::Cartesian - \cgalHasModels CGAL::Homogeneous - \cgalHasModels CGAL::Simple_cartesian - \cgalHasModels CGAL::Simple_homogeneous - \cgalHasModels CGAL::Filtered_kernel - \cgalHasModels CGAL::Exact_predicates_exact_constructions_kernel - \cgalHasModels CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt - \cgalHasModels CGAL::Exact_predicates_inexact_constructions_kernel + \cgalHasModelsBegin + \cgalModels{CGAL::Cartesian} + \cgalModels{CGAL::Homogeneous} + \cgalModels{CGAL::Simple_cartesian} + \cgalModels{CGAL::Simple_homogeneous} + \cgalModels{CGAL::Filtered_kernel} + \cgalModels{CGAL::Exact_predicates_exact_constructions_kernel} + \cgalModels{CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt} + \cgalModels{CGAL::Exact_predicates_inexact_constructions_kernel} \cgalHasModelsEnd \sa `Kernel_d` diff --git a/Kernel_d/doc/Kernel_d/Concepts/KernelWithLifting_d.h b/Kernel_d/doc/Kernel_d/Concepts/KernelWithLifting_d.h index 63e05367bafc..4a8e19db8cd4 100644 --- a/Kernel_d/doc/Kernel_d/Concepts/KernelWithLifting_d.h +++ b/Kernel_d/doc/Kernel_d/Concepts/KernelWithLifting_d.h @@ -8,8 +8,9 @@ general kernel concept. It adds 2 functors, the meaning of which would be unclear in kernels of fixed dimension. \cgalRefines{Kernel_d} -\cgalHasModelsBegin CGAL::Cartesian_d -\cgalHasModels CGAL::Homogeneous_d +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian_d} +\cgalModels{CGAL::Homogeneous_d} \cgalHasModelsEnd */ class KernelWithLifting_d { diff --git a/Kernel_d/doc/Kernel_d/Concepts/Kernel_d.h b/Kernel_d/doc/Kernel_d/Concepts/Kernel_d.h index a56284feab8a..c4ac4f607c80 100644 --- a/Kernel_d/doc/Kernel_d/Concepts/Kernel_d.h +++ b/Kernel_d/doc/Kernel_d/Concepts/Kernel_d.h @@ -18,10 +18,11 @@ predicates. The former replace constructors of the kernel classes and constructive procedures in the kernel. There are also function objects replacing operators, especially for equality testing. -\cgalHasModelsBegin CGAL::Cartesian_d -\cgalHasModels CGAL::Homogeneous_d -\cgalHasModels CGAL::Epick_d -\cgalHasModels CGAL::Epeck_d +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian_d} +\cgalModels{CGAL::Homogeneous_d} +\cgalModels{CGAL::Epick_d} +\cgalModels{CGAL::Epeck_d} \cgalHasModelsEnd */ class Kernel_d { diff --git a/Kernel_d/doc/Kernel_d/Concepts/LinearAlgebraTraits_d.h b/Kernel_d/doc/Kernel_d/Concepts/LinearAlgebraTraits_d.h index f8a25811d421..8dff375eaea0 100644 --- a/Kernel_d/doc/Kernel_d/Concepts/LinearAlgebraTraits_d.h +++ b/Kernel_d/doc/Kernel_d/Concepts/LinearAlgebraTraits_d.h @@ -13,8 +13,9 @@ correct. For example, if the linear system solver declares a linear system \f$ A x = b\f$ unsolvable it also returns a vector \f$ c\f$ such that \f$ c^T A = 0\f$ and \f$ c^T b \neq 0\f$. -\cgalHasModelsBegin CGAL::Linear_algebraHd -\cgalHasModels CGAL::Linear_algebraCd +\cgalHasModelsBegin +\cgalModels{CGAL::Linear_algebraHd} +\cgalModels{CGAL::Linear_algebraCd} \cgalHasModelsEnd */ diff --git a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/CellAttributeWithPoint.h b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/CellAttributeWithPoint.h index 6f97471a99c4..08820e4d061b 100644 --- a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/CellAttributeWithPoint.h +++ b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/CellAttributeWithPoint.h @@ -7,7 +7,9 @@ The concept `CellAttributeWithPoint` is a refinement of the `CellAttribute` conc \cgalRefines{CellAttribute} +\cgalHasModelsBegin \cgalHasModelsBare{\link CGAL::Cell_attribute_with_point `CGAL::Cell_attribute_with_point`\endlink} +\cgalHasModelsEnd \sa `LinearCellComplexItems` diff --git a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplex.h b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplex.h index 740405fc5b3c..c7652262cf88 100644 --- a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplex.h +++ b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplex.h @@ -7,8 +7,10 @@ The concept `LinearCellComplex` represents a linear cell complex in dimension `d \cgalRefines{GenericMap} -\cgalHasModelsBare{\link CGAL::Linear_cell_complex_for_combinatorial_map `CGAL::Linear_cell_complex_for_combinatorial_map`\endlink\n - \link CGAL::Linear_cell_complex_for_generalized_map `CGAL::Linear_cell_complex_for_generalized_map`\endlink} +\cgalHasModelsBegin +\cgalHasModelsBare{\link CGAL::Linear_cell_complex_for_combinatorial_map `CGAL::Linear_cell_complex_for_combinatorial_map`\endlink} +\cgalHasModelsBare{\link CGAL::Linear_cell_complex_for_generalized_map `CGAL::Linear_cell_complex_for_generalized_map`\endlink} +\cgalHasModelsEnd \sa `LinearCellComplexItems` \sa `LinearCellComplexTraits` diff --git a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h index 25df3bed1833..abc3d27eaf24 100644 --- a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h +++ b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h @@ -9,7 +9,8 @@ The concept `LinearCellComplexItems` refines the concept of `GenericMapItems` by The first type in `Attributes` tuple must be a model of the `CellAttributeWithPoint` concept. -\cgalHasModelsBegin CGAL::Linear_cell_complex_min_items +\cgalHasModelsBegin +\cgalModels{CGAL::Linear_cell_complex_min_items} \cgalHasModelsEnd \sa `LinearCellComplex` diff --git a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexTraits.h b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexTraits.h index cb7de2d83823..e701f011493f 100644 --- a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexTraits.h +++ b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexTraits.h @@ -5,7 +5,9 @@ Required types and functors for the `LinearCellComplexTraits` concept. This geometric traits concept is used in the \link CGAL::Linear_cell_complex_for_combinatorial_map `Linear_cell_complex_for_combinatorial_map`\endlink and \link CGAL::Linear_cell_complex_for_generalized_map `Linear_cell_complex_for_generalized_map`\endlink classes. +\cgalHasModelsBegin \cgalHasModelsBare{\link CGAL::Linear_cell_complex_traits `CGAL::Linear_cell_complex_traits`\endlink} +\cgalHasModelsEnd \sa `CGAL::Linear_cell_complex_for_combinatorial_map` \sa `CGAL::Linear_cell_complex_for_generalized_map` diff --git a/Matrix_search/doc/Matrix_search/Concepts/BasicMatrix.h b/Matrix_search/doc/Matrix_search/Concepts/BasicMatrix.h index 37512a501ece..9a7b265540b9 100644 --- a/Matrix_search/doc/Matrix_search/Concepts/BasicMatrix.h +++ b/Matrix_search/doc/Matrix_search/Concepts/BasicMatrix.h @@ -8,7 +8,8 @@ A class `BasicMatrix` has to provide the following types and operations in order to be a model for `BasicMatrix`. -\cgalHasModelsBegin CGAL::Dynamic_matrix +\cgalHasModelsBegin +\cgalModels{CGAL::Dynamic_matrix} \cgalHasModelsEnd \sa `MonotoneMatrixSearchTraits` diff --git a/Matrix_search/doc/Matrix_search/Concepts/MonotoneMatrixSearchTraits.h b/Matrix_search/doc/Matrix_search/Concepts/MonotoneMatrixSearchTraits.h index 3f44b807ffd0..b20b74de1d09 100644 --- a/Matrix_search/doc/Matrix_search/Concepts/MonotoneMatrixSearchTraits.h +++ b/Matrix_search/doc/Matrix_search/Concepts/MonotoneMatrixSearchTraits.h @@ -21,7 +21,8 @@ add most of the functionality described above to arbitrary matrix classes. -\cgalHasModelsBegin CGAL::Dynamic_matrix +\cgalHasModelsBegin +\cgalModels{CGAL::Dynamic_matrix} \cgalHasModelsEnd \sa `CGAL::monotone_matrix_search()` diff --git a/Matrix_search/doc/Matrix_search/Concepts/SortedMatrixSearchTraits.h b/Matrix_search/doc/Matrix_search/Concepts/SortedMatrixSearchTraits.h index e96a49bfdbeb..99c3cfcba772 100644 --- a/Matrix_search/doc/Matrix_search/Concepts/SortedMatrixSearchTraits.h +++ b/Matrix_search/doc/Matrix_search/Concepts/SortedMatrixSearchTraits.h @@ -8,7 +8,8 @@ needed to compute the smallest entry in a set of sorted matrices that fulfills a certain feasibility criterion using the function `CGAL::sorted_matrix_search`. -\cgalHasModelsBegin CGAL::Sorted_matrix_search_traits_adaptor +\cgalHasModelsBegin +\cgalModels{CGAL::Sorted_matrix_search_traits_adaptor} \cgalHasModelsEnd \sa `CGAL::sorted_matrix_search()` diff --git a/Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h b/Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h index 745c85b0d9f6..0980ae1d1512 100644 --- a/Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h +++ b/Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h @@ -17,7 +17,9 @@ points on constrained edges. \cgalRefines{DelaunayTriangulationTraits_2} -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} CGAL::Projection_traits_xy_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{CGAL::Projection_traits_xy_3} \cgalHasModelsEnd diff --git a/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshFaceBase_2.h b/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshFaceBase_2.h index abe11ca79a86..7bc632d6fa8e 100644 --- a/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshFaceBase_2.h +++ b/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshFaceBase_2.h @@ -13,7 +13,8 @@ meshing domain or not. \cgalRefines{ConstrainedTriangulationFaceBase_2} -\cgalHasModelsBegin CGAL::Delaunay_mesh_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Delaunay_mesh_face_base_2} \cgalHasModelsEnd diff --git a/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshTraits_2.h b/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshTraits_2.h index 25d8388d962a..e5e793bafffb 100644 --- a/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshTraits_2.h +++ b/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshTraits_2.h @@ -12,7 +12,9 @@ object `Construct_circumcenter_2`. \cgalRefines{ConformingDelaunayTriangulationTraits_2} -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} CGAL::Projection_traits_xy_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{CGAL::Projection_traits_xy_3} \cgalHasModelsEnd */ diff --git a/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshVertexBase_2.h b/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshVertexBase_2.h index 341888021197..ac7a4a691612 100644 --- a/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshVertexBase_2.h +++ b/Mesh_2/doc/Mesh_2/Concepts/DelaunayMeshVertexBase_2.h @@ -13,7 +13,8 @@ the mesh density everywhere while modifying the mesh. \cgalRefines{TriangulationVertexBase_2} -\cgalHasModelsBegin CGAL::Delaunay_mesh_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Delaunay_mesh_vertex_base_2} \cgalHasModelsEnd diff --git a/Mesh_2/doc/Mesh_2/Concepts/MeshingCriteria_2.h b/Mesh_2/doc/Mesh_2/Concepts/MeshingCriteria_2.h index 929119fb29af..06f5f865e331 100644 --- a/Mesh_2/doc/Mesh_2/Concepts/MeshingCriteria_2.h +++ b/Mesh_2/doc/Mesh_2/Concepts/MeshingCriteria_2.h @@ -37,8 +37,9 @@ comparable as the meshing algorithm will order bad triangles by quality, to split those with smallest quality first. The predicate `Is_bad` computes the quality of the triangle as a by-product. -\cgalHasModelsBegin CGAL::Delaunay_mesh_criteria_2 -\cgalHasModels CGAL::Delaunay_mesh_size_criteria_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Delaunay_mesh_criteria_2} +\cgalModels{CGAL::Delaunay_mesh_size_criteria_2} \cgalHasModelsEnd diff --git a/Mesh_3/doc/Mesh_3/Concepts/BisectionGeometricTraits_3.h b/Mesh_3/doc/Mesh_3/Concepts/BisectionGeometricTraits_3.h index 0ca302d56fb5..bab4df1ba944 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/BisectionGeometricTraits_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/BisectionGeometricTraits_3.h @@ -16,7 +16,9 @@ function from \f$ \mathbb{R}^3\f$ to \f$ \mathbb{R}\f$), the do-intersect predic is computed by evaluations of the function values at both end points of the segment. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \sa `ImplicitSurfaceTraits_3` \sa `IntersectionGeometricTraits_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/IntersectionGeometricTraits_3.h b/Mesh_3/doc/Mesh_3/Concepts/IntersectionGeometricTraits_3.h index d5637c9b8e15..8773bf905f8c 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/IntersectionGeometricTraits_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/IntersectionGeometricTraits_3.h @@ -9,7 +9,9 @@ forming its boundary. The concept `IntersectionGeometricTraits_3` mainly provides the detection and construction of intersections between segments and triangles. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \sa `BisectionGeometricTraits_3` \sa `CGAL::Polyhedral_mesh_domain_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h index 7ad4c56ad1cd..44f0e8181230 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h @@ -43,8 +43,9 @@ each cell (see below). \cgalRefines{SimplicialMeshCellBase_3,RegularTriangulationCellBaseWithWeightedCircumcenter_3,CopyConstructible} -\cgalHasModelsBegin CGAL::Compact_mesh_cell_base_3 -\cgalHasModels CGAL::Mesh_cell_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Compact_mesh_cell_base_3} +\cgalModels{CGAL::Mesh_cell_base_3} \cgalHasModelsEnd \sa `CGAL::make_mesh_3()` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshCellCriteria_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshCellCriteria_3.h index 4691571e9f1b..bc8a60b51d32 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshCellCriteria_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshCellCriteria_3.h @@ -9,7 +9,8 @@ that concern either mesh tetrahedra or surface facets. The concept `MeshCellCriteria_3` describes the types that handle the refinement criteria for mesh tetrahedra. -\cgalHasModelsBegin CGAL::Mesh_cell_criteria_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_cell_criteria_3} \cgalHasModelsEnd \sa `MeshEdgeCriteria_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshCriteriaWithFeatures_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshCriteriaWithFeatures_3.h index e1570416dd7f..dcb2123ec62d 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshCriteriaWithFeatures_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshCriteriaWithFeatures_3.h @@ -14,7 +14,8 @@ that describes the requirements, in terms of sizing, for the discretization of t \cgalRefines{MeshCriteria_3} -\cgalHasModelsBegin CGAL::Mesh_criteria_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_criteria_3} \cgalHasModelsEnd \sa `MeshEdgeCriteria_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshCriteria_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshCriteria_3.h index 189afcbffcb9..83fad908d256 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshCriteria_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshCriteria_3.h @@ -12,7 +12,8 @@ while the refinement criteria for surface facets are described by the concept `MeshFacetCriteria_3`. The concept `MeshCriteria_3` encapsulates these concepts. -\cgalHasModelsBegin CGAL::Mesh_criteria_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_criteria_3} \cgalHasModelsEnd \sa `MeshFacetCriteria_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshDomainField_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshDomainField_3.h index fbb2f2cc8eed..d3f7d1e61ea2 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshDomainField_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshDomainField_3.h @@ -5,7 +5,8 @@ The concept `MeshDomainField_3` describes a scalar field which could be queried at any point of the space. -\cgalHasModelsBegin CGAL::Mesh_constant_domain_field_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_constant_domain_field_3} \cgalHasModelsEnd \sa `MeshDomain_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshDomainWithFeatures_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshDomainWithFeatures_3.h index 80df66b599ad..3a3a79f11053 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshDomainWithFeatures_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshDomainWithFeatures_3.h @@ -17,8 +17,9 @@ between two ordered points on the same curve. \cgalRefines{MeshDomain_3} -\cgalHasModelsBegin CGAL::Mesh_domain_with_polyline_features_3 -\cgalHasModels CGAL::Polyhedral_mesh_domain_with_features_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_domain_with_polyline_features_3} +\cgalModels{CGAL::Polyhedral_mesh_domain_with_features_3} \cgalHasModelsEnd \sa `MeshDomain_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshDomain_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshDomain_3.h index 56c6ed59ad1c..03ca9f2fef7e 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshDomain_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshDomain_3.h @@ -29,8 +29,9 @@ A segment, ray or line is said to intersect properly the domain boundary if it includes points which are strictly inside and strictly outside the domain (resp. the subdomain). -\cgalHasModelsBegin CGAL::Polyhedral_mesh_domain_3 -\cgalHasModels CGAL::Labeled_mesh_domain_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Polyhedral_mesh_domain_3} +\cgalModels{CGAL::Labeled_mesh_domain_3} \cgalHasModelsEnd \sa `MeshVertexBase_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshEdgeCriteria_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshEdgeCriteria_3.h index 41b3bab44515..930a627cc761 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshEdgeCriteria_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshEdgeCriteria_3.h @@ -7,7 +7,8 @@ the 1-dimensional features of the domain. It provides an upper bound for the distance between two protecting ball centers that are consecutive on a 1-feature. -\cgalHasModelsBegin CGAL::Mesh_edge_criteria_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_edge_criteria_3} \cgalHasModelsEnd \sa `MeshCellCriteria_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshFacetCriteria_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshFacetCriteria_3.h index f8bad1f29ccf..a0c32629c5ad 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshFacetCriteria_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshFacetCriteria_3.h @@ -9,7 +9,8 @@ that concern either mesh tetrahedra or surface facets. The concept `MeshFacetCriteria_3` describes the types that handle the refinement criteria for surface facets. -\cgalHasModelsBegin CGAL::Mesh_facet_criteria_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_facet_criteria_3} \cgalHasModelsEnd \sa `MeshCellCriteria_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshPolyline_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshPolyline_3.h index ce8469eb8aa8..043960c0e91e 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshPolyline_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshPolyline_3.h @@ -6,7 +6,9 @@ The concept `MeshPolyline_3` implements a container of points designed to repres Types and functions provided in this concept are such as standard template library containers are natural models of this concept. +\cgalHasModelsBegin \cgalHasModelsBare{`std::vector` for any Kernel of \cgal is a natural model of this concept.} +\cgalHasModelsEnd \sa `CGAL::Mesh_domain_with_polyline_features_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshTriangulationTraits_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshTriangulationTraits_3.h index 3e1a8cf734d0..be84906d8f30 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshTriangulationTraits_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshTriangulationTraits_3.h @@ -9,7 +9,9 @@ a mesh generation process. \cgalRefines{RegularTriangulationTraits_3} +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd In addition to the requirements described for the traits class RegularTriangulationTraits_3, the geometric traits class of a diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshVertexBase_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshVertexBase_3.h index f4f2ff9d9b84..20a62546c2ce 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshVertexBase_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshVertexBase_3.h @@ -22,7 +22,8 @@ each cell (see below). \cgalRefines{SimplicialMeshVertexBase_3,RegularTriangulationVertexBase_3,SurfaceMeshVertexBase_3} -\cgalHasModelsBegin CGAL::Mesh_vertex_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_vertex_base_3} \cgalHasModelsEnd \sa `CGAL::make_mesh_3()` diff --git a/Mesh_3/doc/Mesh_3/Concepts/TriangleAccessor_3.h b/Mesh_3/doc/Mesh_3/Concepts/TriangleAccessor_3.h index 1d3a376d3de1..7be6df1aece7 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/TriangleAccessor_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/TriangleAccessor_3.h @@ -5,7 +5,8 @@ The concept `TriangleAccessor_3` represents an accessor to a triangulated polyhedral surface, intersection free and without boundaries. -\cgalHasModelsBegin CGAL::Triangle_accessor_3,K> +\cgalHasModelsBegin +\cgalModels{CGAL::Triangle_accessor_3,K>} \cgalHasModelsEnd \sa `CGAL::Polyhedral_mesh_domain_3` diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonConvexDecomposition_2.h b/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonConvexDecomposition_2.h index 0f81aaa6a90e..848c46adfda9 100644 --- a/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonConvexDecomposition_2.h +++ b/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonConvexDecomposition_2.h @@ -6,11 +6,12 @@ A model of the `PolygonConvexDecomposition_2` concept is capable of decomposing an input polygon \f$ P\f$ into a set of convex sub-polygons \f$ P_1, \ldots, P_k\f$, such that \f$ \cup_{i=1}^{k}{P_k} = P\f$. -\cgalHasModelsBegin CGAL::Small_side_angle_bisector_decomposition_2 -\cgalHasModels CGAL::Optimal_convex_decomposition_2 -\cgalHasModels CGAL::Hertel_Mehlhorn_convex_decomposition_2 -\cgalHasModels CGAL::Greene_convex_decomposition_2 -\cgalHasModels CGAL::Polygon_nop_decomposition_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Small_side_angle_bisector_decomposition_2} +\cgalModels{CGAL::Optimal_convex_decomposition_2} +\cgalModels{CGAL::Hertel_Mehlhorn_convex_decomposition_2} +\cgalModels{CGAL::Greene_convex_decomposition_2} +\cgalModels{CGAL::Polygon_nop_decomposition_2} \cgalHasModelsEnd */ diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonWithHolesConvexDecomposition_2.h b/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonWithHolesConvexDecomposition_2.h index 64b8d0995076..6cf7eb45c35e 100644 --- a/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonWithHolesConvexDecomposition_2.h +++ b/Minkowski_sum_2/doc/Minkowski_sum_2/Concepts/PolygonWithHolesConvexDecomposition_2.h @@ -9,8 +9,9 @@ convex sub-polygons \f$ P_1, \ldots, P_k\f$, such that \cgalRefines{PolygonConvexDecomposition_2} -\cgalHasModelsBegin CGAL::Polygon_vertical_decomposition_2 -\cgalHasModels CGAL::Polygon_triangulation_decomposition_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Polygon_vertical_decomposition_2} +\cgalModels{CGAL::Polygon_triangulation_decomposition_2} \cgalHasModelsEnd */ diff --git a/Miscellany/doc/Miscellany/Concepts/UniqueHashFunction.h b/Miscellany/doc/Miscellany/Concepts/UniqueHashFunction.h index 1bf64f2a9c94..b3f2543843ff 100644 --- a/Miscellany/doc/Miscellany/Concepts/UniqueHashFunction.h +++ b/Miscellany/doc/Miscellany/Concepts/UniqueHashFunction.h @@ -9,7 +9,8 @@ function object. It maps objects of its domain type `Key` to the integral image type `std::size_t`. The image values have to be unique for all keys in the domain type `Key`. -\cgalHasModelsBegin CGAL::Handle_hash_function +\cgalHasModelsBegin +\cgalModels{CGAL::Handle_hash_function} \cgalHasModelsEnd \sa `CGAL::Unique_hash_map` diff --git a/Modular_arithmetic/doc/Modular_arithmetic/Concepts/ModularTraits.h b/Modular_arithmetic/doc/Modular_arithmetic/Concepts/ModularTraits.h index 0e0467a9f390..a78fde1730a1 100644 --- a/Modular_arithmetic/doc/Modular_arithmetic/Concepts/ModularTraits.h +++ b/Modular_arithmetic/doc/Modular_arithmetic/Concepts/ModularTraits.h @@ -8,7 +8,8 @@ In case this associated type is a model of `Modularizable`, this is indicated by Boolean tag `ModularTraits::Is_modularizable`. The mapping into the `Residue_type` is provided by the functor `ModularTraits::Modular_image`. -\cgalHasModelsBegin CGAL::Modular_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Modular_traits} \cgalHasModelsEnd \sa `CGAL::Residue` diff --git a/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h b/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h index 8db45a2f4287..1d7f832f5d88 100644 --- a/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h +++ b/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h @@ -18,19 +18,21 @@ of denominator, are not `Modularizable`. This is due to the fact that the denominator may be zero modulo the prime, which can not be represented. -\cgalHasModelsBegin int -\cgalHasModels long -\cgalHasModels CORE::BigInt -\cgalHasModels CGAL::Gmpz -\cgalHasModels leda_integer -\cgalHasModels mpz_class +\cgalHasModelsBegin +\cgalModels{int} +\cgalModels{long} +\cgalModels{CORE::BigInt} +\cgalModels{CGAL::Gmpz} +\cgalModels{leda_integer} +\cgalModels{mpz_class} \cgalHasModelsEnd The following types are `Modularizable` iff their template arguments are. -\cgalHasModelsBegin CGAL::Lazy_exact_nt -\cgalHasModels CGAL::Sqrt_extension -\cgalHasModels CGAL::Polynomial +\cgalHasModelsBegin +\cgalModels{CGAL::Lazy_exact_nt} +\cgalModels{CGAL::Sqrt_extension} +\cgalModels{CGAL::Polynomial} \cgalHasModelsEnd \sa `CGAL::Residue` diff --git a/Nef_2/doc/Nef_2/Concepts/ExtendedKernelTraits_2.h b/Nef_2/doc/Nef_2/Concepts/ExtendedKernelTraits_2.h index 7161d6725e76..c46d39daa542 100644 --- a/Nef_2/doc/Nef_2/Concepts/ExtendedKernelTraits_2.h +++ b/Nef_2/doc/Nef_2/Concepts/ExtendedKernelTraits_2.h @@ -38,9 +38,10 @@ functionality for changing between standard affine and extended geometry. At the same time it provides extensible geometric primitives on the extended geometric objects. -\cgalHasModelsBegin CGAL::Extended_cartesian -\cgalHasModels CGAL::Extended_homogeneous -\cgalHasModels CGAL::Filtered_extended_homogeneous +\cgalHasModelsBegin +\cgalModels{CGAL::Extended_cartesian} +\cgalModels{CGAL::Extended_homogeneous} +\cgalModels{CGAL::Filtered_extended_homogeneous} \cgalHasModelsEnd */ diff --git a/Number_types/doc/Number_types/Concepts/RootOf_2.h b/Number_types/doc/Number_types/Concepts/RootOf_2.h index c29f30b3ab2b..9ae9883f80fe 100644 --- a/Number_types/doc/Number_types/Concepts/RootOf_2.h +++ b/Number_types/doc/Number_types/Concepts/RootOf_2.h @@ -30,7 +30,9 @@ special construction for extensions of degree 2: \cgalRefines{DefaultConstructible,CopyConstructible,FromIntConstructible, ImplicitInteroperable with `RT`,ImplicitInteroperable with `FT`} -\cgalHasModelsBareBegin{`double` (not exact)} CGAL::Sqrt_extension +\cgalHasModelsBegin +\cgalHasModelsBare{`double` (not exact)} +\cgalHasModels{CGAL::Sqrt_extension} \cgalHasModelsEnd \sa `CGAL::make_root_of_2` diff --git a/Optimal_bounding_box/doc/Optimal_bounding_box/Concepts/OrientedBoundingBoxTraits.h b/Optimal_bounding_box/doc/Optimal_bounding_box/Concepts/OrientedBoundingBoxTraits.h index fad3d71782a0..40fdf24e2d8f 100644 --- a/Optimal_bounding_box/doc/Optimal_bounding_box/Concepts/OrientedBoundingBoxTraits.h +++ b/Optimal_bounding_box/doc/Optimal_bounding_box/Concepts/OrientedBoundingBoxTraits.h @@ -8,7 +8,8 @@ a 3x3 matrix type. \cgalRefines{Kernel} -\cgalHasModelsBegin CGAL::Oriented_bounding_box_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Oriented_bounding_box_traits_3} \cgalHasModelsEnd */ diff --git a/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/Concepts/OptimalTransportationReconstructionTraits_2.h b/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/Concepts/OptimalTransportationReconstructionTraits_2.h index 39b2c65b4e15..69f33226b2c4 100644 --- a/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/Concepts/OptimalTransportationReconstructionTraits_2.h +++ b/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/Concepts/OptimalTransportationReconstructionTraits_2.h @@ -8,8 +8,10 @@ for the traits class of `CGAL::Optimal_transportation_reconstruction_2`. \cgalRefines{DelaunayTriangulationTraits_2} -\cgalHasModelsBare{All models of the \cgal concept `Kernel`, - `CGAL::Exact_predicates_inexact_constructions_kernel` (recommended)} +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsBare{`CGAL::Exact_predicates_inexact_constructions_kernel` (recommended)} +\cgalHasModelsEnd \sa `CGAL::Optimal_transportation_reconstruction_2` diff --git a/Orthtree/doc/Orthtree/Concepts/OrthtreeTraits.h b/Orthtree/doc/Orthtree/Concepts/OrthtreeTraits.h index 8b6e0e06631e..83408944f2b5 100644 --- a/Orthtree/doc/Orthtree/Concepts/OrthtreeTraits.h +++ b/Orthtree/doc/Orthtree/Concepts/OrthtreeTraits.h @@ -5,9 +5,10 @@ The concept `OrthtreeTraits` defines the requirements for the template parameter of the `CGAL::Orthtree` class. - \cgalHasModelsBegin galHasModel `CGAL::Orthtree_traits_2 - \cgalHasModels CGAL::Orthtree_traits_3 - \cgalHasModels CGAL::Orthtree_traits_d + \cgalHasModelsBegin + \cgalModels{CGAL::Orthtree_traits_2} + \cgalModels{CGAL::Orthtree_traits_3} + \cgalModels{CGAL::Orthtree_traits_d} \cgalHasModelsEnd */ class OrthtreeTraits diff --git a/Orthtree/doc/Orthtree/Concepts/OrthtreeTraversal.h b/Orthtree/doc/Orthtree/Concepts/OrthtreeTraversal.h index c03e9deb2070..851482d8751a 100644 --- a/Orthtree/doc/Orthtree/Concepts/OrthtreeTraversal.h +++ b/Orthtree/doc/Orthtree/Concepts/OrthtreeTraversal.h @@ -9,10 +9,11 @@ A traversal is used to iterate on a tree with a user-selected order (e.g. preorder, postorder). - \cgalHasModelsBegin galHasModel `CGAL::Orthtrees::Preorder_traversal - \cgalHasModels CGAL::Orthtrees::Postorder_traversal - \cgalHasModels CGAL::Orthtrees::Leaves_traversal - \cgalHasModels CGAL::Orthtrees::Level_traversal + \cgalHasModelsBegin + \cgalModels{CGAL::Orthtrees::Preorder_traversal} + \cgalModels{CGAL::Orthtrees::Postorder_traversal} + \cgalModels{CGAL::Orthtrees::Leaves_traversal} + \cgalModels{CGAL::Orthtrees::Level_traversal} \cgalHasModelsEnd */ class OrthtreeTraversal { diff --git a/Partition_2/doc/Partition_2/Concepts/ConvexPartitionIsValidTraits_2.h b/Partition_2/doc/Partition_2/Concepts/ConvexPartitionIsValidTraits_2.h index ff7c9417c08b..6b9be975123b 100644 --- a/Partition_2/doc/Partition_2/Concepts/ConvexPartitionIsValidTraits_2.h +++ b/Partition_2/doc/Partition_2/Concepts/ConvexPartitionIsValidTraits_2.h @@ -6,7 +6,8 @@ Requirements of a traits class used by `convex_partition_is_valid_2` for testing the validity of a convex partition of a polygon. -\cgalHasModelsBegin CGAL::Partition_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Partition_traits_2} \cgalHasModelsEnd \sa `CGAL::approx_convex_partition_2()` diff --git a/Partition_2/doc/Partition_2/Concepts/IsYMonotoneTraits_2.h b/Partition_2/doc/Partition_2/Concepts/IsYMonotoneTraits_2.h index 0c0d7e3fc974..112995c86f11 100644 --- a/Partition_2/doc/Partition_2/Concepts/IsYMonotoneTraits_2.h +++ b/Partition_2/doc/Partition_2/Concepts/IsYMonotoneTraits_2.h @@ -6,8 +6,9 @@ Requirements of a traits class to be used with the function `is_y_monotone_2()` that tests whether a sequence of 2D points defines a \f$ y\f$-monotone polygon or not. -\cgalHasModelsBegin CGAL::Partition_traits_2 -\cgalHasModels CGAL::Kernel_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Partition_traits_2} +\cgalModels{CGAL::Kernel_traits_2} \cgalHasModelsEnd \sa `CGAL::Is_y_monotone_2` diff --git a/Partition_2/doc/Partition_2/Concepts/OptimalConvexPartitionTraits_2.h b/Partition_2/doc/Partition_2/Concepts/OptimalConvexPartitionTraits_2.h index 85676075bb4e..1ef70344a2d6 100644 --- a/Partition_2/doc/Partition_2/Concepts/OptimalConvexPartitionTraits_2.h +++ b/Partition_2/doc/Partition_2/Concepts/OptimalConvexPartitionTraits_2.h @@ -8,7 +8,8 @@ an optimal convex partition of a polygon. \cgalRefines{PartitionTraits_2} -\cgalHasModelsBegin CGAL::Partition_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Partition_traits_2} \cgalHasModelsEnd \sa `CGAL::convex_partition_is_valid_2()` diff --git a/Partition_2/doc/Partition_2/Concepts/PartitionIsValidTraits_2.h b/Partition_2/doc/Partition_2/Concepts/PartitionIsValidTraits_2.h index b91ad8109352..7edbe6dcde6d 100644 --- a/Partition_2/doc/Partition_2/Concepts/PartitionIsValidTraits_2.h +++ b/Partition_2/doc/Partition_2/Concepts/PartitionIsValidTraits_2.h @@ -14,7 +14,8 @@ function `CGAL::is_convex_2()` and the concept `YMonotonePartitionTraits_2` for the additional requirements for testing for convexity and \f$ y\f$-monotonicity, respectively. -\cgalHasModelsBegin CGAL::Partition_is_valid_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Partition_is_valid_traits_2} \cgalHasModelsEnd \sa `CGAL::approx_convex_partition_2()` diff --git a/Partition_2/doc/Partition_2/Concepts/PartitionTraits_2.h b/Partition_2/doc/Partition_2/Concepts/PartitionTraits_2.h index 2ad93228b1bf..910d565cf10a 100644 --- a/Partition_2/doc/Partition_2/Concepts/PartitionTraits_2.h +++ b/Partition_2/doc/Partition_2/Concepts/PartitionTraits_2.h @@ -8,7 +8,8 @@ common to all traits classes. The concept `PartitionTraits_2` defines this common set of requirements. -\cgalHasModelsBegin CGAL::Partition_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Partition_traits_2} \cgalHasModelsEnd \sa `CGAL::approx_convex_partition_2()` diff --git a/Partition_2/doc/Partition_2/Concepts/PolygonIsValid.h b/Partition_2/doc/Partition_2/Concepts/PolygonIsValid.h index ab72c01a9f09..662bdb369a91 100644 --- a/Partition_2/doc/Partition_2/Concepts/PolygonIsValid.h +++ b/Partition_2/doc/Partition_2/Concepts/PolygonIsValid.h @@ -6,8 +6,9 @@ Function object that determines if a sequence of points represents a valid partition polygon or not, where "valid" can assume any of several meanings (e.g., convex or \f$ y\f$-monotone). -\cgalHasModelsBegin CGAL::Is_convex_2 -\cgalHasModels CGAL::Is_y_monotone_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Is_convex_2} +\cgalModels{CGAL::Is_y_monotone_2} \cgalHasModelsEnd \sa `CGAL::approx_convex_partition_2()` diff --git a/Partition_2/doc/Partition_2/Concepts/YMonotonePartitionIsValidTraits_2.h b/Partition_2/doc/Partition_2/Concepts/YMonotonePartitionIsValidTraits_2.h index 6212b11620a4..7869a2122e90 100644 --- a/Partition_2/doc/Partition_2/Concepts/YMonotonePartitionIsValidTraits_2.h +++ b/Partition_2/doc/Partition_2/Concepts/YMonotonePartitionIsValidTraits_2.h @@ -6,7 +6,8 @@ Requirements of a traits class that is used by `y_monotone_partition_is_valid_2` for testing the validity of a \f$ y\f$-monotone partition of a polygon. -\cgalHasModelsBegin CGAL::Partition_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Partition_traits_2} \cgalHasModelsEnd \sa `CGAL::partition_is_valid_2()` diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h index bda0b95ab293..0ae4f0fedcf7 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h @@ -27,7 +27,8 @@ dual functions are called. The additional predicate type `::Periodic_2DelaunayTriangulationTraits_2::Compare_distance_2` is required if calls to `nearest_vertex(..)` are issued. -\cgalHasModelsBegin CGAL::Periodic_2_Delaunay_triangulation_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_2_Delaunay_triangulation_traits_2} \cgalHasModelsEnd \sa `DelaunayTriangulationTraits_2` diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2Offset_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2Offset_2.h index 56d28d5a2171..172f176c7cfc 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2Offset_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2Offset_2.h @@ -7,7 +7,8 @@ The concept `Periodic_2Offset_2` describes a two-/dimensional integer vector with some specialized access functions and operations. -\cgalHasModelsBegin CGAL::Periodic_2_offset_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_2_offset_2} \cgalHasModelsEnd \sa `Periodic_2TriangulationTraits_2` diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationFaceBase_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationFaceBase_2.h index 96769827f334..da6b89b93a27 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationFaceBase_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationFaceBase_2.h @@ -13,7 +13,8 @@ vertex \f$ i\f$. \cgalRefines{TriangulationFaceBase_2} -\cgalHasModelsBegin CGAL::Periodic_2_triangulation_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_2_triangulation_face_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h index 58dad3ed62d0..1d93a35edbef 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h @@ -24,7 +24,8 @@ In addition to the requirements described for the traits class Periodic triangulation must fulfill the following requirements: -\cgalHasModelsBegin CGAL::Periodic_2_triangulation_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_2_triangulation_traits_2} \cgalHasModelsEnd \sa `TriangulationTraits_2` diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationVertexBase_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationVertexBase_2.h index 33d799fec248..eeae18dcd70e 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationVertexBase_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationVertexBase_2.h @@ -16,7 +16,8 @@ The storage of the offset is only needed when a triangulation is copied. \cgalRefines{TriangulationVertexBase_2} -\cgalHasModelsBegin CGAL::Periodic_2_triangulation_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_2_triangulation_vertex_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h index 2794a7f365ae..73f7d1339a52 100644 --- a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h +++ b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h @@ -22,7 +22,8 @@ Wrapping any model of `Periodic_3MeshDomain_3` with the class `CGAL::Mesh_domain_with_polyline_features_3` gives a model of `Periodic_3MeshDomainWithFeatures_3`. -\cgalHasModelsBegin CGAL::Mesh_domain_with_polyline_features_3 > +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_domain_with_polyline_features_3 >} \cgalHasModelsEnd \sa `CGAL::Periodic_3_function_wrapper` diff --git a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h index 63170e01edb0..b92341527b91 100644 --- a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h +++ b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h @@ -20,7 +20,8 @@ The class `CGAL::Labeled_mesh_domain_3` paired with a periodic labeling fun is a model of this concept. It is possible to create artificially periodic functions through the class `CGAL::Periodic_3_function_wrapper`. -\cgalHasModelsBegin CGAL::Labeled_mesh_domain_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Labeled_mesh_domain_3} \cgalHasModelsEnd \sa `CGAL::Labeled_mesh_domain_3` diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h index 1d72f2281804..571b9a0fa981 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h @@ -15,7 +15,8 @@ functor the version without offsets. \cgalRefines{Periodic_3TriangulationTraits_3,DelaunayTriangulationTraits_3} -\cgalHasModelsBegin CGAL::Periodic_3_Delaunay_triangulation_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_3_Delaunay_triangulation_traits_3} \cgalHasModelsEnd In addition to the requirements described by the concepts diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3Offset_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3Offset_3.h index b5a467b4cd82..2cb71cf9bcc4 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3Offset_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3Offset_3.h @@ -6,7 +6,8 @@ The concept `Periodic_3Offset_3` describes a three-dimensional integer vector with some specialized access functions and operations. -\cgalHasModelsBegin CGAL::Periodic_3_offset_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_3_offset_3} \cgalHasModelsEnd \sa `Periodic_3TriangulationTraits_3` diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSCellBase_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSCellBase_3.h index 29c9fae1dc68..05b10c71e021 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSCellBase_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSCellBase_3.h @@ -5,8 +5,9 @@ \cgalRefines{RegularTriangulationCellBase_3,Periodic_3TriangulationDSCellBase_3} -\cgalHasModelsBegin CGAL::Regular_triangulation_cell_base_3 > -\cgalHasModels CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3 > +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_triangulation_cell_base_3 >} +\cgalModels{CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3 >} \cgalHasModelsEnd The template parameter `Periodic_3RegularTriangulationTraits_3` is expected to be the same as the diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSVertexBase_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSVertexBase_3.h index 8f5ce76dab56..be6214920cb8 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSVertexBase_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationDSVertexBase_3.h @@ -5,7 +5,8 @@ \cgalRefines{RegularTriangulationVertexBase_3,Periodic_3TriangulationDSVertexBase_3} -\cgalHasModelsBegin CGAL::Regular_triangulation_vertex_base_3 > +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_triangulation_vertex_base_3 >} \cgalHasModelsEnd The template parameter `Periodic_3RegularTriangulationTraits_3` is expected to be the same as the diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h index c128b08f82e9..cdc5a72ead57 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h @@ -15,7 +15,8 @@ functor the version without offsets. \cgalRefines{Periodic_3TriangulationTraits_3,RegularTriangulationTraits_3} -\cgalHasModelsBegin CGAL::Periodic_3_regular_triangulation_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_3_regular_triangulation_traits_3} \cgalHasModelsEnd In addition to the requirements described for the traits class diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSCellBase_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSCellBase_3.h index 9f575b848695..d6e735e497fd 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSCellBase_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSCellBase_3.h @@ -18,7 +18,8 @@ does not contain any information. \cgalRefines{TriangulationDSCellBase_3} -\cgalHasModelsBegin CGAL::Periodic_3_triangulation_ds_cell_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_3_triangulation_ds_cell_base_3} \cgalHasModelsEnd \sa `TriangulationDataStructure_3` diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSVertexBase_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSVertexBase_3.h index 14b032fc1bc0..2665d89bdefa 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSVertexBase_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationDSVertexBase_3.h @@ -12,7 +12,8 @@ a vertex provides access to one of its incident cells through a handle. \cgalRefines{TriangulationDSVertexBase_3} -\cgalHasModelsBegin CGAL::Periodic_3_triangulation_ds_vertex_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_3_triangulation_ds_vertex_base_3} \cgalHasModelsEnd \sa `TriangulationDataStructure_3` diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h index ace2ebb8199b..67b8f33a78a5 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h @@ -14,7 +14,8 @@ functor the version without offsets. \cgalRefines{TriangulationTraits_3} -\cgalHasModelsBegin CGAL::Periodic_3_triangulation_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_3_triangulation_traits_3} \cgalHasModelsEnd \sa `Periodic_3DelaunayTriangulationTraits_3` diff --git a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicDelaunayTriangulationTraits_2.h b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicDelaunayTriangulationTraits_2.h index 7532e1b0797d..77501fa9399d 100644 --- a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicDelaunayTriangulationTraits_2.h +++ b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicDelaunayTriangulationTraits_2.h @@ -12,7 +12,8 @@ to `Periodic_4HyperbolicTriangulationTraits_2` that needs to be fulfilled by any class used to instantiate the first template parameter of the class `CGAL::Periodic_4_hyperbolic_Delaunay_triangulation_2`. -\cgalHasModelsBegin CGAL::Periodic_4_hyperbolic_Delaunay_triangulation_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_4_hyperbolic_Delaunay_triangulation_traits_2} \cgalHasModelsEnd */ diff --git a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationFaceBase_2.h b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationFaceBase_2.h index 9766710af1ed..92d62dfeeb2e 100644 --- a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationFaceBase_2.h +++ b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationFaceBase_2.h @@ -20,7 +20,8 @@ corresponding vertex produces the canonical representative of the face in the hy Hyperbolic translations are represented by a nested type which is provided by the concept `Periodic_4HyperbolicDelaunayTriangulationTraits_2`. -\cgalHasModelsBegin CGAL::Periodic_4_hyperbolic_triangulation_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_4_hyperbolic_triangulation_face_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationVertexBase_2.h b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationVertexBase_2.h index eb8bfe0b89dd..40b3cb0d34bc 100644 --- a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationVertexBase_2.h +++ b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Concepts/Periodic_4HyperbolicTriangulationVertexBase_2.h @@ -14,7 +14,8 @@ translation during the insertion process. A boolean flag indicates whether the face stores a translation or not. The value of the flag is automatically set when storing or removing a translation. -\cgalHasModelsBegin CGAL::Periodic_4_hyperbolic_triangulation_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Periodic_4_hyperbolic_triangulation_vertex_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Polygon/doc/Polygon/Concepts/GeneralPolygonWithHoles_2.h b/Polygon/doc/Polygon/Concepts/GeneralPolygonWithHoles_2.h index f17b26f951ae..6f58a4de0e89 100644 --- a/Polygon/doc/Polygon/Concepts/GeneralPolygonWithHoles_2.h +++ b/Polygon/doc/Polygon/Concepts/GeneralPolygonWithHoles_2.h @@ -8,8 +8,9 @@ * represents the outer boundary and the general polygons that represent * the holes. * - * \cgalHasModelsBegin CGAL::General_polygon_with_holes_2 - * \cgalHasModels CGAL::Polygon_with_holes_2 + * \cgalHasModelsBegin + * \cgalModels{CGAL::General_polygon_with_holes_2} + * \cgalModels{CGAL::Polygon_with_holes_2} * \cgalHasModelsEnd */ diff --git a/Polygon/doc/Polygon/Concepts/PolygonTraits_2.h b/Polygon/doc/Polygon/Concepts/PolygonTraits_2.h index 068194985bce..639ed921bb7a 100644 --- a/Polygon/doc/Polygon/Concepts/PolygonTraits_2.h +++ b/Polygon/doc/Polygon/Concepts/PolygonTraits_2.h @@ -14,9 +14,11 @@ and refer to the description of the kernel concept for details. \cgalRefines{DefaultConstructible,CopyConstructable} -\cgalHasModelsBareBegin{The kernels supplied by \cgal are models of `PolygonTraits_2`} CGAL::Projection_traits_xy_3 -\cgalHasModels CGAL::Projection_traits_yz_3 -\cgalHasModels CGAL::Projection_traits_xz_3 +\cgalHasModelsBegin +\cgalHasModelsBare{The kernels supplied by \cgal are models of `PolygonTraits_2`} +\cgalHasModels{CGAL::Projection_traits_xy_3} +\cgalHasModels{CGAL::Projection_traits_yz_3} +\cgalHasModels{CGAL::Projection_traits_xz_3} \cgalHasModelsEnd \sa `CGAL::Polygon_2` diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPCorefinementVisitor.h b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPCorefinementVisitor.h index facce5d714b0..683f7f581368 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPCorefinementVisitor.h +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPCorefinementVisitor.h @@ -6,7 +6,8 @@ /// the creation of new faces and new edges. /// /// \cgalRefines{CopyConstructible} -/// \cgalHasModelsBegin CGAL::Polygon_mesh_processing::Corefinement::Default_visitor +/// \cgalHasModelsBegin +/// \cgalModels{CGAL::Polygon_mesh_processing::Corefinement::Default_visitor} /// \cgalHasModelsEnd class PMPCorefinementVisitor{ diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPDistanceTraits.h b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPDistanceTraits.h index ec9839512208..c0b9c41ebe77 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPDistanceTraits.h +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPDistanceTraits.h @@ -7,7 +7,9 @@ /// `sample_triangle_mesh()`, `approximate_Hausdorff_distance()` and `max_distance_to_triangle_mesh()` /// /// \cgalRefines{AABBGeomTraits,SpatialSortingTraits_3} +/// \cgalHasModelsBegin /// \cgalHasModelsBare{Any 3D Kernel is a model of this concept} +/// \cgalHasModelsEnd class PMPDistanceTraits{ public: diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPHolefillingVisitor.h b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPHolefillingVisitor.h index 11af2abad0fd..e524ca75ffe9 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPHolefillingVisitor.h +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPHolefillingVisitor.h @@ -9,7 +9,8 @@ /// If that fails, it uses an algorithm with cubic running time (*cubic phase*). /// /// \cgalRefines{CopyConstructible} -/// \cgalHasModelsBegin CGAL::Polygon_mesh_processing::Hole_filling::Default_visitor +/// \cgalHasModelsBegin +/// \cgalModels{CGAL::Polygon_mesh_processing::Hole_filling::Default_visitor} /// \cgalHasModelsEnd class PMPHolefillingVisitor{ diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPPolygonSoupOrientationVisitor.h b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPPolygonSoupOrientationVisitor.h index d0597a5c90e5..0016e1cb8655 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPPolygonSoupOrientationVisitor.h +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPPolygonSoupOrientationVisitor.h @@ -7,7 +7,8 @@ /// during the orientation process. /// /// \cgalRefines{CopyConstructible} -/// \cgalHasModelsBegin CGAL::Polygon_mesh_processing::Default_orientation_visitor +/// \cgalHasModelsBegin +/// \cgalModels{CGAL::Polygon_mesh_processing::Default_orientation_visitor} /// \cgalHasModelsEnd class PMPPolygonSoupOrientationVisitor{ diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPTriangulateFaceVisitor.h b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPTriangulateFaceVisitor.h index a8c885e7b13d..3bc52ba8786e 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPTriangulateFaceVisitor.h +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPTriangulateFaceVisitor.h @@ -6,7 +6,8 @@ /// the creation of new faces. /// /// \cgalRefines{CopyConstructible} -/// \cgalHasModelsBegin CGAL::Polygon_mesh_processing::Triangulate_faces::Default_visitor +/// \cgalHasModelsBegin +/// \cgalModels{CGAL::Polygon_mesh_processing::Triangulate_faces::Default_visitor} /// \cgalHasModelsEnd diff --git a/Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h b/Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h index 31e6b981de25..d75b5d0b491e 100644 --- a/Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h +++ b/Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h @@ -13,9 +13,10 @@ polyhedral surface renames faces to facets. \cgalRefines{HalfedgeDSItems} -\cgalHasModelsBegin CGAL::Polyhedron_items_3 -\cgalHasModels CGAL::Polyhedron_min_items_3 -\cgalHasModels CGAL::Polyhedron_items_with_id_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Polyhedron_items_3} +\cgalModels{CGAL::Polyhedron_min_items_3} +\cgalModels{CGAL::Polyhedron_items_with_id_3} \cgalHasModelsEnd \sa `CGAL::Polyhedron_3` diff --git a/Polyhedron/doc/Polyhedron/Concepts/PolyhedronTraits_3.h b/Polyhedron/doc/Polyhedron/Concepts/PolyhedronTraits_3.h index 5dc824c7d553..39c4476cf7b4 100644 --- a/Polyhedron/doc/Polyhedron/Concepts/PolyhedronTraits_3.h +++ b/Polyhedron/doc/Polyhedron/Concepts/PolyhedronTraits_3.h @@ -10,8 +10,10 @@ and can be used directly as template argument. \cgalRefines{CopyConstructible,Assignable} -\cgalHasModelsBareBegin{All models of the `Kernel` concept, e.g. `CGAL::Simple_cartesian`} CGAL::Polyhedron_traits_3 -\cgalHasModels CGAL::Polyhedron_traits_with_normals_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the `Kernel` concept, e.g. `CGAL::Simple_cartesian`} +\cgalHasModels{CGAL::Polyhedron_traits_3} +\cgalHasModels{CGAL::Polyhedron_traits_with_normals_3} \cgalHasModelsEnd \sa `CGAL::Polyhedron_3` diff --git a/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationCostFunction.h b/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationCostFunction.h index 525753e4c75a..bf8fb4b60ab6 100644 --- a/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationCostFunction.h +++ b/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationCostFunction.h @@ -12,9 +12,10 @@ preserve the overall polyline set shape as much as possible \cgalRefines{CopyConstructible,Assignable} -\cgalHasModelsBegin CGAL::Polyline_simplification_2::Hybrid_squared_distance_cost -\cgalHasModels CGAL::Polyline_simplification_2::Scaled_squared_distance_cost -\cgalHasModels CGAL::Polyline_simplification_2::Squared_distance_cost +\cgalHasModelsBegin +\cgalModels{CGAL::Polyline_simplification_2::Hybrid_squared_distance_cost} +\cgalModels{CGAL::Polyline_simplification_2::Scaled_squared_distance_cost} +\cgalModels{CGAL::Polyline_simplification_2::Squared_distance_cost} \cgalHasModelsEnd */ diff --git a/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationStopPredicate.h b/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationStopPredicate.h index bb5b1d98948d..5d95499fd69c 100644 --- a/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationStopPredicate.h +++ b/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationStopPredicate.h @@ -5,9 +5,10 @@ Models of this concept are passed to the polyline simplification algorithm to indicate when to stop the process. -\cgalHasModelsBegin CGAL::Polyline_simplification_2::Stop_below_count_ratio_threshold -\cgalHasModels CGAL::Polyline_simplification_2::Stop_below_count_threshold -\cgalHasModels CGAL::Polyline_simplification_2::Stop_above_cost_threshold +\cgalHasModelsBegin +\cgalModels{CGAL::Polyline_simplification_2::Stop_below_count_ratio_threshold} +\cgalModels{CGAL::Polyline_simplification_2::Stop_below_count_threshold} +\cgalModels{CGAL::Polyline_simplification_2::Stop_above_cost_threshold} \cgalHasModelsEnd */ diff --git a/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationVertexBase_2.h b/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationVertexBase_2.h index 20aff75a93bd..e4d8d079a59d 100644 --- a/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationVertexBase_2.h +++ b/Polyline_simplification_2/doc/Polyline_simplification_2/Concepts/PolylineSimplificationVertexBase_2.h @@ -8,7 +8,8 @@ whether a vertex can be removed, and the cost of the removal. \cgalRefines{TriangulationVertexBase_2} -\cgalHasModelsBegin CGAL::Polyline_simplification_2::Vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Polyline_simplification_2::Vertex_base_2} \cgalHasModelsEnd \sa `TriangulationFaceBase_2` diff --git a/Polynomial/doc/Polynomial/Concepts/PolynomialTraits_d.h b/Polynomial/doc/Polynomial/Concepts/PolynomialTraits_d.h index 7ce0406f0644..c1c13ad96405 100644 --- a/Polynomial/doc/Polynomial/Concepts/PolynomialTraits_d.h +++ b/Polynomial/doc/Polynomial/Concepts/PolynomialTraits_d.h @@ -31,7 +31,8 @@ is possible to select a certain variable. \sa `Polynomial_d` -\cgalHasModelsBegin CGAL::Polynomial_traits_d +\cgalHasModelsBegin +\cgalModels{CGAL::Polynomial_traits_d} \cgalHasModelsEnd */ diff --git a/Polynomial/doc/Polynomial/Concepts/Polynomial_d.h b/Polynomial/doc/Polynomial/Concepts/Polynomial_d.h index 6a5a0c84a05f..2b41053230e8 100644 --- a/Polynomial/doc/Polynomial/Concepts/Polynomial_d.h +++ b/Polynomial/doc/Polynomial/Concepts/Polynomial_d.h @@ -32,7 +32,8 @@ coefficient is a `Field` the polynomial is model of `EuclideanRing`. \sa `AlgebraicStructureTraits` \sa `PolynomialTraits_d` -\cgalHasModelsBegin CGAL::Polynomial +\cgalHasModelsBegin +\cgalModels{CGAL::Polynomial} \cgalHasModelsEnd */ diff --git a/Polytope_distance_d/doc/Polytope_distance_d/Concepts/AllFurthestNeighborsTraits_2.h b/Polytope_distance_d/doc/Polytope_distance_d/Concepts/AllFurthestNeighborsTraits_2.h index 64c1383c051f..a0b89952bc07 100644 --- a/Polytope_distance_d/doc/Polytope_distance_d/Concepts/AllFurthestNeighborsTraits_2.h +++ b/Polytope_distance_d/doc/Polytope_distance_d/Concepts/AllFurthestNeighborsTraits_2.h @@ -7,10 +7,11 @@ The concept `AllFurthestNeighborsTraits_2` defines types and operations needed to compute all furthest neighbors for the vertices of a convex polygon using the function `all_furthest_neighbors_2()`. -\cgalHasModelsBegin CGAL::Cartesian -\cgalHasModels CGAL::Homogeneous -\cgalHasModels CGAL::Simple_cartesian -\cgalHasModels CGAL::Simple_homogeneous +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian} +\cgalModels{CGAL::Homogeneous} +\cgalModels{CGAL::Simple_cartesian} +\cgalModels{CGAL::Simple_homogeneous} \cgalHasModelsEnd \sa `CGAL::all_furthest_neighbors_2()` diff --git a/Polytope_distance_d/doc/Polytope_distance_d/Concepts/PolytopeDistanceDTraits.h b/Polytope_distance_d/doc/Polytope_distance_d/Concepts/PolytopeDistanceDTraits.h index 34286f63b4bc..1198e0d98698 100644 --- a/Polytope_distance_d/doc/Polytope_distance_d/Concepts/PolytopeDistanceDTraits.h +++ b/Polytope_distance_d/doc/Polytope_distance_d/Concepts/PolytopeDistanceDTraits.h @@ -6,9 +6,10 @@ This concept defines the requirements for traits classes of \f$ d\f$-dimensional optimisation algorithms. -\cgalHasModelsBegin CGAL::Polytope_distance_d_traits_2 -\cgalHasModels CGAL::Polytope_distance_d_traits_3 -\cgalHasModels CGAL::Polytope_distance_d_traits_d +\cgalHasModelsBegin +\cgalModels{CGAL::Polytope_distance_d_traits_2} +\cgalModels{CGAL::Polytope_distance_d_traits_3} +\cgalModels{CGAL::Polytope_distance_d_traits_d} \cgalHasModelsEnd \sa `CGAL::Polytope_distance_d` diff --git a/Polytope_distance_d/doc/Polytope_distance_d/Concepts/WidthTraits_3.h b/Polytope_distance_d/doc/Polytope_distance_d/Concepts/WidthTraits_3.h index 5794f4716580..7295ea2e2969 100644 --- a/Polytope_distance_d/doc/Polytope_distance_d/Concepts/WidthTraits_3.h +++ b/Polytope_distance_d/doc/Polytope_distance_d/Concepts/WidthTraits_3.h @@ -12,7 +12,8 @@ Whatever the coordinates of the points are, it is required for the width-algorithm to have access to the homogeneous representation of points. -\cgalHasModelsBegin CGAL::Width_default_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Width_default_traits_3} \cgalHasModelsEnd \sa `CGAL::Width_3` diff --git a/QP_solver/doc/QP_solver/Concepts/LinearProgram.h b/QP_solver/doc/QP_solver/Concepts/LinearProgram.h index 1882b05c73ee..206dbdb1a578 100644 --- a/QP_solver/doc/QP_solver/Concepts/LinearProgram.h +++ b/QP_solver/doc/QP_solver/Concepts/LinearProgram.h @@ -35,9 +35,10 @@ The description is given by appropriate random-access iterators over the program data, see below. The program therefore comes in dense representation which includes zero entries. -\cgalHasModelsBegin CGAL::Quadratic_program -\cgalHasModels CGAL::Quadratic_program_from_mps -\cgalHasModels CGAL::Linear_program_from_iterators +\cgalHasModelsBegin +\cgalModels{CGAL::Quadratic_program} +\cgalModels{CGAL::Quadratic_program_from_mps} +\cgalModels{CGAL::Linear_program_from_iterators} \cgalHasModelsEnd diff --git a/QP_solver/doc/QP_solver/Concepts/NonnegativeLinearProgram.h b/QP_solver/doc/QP_solver/Concepts/NonnegativeLinearProgram.h index 0e4c2928cec3..e9bbee8dadde 100644 --- a/QP_solver/doc/QP_solver/Concepts/NonnegativeLinearProgram.h +++ b/QP_solver/doc/QP_solver/Concepts/NonnegativeLinearProgram.h @@ -29,18 +29,20 @@ The description is given by appropriate random-access iterators over the program data, see below. The program therefore comes in dense representation which includes zero entries. -\cgalHasModelsBegin CGAL::Quadratic_program -\cgalHasModels CGAL::Quadratic_program_from_mps -\cgalHasModels CGAL::Nonnegative_linear_program_from_iterators +\cgalHasModelsBegin +\cgalModels{CGAL::Quadratic_program} +\cgalModels{CGAL::Quadratic_program_from_mps} +\cgalModels{CGAL::Nonnegative_linear_program_from_iterators} \cgalHasModelsEnd The value types of all iterator types (nested iterator types, respectively, for `A_iterator`) must be convertible to some common `IntegralDomain` `ET`. -\cgalHasModelsBegin CGAL::Quadratic_program -\cgalHasModels CGAL::Quadratic_program_from_mps -\cgalHasModels CGAL::Nonnegative_linear_program_from_iterators +\cgalHasModelsBegin +\cgalModels{CGAL::Quadratic_program} +\cgalModels{CGAL::Quadratic_program_from_mps} +\cgalModels{CGAL::Nonnegative_linear_program_from_iterators} \cgalHasModelsEnd \sa `QuadraticProgram` diff --git a/QP_solver/doc/QP_solver/Concepts/NonnegativeQuadraticProgram.h b/QP_solver/doc/QP_solver/Concepts/NonnegativeQuadraticProgram.h index f531f27550c4..508ac094f4ab 100644 --- a/QP_solver/doc/QP_solver/Concepts/NonnegativeQuadraticProgram.h +++ b/QP_solver/doc/QP_solver/Concepts/NonnegativeQuadraticProgram.h @@ -33,9 +33,10 @@ The description is given by appropriate random-access iterators over the program data, see below. The program therefore comes in dense representation which includes zero entries. -\cgalHasModelsBegin CGAL::Quadratic_program -\cgalHasModels CGAL::Quadratic_program_from_mps -\cgalHasModels CGAL::Nonnegative_quadratic_program_from_iterators +\cgalHasModelsBegin +\cgalModels{CGAL::Quadratic_program} +\cgalModels{CGAL::Quadratic_program_from_mps} +\cgalModels{CGAL::Nonnegative_quadratic_program_from_iterators} \cgalHasModelsEnd The value types of all iterator types (nested iterator diff --git a/QP_solver/doc/QP_solver/Concepts/QuadraticProgram.h b/QP_solver/doc/QP_solver/Concepts/QuadraticProgram.h index e25310153888..3b3ebe86f274 100644 --- a/QP_solver/doc/QP_solver/Concepts/QuadraticProgram.h +++ b/QP_solver/doc/QP_solver/Concepts/QuadraticProgram.h @@ -34,9 +34,10 @@ The description is given by appropriate random-access iterators over the program data, see below. The program therefore comes in dense representation which includes zero entries. -\cgalHasModelsBegin CGAL::Quadratic_program -\cgalHasModels CGAL::Quadratic_program_from_mps -\cgalHasModels CGAL::Quadratic_program_from_iterators +\cgalHasModelsBegin +\cgalModels{CGAL::Quadratic_program} +\cgalModels{CGAL::Quadratic_program_from_mps} +\cgalModels{CGAL::Quadratic_program_from_iterators} \cgalHasModelsEnd The value types of all iterator types (nested iterator diff --git a/SMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h b/SMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h index 1359f35074e4..e29abc65d3b3 100644 --- a/SMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h +++ b/SMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h @@ -48,7 +48,8 @@ of the input complex. \cgalRefines{MeshComplex_3InTriangulation_3} -\cgalHasModelsBegin CGAL::Mesh_complex_3_in_triangulation_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_complex_3_in_triangulation_3} \cgalHasModelsEnd \sa `MeshComplex_3InTriangulation_3` diff --git a/SMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h b/SMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h index fa640570e27e..2bd6bf5d8e85 100644 --- a/SMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h +++ b/SMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h @@ -42,7 +42,8 @@ the current approximation of each subdomain and each boundary surface patch. The data structure encodes the final mesh at the end of the meshing process. -\cgalHasModelsBegin CGAL::Mesh_complex_3_in_triangulation_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_complex_3_in_triangulation_3} \cgalHasModelsEnd \sa `MeshDomain_3` diff --git a/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshCellBase_3.h b/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshCellBase_3.h index 50ac974f9797..37c1aa8a1dfa 100644 --- a/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshCellBase_3.h +++ b/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshCellBase_3.h @@ -18,10 +18,11 @@ of the triangulation that are surface facets. \cgalRefines{TriangulationCellBase_3,CopyConstructible} -\cgalHasModelsBegin CGAL::Compact_mesh_cell_base_3 -\cgalHasModels CGAL::Mesh_cell_base_3 -\cgalHasModels CGAL::Simplicial_mesh_cell_base_3 -\cgalHasModels CGAL::Tetrahedral_remeshing::Remeshing_cell_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Compact_mesh_cell_base_3} +\cgalModels{CGAL::Mesh_cell_base_3} +\cgalModels{CGAL::Simplicial_mesh_cell_base_3} +\cgalModels{CGAL::Tetrahedral_remeshing::Remeshing_cell_base_3} \cgalHasModelsEnd */ diff --git a/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshVertexBase_3.h b/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshVertexBase_3.h index 938ce50e7e27..accc2c9b77a8 100644 --- a/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshVertexBase_3.h +++ b/SMDS_3/doc/SMDS_3/Concepts/SimplicialMeshVertexBase_3.h @@ -16,9 +16,10 @@ and to an index characteristic of this face. \cgalRefines{TriangulationVertexBase_3} -\cgalHasModelsBegin CGAL::Mesh_vertex_base_3 -\cgalHasModels CGAL::Simplicial_mesh_vertex_base_3 -\cgalHasModels CGAL::Tetrahedral_remeshing::Remeshing_vertex_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Mesh_vertex_base_3} +\cgalModels{CGAL::Simplicial_mesh_vertex_base_3} +\cgalModels{CGAL::Tetrahedral_remeshing::Remeshing_vertex_base_3} \cgalHasModelsEnd */ diff --git a/STL_Extension/doc/STL_Extension/Concepts/Descriptor.h b/STL_Extension/doc/STL_Extension/Concepts/Descriptor.h index 4c700b18520a..900c6874eb39 100644 --- a/STL_Extension/doc/STL_Extension/Concepts/Descriptor.h +++ b/STL_Extension/doc/STL_Extension/Concepts/Descriptor.h @@ -6,8 +6,9 @@ The concept `Descriptor` allows to describe a unique object in an abstract model \cgalRefines{DefaultConstructible,CopyConstructible,Assignable,EqualityComparable} -\cgalHasModelsBegin Index -\cgalHasModels Handle +\cgalHasModelsBegin +\cgalModels{Index} +\cgalModels{Handle} \cgalHasModelsEnd */ diff --git a/STL_Extension/doc/STL_Extension/Concepts/Hashable.h b/STL_Extension/doc/STL_Extension/Concepts/Hashable.h index ab5c0429a90e..7dffe7cd9176 100644 --- a/STL_Extension/doc/STL_Extension/Concepts/Hashable.h +++ b/STL_Extension/doc/STL_Extension/Concepts/Hashable.h @@ -6,8 +6,10 @@ A type `Key` is a model of the concept `Hashable` if the specializations `boost::hash` and `std::hash` exist. -\cgalHasModelsBare{All handles and indices of \cgal data structures, - All handles of OpenMesh\, by including the specializations of the `graph_traits` header files provided by \cgal. They can be disables by defining the macro `CGAL_DISABLE_HASH_OPENMESH`.} +\cgalHasModelsBegin +\cgalHasModelsBare{All handles and indices of \cgal data structures} +\cgalHasModelsBare{All handles of OpenMesh\, by including the specializations of the `graph_traits` header files provided by \cgal. They can be disables by defining the macro `CGAL_DISABLE_HASH_OPENMESH`.} +\cgalHasModelsEnd \sa `CGAL::Unique_hash_map` \sa `std::unordered_set` diff --git a/STL_Extension/doc/STL_Extension/Concepts/Index.h b/STL_Extension/doc/STL_Extension/Concepts/Index.h index c94791cd287b..4a3c749305d4 100644 --- a/STL_Extension/doc/STL_Extension/Concepts/Index.h +++ b/STL_Extension/doc/STL_Extension/Concepts/Index.h @@ -6,8 +6,9 @@ The concept `Index` is a refinement of `Descriptor` which must be convertible fr \cgalRefines{Descriptor} -\cgalHasModelsBegin int -\cgalHasModels size_t +\cgalHasModelsBegin +\cgalModels{int} +\cgalModels{size_t} \cgalHasModelsEnd \cgalHeading{Notation} diff --git a/STL_Extension/doc/STL_Extension/Concepts/ProjectionObject.h b/STL_Extension/doc/STL_Extension/Concepts/ProjectionObject.h index 00f421a6c679..55cd05e95da2 100644 --- a/STL_Extension/doc/STL_Extension/Concepts/ProjectionObject.h +++ b/STL_Extension/doc/STL_Extension/Concepts/ProjectionObject.h @@ -12,19 +12,20 @@ The concept `ProjectionObject` is modeled after the STL concept `UnaryFunction`, but takes also care of (const) references. -\cgalHasModelsBegin CGAL::Identity -\cgalHasModels CGAL::Dereference -\cgalHasModels CGAL::Get_address -\cgalHasModels CGAL::Cast_function_object -\cgalHasModels CGAL::Project_vertex -\cgalHasModels CGAL::Project_facet -\cgalHasModels CGAL::Project_point -\cgalHasModels CGAL::Project_normal -\cgalHasModels CGAL::Project_plane -\cgalHasModels CGAL::Project_next -\cgalHasModels CGAL::Project_prev -\cgalHasModels CGAL::Project_next_opposite -\cgalHasModels CGAL::Project_opposite_prev +\cgalHasModelsBegin +\cgalModels{CGAL::Identity} +\cgalModels{CGAL::Dereference} +\cgalModels{CGAL::Get_address} +\cgalModels{CGAL::Cast_function_object} +\cgalModels{CGAL::Project_vertex} +\cgalModels{CGAL::Project_facet} +\cgalModels{CGAL::Project_point} +\cgalModels{CGAL::Project_normal} +\cgalModels{CGAL::Project_plane} +\cgalModels{CGAL::Project_next} +\cgalModels{CGAL::Project_prev} +\cgalModels{CGAL::Project_next_opposite} +\cgalModels{CGAL::Project_opposite_prev} \cgalHasModelsEnd diff --git a/STL_Extension/doc/STL_Extension/Concepts/SurjectiveLockDataStructure.h b/STL_Extension/doc/STL_Extension/Concepts/SurjectiveLockDataStructure.h index 02e8a3211506..89f447da3b52 100644 --- a/STL_Extension/doc/STL_Extension/Concepts/SurjectiveLockDataStructure.h +++ b/STL_Extension/doc/STL_Extension/Concepts/SurjectiveLockDataStructure.h @@ -21,7 +21,8 @@ We call `S` the surjective function such that `S(object)` is the \"thing\" that is locked when one tries to lock `object`. In the previous example, `S(point)` is the voxel containing `point`. -\cgalHasModelsBegin CGAL::Spatial_lock_grid_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Spatial_lock_grid_3} \cgalHasModelsEnd */ diff --git a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceMesher.h b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceMesher.h index 35367ad681fd..64979029e178 100644 --- a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceMesher.h +++ b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceMesher.h @@ -11,8 +11,9 @@ namespace Scale_space_reconstruction_3 { * A mesher is a functor that can be applied to a range of * points and that returns a set of facets. * - * \cgalHasModelsBegin CGAL::Scale_space_reconstruction_3::Alpha_shape_mesher - * \cgalHasModels CGAL::Scale_space_reconstruction_3::Advancing_front_mesher + * \cgalHasModelsBegin + * \cgalModels{CGAL::Scale_space_reconstruction_3::Alpha_shape_mesher} + * \cgalModels{CGAL::Scale_space_reconstruction_3::Advancing_front_mesher} * \cgalHasModelsEnd * */ diff --git a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceSmoother.h b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceSmoother.h index 326cc4ff2df8..8eaa935ce3c9 100644 --- a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceSmoother.h +++ b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Concepts/ScaleSpaceSmoother.h @@ -15,8 +15,9 @@ namespace Scale_space_reconstruction_3 { * \note the functor can be applied several times by the scale space * reconstruction algorithm. * - * \cgalHasModelsBegin CGAL::Scale_space_reconstruction_3::Weighted_PCA_smoother - * \cgalHasModels CGAL::Scale_space_reconstruction_3::Jet_smoother + * \cgalHasModelsBegin + * \cgalModels{CGAL::Scale_space_reconstruction_3::Weighted_PCA_smoother} + * \cgalModels{CGAL::Scale_space_reconstruction_3::Jet_smoother} * \cgalHasModelsEnd */ class Smoother diff --git a/SearchStructures/doc/SearchStructures/Concepts/RangeSegmentTreeTraits_k.h b/SearchStructures/doc/SearchStructures/Concepts/RangeSegmentTreeTraits_k.h index f61385ec5896..75e97ae287bf 100644 --- a/SearchStructures/doc/SearchStructures/Concepts/RangeSegmentTreeTraits_k.h +++ b/SearchStructures/doc/SearchStructures/Concepts/RangeSegmentTreeTraits_k.h @@ -9,12 +9,13 @@ the keys and intervals, and provide comparison functions that are needed for window queries. -\cgalHasModelsBegin CGAL::Range_segment_tree_set_traits_2 -\cgalHasModels CGAL::Range_segment_tree_set_traits_3 -\cgalHasModels CGAL::Range_tree_map_traits_2 -\cgalHasModels CGAL::Range_tree_map_traits_3 -\cgalHasModels CGAL::Segment_tree_map_traits_2 -\cgalHasModels CGAL::Segment_tree_map_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Range_segment_tree_set_traits_2} +\cgalModels{CGAL::Range_segment_tree_set_traits_3} +\cgalModels{CGAL::Range_tree_map_traits_2} +\cgalModels{CGAL::Range_tree_map_traits_3} +\cgalModels{CGAL::Segment_tree_map_traits_2} +\cgalModels{CGAL::Segment_tree_map_traits_3} \cgalHasModelsEnd \cgalHeading{Example} diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphDataStructure_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphDataStructure_2.h index f5be21ae15ea..15c80be49e4b 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphDataStructure_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphDataStructure_2.h @@ -33,7 +33,8 @@ We only describe the additional requirements with respect to the \cgalRefines{ApolloniusGraphDataStructure_2} -\cgalHasModelsBegin CGAL::Triangulation_data_structure_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_data_structure_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphFaceBase_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphFaceBase_2.h index ee8181103a40..4ae9eec2503c 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphFaceBase_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphFaceBase_2.h @@ -9,7 +9,8 @@ requirements for the face base class of the \cgalRefines{TriangulationFaceBase_2} -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_face_base_2} \cgalHasModelsEnd \sa `SegmentDelaunayGraphDataStructure_2` diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphHierarchyVertexBase_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphHierarchyVertexBase_2.h index d53cbd55ccf5..d7a281a8d811 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphHierarchyVertexBase_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphHierarchyVertexBase_2.h @@ -26,7 +26,8 @@ The `SegmentDelaunayGraphHierarchyVertexBase_2` concept does not introduce any constructors in addition to those of the `SegmentDelaunayGraphVertexBase_2` concept. -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_hierarchy_vertex_base_2 > +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_hierarchy_vertex_base_2 >} \cgalHasModelsEnd \sa `SegmentDelaunayGraphDataStructure_2` diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphSite_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphSite_2.h index 99d6bf2ca9ee..65002722e6d7 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphSite_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphSite_2.h @@ -8,7 +8,8 @@ requirements for the sites of a segment Delaunay graph. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_site_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_site_2} \cgalHasModelsEnd \sa `SegmentDelaunayGraphTraits_2` diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h index d79098a554c1..fbe6887f2eb0 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h @@ -11,7 +11,8 @@ by storing handles to points instead of points. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_storage_site_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_storage_site_2} \cgalHasModelsEnd \sa `SegmentDelaunayGraphTraits_2` diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageTraits_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageTraits_2.h index e4866423c159..e733426405d3 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageTraits_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageTraits_2.h @@ -15,7 +15,8 @@ See section \ref Segment_Delaunay_graph_2StronglyIntersecting for more informati \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_storage_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_storage_traits_2} \cgalHasModelsEnd \sa `SegmentDelaunayGraphTraits_2` diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphTraits_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphTraits_2.h index 78e56ed2f6cf..7297c1db8316 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphTraits_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphTraits_2.h @@ -14,10 +14,11 @@ the concept `SegmentDelaunayGraphSite_2`. It also provides constructions for sites and several function object types for the predicates. -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_traits_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_traits_without_intersections_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_filtered_traits_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_filtered_traits_without_intersections_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_traits_2} +\cgalModels{CGAL::Segment_Delaunay_graph_traits_without_intersections_2} +\cgalModels{CGAL::Segment_Delaunay_graph_filtered_traits_2} +\cgalModels{CGAL::Segment_Delaunay_graph_filtered_traits_without_intersections_2} \cgalHasModelsEnd \sa `SegmentDelaunayGraphSite_2` diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphVertexBase_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphVertexBase_2.h index 48097737f247..32b0b36ab17d 100644 --- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphVertexBase_2.h +++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphVertexBase_2.h @@ -11,7 +11,8 @@ requirements for the vertex base class of the site of the segment Delaunay graph and provides access to one of its incident faces through a `Face_handle`. -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_vertex_base_2} \cgalHasModelsEnd \sa `SegmentDelaunayGraphTraits_2` diff --git a/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/Concepts/SegmentDelaunayGraphLinfTraits_2.h b/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/Concepts/SegmentDelaunayGraphLinfTraits_2.h index 4a8ec7f78fc8..a384691661af 100644 --- a/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/Concepts/SegmentDelaunayGraphLinfTraits_2.h +++ b/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/Concepts/SegmentDelaunayGraphLinfTraits_2.h @@ -36,10 +36,11 @@ with respect to the \cgalRefines{SegmentDelaunayGraphTraits_2} -\cgalHasModelsBegin CGAL::Segment_Delaunay_graph_Linf_traits_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_Linf_traits_without_intersections_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_Linf_filtered_traits_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_Linf_filtered_traits_without_intersections_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Segment_Delaunay_graph_Linf_traits_2} +\cgalModels{CGAL::Segment_Delaunay_graph_Linf_traits_without_intersections_2} +\cgalModels{CGAL::Segment_Delaunay_graph_Linf_filtered_traits_2} +\cgalModels{CGAL::Segment_Delaunay_graph_Linf_filtered_traits_without_intersections_2} \cgalHasModelsEnd \sa `SegmentDelaunayGraphSite_2` diff --git a/Set_movable_separability_2/doc/Set_movable_separability_2/Concepts/CastingTraits_2.h b/Set_movable_separability_2/doc/Set_movable_separability_2/Concepts/CastingTraits_2.h index cb1e7eed119a..1322002cd6d3 100644 --- a/Set_movable_separability_2/doc/Set_movable_separability_2/Concepts/CastingTraits_2.h +++ b/Set_movable_separability_2/doc/Set_movable_separability_2/Concepts/CastingTraits_2.h @@ -7,7 +7,9 @@ \cgalRefines{DefaultConstructible,PolygonTraits_2} + \cgalHasModelsBegin \cgalHasModelsBare{Any CGAL kernel, e.g., CGAL::Exact_predicates_exact_constructions_kernel.} + \cgalHasModelsEnd */ diff --git a/Shape_detection/doc/Shape_detection/Concepts/EfficientRANSACTraits.h b/Shape_detection/doc/Shape_detection/Concepts/EfficientRANSACTraits.h index e581f066cb63..9005865d80e9 100644 --- a/Shape_detection/doc/Shape_detection/Concepts/EfficientRANSACTraits.h +++ b/Shape_detection/doc/Shape_detection/Concepts/EfficientRANSACTraits.h @@ -12,7 +12,8 @@ input data has to be provided in form of a random access iterator. Point and normal property maps have to be provided to extract the points and the normals from the input. -\cgalHasModelsBegin CGAL::Shape_detection::Efficient_RANSAC_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Shape_detection::Efficient_RANSAC_traits} \cgalHasModelsEnd */ class EfficientRANSACTraits{ diff --git a/Shape_detection/doc/Shape_detection/Concepts/NeighborQuery.h b/Shape_detection/doc/Shape_detection/Concepts/NeighborQuery.h index 88df769ec099..76926590b35f 100644 --- a/Shape_detection/doc/Shape_detection/Concepts/NeighborQuery.h +++ b/Shape_detection/doc/Shape_detection/Concepts/NeighborQuery.h @@ -5,10 +5,11 @@ A concept that describes the set of methods used by the `CGAL::Shape_detection::Region_growing` to access neighbors of an item. -\cgalHasModelsBegin CGAL::Shape_detection::Point_set::K_neighbor_query -\cgalHasModels CGAL::Shape_detection::Point_set::Sphere_neighbor_query -\cgalHasModels CGAL::Shape_detection::Polygon_mesh::Polyline_graph -\cgalHasModels CGAL::Shape_detection::Polygon_mesh::One_ring_neighbor_query +\cgalHasModelsBegin +\cgalModels{CGAL::Shape_detection::Point_set::K_neighbor_query} +\cgalModels{CGAL::Shape_detection::Point_set::Sphere_neighbor_query} +\cgalModels{CGAL::Shape_detection::Polygon_mesh::Polyline_graph} +\cgalModels{CGAL::Shape_detection::Polygon_mesh::One_ring_neighbor_query} \cgalHasModelsEnd */ class NeighborQuery { diff --git a/Shape_detection/doc/Shape_detection/Concepts/RegionType.h b/Shape_detection/doc/Shape_detection/Concepts/RegionType.h index af3212c67593..09b97911b5db 100644 --- a/Shape_detection/doc/Shape_detection/Concepts/RegionType.h +++ b/Shape_detection/doc/Shape_detection/Concepts/RegionType.h @@ -7,13 +7,14 @@ to maintain a region. A region is represented by a set items, which are included in this region. -\cgalHasModelsBegin CGAL::Shape_detection::Point_set::Least_squares_line_fit_region -\cgalHasModels CGAL::Shape_detection::Point_set::Least_squares_circle_fit_region -\cgalHasModels CGAL::Shape_detection::Point_set::Least_squares_plane_fit_region -\cgalHasModels CGAL::Shape_detection::Point_set::Least_squares_sphere_fit_region -\cgalHasModels CGAL::Shape_detection::Point_set::Least_squares_cylinder_fit_region -\cgalHasModels CGAL::Shape_detection::Segment_set::Least_squares_line_fit_region -\cgalHasModels CGAL::Shape_detection::Polygon_mesh::Least_squares_plane_fit_region +\cgalHasModelsBegin +\cgalModels{CGAL::Shape_detection::Point_set::Least_squares_line_fit_region} +\cgalModels{CGAL::Shape_detection::Point_set::Least_squares_circle_fit_region} +\cgalModels{CGAL::Shape_detection::Point_set::Least_squares_plane_fit_region} +\cgalModels{CGAL::Shape_detection::Point_set::Least_squares_sphere_fit_region} +\cgalModels{CGAL::Shape_detection::Point_set::Least_squares_cylinder_fit_region} +\cgalModels{CGAL::Shape_detection::Segment_set::Least_squares_line_fit_region} +\cgalModels{CGAL::Shape_detection::Polygon_mesh::Least_squares_plane_fit_region} \cgalHasModelsEnd */ class RegionType { diff --git a/Shape_regularization/doc/Shape_regularization/Concepts/ContourDirections.h b/Shape_regularization/doc/Shape_regularization/Concepts/ContourDirections.h index 9ed67563fdcc..cf96c3abe8e1 100644 --- a/Shape_regularization/doc/Shape_regularization/Concepts/ContourDirections.h +++ b/Shape_regularization/doc/Shape_regularization/Concepts/ContourDirections.h @@ -10,9 +10,10 @@ a model of this concept, the user sets such directions and provides a way to ori contour edges towards these directions. All contour regularization functions in this package are parameterized by this concept. -\cgalHasModelsBegin Contours::Longest_direction_2 -\cgalHasModels Contours::Multiple_directions_2 -\cgalHasModels Contours::User_defined_directions_2 +\cgalHasModelsBegin +\cgalModels{Contours::Longest_direction_2} +\cgalModels{Contours::Multiple_directions_2} +\cgalModels{Contours::User_defined_directions_2} \cgalHasModelsEnd */ class ContourDirections { diff --git a/Shape_regularization/doc/Shape_regularization/Concepts/NeighborQuery.h b/Shape_regularization/doc/Shape_regularization/Concepts/NeighborQuery.h index 20dbf1801e12..f2cd1486593c 100644 --- a/Shape_regularization/doc/Shape_regularization/Concepts/NeighborQuery.h +++ b/Shape_regularization/doc/Shape_regularization/Concepts/NeighborQuery.h @@ -9,7 +9,8 @@ A concept that describes the set of methods used by the class `QP_regularization` to access neighbors of a geometric object being regularized. -\cgalHasModelsBegin Segments::Delaunay_neighbor_query_2 +\cgalHasModelsBegin +\cgalModels{Segments::Delaunay_neighbor_query_2} \cgalHasModelsEnd */ class NeighborQuery { diff --git a/Shape_regularization/doc/Shape_regularization/Concepts/RegularizationType.h b/Shape_regularization/doc/Shape_regularization/Concepts/RegularizationType.h index ab3bbb08b7b6..ed3a10b5e285 100644 --- a/Shape_regularization/doc/Shape_regularization/Concepts/RegularizationType.h +++ b/Shape_regularization/doc/Shape_regularization/Concepts/RegularizationType.h @@ -9,8 +9,9 @@ A concept that describes the set of methods used by the class `QP_regularization` to access various data required for setting up the the global regularization problem. -\cgalHasModelsBegin Segments::Angle_regularization_2 -\cgalHasModels Segments::Offset_regularization_2 +\cgalHasModelsBegin +\cgalModels{Segments::Angle_regularization_2} +\cgalModels{Segments::Offset_regularization_2} \cgalHasModelsEnd */ class RegularizationType { diff --git a/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurfaceTraits_3.h b/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurfaceTraits_3.h index 180cbeeb64d2..363d63a67750 100644 --- a/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurfaceTraits_3.h +++ b/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurfaceTraits_3.h @@ -10,7 +10,8 @@ polyhedral mesh approximating a skin surface \cgalRefines{RegularTriangulationTraits_3} -\cgalHasModelsBegin CGAL::Skin_surface_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Skin_surface_traits_3} \cgalHasModelsEnd \sa `CGAL::Skin_surface_3` diff --git a/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurface_3.h b/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurface_3.h index 237a5d3049d6..22146acf83a4 100644 --- a/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurface_3.h +++ b/Skin_surface_3/doc/Skin_surface_3/Concepts/SkinSurface_3.h @@ -9,8 +9,9 @@ The concept requires a constructor from an iterator range of weighted points and a shrink factor. By default the input balls are grown in such that the skin surface wraps around the input balls. -\cgalHasModelsBegin CGAL::Skin_surface_3 -\cgalHasModels CGAL::Union_of_balls_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Skin_surface_3} +\cgalModels{CGAL::Union_of_balls_3} \cgalHasModelsEnd */ diff --git a/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h b/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h index 163d17faa16a..49dd95d05338 100644 --- a/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h +++ b/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h @@ -11,7 +11,8 @@ some function object types for the required predicates on those primitives. \cgalRefines{ArrangementTraits_2} -\cgalHasModelsBegin CGAL::Snap_rounding_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Snap_rounding_traits_2} \cgalHasModelsEnd */ @@ -172,7 +173,9 @@ namespace SRTraits_2{ \cgalConcept Represents an iso rectangle \cgalRefines{DefaultConstructible,CopyConstructible,Assignable} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Iso_rectangle_2 `Snap_rounding_traits_2::Iso_rectangle_2` \endlink} + \cgalHasModelsEnd */ class IsoRectangle_2 {}; @@ -181,7 +184,9 @@ class IsoRectangle_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableBinaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Construct_vertex_2 `Snap_rounding_traits_2::Construct_vertex_2` \endlink} + \cgalHasModelsEnd */ class ConstructVertex_2 { @@ -198,7 +203,9 @@ class ConstructVertex_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableBinaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Construct_segment_2 `Snap_rounding_traits_2::Construct_segment_2` \endlink} + \cgalHasModelsEnd */ class ConstructSegment_2 { @@ -215,7 +222,9 @@ class ConstructSegment_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableQuaternaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Construct_iso_rectangle_2 `Snap_rounding_traits_2::Construct_iso_rectangle_2` \endlink} + \cgalHasModelsEnd */ class ConstructIsoRectangle_2 { @@ -236,7 +245,9 @@ class ConstructIsoRectangle_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableBinaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Compare_x_2 `Snap_rounding_traits_2::Compare_x_2` \endlink} + \cgalHasModelsEnd */ class CompareX_2 { @@ -252,7 +263,9 @@ class CompareX_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableBinaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Compare_y_2 `Snap_rounding_traits_2::Compare_y_2` \endlink} + \cgalHasModelsEnd */ class CompareY_2 { @@ -269,7 +282,9 @@ class CompareY_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableQuaternaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Snap_2 `Snap_rounding_traits_2::Snap_2` \endlink} + \cgalHasModelsEnd */ class Snap_2 { @@ -288,7 +303,9 @@ class Snap_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableBinaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Integer_grid_point_2 `Snap_rounding_traits_2::Integer_grid_point_2` \endlink} + \cgalHasModelsEnd */ class IntegerGridPoint_2 @@ -309,7 +326,9 @@ class IntegerGridPoint_2 \ingroup PkgSnapRounding2Concepts \cgalConcept \cgalRefines{AdaptableTernaryFunction} + \cgalHasModelsBegin \cgalHasModelsBare{\link SnapRoundingTraits_2::Minkowski_sum_with_pixel_2 `Snap_rounding_traits_2::Minkowski_sum_with_pixel_2` \endlink} + \cgalHasModelsEnd */ class MinkowskiSumWithPixel_2 { diff --git a/Solver_interface/doc/Solver_interface/Concepts/DiagonalizeTraits.h b/Solver_interface/doc/Solver_interface/Concepts/DiagonalizeTraits.h index 41594f6cbfeb..7791fbf59a9a 100644 --- a/Solver_interface/doc/Solver_interface/Concepts/DiagonalizeTraits.h +++ b/Solver_interface/doc/Solver_interface/Concepts/DiagonalizeTraits.h @@ -19,7 +19,8 @@ For example, a matrix of dimension 3 is defined as \tparam FT Number type \tparam dim Dimension of the matrices and vectors -\cgalHasModelsBegin CGAL::Eigen_diagonalize_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_diagonalize_traits} \cgalHasModelsEnd */ template diff --git a/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h b/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h index 015153dd3240..f73b3d143963 100644 --- a/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h +++ b/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h @@ -7,7 +7,8 @@ class MixedIntegerProgramTraits `MixedIntegerProgramVariable` is a concept of a variable in a Mixed Integer Programming (MIP) problem. -\cgalHasModelsBegin CGAL::Variable +\cgalHasModelsBegin +\cgalModels{CGAL::Variable} \cgalHasModelsEnd */ template @@ -113,7 +114,8 @@ class MixedIntegerProgramVariable `MixedIntegerProgramLinearConstraint` is a concept of a linear constraint in a Mixed Integer Programming (MIP) problem. -\cgalHasModelsBegin CGAL::Linear_constraint +\cgalHasModelsBegin +\cgalModels{CGAL::Linear_constraint} \cgalHasModelsEnd */ template @@ -211,7 +213,8 @@ class MixedIntegerProgramLinearConstraint `MixedIntegerProgramLinearObjective` is a concept of the linear objective function in a Mixed Integer Programming (MIP) problem. -\cgalHasModelsBegin CGAL::Linear_objective +\cgalHasModelsBegin +\cgalModels{CGAL::Linear_objective} \cgalHasModelsEnd */ template @@ -280,9 +283,10 @@ Mixed Integer Programming (MIP) problems. A model of this concept stores the int variables, linear objective, and linear constraints (if any) and provides a method to solve the problem. -\cgalHasModelsBegin CGAL::Mixed_integer_program_traits -\cgalHasModels CGAL::GLPK_mixed_integer_program_traits -\cgalHasModels CGAL::SCIP_mixed_integer_program_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Mixed_integer_program_traits} +\cgalModels{CGAL::GLPK_mixed_integer_program_traits} +\cgalModels{CGAL::SCIP_mixed_integer_program_traits} \cgalHasModelsEnd */ template diff --git a/Solver_interface/doc/Solver_interface/Concepts/NormalEquationSparseLinearAlgebraTraits_d.h b/Solver_interface/doc/Solver_interface/Concepts/NormalEquationSparseLinearAlgebraTraits_d.h index 07781ed7265a..49fb8ee1937e 100644 --- a/Solver_interface/doc/Solver_interface/Concepts/NormalEquationSparseLinearAlgebraTraits_d.h +++ b/Solver_interface/doc/Solver_interface/Concepts/NormalEquationSparseLinearAlgebraTraits_d.h @@ -7,7 +7,8 @@ Concept describing the set of requirements for solving the normal equation \f$ A \sa `SparseLinearAlgebraTraits_d` -\cgalHasModelsBegin CGAL::Eigen_solver_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_solver_traits} \cgalHasModelsEnd */ class NormalEquationSparseLinearAlgebraTraits_d diff --git a/Solver_interface/doc/Solver_interface/Concepts/QuadraticProgramTraits.h b/Solver_interface/doc/Solver_interface/Concepts/QuadraticProgramTraits.h index f929f231c7b5..7ed6bf55f2b3 100644 --- a/Solver_interface/doc/Solver_interface/Concepts/QuadraticProgramTraits.h +++ b/Solver_interface/doc/Solver_interface/Concepts/QuadraticProgramTraits.h @@ -24,7 +24,8 @@ where \f$ l_i \in \mathbb{R} \cup \{-\infty\} \f$ for all \f$ i \f$, where \f$ u_i \in \mathbb{R} \cup \{+\infty\} \f$ for all \f$ i \f$. -\cgalHasModelsBegin CGAL::OSQP_quadratic_program_traits +\cgalHasModelsBegin +\cgalModels{CGAL::OSQP_quadratic_program_traits} \cgalHasModelsEnd */ class QuadraticProgramTraits { diff --git a/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraits_d.h b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraits_d.h index 7c04f914bd48..9d236d47d3df 100644 --- a/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraits_d.h +++ b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraits_d.h @@ -4,7 +4,8 @@ The concept `SparseLinearAlgebraTraits_d` is used to solve sparse linear systems A\f$ \times \f$ X = B. -\cgalHasModelsBegin CGAL::Eigen_solver_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_solver_traits} \cgalHasModelsEnd */ class SparseLinearAlgebraTraits_d @@ -63,7 +64,8 @@ by a sparse matrix. \cgalRefines{DefaultConstructible} -\cgalHasModelsBegin CGAL::Eigen_vector +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_vector} \cgalHasModelsEnd \sa `SparseLinearAlgebraTraits_d` @@ -131,8 +133,9 @@ NT& operator[](Index row); \cgalRefines{Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Eigen_sparse_matrix -\cgalHasModels CGAL::Eigen_sparse_symmetric_matrix +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_sparse_matrix} +\cgalModels{CGAL::Eigen_sparse_symmetric_matrix} \cgalHasModelsEnd \sa `SparseLinearAlgebraTraits_d` diff --git a/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraWithFactorTraits_d.h b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraWithFactorTraits_d.h index 34df486f1e63..c8792ccab3a6 100644 --- a/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraWithFactorTraits_d.h +++ b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraWithFactorTraits_d.h @@ -8,7 +8,8 @@ method to solve the system for different right-hand vectors. \cgalRefines{SparseLinearAlgebraTraits_d} -\cgalHasModelsBegin CGAL::Eigen_solver_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_solver_traits} \cgalHasModelsEnd */ class SparseLinearAlgebraWithFactorTraits_d { diff --git a/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h b/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h old mode 100644 new mode 100755 index 2c843090296b..cd0ec9832ee6 --- a/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h +++ b/Solver_interface/doc/Solver_interface/Concepts/SvdTraits.h @@ -5,7 +5,8 @@ The concept `SvdTraits` describes the linear algebra types and algorithms needed to solve in the least square sense a linear system with a singular value decomposition -\cgalHasModelsBegin galHasModel `CGAL::Eigen_svd +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_svd} \cgalHasModelsEnd */ class SvdTraits @@ -52,7 +53,8 @@ class SvdTraits \cgalConcept Concept of vector type used by the concept `SvdTraits`. -\cgalHasModelsBegin CGAL::Eigen_vector +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_vector} \cgalHasModelsEnd */ class SvdTraits::Vector @@ -90,7 +92,8 @@ Concept of matrix type used by the concept `SvdTraits`. \cgalRefines{DefaultConstructible,Assignable} -\cgalHasModelsBegin CGAL::Eigen_matrix +\cgalHasModelsBegin +\cgalModels{CGAL::Eigen_matrix} \cgalHasModelsEnd */ class SvdTraits::Matrix diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/FuzzyQueryItem.h b/Spatial_searching/doc/Spatial_searching/Concepts/FuzzyQueryItem.h old mode 100644 new mode 100755 index 4e0837b36be0..7289e042338b --- a/Spatial_searching/doc/Spatial_searching/Concepts/FuzzyQueryItem.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/FuzzyQueryItem.h @@ -4,8 +4,9 @@ The concept `FuzzyQueryItem` describes the requirements for fuzzy `d`-dimensional spatial objects. -\cgalHasModelsBegin CGAL::Fuzzy_sphere -\cgalHasModel `CGAL::Fuzzy_iso_box` +\cgalHasModelsBegin +\cgalHasModels{CGAL::Fuzzy_sphere} +\cgalHasModels{CGAL::Fuzzy_iso_box} \cgalHasModelsEnd */ diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/GeneralDistance.h b/Spatial_searching/doc/Spatial_searching/Concepts/GeneralDistance.h index 7a8506131f61..6bf09d1211ae 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/GeneralDistance.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/GeneralDistance.h @@ -8,8 +8,9 @@ To optimize distance computations transformed distances are used, e.g., for a Euclidean distance the transformed distance is the squared Euclidean distance. -\cgalHasModelsBegin CGAL::Manhattan_distance_iso_box_point -\cgalHasModels CGAL::Euclidean_distance_sphere_point +\cgalHasModelsBegin +\cgalModels{CGAL::Manhattan_distance_iso_box_point} +\cgalModels{CGAL::Euclidean_distance_sphere_point} \cgalHasModelsEnd */ diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/OrthogonalDistance.h b/Spatial_searching/doc/Spatial_searching/Concepts/OrthogonalDistance.h index b2f826e4074a..a12b6e2a2447 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/OrthogonalDistance.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/OrthogonalDistance.h @@ -8,8 +8,9 @@ E.g., for an Euclidean distance the transformed distance is the squared Euclidea \cgalRefines{GeneralDistance} -\cgalHasModelsBegin CGAL::Euclidean_distance -\cgalHasModels CGAL::Weighted_Minkowski_distance +\cgalHasModelsBegin +\cgalModels{CGAL::Euclidean_distance} +\cgalModels{CGAL::Weighted_Minkowski_distance} \cgalHasModelsEnd */ diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/RangeSearchTraits.h b/Spatial_searching/doc/Spatial_searching/Concepts/RangeSearchTraits.h index feb9af6f79ed..22a34f8c6de4 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/RangeSearchTraits.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/RangeSearchTraits.h @@ -8,12 +8,13 @@ range search queries in a model of `SpatialTree`. \cgalRefines{SearchTraits} -\cgalHasModelsBegin CGAL::Cartesian_d -\cgalHasModels CGAL::Homogeneous_d -\cgalHasModels CGAL::Epick_d -\cgalHasModels CGAL::Epeck_d -\cgalHasModels CGAL::Search_traits_2 -\cgalHasModels CGAL::Search_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian_d} +\cgalModels{CGAL::Homogeneous_d} +\cgalModels{CGAL::Epick_d} +\cgalModels{CGAL::Epeck_d} +\cgalModels{CGAL::Search_traits_2} +\cgalModels{CGAL::Search_traits_3} \cgalHasModelsEnd \sa `SearchTraits` diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_2.h b/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_2.h index 96857238a64a..f55a7971ea50 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_2.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_2.h @@ -5,7 +5,9 @@ The concept `SearchGeomTraits_2` defines the requirements for the template parameter of the search traits classes. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd */ class SearchGeomTraits_2 { diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_3.h b/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_3.h index 85191a1b0962..5b5e5916dc92 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_3.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/SearchGeomTraits_3.h @@ -5,7 +5,9 @@ The concept `SearchGeomTraits_3` defines the requirements for the template parameter of the search traits classes. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd */ diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h b/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h index 6bfe70109e01..358c828ff6f8 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h @@ -5,14 +5,15 @@ The concept `SearchTraits` defines the requirements for the template parameter of the search classes. -\cgalHasModelsBegin CGAL::Cartesian_d -\cgalHasModels CGAL::Homogeneous_d -\cgalHasModels CGAL::Epick_d -\cgalHasModels CGAL::Epeck_d -\cgalHasModels CGAL::Search_traits_2 -\cgalHasModels CGAL::Search_traits_3 -\cgalHasModels CGAL::Search_traits_d -\cgalHasModels CGAL::Search_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Cartesian_d} +\cgalModels{CGAL::Homogeneous_d} +\cgalModels{CGAL::Epick_d} +\cgalModels{CGAL::Epeck_d} +\cgalModels{CGAL::Search_traits_2} +\cgalModels{CGAL::Search_traits_3} +\cgalModels{CGAL::Search_traits_d} +\cgalModels{CGAL::Search_traits} \cgalHasModelsEnd \sa `RangeSearchTraits` diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/SpatialSeparator.h b/Spatial_searching/doc/Spatial_searching/Concepts/SpatialSeparator.h index ecdc521ce9fe..357dbbfff468 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/SpatialSeparator.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/SpatialSeparator.h @@ -11,7 +11,8 @@ space is said to be on the negative side of the separator and the other part of space is said to be on the positive side of the separator. -\cgalHasModelsBegin CGAL::Plane_separator +\cgalHasModelsBegin +\cgalModels{CGAL::Plane_separator} \cgalHasModelsEnd */ diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/SpatialTree.h b/Spatial_searching/doc/Spatial_searching/Concepts/SpatialTree.h index 58d396cec22c..aa483a297805 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/SpatialTree.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/SpatialTree.h @@ -5,7 +5,8 @@ The concept `SpatialTree` defines the requirements for a tree supporting both neighbor searching and approximate range searching. -\cgalHasModelsBegin CGAL::Kd_tree +\cgalHasModelsBegin +\cgalModels{CGAL::Kd_tree} \cgalHasModelsEnd */ diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/Splitter.h b/Spatial_searching/doc/Spatial_searching/Concepts/Splitter.h index 88a18887640d..6621186a2f7e 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/Splitter.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/Splitter.h @@ -7,13 +7,14 @@ The concept `Splitter` defines the requirements for a function object class implementing a splitting rule. \cgalAdvancedEnd -\cgalHasModelsBegin CGAL::Fair -\cgalHasModels CGAL::Median_of_rectangle -\cgalHasModels CGAL::Median_of_max_spread -\cgalHasModels CGAL::Midpoint_of_rectangle -\cgalHasModels CGAL::Midpoint_of_max_spread -\cgalHasModels CGAL::Sliding_fair -\cgalHasModels CGAL::Sliding_midpoint +\cgalHasModelsBegin +\cgalModels{CGAL::Fair} +\cgalModels{CGAL::Median_of_rectangle} +\cgalModels{CGAL::Median_of_max_spread} +\cgalModels{CGAL::Midpoint_of_rectangle} +\cgalModels{CGAL::Midpoint_of_max_spread} +\cgalModels{CGAL::Sliding_fair} +\cgalModels{CGAL::Sliding_midpoint} \cgalHasModelsEnd */ diff --git a/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_2.h b/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_2.h index 8a48e705bd00..f577778a10d4 100644 --- a/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_2.h +++ b/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_2.h @@ -9,7 +9,9 @@ primitives (objects and predicates) that the sorting algorithms use. `SpatialSortingTraits_2` defines the complete set of primitives required in these functions and functors. -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} CGAL::Spatial_sort_traits_adapter_2 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{CGAL::Spatial_sort_traits_adapter_2} \cgalHasModelsEnd */ diff --git a/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_3.h b/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_3.h index 2cef4c17269a..f0274680a2dd 100644 --- a/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_3.h +++ b/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_3.h @@ -9,7 +9,9 @@ primitives (objects and predicates) that the sorting algorithms use. `SpatialSortingTraits_3` defines the complete set of primitives required in these functions and functors. -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} CGAL::Spatial_sort_traits_adapter_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{CGAL::Spatial_sort_traits_adapter_3} \cgalHasModelsEnd */ diff --git a/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_d.h b/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_d.h index a0c4dfd031d4..8e4ca68c7990 100644 --- a/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_d.h +++ b/Spatial_sorting/doc/Spatial_sorting/Concepts/SpatialSortingTraits_d.h @@ -9,7 +9,9 @@ primitives (objects and predicates) that the sorting algorithms use. `SpatialSortingTraits_d` defines the complete set of primitives required in these functions and functors. -\cgalHasModelsBareBegin{Any \cgal `d`-dimensional kernel.} CGAL::Spatial_sort_traits_adapter_d +\cgalHasModelsBegin +\cgalHasModelsBare{Any \cgal `d`-dimensional kernel.} +\cgalHasModels{CGAL::Spatial_sort_traits_adapter_d} \cgalHasModelsEnd */ diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/PolygonOffsetBuilderTraits_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/PolygonOffsetBuilderTraits_2.h index 15aa1efc7dab..f5f7270e043a 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/PolygonOffsetBuilderTraits_2.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/PolygonOffsetBuilderTraits_2.h @@ -7,7 +7,8 @@ The concept `PolygonOffsetBuilderTraits_2` describes the requirements for the geometric traits class required by the algorithm class `CGAL::Polygon_offset_builder_2`. -\cgalHasModelsBegin CGAL::Polygon_offset_builder_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Polygon_offset_builder_traits_2} \cgalHasModelsEnd \sa `CGAL::Polygon_offset_builder_2` diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilderTraits_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilderTraits_2.h index a19486171c43..5df86d3e2a6b 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilderTraits_2.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilderTraits_2.h @@ -7,7 +7,8 @@ The concept `StraightSkeletonBuilderTraits_2` describes the requirements for the geometric traits class required by the algorithm class `CGAL::Straight_skeleton_builder_2`. -\cgalHasModelsBegin CGAL::Straight_skeleton_builder_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Straight_skeleton_builder_traits_2} \cgalHasModelsEnd */ class StraightSkeletonBuilderTraits_2 { diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilder_2_Visitor.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilder_2_Visitor.h index 316fbc4b0e04..7937ab435359 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilder_2_Visitor.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonBuilder_2_Visitor.h @@ -5,7 +5,8 @@ The concept `StraightSkeletonBuilder_2_Visitor` describes the requirements of the visitor class required by the algorithm class `CGAL::Straight_skeleton_builder_2` in its third template parameter. -\cgalHasModelsBegin CGAL::Dummy_straight_skeleton_builder_2_visitor +\cgalHasModelsBegin +\cgalModels{CGAL::Dummy_straight_skeleton_builder_2_visitor} \cgalHasModelsEnd \sa `CGAL::Straight_skeleton_builder_2` diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonFace_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonFace_2.h index 16bf5a396b50..af125ad42f5e 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonFace_2.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonFace_2.h @@ -8,7 +8,8 @@ The concept `StraightSkeletonFace_2` describes the requirements for the face typ `StraightSkeleton_2` concept. It is a refinement of the `HalfedgeDSFace` concept with support for storage of the incident halfedge. -\cgalHasModelsBegin CGAL::Straight_skeleton_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Straight_skeleton_face_base_2} \cgalHasModelsEnd \sa `StraightSkeletonVertex_2` diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonHalfedge_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonHalfedge_2.h index 22caa9419c04..67f6dafc5c44 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonHalfedge_2.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonHalfedge_2.h @@ -12,7 +12,8 @@ The only geometric embedding used by the Straight Skeleton Data Structure are th in the contour and skeleton vertices. However, for any halfedge, there is a 2D segment implicitly given by its `source` and `target` vertices. -\cgalHasModelsBegin CGAL::Straight_skeleton_halfedge_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Straight_skeleton_halfedge_base_2} \cgalHasModelsEnd \sa `StraightSkeleton_2` diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonItemsConverter_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonItemsConverter_2.h index a95688dc6e78..0bf7cab0c87f 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonItemsConverter_2.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonItemsConverter_2.h @@ -6,7 +6,8 @@ The concept `StraightSkeletonItemsConverter_2` describes the requirements for it as the third template argument to the class `Straight_skeleton_converter_2`. It converts the `HDS` items from one type of straight skeleton to another. -\cgalHasModelsBegin CGAL::Straight_skeleton_items_converter_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Straight_skeleton_items_converter_2} \cgalHasModelsEnd \sa `CGAL::Straight_skeleton_converter_2` diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonVertex_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonVertex_2.h index a53a002940ef..29f50118cb4c 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonVertex_2.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeletonVertex_2.h @@ -9,7 +9,8 @@ The concept `StraightSkeletonVertex_2` describes the requirements for the vertex with support for storage of the incident halfedge. The `StraightSkeletonVertex_2` concept requires the geometric embedding to be a 2D point. -\cgalHasModelsBegin CGAL::Straight_skeleton_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Straight_skeleton_vertex_base_2} \cgalHasModelsEnd \sa `StraightSkeletonHalfedge_2` diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeleton_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeleton_2.h index 52dcfe61484e..9df0937e9ff4 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeleton_2.h +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Concepts/StraightSkeleton_2.h @@ -9,7 +9,8 @@ used to represent a straight skeleton. It refines the concept `HalfedgeDS` and adds additional requirements on the nested types `Vertex`, `Halfedge`, and `Face` of the halfedge data structure. -\cgalHasModelsBegin CGAL::Straight_skeleton_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Straight_skeleton_2} \cgalHasModelsEnd \attention This concept explicitly protects all the modifying diff --git a/Stream_lines_2/doc/Stream_lines_2/Concepts/Integrator_2.h b/Stream_lines_2/doc/Stream_lines_2/Concepts/Integrator_2.h index 6f001fda04ee..9e23002f51d9 100644 --- a/Stream_lines_2/doc/Stream_lines_2/Concepts/Integrator_2.h +++ b/Stream_lines_2/doc/Stream_lines_2/Concepts/Integrator_2.h @@ -9,8 +9,9 @@ the second template parameter of the class provides the operation that integrates a new point from a given point with a predefined step, and according to a specified vector. -\cgalHasModelsBegin CGAL::Euler_integrator_2 -\cgalHasModels CGAL::Runge_kutta_integrator_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Euler_integrator_2} +\cgalModels{CGAL::Runge_kutta_integrator_2} \cgalHasModelsEnd */ diff --git a/Stream_lines_2/doc/Stream_lines_2/Concepts/StreamLinesTraits_2.h b/Stream_lines_2/doc/Stream_lines_2/Concepts/StreamLinesTraits_2.h index e1394b709454..a2e24fd2fbad 100644 --- a/Stream_lines_2/doc/Stream_lines_2/Concepts/StreamLinesTraits_2.h +++ b/Stream_lines_2/doc/Stream_lines_2/Concepts/StreamLinesTraits_2.h @@ -9,7 +9,9 @@ the template parameter of the class This concept provides the types handled by the `CGAL::Stream_lines_2` class. +\cgalHasModelsBegin \cgalHasModelsBare{The kernels of \cgal are models for this traits class.} +\cgalHasModelsEnd */ class StreamLinesTraits_2 { diff --git a/Stream_lines_2/doc/Stream_lines_2/Concepts/VectorField_2.h b/Stream_lines_2/doc/Stream_lines_2/Concepts/VectorField_2.h index b42a88dba950..b79ed1e740fa 100644 --- a/Stream_lines_2/doc/Stream_lines_2/Concepts/VectorField_2.h +++ b/Stream_lines_2/doc/Stream_lines_2/Concepts/VectorField_2.h @@ -9,8 +9,9 @@ the first template parameter of the class provides the types of the geometric primitives used in the placement of streamlines and some functions for answering different queries. -\cgalHasModelsBegin CGAL::Regular_grid_2 -\cgalHasModels CGAL::Triangular_field_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_grid_2} +\cgalModels{CGAL::Triangular_field_2} \cgalHasModelsEnd */ diff --git a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/DQQMask_3.h b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/DQQMask_3.h index 2a0e662a0e82..ea351a5d2ba1 100644 --- a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/DQQMask_3.h +++ b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/DQQMask_3.h @@ -11,7 +11,8 @@ policy concept of geometric computations is used in \cgalRefines{SubdivisionMask_3} -\cgalHasModelsBegin CGAL::DooSabin_mask_3 +\cgalHasModelsBegin +\cgalModels{CGAL::DooSabin_mask_3} \cgalHasModelsEnd \sa `CGAL::Subdivision_method_3` diff --git a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PQQMask_3.h b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PQQMask_3.h index 22c59d45ad22..15a337e68c97 100644 --- a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PQQMask_3.h +++ b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PQQMask_3.h @@ -11,7 +11,8 @@ policy concept of geometric computations is used in \cgalRefines{SubdivisionMask_3} -\cgalHasModelsBegin CGAL::CatmullClark_mask_3 +\cgalHasModelsBegin +\cgalModels{CGAL::CatmullClark_mask_3} \cgalHasModelsEnd \sa `CGAL::Subdivision_method_3` diff --git a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PTQMask_3.h b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PTQMask_3.h index 2faff045bd6d..190f970bd007 100644 --- a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PTQMask_3.h +++ b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/PTQMask_3.h @@ -10,7 +10,8 @@ policy concept of geometric computations is used in \cgalRefines{SubdivisionMask_3} -\cgalHasModelsBegin CGAL::Loop_mask_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Loop_mask_3} \cgalHasModelsEnd \sa `CGAL::Subdivision_method_3` diff --git a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/Sqrt3Mask_3.h b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/Sqrt3Mask_3.h index ed311db671a3..72823a073e1b 100644 --- a/Subdivision_method_3/doc/Subdivision_method_3/Concepts/Sqrt3Mask_3.h +++ b/Subdivision_method_3/doc/Subdivision_method_3/Concepts/Sqrt3Mask_3.h @@ -9,7 +9,8 @@ policy concept of geometric computations is used in \cgalRefines{SubdivisionMask_3} -\cgalHasModelsBegin CGAL::Sqrt3_mask_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Sqrt3_mask_3} \cgalHasModelsEnd \sa `CGAL::Subdivision_method_3` diff --git a/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h b/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h index 68364e07863a..f6e59cdaf67f 100644 --- a/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h +++ b/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h @@ -6,8 +6,9 @@ The concept `ErrorMetricProxy` defines the notion of proxy, computes the fitting error from a face to a proxy, and fits a proxy from a range of faces. -\cgalHasModelsBegin CGAL::Surface_mesh_approximation::L21_metric_plane_proxy -\cgalHasModels CGAL::Surface_mesh_approximation::L2_metric_plane_proxy +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_approximation::L21_metric_plane_proxy} +\cgalModels{CGAL::Surface_mesh_approximation::L2_metric_plane_proxy} \cgalHasModelsEnd */ diff --git a/Surface_mesh_deformation/doc/Surface_mesh_deformation/Concepts/DeformationClosestRotationTraits_3.h b/Surface_mesh_deformation/doc/Surface_mesh_deformation/Concepts/DeformationClosestRotationTraits_3.h index 65137707986d..4332ebda74b1 100644 --- a/Surface_mesh_deformation/doc/Surface_mesh_deformation/Concepts/DeformationClosestRotationTraits_3.h +++ b/Surface_mesh_deformation/doc/Surface_mesh_deformation/Concepts/DeformationClosestRotationTraits_3.h @@ -9,8 +9,9 @@ to implement models of this concept. \cgalRefines{DefaultConstructible} -\cgalHasModelsBegin CGAL::Deformation_Eigen_closest_rotation_traits_3 -\cgalHasModels CGAL::Deformation_Eigen_polar_closest_rotation_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Deformation_Eigen_closest_rotation_traits_3} +\cgalModels{CGAL::Deformation_Eigen_polar_closest_rotation_traits_3} \cgalHasModelsEnd */ diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/Parameterizer_3.h b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/Parameterizer_3.h index 67002d031aec..35a8d8a2e1a4 100644 --- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/Parameterizer_3.h +++ b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/Parameterizer_3.h @@ -12,16 +12,17 @@ the border of a given mesh. Construction and destruction are undefined. -\cgalHasModelsBegin CGAL::Surface_mesh_parameterization::Fixed_border_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::ARAP_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::Barycentric_mapping_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::Discrete_authalic_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::Discrete_conformal_map_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::LSCM_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::Mean_value_coordinates_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::Circular_border_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::Square_border_parameterizer_3 -\cgalHasModels CGAL::Surface_mesh_parameterization::Two_vertices_parameterizer_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_parameterization::Fixed_border_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::ARAP_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::Barycentric_mapping_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::Discrete_authalic_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::Discrete_conformal_map_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::LSCM_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::Mean_value_coordinates_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::Circular_border_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::Square_border_parameterizer_3} +\cgalModels{CGAL::Surface_mesh_parameterization::Two_vertices_parameterizer_3} \cgalHasModelsEnd \sa `CGAL::Surface_mesh_parameterization::Orbifold_Tutte_parameterizer_3` diff --git a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Concepts/SegmentationGeomTraits.h b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Concepts/SegmentationGeomTraits.h index 2e0a58fa0a28..81e7848328b1 100644 --- a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Concepts/SegmentationGeomTraits.h +++ b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Concepts/SegmentationGeomTraits.h @@ -5,7 +5,9 @@ The concept `SegmentationGeomTraits` describes the set of requirements of the geometric traits needed by the segmentation functions. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \cgalRefines{AABBGeomTraits} diff --git a/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/Concepts/SurfaceMeshShortestPathTraits.h b/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/Concepts/SurfaceMeshShortestPathTraits.h index 51d4ae712eb6..9724634b10ff 100644 --- a/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/Concepts/SurfaceMeshShortestPathTraits.h +++ b/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/Concepts/SurfaceMeshShortestPathTraits.h @@ -8,7 +8,8 @@ predicates, and constructions required by the traits class parameter of `CGAL::Surface_mesh_shortest_path`. \cgalRefines{CopyConstructible,Assignable} -\cgalHasModelsBegin CGAL::Surface_mesh_shortest_path_traits +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_shortest_path_traits} \cgalHasModelsEnd */ diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetCost.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetCost.h index f31143efcc62..2bd7a6bd2017 100644 --- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetCost.h +++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetCost.h @@ -12,9 +12,10 @@ or can be intentionally returned to prevent the edge from being collapsed. \cgalRefines{DefaultConstructible,CopyConstructible} -\cgalHasModelsBegin CGAL::Surface_mesh_simplification::Edge_length_cost -\cgalHasModels CGAL::Surface_mesh_simplification::LindstromTurk_cost -\cgalHasModels CGAL::Surface_mesh_simplification::GarlandHeckbert_policies +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_simplification::Edge_length_cost} +\cgalModels{CGAL::Surface_mesh_simplification::LindstromTurk_cost} +\cgalModels{CGAL::Surface_mesh_simplification::GarlandHeckbert_policies} \cgalHasModelsEnd */ diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetPlacement.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetPlacement.h index bb66ff08d050..cf87c5e2400d 100644 --- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetPlacement.h +++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/GetPlacement.h @@ -14,11 +14,12 @@ or can be intentionally returned to prevent the edge from being collapsed. \cgalRefines{DefaultConstructible,CopyConstructible} -\cgalHasModelsBegin CGAL::Surface_mesh_simplification::Midpoint_placement -\cgalHasModels CGAL::Surface_mesh_simplification::LindstromTurk_placement -\cgalHasModels CGAL::Surface_mesh_simplification::GarlandHeckbert_policies -\cgalHasModels CGAL::Surface_mesh_simplification::Bounded_normal_change_placement -\cgalHasModels CGAL::Surface_mesh_simplification::Constrained_placement +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_simplification::Midpoint_placement} +\cgalModels{CGAL::Surface_mesh_simplification::LindstromTurk_placement} +\cgalModels{CGAL::Surface_mesh_simplification::GarlandHeckbert_policies} +\cgalModels{CGAL::Surface_mesh_simplification::Bounded_normal_change_placement} +\cgalModels{CGAL::Surface_mesh_simplification::Constrained_placement} \cgalHasModelsEnd */ diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/PlacementFilter.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/PlacementFilter.h index b66544074009..6f53b84171e8 100644 --- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/PlacementFilter.h +++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/PlacementFilter.h @@ -14,8 +14,9 @@ be absent). The value `boost::none` indicates that the edge should not be collap \cgalRefines{DefaultConstructible,CopyConstructible} -\cgalHasModelsBegin CGAL::Surface_mesh_simplification::Bounded_normal_change_filter -\cgalHasModels CGAL::Surface_mesh_simplification::Polyhedral_envelope_filter +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_simplification::Bounded_normal_change_filter} +\cgalModels{CGAL::Surface_mesh_simplification::Polyhedral_envelope_filter} \cgalHasModelsEnd */ diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/StopPredicate.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/StopPredicate.h index df8fc845f5b4..9a51402119c5 100644 --- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/StopPredicate.h +++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/StopPredicate.h @@ -4,11 +4,12 @@ The concept `StopPredicate` describes the requirements for the predicate which indicates if the simplification process must finish. -\cgalHasModelsBegin CGAL::Surface_mesh_simplification::Edge_count_stop_predicate -\cgalHasModels CGAL::Surface_mesh_simplification::Face_count_stop_predicate -\cgalHasModels CGAL::Surface_mesh_simplification::Edge_count_ratio_stop_predicate -\cgalHasModels CGAL::Surface_mesh_simplification::Face_count_ratio_stop_predicate -\cgalHasModels CGAL::Surface_mesh_simplification::Edge_length_stop_predicate +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_simplification::Edge_count_stop_predicate} +\cgalModels{CGAL::Surface_mesh_simplification::Face_count_stop_predicate} +\cgalModels{CGAL::Surface_mesh_simplification::Edge_count_ratio_stop_predicate} +\cgalModels{CGAL::Surface_mesh_simplification::Face_count_ratio_stop_predicate} +\cgalModels{CGAL::Surface_mesh_simplification::Edge_length_stop_predicate} \cgalHasModelsEnd */ diff --git a/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/Concepts/MeanCurvatureSkeletonizationTraits.h b/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/Concepts/MeanCurvatureSkeletonizationTraits.h index b7466a2ecd45..8e929d561dd5 100644 --- a/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/Concepts/MeanCurvatureSkeletonizationTraits.h +++ b/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/Concepts/MeanCurvatureSkeletonizationTraits.h @@ -5,7 +5,9 @@ * * Traits class concept defining the requirements of the class `CGAL::Mean_curvature_flow_skeletonization`. * + * \cgalHasModelsBegin * \cgalHasModelsBare{Any \cgal `Kernel` with `double` as `%Kernel::%FT`} + * \cgalHasModelsEnd * * */ diff --git a/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchema.h b/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchema.h index 6f6355c93901..ea183d1c13f1 100644 --- a/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchema.h +++ b/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchema.h @@ -9,8 +9,10 @@ \cgalRefines{GenericMap} - \cgalHasModelsBare{\link CGAL::Surface_mesh_topology::Polygonal_schema_with_combinatorial_map `CGAL::Surface_mesh_topology::Polygonal_schema_with_combinatorial_map`\endlink\n - \link CGAL::Surface_mesh_topology::Polygonal_schema_with_generalized_map `CGAL::Surface_mesh_topology::Polygonal_schema_with_generalized_map`\endlink} + \cgalHasModelsBegin + \cgalHasModelsBare{\link CGAL::Surface_mesh_topology::Polygonal_schema_with_combinatorial_map `CGAL::Surface_mesh_topology::Polygonal_schema_with_combinatorial_map`\endlink} + \cgalHasModelsBare{\link CGAL::Surface_mesh_topology::Polygonal_schema_with_generalized_map `CGAL::Surface_mesh_topology::Polygonal_schema_with_generalized_map`\endlink} + \cgalHasModelsEnd */ class PolygonalSchema diff --git a/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchemaItems.h b/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchemaItems.h index 0bf077baf427..ee039139ce10 100644 --- a/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchemaItems.h +++ b/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/PolygonalSchemaItems.h @@ -6,7 +6,9 @@ \cgalRefines{GenericMapItems} + \cgalHasModelsBegin \cgalHasModelsBare{\link CGAL::Surface_mesh_topology::Polygonal_schema_min_items `CGAL::Surface_mesh_topology::Polygonal_schema_min_items`\endlink} + \cgalHasModelsEnd */ class PolygonalSchemaItems diff --git a/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/WeightFunctor.h b/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/WeightFunctor.h index 4650a313f02a..6f9cbefceb67 100644 --- a/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/WeightFunctor.h +++ b/Surface_mesh_topology/doc/Surface_mesh_topology/Concepts/WeightFunctor.h @@ -5,8 +5,10 @@ The concept `WeightFunctor` defines a functor to calculate the weight of an edge. - \cgalHasModelsBare{\link CGAL::Surface_mesh_topology::Unit_weight_functor `CGAL::Surface_mesh_topology::Unit_weight_functor`\endlink, - \link CGAL::Surface_mesh_topology::Euclidean_length_weight_functor `CGAL::Surface_mesh_topology::Euclidean_length_weight_functor`\endlink} + \cgalHasModelsBegin + \cgalHasModelsBare{\link CGAL::Surface_mesh_topology::Unit_weight_functor `CGAL::Surface_mesh_topology::Unit_weight_functor`\endlink} + \cgalHasModelsBare{\link CGAL::Surface_mesh_topology::Euclidean_length_weight_functor `CGAL::Surface_mesh_topology::Euclidean_length_weight_functor`\endlink} + \cgalHasModelsEnd */ class WeightFunctor { public: diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitFunction.h b/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitFunction.h index 319bf352f0c6..299065f4890c 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitFunction.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitFunction.h @@ -7,7 +7,9 @@ The concept `ImplicitFunction` describes a function object whose `operator()` computes the values of a function \f$ f : \mathbb{R}^3 \longrightarrow \mathbb{R}\f$. -\cgalHasModelsBareBegin{any pointer to a function of type `FT (*)(Point)`} CGAL::Gray_level_image_3 +\cgalHasModelsBegin +\cgalHasModelsBare{any pointer to a function of type `FT (*)(Point)`} +\cgalHasModels{CGAL::Gray_level_image_3} \cgalHasModelsEnd \sa `CGAL::Implicit_surface_3` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitSurfaceTraits_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitSurfaceTraits_3.h index 28814f2648ea..d06d695c40e6 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitSurfaceTraits_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/ImplicitSurfaceTraits_3.h @@ -15,7 +15,9 @@ the concept `ImplicitSurfaceTraits_3` provides the types, predicates and constru that are passed to the generated model of `SurfaceMeshTraits_3`. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Implicit_surface_3` \sa `CGAL::make_surface_mesh()` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshCellBase_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshCellBase_3.h index 1b16bc506f14..3dcc8a0dedf5 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshCellBase_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshCellBase_3.h @@ -37,8 +37,9 @@ of the restriction to the surface of a three dimensional triangulation. In the following we call surface center of a facet, the center of its biggest Delaunay surface ball. -\cgalHasModelsBegin CGAL::Surface_mesh_cell_base_3 -\cgalHasModels CGAL::Surface_mesh_default_triangulation_3::Cell +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_cell_base_3} +\cgalModels{CGAL::Surface_mesh_default_triangulation_3::Cell} \cgalHasModelsEnd \sa `SurfaceMeshTriangulation_3` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshComplex_2InTriangulation_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshComplex_2InTriangulation_3.h index ec9eba193720..35b923bbb8b5 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshComplex_2InTriangulation_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshComplex_2InTriangulation_3.h @@ -30,7 +30,8 @@ A model of this concept is a type to be plugged as first template parameter in the function template `CGAL::make_surface_mesh()`. -\cgalHasModelsBegin CGAL::Surface_mesh_complex_2_in_triangulation_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_complex_2_in_triangulation_3} \cgalHasModelsEnd \sa `CGAL::make_surface_mesh()` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshFacetsCriteria_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshFacetsCriteria_3.h index 7380607aca07..0f3431af56cb 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshFacetsCriteria_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshFacetsCriteria_3.h @@ -33,7 +33,8 @@ is just a lexicographical comparison. The meshing algorithm handles facets with lowest quality first. The qualities are computed by a function `is_bad(const Facet& f, const Quality& q)`. -\cgalHasModelsBegin CGAL::Surface_mesh_default_criteria_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_default_criteria_3} \cgalHasModelsEnd \sa `CGAL::make_surface_mesh()` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTraits_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTraits_3.h index dd728781a7f7..672f74669488 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTraits_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTraits_3.h @@ -11,7 +11,8 @@ and to compute some intersection points if any exists. The concept `SurfaceMeshTraits_3` also includes a funcctor able to provide a small set of initial points on the surface. -\cgalHasModelsBegin CGAL::Surface_mesh_traits_generator_3::type +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_traits_generator_3::type} \cgalHasModelsEnd \sa `CGAL::make_surface_mesh()` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTriangulation_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTriangulation_3.h index 7af1aba64cae..a8411edcbbd5 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTriangulation_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshTriangulation_3.h @@ -17,7 +17,9 @@ the requirements for the triangulation type plugged in the class `CGAL::Surface_mesh_complex_2_in_triangulation_3`. +\cgalHasModelsBegin \cgalHasModelsBare{Any 3D Delaunay triangulation class of \cgal} +\cgalHasModelsEnd \sa `CGAL::Triangulation_3` \sa `CGAL::Delaunay_triangulation_3` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshVertexBase_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshVertexBase_3.h index 086b7759ac90..32663ac10ddf 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshVertexBase_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/SurfaceMeshVertexBase_3.h @@ -31,8 +31,9 @@ integers, which, when they are valid, store respectively the number of complex facets incident to the vertex and the number of connected components of the adjacency graph of those facets. -\cgalHasModelsBegin CGAL::Surface_mesh_vertex_base_3 -\cgalHasModels CGAL::Surface_mesh_default_triangulation_3::Vertex +\cgalHasModelsBegin +\cgalModels{CGAL::Surface_mesh_vertex_base_3} +\cgalModels{CGAL::Surface_mesh_default_triangulation_3::Vertex} \cgalHasModelsEnd \sa `SurfaceMeshComplex_2InTriangulation_3` diff --git a/Surface_mesher/doc/Surface_mesher/Concepts/Surface_3.h b/Surface_mesher/doc/Surface_mesher/Concepts/Surface_3.h index 0e5cca74dfef..4b4d11da894f 100644 --- a/Surface_mesher/doc/Surface_mesher/Concepts/Surface_3.h +++ b/Surface_mesher/doc/Surface_mesher/Concepts/Surface_3.h @@ -8,7 +8,8 @@ The surface types are required to be copy constructible and assignable. -\cgalHasModelsBegin CGAL::Implicit_surface_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Implicit_surface_3} \cgalHasModelsEnd \sa `CGAL::make_surface_mesh()` diff --git a/TDS_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h b/TDS_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h index e10d068c1b1a..e1dc359a13f0 100644 --- a/TDS_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h +++ b/TDS_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h @@ -48,7 +48,8 @@ that the `CGAL::Triangulation_data_structure_2` actually uses as a base class for the class `CGAL::Triangulation_data_structure_2::Face`. -\cgalHasModelsBegin CGAL::Triangulation_ds_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_face_base_2} \cgalHasModelsEnd \sa `TriangulationDSVertexBase_2` diff --git a/TDS_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h b/TDS_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h index e47b7cfbf3f8..994a0f82b9b0 100644 --- a/TDS_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h +++ b/TDS_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h @@ -44,7 +44,8 @@ that the `CGAL::Triangulation_data_structure_2` actually uses as a base class for the class of `CGAL::Triangulation_data_structure_2::Vertex`. -\cgalHasModelsBegin CGAL::Triangulation_ds_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_vertex_base_2} \cgalHasModelsEnd \sa `TriangulationDSFaceBase_2` diff --git a/TDS_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h b/TDS_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h index 051a1359d2e8..a07310740957 100644 --- a/TDS_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h +++ b/TDS_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h @@ -64,7 +64,8 @@ the rank of this item in the output order. When dimension \f$ <\f$ 2, the same information is output for faces of maximal dimension instead of faces. -\cgalHasModelsBegin CGAL::Triangulation_data_structure_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_data_structure_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2::Face` @@ -727,7 +728,8 @@ In order to obtain new vertices or destruct unused vertices, the user must call the `create_vertex()` and `delete_vertex()` methods of the triangulation data structure. -\cgalHasModelsBegin CGAL::Triangulation_ds_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_vertex_base_2} \cgalHasModelsEnd \sa `TriangulationDSVertexBase_2` @@ -849,7 +851,8 @@ The methods `create_face()` and have to be used to define new faces and to delete no longer used faces. -\cgalHasModelsBegin CGAL::Triangulation_ds_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_face_base_2} \cgalHasModelsEnd \sa `TriangulationDSFaceBase_2` diff --git a/TDS_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h b/TDS_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h index 59f5b45bbe2a..8f8ec146dbf9 100644 --- a/TDS_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h +++ b/TDS_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h @@ -33,7 +33,8 @@ cell classes. The rebound base classes so obtained are the classes which are used as base classes for the final vertex and cell classes. More information can be found in Section \ref TDS3secdesign. -\cgalHasModelsBegin CGAL::Triangulation_ds_cell_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_cell_base_3} \cgalHasModelsEnd \sa `TriangulationDSVertexBase_3` diff --git a/TDS_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h b/TDS_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h index 9ef2cd34bbc6..0a9d10b04bff 100644 --- a/TDS_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h +++ b/TDS_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h @@ -28,7 +28,8 @@ cell classes. The rebound base classes so obtained are the classes which are used as base classes for the final vertex and cell classes. More information can be found in Section \ref TDS3secdesign. -\cgalHasModelsBegin CGAL::Triangulation_ds_vertex_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_vertex_base_3} \cgalHasModelsEnd \sa `TriangulationDSCellBase_3` diff --git a/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h b/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h index a2c6d41e9334..c3a7ba38023d 100644 --- a/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h +++ b/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h @@ -65,7 +65,8 @@ neighbors of each cell, where the index corresponds to the preceding list of cells. When dimension < 3, the same information is stored for faces of maximal dimension instead of cells. -\cgalHasModelsBegin CGAL::Triangulation_data_structure_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_data_structure_3} \cgalHasModelsEnd \sa `TriangulationDataStructure_3::Vertex` diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingCellBase_3.h b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingCellBase_3.h index aa3f4d68dc1c..342e203e2598 100644 --- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingCellBase_3.h +++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingCellBase_3.h @@ -6,7 +6,8 @@ Cell base concept to be used in the triangulation type given to the function `CGAL::tetrahedral_isotropic_remeshing()`. -\cgalHasModelsBegin CGAL::Tetrahedral_remeshing::Remeshing_cell_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Tetrahedral_remeshing::Remeshing_cell_base_3} \cgalHasModelsEnd */ diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingTriangulationTraits_3.h b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingTriangulationTraits_3.h index ad71f044d997..85e92da96c32 100644 --- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingTriangulationTraits_3.h +++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingTriangulationTraits_3.h @@ -10,7 +10,9 @@ of the class `Remeshing_triangulation_3`. It defines the geometric objects (points, segments, triangles, and tetrahedra) forming the triangulation together with a few geometric predicates and constructions on these objects. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Triangulation_3` */ diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingVertexBase_3.h b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingVertexBase_3.h index 2b1b5bc8fc3f..2ce117b8ff32 100644 --- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingVertexBase_3.h +++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Concepts/RemeshingVertexBase_3.h @@ -6,7 +6,8 @@ Vertex base concept to be used in the triangulation type given to the function `CGAL::tetrahedral_isotropic_remeshing()`. -\cgalHasModelsBegin Tetrahedral_remeshing::Remeshing_vertex_base_3 +\cgalHasModelsBegin +\cgalModels{Tetrahedral_remeshing::Remeshing_vertex_base_3} \cgalHasModelsEnd */ diff --git a/Triangulation/doc/Triangulation/Concepts/DelaunayTriangulationTraits.h b/Triangulation/doc/Triangulation/Concepts/DelaunayTriangulationTraits.h index 14395b71b936..1dd4fa17d49f 100644 --- a/Triangulation/doc/Triangulation/Concepts/DelaunayTriangulationTraits.h +++ b/Triangulation/doc/Triangulation/Concepts/DelaunayTriangulationTraits.h @@ -9,8 +9,9 @@ a Delaunay triangulation. It corresponds to the first template parameter of the \cgalRefines{TriangulationTraits} -\cgalHasModelsBegin CGAL::Epick_d -\cgalHasModels CGAL::Epeck_d +\cgalHasModelsBegin +\cgalModels{CGAL::Epick_d} +\cgalModels{CGAL::Epeck_d} \cgalHasModelsEnd \sa `TriangulationTraits` diff --git a/Triangulation/doc/Triangulation/Concepts/RegularTriangulationTraits.h b/Triangulation/doc/Triangulation/Concepts/RegularTriangulationTraits.h index 35b31839b7ab..1afb3084639a 100644 --- a/Triangulation/doc/Triangulation/Concepts/RegularTriangulationTraits.h +++ b/Triangulation/doc/Triangulation/Concepts/RegularTriangulationTraits.h @@ -9,8 +9,9 @@ a regular triangulation. It corresponds to the first template parameter of the c \cgalRefines{TriangulationTraits} -\cgalHasModelsBegin CGAL::Epick_d -\cgalHasModels CGAL::Epeck_d +\cgalHasModelsBegin +\cgalModels{CGAL::Epick_d} +\cgalModels{CGAL::Epeck_d} \cgalHasModelsEnd \sa `TriangulationTraits` diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationDSFace.h b/Triangulation/doc/Triangulation/Concepts/TriangulationDSFace.h index d92afbd427e6..b72f4ee1fd0a 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationDSFace.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationDSFace.h @@ -15,7 +15,8 @@ The dimension of a face is implicitly set when `TriangulationDSFace::set_index` is called two times to set the first two vertices (`i = 0` and `i = 1`), then the dimension is 1. -\cgalHasModelsBegin CGAL::Triangulation_face +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_face} \cgalHasModelsEnd \sa `TriangulationDSFullCell` diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationDSFullCell.h b/Triangulation/doc/Triangulation/Concepts/TriangulationDSFullCell.h index 3e32c2423a22..231e29f5a08f 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationDSFullCell.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationDSFullCell.h @@ -36,8 +36,9 @@ of `CGAL::Triangulation_data_structure::Vertex`. \cgalRefines{TriangulationDataStructure::FullCell} -\cgalHasModelsBegin CGAL::Triangulation_ds_full_cell -\cgalHasModels CGAL::Triangulation_full_cell +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_full_cell} +\cgalModels{CGAL::Triangulation_full_cell} \cgalHasModelsEnd \sa `TriangulationDSVertex` diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationDSVertex.h b/Triangulation/doc/Triangulation/Concepts/TriangulationDSVertex.h index c23aaabe1ea7..51fb7cad627c 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationDSVertex.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationDSVertex.h @@ -36,8 +36,9 @@ of `CGAL::Triangulation_data_structure::Vertex`. \cgalRefines{TriangulationDataStructure::Vertex} -\cgalHasModelsBegin CGAL::Triangulation_ds_vertex -\cgalHasModels CGAL::Triangulation_vertex +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_vertex} +\cgalModels{CGAL::Triangulation_vertex} \cgalHasModelsEnd \sa `TriangulationDSFullCell` diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h b/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h index c17ded6feb1e..a8da6d398490 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h @@ -69,7 +69,8 @@ The classes `Vertex` and `Full_cell` have to provide the relevant I/O operators (possibly empty). -\cgalHasModelsBegin CGAL::Triangulation_data_structure +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_data_structure} \cgalHasModelsEnd \sa `TriangulationDataStructure::Vertex` @@ -661,8 +662,9 @@ It sets requirements of combinatorial nature only, as geometry is not concerned here. In particular, we only require that the vertex holds a handle to a full cell incident to it in the triangulation. -\cgalHasModelsBegin CGAL::Triangulation_ds_vertex -\cgalHasModels CGAL::Triangulation_vertex +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_vertex} +\cgalModels{CGAL::Triangulation_vertex} \cgalHasModelsEnd \sa `TriangulationDataStructure::FullCell` @@ -769,8 +771,9 @@ full cell as well as handles to the adjacent full cells. Two full cells are said to be adjacent when they share a facet. Adjacent full cells are called hereafter neighbors. -\cgalHasModelsBegin CGAL::Triangulation_ds_full_cell -\cgalHasModels CGAL::Triangulation_full_cell +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_ds_full_cell} +\cgalModels{CGAL::Triangulation_full_cell} \cgalHasModelsEnd \sa `TriangulationDataStructure::FullCell` diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationFullCell.h b/Triangulation/doc/Triangulation/Concepts/TriangulationFullCell.h index eba0214810a1..95cac2eab13c 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationFullCell.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationFullCell.h @@ -10,7 +10,8 @@ represent a full cell. \cgalRefines{TriangulationDSFullCell We only list below the additional specific requirements of `TriangulationFullCell`} -\cgalHasModelsBegin CGAL::Triangulation_full_cell +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_full_cell} \cgalHasModelsEnd \sa `CGAL::Triangulation_full_cell` diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationTraits.h b/Triangulation/doc/Triangulation/Concepts/TriangulationTraits.h index 3d004b52c286..198e3a736502 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationTraits.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationTraits.h @@ -14,8 +14,9 @@ traits must refine `SpatialSortingTraits_d`. The insertion is then optimized using spatial sorting. This is not required if the points are inserted one by one. -\cgalHasModelsBegin CGAL::Epick_d -\cgalHasModels CGAL::Epeck_d +\cgalHasModelsBegin +\cgalModels{CGAL::Epick_d} +\cgalModels{CGAL::Epeck_d} \cgalHasModelsEnd \sa `DelaunayTriangulationTraits` diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationVertex.h b/Triangulation/doc/Triangulation/Concepts/TriangulationVertex.h index 956acd269f14..457339f28b0e 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationVertex.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationVertex.h @@ -12,7 +12,8 @@ We only list below the additional specific requirements of ::TriangulationVertex Compared to ::TriangulationDSVertex, the main difference is the addition of an association of the vertex with a geometric point. -\cgalHasModelsBegin CGAL::Triangulation_vertex +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_vertex} \cgalHasModelsEnd \cgalHeading{Input/Output} diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h index bf4b52d43c46..cf9b15d466ef 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h @@ -17,9 +17,11 @@ The concept `ConstrainedDelaunayTriangulationTraits_2` refines both the concept \cgalRefines{DelaunayTriangulationTraits_2,ConstrainedTriangulationTraits_2} -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} CGAL::Projection_traits_xy_3 -\cgalHasModels CGAL::Projection_traits_yz_3 -\cgalHasModels CGAL::Projection_traits_xz_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{CGAL::Projection_traits_xy_3} +\cgalHasModels{CGAL::Projection_traits_yz_3} +\cgalHasModels{CGAL::Projection_traits_xz_3} \cgalHasModelsEnd diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h index a5a98882faa6..73951fc22c16 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h @@ -19,7 +19,8 @@ constraints. Defines the same types as the `TriangulationFaceBase_2` concept -\cgalHasModelsBegin CGAL::Constrained_triangulation_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Constrained_triangulation_face_base_2} \cgalHasModelsEnd \sa `TriangulationFaceBase_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h index 0af956128561..892053e3bac0 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h @@ -19,10 +19,12 @@ to compute the squared distance between a point and a line \cgalRefines{TriangulationTraits_2} -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} CGAL::Projection_traits_3 -\cgalHasModels CGAL::Projection_traits_xy_3 -\cgalHasModels CGAL::Projection_traits_yz_3 -\cgalHasModels CGAL::Projection_traits_xz_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{CGAL::Projection_traits_3} +\cgalHasModels{CGAL::Projection_traits_xy_3} +\cgalHasModels{CGAL::Projection_traits_yz_3} +\cgalHasModels{CGAL::Projection_traits_xz_3} \cgalHasModelsEnd \sa `TriangulationTraits_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h index d223c281d3c0..f76e24c327a2 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h @@ -22,12 +22,14 @@ required if the method `nearest_vertex()` is used. \cgalRefines{TriangulationTraits_2} -\cgalHasModelsBare{All models of the \cgal concept `Kernel`\n - `CGAL::Projection_traits_3` (not for dual Voronoi functions)\n - `CGAL::Projection_traits_xy_3` (not for dual Voronoi functions)\n - `CGAL::Projection_traits_xy_3` (not for dual Voronoi functions)\n - `CGAL::Projection_traits_yz_3` (not for dual Voronoi functions)\n - `CGAL::Projection_traits_xz_3` (not for dual Voronoi functions)} +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsBare{`CGAL::Projection_traits_3` (not for dual Voronoi functions)} +\cgalHasModelsBare{`CGAL::Projection_traits_xy_3` (not for dual Voronoi functions)} +\cgalHasModelsBare{`CGAL::Projection_traits_xy_3` (not for dual Voronoi functions)} +\cgalHasModelsBare{`CGAL::Projection_traits_yz_3` (not for dual Voronoi functions)} +\cgalHasModelsBare{`CGAL::Projection_traits_xz_3` (not for dual Voronoi functions)} +\cgalHasModelsEnd \sa `TriangulationTraits_2` */ diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h index 26c24a4e86ba..4ec205577472 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h @@ -34,7 +34,8 @@ in the face a list to store hidden vertices. \cgalRefines{TriangulationFaceBase_2} -\cgalHasModelsBegin CGAL::Regular_triangulation_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_triangulation_face_base_2} \cgalHasModelsEnd \sa `TriangulationFaceBase_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h index e935587ab864..71dc4f724682 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h @@ -18,7 +18,9 @@ of Delaunay triangulations. \cgalRefines{TriangulationTraits_2} +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Regular_triangulation_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h index af73baa96815..feee66c0b110 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h @@ -35,7 +35,8 @@ vertex of the triangulation or a hidden vertex. \cgalRefines{TriangulationVertexBase_2} -\cgalHasModelsBegin CGAL::Regular_triangulation_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_triangulation_vertex_base_2} \cgalHasModelsEnd \sa `TriangulationVertexBase_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h index 17ee831ec0be..9a364975955b 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h @@ -16,7 +16,8 @@ and only provided for symmetry with the vertex case. \cgalRefines{TriangulationDSFaceBase_2} -\cgalHasModelsBegin CGAL::Triangulation_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_face_base_2} \cgalHasModelsEnd \sa `TriangulationVertexBase_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h index 497c1fadde72..83e3992d81ce 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h @@ -14,7 +14,8 @@ next and previous level triangulations. \cgalRefines{TriangulationVertexBase_2} -\cgalHasModelsBegin CGAL::Triangulation_hierarchy_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_hierarchy_vertex_base_2} \cgalHasModelsEnd \sa `CGAL::Triangulation_hierarchy_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h index f158bbeea8d6..0d810e92288c 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h @@ -12,10 +12,12 @@ provides the types of the geometric primitives used in the triangulation and some function object types for the required predicates on those primitives. -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} CGAL::Projection_traits_3 -\cgalHasModels CGAL::Projection_traits_xy_3 -\cgalHasModels CGAL::Projection_traits_yz_3 -\cgalHasModels CGAL::Projection_traits_xz_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{CGAL::Projection_traits_3} +\cgalHasModels{CGAL::Projection_traits_xy_3} +\cgalHasModels{CGAL::Projection_traits_yz_3} +\cgalHasModels{CGAL::Projection_traits_xz_3} \cgalHasModelsEnd \sa `CGAL::Triangulation_2` diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h index c5e59974834d..8cca35af421a 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h @@ -8,7 +8,8 @@ and provides an additional information storage. \cgalRefines{TriangulationVertexBase_2} -\cgalHasModelsBegin CGAL::Triangulation_vertex_base_with_info_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_vertex_base_with_info_2} \cgalHasModelsEnd */ diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBase_2.h index 816e93b382ac..9790b02cecc3 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBase_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBase_2.h @@ -15,7 +15,8 @@ the vertex base of a triangulation stores a point. \cgalRefines{TriangulationDSVertexBase_2} -\cgalHasModelsBegin CGAL::Triangulation_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_vertex_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationCellBase_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationCellBase_3.h index 4df0ce0f7527..b71b96cc4392 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationCellBase_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationCellBase_3.h @@ -11,8 +11,9 @@ in the cell an operator that computes its circumcenter. \cgalRefines{TriangulationCellBase_3} -\cgalHasModelsBegin CGAL::Delaunay_triangulation_cell_base_3 -\cgalHasModels CGAL::Delaunay_triangulation_cell_base_with_circumcenter_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Delaunay_triangulation_cell_base_3} +\cgalModels{CGAL::Delaunay_triangulation_cell_base_with_circumcenter_3} \cgalHasModelsEnd \sa `DelaunayTriangulationTraits_3` diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h index b727b6013c9d..3493e4ef1faf 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h @@ -10,13 +10,14 @@ predicates and constructions on these objects. \cgalRefines{TriangulationTraits_3} -\cgalHasModelsBegin CGAL::Exact_predicates_inexact_constructions_kernel (recommended) -\cgalHasModels CGAL::Exact_predicates_exact_constructions_kernel (recommended for Voronoi) -\cgalHasModels CGAL::Filtered_kernel -\cgalHasModels CGAL::Cartesian -\cgalHasModels CGAL::Simple_cartesian -\cgalHasModels CGAL::Homogeneous -\cgalHasModels CGAL::Simple_homogeneous +\cgalHasModelsBegin +\cgalModels{CGAL::Exact_predicates_inexact_constructions_kernel (recommended)} +\cgalModels{CGAL::Exact_predicates_exact_constructions_kernel (recommended for Voronoi)} +\cgalModels{CGAL::Filtered_kernel} +\cgalModels{CGAL::Cartesian} +\cgalModels{CGAL::Simple_cartesian} +\cgalModels{CGAL::Homogeneous} +\cgalModels{CGAL::Simple_homogeneous} \cgalHasModelsEnd In addition to the requirements described for the traits class of diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBaseWithWeightedCircumcenter_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBaseWithWeightedCircumcenter_3.h index 9c7764481069..cd00268b2b91 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBaseWithWeightedCircumcenter_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBaseWithWeightedCircumcenter_3.h @@ -19,7 +19,8 @@ circumcenter by calling `invalidate_weighted_circumcenter_cache()`. \cgalRefines{RegularTriangulationCellBase_3} -\cgalHasModelsBegin CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3} \cgalHasModelsEnd \sa `RegularTriangulationTraits_3` diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h index b7362aca63ff..b95816da2963 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h @@ -35,7 +35,8 @@ and an operator to compute its weighted circumcenter. \cgalRefines{TriangulationCellBase_3} -\cgalHasModelsBegin CGAL::Regular_triangulation_cell_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_triangulation_cell_base_3} \cgalHasModelsEnd \sa `RegularTriangulationTraits_3` diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h index 41cd3c59fbc1..cea91c4d670d 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h @@ -15,7 +15,9 @@ or the weighted point \f$ {p}^{(w)}=(p,w_p)\f$. \cgalRefines{TriangulationTraits_3} +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Regular_triangulation_3` diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationVertexBase_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationVertexBase_3.h index aa5da85428da..09d9ce0a0fc0 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationVertexBase_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationVertexBase_3.h @@ -9,7 +9,8 @@ by adding a geometric point member. \cgalRefines{TriangulationDSVertexBase_3} -\cgalHasModelsBegin CGAL::Regular_triangulation_vertex_base_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Regular_triangulation_vertex_base_3} \cgalHasModelsEnd \sa `RegularTriangulationCellBase_3` diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBaseWithInfo_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBaseWithInfo_3.h index 4efba49955ac..84add9f98c93 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBaseWithInfo_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBaseWithInfo_3.h @@ -8,7 +8,8 @@ and provides an additional information storage. \cgalRefines{TriangulationCellBase_3} -\cgalHasModelsBegin CGAL::Triangulation_cell_base_with_info_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_cell_base_with_info_3} \cgalHasModelsEnd */ diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBase_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBase_3.h index 419ba6c4417a..8b26efc32c47 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBase_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationCellBase_3.h @@ -10,8 +10,9 @@ structure apply. \cgalRefines{TriangulationDSCellBase_3} -\cgalHasModelsBegin CGAL::Triangulation_cell_base_3 -\cgalHasModels CGAL::Triangulation_cell_base_with_info_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_cell_base_3} +\cgalModels{CGAL::Triangulation_cell_base_with_info_3} \cgalHasModelsEnd \sa `TriangulationVertexBase_3` diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h index 96a428da0503..99f5fda17531 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h @@ -11,7 +11,9 @@ triangles and tetrahedra) forming the triangulation together with a few geometric predicates and constructions on these objects: lexicographical comparison, orientation in case of coplanar points and orientation in space. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd \sa `CGAL::Triangulation_3` */ diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBaseWithInfo_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBaseWithInfo_3.h index 2801c4580136..37e2fd97140c 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBaseWithInfo_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBaseWithInfo_3.h @@ -8,7 +8,8 @@ and provides an additional information storage. \cgalRefines{TriangulationVertexBase_3} -\cgalHasModelsBegin CGAL::Triangulation_vertex_base_with_info_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_vertex_base_with_info_3} \cgalHasModelsEnd */ diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBase_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBase_3.h index 75d23eb5581a..5110b87d71f1 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBase_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationVertexBase_3.h @@ -9,8 +9,9 @@ for the triangulation data structure. \cgalRefines{TriangulationDSVertexBase_3} -\cgalHasModelsBegin CGAL::Triangulation_vertex_base_3 -\cgalHasModels CGAL::Triangulation_vertex_base_with_info_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_vertex_base_3} +\cgalModels{CGAL::Triangulation_vertex_base_with_info_3} \cgalHasModelsEnd \sa `TriangulationCellBase_3` diff --git a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/DelaunayTriangulationOnSphereTraits_2.h b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/DelaunayTriangulationOnSphereTraits_2.h index d73727aaabc0..df1da8edad50 100644 --- a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/DelaunayTriangulationOnSphereTraits_2.h +++ b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/DelaunayTriangulationOnSphereTraits_2.h @@ -11,8 +11,9 @@ parameter of the class `CGAL::Delaunay_triangulation_on_sphere_2`. To the requirements listed within the concept `TriangulationOnSphereTraits_2`, this concept adds types and functors requirements related to build the dual on the sphere. -\cgalHasModelsBegin CGAL::Delaunay_triangulation_on_sphere_traits_2 -\cgalHasModels CGAL::Projection_on_sphere_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Delaunay_triangulation_on_sphere_traits_2} +\cgalModels{CGAL::Projection_on_sphere_traits_3} \cgalHasModelsEnd */ class DelaunayTriangulationOnSphereTraits_2 diff --git a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereFaceBase_2.h b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereFaceBase_2.h index 0d1fe175810c..5e49109a4da4 100644 --- a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereFaceBase_2.h +++ b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereFaceBase_2.h @@ -19,7 +19,8 @@ then the triangulation is not an orientable triangulated surface without boundar In this case, fictitious faces are added to the triangulation, called ghost faces, such that the triangulation is a topological sphere. -\cgalHasModelsBegin CGAL::Triangulation_on_sphere_face_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_on_sphere_face_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereTraits_2.h b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereTraits_2.h index 4ccf99b9a261..ea94dfc395c4 100644 --- a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereTraits_2.h +++ b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereTraits_2.h @@ -13,8 +13,9 @@ triangulation and the function object types for the required predicates on those In particular, the traits class is expected to contain information about the sphere (center and radius) on which the points of the triangulation lie, as well as to provide means to change this information. -\cgalHasModelsBegin CGAL::Delaunay_triangulation_on_sphere_traits_2 -\cgalHasModels CGAL::Projection_on_sphere_traits_3 +\cgalHasModelsBegin +\cgalModels{CGAL::Delaunay_triangulation_on_sphere_traits_2} +\cgalModels{CGAL::Projection_on_sphere_traits_3} \cgalHasModelsEnd \sa `DelaunayTriangulationOnSphereTraits_2` diff --git a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereVertexBase_2.h b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereVertexBase_2.h index 7701fde798b9..23f0fbce9e0c 100644 --- a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereVertexBase_2.h +++ b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/Concepts/TriangulationOnSphereVertexBase_2.h @@ -9,7 +9,8 @@ of a triangulation data structure to be plugged in a triangulation on the sphere It refines the concept `TriangulationDSVertexBase_2`, adding geometric information: the vertex base of a triangulation stores a point. -\cgalHasModelsBegin CGAL::Triangulation_on_sphere_vertex_base_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Triangulation_on_sphere_vertex_base_2} \cgalHasModelsEnd \sa `TriangulationDataStructure_2` diff --git a/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h b/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h index 3d656b13a16f..a39c04b2179b 100644 --- a/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h +++ b/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h @@ -6,9 +6,10 @@ A model of the `Visibility_2` concept can be attached to an `Arrangement_2` instance to answer visibility queries within the faces of this arrangement. -\cgalHasModelsBegin CGAL::Simple_polygon_visibility_2 -\cgalHasModels CGAL::Rotational_sweep_visibility_2 -\cgalHasModels CGAL::Triangular_expansion_visibility_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Simple_polygon_visibility_2} +\cgalModels{CGAL::Rotational_sweep_visibility_2} +\cgalModels{CGAL::Triangular_expansion_visibility_2} \cgalHasModelsEnd */ diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationPolicy_2.h b/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationPolicy_2.h index 916a678290fa..bec40a64a9f5 100644 --- a/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationPolicy_2.h +++ b/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationPolicy_2.h @@ -13,15 +13,16 @@ graph they take as an argument, the last ones does. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Identity_policy_2 -\cgalHasModels CGAL::Apollonius_graph_degeneracy_removal_policy_2 -\cgalHasModels CGAL::Apollonius_graph_caching_degeneracy_removal_policy_2 -\cgalHasModels CGAL::Delaunay_triangulation_degeneracy_removal_policy_2 -\cgalHasModels CGAL::Delaunay_triangulation_caching_degeneracy_removal_policy_2 -\cgalHasModels CGAL::Regular_triangulation_degeneracy_removal_policy_2 -\cgalHasModels CGAL::Regular_triangulation_caching_degeneracy_removal_policy_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_degeneracy_removal_policy_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_caching_degeneracy_removal_policy_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Identity_policy_2} +\cgalModels{CGAL::Apollonius_graph_degeneracy_removal_policy_2} +\cgalModels{CGAL::Apollonius_graph_caching_degeneracy_removal_policy_2} +\cgalModels{CGAL::Delaunay_triangulation_degeneracy_removal_policy_2} +\cgalModels{CGAL::Delaunay_triangulation_caching_degeneracy_removal_policy_2} +\cgalModels{CGAL::Regular_triangulation_degeneracy_removal_policy_2} +\cgalModels{CGAL::Regular_triangulation_caching_degeneracy_removal_policy_2} +\cgalModels{CGAL::Segment_Delaunay_graph_degeneracy_removal_policy_2} +\cgalModels{CGAL::Segment_Delaunay_graph_caching_degeneracy_removal_policy_2} \cgalHasModelsEnd \sa `DelaunayGraph_2` diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationTraits_2.h b/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationTraits_2.h index 941a0b9dfbe9..452c25d3e022 100644 --- a/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationTraits_2.h +++ b/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/AdaptationTraits_2.h @@ -11,10 +11,11 @@ tag is provided for determining whether this functor is defined or not. \cgalRefines{CopyConstructible,Assignable,DefaultConstructible} -\cgalHasModelsBegin CGAL::Apollonius_graph_adaptation_traits_2 -\cgalHasModels CGAL::Delaunay_triangulation_adaptation_traits_2 -\cgalHasModels CGAL::Regular_triangulation_adaptation_traits_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_adaptation_traits_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Apollonius_graph_adaptation_traits_2} +\cgalModels{CGAL::Delaunay_triangulation_adaptation_traits_2} +\cgalModels{CGAL::Regular_triangulation_adaptation_traits_2} +\cgalModels{CGAL::Segment_Delaunay_graph_adaptation_traits_2} \cgalHasModelsEnd \sa `DelaunayGraph_2` diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/DelaunayGraph_2.h b/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/DelaunayGraph_2.h index 01749c2be48b..2c302fd96a9a 100644 --- a/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/DelaunayGraph_2.h +++ b/Voronoi_diagram_2/doc/Voronoi_diagram_2/Concepts/DelaunayGraph_2.h @@ -18,12 +18,14 @@ iterators and circulators that allow to traverse it (completely or partially). All iterators and circulators must be convertible to the corresponding handles. -\cgalHasModelsBareBegin{ `CGAL::Triangulation_hierarchy_2` provided that `Tr` is a model of `DelaunayGraph_2`} CGAL::Delaunay_triangulation_2 -\cgalHasModels CGAL::Regular_triangulation_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_2 -\cgalHasModels CGAL::Segment_Delaunay_graph_hierarchy_2 -\cgalHasModels CGAL::Apollonius_graph_2 -\cgalHasModels CGAL::Apollonius_graph_hierarchy_2 +\cgalHasModelsBegin +\cgalHasModelsBare{ `CGAL::Triangulation_hierarchy_2` provided that `Tr` is a model of `DelaunayGraph_2`} +\cgalHasModels{CGAL::Delaunay_triangulation_2} +\cgalHasModels{CGAL::Regular_triangulation_2} +\cgalHasModels{CGAL::Segment_Delaunay_graph_2} +\cgalHasModels{CGAL::Segment_Delaunay_graph_hierarchy_2} +\cgalHasModels{CGAL::Apollonius_graph_2} +\cgalHasModels{CGAL::Apollonius_graph_hierarchy_2} \cgalHasModelsEnd \sa `AdaptationTraits_2` diff --git a/Weights/doc/Weights/Concepts/AnalyticWeightTraits_2.h b/Weights/doc/Weights/Concepts/AnalyticWeightTraits_2.h index a6f6793d19c3..1bbfda65f44e 100644 --- a/Weights/doc/Weights/Concepts/AnalyticWeightTraits_2.h +++ b/Weights/doc/Weights/Concepts/AnalyticWeightTraits_2.h @@ -5,9 +5,11 @@ A concept that describes the set of requirements of classes used in the computation of analytic weights in 2D. -\cgalHasModelsBareBegin{All models of the \cgal concept `Kernel`} sCGAL:Projection_traits_xy_3 -\cgalHasModels CGAL::Projection_traits_yz_3 -\cgalHasModels CGAL::Projection_traits_xz_3 +\cgalHasModelsBegin +\cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModels{sCGAL:Projection_traits_xy_3} +\cgalHasModels{CGAL::Projection_traits_yz_3} +\cgalHasModels{CGAL::Projection_traits_xz_3} \cgalHasModelsEnd */ class AnalyticWeightTraits_2 { diff --git a/Weights/doc/Weights/Concepts/AnalyticWeightTraits_3.h b/Weights/doc/Weights/Concepts/AnalyticWeightTraits_3.h index 5aab656b6128..488c87558c0e 100644 --- a/Weights/doc/Weights/Concepts/AnalyticWeightTraits_3.h +++ b/Weights/doc/Weights/Concepts/AnalyticWeightTraits_3.h @@ -5,7 +5,9 @@ A concept that describes the set of requirements of classes used in the computation of analytic weights in 3D. +\cgalHasModelsBegin \cgalHasModelsBare{All models of the \cgal concept `Kernel`} +\cgalHasModelsEnd */ class AnalyticWeightTraits_3 { diff --git a/Weights/doc/Weights/Concepts/BarycentricWeights_2.h b/Weights/doc/Weights/Concepts/BarycentricWeights_2.h index 95d700e8e512..76104f359294 100644 --- a/Weights/doc/Weights/Concepts/BarycentricWeights_2.h +++ b/Weights/doc/Weights/Concepts/BarycentricWeights_2.h @@ -5,9 +5,10 @@ A concept that describes the set of methods required in all classes used in the computation of 2D generalized barycentric weights. -\cgalHasModelsBegin CGAL::Weights::Wachspress_weights_2 -\cgalHasModels CGAL::Weights::Mean_value_weights_2 -\cgalHasModels CGAL::Weights::Discrete_harmonic_weights_2 +\cgalHasModelsBegin +\cgalModels{CGAL::Weights::Wachspress_weights_2} +\cgalModels{CGAL::Weights::Mean_value_weights_2} +\cgalModels{CGAL::Weights::Discrete_harmonic_weights_2} \cgalHasModelsEnd */ class BarycentricWeights_2 {