doxy: support both ClassImp() and ClassDef()

[u/mrichter/AliRoot.git] / doxygen / thtml2doxy.py

diff --git a/doxygen/thtml2doxy.py b/doxygen/thtml2doxy.py
index 6f20a373d81447af83ca99fefcfacee0f9a37fac..1347c549ee09338ba8aa4fd557a7c1d94ea850ec 100755 (executable)
--- a/doxygen/thtml2doxy.py
+++ b/doxygen/thtml2doxy.py
@@ -334,7 +334,7 @@ def comment_classdesc(filename, comments, look_no_further_than_line):
   reclass_doxy = r'(?i)^\s*\\(class|file):?\s*([^.]*)'
   class_name_doxy = None
 
-  reauthor = r'(?i)^\s*\\?authors?:?\s*(.*?)\s*(,?\s*([0-9./-]+))?\s*$'
+  reauthor = r'(?i)^\s*\\?(authors?|origin):?\s*(.*?)\s*(,?\s*([0-9./-]+))?\s*$'
   redate = r'(?i)^\s*\\?date:?\s*([0-9./-]+)\s*$'
   author = None
   date = None
@@ -392,10 +392,10 @@ def comment_classdesc(filename, comments, look_no_further_than_line):
         else:
           mauthor = re.search(reauthor, mcomm.group(1))
           if mauthor:
-            author = mauthor.group(1)
+            author = mauthor.group(2)
             if date is None:
               # Date specified in the standalone \date field has priority
-              date = mauthor.group(3)
+              date = mauthor.group(4)
             append = False
           else:
             mdate = re.search(redate, mcomm.group(1))
@@ -472,7 +472,7 @@ def comment_classimp(filename, comments):
   recomm = r'^\s*///?(\s*.*?)\s*/*\s*$'
 
   line_num = 0
-  reclassimp = r'^(\s*)ClassImp\((.*?)\)\s*;?\s*$'
+  reclassimp = r'^(\s*)Class(Imp|Def)\((.*?)\).*$'
 
   in_classimp_cond = False
   restartcond = r'^\s*///\s*\\cond\s+CLASSIMP\s*$'
@@ -497,10 +497,11 @@ def comment_classimp(filename, comments):
         classimp_indent = len( mclassimp.group(1) )
 
         line_classimp = line_num
-        classimp_class = mclassimp.group(2)
+        classimp_class = mclassimp.group(3)
+        imp_or_def = mclassimp.group(2)
         logging.debug(
           'Comment found for ' +
-          Colt( 'ClassImp(' ).magenta() +
+          Colt( 'Class%s(' % imp_or_def ).magenta() +
           Colt( classimp_class ).cyan() +
           Colt( ')' ).magenta() )
 
@@ -527,28 +528,28 @@ def comment_classimp(filename, comments):
       comments.append(Comment(
         ['\cond CLASSIMP'],
         line_startcond, 1, line_startcond, 1,
-        classimp_indent, 'ClassImp(%s)' % classimp_class,
+        classimp_indent, 'ClassImp/Def(%s)' % classimp_class,
         append_empty=False
       ))
     else:
       comments.append(PrependComment(
         ['\cond CLASSIMP'],
         line_classimp, 1, line_classimp, 1,
-        classimp_indent, 'ClassImp(%s)' % classimp_class
+        classimp_indent, 'ClassImp/Def(%s)' % classimp_class
       ))
 
     if line_endcond != -1:
       comments.append(Comment(
         ['\endcond'],
         line_endcond, 1, line_endcond, 1,
-        classimp_indent, 'ClassImp(%s)' % classimp_class,
+        classimp_indent, 'ClassImp/Def(%s)' % classimp_class,
         append_empty=False
       ))
     else:
       comments.append(PrependComment(
         ['\endcond'],
         line_classimp+1, 1, line_classimp+1, 1,
-        classimp_indent, 'ClassImp(%s)' % classimp_class
+        classimp_indent, 'ClassImp/Def(%s)' % classimp_class
       ))