From 09f0c3abfeb005fea96d2215c3a7f3ddabb2e3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?=
 <Philipp.Moeller@geometryfactory.com>
Date: Tue, 21 Aug 2012 12:34:18 +0000
Subject: [PATCH] Add possiblity for packages in the package overview where top
 level and subdirectory diverge.

---
 Documentation/DoxygenLayoutPackage.xml |  6 +++---
 Documentation/doc/packages.txt         |  2 +-
 Documentation/doxyassist.xml           | 20 +++++++++++++++++---
 Documentation/pkglist_filter.sh        |  8 +++++++-
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Documentation/DoxygenLayoutPackage.xml b/Documentation/DoxygenLayoutPackage.xml
index b8830283330..7e79b8a3a28 100644
--- a/Documentation/DoxygenLayoutPackage.xml
+++ b/Documentation/DoxygenLayoutPackage.xml
@@ -2,14 +2,13 @@
   <!-- Navigation index tabs for HTML output -->
   <navindex>
     <tab type="mainpage" visible="yes" title=""/>
-    <tab type="user" url="../../CGAL.CGAL/html/packages.html" title="Packages"/>
-    <tab type="pages" visible="yes" title="" intro=""/>
+    <!-- <tab type="user" url="@ref packagemodule" title="Reference"/> -->
     <tab type="modules" visible="yes" title="" intro=""/>
+    <tab type="pages" visible="yes" title="" intro=""/>
     <tab type="namespaces" visible="yes" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>
       <tab type="namespacemembers" visible="yes" title="" intro=""/>
     </tab>
-
     <tab type="classes" visible="yes" title="">
       <tab type="classlist" visible="yes" title="" intro=""/>
       <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
@@ -21,6 +20,7 @@
       <tab type="globals" visible="yes" title="" intro=""/>
     </tab>
     <tab type="examples" visible="yes" title="" intro=""/>  
+    <tab type="user" url="../../CGAL.CGAL/html/packages.html" title="Packages"/>
   </navindex>
 
   <!-- Layout definition for a class page -->
diff --git a/Documentation/doc/packages.txt b/Documentation/doc/packages.txt
index 00841e7e123..61bff0ea98e 100644
--- a/Documentation/doc/packages.txt
+++ b/Documentation/doc/packages.txt
@@ -57,7 +57,7 @@
 \section PartArrangements Arrangements
 
 \package_listing{Arrangement_on_surface_2}
-\package_listing{Sweep_line_2}
+\package_listing{Arrangement_on_surface_2/Sweep_line_2}
 \package_listing{Snap_rounding_2}
 
 \package_listing{Envelope_2}
diff --git a/Documentation/doxyassist.xml b/Documentation/doxyassist.xml
index ed6f9ecc657..8fc6e00754f 100644
--- a/Documentation/doxyassist.xml
+++ b/Documentation/doxyassist.xml
@@ -31,7 +31,7 @@ namespace for the XML file to be processed properly.  -->
           <item>PkgDescriptionBegin{1}=&lt;table cellpadding=&quot;2&quot; cellspacing=&quot;0&quot;&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;</item>
         </list>
       </doxygen>
-      
+
       <!-- subprojects -->
       <project>
         <name>STL_Extension</name>
@@ -295,8 +295,7 @@ namespace for the XML file to be processed properly.  -->
           <string name="STRIP_FROM_INC_PATH">../Geomview/doc/Geomview/</string>
           <string name="GENERATE_TAGFILE">./tags/Geomview.tag</string>
           <string name="EXAMPLE_PATH">../Geomview/demo</string>
-          <list name="TAGFILES" append="true">
-          </list>
+          <string name="IMAGE_PATH">../Geomview/doc/Geomview/fig</string>
         </doxygen>
       </project>
 
@@ -559,6 +558,18 @@ namespace for the XML file to be processed properly.  -->
         </doxygen>
       </project>
 
