X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=c68460c3b920fda566159c6fb828a82f4501c50c;hb=b950bfac562447bf1870db4bfcbaa9ecbd3e1c0e;hp=58a7e34ccb98eb13c3ea8e33c8b9ce5827b3f9e0;hpb=da7dbf5f2f54bc66984ab2524c490335d567b5e7;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 58a7e34ccb..c68460c3b9 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -1,56 +1,48 @@
 /*
-  lookup.hh -- declare Lookup
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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/>.
 */
 
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
-#include "lily-guile.hh"
-#include "molecule.hh"
-#include "fproto.hh"
-#include "direction.hh"
-#include "box.hh"
+#include "stencil.hh"
+#include "std-vector.hh"
 
-/** handy interface to symbol table
-    TODO: move this into GUILE?
- */
-class Lookup
+struct Lookup
 {
-public:
-  Lookup ();
-  Lookup (Lookup const&);
-
-  Molecule simple_bar (String s, Real w, Paper_def*) const;
-  Molecule accidental (int, bool cautionary) const;
-  Molecule afm_find (String, bool warn=true) const;
-  Molecule notehead  (int, String) const;
-  Molecule bar (String, Real height, Paper_def*) const;
-  Molecule beam (Real, Real, Real) const;
-  Molecule clef (String) const;
-  Molecule dashed_slur (Array<Offset> 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 hairpin (Real width, Real height, bool decresc, bool continued) const;
-  Molecule tuplet_bracket (Real dy, Real dx, Real thick,Real interline, Direction dir) const;
-  Molecule rest (int, bool outside, String) const;
-  Molecule accordion (SCM arg, Real interline_f) const;
-  Molecule slur (Array<Offset> controls) const;
-  Molecule text (String style, String text, Paper_def*) const;
-  Molecule staff_brace (Real dy) const;
-  Molecule staff_bracket (Real dy) const;
-  Molecule volta (Real w, Real h, Real il, bool last_b) const;
-  Molecule special_time_signature (String, int,int, Paper_def*) const;
-  Molecule time_signature (int n,int d, Paper_def*) const;
-
-  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 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, 
+                       SCM dash_definition);
+  static 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);
 };
 
 #endif // LOOKUP_HH