This is so that using-declarations can later be added without
appearing before #includes.
18 files changed:
#define PATHSEP ':'
#endif
#define PATHSEP ':'
#endif
vector<string>
File_path::directories () const
{
return dirs_;
}
vector<string>
File_path::directories () const
{
return dirs_;
}
void
File_path::parse_path (const string &p)
{
void
File_path::parse_path (const string &p)
{
#ifndef DIRECTION_HH
#define DIRECTION_HH
#ifndef DIRECTION_HH
#define DIRECTION_HH
#include "axis.hh"
enum Direction
#include "axis.hh"
enum Direction
#include "std-string.hh"
#include "string-convert.hh"
#include "std-string.hh"
#include "string-convert.hh"
+#include "std-vector.hh"
string
to_string (const string &s)
string
to_string (const string &s)
-#include "std-vector.hh"
-
vector<string>
string_split (string str, char c)
{
vector<string>
string_split (string str, char c)
{
#include "axis-group-interface.hh"
#include "item.hh"
#include "axis-group-interface.hh"
#include "item.hh"
+#include "translator.icc"
+
class Collision_engraver : public Engraver
{
Item *col_;
class Collision_engraver : public Engraver
{
Item *col_;
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Collision_engraver, note_column);
ADD_TRANSLATOR (Collision_engraver,
ADD_ACKNOWLEDGER (Collision_engraver, note_column);
ADD_TRANSLATOR (Collision_engraver,
using namespace std;
#include "std-string.hh"
#include "lily-guile.hh"
#include "warn.hh"
using namespace std;
#include "std-string.hh"
#include "lily-guile.hh"
#include "warn.hh"
+/* type predicates. */
+#include "global-context.hh"
+#include "input.hh"
+#include "item.hh"
+#include "music.hh"
+#include "music-function.hh"
+#include "paper-score.hh"
+#include "performance.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "unpure-pure-container.hh"
+
static SCM doc_hash_table;
void
static SCM doc_hash_table;
void
map<void *, string> type_names;
void
map<void *, string> type_names;
void
return type_names[ptr];
}
return type_names[ptr];
}
-/* type predicates. */
-#include "global-context.hh"
-#include "input.hh"
-#include "item.hh"
-#include "music.hh"
-#include "music-function.hh"
-#include "paper-score.hh"
-#include "performance.hh"
-#include "spanner.hh"
-#include "stream-event.hh"
-#include "unpure-pure-container.hh"
-
#include "item.hh"
#include "grid-line-interface.hh"
#include "item.hh"
#include "grid-line-interface.hh"
+#include "translator.icc"
+
class Grid_line_span_engraver : public Engraver
{
Item *spanline_;
class Grid_line_span_engraver : public Engraver
{
Item *spanline_;
-#include "translator.icc"
ADD_ACKNOWLEDGER (Grid_line_span_engraver, grid_point);
ADD_TRANSLATOR (Grid_line_span_engraver,
/* doc */
ADD_ACKNOWLEDGER (Grid_line_span_engraver, grid_point);
ADD_TRANSLATOR (Grid_line_span_engraver,
/* doc */
#include "grob.hh"
#include "warn.hh"
#include "grob.hh"
#include "warn.hh"
+#include "translator.icc"
+
struct Grob_pq_entry
{
Grob *grob_;
struct Grob_pq_entry
{
Grob *grob_;
context ()->set_property ("busyGrobs", busy);
}
context ()->set_property ("busyGrobs", busy);
}
-#include "translator.icc"
ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
ADD_TRANSLATOR (Grob_pq_engraver,
/* doc */
ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
ADD_TRANSLATOR (Grob_pq_engraver,
/* doc */
#include "engraver.hh"
#include "staff-symbol.hh"
#include "engraver.hh"
#include "staff-symbol.hh"
+#include "translator.icc"
+
class Ledger_line_engraver : public Engraver
{
Spanner *span_;
class Ledger_line_engraver : public Engraver
{
Spanner *span_;
ledgered_grobs_.push_back (s.grob ());
}
ledgered_grobs_.push_back (s.grob ());
}
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Ledger_line_engraver, ledgered);
ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
ADD_TRANSLATOR (Ledger_line_engraver,
ADD_ACKNOWLEDGER (Ledger_line_engraver, ledgered);
ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
ADD_TRANSLATOR (Ledger_line_engraver,
#include "warn.hh"
#include "axis-group-interface.hh"
#include "warn.hh"
#include "axis-group-interface.hh"
+#include "translator.icc"
+
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, note_column);
ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_bracket);
ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_script);
ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, note_column);
ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_bracket);
ADD_ACKNOWLEDGER (Piano_pedal_align_engraver, piano_pedal_script);
#include "stream-event.hh"
#include "warn.hh"
#include "stream-event.hh"
#include "warn.hh"
+#include "translator.icc"
+
class Pitched_trill_engraver : public Engraver
{
public:
class Pitched_trill_engraver : public Engraver
{
public:
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
ADD_ACKNOWLEDGER (Pitched_trill_engraver, stem);
ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
ADD_ACKNOWLEDGER (Pitched_trill_engraver, stem);
#include "pure-from-neighbor-interface.hh"
#include "engraver.hh"
#include "pure-from-neighbor-interface.hh"
#include "engraver.hh"
+#include "translator.icc"
+
class Pure_from_neighbor_engraver : public Engraver
{
vector<Grob *> pure_relevants_;
class Pure_from_neighbor_engraver : public Engraver
{
vector<Grob *> pure_relevants_;
pure_relevants_.clear ();
}
pure_relevants_.clear ();
}
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, item);
ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, pure_from_neighbor);
ADD_TRANSLATOR (Pure_from_neighbor_engraver,
ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, item);
ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, pure_from_neighbor);
ADD_TRANSLATOR (Pure_from_neighbor_engraver,
#include "version.hh"
#include "warn.hh"
#include "version.hh"
#include "warn.hh"
+#ifdef __MINGW32__
+#include <winbase.h>
+#endif
+
#define FRAMEWORKDIR ".."
int
#define FRAMEWORKDIR ".."
int
-#ifdef __MINGW32__
-#include <winbase.h>
-#endif
-
static void
prefix_relocation (const string &prefix)
{
static void
prefix_relocation (const string &prefix)
{
#include "stream-event.hh"
#include "warn.hh"
#include "stream-event.hh"
#include "warn.hh"
+#include "translator.icc"
+
class Rest_collision_engraver : public Engraver
{
protected:
class Rest_collision_engraver : public Engraver
{
protected:
-#include "translator.icc"
-
ADD_TRANSLATOR (Rest_collision_engraver,
/* doc */
"Handle collisions of rests.",
ADD_TRANSLATOR (Rest_collision_engraver,
/* doc */
"Handle collisions of rests.",
#include "side-position-interface.hh"
#include "staff-symbol-referencer.hh"
#include "side-position-interface.hh"
#include "staff-symbol-referencer.hh"
+#include "translator.icc"
+
/**
Make arpeggios that span multiple staves. Catch arpeggios, and span a
Span_arpeggio over them if we find more than two arpeggios.
/**
Make arpeggios that span multiple staves. Catch arpeggios, and span a
Span_arpeggio over them if we find more than two arpeggios.
note_columns_.clear ();
}
note_columns_.clear ();
}
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Span_arpeggio_engraver, arpeggio);
ADD_ACKNOWLEDGER (Span_arpeggio_engraver, note_column);
ADD_TRANSLATOR (Span_arpeggio_engraver,
ADD_ACKNOWLEDGER (Span_arpeggio_engraver, arpeggio);
ADD_ACKNOWLEDGER (Span_arpeggio_engraver, note_column);
ADD_TRANSLATOR (Span_arpeggio_engraver,
#include "pointer-group-interface.hh"
#include "lily-imports.hh"
#include "pointer-group-interface.hh"
#include "lily-imports.hh"
+#include "translator.icc"
+
/**
Make bars that span multiple "staves". Catch bars, and span a
/**
Make bars that span multiple "staves". Catch bars, and span a
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
ADD_TRANSLATOR (Span_bar_engraver,
/* doc */
ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
ADD_TRANSLATOR (Span_bar_engraver,
/* doc */
#include "pointer-group-interface.hh"
#include "engraver.hh"
#include "pointer-group-interface.hh"
#include "engraver.hh"
+#include "translator.icc"
+
/*
The Span_bar_stub_engraver creates SpanBarStub grobs in the contexts
that a grouping context contains. For example, if a PianoStaff contains
/*
The Span_bar_stub_engraver creates SpanBarStub grobs in the contexts
that a grouping context contains. For example, if a PianoStaff contains
axis_groups_ = axis_groups;
}
axis_groups_ = axis_groups;
}
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (Span_bar_stub_engraver, span_bar);
ADD_ACKNOWLEDGER (Span_bar_stub_engraver, hara_kiri_group_spanner);
ADD_TRANSLATOR (Span_bar_stub_engraver,
ADD_ACKNOWLEDGER (Span_bar_stub_engraver, span_bar);
ADD_ACKNOWLEDGER (Span_bar_stub_engraver, hara_kiri_group_spanner);
ADD_TRANSLATOR (Span_bar_stub_engraver,
#include "warn.hh"
#include "lily-imports.hh"
#include "warn.hh"
#include "lily-imports.hh"
+#include "translator.icc"
+
/* Perform a staff. Individual notes should have their instrument
(staff-wide) set, so we override play_element ()
*/
/* Perform a staff. Individual notes should have their instrument
(staff-wide) set, so we override play_element ()
*/
int Staff_performer::channel_count_ = 0;
int Staff_performer::staff_performer_count_ = 0;
int Staff_performer::channel_count_ = 0;
int Staff_performer::staff_performer_count_ = 0;
-#include "translator.icc"
-
ADD_TRANSLATOR (Staff_performer,
/* doc */
"",
ADD_TRANSLATOR (Staff_performer,
/* doc */
"",
#include "staff-symbol.hh"
#include "system-start-delimiter.hh"
#include "staff-symbol.hh"
#include "system-start-delimiter.hh"
+#include "translator.icc"
+
struct Bracket_nesting_node
{
public:
struct Bracket_nesting_node
{
public:
nesting_->add_support (inf.grob ());
}
nesting_->add_support (inf.grob ());
}
-#include "translator.icc"
-
ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol);
ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter);
ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol);
ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter);