Merge branch 'master' into translation

[lilypond.git] / lily / include / lookup.hh

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 39dc5ae9b05b559717da761a36864662ac904a09..5b7614531625c0bb02099c3618bcdf8b3d054409 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -1,65 +1,48 @@
 /*
-  lookup.hh -- declare Lookup
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#ifndef LOOKUPSYMS_HH
-#define LOOKUPSYMS_HH
-
-#include "atom.hh"
-#include "fproto.hh"
-#include "scalar.hh"
-#include "direction.hh"
-
-/** handy interface to symbol table
- */
-struct Lookup {
-  Paper_def * paper_l_;
-  Symtables *symtables_p_;
-  String texsetting;
+  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.
 
-  Lookup();
-  Lookup (Lookup const &);
-  ~Lookup();
-  
-  void add (String, Symtable*);
-  void print() const;
+  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.
 
-  Atom fill (Box b) const;
-  Atom beam_element (int,int,Real=0) const;
-
-  /// round slope to closest TeXslope
-  Atom beam (Real&,Real, Real) const;
-  Atom ps_beam (Real, Real, Real)const;
-  Atom tex_beam (Real&, Real) const;
-
-  Atom streepje (int type) const;
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  Atom vbrace (Real &dy) const;
-  Atom meter (Array<Scalar>) const;
-  Atom stem (Real y1_pos, Real y2_pos) const;
-  Atom rule_symbol (Real height, Real width) const;
-  Atom accidental (int) const;
-  Atom ball (int) const;
-  Atom flag (int, Direction) const;
-  Atom rest (int, bool outside) const;
-  Atom clef (String) const;
-  Atom bar (String, Real height) const;
-    
-  Atom dots () const;
-  Atom slur (Real &dy, Real &dx, Direction dir) const;
-  Atom tex_slur (int dy, Real &dx, Direction dir) const;
-  Atom ps_slur (Real dy, Real dx, Real dir) const;
-  Atom half_slur (int dy, Real &dx, Direction dir, int xpart) const;
-  Atom half_slur_middlepart (Real &dx, Direction dir) const;
-  Atom big_slur (int dy, Real &dx, Direction dir) const;
-  Atom text (String style, String text, int align = 1) const;
-  Atom script (String idx) const;
-  Atom hairpin (Real & width, bool decresc, bool continued) const;
-  Atom dynamic (String) const;
+#ifndef LOOKUP_HH
+#define LOOKUP_HH
+
+#include "stencil.hh"
+#include "std-vector.hh"
+
+namespace Lookup
+{
+  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);
+  Stencil frame (Box b, Real thick, Real blot);
+  Stencil slur (Bezier controls, Real cthick, Real thick,
+                       SCM dash_definition);
+  Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve,
+                                  Real thickness);
+  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
+#endif // LOOKUP_HH