diff --git a/external/lilypond-builtins-generator.ly b/external/lilypond-builtins-generator.ly
index 57023e9b31..6fafca355f 100644
--- a/external/lilypond-builtins-generator.ly
+++ b/external/lilypond-builtins-generator.ly
@@ -28,26 +28,29 @@
 
 #(format port "~a" output-preamble)
 
-% We don't want builtins with special characters in this list since
-% matching them as names in the lexer could cause problems. For example,
-% \= is not included, because accepting ^ in names would cause the =
-% in \set tieWaitForNote=##t to be potentially consumed.
-% So we exclude them here and list them exhaustively in the lexer.
-#(define valid-regexp (make-regexp "^[-_:?!>a-zA-Z]+$"))
-
 #(define (dump-py-list name vals)
    (let* ((string-vals
             (map symbol->string vals))
-          (filtered-vals
-            (filter
-              (lambda (val)
-                (regexp-exec valid-regexp val))
+          (fixed-vals
+            (filter-map
+              (lambda (str)
+                ; To avoid conflicts with Scheme builtins,
+                ; a leading backslash is prepended to \<,
+                ; \= and a few others. The lexer finds it
+                ; itself, so remove it here.
+                (cond
+                  ((equal? str "\\\\")
+                   #f)
+                  ((string-startswith str "\\")
+                   (string-drop str 1))
+                  (else
+                   str)))
               string-vals))
           (sorted-vals ; reproducibility
             ; Avoid duplicates (e.g., identical pitches
             ; in different languages)
             (uniq-list
-              (sort filtered-vals string<?)))
+              (sort fixed-vals string<?)))
           (formatted-vals
             (map
               (lambda (val)
@@ -105,19 +108,6 @@
       book
       bookpart
       score
-      markup
-      markuplist
-      ; Commands setting properties.  Even though some
-      ; are actually music functions, they are important
-      ; enough that we want to view them as keywords.
-      set
-      unset
-      override
-      revert
-      tweak
-      once
-      undo
-      temporary
       ; Other.
       new
       etc
@@ -125,7 +115,6 @@
       language
       version))
 
-
 #(dump-py-list 'keywords keywords)
 
 %% CLEFS
@@ -177,7 +166,15 @@
 
 % View these as music functions.
 #(define extra-music-functions
-   '(repeat
+   '(set
+     unset
+     override
+     revert
+     tweak
+     once
+     undo
+     temporary
+     repeat
      alternative
      tempo
      change))
@@ -237,8 +234,11 @@
               (let* ((string-name (symbol->string (car entry)))
                      (match (regexp-exec markup-name-regexp string-name)))
                 (string->symbol (match:substring match 1))))
-            markup-commands)))
-   (dump-py-list 'markup_commands markup-command-names))
+            markup-commands))
+        (markup-words
+          (append '(markup markuplist)
+                  markup-command-names)))
+   (dump-py-list 'markup_commands markup-words))
 
 %% GROBS
 
diff --git a/pygments/lexers/_lilypond_builtins.py b/pygments/lexers/_lilypond_builtins.py
index 6391095ed9..6cf911c80f 100644
--- a/pygments/lexers/_lilypond_builtins.py
+++ b/pygments/lexers/_lilypond_builtins.py
@@ -37,24 +37,14 @@
   "layout",
   "lyricmode",
   "lyricsto",
-  "markup",
-  "markuplist",
   "midi",
   "name",
   "new",
   "notemode",
-  "once",
-  "override",
   "paper",
   "remove",
-  "revert",
   "score",
-  "set",
-  "temporary",
-  "tweak",
   "type",
-  "undo",
-  "unset",
   "version",
   "with",
 ]
@@ -63,6 +53,7 @@
   "C",
   "F",
   "G",
+  "G2",
   "GG",
   "alto",
   "altovarC",
@@ -70,16 +61,52 @@
   "baritonevarC",
   "baritonevarF",
   "bass",
+  "blackmensural-c1",
+  "blackmensural-c2",
+  "blackmensural-c3",
+  "blackmensural-c4",
+  "blackmensural-c5",
   "french",
   "hufnagel-do-fa",
+  "hufnagel-do1",
+  "hufnagel-do2",
+  "hufnagel-do3",
+  "hufnagel-fa1",
+  "hufnagel-fa2",
   "kievan-do",
