* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / lily / script-column.cc

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 2fd32623b842d78e05b7e5bc1309c1d0b221a3c8..311f5cbb7c4f264e19790b4c2cd99607c5de6128 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,10 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+
 #include "script-column.hh"
+
 #include "side-position-interface.hh"
 #include "warn.hh"
 #include "group-interface.hh"
@@ -14,8 +16,8 @@
 void
 Script_column::add_staff_sided (Grob *me, Item *i)
 {
-  SCM p = i->get_grob_property ("script-priority");
-  if (!gh_number_p (p))
+  SCM p = i->get_property ("script-priority");
+  if (!scm_is_number (p))
     return;
 
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
@@ -23,23 +25,20 @@ Script_column::add_staff_sided (Grob *me, Item *i)
   me->add_dependency (i);
 }
 
-LY_DEFINE(grob_script_priority_less,
-         "ly:grob-script-priority-less", 2, 0, 0, 
-         (SCM a, SCM b),
+LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less",
+         2, 0, 0, (SCM a, SCM b),
          "Compare two grobs by script priority. For internal use.")
 {
-  Grob * i1 = unsmob_grob (a);
-  Grob* i2 = unsmob_grob (b);
+  Grob *i1 = unsmob_grob (a);
+  Grob *i2 = unsmob_grob (b);
 
-  SCM p1 = i1->get_grob_property ("script-priority");
-  SCM p2 = i2->get_grob_property ("script-priority");
+  SCM p1 = i1->get_property ("script-priority");
+  SCM p2 = i2->get_property ("script-priority");
 
-  return gh_scm2int (p1) < gh_scm2int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
+  return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-
-
-MAKE_SCHEME_CALLBACK (Script_column,before_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1);
 SCM
 Script_column::before_line_breaking (SCM smob)
 {
@@ -47,15 +46,19 @@ Script_column::before_line_breaking (SCM smob)
   Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
   Link_array<Grob> staff_sided;
   
-  for (SCM s  = me->get_grob_property( "scripts");  gh_pair_p (s); s = gh_cdr( s))
+  for (SCM s = me->get_property ("scripts"); scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob *sc = unsmob_grob (gh_car (s));
+      Grob *sc = unsmob_grob (scm_car (s));
 
-      if (!sc->has_offset_callback_b (Side_position_interface::aligned_side_proc, X_AXIS))
+      /*
+       Don't want to consider scripts horizontally next to notes.
+       */
+      if (!sc->has_offset_callback (Side_position_interface::aligned_side_proc,
+                                   X_AXIS))
        staff_sided.push (sc);
     }
   
-  for (int i=0; i < staff_sided.size (); i++)
+  for (int i = 0; i < staff_sided.size (); i++)
     {
       Grob* g = staff_sided[i];
       Direction d = Side_position_interface::get_direction (g);
@@ -63,35 +66,34 @@ Script_column::before_line_breaking (SCM smob)
        {
          programming_error ( "No direction for script?");
          d = DOWN;
-         g->set_grob_property ("direction", gh_int2scm (d));
+         g->set_property ("direction", scm_int2num (d));
        }
       
-      scripts[d] = scm_cons (g->self_scm(), scripts[d]);
+      scripts[d] = scm_cons (g->self_scm (), scripts[d]);
     }
 
   Direction d = DOWN;
-  do {
-    SCM ss = scm_reverse_x (scripts[d], SCM_EOL);
-    ss = scm_stable_sort_x (ss,  grob_script_priority_less_proc);
-
-    Grob * last = 0;
-    for (SCM s = ss; gh_pair_p (s); s = gh_cdr (s))
-      {
-       Grob* g = unsmob_grob (gh_car (s));
-       if (last)
-         Side_position_interface::add_support (g,last);
-
-       last = g;
-      }
-    
-  } while (flip (&d) != DOWN);
+  do
+    {
+      SCM ss = scm_reverse_x (scripts[d], SCM_EOL);
+      ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc);
+      
+      Grob * last = 0;
+      for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s))
+       {
+         Grob *g = unsmob_grob (scm_car (s));
+         if (last)
+           Side_position_interface::add_support (g,last);
+         
+         last = g;
+       }
+      
+    } while (flip (&d) != DOWN);
 
   return SCM_UNSPECIFIED;
 }
 
-
 ADD_INTERFACE (Script_column,"script-column-interface",
-  "An interface that sorts scripts according to their @code{script-priority}",
-  "");
-
-
+              "An interface that sorts scripts "
+              "according to their @code{script-priority}",
+              "");