X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=6f9062190ef46f91b37ffbbc6b99f3cf01dd70f4;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=4007d93e9feb6be47b506bbb86db446ca2b72c78;hpb=eb72c0f066957c3e71d336db0f72814e34d3964d;p=lilypond.git

diff --git a/lily/clef.cc b/lily/clef.cc
index 4007d93e9f..6f9062190e 100644
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -1,43 +1,51 @@
 /*
-  clef.cc -- implement Clef_item
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "clef.hh"
 
-#include "string.hh"
-#include "stencil.hh"
-#include "item.hh"
 #include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
+#include "stencil.hh"
 
-/*
-  FIXME: should use symbol for #'style.
-*/
-MAKE_SCHEME_CALLBACK (Clef, before_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1);
 SCM
-Clef::before_line_breaking (SCM smob)
+Clef::calc_glyph_name (SCM smob)
 {
-  Item *s = unsmob_item (smob);
-  SCM glyph = s->get_property ("glyph-name");
+  Item *s = unsmob<Item> (smob);
+  SCM glyph = s->get_property ("glyph");
 
-  if (!scm_is_string (glyph))
-    s->suicide ();
-  else
+  if (scm_is_string (glyph))
     {
-      String str = ly_scm2string (glyph);
+      string str = ly_scm2string (glyph);
 
       if (to_boolean (s->get_property ("non-default"))
-	  && s->break_status_dir () != RIGHT
-	  && !to_boolean (s->get_property ("full-size-change")))
-	{
-	  str += "_change";
-	  s->set_property ("glyph-name", scm_makfrom0str (str.to_str0 ()));
-	}
+          && s->break_status_dir () != RIGHT
+          && !to_boolean (s->get_property ("full-size-change")))
+        {
+          str += "_change";
+        }
+
+      return ly_string2scm (str);
     }
 
+  s->suicide ();
   return SCM_UNSPECIFIED;
 }
 
@@ -45,20 +53,27 @@ MAKE_SCHEME_CALLBACK (Clef, print, 1)
 SCM
 Clef::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   SCM glyph_scm = me->get_property ("glyph-name");
   if (!scm_is_string (glyph_scm))
     return SCM_EOL;
 
-  String glyph = String (ly_scm2string (glyph_scm));
+  string glyph = string (ly_scm2string (glyph_scm));
   Font_metric *fm = Font_interface::get_default_font (me);
   Stencil out = fm->find_by_name (glyph);
   if (out.is_empty ())
-    me->warning (_f ("clef `%s' not found", glyph.to_str0 ()));
+    me->warning (_f ("clef `%s' not found", glyph.c_str ()));
+
   return out.smobbed_copy ();
 }
 
-ADD_INTERFACE (Clef, "clef-interface",
-	       "A clef sign",
-	       "non-default full-size-change glyph-name");
+ADD_INTERFACE (Clef,
+               "A clef sign.",
+
+               /* properties */
+               "full-size-change "
+               "glyph "
+               "glyph-name "
+               "non-default "
+              );