add a link to common demo dlls and update demo macro to avoid repeating Demo

sloriot · sloriot · commit 979306eb9342 · 2013-10-22T12:16:48.000+02:00
diff --git a/Documentation/BaseDoxyfile.in b/Documentation/BaseDoxyfile.in
@@ -268,7 +268,10 @@ ALIASES += "cgalPkgDesc{1}=<div class=\"PkgDescription\">\1</div>"
 ALIASES += "cgalPkgSince{1}=<B>Introduced in:</B> \cgal \1<BR>"
 ALIASES += "cgalPkgDependsOn{1}=<B>Depends on:</B> \1 <BR>"
 ALIASES += "cgalPkgLicense{1}=<B>License:</B> \1 <BR>"
-ALIASES += "cgalPkgDemo{2}=<B>Demo:</B> <a href=\"http://www.cgal.org/demo/4.3/\2\">\1</a><BR>"
+ALIASES += "cgalPkgDemo{2}=<B>Windows Demo:</B> <a href=\"http://www.cgal.org/demo/4.3/\2\">\1</a><BR><B>Common Demo Dlls:</B> <a href=\"http://www.cgal.org/demo/4.3/\2\">dlls</a><BR>"
+ALIASES += "cgalPkgDemo{4}=<B>Windows Demos:</B> <a href=\"http://www.cgal.org/demo/4.3/\2\">\1</a>, <a href=\"http://www.cgal.org/demo/4.3/\4\">\3</a><BR><B>Common Demo Dlls:</B> <a href=\"http://www.cgal.org/demo/4.3/\2\">dlls</a><BR>"
+ALIASES += "cgalPkgDemo{6}=<B>Windows Demos:</B> <a href=\"http://www.cgal.org/demo/4.3/\2\">\1</a>, <a href=\"http://www.cgal.org/demo/4.3/\4\">\3</a>, <a href=\"http://www.cgal.org/demo/4.3/\6\">\5</a><BR><B>Common Demo Dlls:</B> <a href=\"http://www.cgal.org/demo/4.3/\2\">dlls</a><BR>"
+
 ALIASES += "cgalPkgDescriptionEnd="
 
 # this alias controls linking to the how to cite page, it is also
diff --git a/Envelope_3/doc/Envelope_3/PackageDescription.txt b/Envelope_3/doc/Envelope_3/PackageDescription.txt
@@ -16,8 +16,7 @@
 \cgalPkgDependsOn{\ref PkgArrangement2Summary}
 \cgalPkgBib{cgal:mwz-e3}
 \cgalPkgLicense{\ref licensesGPL  "GPL"}
-\cgalPkgDemo{3D Envelopes,envelope_3.zip}
-\cgalPkgDemo{L1 Voronoi Diagram,l1_voronoi_diagram_2.zip}
+\cgalPkgDemo{3D Envelopes,envelope_3.zip,L1 Voronoi Diagram,l1_voronoi_diagram_2.zip}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
diff --git a/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt b/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt
@@ -17,8 +17,7 @@
 \cgalPkgSince{1.1}
 \cgalPkgBib{cgal:hp-ia}
 \cgalPkgLicense{\ref licensesGPL "GPL"}
-\cgalPkgDemo{2D Inscribed k-gon as part of Polygon demo,polygon.zip}
-\cgalPkgDemo{2D Largest Empty Rectangle,largest_empty_rect_2.zip}
+\cgalPkgDemo{2D Inscribed k-gon as part of Polygon demo,polygon.zip,2D Largest Empty Rectangle,largest_empty_rect_2.zip}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
diff --git a/Partition_2/doc/Partition_2/PackageDescription.txt b/Partition_2/doc/Partition_2/PackageDescription.txt
@@ -19,8 +19,7 @@
 \cgalPkgSince{2.3}
 \cgalPkgBib{cgal:h-pp2}
 \cgalPkgLicense{\ref licensesGPL  "GPL"}
-\cgalPkgDemo{2D Polygon Partition,partition_2.zip}
-\cgalPkgDemo{Operations on Polygons,polygon.zip}
+\cgalPkgDemo{2D Polygon Partition,partition_2.zip,Operations on Polygons,polygon.zip}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
diff --git a/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt b/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt
@@ -29,9 +29,7 @@
 \cgalPkgSince{3.2}
 \cgalPkgBib{cgal:ap-pcad}
 \cgalPkgLicense{\ref licensesGPL "GPL"}
-\cgalPkgDemo{Principal Component Analysis,pca.zip}
-\cgalPkgDemo{Operations on Polygons,polygon.zip}
-\cgalPkgDemo{Operations on Polyhedra,polyhedron_3.zip}
+\cgalPkgDemo{Principal Component Analysis,pca.zip,Operations on Polygons,polygon.zip,Operations on Polyhedra,polyhedron_3.zip}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt b/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt
@@ -26,8 +26,7 @@
 \cgalPkgDependsOn{\ref PkgHDSSummary}
 \cgalPkgBib{cgal:c-sspo2}
 \cgalPkgLicense{\ref licensesGPL  "GPL"}
-\cgalPkgDemo{2D Straight Skeleton,straight_skeleton_2.zip}
-\cgalPkgDemo{Operations on Polygons,polygon.zip}
+\cgalPkgDemo{2D Straight Skeleton,straight_skeleton_2.zip,Operations on Polygons,polygon.zip}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
diff --git a/Triangulation_2/doc/Triangulation_2/PackageDescription.txt b/Triangulation_2/doc/Triangulation_2/PackageDescription.txt
@@ -31,9 +31,7 @@
 \cgalPkgDependsOn{\ref PkgTDS2Summary}
 \cgalPkgBib{cgal:y-t2}
 \cgalPkgLicense{\ref licensesGPL "GPL"}
-\cgalPkgDemo{Delaunay Triangulation,delaunay_triangulation_2.zip}
-\cgalPkgDemo{Regular Triangulation,regular_triangulation_2.zip}
-\cgalPkgDemo{Constrained Delaunay Triangulation,constrained_delaunay_triangulation_2.zip}
+\cgalPkgDemo{Delaunay Triangulation,delaunay_triangulation_2.zip,Regular Triangulation,regular_triangulation_2.zip,Constrained Delaunay Triangulation,constrained_delaunay_triangulation_2.zip}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/PackageDescription.txt b/Voronoi_diagram_2/doc/Voronoi_diagram_2/PackageDescription.txt
@@ -26,9 +26,7 @@
 \cgalPkgSince{3.2}
 \cgalPkgBib{cgal:k-vda2}
 \cgalPkgLicense{\ref licensesGPL "GPL"}
-\cgalPkgDemo{2D Point Voronoi Diagram ,delaunay_triangulation_2.zip}
-\cgalPkgDemo{2D Disk Voronoi Diagram,apollonius_graph_2.zip}
-\cgalPkgDemo{2D Segment Voronoi Diagram,segment_voronoi_diagram_2.zip}
+\cgalPkgDemo{2D Point Voronoi Diagram ,delaunay_triangulation_2.zip,2D Disk Voronoi Diagram,apollonius_graph_2.zip,2D Segment Voronoi Diagram,segment_voronoi_diagram_2.zip}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
