diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 9e65a357fca..8a238305b81 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -56,7 +56,7 @@ jobs: set -x sudo apt-get update && sudo apt-get install -y graphviz ssh bibtex2html sudo pip install lxml - sudo pip install 'pyquery==1.4.1' # it seems to be the last py2 compatible version + sudo pip install pyquery wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~cgaltest/doxygen_1_8_13_patched/doxygen sudo mv doxygen_exe /usr/bin/doxygen sudo chmod +x /usr/bin/doxygen diff --git a/.github/workflows/delete_doc.yml b/.github/workflows/delete_doc.yml index de6c6e0e2a2..497013a51eb 100644 --- a/.github/workflows/delete_doc.yml +++ b/.github/workflows/delete_doc.yml @@ -20,7 +20,7 @@ jobs: set -x git config --global user.email "cgal@geometryfactory.com" git config --global user.name "cgaltest" - git clone https://maxGimeno:${{ secrets.PUSH_TO_CGAL_GITHUB_IO_TOKEN }}@github.com/CGAL/cgal.github.io.git --depth=5 + git clone https://CGAL:${{ secrets.PUSH_TO_CGAL_GITHUB_IO_TOKEN }}@github.com/CGAL/cgal.github.io.git PR_NUMBER=$(python -c "import json; import os; y = json.load(open(os.environ['GITHUB_EVENT_PATH'])); print(y[\"number\"])") cd cgal.github.io/ egrep -v " ${PR_NUMBER}\." index.html > tmp.html || true diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h index 630a569ebfb..215cbd65924 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h @@ -37,7 +37,7 @@ public: operator()(const Ray_3& r, const Primitive& primitive)`. A common algorithm to compute the intersection between a bounding box and a ray is the + HREF="https://education.siggraph.org/static/HyperGraph/raytrace/rtinter3.htm">the slab method. */ typedef unspecified_type Intersection_distance; diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementPainterOstream.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementPainterOstream.cpp index 1fa59ad88de..bdc2c17f627 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementPainterOstream.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementPainterOstream.cpp @@ -289,7 +289,7 @@ ArrangementPainterOstream>::operator<<( QRectF seg_bb = this->convert(seg.bbox()); if ( this->clippingRect.isValid() && - !this->clippingRect.intersects(seg_bb) & + !this->clippingRect.intersects(seg_bb) && (!seg.is_horizontal() && !seg.is_vertical())) { return *this; } diff --git a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h index 8980c453104..a93004ad293 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h @@ -631,7 +631,6 @@ namespace CartesianKernelFunctors { typedef typename K::Point_2 Point_2; typedef typename K::Line_2 Line_2; typedef typename K::Equal_2 Equal_2; - typedef typename K::Less_signed_distance_to_line_2 Less_signed_distance_to_line_2; public: typedef typename K::Comparison_result result_type; @@ -641,7 +640,8 @@ namespace CartesianKernelFunctors { const Point_2& c, const Point_2& d) const { CGAL_kernel_precondition_code(Equal_2 equal;) - CGAL_kernel_precondition(! equal(a,b)); + CGAL_kernel_precondition(! equal(a,b)); + return cmp_signed_dist_to_lineC2( a.x(), a.y(), b.x(), b.y(), c.x(), c.y(), @@ -651,10 +651,9 @@ namespace CartesianKernelFunctors { result_type operator()(const Line_2& l, const Point_2& p, const Point_2& q) const { - Less_signed_distance_to_line_2 less = K().less_signed_distance_to_line_2_object(); - if (less(l, p, q)) return SMALLER; - if (less(l, q, p)) return LARGER; - return EQUAL; + return cmp_signed_dist_to_directionC2(l.a(), l.b(), + p.x(), p.y(), + q.x(), q.y()); } }; diff --git a/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_akl_toussaint.h b/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_akl_toussaint.h index f84b4b41c02..4df696cd96e 100644 --- a/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_akl_toussaint.h +++ b/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_akl_toussaint.h @@ -9,6 +9,7 @@ The resulting sequence is placed starting at position `result`, and the past-the-end iterator for the resulting sequence is returned. It is not specified at which point the cyclic sequence of extreme points is cut into a linear sequence. + \pre The source range [`first`,`beyond`) does not contain `result`. The default traits class `Default_traits` is the kernel in which the value type of `ForwardIterator` is defined. @@ -36,6 +37,8 @@ functions that return instances of these types: \sa `CGAL::ch_graham_andrew()` \sa `CGAL::ch_jarvis()` \sa `CGAL::ch_melkman()` +\sa `CGAL::lower_hull_points_2()` +\sa `CGAL::upper_hull_points_2()` \sa `CGAL::convex_hull_2()` \cgalHeading{Implementation} @@ -49,7 +52,7 @@ points. template OutputIterator ch_akl_toussaint(ForwardIterator first, ForwardIterator beyond, -OutputIterator result, -const Traits& ch_traits = Default_traits()); + OutputIterator result, + const Traits& ch_traits = Default_traits()); } /* namespace CGAL */ diff --git a/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_bykat.h b/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_bykat.h index 4273efd5f1d..03ca5875518 100644 --- a/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_bykat.h +++ b/Convex_hull_2/doc/Convex_hull_2/CGAL/ch_bykat.h @@ -9,6 +9,7 @@ The resulting sequence is placed starting at position `result`, and the past-the-end iterator for the resulting sequence is returned. It is not specified at which point the cyclic sequence of extreme points is cut into a linear sequence. + \pre The source range [`first`,`beyond`) does not contain `result`. The default traits class `Default_traits` is the kernel in which the @@ -24,7 +25,7 @@ the concept `ConvexHullTraits_2` and their corresponding member functions that return instances of these types: