X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=db5f2d9cc78a631edcf8bcd480c695f35ed82448;hb=04e10efb0566620b4b7972d6775c8e59f04fa209;hp=b81c610f315283498716c1eac80f2c0176a36d42;hpb=492f3643bd2a86956201c3e0c93bb1b65bcdea4e;p=lilypond.git diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index b81c610f31..db5f2d9cc7 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -3,34 +3,34 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ #ifndef LOOKUP_HH #define LOOKUP_HH -#include "string.hh" -#include "molecule.hh" -#include "flower-proto.hh" -#include "direction.hh" -#include "box.hh" +#include "stencil.hh" +#include "std-vector.hh" struct Lookup { - static Molecule bracket (Axis a, Interval iv, Real thick, Real protude); - static Molecule accordion (SCM arg, Real interline_f, Font_metric*fm); - static Molecule frame (Box b, Real thick); - static Molecule slur (Bezier controls, Real cthick, Real thick); - static Molecule bezier_sandwich (Bezier top_curve, Bezier bottom_curve); - static Molecule horizontal_slope (Real width, Real slope, Real height); - static Molecule beam (Real slope, Real width, Real thick); - static Molecule dashed_slur (Bezier, Real thick, Real dash); - static Molecule blank (Box b); - static Molecule filledbox (Box b); - static Molecule roundfilledbox (Box b, Real blotdiameter); - static Molecule repeat_slash (Real w, Real slope, Real th); - static Molecule line (Real th, Offset from, Offset to); + static Stencil dot (Offset p, Real radius); + static Stencil bracket (Axis a, Interval iv, Real thick, Real protude, Real blot); + static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm); + static Stencil rotated_box (Real slope, Real width, Real thick, Real blot); + static Stencil round_filled_polygon (vector const &points, Real blotdiameter); + static Stencil frame (Box b, Real thick, Real blot); + static Stencil slur (Bezier controls, Real cthick, Real thick); + static Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve); + static Stencil beam (Real slope, Real width, Real thick, Real blot); + static Stencil dashed_slur (Bezier, Real thick, Real dash_period, Real dash_fraction); + 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, Real, Real); }; #endif // LOOKUP_HH