From: Erlend Aasland <erlenda@gmail.com>
Date: Thu, 26 Oct 2006 20:19:27 +0000 (+0000)
Subject: Build fix
X-Git-Tag: release/2.10.0-2~74
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fc44ae90e5b214655c19014b16a13409d191fce5;p=lilypond.git

Build fix
---

diff --git a/ChangeLog b/ChangeLog
index 6cc40fb448..b0bd8fc337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@
 
 	* lily/source-file.cc: put multibyte var inside #if clause
 
+	* scm/define-grob-interfaces.scm:
+	* scm/define-grob-properties.scm:
+	Build fix (string-fret-finger-combinations)
+
 2006-10-26  Joe Neeman  <joeneeman@gmail.com>
 
 	* lily/system.cc (get_paper_system): 
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index afb72d6999..7d4ca0f34d 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -49,7 +49,8 @@
  '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
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index a9f3c994d2..029d73c58f 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -390,7 +390,6 @@ object.")
      (size ,number? "Size of object, relative to standard size.")
      (slope ,number? "The slope of this object.")
      (slur-padding ,number? "Extra distance between slur and script.")
-     (string-fret-finger-combinations ,list? "List consisting of (string-number fret-number finger-number) entries." )
      (space-alist ,list? "A table that specifies distances between
 prefatory items, like clef and time-signature. The format is an alist
 of spacing tuples: @code{(@var{break-align-symbol} @var{type}
@@ -426,6 +425,7 @@ separately, but put before musical columns.")
      (strict-grace-spacing ,boolean? "If set, grace notes 
 are not spaced separately, but put before musical columns.")
      (string-count ,integer? "The number of strings in a fret diagram.")
+     (string-fret-finger-combinations ,list? "List consisting of (string-number fret-number finger-number) entries.")
      (stroke-style ,string? "set to \"grace\" to turn stroke through flag on.")
      
      (style ,symbol? "This setting determines in what style a grob is