X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=5fe740482593e6f93365d63aa31086a1709ce7da;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=c68460c3b920fda566159c6fb828a82f4501c50c;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index c68460c3b9..5fe7404825 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -24,25 +24,25 @@
 #include "stencil.hh"
 #include "std-vector.hh"
 
-struct Lookup
+namespace Lookup
 {
-  static Stencil dot (Offset p, Real radius);
-  static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
-  static Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
-  static Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
-  static Stencil frame (Box b, Real thick, Real blot);
-  static Stencil slur (Bezier controls, Real cthick, Real thick, 
+  Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
+  Stencil circle (Real rad, Real thick, bool filled);
+  Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
+  Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter, Real extroversion = -1.0);
+  Stencil frame (Box b, Real thick, Real blot);
+  Stencil slur (Bezier controls, Real cthick, Real thick,
                        SCM dash_definition);
-  static Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve,
+  Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve,
                                   Real thickness);
-  static Stencil beam (Real slope, Real width, Real thick, Real blot);
-  static Stencil blank (Box b);
-  static Stencil filled_box (Box b);
-  static Stencil round_filled_box (Box b, Real blotdiameter);
-  static Stencil repeat_slash (Real w, Real slope, Real th);
-  static Stencil horizontal_line (Interval w, Real th);
-  static Stencil triangle (Interval iv, Real thick, Real protrude);
-  static Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
+  Stencil beam (Real slope, Real width, Real thick, Real blot);
+  Stencil blank (Box b);
+  Stencil filled_box (Box b);
+  Stencil round_filled_box (Box b, Real blotdiameter);
+  Stencil repeat_slash (Real w, Real slope, Real th);
+  Stencil horizontal_line (Interval w, Real th);
+  Stencil triangle (Interval iv, Real thick, Real protrude);
+  Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
 };
 
 #endif // LOOKUP_HH