+      <project>
+        <name>Sweep_line_2</name>
+        <input>../Arrangement_on_surface_2/doc/Sweep_line_2</input>
+        <doxygen>
+          <string name="STRIP_FROM_PATH">../Arrangement_on_surface_2/doc/Sweep_line_2</string>
+          <string name="STRIP_FROM_INC_PATH">../Sweep_line_2/doc/Nef_3/</string>
+          <string name="GENERATE_TAGFILE">./tags/Sweep_line_2.tag</string>
+          <string name="IMAGE_PATH">../Arrangement_on_surface_2/doc/Sweep_line_2/fig</string>
+          <string name="EXAMPLE_PATH">../Arrangement_on_surface_2/examples</string>
+        </doxygen>
+      </project>
+
       <project>
         <name>Nef_3</name>
         <input>../Nef_3/doc</input>
@@ -586,6 +597,7 @@ namespace for the XML file to be processed properly.  -->
       <output>./output</output>
       <logDirectory>./log</logDirectory>
       <doxygen>
+        <string name="LAYOUT_FILE">DoxygenLayout.xml</string>
         <string name="GENERATE_TAGFILE">./tags/Manual.tag</string>
         <string name="EXAMPLE_PATH">../Convex_hull_2/examples</string>
 
@@ -630,6 +642,7 @@ namespace for the XML file to be processed properly.  -->
           <item>../STL_Extension/doc/STL_Extension/fig</item>
           <item>../Skin_surface_3/doc/Skin_surface_3/fig</item>
           <item>../Snap_rounding_2/doc/Snap_rounding_2/fig</item>
+          <item>../Arrangement_on_surface_2/doc/Sweep_line_2/fig</item>
           <item>../Spatial_searching/doc/Spatial_searching/fig</item>
           <item>../Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/fig</item>
           <item>../Straight_skeleton_2/doc/Straight_skeleton_2/fig</item>
@@ -670,6 +683,7 @@ namespace for the XML file to be processed properly.  -->
           <item>./tags/Principal_component_analysis.tag=../../CGAL.CGAL.Principal_component_analysis/html</item>
           <item>./tags/STL_Extension.tag=../../CGAL.CGAL.STL_Extension/html</item>
           <item>./tags/Skin_surface_3.tag=../../CGAL.CGAL.Skin_surface_3/html</item>
+          <item>./tags/Sweep_line_2.tag=../../CGAL.CGAL.Sweep_line_2/html</item>
           <item>./tags/Snap_rounding_2.tag=../../CGAL.CGAL.Snap_rounding_2/html</item>
           <item>./tags/Spatial_searching.tag=../../CGAL.CGAL.Spatial_searching/html</item>
           <item>./tags/Segment_Delaunay_graph_2.tag=../../CGAL.CGAL.Segment_Delaunay_graph_2/html</item>
diff --git a/Documentation/pkglist_filter.sh b/Documentation/pkglist_filter.sh
index af914c46077..dbfb9461f25 100755
--- a/Documentation/pkglist_filter.sh
+++ b/Documentation/pkglist_filter.sh
@@ -4,7 +4,13 @@ while read -r line
 do     
     pkg=$(echo ${line} | sed -n '/\\package_listing{[^}]*}/p' | sed 's/\\package_listing{\([^}]*\)}/\1/')
     if [ -n "${pkg}" ]; then
-        cat "../${pkg}/doc/${pkg}/PackageDescription.txt" | sed -n '/PkgDescriptionBegin/,/PkgDescriptionEnd/p' | sed "s/\(\\PkgDescriptionBegin{[^}]*\)}/\1,${pkg}}/"
+        top_level=${pkg%/*}
+        lower_level=${pkg##*/}
+        if [ -n "${top_level}" ]; then
+            cat "../${top_level}/doc/${lower_level}/PackageDescription.txt" | sed -n '/PkgDescriptionBegin/,/PkgDescriptionEnd/p' | sed "s/\(\\PkgDescriptionBegin{[^}]*\)}/\1,${lower_level}}/"
+        else
+            cat "../${pkg}/doc/${pkg}/PackageDescription.txt" | sed -n '/PkgDescriptionBegin/,/PkgDescriptionEnd/p' | sed "s/\(\\PkgDescriptionBegin{[^}]*\)}/\1,${pkg}}/"
+        fi
     else
         echo -E "${line}"
     fi