X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grob-interfaces.scm;h=46d23d949a46556acdc6e2f17540104b87dbeeca;hb=2a0b1965e27a65b8ba1cfbad38ab4d25f5ec6aa6;hp=210b4552a0594952334bc03208fe9b55038db84f;hpb=4a4b9008d4e571eb5714314661f5eaf35b117ef0;p=lilypond.git

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 210b4552a0..46d23d949a 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -14,6 +14,21 @@
    "An accidental, printed as a suggestion (typically: vertically over a note)"
    '())
 
+(ly:add-interface
+ 'bass-figure-interface
+ "A bass figure text"
+ '(implicit))
+
+(ly:add-interface
+ 'bend-after-interface
+ "A doit or drop."
+ '(thickness delta-position))
+
+(ly:add-interface
+ 'bass-figure-alignment-interface
+ ""
+ '())
+
 (ly:add-interface
  'dynamic-interface
    "Any kind of loudness sign"
@@ -25,34 +40,53 @@
    '(avoid-slur))
 
 (ly:add-interface
- 'finger-interface
- "A fingering instruction"
- '())
+ 'dynamic-text-spanner-interface
+   "Dynamic text spanner"
+   '(text))
 
 (ly:add-interface
- 'string-number-interface
- "A string number instruction"
+ 'finger-interface
+ "A fingering instruction"
  '())
 
 (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"
- '(width thickness height ligature-primitive-callback))
+ '(width thickness height))
+
 
 (ly:add-interface
  'lyric-syllable-interface
- "a single piece of lyrics"
+ "A single piece of lyrics"
  '())
 
 (ly:add-interface
@@ -62,18 +96,18 @@
 
 (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
  'multi-measure-interface
  "Multi measure rest, and the text or number that is printed over it."
- '())
+ '(bound-padding))
 
 (ly:add-interface
 'note-name-interface
@@ -85,31 +119,68 @@
  "Kill this grob after the line breaking process."
  '())
 
+(ly:add-interface
+ 'parentheses-interface
+ "Parentheses for other objects"
+ '(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"
    '(accidental-grob))
 
+(ly:add-interface
+ 'trill-pitch-accidental-interface
+ "An accidental for trill pitch"
+ '()
+ )
+
+(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."
  '())
 
+
+(ly:add-interface
+ 'spacing-options-interface
+ "Supports setting of spacing variables"
+ '(spacing-increment shortest-duration-space))
+
 (ly:add-interface
  'stanza-number-interface
  "A stanza number, to be put in from of a lyrics line"
  '())
 
 (ly:add-interface
- 'bass-figure-interface
- "A bass figure text"
- '(implicit))
+ 'string-number-interface
+ "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."
+ '(text long-text collapse-height style))
 
 ;;; todo: this is not typesetting info. Move to interpretation.
 (ly:add-interface
@@ -117,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: