Remove obsolete accordion code.

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index b07acd6ef0b4f6477ed646da3d49a7e20c5299c0..509dece604d31f96cef2345cd141615e0c836461 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -17,7 +17,6 @@ struct Lookup
 {
   static Stencil dot (Offset p, Real radius);
   static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
-  static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm);
   static Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
   static Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
   static Stencil frame (Box b, Real thick, Real blot);

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 62e0d9731786d78c03da4f7bcefe0cc3ae8cf4e7..d2099d7c4886f58802ee2db82dc85ebc54369b3d 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -18,11 +18,9 @@ using namespace std;
 #include "warn.hh"
 #include "dimensions.hh"
 #include "bezier.hh"
-#include "string-convert.hh"
 #include "file-path.hh"
 #include "main.hh"
 #include "lily-guile.hh"
-#include "font-metric.hh"
 
 Stencil
 Lookup::dot (Offset p, Real radius)
@@ -461,207 +459,6 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
   return Stencil (b, horizontal_bend);
 }
 
-/*
-  TODO: junk me.
-*/
-Stencil
-Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
-{
-  Stencil m;
-  string sym = ly_scm2string (scm_car (s));
-  string reg = ly_scm2string (scm_car (scm_cdr (s)));
-
-  if (sym == "Discant")
-    {
-      Stencil r = fm->find_by_name ("accordion.accDiscant");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      int eflag = 0x00;
-      if (reg.substr (0, 3) == "EEE")
-       {
-         eflag = 0x07;
-         reg = reg.substr (3);
-       }
-      else if (reg.substr (0, 2) == "EE")
-       {
-         eflag = 0x05;
-         reg = reg.substr (2);
-       }
-      else if (reg.substr (0, 2) == "Eh")
-       {
-         eflag = 0x04;
-         reg = reg.substr (2);
-       }
-      else if (reg.substr (0, 1) == "E")
-       {
-         eflag = 0x02;
-         reg = reg.substr (1);
-       }
-      if (eflag & 0x02)
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-       }
-      if (eflag & 0x04)
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         d.translate_axis (0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-       }
-      if (eflag & 0x01)
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-       }
-      if (reg.substr (0, 2) == "SS")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (0.5 * staff_space PT, Y_AXIS);
-         d.translate_axis (0.4 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (2);
-       }
-      if (reg.substr (0, 1) == "S")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (0.5 * staff_space PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-    }
-  else if (sym == "Freebase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accFreebase");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg == "E")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         m.add_stencil (d);
-       }
-    }
-  else if (sym == "Bayanbase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accBayanbase");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "T")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      /* include 4' reed just for completeness. You don't want to use this. */
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 2) == "EE")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         d.translate_axis (0.4 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (2);
-       }
-      if (reg.substr (0, 1) == "E")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-    }
-  else if (sym == "Stdbase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accStdbase");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "T")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 3.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "M")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2 PT, Y_AXIS);
-         d.translate_axis (staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "E")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "S")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-    }
-  /* ugh maybe try to use regular font for S.B. and B.B and only use one font
-     for the rectangle */
-  else if (sym == "SB")
-    {
-      Stencil r = fm->find_by_name ("accordion.accSB");
-      m.add_stencil (r);
-    }
-  else if (sym == "BB")
-    {
-      Stencil r = fm->find_by_name ("accordion.accBB");
-      m.add_stencil (r);
-    }
-  else if (sym == "OldEE")
-    {
-      Stencil r = fm->find_by_name ("accordion.accOldEE");
-      m.add_stencil (r);
-    }
-  else if (sym == "OldEES")
-    {
-      Stencil r = fm->find_by_name ("accordion.accOldEES");
-      m.add_stencil (r);
-    }
-  return m;
-}
-
 Stencil
 Lookup::repeat_slash (Real w, Real s, Real t)
 {

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index f6957f9eea8bcf87f4dca26482dcfb18d410433f..a8fbc49fcdb51d3b446e12eca0848b1541ea9f19 100644 (file)
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -33,9 +33,6 @@ Script_interface::get_stencil (Grob *me, Direction d)
       return Font_interface::get_default_font (me)
        ->find_by_name ("scripts." + ly_scm2string (str));
     }
-  else if (key == ly_symbol2scm ("accordion"))
-    return Lookup::accordion (scm_cdr (s), 1.0,
-                             Font_interface::get_default_font (me));
   else
     assert (false);
 

diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly
deleted file mode 100644 (file)
index bb69331..0000000
--- a/ly/accordion-defs-init.ly
+++ /dev/null
@@ -1,56 +0,0 @@
-\version "2.10.0"
-% Symbols needed to print accordion music
-% 
-%  2' = T
-%  4' = F
-%  8' = E
-% 16' = S
-%
-
-accDiscant = #(make-articulation "accDiscant")
-accDiscantF = #(make-articulation "accDiscantF")
-accDiscantE = #(make-articulation "accDiscantE")
-accDiscantEh = #(make-articulation "accDiscantEh")
-accDiscantFE = #(make-articulation "accDiscantFE")
-accDiscantFEh = #(make-articulation "accDiscantFEh")
-accDiscantEE = #(make-articulation "accDiscantEE")
-accDiscantFEE = #(make-articulation "accDiscantFEE")
-accDiscantEEE = #(make-articulation "accDiscantEEE")
-accDiscantFEEE = #(make-articulation "accDiscantFEEE")
-accDiscantS = #(make-articulation "accDiscantS")
-accDiscantFS = #(make-articulation "accDiscantFS")
-accDiscantES = #(make-articulation "accDiscantES")
-accDiscantEhS = #(make-articulation "accDiscantEhS")
-accDiscantFES = #(make-articulation "accDiscantFES")
-accDiscantFEhS = #(make-articulation "accDiscantFEhS")
-accDiscantEES = #(make-articulation "accDiscantEES")
-accDiscantFEES = #(make-articulation "accDiscantFEES")
-accDiscantEEES = #(make-articulation "accDiscantEEES")
-accDiscantFEEES = #(make-articulation "accDiscantFEEES")
-accDiscantSS = #(make-articulation "accDiscantSS")
-accDiscantESS = #(make-articulation "accDiscantESS")
-accDiscantEESS = #(make-articulation "accDiscantEESS")
-accDiscantEEESS = #(make-articulation "accDiscantEEESS")
-
-accFreebase = #(make-articulation "accFreebase")
-accFreebaseF = #(make-articulation "accFreebaseF")
-accFreebaseE = #(make-articulation "accFreebaseE")
-accFreebaseFE = #(make-articulation "accFreebaseFE")
-
-accBayanbase = #(make-articulation "accBayanbase")
-accBayanbaseT = #(make-articulation "accBayanbaseT")
-accBayanbaseE = #(make-articulation "accBayanbaseE")
-accBayanbaseTE = #(make-articulation "accBayanbaseTE")
-accBayanbaseEE = #(make-articulation "accBayanbaseEE")
-accBayanbaseTEE = #(make-articulation "accBayanbaseTEE")
-
-accStdbase = #(make-articulation "accStdbase")
-accStdbaseFE = #(make-articulation "accStdbaseFE")
-accStdbaseTFE = #(make-articulation "accStdbaseTFE")
-accStdbaseMES = #(make-articulation "accStdbaseMES")
-accStdbaseTFMES = #(make-articulation "accStdbaseTFMES")
-
-accSB = #(make-articulation "accSB")
-accBB = #(make-articulation "accBB")
-accOldEE = #(make-articulation "accOldEE")
-accOldEES = #(make-articulation "accOldEES")