-s = open ('scm/markup.scm', 'r').read ()
-keywords += [w for w in re.findall (r"(?m)^\s*\(cons\s*([a-z-]+)-markup", s)]
+# markup commands
+for name in ['ly/toc-init.ly',
+ 'scm/define-markup-commands.scm',
+ 'scm/fret-diagrams.scm',
+ 'scm/harp-pedals.scm']:
+ s = open (name, 'r').read ()
+ keywords += [w for w in re.findall (r"\(define-markup[a-z-]+\s+\(([a-zA-Z-]+)", s)]