+  "medicaea-do1",
+  "medicaea-do2",
+  "medicaea-do3",
+  "medicaea-fa1",
+  "medicaea-fa2",
+  "mensural-c1",
+  "mensural-c2",
+  "mensural-c3",
+  "mensural-c4",
+  "mensural-c5",
   "mensural-f",
   "mensural-g",
   "mezzosoprano",
   "moderntab",
+  "neomensural-c1",
+  "neomensural-c2",
+  "neomensural-c3",
+  "neomensural-c4",
+  "neomensural-c5",
   "percussion",
+  "petrucci-c1",
+  "petrucci-c2",
+  "petrucci-c3",
+  "petrucci-c4",
+  "petrucci-c5",
   "petrucci-f",
+  "petrucci-f2",
+  "petrucci-f3",
+  "petrucci-f4",
+  "petrucci-f5",
   "petrucci-g",
+  "petrucci-g1",
+  "petrucci-g2",
   "soprano",
   "subbass",
   "tab",
@@ -90,6 +117,11 @@
   "varC",
   "varbaritone",
   "varpercussion",
+  "vaticana-do1",
+  "vaticana-do2",
+  "vaticana-do3",
+  "vaticana-fa1",
+  "vaticana-fa2",
   "violin",
 ]
 
@@ -787,6 +819,7 @@
 ]
 
 music_functions = [
+  "=",
   "absolute",
   "acciaccatura",
   "accidentalStyle",
@@ -876,6 +909,7 @@
   "omit",
   "once",
   "ottava",
+  "override",
   "overrideProperty",
   "overrideTimeSignatureSettings",
   "pageBreak",
@@ -910,9 +944,11 @@
   "repeat",
   "resetRelativeOctave",
   "retrograde",
+  "revert",
   "revertTimeSignatureSettings",
   "rightHandFinger",
   "scaleDurations",
+  "set",
   "settingsFrom",
   "shape",
   "shiftDurations",
@@ -943,14 +979,19 @@
   "undo",
   "unfoldRepeats",
   "unfolded",
+  "unset",
   "voices",
   "void",
   "volta",
+  "vshape",
   "withMusicProperty",
   "xNote",
 ]
 
 dynamics = [
+  "!",
+  "<",
+  ">",
   "cr",
   "cresc",
   "decr",
@@ -986,6 +1027,12 @@
 ]
 
 articulations = [
+  "(",
+  ")",
+  "-",
+  "[",
+  "]",
+  "^",
   "accent",
   "arpeggio",
   "breakDynamicSpan",
@@ -1064,9 +1111,12 @@
   "verylongfermata",
   "veryshortfermata",
   "vowelTransition",
+  "~",
 ]
 
 music_commands = [
+  "[",
+  "]",
   "aikenHeads",
   "aikenHeadsMinor",
   "aikenThinHeads",
@@ -1243,6 +1293,8 @@
   "walkerHeadsMinor",
   "xNotesOff",
   "xNotesOn",
+  "|",
+  "~",
 ]
 
 markup_commands = [
@@ -1322,6 +1374,8 @@
   "map-markup-commands",
   "markalphabet",
   "markletter",
+  "markup",
+  "markuplist",
   "medium",
   "multi-measure-rest-by-number",
   "musicglyph",
@@ -1349,6 +1403,7 @@
   "parenthesize",
   "path",
   "pattern",
+  "polygon",
   "postscript",
   "property-recursive",
   "put-adjacent",
@@ -1453,6 +1508,10 @@
   "ClusterSpanner",
   "ClusterSpannerBeacon",
   "CombineTextScript",
+  "ControlPointItem",
+  "ControlPointSpanner",
+  "ControlPolygonItem",
+  "ControlPolygonSpanner",
   "CueClef",
   "CueEndClef",
   "Custos",
@@ -1725,6 +1784,7 @@
   "Script_engraver",
   "Script_row_engraver",
   "Separating_line_group_engraver",
+  "Show_control_points_engraver",
   "Slash_repeat_engraver",
   "Slur_engraver",
   "Slur_performer",
@@ -1762,6 +1822,9 @@
 ]
 
 scheme_functions = [
+  "!=",
+  "*location*",
+  "*parser*",
   "Alteration_glyph_engraver",
   "Bend_spanner_engraver",
   "Centered_bar_number_align_engraver",
@@ -1771,6 +1834,7 @@
   "Measure_spanner_engraver",
   "Merge_mmrest_numbers_engraver",
   "Merge_rests_engraver",
+  "Show_control_points_engraver",
   "Span_stem_engraver",
   "Spanner_tracking_engraver",
   "_",
@@ -1798,6 +1862,7 @@
   "adjust-slash-stencil",
   "aligned-text-stencil-function",
   "alist->hash-table",
+  "alist<?",
   "all-bar-numbers-visible",
   "all-equal?",
   "all-repeat-counts-visible",
@@ -1808,6 +1873,8 @@
   "ambitus::print",
   "analyse-spanner-states",
   "ancestor-lookup-initialize",
+  "angle-0-2pi",
+  "angle-0-360",
   "annotate-spacing-spec",
   "annotate-y-interval",
   "any-mmrest-events",
@@ -1912,6 +1979,8 @@
   "calculate-time-fraction",
   "call-after-session",
   "caps-markup",
+  "car<",
+  "car<=",
   "center-align-markup",
   "center-column-markup",
   "centered-stencil",
@@ -1991,8 +2060,13 @@
   "context-defs-from-music",
   "context-mod-from-music",
   "context-spec-music",
+  "control-point::calc-offset",
+  "control-polygon::calc-text",
+  "coord*",
+  "coord+",
   "coord-",
   "coord-apply",
+  "coord-axis",
   "coord-operation",
   "coord-rotate",
   "coord-rotated",
@@ -2084,6 +2158,7 @@
   "empty-music",
   "end-broken-spanner?",
   "end-moment",
+  "engraver-make-sticky-grob",
   "entry-greater-than-x?",
   "eps-file->stencil",
   "epsfile-markup",
@@ -2273,6 +2348,7 @@
   "horizontal-slash-interval",
   "hspace-markup",
   "huge-markup",
+  "ice9-format",
   "ignatzek-chord-names",
   "index-cell",
   "index?",
@@ -2500,6 +2576,7 @@
   "ly:duration-log",
   "ly:duration-scale",
   "ly:duration::less?",
+  "ly:duration<?",
   "ly:duration?",
   "ly:effective-prefix",
   "ly:enclosing-bracket::print",
@@ -2575,6 +2652,7 @@
   "ly:grob-object",
   "ly:grob-original",
   "ly:grob-parent",
+  "ly:grob-pq<?",
   "ly:grob-properties?",
   "ly:grob-property",
   "ly:grob-property-data",
@@ -2592,6 +2670,7 @@
   "ly:grob-suicide!",
   "ly:grob-system",
   "ly:grob-translate-axis!",
+  "ly:grob-vertical<?",
   "ly:grob-warning",
   "ly:grob::horizontal-skylines-from-element-stencils",
   "ly:grob::horizontal-skylines-from-stencil",
@@ -2611,6 +2690,7 @@
   "ly:grob?",
   "ly:gs-cli",
   "ly:gulp-file",
+  "ly:gulp-file-utf8",
   "ly:hairpin::broken-bound-padding",
   "ly:hairpin::print",
   "ly:hairpin::pure-height",
@@ -2632,6 +2712,7 @@
   "ly:input-message",
   "ly:input-warning",
   "ly:interpret-music-expression",
+  "ly:intlog2",
   "ly:item-break-dir",
   "ly:item-get-column",
   "ly:item?",
@@ -2713,6 +2794,7 @@
   "ly:moment-mod",
   "ly:moment-mul",
   "ly:moment-sub",
+  "ly:moment<?",
   "ly:moment?",
   "ly:multi-measure-rest::height",
   "ly:multi-measure-rest::percent",
@@ -2843,6 +2925,7 @@
   "ly:pitch-tones",
   "ly:pitch-transpose",
   "ly:pitch::less?",
+  "ly:pitch<?",
   "ly:pitch?",
   "ly:pointer-group-interface::add-grob",
   "ly:pop-property-iterator::constructor",
@@ -2884,7 +2967,7 @@
   "ly:rest::y-offset-callback",
   "ly:rhythmic-music-iterator::constructor",
   "ly:round-filled-box",
-  "ly:round-filled-polygon",
+  "ly:round-polygon",
   "ly:run-translator",
   "ly:score-add-output-def!",
   "ly:score-embedded-format",
@@ -3066,6 +3149,7 @@
   "ly:tuplet-number::calc-x-offset",
   "ly:tuplet-number::calc-y-offset",
   "ly:tuplet-number::print",
+  "ly:type1->pfa",
   "ly:unit",
   "ly:unpure-call",
   "ly:unpure-pure-container-pure-part",
@@ -3084,11 +3168,13 @@
   "ly:vowel-transition::set-spacing-rods",
   "ly:warning",
   "ly:warning-located",
+  "ly:wide-char->utf-8",
   "lyric-text::print",
   "magnification->font-size",
   "magnify-markup",
   "magnifyStaff-is-set?",
   "magstep",
+  "maj7-modifier",
   "make-abs-fontsize-markup",
   "make-accidental-dodecaphonic-rule",
   "make-accidental-markup",
@@ -3253,6 +3339,7 @@
   "make-path-stencil",
   "make-pattern-markup",
   "make-percent-set",
+  "make-polygon-markup",
   "make-postscript-markup",
   "make-property-recursive-markup",
   "make-property-set",
@@ -3408,6 +3495,7 @@
   "moment->fraction",
   "moment-min",
   "moment-pair?",
+  "moment<=?",
   "move-chord-note",
   "multi-fork",
   "multi-measure-rest-by-number-markup",
@@ -3547,6 +3635,7 @@
   "pitch-of-note",
   "pitch-step",
   "polar->rectangular",
+  "polygon-markup",
   "position-true-endpoint",
   "postprocess-output",
   "postscript->pdf",
@@ -3599,6 +3688,7 @@
   "rest-markup",
   "retrieve-glyph-flag",
   "retrograde-music",
+  "return-1",
   "reverse-interval",
   "revert-fontSize",
   "revert-head-style",
@@ -3611,6 +3701,10 @@
   "rhythmic-location->string",
   "rhythmic-location-bar-number",
   "rhythmic-location-measure-position",
+  "rhythmic-location<=?",
+  "rhythmic-location<?",
+  "rhythmic-location=?",
+  "rhythmic-location>=?",
   "rhythmic-location>?",
   "rhythmic-location?",
   "rich-bassoon-uber-key-stencil",
@@ -3776,9 +3870,11 @@
   "sus-modifier",
   "symbol-concatenate",
   "symbol-footnotes",
+  "symbol-key<?",
   "symbol-list-or-music?",
   "symbol-list-or-symbol?",
   "symbol-list?",
+  "symbol<?",
   "symlink-if-not-exist",
   "symlink-or-copy-if-not-exist",
   "symmetric-interval",
@@ -3877,6 +3973,7 @@
   "write-performances-midis",
   "write-system-signature",
   "write-system-signatures",
+  "x11-color",
 ]
 
 context_properties = [
@@ -4179,6 +4276,7 @@
   "begin-of-line-visible",
   "bend-me",
   "between-cols",
+  "bezier",
   "bound-alignment-interfaces",
   "bound-details",
   "bound-padding",
@@ -4196,6 +4294,7 @@
   "break-visibility",
   "breakable",
   "broken-bound-padding",
+  "c0-position",
   "cause",
   "cavum",
   "chord-dots-limit",
@@ -4250,7 +4349,9 @@
   "extra-offset",
   "extra-spacing-height",
   "extra-spacing-width",
+  "extroversion",
   "figures",
+  "filled",
   "flag",
   "flag-count",
   "flag-style",
@@ -4314,6 +4415,7 @@
   "in-note-padding",
   "in-note-stencil",
   "inclinatum",
+  "index",
   "inspect-quants",
   "interfaces",
   "items-worth-living",
@@ -4460,6 +4562,7 @@
   "shortest-duration-space",
   "shortest-playing-duration",
   "shortest-starter-duration",
+  "show-control-points",
   "side-axis",
   "side-relative-direction",
   "side-support-elements",
diff --git a/pygments/lexers/lilypond.py b/pygments/lexers/lilypond.py
index c6f179f105..28ef7d2c78 100644
--- a/pygments/lexers/lilypond.py
+++ b/pygments/lexers/lilypond.py
@@ -5,7 +5,7 @@
 
     Lexer for LilyPond.
 
-    :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2021 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,40 +26,19 @@
 
 __all__ = ["LilyPondLexer"]
 
-words_token_definitions = [
-    (keywords, Token.Keyword),
-    (clefs, Token.Name.Builtin.Clef),
-    (scales, Token.Name.Builtin.Scale),
-    (repeat_types, Token.Name.Builtin.RepeatType),
-    (music_functions, Token.Name.Builtin.MusicFunction),
-    (dynamics, Token.Name.Builtin.Dynamic),
-    (articulations, Token.Name.Builtin.Articulation),
-    (music_commands, Token.Name.Builtin.MusicCommand),
-    (markup_commands, Token.Name.Builtin.MarkupCommand),
-    (grobs, Token.Name.Builtin.Grob),
-    (translators, Token.Name.Builtin.Translator),
-    (contexts, Token.Name.Builtin.Context),
-    (context_properties, Token.Name.Builtin.ContextProperty),
-    (grob_properties, Token.Name.Builtin.GrobProperty),
-    (paper_variables, Token.Name.Builtin.PaperVariable),
-    (header_variables, Token.Name.Builtin.HeaderVariable),
-]
-
-word_token_dict = {}
-# Walk in reversed order: keywords have priority above everything else.
-for word_list, token in reversed(words_token_definitions):
-    word_token_dict.update({w: token for w in word_list})
-
-# Avoid highlighting, e.g., "sub" in lyrics as if it were
-# a markup command.
-need_backslash = [
-    Token.Keyword,
-    Token.Name.Builtin.MusicFunction,
-    Token.Name.Builtin.Dynamic,
-    Token.Name.Builtin.Articulation,
-    Token.Name.Builtin.MusicCommand,
-    Token.Name.Builtin.MarkupCommand,
-]
+
+def builtin_words_with_prefix(names, prefix):
+    return words(names, prefix, suffix=r"(?!-|[^\W\d])")
+
+def builtin_backslashed_words(names):
+    return builtin_words_with_prefix(names, prefix=r"[\-_^]?\\")
+
+def builtin_words(names):
+    # Backslashes are always allowed.  This is because you can often
+    # find a context where the form with the backslash will do something
+    # useful, for example:
+    # \layout { \context { \Score ... } }
+    return builtin_words_with_prefix(names, prefix=r"[\-_^]?\\?")
 
 class LilyPondLexer(SchemeLexer):
     """
@@ -84,35 +63,15 @@ class LilyPondLexer(SchemeLexer):
     # lexical modes. Instead, it catches the most frequent pieces
     # of syntax, and, above all, knows about many kinds of builtins.
 
-    # TODO: \lyricmode could be recognized though.
-
     # In order to parse embedded Scheme, this lexer subclasses the SchemeLexer.
     # It redefines the 'root' state entirely, and adds a rule for #{ #}
     # to the 'value' state. The latter is used to parse a Scheme expression
     # after #.
 
     def get_tokens_unprocessed(self, text):
-        """Resolve all kinds of builtin names."""
+        """Highlight Scheme variables as LilyPond builtins when applicable."""
         for index, token, value in super().get_tokens_unprocessed(text):
-            if token is Token.Name:
-                match = re.match(r"[\-^_]?(\\?)(.*)", value)
-                word = match.group(2)
-                try:
-                    token = word_token_dict[word]
-                except KeyError:
-                    if match.group(1):
-                        # \something, a variable or a call to a function
-                        # of some kind (music, markup, void, etc.).
-                        token = Token.Name.BackslashReference
-                    else:
-                        # Perhaps the left-hand-side of an assignment.
-                        token = Token.Name
-                else:
-                    # Avoid highlighting something like "super" (without backslash)
-                    # in lyrics as a markup command.
-                    if not match.group(1) and token in need_backslash:
-                        token = Token.Name
-            elif token is Token.Name.Function or token is Token.Name.Variable:
+            if token is Token.Name.Function or token is Token.Name.Variable:
                 if value in scheme_functions:
                     token = Token.Name.Builtin.SchemeFunction
             elif token is Token.Name.Builtin:
@@ -177,34 +136,39 @@ def get_tokens_unprocessed(self, text):
             # respective number, so we highlight as number too.
             (r"((m|dim|aug|maj)(?=\d|\W))|/|[+]", Token.Number),
 
-            # Ties.
-            (r"~", Token.Name.Builtin.Articulation),
-
-            # Other common articulations: slurs, phrasing slurs, manual beams,
-            # ligature brackets.
-            (r"[\-_^]?\\?[()[\]]", Token.Name.Builtin.Articulation),
+            # Ties, slurs, manual beams.
+            (r"[~()[\]]", Token.Name.Builtin.Articulation),
 
             # Predefined articulation shortcuts. A direction specifier is
             # required here.
             (r"[\-_^][>^_!.\-+]", Token.Name.Builtin.Articulation),
 
-            # Other articulations whose name is not alphabetic.
-            (r"[\-_^]?\\[\-^]", Token.Name.Builtin.Articulation),
-
-            # One music function whose name is not alphabetic.
-            (r"\\=", Token.Name.Builtin.MusicFunction),
-
-            # Dynamics whose name is not alphabetic.
-            (r"[\-_^]?\\[<>!]", Token.Name.Builtin.Dynamic),
-
             # Fingering numbers, string numbers.
             (r"[\-_^]?\\?\d+", Token.Name.Builtin.Articulation),
 
-            # Any name or unquoted string, possibly referenced via the backslash,
-            # possibly preceded with a direction specifier. Let
-            # get_tokens_unprocessed() recognize builtins. [^\W\d_] with
-            # re.UNICODE is a trick to match any Unicode letter or underscore.
-            (r"([\-_^]?\\)?(-|[^\W\d])*[^\W\d_]", Token.Name),
+            # Builtins.
+            (builtin_backslashed_words(keywords), Token.Keyword),
+            (builtin_words(clefs), Token.Name.Builtin.Clef),
+            (builtin_words(scales), Token.Name.Builtin.Scale),
+            (builtin_words(repeat_types), Token.Name.Builtin.RepeatType),
+            (builtin_backslashed_words(music_functions), Token.Name.Builtin.MusicFunction),
+            (builtin_backslashed_words(dynamics), Token.Name.Builtin.Dynamic),
+            (builtin_backslashed_words(articulations), Token.Name.Builtin.Articulation),
+            (builtin_backslashed_words(music_commands), Token.Name.Builtin.MusicCommand),
+            (builtin_backslashed_words(markup_commands), Token.Name.Builtin.MarkupCommand),
+            (builtin_words(grobs), Token.Name.Builtin.Grob),
+            (builtin_words(translators), Token.Name.Builtin.Translator),
+            (builtin_words(contexts), Token.Name.Builtin.Context),
+            (builtin_words(context_properties), Token.Name.Builtin.ContextProperty),
+            (builtin_words(grob_properties), Token.Name.Builtin.GrobProperty),
+            (builtin_words(paper_variables), Token.Name.Builtin.PaperVariable),
+            (builtin_words(header_variables), Token.Name.Builtin.HeaderVariable),
+
+            # Other backslashed-escaped names (like dereferencing a
+            # music variable.)  Dashes (as in markup commands) and underscores
+            # (as in engravers) are allowed, but not at the end, to avoid
+            # matching the direction specifier of the next element.
+            (r"[\-_^]?\\(-|[^\W\d])*[^\W\d_]", Token.Name.BackslashReference),
 
             # Virtually everything can appear in markup mode, so we highlight
             # as text.
diff --git a/pygments/styles/lilypond.py b/pygments/styles/lilypond.py
index 222e746a55..a0b4608276 100644
--- a/pygments/styles/lilypond.py
+++ b/pygments/styles/lilypond.py
@@ -22,7 +22,7 @@ class LilypondStyle(Style):
         Token.Keyword: "bold",
         Token.Comment: "italic #A3AAB2",
         Token.String: "#C7290A",
-        Token.Pitch: "#911520",
+        ### Token.Pitch: "#911520",
         Token.Number: "#976806", # also durations and chord modifiers
         Token.ChordModifier: "#C0870E",
         Token.Name.BackslashReference: "bold #08547A",