add some props to interface (patch

courtesy Chris J).

diff --git a/ChangeLog b/ChangeLog
index 1af018c49369cb41072d5b56cc7be27a5175e68b..a594d9975b06c1ca19bb765989ce6046838788a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/text-spanner.cc: add some props to interface (patch
+       courtesy Chris J).
+
 2002-06-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/text-spanner.cc (setup_pedal_bracket): Bugfix: only

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 69fb7dfb2cc578b32d71fee77312d92f82f5900b..cf2e275027e91f0166753805114a0c476546cfe4 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -212,12 +212,8 @@ ly_scm2string (SCM s)
 {
   assert (gh_string_p (s));
 
-  size_t len; 
-  char *p = gh_scm2newstr (s , &len);
-  
+  char *p = SCM_STRING_CHARS(s);
   String r (p);
-
-  free (p);
   return r;
 }
 

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 53fb7ff19ae25ee899ee5fa80f7b0549679948c5..acbabdc56e7629a432d936575c8ac6ba89f1c202 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -293,5 +293,5 @@ ADD_INTERFACE (Pianopedal,"piano-pedal-interface",
 
 ADD_INTERFACE (Text_spanner,"text-spanner-interface",
               "generic text spanner",
-              "dash-period if-text-padding dash-length edge-height edge-widen edge-text shorten-pair type");
+              "dash-period if-text-padding dash-length edge-height edge-widen edge-text shorten-pair type thickness outer width-correct");
 

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index cedaf07851f9cd006760e139b8c644a17c6f9999..825ff4b622f880cf5fc0127aae5a2b351bc0fee0 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -265,6 +265,7 @@ FIXME: also pair? (cons LEFT RIGHT)
 (grob-property-description 'note-heads grob-list? "List of note head grobs")
 (grob-property-description 'number-threshold number? "only put numbers bigger than this threshold over multi measure rest.")
 (grob-property-description 'old-accidentals list? "list of (pitch, accidental) pairs.")
+(grob-property-description 'outer boolean? "whether a text spanner should extend to the outer edge of the spanned notes")
 (grob-property-description 'padding number? "add this much extra space between objects that are next to each other.")
 (grob-property-description 'pedal-type symbol? "Style of piano pedal: text, bracket or mixed.")
 (grob-property-description 'pedal-text ly-grob? "Pointer to the text of a mixed-style piano pedal.")
@@ -421,6 +422,7 @@ one of: line, dashed-line, trill or dotted-line.
 (grob-property-description 'begin-alignment number? "proportion of lyric length from beginning to align with note-head for left-aligned lyrics.")
 (grob-property-description 'end-alignment number? "proportion of lyric length from end to align with note-head for right-aligned lyrics.")
 (grob-property-description 'width number? "width of a grob measured in staff space.")
+(grob-property-description 'width-correct number? "width correction for (de)cresc. text spanners.")
 (grob-property-description 'x-gap number? "horizontal gap between notehead and tie.")
 (grob-property-description 'y-free number? "minimal vertical gap between slur and noteheads or stems.")
 (grob-property-description 'y-offset number? "extra vertical offset for ties away from the center line.")