Improvements and bugfixes to the depot_tools doc generation process.

docs/src/filter_demo_output.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import os
 import re
 import sys
 
@@ skipping 59 matching lines @@
   callouts = collections.defaultdict(int)
   for i, line in enumerate(output.splitlines(True)):
     m = callout_re.match(line)
     if m:
       callouts[i + int(m.group(1)) - len(callouts)] += 1
 
   output = callout_re.sub('', output)
 
   w = sys.stdout.write
 
+  comment_marker = '###COMMENT###'
+
   callout_counter = 1
   if backend == 'xhtml11':
     preamble = (
         '</p></div><div class="listingblock"><div class="content"><pre><code>'
     )
     postamble = '</code></pre></div></div><p><div class="paragraph">'
     c = ansi2html.Ansi2HTMLConverter(inline=True, scheme='custom')
 
     in_code = False
     body = c.convert(output, full=False)
     for i, line in enumerate(body.splitlines()):
-      if line.startswith('# '):
+      if line.startswith(comment_marker):
         if in_code:
           w(postamble)
           in_code = False
-        w(line[1:])
+        w(line[len(comment_marker):])
       else:
         if not in_code:
           w(preamble)
           in_code = True
         ext = ''
         for _ in xrange(callouts[i]):
           if not ext:
             ext += '</span>'
           ext += ' <b>&lt;%d&gt;</b>' % callout_counter
           callout_counter += 1
         if ext:
           ext += '<span>'
         w(line + ext + '\n')
     if in_code:
       w(postamble)
   else:
     preamble = '</simpara><literallayout class="monospaced">'
     postamble = '</literallayout><simpara>'
 
     in_code = False
     body = simpleXML(output)
     for i, line in enumerate(body.splitlines()):
-      if line.startswith('# '):
+      if line.startswith(comment_marker):
         if in_code:
           w(postamble)
           in_code = False
-        w(line[1:])
+        w(line[len(comment_marker):])
       else:
         if not in_code:
           w(preamble)
           in_code = True
         ext = ''
         for _ in xrange(callouts[i]):
           ext += '  <emphasis role="strong">(%d)</emphasis>' % callout_counter
           callout_counter += 1
         w(line + ext + '\n')
     if in_code:
       w(postamble)
 
 
 if __name__ == '__main__':
   main()