X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=4a3dea7e0f9f343cb18e8e1f6d8769e82255b6de;hb=cee6cea4ed55eb4fa1f9d83c997ebc19744a6e1a;hp=493b1b735e16e4064562c7a79ad56afe6f342756;hpb=ab8cc216b5483e35ed900c2761cb5a627bc419f4;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 493b1b735e..5b76145316 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -1,87 +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--1998 Han-Wen Nienhuys <hanwen@cs.uu.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
+  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 "atom.hh"
-#include "fproto.hh"
-#include "scalar.hh"
-#include "direction.hh"
-#include "curve.hh"
-#include "afm.hh"
-#include "symtable.hh"
-#include "box.hh"
+#include "stencil.hh"
+#include "std-vector.hh"
 
-/** handy interface to symbol table
- */
-class Lookup
+namespace Lookup
 {
-public:
-  Lookup ();
-  Lookup (Lookup const&);
-  Lookup (Symtables const&);
-  virtual ~Lookup ();
-  
-  Atom accidental (int) const;
-  void add (String, Symtable*);
-  virtual Atom afm_find (String s) const = 0;
-  Atom afm_find (String, String) const;
-  virtual Atom* atom_p (String, int, Box) const = 0;
-  Atom ball (int) const;
-  Atom bar (String, Real height) const;
-  String base_output_str () const;
-  Atom beam (Real,Real, Real) const;
-  virtual String character_str (int i) const;
-  Atom clef (String) const;
-  virtual Atom dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
-  Atom dots () const;
-  Atom dynamic (String) const;
-  Atom fill (Box b) const;
-  Atom flag (int, Direction) const;
-  virtual Atom hairpin (Real width, bool decresc, bool continued) const = 0;
-  virtual Lookup* lookup_p (Lookup const&) const = 0;
-  virtual Lookup* lookup_p (Symtables const&) const = 0;
-  virtual Paper_outputter* paper_outputter_p (Paper_stream*, Paper_def*, Scope*, String) const = 0;
-  virtual Paper_stream* paper_stream_p () const = 0;
-  virtual Atom plet (Real dy, Real dx, Direction dir) const = 0;
-  void print () const;
-  virtual Atom ps_beam (Real slope, Real width, Real thick) const = 0;
-  virtual String print_dimen (Real) const;
-  Atom rest (int, bool outside) const;
-  Atom rule_symbol (Real height, Real width) const;
-  Atom script (String idx) const;
-  /** paratime_signature substitution in lookup strings.
-      this function provides a simple macro mechanism:
-
-      if source == "tex%bla%", then
-      substitute_args (source, {"X","Y"})  == "texXblaY"
-  */
-  String substitute_args (String source, Array<String> args) const;
-  /// paratime_signature substitution in lookup strings
-  String substitute_args (String source, Array<Scalar> args) const;
-  virtual Atom stem (Real y1_pos, Real y2_pos) const = 0;
-  Atom stem (Real y1_pos, Real y2_pos, String) const;
-  virtual Atom slur (Array<Offset> controls) const = 0;
-  Atom streepje (int type) const;
-  virtual Atom text (String style, String text) const;
-  virtual String unknown_str () const = 0;
-  Atom vbrace (Real &dy) const;
-  virtual Atom vbracket (Real &dy) const = 0;
-  Atom special_time_signature (String, Array<Scalar>) const;
-  Atom time_signature (Array<Scalar>) const;
-
-  Paper_def * paper_l_;
-  Symtables *symtables_p_;
-  String font_;
-  String font_path_;  
-  Adobe_font_metric * afm_p_;
+  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 // LOOKUP_HH