Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / define-grob-interfaces.scm

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 1759fa5606ac458766c82a833af53f08db7ff5f7..e141103e05b05d0aadfe0d5098e56912d76405a1 100644 (file)
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -14,7 +14,6 @@
    "An accidental, printed as a suggestion (typically: vertically over a note)"
    '())
 
-
 (ly:add-interface
  'bass-figure-interface
  "A bass figure text"
@@ -49,18 +48,29 @@
  'fret-diagram-interface
  "A fret diagram"
  '(align-dir barre-type dot-color dot-radius finger-code fret-count
-  label-dir number-type size string-count thickness))
+  label-dir number-type size string-count
+  string-fret-finger-combinations thickness))
 
 (ly:add-interface
  'grace-spacing-interface
  "Keep track of durations in a run of grace notes."
  '(columns common-shortest-duration))
 
+(ly:add-interface
+ 'key-cancellation-interface
+ "A key cancellation"
+ '())
+
 (ly:add-interface
  'ligature-interface
  "A ligature"
  '())
 
+(ly:add-interface
+ 'key-cancellation-interface
+ "A key cancellation"
+ '())
+
 (ly:add-interface
  'ligature-bracket-interface
  "A bracket indicating a ligature in the original edition"
@@ -69,7 +79,7 @@
 
 (ly:add-interface
  'lyric-syllable-interface
- "a single piece of lyrics"
+ "A single piece of lyrics"
  '())
 
 (ly:add-interface
@@ -79,12 +89,12 @@
 
 (ly:add-interface
  'mark-interface
- "a rehearsal mark"
+ "A rehearsal mark"
  '())
 
 (ly:add-interface
  'metronome-mark-interface
- "a rehearsal mark"
+ "A metronome mark"
  '())
 
 (ly:add-interface
@@ -105,13 +115,18 @@
 (ly:add-interface
  'parentheses-interface
  "Parentheses for other objects"
- '(padding))
+ '(padding stencils))
 
 (ly:add-interface
  'piano-pedal-interface
  "A piano pedal sign"
  '())
 
+(ly:add-interface
+ 'piano-pedal-script-interface
+ "A piano pedal sign, fixed size"
+ '())
+
 (ly:add-interface
  'pitched-trill-interface
    "A note head to indicate trill pitches"
@@ -120,12 +135,13 @@
 (ly:add-interface
  'trill-pitch-accidental-interface
  "An accidental for trill pitch"
- '(accidentals))
+ '()
+ )
 
 (ly:add-interface
  'rhythmic-grob-interface
- "Any object with a rhythmic basis. Used to determine which grobs
-are interesting enough to maintain a hara-kiri staff."
+ "Any object with a duration. Used to determine which grobs are
+interesting enough to maintain a hara-kiri staff."
  '())
 
 
@@ -160,6 +176,13 @@ are interesting enough to maintain a hara-kiri staff."
  "An interface for any notes set in a tablature staff"
  '())
 
+(ly:add-interface
+ 'unbreakable-spanner-interface
+ "A spanner that should not be broken across line breaks. Override
+with @code{breakable=##t}. "
+ 
+ '(breakable))
+
 (ly:add-interface
  'vertically-spaceable-interface
  "Objects that should be kept at constant vertical distances. Typically: