From 1ffd3d70c2afa54b12045058be6c5155b00fc2cc Mon Sep 17 00:00:00 2001
From: abv <abv@opencascade.com>
Date: Mon, 8 Sep 2014 18:17:50 +0400
Subject: [PATCH] 0025226: Reference Manual -- list of classes in package is
 polluted

Documentation generator corrected to avoid adding irrelevant classes to the package list.
---
 adm/gendoc.tcl |  2 +-
 adm/occaux.tcl | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/adm/gendoc.tcl b/adm/gendoc.tcl
index 2242696f96..87e02d5154 100644
--- a/adm/gendoc.tcl
+++ b/adm/gendoc.tcl
@@ -684,7 +684,7 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod
       foreach tk [$module:toolkits] {
         foreach pk [split [OCCDoc_GetPackagesList [OCCDoc_Locate $tk $productsPath]]] {
           if { [llength $pk] != "{}" } {
-            lappend filelist [OCCDoc_GetHeadersList "p" "pubinclude" "$pk" "$productsPath"]
+            lappend filelist [OCCDoc_GetHeadersList "p" "$pk" "$productsPath"]
           }
         }
       }
diff --git a/adm/occaux.tcl b/adm/occaux.tcl
index 161fd74ab4..f732f0106b 100644
--- a/adm/occaux.tcl
+++ b/adm/occaux.tcl
@@ -537,26 +537,15 @@ proc OCCDoc_GetModulesList { {theProductsDir ""} } {
 }
 
 # Returns list of desired files in the specified location
-proc OCCDoc_GetHeadersList { theDesiredContent theFileType thePackageName {theProductsDir ""} } {
+proc OCCDoc_GetHeadersList { theDesiredContent thePackageName {theProductsDir ""} } {
+
+  # Get list of header files with path
+  set files_list [split [glob -nocomplain -type f -directory "[OCCDoc_GetIncDir $theProductsDir]" "${thePackageName}.hxx" "${thePackageName}_*.hxx"]]
 
-  # Get file type
-  set file_type_pattern "*.*"
-  if { $theFileType == "pubinclude" } {
-    set file_type_pattern "*.*"
-  } elseif { $theFileType == "privinclude" } {
-    set file_type_pattern "*.ixx"
-  }
-  
   # Get content according to desired type ('p' for path and 'f' for filenames only)
   if { $theDesiredContent == "p" } {
-
-    # Get list of files with path
-    set files_list [split [glob -nocomplain -type f -directory "[OCCDoc_GetIncDir $theProductsDir]" "$thePackageName$file_type_pattern"]]
-
     return $files_list
   } elseif { $theDesiredContent == "f" } {
-  # Get list of files without path
-    set files_list [split [glob -nocomplain -type f -directory "[OCCDoc_GetIncDir $theProductsDir]" "$thePackageName$file_type_pattern"]]
 
     # Cut paths from filenames
     foreach file $files_list {
@@ -662,7 +651,7 @@ proc OCCDoc_MakeMainPage {outDir outFile modules {theProductsDir ""} } {
     set u [OCCDoc_GetNameFromPath $pk]
     puts $fd "/**"
     puts $fd "\\page [string tolower $package_prefix$u] Package $u"
-    foreach hdr [lsort [OCCDoc_GetHeadersList "f" "pubinclude" "$pk" "$theProductsDir"]] {
+    foreach hdr [lsort [OCCDoc_GetHeadersList "f" "$pk" "$theProductsDir"]] {
       if { ! [regexp {^Handle_} $hdr] && [regexp {(.*)[.]hxx} $hdr str obj] } {
         puts $fd "\\li \\subpage $obj"
       }