Merge branch 'master' into lilypond/translation

[lilypond.git] / scm / define-context-properties.scm

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 044bb699730f7f1db7e5a920db26634145904d78..a238998d033cc77fc841b48ceb4e4b66ec5cc8aa 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -135,6 +135,8 @@ that normally end on beats.")
      (beatStructure ,list? "List of @code{baseMoment}s that are combined
 to make beats.")
 
+     (capoPitch ,ly:pitch? "The pitch to transpose chords down by when using the capo.")
+     (capoVertical ,boolean? "Whether to display actual and transposed pitches above each other or not.")
      (chordChanges ,boolean? "Only show changes in chords scheme?")
      (chordNameExceptions ,list? "An alist of chord exceptions.
 Contains @code{(@var{chord} . @var{markup})} entries.")
@@ -163,8 +165,6 @@ staff.")
      (completionBusy ,boolean? "Whether a completion-note head is playing.")
      (connectArpeggios ,boolean? "If set, connect arpeggios across
 piano staff.")
-     (connectBraces ,boolean? "If set, connect braces across
-staves.")
      (countPercentRepeats ,boolean? "If set, produce counters for
 percent repeats.")
      (createKeyOnClefChange ,boolean? "Print a key signature whenever