X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-interface.cc;h=ebbd62ef4f2b61ac9bff1824b9e102b15c3edb4d;hb=69aa7021254529b5f399861636b33674f57aa20d;hp=c662d77d9f84f42b97e62d71f2c17b7320f113fc;hpb=edf17353d89f4f6bd831466262402bb9151a26ca;p=lilypond.git

diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index c662d77d9f..ebbd62ef4f 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -1,18 +1,29 @@
 /*
-  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--2011 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"
 
-#include "staff-symbol-referencer.hh"
+#include "font-interface.hh"
+#include "grob.hh"
 #include "lookup.hh"
 #include "output-def.hh"
-#include "grob.hh"
-#include "font-interface.hh"
+#include "staff-symbol-referencer.hh"
 
 Stencil
 Line_interface::make_arrow (Offset begin, Offset end,
@@ -37,15 +48,9 @@ Line_interface::make_trill_line (Grob *me,
 				 Offset from,
 				 Offset to)
 {
-  Offset dz = (to-from);
-  SCM alist_chain = Font_interface::text_font_alist_chain (me);
-  SCM style_alist = scm_list_n (scm_cons (ly_symbol2scm ("font-encoding"),
-					  ly_symbol2scm ("fetaMusic")),
-				SCM_UNDEFINED);
+  Offset dz = (to - from);
 
-  Font_metric *fm = select_font (me->layout (),
-				 scm_cons (style_alist,
-					   alist_chain));
+  Font_metric *fm = Font_interface::get_default_font (me);
 
   Stencil elt = fm->find_by_name ("scripts.trill_element");
   elt.align_to (Y_AXIS, CENTER);
@@ -77,7 +82,7 @@ Line_interface::make_zigzag_line (Grob *me,
 				  Offset from,
 				  Offset to)
 {
-  Offset dz = to -from;
+  Offset dz = to - from;
 
   Real thick = Staff_symbol_referencer::line_thickness (me);
   thick *= robust_scm2double (me->get_property ("thickness"), 1.0); // todo: staff sym referencer? 
@@ -111,13 +116,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;
 }
 
 
@@ -204,11 +203,11 @@ Line_interface::line (Grob *me, Offset from, Offset to)
 
   SCM type = me->get_property ("style");
   if (type == ly_symbol2scm ("zigzag"))
-    {
-      return make_zigzag_line (me, from, to);
-    }
+    return make_zigzag_line (me, from, to);
   else if (type == ly_symbol2scm ("trill"))
     return make_trill_line (me, from, to);
+  else if (type == ly_symbol2scm ("none"))
+    return Stencil ();
   
   Stencil stencil;
 
@@ -227,7 +226,7 @@ Line_interface::line (Grob *me, Offset from, Offset to)
       if (period <= 0)
 	return Stencil ();
 
-      Real len = (to-from).length ();
+      Real len = (to - from).length ();
       
       int n = (int) rint ((len - period * fraction) / period);
       n = max (0, n);
@@ -237,7 +236,7 @@ Line_interface::line (Grob *me, Offset from, Offset to)
 	    TODO: figure out something intelligent for really short
 	    sections.
 	   */
-	  period = ((to-from).length () - period * fraction) / n;
+	  period = ((to - from).length () - period * fraction) / n;
 	}
       stencil = make_dashed_line (thick, from, to, period, fraction);
     }
@@ -250,21 +249,20 @@ Line_interface::line (Grob *me, Offset from, Offset to)
 ADD_INTERFACE (Line_interface,
 	       "Generic line objects.  Any object using lines supports this."
 	       "  The property @code{style} can be @code{line},"
-	       " @code{dashed-line}, @code{trill}, @code{dotted-line} or"
-	       " @code{zigzag}.\n"
+	       " @code{dashed-line}, @code{trill}, @code{dotted-line},"
+	       " @code{zigzag} or @code{none} (a transparent line).\n"
 	       "\n"
 	       "For @code{dashed-line}, the length of the dashes is tuned"
 	       " with @code{dash-fraction}.  If the latter is set to@tie{}0, a"
-	       " dotted line is produced.  If @code{dash-period} is negative,"
-	       " the line is made transparent.",
+	       " dotted line is produced.",
 
 	       /* properties */
-	       "dash-period "
+	       "arrow-length "
+	       "arrow-width "
 	       "dash-fraction "
-	       "thickness "
+	       "dash-period "
 	       "style "
+	       "thickness "
 	       "zigzag-length "
 	       "zigzag-width "
-	       "arrow-length "
-	       "arrow-width ")
-
+	       );