[gtk-doc] scan: detect XxxYyyyPrivate structs and move to standard section

[Stefan Kost <stefkost src gnome org>]

commit 5fb843d000a97fb1b640816b870fd4eb41a30bbd
Author: Stefan Sauer <ensonic users sf net>
Date:   Fri Aug 26 20:41:03 2011 +0200

    scan: detect XxxYyyyPrivate structs and move to standard section

 gtkdoc-scan.in |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
index 30c51af..aff585b 100755
--- a/gtkdoc-scan.in
+++ b/gtkdoc-scan.in
@@ -837,6 +837,8 @@ sub ScanHeader {
     # Try to separate the standard macros and functions, placing them at the
     # end of the current section, in a subsection named 'Standard'.
     # do this in a loop to catch object, enums and flags
+    # FIXME: we still leave XxxXxxxxClass in the normal section, it would be
+    # nice to hide it, if it is not documented and empty (only parent) 
     my ($class,$lclass);
     my ($standard_decl) = "";
     do {
@@ -857,17 +859,22 @@ sub ScanHeader {
         }
     
         if ($class ne "") {
-            while ($list =~ s/^\S+_IS_$class\n//m)          { $standard_decl .= $&; }
-            while ($list =~ s/^\S+_TYPE_$class\n//m)        { $standard_decl .= $&; }
-            while ($list =~ s/^\S+_${lclass}_get_type\n//m) { $standard_decl .= $&; }
-            while ($list =~ s/^\S+_${class}_CLASS\n//m)     { $standard_decl .= $&; }
-            while ($list =~ s/^\S+_IS_${class}_CLASS\n//m)  { $standard_decl .= $&; }
-            while ($list =~ s/^\S+_${class}_GET_CLASS\n//m) { $standard_decl .= $&; }
-            while ($list =~ s/^\S+_${class}_GET_IFACE\n//m) { $standard_decl .= $&; }
+            my ($cclass) = $lclass;
+            $cclass =~ s/_//g;
+            
+            if ($list =~ s/^\S+${cclass}Private\n//im)          { $standard_decl .= $&; }
+            
+            while ($list =~ s/^\S+_IS_$class\n//m)              { $standard_decl .= $&; }
+            while ($list =~ s/^\S+_TYPE_$class\n//m)            { $standard_decl .= $&; }
+            while ($list =~ s/^\S+_${lclass}_get_type\n//m)     { $standard_decl .= $&; }
+            while ($list =~ s/^\S+_${class}_CLASS\n//m)         { $standard_decl .= $&; }
+            while ($list =~ s/^\S+_IS_${class}_CLASS\n//m)      { $standard_decl .= $&; }
+            while ($list =~ s/^\S+_${class}_GET_CLASS\n//m)     { $standard_decl .= $&; }
+            while ($list =~ s/^\S+_${class}_GET_IFACE\n//m)     { $standard_decl .= $&; }
             while ($list =~ s/^\S+_${class}_GET_INTERFACE\n//m) { $standard_decl .= $&; }
     
             # We do this one last, otherwise it tends to be caught by the IS_$class macro
-            while ($list =~ s/^\S+_$class\n//m)           { $standard_decl .= $&; }
+            while ($list =~ s/^\S+_$class\n//m)                 { $standard_decl .= $&; }
             
             @TRACE@("Decl '".join(",",split("\n",$list))."'\n");
             @TRACE@("Std  '".join(",",split("\n",$standard_decl))."'\n");