X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=0958dbae8ed7dfcd954de933a6ae7e3b4778e07b;hb=a2e0081b9f6263a3ddb8e7bf898f6592dad5f89e;hp=a5398a1573e3dc95f19b02e4d0bd5cf4c96ac412;hpb=947454c5cc430a9627262de4f25274a64789d3c2;p=lilypond.git

diff --git a/lily/accidental.cc b/lily/accidental.cc
index a5398a1573..0958dbae8e 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -8,7 +8,7 @@
 #include "item.hh"
 #include "stencil.hh"
 #include "accidental-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "pitch.hh"
 
 /*
@@ -60,17 +60,17 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
   if (to_boolean (a->get_property ("cautionary")))
     {
       SCM cstyle = a->get_property ("cautionary-style");
-      parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+      parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
 
     }
 
   SCM accs = a->get_property ("accidentals");
   SCM scm_style = a->get_property ("style");
-  if (!gh_symbol_p (scm_style)
+  if (!ly_c_symbol_p (scm_style)
       && !parens
       && scm_ilength (accs) == 1)
     {
-      if (gh_scm2int (gh_car (accs)) == FLAT)
+      if (ly_scm2int (ly_car (accs)) == FLAT)
 	{
 	  Box stem = b;
 	  Box bulb = b;
@@ -80,6 +80,11 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
 	    really close.
 	  */
 	  stem[X_AXIS][RIGHT] *= .5;
+
+	  /*
+	    To prevent vertical alignment for 6ths
+	   */
+	  stem[Y_AXIS]  *= 1.1;  
 	  bulb[Y_AXIS][UP] *= .35;
 
 	  boxes.push (bulb);
@@ -170,13 +175,13 @@ Accidental_interface::print (SCM smob)
   if (caut)
     {
       SCM cstyle = me->get_property ("cautionary-style");
-      parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses"));
-      smaller = gh_equal_p (cstyle, ly_symbol2scm ("smaller"));
+      parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+      smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller"));
     }
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (gh_symbol_p (scm_style))
+  if (ly_c_symbol_p (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
@@ -191,8 +196,8 @@ Accidental_interface::print (SCM smob)
   Font_metric *fm = 0;
   if (smaller)
     {
-      SCM ac = Font_interface::font_alist_chain (me);
-      ac = gh_cons (gh_cons (gh_cons
+      SCM ac = Font_interface::text_font_alist_chain (me);
+      ac = scm_cons (scm_cons (scm_cons
 			     (ly_symbol2scm ("font-size"),
 			      scm_int2num (-2)), SCM_EOL),
 		    ac);
@@ -203,9 +208,9 @@ Accidental_interface::print (SCM smob)
 
   Stencil mol;
   for (SCM s = me->get_property ("accidentals");
-       gh_pair_p (s); s = gh_cdr (s))
+       ly_c_pair_p (s); s = ly_cdr (s))
     {
-      int alteration = gh_scm2int (gh_car (s));
+      int alteration = ly_scm2int (ly_car (s));
       String font_char = get_fontcharname (style, alteration);
       Stencil acc (fm->find_by_name ("accidentals-" + font_char));