resolve merge

[lilypond.git] / lily / ottava-engraver.cc

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index f4a8a8b91c839bbaefeea66eabf1aedd81844ec7..fd59b33b8e83a7e158d1420ff149342c58fad534 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,18 +1,30 @@
 /*
-  ottava-engraver.cc -- implement Ottava_spanner_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys
 
-  (c) 2000--2009 Han-Wen Nienhuys
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "protected-scm.hh"
+#include "engraver.hh"
+#include "item.hh"
 #include "note-column.hh"
+#include "protected-scm.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
 #include "spanner.hh"
 #include "text-interface.hh"
-#include "item.hh"
+
 
 class Ottava_spanner_engraver : public Engraver
 {
@@ -137,8 +149,8 @@ ADD_TRANSLATOR (Ottava_spanner_engraver,
                "OttavaBracket ",
 
                /* read */
+               "middleCOffset "
                "ottavation "
-               "originalMiddleCPosition "
                "currentMusicalColumn ",
                
                /* write */