* scm/output-tex.scm (named-glyph): new function. This fixes TeX output.

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 940284971a29b658c1f6e7a9a9f300c8ae76489c..b098b38af794f77a38fb428eb185d0c09cd7e4d4 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -15,7 +15,7 @@
 
 #include "stem.hh"
 
-#include <cmath>               // rint
+#include <math.h>              // rint
 
 #include "lookup.hh"
 #include "directional-element-interface.hh"
@@ -414,7 +414,7 @@ Stem::position_noteheads (Grob *me)
   for (int i = 1; i < heads.size (); i ++)
     {
       Real p = Staff_symbol_referencer::get_position (heads[i]);
-      Real dy =fabs (lastpos- p);
+      Real dy = fabs (lastpos- p);
 
       /*
        dy should always be 0.5, 0.0, 1.0, but provide safety margin
@@ -502,7 +502,7 @@ Stem::height (SCM smob, SCM ax)
   /*
     ugh. - this dependency should be automatic.
   */
-  Grob *beam= get_beam (me);
+  Grob *beam = get_beam (me);
   if (beam)
     {
       Beam::after_line_breaking (beam->self_scm ());
@@ -513,7 +513,7 @@ Stem::height (SCM smob, SCM ax)
   Interval iv;
   if (mol != SCM_EOL)
     iv = unsmob_stencil (mol)->extent (a);
-  if (Grob *b =get_beam (me))
+  if (Grob *b = get_beam (me))
     {
       Direction d = get_direction (me);
       iv[d] += d * Beam::get_thickness (b) * 0.5 ;
@@ -570,7 +570,7 @@ Stem::flag (Grob *me)
   String font_char = flag_style
     + to_string (dir) + staffline_offs + to_string (duration_log (me));
   Font_metric *fm = Font_interface::get_default_font (me);
-  Stencil flag = fm->find_by_name ("flags-" + font_char);
+  Stencil flag = fm->find_by_name ("flags." + font_char);
   if (flag.is_empty ())
     me->warning (_f ("flag `%s' not found", font_char));
 
@@ -581,7 +581,7 @@ Stem::flag (Grob *me)
       if (!stroke_style.is_empty ())
        {
          String font_char = to_string (dir) + stroke_style;
-         Stencil stroke = fm->find_by_name ("flags-" + font_char);
+         Stencil stroke = fm->find_by_name ("flags." + font_char);
          if (stroke.is_empty ())
            me->warning (_f ("flag stroke `%s' not found", font_char));
          else
@@ -592,9 +592,9 @@ Stem::flag (Grob *me)
   return flag;
 }
 
-MAKE_SCHEME_CALLBACK (Stem,dim_callback,2);
+MAKE_SCHEME_CALLBACK (Stem,width_callback,2);
 SCM
-Stem::dim_callback (SCM e, SCM ax)
+Stem::width_callback (SCM e, SCM ax)
 {
   Axis a = (Axis) scm_to_int (ax);
   assert (a == X_AXIS);
@@ -714,9 +714,9 @@ Stem::print (SCM smob)
 /*
   move the stem to right of the notehead if it is up.
  */
-MAKE_SCHEME_CALLBACK (Stem, off_callback, 2);
+MAKE_SCHEME_CALLBACK (Stem, offset_callback, 2);
 SCM
-Stem::off_callback (SCM element_smob, SCM)
+Stem::offset_callback (SCM element_smob, SCM)
 {
   Grob *me = unsmob_grob (element_smob);
   Real r = 0.0;
@@ -896,7 +896,7 @@ Stem::calc_stem_info (Grob *me)
 Slice
 Stem::beam_multiplicity (Grob *stem)
 {
-  SCM beaming= stem->get_property ("beaming");
+  SCM beaming = stem->get_property ("beaming");
   Slice le = int_list_to_slice (scm_car (beaming));
   Slice ri = int_list_to_slice (scm_cdr (beaming));
   le.unite (ri);