diff --git a/Documentation/doc/packages.txt b/Documentation/doc/packages.txt
index b0dd7ec6ddb..abd0419a096 100644
--- a/Documentation/doc/packages.txt
+++ b/Documentation/doc/packages.txt
@@ -13,213 +13,134 @@ h1 {
\section PartAlgebraicFoundations Arithmetic and Algebra
-
\package_listing{Algebraic_foundations}
-
\package_listing{Number_types}
-
\package_listing{Modular_arithmetic}
-
\package_listing{Polynomial}
-
\package_listing{Algebraic_kernel_d}
\section PartCombinatorialAlgorithms Combinatorial Algorithms
-
\package_listing{Matrix_search}
-
\package_listing{QP_solver}
\section PartKernels Geometry Kernels
-
\package_listing{Kernel_23}
-
\package_listing{Kernel_d}
-
\package_listing{Circular_kernel_2}
-
\package_listing{Circular_kernel_3}
\section PartConvexHullAlgorithms Convex Hull Algorithms
-
\package_listing{Convex_hull_2}
-
\package_listing{Convex_hull_3}
-
\package_listing{Convex_hull_d}
\section PartPolygons Polygons
-
\package_listing{Polygon}
-
\package_listing{Boolean_set_operations_2}
-
\package_listing{Nef_2}
-
\package_listing{Nef_S2}
-
\package_listing{Partition_2}
-
\package_listing{Straight_skeleton_2}
-
\package_listing{Minkowski_sum_2}
\section PartPolyhedra Cell Complexes and Polyhedra
-
\package_listing{Polyhedron}
-
\package_listing{HalfedgeDS}
-
\package_listing{Combinatorial_map}
-
\package_listing{Linear_cell_complex}
-
\package_listing{Nef_3}
-
\package_listing{Convex_decomposition_3}
-
\package_listing{Minkowski_sum_3}
\section PartArrangements Arrangements
-
\package_listing{Arrangement_on_surface_2}
-
\package_listing{Arrangement_on_surface_2/Sweep_line_2}
-
\package_listing{Snap_rounding_2}
-
\package_listing{Envelope_2}
-
\package_listing{Envelope_3}
\section PartTriangulationsAndDelaunayTriangulations Triangulations and Delaunay Triangulations
-
\package_listing{Triangulation_2}
-
\package_listing{Triangulation_2/TDS_2}
-
\package_listing{Triangulation_3}
-
\package_listing{Triangulation_3/TDS_3}
-
\package_listing{Periodic_3_triangulation_3}
-
\package_listing{Alpha_shapes_2}
-
\package_listing{Alpha_shapes_3}
\section PartVoronoiDiagrams Voronoi Diagrams
-
\package_listing{Segment_Delaunay_graph_2}
-
\package_listing{Apollonius_graph_2}
-
\package_listing{Voronoi_diagram_2}
\section PartMeshing Mesh Generation
-
\package_listing{Mesh_2}
-
\package_listing{Surface_mesher}
-
\package_listing{Surface_reconstruction_points_3}
-
\package_listing{Skin_surface_3}
-
\package_listing{Mesh_3}
\section PartGeometryProcessing Geometry Processing
-
\package_listing{Subdivision_method_3}
-
\package_listing{Surface_mesh_simplification}
-
\package_listing{Surface_mesh_parameterization}
-
\package_listing{Stream_lines_2}
-
\package_listing{Ridges_3}
-
\package_listing{Jet_fitting_3}
-
\package_listing{Point_set_processing_3}
\section PartSearchStructures Spatial Searching and Sorting
-
\package_listing{Point_set_2}
-
\package_listing{Interval_skip_list}
-
\package_listing{Spatial_searching}
-
\package_listing{SearchStructures}
-
\package_listing{Box_intersection_d}
-
\package_listing{AABB_tree}
-
\package_listing{Spatial_sorting}
\section PartGeometricOptimization Geometric Optimization
-
\package_listing{Bounding_volumes}
-
\package_listing{Inscribed_areas}
-
\package_listing{Polytope_distance_d}
-
\package_listing{Principal_component_analysis}
\section PartInterpolation Interpolation
-
\package_listing{Interpolation}
\section PartKineticDataStructures Kinetic Data Structures
-
\package_listing{Kinetic_data_structures}
-
\package_listing{Kinetic_data_structures/Kinetic_framework}
\section PartSupportLibrary Support Library
-
\package_listing{STL_Extension}
-
\package_listing{BGL}
-
\package_listing{Point_set_processing_3/Property_map}
-
\package_listing{Circulator}
-
\package_listing{Generator}
-
\package_listing{Miscellany}
-
\package_listing{Stream_support/IOstream}
\section PartVisualization Visualization
-
\package_listing{Geomview}
-
\package_listing{GraphicsView}
-
\package_listing{CGAL_ipelets}
*/
diff --git a/Documentation/doxyassist.xml b/Documentation/doxyassist.xml
index d994041969b..28b089cbef0 100644
--- a/Documentation/doxyassist.xml
+++ b/Documentation/doxyassist.xml
@@ -37,7 +37,7 @@ namespace for the XML file to be processed properly. -->
cgal_package_stylesheet.css
DoxygenLayoutPackage.xml
- - PkgDescriptionBegin{1}=<table cellpadding="2" cellspacing="0"><tr><td colspan="2"></td></tr><tr>
+ - PkgDescriptionBegin{2}=<table cellpadding="2" cellspacing="0"><tr><td colspan="2"></td></tr><tr>
- PkgManuals{2}=
header_package.html
@@ -1465,7 +1465,7 @@ namespace for the XML file to be processed properly. -->
true
false
- - PkgDescriptionBegin{2}=<table cellpadding="2" cellspacing="0"><tr><td colspan="2"><h2><a href="../../CGAL.CGAL.\2/html/index.html">\1</a></h2></td></tr><tr>
+ - PkgDescriptionBegin{2}=\subsection \2 \1 \n<table cellpadding="2" cellspacing="0"><tr>
- PkgManuals{2}=\par "Manuals"\ref \1 "User Manual" \ref \2 "Reference Manual"
diff --git a/Documentation/pkglist_filter.sh b/Documentation/pkglist_filter.sh
index 82d7501c554..b51ebc3be20 100755
--- a/Documentation/pkglist_filter.sh
+++ b/Documentation/pkglist_filter.sh
@@ -11,8 +11,7 @@ do
else
filename="../${pkg}/doc/${pkg}/PackageDescription.txt"
fi
- sed -n '/PkgDescriptionBegin/,/PkgDescriptionEnd/p' < "$filename" | \
- awk '/\\PkgDescriptionBegin{[^}]*}/ { match($0, "(\\\\PkgDescriptionBegin{)([^}]*)}", a); esc=a[2]; gsub(/ |(\\,)|\(|\)/, "-", esc); printf("%s%s,%s}", a[1], a[2], esc); next} {print}'
+ sed -n '/PkgDescriptionBegin/,/PkgDescriptionEnd/p' < "$filename"
else
echo -E "${line}"
fi