Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 59ff1593a77029bebd447e554e6716b0e2b84b6e..46d23d949a46556acdc6e2f17540104b87dbeeca 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"
@@ -40,6 +39,11 @@
    "Dynamic line spanner"
    '(avoid-slur))
 
+(ly:add-interface
+ 'dynamic-text-spanner-interface
+   "Dynamic text spanner"
+   '(text))
+
 (ly:add-interface
  'finger-interface
  "A fingering instruction"
@@ -48,19 +52,32 @@
 (ly:add-interface
  '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 xo-font-magnification
+mute-string open-string orientation 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 +86,7 @@
 
 (ly:add-interface
  'lyric-syllable-interface
- "a single piece of lyrics"
+ "A single piece of lyrics"
  '())
 
 (ly:add-interface
@@ -79,12 +96,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 +122,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 +142,18 @@
 (ly:add-interface
  'trill-pitch-accidental-interface
  "An accidental for trill pitch"
- '(accidentals))
+ '()
+ )
+
+(ly:add-interface
+ 'trill-spanner-interface
+ "An accidental for trill pitch"
+ '())
 
 (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."
  '())
 
 
@@ -144,6 +172,11 @@ are interesting enough to maintain a hara-kiri staff."
  "A string number instruction"
  '())
 
+(ly:add-interface
+ 'stroke-finger-interface
+ "A right hand finger instruction"
+ '(digit-names))
+
 (ly:add-interface
  'system-start-text-interface
  "A text at the beginning of a system."
@@ -155,6 +188,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: