From 7f63ca8841e0b01988e34cdc24665160f1ffffcd Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Aug 2004 23:27:33 +0000
Subject: [PATCH] *** empty log message ***

---
 Documentation/user/tutorial.itely          | 6 ++----
 lily/dynamic-engraver.cc                   | 2 +-
 lily/phrasing-slur-engraver.cc             | 8 ++++----
 lily/script-engraver.cc                    | 2 +-
 lily/{slur-quanting.cc => slur-scoring.cc} | 0
 lily/{new-slur.cc => slur.cc}              | 0
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename lily/{slur-quanting.cc => slur-scoring.cc} (100%)
 rename lily/{new-slur.cc => slur.cc} (100%)

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index eccf55c0f6..0f331a7248 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -856,17 +856,15 @@ r4 <c e g>8[ <c f a>]~ <c f a>
 @end lilypond
 
 @example
-r4 <c e g>8\>( <c e g> <c e g> <c f a>8\!)
+r4 <c e g>8\>( <c e g> <c e g> <c f a>\!)
 @end example
 
 @lilypond[quote,relative=1,fragment]
 \slurUp
-r4 <c e g>8\>( <c e g> <c e g> <c f a>8\!)
+r4 <c e g>8\>( <c e g> <c e g> <c f a>\!)
 @end lilypond
 
 
-
-
 @node Advanced rhythmic commands
 @section Advanced rhythmic commands
 
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 9b0b1892ad..18c41d2b16 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -401,7 +401,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info info)
 	  < ly_scm2int (script_->get_property ("script-priority")))
 	Side_position_interface::add_support (line_spanner_, info.grob_);
     }
-  else if (New_slur::has_interface (info.grob_))
+  else if (Slur::has_interface (info.grob_))
     slur_ = dynamic_cast<Spanner*> (info.grob_);
 }
 
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 73fd4b4061..c48ce5b6ad 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -76,9 +76,9 @@ Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
   if (Note_column::has_interface (info.grob_))
     {
       for (int i = slurs_.size (); i--; )
-	New_slur::add_column (slurs_[i], e);
+	Slur::add_column (slurs_[i], e);
       for (int i = end_slurs_.size (); i-- ; )
-	New_slur::add_column (end_slurs_[i], e);
+	Slur::add_column (end_slurs_[i], e);
     }
   else
     {
@@ -86,9 +86,9 @@ Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
 	TODO: maybe take more objects?  
        */
       for (int i = slurs_.size (); i--; )
-	New_slur::add_extra_encompass (slurs_[i], e);
+	Slur::add_extra_encompass (slurs_[i], e);
       for (int i = end_slurs_.size (); i--; )
-	New_slur::add_extra_encompass (end_slurs_[i], e);
+	Slur::add_extra_encompass (end_slurs_[i], e);
     }
 }
 
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 2a463b581f..3b952933cb 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -220,7 +220,7 @@ Script_engraver::acknowledge_grob (Grob_info info)
 	    e->set_parent (info.grob_, X_AXIS);
 	}
     }
-  else if (New_slur::has_interface (info.grob_))
+  else if (Slur::has_interface (info.grob_))
     slur_ = dynamic_cast<Spanner*> (info.grob_);
 }
 
diff --git a/lily/slur-quanting.cc b/lily/slur-scoring.cc
similarity index 100%
rename from lily/slur-quanting.cc
rename to lily/slur-scoring.cc
diff --git a/lily/new-slur.cc b/lily/slur.cc
similarity index 100%
rename from lily/new-slur.cc
rename to lily/slur.cc
-- 
2.39.5