Web: really read search-box HTML file in UTF-8

[lilypond.git] / lily / line-interface.cc

diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index 13f5a8cdef59e6d863e4745d379712eb75ae52e1..c7bf67a406ce8eed60a02400bb8489bbd6b17498 100644 (file)
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -1,9 +1,20 @@
 /*
-  line-interface.cc -- implement Line_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 "line-interface.hh"
@@ -111,13 +122,7 @@ Line_interface::make_zigzag_line (Grob *me,
       total.add_stencil (moved_squiggle);
     }
 
-  Box b;
-  b.add_point (Offset (0, 0));
-  b.add_point (dz);
-  b[X_AXIS].widen (thick / 2);
-  b[Y_AXIS].widen (thick / 2);
-
-  return Stencil (b, total.expr ());
+  return total;
 }
 
 
@@ -210,7 +215,7 @@ Line_interface::line (Grob *me, Offset from, Offset to)
   else if (type == ly_symbol2scm ("trill"))
     return make_trill_line (me, from, to);
   
-  Stencil stil;
+  Stencil stencil;
 
   if (type == ly_symbol2scm ("dashed-line") || type == ly_symbol2scm ("dotted-line"))
     {
@@ -239,12 +244,12 @@ Line_interface::line (Grob *me, Offset from, Offset to)
           */
          period = ((to-from).length () - period * fraction) / n;
        }
-      stil = make_dashed_line (thick, from, to, period, fraction);
+      stencil = make_dashed_line (thick, from, to, period, fraction);
     }
   else
-    stil = make_line (thick, from, to);
+    stencil = make_line (thick, from, to);
 
-  return stil;
+  return stencil;
 }
 
 ADD_INTERFACE (Line_interface,