X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=2e22a507873c62cd5d55640088d6c62b6952d85d;hb=8eef80ceb2f84478fee909225e14f59a33031dd9;hp=9b988f4978eb5d45a36bab4355d72eed5668c291;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 9b988f4978..2e22a50787 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -3,61 +3,32 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ #ifndef LOOKUP_HH #define LOOKUP_HH -#include "molecule.hh" -#include "fproto.hh" -#include "direction.hh" -#include "box.hh" +#include "stencil.hh" -/** handy interface to symbol table - */ -class Lookup +struct Lookup { -public: - Lookup (); - Lookup (Lookup const&); - - - - Molecule special_ball (int, String) const; - Molecule simple_bar (String s, Real w) const; - Molecule accidental (int, bool cautionary) const; - Molecule afm_find (String, bool warn=true) const; - Molecule ball (int) const; - Molecule bar (String, Real height) const; - Molecule beam (Real, Real, Real) const; - Molecule clef (String) const; - Molecule dashed_slur (Array controls, Real thick, Real dash) const; - Molecule dots () const; - Molecule ledger_line (Interval) const; - Molecule fill (Box b) const; - Molecule filledbox (Box b) const; - Molecule flag (int, Direction) const; - Molecule hairpin (Real width, bool decresc, bool continued) const; - Molecule plet (Real dy, Real dx, Direction dir) const; - Molecule rest (int, bool outside) const; - Molecule rule_symbol (Real height, Real width) const; - Molecule script (String idx) const; - Molecule stem (Real y1_pos, Real y2_pos) const; - Molecule slur (Array controls) const; - Molecule streepje (int type) const; - Molecule text (String style, String text) const; - Molecule staff_brace (Real dy) const; - Molecule staff_bracket (Real dy) const; - Molecule volta (Real w, bool last_b) const; - Molecule special_time_signature (String, int,int) const; - Molecule time_signature (int n,int d) const; - - Paper_def * paper_l_; - - String font_name_; - Adobe_font_metric * afm_l_; + 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 round_filled_polygon (Array 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