2003 -> 2004

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 39d43277c4f48dab22fb7b6000d2508e4b95665b..7a89832cbf8f9db91ab580b1146c73302bbea7c0 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -1,7 +1,15 @@
+/*
+  accidental.cc -- implement Accidental_interface
+
+  (c) 2001--2004 Han-Wen Nienhuys
+  
+ */
 #include "font-interface.hh"
 #include "item.hh"
 #include "molecule.hh"
 #include "accidental-interface.hh"
+#include "paper-def.hh"
+#include "pitch.hh"
 
 /*
   TODO: insert support for smaller cautionaries, tie-break-reminders.
@@ -18,8 +26,8 @@ parenthesize (Grob*me, Molecule m)
 {
   Molecule open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-leftparen"));
   Molecule close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-rightparen"));
-  m.add_at_edge (X_AXIS, LEFT, Molecule (open), 0);
-  m.add_at_edge (X_AXIS, RIGHT, Molecule (close), 0);
+  m.add_at_edge (X_AXIS, LEFT, Molecule (open), 0,0);
+  m.add_at_edge (X_AXIS, RIGHT, Molecule (close), 0,0);
 
   return m;
 }
@@ -32,7 +40,7 @@ Accidental_interface::after_line_breaking (SCM smob)
   Grob *me  = unsmob_grob (smob);
   Grob *tie = unsmob_grob (me->get_grob_property ("tie"));
 
-  if (tie && !tie->original_l_)
+  if (tie && !tie->original_)
     {
       me->suicide ();
     }
@@ -62,7 +70,7 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
       && !parens
       && scm_ilength (accs) == 1)
     {
-      if (gh_scm2int (gh_car (accs)) == -1)
+      if (gh_scm2int (gh_car (accs)) == FLAT)
        {
          Box stem = b;
          Box bulb = b;
@@ -77,6 +85,7 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
          boxes.push (bulb);
          boxes.push (stem);
        }
+      
       /*
        TODO: add support for natural, double flat.
        */
@@ -95,6 +104,60 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common)
   return boxes;
 }
 
+/*
+ * Some styles do not provide all flavours of accidentals, e.g. there
+ * is currently no sharp accidental in vaticana style.  In these cases
+ * this function falls back to one of the other styles.
+ */
+
+/*
+  todo: this sort of stuff in Scheme. --hwn.
+ */
+String
+Accidental_interface::get_fontcharname (String style, int alteration)
+{
+  if (alteration == DOUBLE_FLAT
+      || alteration == DOUBLE_SHARP)
+    {
+      return to_string (alteration);
+    }
+  
+  if (style == "hufnagel")
+    switch (alteration)
+      {
+      case FLAT: return "hufnagel-1";
+      case 0: return "vaticana0";
+      case SHARP: return "mensural1";
+      }
+  if (style == "medicaea")
+    switch (alteration)
+      {
+      case FLAT: return "medicaea-1";
+      case 0: return "vaticana0";
+      case SHARP: return "mensural1";
+      }
+  if (style == "vaticana")
+    switch (alteration)
+      {
+      case FLAT: return "vaticana-1";
+      case 0: return "vaticana0";
+      case SHARP: return "mensural1";
+      }
+  if (style == "mensural")
+    switch (alteration)
+      {
+      case FLAT: return "mensural-1";
+      case 0: return "vaticana0";
+      case SHARP: return "mensural1";
+      }
+  
+  if (style == "neo_mensural")
+    style = ""; // currently same as default
+  if (style == "default")
+    style = "";
+  return style + to_string (alteration);
+}
+
 MAKE_SCHEME_CALLBACK (Accidental_interface,brew_molecule,1);
 SCM
 Accidental_interface::brew_molecule (SCM smob)
@@ -102,7 +165,7 @@ Accidental_interface::brew_molecule (SCM smob)
   Grob *me = unsmob_grob (smob);
   bool smaller = false;
   bool parens = false;
-  
+
   bool caut  = to_boolean (me->get_grob_property ("cautionary"));
   if (caut)
     {
@@ -110,47 +173,50 @@ Accidental_interface::brew_molecule (SCM smob)
       parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses"));
       smaller = gh_equal_p (cstyle, ly_symbol2scm ("smaller"));
     }
-  
+
   SCM scm_style = me->get_grob_property ("style");
   String style;
   if (gh_symbol_p (scm_style))
     {
-      style = ly_scm2string (scm_symbol_to_string (scm_style));
+      style = ly_symbol2string (scm_style);
     }
   else
     {
       /*
        preferably no name for the default style.
-       */
+      */
       style = "";
     }
 
-
   Font_metric *fm = 0;
   if (smaller)
     {
       SCM ac = Font_interface::font_alist_chain (me);
       ac = gh_cons (gh_cons (gh_cons
                             (ly_symbol2scm ("font-relative-size"),
-                             gh_int2scm (-1)), SCM_EOL),
+                             scm_int2num (-1)), SCM_EOL),
                    ac);
-      fm = Font_interface::get_font (me, ac);
+      fm = select_font (me->get_paper (), ac);
     }
   else
     fm = Font_interface::get_default_font (me);
 
   Molecule mol;
   for (SCM s = me->get_grob_property ("accidentals");
-       gh_pair_p (s);  s= gh_cdr (s))
+       gh_pair_p (s); s = gh_cdr (s))
     {
-      SCM entry  = gh_car (s);
-      
-      
-      Molecule acc (fm->find_by_name (String ("accidentals-") +
-                                     style +
-                                     to_str (gh_scm2int(entry))));
-      
-      mol.add_at_edge (X_AXIS,  RIGHT, acc, 0.1);
+      int alteration = gh_scm2int (gh_car (s));
+      String font_char = get_fontcharname (style, alteration);
+      Molecule acc (fm->find_by_name ("accidentals-" + font_char));
+
+      if (acc.is_empty ())
+       {
+         me->warning (_f ("accidental `%s' not found", font_char));
+       }
+      else
+       {
+         mol.add_at_edge (X_AXIS,  RIGHT, acc, 0.1,0);
+       }
     }
 
   if (parens)
@@ -163,4 +229,4 @@ Accidental_interface::brew_molecule (SCM smob)
 
 ADD_INTERFACE (Accidental_interface, "accidental-interface",
              "a single accidental",
-              "cautionary-style style tie accidentals");
+              "cautionary cautionary-style style tie accidentals");