X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fbuild%2Flilypond-words.py;h=4768c5dfeae9228fa0753b7d16e79c0ae67408a7;hb=57817ab4e80df96e604b50a766c23ebabf72fc66;hp=56cab778ea2152c4a31079972c78af099d4d1c42;hpb=10ea32bdf05e76a871aa81273815ac658ccd0143;p=lilypond.git

diff --git a/scripts/build/lilypond-words.py b/scripts/build/lilypond-words.py
index 56cab778ea..4768c5dfea 100644
--- a/scripts/build/lilypond-words.py
+++ b/scripts/build/lilypond-words.py
@@ -21,8 +21,13 @@ keywords += ['include', 'maininput', 'version']
 s = open ('lily/lily-lexer.cc', 'r').read ()
 keywords += [w for w in re.findall (r"\s*{\"(.+)\",\s*.*},\s*\n", s)]
 
-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)]
 
 # identifiers and keywords
 for name in ['ly/chord-modifiers-init.ly',
@@ -36,25 +41,14 @@ for name in ['ly/chord-modifiers-init.ly',
              'ly/scale-definitions-init.ly',
              'ly/script-init.ly',
              'ly/spanners-init.ly',
+             'ly/toc-init.ly',
              'ly/declarations-init.ly']:
     s = open (name, 'r').read ()
     keywords += [w for w in re.findall (r"(?m)^\s*\"?([a-zA-Z]+)\"?\s*=", s)]
 
 # note names
-for name in ['ly/catalan.ly',
-             'ly/deutsch.ly',
-             'ly/drumpitch-init.ly',
-             'ly/english.ly',
-             'ly/espanol.ly',
-             'ly/italiano.ly',
-             'ly/nederlands.ly',
-             'ly/norsk.ly',
-             'ly/portugues.ly',
-             'ly/suomi.ly',
-             'ly/svenska.ly',
-             'ly/vlaams.ly']:
-    s = open (name, 'r').read ()
-    note_names += [n for n in re.findall (r"(?m)^\s*\(([a-z]+)[^l]+ly:make-pitch", s)]
+s = open ('scm/define-note-names.scm', 'r').read ()
+note_names += [n for n in re.findall (r"(?m)^\s*\(([a-z]+)\s+\.\s+,\(ly:make-pitch", s)]
 
 # reserved words
 for name in ['ly/engraver-init.ly',
@@ -125,9 +119,9 @@ if out_el:
                   '//markup - { _ } -',
                   '//notes - { _ } -',
                   '//relative - % { _ } -',
-                  '//score - { //n /? //simultaneous { //n _ //n } /! //n //paper {  } //n /? //midi {  } //n /! } //n -',
+                  '//score - { //n /? //simultaneous { //n _ //n } /! //n //layout {  } //n /? //midi {  } //n /! } //n -',
                   '//simultaneous - { _ } -',
-                  '//sustainDown - _ //sustainUp -',
+                  '//sustainOn - _ //sustainOff -',
                   '//times - % { _ } -',
                   '//transpose - % { _ } -',
                   '']
@@ -145,4 +139,4 @@ if out_vim:
 
     f.write ('syn match lilyNote \"\\<\\(\\(\\(')
     f.write (''.join ([w + '\\|' for w in note_names]))
-    f.write ('a\\)\\([,\']\\)\\{,4}\\([?!]\\)\\?\\)\\|s\\|r\\)\\(\\(128\\|64\\|32\\|16\\|8\\|4\\|2\\|1\\|\\\\breve\\|\\\\longa\\|\\\\maxima\\)[.]\\{,8}\\)\\?\\(\\A\\|\\n\\)\"me=e-1\n')
+    f.write ('a\\)\\([,\']\\)\\{,4}\\([?!]\\)\\?\\)\\|s\\|r\\|R\\|q\\)\\(\\(128\\|64\\|32\\|16\\|8\\|4\\|2\\|1\\|\\\\breve\\|\\\\longa\\|\\\\maxima\\)[.]\\{,8}\\)\\?\\(\\A\\|\\n\\)\"me=e-1\n')