doxy: no trailing empty spaces in comments

diff --git a/doxygen/thtml2doxy.py b/doxygen/thtml2doxy.py
index 40e4515dce63aab02c007d255c5f3991c6ed1d5c..095054abc6d8c63eb122c970720fb2da1505a076 100755 (executable)
--- a/doxygen/thtml2doxy.py
+++ b/doxygen/thtml2doxy.py
@@ -697,15 +697,21 @@ def rewrite_comments(fhin, fhout, comments):
 
   rindent = r'^(\s*)'
 
-
   def dump_comment_block(cmt):
-   text_indent = ''
-   for i in range(0, cmt.indent):
-     text_indent = text_indent + ' '
-
-   for lc in cmt.lines:
-     fhout.write( "%s/// %s\n" % (text_indent, lc) );
-   fhout.write('\n')
+    text_indent = ''
+    for i in range(0, cmt.indent):
+      text_indent = text_indent + ' '
+
+    for lc in cmt.lines:
+      fhout.write('%s///' % text_indent )
+      lc = lc.rstrip()
+      if len(lc) != 0:
+        fhout.write(' ')
+        fhout.write(lc)
+      fhout.write('\n')
+
+    # Empty new line at the end of the comment
+    fhout.write('\n')
 
 
   for line in fhin: