Merge with master

[lilypond.git] / lily / include / line-interface.hh

diff --git a/lily/include/line-interface.hh b/lily/include/line-interface.hh
index 7746a735e8ed9c0c8a297ff393bb200149f1345a..fa94b9f71185fc5813bce3229b8f0e09e64ede18 100644 (file)
--- a/lily/include/line-interface.hh
+++ b/lily/include/line-interface.hh
@@ -16,6 +16,12 @@ struct Line_interface
 {
   static Stencil line (Grob *me, Offset from, Offset to);
   DECLARE_GROB_INTERFACE();
+  static Stencil make_zigzag_line (Grob *me,
+                                  Offset from,
+                                  Offset to);
+  static Stencil make_trill_line (Grob *me,
+                                Offset from,
+                                Offset to);
   static Stencil make_dashed_line (Real th, Offset from, Offset to, Real, Real);
   static Stencil make_line (Real th, Offset from, Offset to);
   static Stencil make_arrow (Offset beg, Offset end, Real thick,