Changeset 753 for trunk/MagicSoft/Mars/mbase

Timestamp:

04/18/01 16:26:42 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MHtml.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mbase/MHtml.cc

@@ -1 @@
-// @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.cc,v 1.1 2001-04-18 13:34:23 tbretz Exp $
+// @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.cc,v 1.2 2001-04-18 15:26:04 tbretz Exp $
 // Author: Nenad Buncic   18/10/95
 
@@ -722 +722 @@
     Bool_t postponeMemberDescr = kFALSE;
     Bool_t skipMemberName      = kFALSE;
+    Bool_t writeBracket        = kFALSE;
     streampos postponedpos = 0;
 
@@ -824 +825 @@
 
 
-                    if( extractComments ) {
+                    if( extractComments) {
                         if( firstCommentLine ) {
                             out << "<pre>";
@@ -948 +949 @@
 
                     if( method ) {
+
                         if (skipMemberName)
                         {
                             skipMemberName = kFALSE;
+                            writeBracket = kTRUE;
                             sourceFile.seekg(postponedpos);
                         }
@@ -1057 +1060 @@
                                     ExpandKeywords( out, nameEndPtr, classPtr, flag );
                                     out << "<br>" << endl;
+
                                     if (postponeMemberDescr)
                                     {
-                                        postponeMemberDescr = kFALSE;
                                         streampos pos = sourceFile.tellg();
                                         sourceFile.seekg(postponedpos);
                                         postponedpos = pos;
                                         skipMemberName = kTRUE;
+                                        postponeMemberDescr = kFALSE;
                                     }
                                     extractComments = kTRUE;
@@ -1075 +1079 @@
 
                 // write to '.cxx.html' file
-                if( thisLineIsPpLine )
-                    ExpandPpLine( tempFile, fLine );
-                else {
-                    if( thisLineIsCommented ) tempFile << "<b>";
-                    ExpandKeywords( tempFile, fLine, classPtr, tempFlag, "../" );
-                    if( thisLineIsCommented ) tempFile << "</b>";
+                if (!skipMemberName)
+                {
+                    if( thisLineIsPpLine )
+                        ExpandPpLine( tempFile, fLine );
+                    else {
+                        if( thisLineIsCommented) tempFile << "<b>";
+                        ExpandKeywords( tempFile, fLine, classPtr, tempFlag, "../" );
+                        if( thisLineIsCommented ) tempFile << "</b>";
+                    }
+                    tempFile << endl;
+
+                    if (writeBracket)
+                    {
+                        writeBracket = kFALSE;
+                        tempFile << "{" << endl;
+                    }
                 }
-                tempFile << endl;
+
             }
             tempFile << "</pre>" << endl;