quarter tones in tablature

[lilypond.git] / lily / beaming-pattern.cc

diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index 53a8c354ea162d5e28d792f5e18bb0192b61e944..f205df8d78a14014c0d23547e7afaf5601f6166c 100644 (file)
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -21,8 +21,6 @@
 #include "beaming-pattern.hh"
 #include "misc.hh"
 
-using std::vector;
-
 /*
   Represents a stem belonging to a beam. Sometimes (for example, if the stem
   belongs to a rest and stemlets aren't used) the stem will be invisible.
@@ -173,7 +171,7 @@ Beaming_pattern::beamify (Beaming_options const &options)
             int importance = infos_[i + 1].rhythmic_importance_;
             int count = (importance < 0 && options.subdivide_beams_) 
                         ? subdivide_beam_count
-                        : std::min (std::min (infos_[i].count (non_flag_dir),
+                        : min (min (infos_[i].count (non_flag_dir),
                                         infos_[i + non_flag_dir].count (-non_flag_dir)),
                                    infos_[i - non_flag_dir].count (non_flag_dir));
 
@@ -317,7 +315,7 @@ Beaming_pattern::unbeam_invisible_stems ()
   for (vsize i = 1; i < infos_.size (); i++)
     if (infos_[i].invisible_)
       {
-        int b = std::min (infos_[i].count (LEFT), infos_[i - 1].count (LEFT));
+        int b = min (infos_[i].count (LEFT), infos_[i - 1].count (LEFT));
         infos_[i].beam_count_drul_[LEFT] = b;
         infos_[i].beam_count_drul_[RIGHT] = b;
       }
@@ -326,7 +324,7 @@ Beaming_pattern::unbeam_invisible_stems ()
     for (vsize i = infos_.size () - 1; i--;)
       if (infos_[i].invisible_)
         {
-          int b = std::min (infos_[i].count (LEFT), infos_[i + 1].count (LEFT));
+          int b = min (infos_[i].count (LEFT), infos_[i + 1].count (LEFT));
           infos_[i].beam_count_drul_[LEFT] = b;
           infos_[i].beam_count_drul_[RIGHT] = b;
         }
@@ -357,7 +355,7 @@ Beaming_pattern::start_moment (int i) const
 Moment
 Beaming_pattern::end_moment (int i) const
 {
-  Duration dur (2 + std::max (beamlet_count (i, LEFT),
+  Duration dur (2 + max (beamlet_count (i, LEFT),
                          beamlet_count (i, RIGHT)),
                 0);
 
@@ -396,7 +394,7 @@ Beaming_pattern::split_pattern (int i)
   new_pattern = new Beaming_pattern ();
   for (vsize j = i + 1; j < infos_.size (); j++)
     {
-      count = std::max (beamlet_count (j, LEFT), beamlet_count (j, RIGHT));
+      count = max (beamlet_count (j, LEFT), beamlet_count (j, RIGHT));
       new_pattern->add_stem (start_moment (j),
                              count,
                              invisibility (j),