From c2d57c1740eaf8aacb3e095f402556cd98259c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 21 Nov 2012 10:51:04 +0100 Subject: [PATCH 1/2] fix mismatch of {} --- .../doc/Boolean_set_operations_2/Boolean_set_operations_2.txt | 2 +- .../package_info/Boolean_set_operations_2/long_description.txt | 2 +- .../doc/Developer_manual/Chapter_iterators_and_circulators.txt | 2 +- Documentation/doc/Developer_manual/Chapter_traits_classes.txt | 2 +- Triangulation_3/doc/Triangulation_3/Triangulation_3.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Boolean_set_operations_2.txt b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Boolean_set_operations_2.txt index 30d83027a3a..8589479300a 100644 --- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Boolean_set_operations_2.txt +++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Boolean_set_operations_2.txt @@ -158,7 +158,7 @@ void print_polygon (const CGAL::Polygon_2& P) for (vit = P.vertices_begin(); vit != P.vertices_end(); ++vit) std::cout << " (" << *vit << ')'; std::cout << " ]" << std::endl; - } +} \endcode In this section we use the term polygon to indicate a diff --git a/Boolean_set_operations_2/package_info/Boolean_set_operations_2/long_description.txt b/Boolean_set_operations_2/package_info/Boolean_set_operations_2/long_description.txt index 81a26ea056d..4ff861d3b93 100644 --- a/Boolean_set_operations_2/package_info/Boolean_set_operations_2/long_description.txt +++ b/Boolean_set_operations_2/package_info/Boolean_set_operations_2/long_description.txt @@ -1,6 +1,6 @@ This package consists of the implementation of Boolean set-operations on point sets bounded by weakly x-monotone curves in 2-dimensional -Euclidean space. (Continuous planar curves or vertical segments.} In +Euclidean space. (Continuous planar curves or vertical segments.) In particular, it contains the implementation of regularized Boolean set-operations, intersection predicates, and point containment predicates. diff --git a/Documentation/doc/Developer_manual/Chapter_iterators_and_circulators.txt b/Documentation/doc/Developer_manual/Chapter_iterators_and_circulators.txt index fa30575895e..0b770e68f8a 100644 --- a/Documentation/doc/Developer_manual/Chapter_iterators_and_circulators.txt +++ b/Documentation/doc/Developer_manual/Chapter_iterators_and_circulators.txt @@ -281,7 +281,7 @@ computes the convex hull of a set of points in two dimensions: // 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.} +// cyclic sequence of extreme points is cut into a linear sequence. template OutputIterator convex_hull_points_2(InputIterator first, InputIterator beyond, diff --git a/Documentation/doc/Developer_manual/Chapter_traits_classes.txt b/Documentation/doc/Developer_manual/Chapter_traits_classes.txt index 0ac149afff3..502d219c15a 100644 --- a/Documentation/doc/Developer_manual/Chapter_traits_classes.txt +++ b/Documentation/doc/Developer_manual/Chapter_traits_classes.txt @@ -74,7 +74,7 @@ template ch_graham_andrew( InputIterator first, InputIterator beyond, OutputIterator result, - const Traits & ch_traits);} + const Traits & ch_traits); \endcode You notice that there is a template parameter named `Traits`, diff --git a/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt b/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt index 56e0d422f7a..4e88b199144 100644 --- a/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt +++ b/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt @@ -155,7 +155,7 @@ where \f$ \|{p-z}\|\f$ is the Euclidean distance between \f$ p\f$ and \f$ z\f$. are said to be orthogonal iff \f$ \Pi{({p}^{(w)},{z}^{(w)})} = 0\f$ (see \cgalFigureRef{Triangulation3figortho)}. -\cgalFigureBegin{Triangulation3figortho,ortho.gif] +\cgalFigureBegin{Triangulation3figortho,ortho.gif} Orthogonal weighted points (picture in 2D). \cgalFigureEnd From 2b0f810c02b087a300259137b479837958f4ba20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 21 Nov 2012 11:00:41 +0100 Subject: [PATCH 2/2] use figure macros --- .../CGAL/Regular_triangulation_3.h | 2 +- .../doc/Triangulation_3/Triangulation_3.txt | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h index d18a34fd251..5139a97e263 100644 --- a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h +++ b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h @@ -17,7 +17,7 @@ defined as where \f$ \|{p-z}\|\f$ is the Euclidean distance between \f$ p\f$ and \f$ z\f$. \f$ {p}^{(w)}\f$ and \f$ {z}^{(w)}\f$ are said to be orthogonal if \f$ \Pi{({p}^{(w)}-{z}^{(w)})} -= 0\f$ (see Figure \ref Triangulation3figortho). += 0\f$ (see Figure \cgalFigureRef{Triangulation3figortho}). Four weighted points have a unique common orthogonal weighted point called the power sphere. A sphere \f$ {z}^{(w)}\f$ is said to be diff --git a/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt b/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt index 4e88b199144..584fff76009 100644 --- a/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt +++ b/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt @@ -47,8 +47,9 @@ of the underlying Euclidean space \f$ \R^3\f$ (see indexed with 0, 1, 2, 3 in such a way that the neighbor indexed by \f$ i\f$ is opposite to the vertex with the same index. -\anchor Triangulation3figorient -\image html orient.gif "Orientation of a cell (3-dimensional case)." +\cgalFigureBegin{Triangulation3figorient,orient.gif} +Orientation of a cell (3-dimensional case). +\cgalFigureEnd As in the underlying combinatorial triangulation (see Chapter \ref chapterTDS3 "3D Triangulation Data Structure"), @@ -545,6 +546,7 @@ version 4.3.2, under Linux (Fedora 10 distribution), with the compilation option -O3 -DCGAL_NDEBUG. The computer used was equipped with a 64bit Intel Xeon 3GHz processor and 32GB of RAM (a recent desktop machine as of 2009). +\cgalFigureAnchor{Triangulation3figbenchmarks}
@@ -718,10 +720,10 @@ Vertex removal 1.38e-04
-
-CAPTION Running times in seconds for algorithms on 3D triangulations. -\anchor Triangulation3figbenchmarks +\cgalFigureCaptionBegin{Triangulation3figbenchmarks} +Running times in seconds for algorithms on 3D triangulations. +\cgalFigureCaptionEnd More benchmarks comparing \cgal to other software can be found in \cite msri52:liu-snoeyink-05. @@ -752,6 +754,7 @@ internal bookkeeping is otherwise on the order of \f$ O(\sqrt{n})\f$. points, as measured empirically using `Memory_sizer` for large triangulations (\f$ 10^6\f$ random points). +\cgalFigureAnchor{Triangulation3figmemory}
@@ -803,10 +806,10 @@ points, as measured empirically using `Memory_sizer` for large triangulations 527
-
-CAPTION Memory usage in bytes per point for large data sets. -\anchor Triangulation3figmemory +\cgalFigureCaptionBegin{Triangulation3figmemory} +Memory usage in bytes per point for large data sets. +\cgalFigureCaptionEnd \subsection Triangulation_3VariabilityDependingonthe Variability Depending on the Data Sets and the Kernel @@ -855,7 +858,7 @@ triangulation. General introductory information about these robustness issues can be found in \cite cgta-kmpsy-08. More benchmarks around this issue can also be found in \cite cgal:dp-eegpd-03. -\anchor Triangulation3figkernelsanddatasets +\cgalFigureAnchor{Triangulation3figkernelsanddatasets}
@@ -956,8 +959,10 @@ Number of points 75.2
-Running times (seconds) for various kernels and data sets.
+\cgalFigureCaptionBegin{Triangulation3figkernelsanddatasets} +Running times (seconds) for various kernels and data sets. +\cgalFigureCaptionEnd \cgalFigureBegin{Triangulation3figdatasets,api1_01.gif,b35-1.gif,HD.gif}