lilypond-1.3.112

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 06758d262902a0758f9e731f92f5f53be35b1669..c3a2136f2a0fc278f568118f6b0e78c7d7ed5082 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -96,7 +96,7 @@ Clef_engraver::set_central_c (SCM glyph,SCM clefpos, SCM octavation)
 void
 Clef_engraver::set_glyph ()
 {
-  SCM glyph_sym = ly_symbol2scm ("glyph");
+  SCM glyph_sym = ly_symbol2scm ("glyph-name");
   SCM glyph = get_property ("clefGlyph");
 
   SCM basic = ly_symbol2scm ("Clef");

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 0481d0b74b3b7b5030ed3322a7879ecb0250e847..1cdc84a57aab91cebe006a12603f72f0cbf6e52e 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -22,7 +22,7 @@ Clef::before_line_breaking (SCM smob)
 {
   Item * s = dynamic_cast<Item*> (unsmob_grob (smob));
 
-  SCM glyph = s->get_grob_property ("glyph");
+  SCM glyph = s->get_grob_property ("glyph-name");
   
   if (gh_string_p (glyph))
     {
@@ -33,7 +33,7 @@ Clef::before_line_breaking (SCM smob)
          to_boolean (s->get_grob_property ("full-size-change")))
        {
          str += "_change";
-         s->set_grob_property ("glyph", ly_str02scm (str.ch_C()));       
+         s->set_grob_property ("glyph-name", ly_str02scm (str.ch_C()));          
        }
     }
   else
@@ -63,7 +63,7 @@ SCM
 Clef::brew_molecule (SCM smob) 
 {
   Grob * sc = unsmob_grob (smob);
-  SCM glyph = sc->get_grob_property ("glyph");
+  SCM glyph = sc->get_grob_property ("glyph-name");
   if (gh_string_p (glyph))
     {
       return Font_interface::get_default_font (sc)->find_by_name (String (ly_scm2string (glyph))).smobbed_copy ();

diff --git a/scm/backend-property.scm b/scm/backend-property.scm
index d0360c4938100dd009b169f3e98e62927c254650..a42cee3427906d750cc487d5924d67469c50ba78 100644 (file)
--- a/scm/backend-property.scm
+++ b/scm/backend-property.scm
@@ -141,10 +141,8 @@ is used by @ref{note-collision-interface}")
 (elt-property-description 'fraction number-pair? "")
 (elt-property-description 'full-size-change boolean? "if set, don't make a change clef smaller.")
 
-(elt-property-description 'glyph symbol? "a string determining what style of  glyph is typeset. Valid choices depend on the function that is reading this property. ")
-(elt-property-description 'glyph string? "what kind barline? A concatenation of |, : and .")
-(elt-property-description 'glyph string? "a string determining what glyph is typeset")
-
+(elt-property-description 'glyph symbol? "a string determining what (style) of  glyph is typeset. Valid choices depend on the function that is reading this property. ")
+(elt-property-description 'glyph-name string? "a name of character within font")
 
 (elt-property-description 'grow-direction dir? "crescendo or decrescendo?")
 (elt-property-description 'hair-thickness number? "thickness, measured in stafflinethickness")
@@ -299,7 +297,7 @@ bracket. Setting the property to #'if-no-beam will make it
 print only if there is no beam associated with this tuplet bracket.")
 (elt-property-description 'tuplet-number-visibility boolean-or-symbol? "
 Like @code{tuplet-bracket-visibility}, but for the number.")
-(elt-property-description 'type string? "one of: line, dashed-line or dotted-line")
+(elt-property-description 'type symbol? "one of: line, dashed-line or dotted-line")
 (elt-property-description 'vertical-position-quant-function procedure? "
 function of type (beam multiplicity dy staff-line-thickness) -> real.  Default value: default-beam-y-quants, also available: beam-traditional-y-quants.
 ")

diff --git a/scm/translator-properties.scm b/scm/translator-properties.scm
index b3c63665741851007b9f49ba19877475278f21f5..42a14ef3c4b2c63edc872e3a69fee5f9f9652704 100644 (file)
--- a/scm/translator-properties.scm
+++ b/scm/translator-properties.scm
@@ -148,6 +148,7 @@ the music.
 ")
 (translator-property-description 'melismaBusy boolean? "")
 (translator-property-description 'melismaEngraverBusy boolean? "")
+(translator-property-description 'midiInstrument string? "")
 (translator-property-description 'noAutoBeaming boolean? "  If set to true then beams are not generated automatically.
 ")
 (translator-property-description 'noResetKey boolean? "Do not