#define DECLARE_TYPE_NAME(Class)
-class Notename_table_identifier;
class Translator_group_identifier;
class Music_identifier;
class Articulation_req_identifier;
void error (String) const;
String str () const;
IDACCESSOR(Translator_group)
- IDACCESSOR(Notename_table)
IDACCESSOR(Music)
IDACCESSOR(Midi_def)
IDACCESSOR(Paper_def)
DECLARE_ID_CLASS(Translator_group);
DECLARE_ID_CLASS(Duration);
-DECLARE_ID_CLASS(Notename_table);
DECLARE_ID_CLASS(Real);
DECLARE_ID_CLASS(String);
DECLARE_ID_CLASS(General_script_def);
struct Musical_pitch : public Input
{
Musical_pitch (int notename=0, int accidental=0, int octave=0);
+
+ /// construct from '(octave name acc)
Musical_pitch (SCM);
/// 0 is c, 6 is b
int notename_i_;
+
/// 0 natural, 1 sharp, etc
int accidental_i_;
+
/// 0 is central c
int octave_i_;
-/*
- notename-table.hh -- declare Notename_table
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef NOTENAME_TABLE_HH
-#define NOTENAME_TABLE_HH
-
-#include "string.hh"
-#include "lily-proto.hh"
-
-class Notename_table {
- Dictionary<Musical_pitch> *pitch_dict_;
-public:
- Notename_table ();
- ~Notename_table ();
- Notename_table (Notename_table const&);
- Musical_pitch get_pitch(String s) const;
- void add_note_name (String, Musical_pitch const *p);
- bool elem_b (String )const;
-};
-
-#endif // NOTENAME_TABLE_HH
#include "hash-table.hh"
#include "smobs.hh"
-#define usestl
struct SCM_less
{
class Scheme_hash_table : private Scm_stl_map
{
public:
-#ifndef usestl
- // bool elem_b (SCM k) const;
- Hash_table<SCM,SCM>::try_retrieve;
- Hash_table<SCM,SCM>::elem_b;
-#else
bool try_retrieve (SCM key, SCM *val);
bool elem_b (SCM key) const;
-#endif
-
/**
WARNING: putting something in assumes responsibility for cleaning
SCM
Musical_pitch::to_scm ()const
{
- return gh_list (gh_int2scm (notename_i_),
+ return gh_list (gh_int2scm (octave_i_),
+ gh_int2scm (notename_i_),
gh_int2scm (accidental_i_),
- gh_int2scm (octave_i_),
SCM_UNDEFINED);
}
Musical_pitch::Musical_pitch (SCM s)
{
- notename_i_ = gh_scm2int (gh_car (s));
- accidental_i_ = gh_scm2int (gh_cadr (s));
- octave_i_ = gh_scm2int (gh_caddr (s));
+ octave_i_ = gh_scm2int (gh_car (s));
+ notename_i_ = gh_scm2int (gh_cadr (s));
+ accidental_i_ = gh_scm2int (gh_caddr (s));
}
Musical_pitch::Musical_pitch (int n, int a, int o)
-/*
- notename-table.cc -- implement Notename_table
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "notename-table.hh"
-#include "dictionary-iter.hh"
-#include "dictionary.hh"
-#include "musical-pitch.hh"
-
-void
-Notename_table::add_note_name (String s,
- Musical_pitch const *p)
-{
- pitch_dict_->elem (s) = *p;
-}
-
-Notename_table::Notename_table ()
-{
- pitch_dict_ = new Dictionary<Musical_pitch>;
-}
-
-Notename_table::~Notename_table()
-{
- delete pitch_dict_;
-}
-
-Notename_table::Notename_table (Notename_table const &s)
-{
- pitch_dict_ = new Dictionary<Musical_pitch> (*s.pitch_dict_);
-}
-bool
-Notename_table::elem_b (String s)const
-{
- return pitch_dict_->elem_b (s);
-}
-Musical_pitch
-Notename_table::get_pitch (String s)const
-{
- return (*pitch_dict_)[s];
-}
% added asas and marked ases as `unusual'
-%
-% Please note that, while these names are used to enter *notes*, they
-% actually are *melodic*s, i.e. they represent a pitch solely. Notes
-% have a rhythmic part too. This is the reason that we don't write 'note { .. }'
-%
-\notenames {
- ceses = \musicalpitch { -1 0 -2 }
- ces = \musicalpitch { -1 0 -1 }
- c = \musicalpitch { -1 0 0 }
- cis = \musicalpitch { -1 0 1 }
- cisis = \musicalpitch { -1 0 2 }
- deses = \musicalpitch { -1 1 -2 }
- des = \musicalpitch { -1 1 -1 }
- d = \musicalpitch { -1 1 0 }
- dis = \musicalpitch { -1 1 1 }
- disis = \musicalpitch { -1 1 2 }
- eses = \musicalpitch { -1 2 -2 }
- es = \musicalpitch { -1 2 -1 }
- e = \musicalpitch { -1 2 0 }
- eis = \musicalpitch { -1 2 1 }
- eisis = \musicalpitch { -1 2 2 }
- feses = \musicalpitch { -1 3 -2 }
- fes = \musicalpitch { -1 3 -1 }
- f = \musicalpitch { -1 3 0 }
- fis = \musicalpitch { -1 3 1 }
- fisis = \musicalpitch { -1 3 2 }
- geses = \musicalpitch { -1 4 -2 }
- ges = \musicalpitch { -1 4 -1 }
- g = \musicalpitch { -1 4 0 }
- gis = \musicalpitch { -1 4 1 }
- gisis = \musicalpitch { -1 4 2 }
- asas = \musicalpitch { -1 5 -2 }
- ases = \musicalpitch { -1 5 -2 } % non-standard name for asas
- as = \musicalpitch { -1 5 -1 }
- a = \musicalpitch { -1 5 0 }
- ais = \musicalpitch { -1 5 1 }
- aisis = \musicalpitch { -1 5 2 }
- heses = \musicalpitch { -1 6 -2 }
- b = \musicalpitch { -1 6 -1 }
- h = \musicalpitch { -1 6 0 }
- his = \musicalpitch { -1 6 1 }
- hisis = \musicalpitch { -1 6 2 }
-
-
- %
- % upper case: 1 octave lower.
- %
-
-
- Ceses = \musicalpitch { -2 0 -2 }
- Ces = \musicalpitch { -2 0 -1 }
- C = \musicalpitch { -2 0 0 }
- Cis = \musicalpitch { -2 0 1 }
- Cisis = \musicalpitch { -2 0 2 }
- Deses = \musicalpitch { -2 1 -2 }
- Des = \musicalpitch { -2 1 -1 }
- D = \musicalpitch { -2 1 0 }
- Dis = \musicalpitch { -2 1 1 }
- Disis = \musicalpitch { -2 1 2 }
- Eses = \musicalpitch { -2 2 -2 }
- Es = \musicalpitch { -2 2 -1 }
- E = \musicalpitch { -2 2 0 }
- Eis = \musicalpitch { -2 2 1 }
- Eisis = \musicalpitch { -2 2 2 }
- Feses = \musicalpitch { -2 3 -2 }
- Fes = \musicalpitch { -2 3 -1 }
- F = \musicalpitch { -2 3 0 }
- Fis = \musicalpitch { -2 3 1 }
- Fisis = \musicalpitch { -2 3 2 }
- Geses = \musicalpitch { -2 4 -2 }
- Ges = \musicalpitch { -2 4 -1 }
- G = \musicalpitch { -2 4 0 }
- Gis = \musicalpitch { -2 4 1 }
- Gisis = \musicalpitch { -2 4 2 }
- Asas = \musicalpitch { -2 5 -2 }
- Ases = \musicalpitch { -2 5 -2 } % non-standard name for Asas
- As = \musicalpitch { -2 5 -1 }
- A = \musicalpitch { -2 5 0 }
- Ais = \musicalpitch { -2 5 1 }
- Aisis = \musicalpitch { -2 5 2 }
- Heses = \musicalpitch { -2 6 -2 }
- B = \musicalpitch { -2 6 -1 }
- H = \musicalpitch { -2 6 0 }
- His = \musicalpitch { -2 6 1 }
- Hisis = \musicalpitch { -2 6 2 }
+\notenames #'(
+ (ceses . ( -1 0 -2 ))
+ (ces . ( -1 0 -1 ))
+ (c . ( -1 0 0 ))
+ (cis . ( -1 0 1 ))
+ (cisis . ( -1 0 2 ))
+ (deses . ( -1 1 -2 ))
+ (des . ( -1 1 -1 ))
+ (d . ( -1 1 0 ))
+ (dis . ( -1 1 1 ))
+ (disis . ( -1 1 2 ))
+ (eses . ( -1 2 -2 ))
+ (es . ( -1 2 -1 ))
+ (e . ( -1 2 0 ))
+ (eis . ( -1 2 1 ))
+ (eisis . ( -1 2 2 ))
+ (feses . ( -1 3 -2 ))
+ (fes . ( -1 3 -1 ))
+ (f . ( -1 3 0 ))
+ (fis . ( -1 3 1 ))
+ (fisis . ( -1 3 2 ))
+ (geses . ( -1 4 -2 ))
+ (ges . ( -1 4 -1 ))
+ (g . ( -1 4 0 ))
+ (gis . ( -1 4 1 ))
+ (gisis . ( -1 4 2 ))
+ (asas . ( -1 5 -2 ))
+ (ases . ( -1 5 -2 )) ; non-standard name for asas
+ (as . ( -1 5 -1 ))
+ (a . ( -1 5 0 ))
+ (ais . ( -1 5 1 ))
+ (aisis . ( -1 5 2 ))
+ (heses . ( -1 6 -2 ))
+ (b . ( -1 6 -1 ))
+ (h . ( -1 6 0 ))
+ (his . ( -1 6 1 ))
+ (hisis . ( -1 6 2 ))
+)
}
+
+\version "1.3.38";
% contributed by Paolo Zuliani <zuliap@easynet.it>
\notenames {
- dobb = \musicalpitch { -1 0 -2 }
- dob = \musicalpitch { -1 0 -1 }
- do = \musicalpitch { -1 0 0 }
- dod = \musicalpitch { -1 0 1 }
- dodd = \musicalpitch { -1 0 2 }
- rebb = \musicalpitch { -1 1 -2 }
- reb = \musicalpitch { -1 1 -1 }
- re = \musicalpitch { -1 1 0 }
- red = \musicalpitch { -1 1 1 }
- redd = \musicalpitch { -1 1 2 }
- mibb = \musicalpitch { -1 2 -2 }
- mib = \musicalpitch { -1 2 -1 }
- mi = \musicalpitch { -1 2 0 }
- mid = \musicalpitch { -1 2 1 }
- midd = \musicalpitch { -1 2 2 }
- fabb = \musicalpitch { -1 3 -2 }
- fab = \musicalpitch { -1 3 -1 }
- fa = \musicalpitch { -1 3 0 }
- fad = \musicalpitch { -1 3 1 }
- fadd = \musicalpitch { -1 3 2 }
- solbb = \musicalpitch { -1 4 -2 }
- solb = \musicalpitch { -1 4 -1 }
- sol = \musicalpitch { -1 4 0 }
- sold = \musicalpitch { -1 4 1 }
- soldd = \musicalpitch { -1 4 2 }
- labb = \musicalpitch { -1 5 -2 }
- lab = \musicalpitch { -1 5 -1 }
- la = \musicalpitch { -1 5 0 }
- lad = \musicalpitch { -1 5 1 }
- ladd = \musicalpitch { -1 5 2 }
- sibb = \musicalpitch { -1 6 -2 }
- sib = \musicalpitch { -1 6 -1 }
- si = \musicalpitch { -1 6 0 }
- sid = \musicalpitch { -1 6 1 }
- sidd = \musicalpitch { -1 6 2 }
+ (dobb . ( -1 0 -2 ))
+ (dob . ( -1 0 -1 ))
+ (do . ( -1 0 0 ))
+ (dod . ( -1 0 1 ))
+ (dodd . ( -1 0 2 ))
+ (rebb . ( -1 1 -2 ))
+ (reb . ( -1 1 -1 ))
+ (re . ( -1 1 0 ))
+ (red . ( -1 1 1 ))
+ (redd . ( -1 1 2 ))
+ (mibb . ( -1 2 -2 ))
+ (mib . ( -1 2 -1 ))
+ (mi . ( -1 2 0 ))
+ (mid . ( -1 2 1 ))
+ (midd . ( -1 2 2 ))
+ (fabb . ( -1 3 -2 ))
+ (fab . ( -1 3 -1 ))
+ (fa . ( -1 3 0 ))
+ (fad . ( -1 3 1 ))
+ (fadd . ( -1 3 2 ))
+ (solbb . ( -1 4 -2 ))
+ (solb . ( -1 4 -1 ))
+ (sol . ( -1 4 0 ))
+ (sold . ( -1 4 1 ))
+ (soldd . ( -1 4 2 ))
+ (labb . ( -1 5 -2 ))
+ (lab . ( -1 5 -1 ))
+ (la . ( -1 5 0 ))
+ (lad . ( -1 5 1 ))
+ (ladd . ( -1 5 2 ))
+ (sibb . ( -1 6 -2 ))
+ (sib . ( -1 6 -1 ))
+ (si . ( -1 6 0 ))
+ (sid . ( -1 6 1 ))
+ (sidd . ( -1 6 2 ))
}
+
+\version "1.3.38";
%{
- common dutch names for notes. "es" means flat, "is" means sharp
+ common dutch names for notes. es means flat, is means sharp
%}
-\notenames {
- ceses = \musicalpitch { -1 0 -2 }
- ces = \musicalpitch { -1 0 -1 }
- c = \musicalpitch { -1 0 0 }
- cis = \musicalpitch { -1 0 1 }
- cisis = \musicalpitch { -1 0 2 }
- deses = \musicalpitch { -1 1 -2 }
- des = \musicalpitch { -1 1 -1 }
- d = \musicalpitch { -1 1 0 }
- dis = \musicalpitch { -1 1 1 }
- disis = \musicalpitch { -1 1 2 }
- eeses = \musicalpitch { -1 2 -2 }
- eses = \musicalpitch { -1 2 -2 }
- ees = \musicalpitch { -1 2 -1 }
- es = \musicalpitch { -1 2 -1 }
- e = \musicalpitch { -1 2 0 }
- eis = \musicalpitch { -1 2 1 }
- eisis = \musicalpitch { -1 2 2 }
- feses = \musicalpitch { -1 3 -2 }
- fes = \musicalpitch { -1 3 -1 }
- f = \musicalpitch { -1 3 0 }
- fis = \musicalpitch { -1 3 1 }
- fisis = \musicalpitch { -1 3 2 }
- geses = \musicalpitch { -1 4 -2 }
- ges = \musicalpitch { -1 4 -1 }
- g = \musicalpitch { -1 4 0 }
- gis = \musicalpitch { -1 4 1 }
- gisis = \musicalpitch { -1 4 2 }
- aeses = \musicalpitch { -1 5 -2 }
- ases = \musicalpitch { -1 5 -2 }
- aes = \musicalpitch { -1 5 -1 }
- as = \musicalpitch { -1 5 -1 }
- a = \musicalpitch { -1 5 0 }
- ais = \musicalpitch { -1 5 1 }
- aisis = \musicalpitch { -1 5 2 }
- beses = \musicalpitch { -1 6 -2 }
- bes = \musicalpitch { -1 6 -1 }
- b = \musicalpitch { -1 6 0 }
- bis = \musicalpitch { -1 6 1 }
- bisis = \musicalpitch { -1 6 2 }
+\notenames
+ #'((ceses . (-1 0 -2 ))
+ (ces . ( -1 0 -1 ))
+ (c . ( -1 0 0 ))
+ (cis . ( -1 0 1 ))
+ (cisis . ( -1 0 2 ))
+ (deses . ( -1 1 -2 ))
+ (des . ( -1 1 -1 ))
+ (d . ( -1 1 0 ))
+ (dis . ( -1 1 1 ))
+ (disis . ( -1 1 2 ))
+ (eeses . ( -1 2 -2 ))
+ (eses . ( -1 2 -2 ))
+ (ees . ( -1 2 -1 ))
+ (es . ( -1 2 -1 ))
+ (e . ( -1 2 0 ))
+ (eis . ( -1 2 1 ))
+ (eisis . ( -1 2 2 ))
+ (feses . ( -1 3 -2 ))
+ (fes . ( -1 3 -1 ))
+ (f . ( -1 3 0 ))
+ (fis . ( -1 3 1 ))
+ (fisis . ( -1 3 2 ))
+ (geses . ( -1 4 -2 ))
+ (ges . ( -1 4 -1 ))
+ (g . ( -1 4 0 ))
+ (gis . ( -1 4 1 ))
+ (gisis . ( -1 4 2 ))
+ (aeses . ( -1 5 -2 ))
+ (ases . ( -1 5 -2 ))
+ (aes . ( -1 5 -1 ))
+ (as . ( -1 5 -1 ))
+ (a . ( -1 5 0 ))
+ (ais . ( -1 5 1 ))
+ (aisis . ( -1 5 2 ))
+ (beses . ( -1 6 -2 ))
+ (bes . ( -1 6 -1 ))
+ (b . ( -1 6 0 ))
+ (bis . ( -1 6 1 ))
+ (bisis . ( -1 6 2 )))
- %
- % upper case: 1 octave lower.
- %
-
- %% deprecated.
-
- Ceses = \musicalpitch { -2 0 -2 }
- Ces = \musicalpitch { -2 0 -1 }
- C = \musicalpitch { -2 0 0 }
- Cis = \musicalpitch { -2 0 1 }
- Cisis = \musicalpitch { -2 0 2 }
- Deses = \musicalpitch { -2 1 -2 }
- Des = \musicalpitch { -2 1 -1 }
- D = \musicalpitch { -2 1 0 }
- Dis = \musicalpitch { -2 1 1 }
- Disis = \musicalpitch { -2 1 2 }
- Eses = \musicalpitch { -2 2 -2 }
- Eeses = \musicalpitch { -2 2 -2 }
- Es = \musicalpitch { -2 2 -1 }
- Ees = \musicalpitch { -2 2 -1 }
- E = \musicalpitch { -2 2 0 }
- Eis = \musicalpitch { -2 2 1 }
- Eisis = \musicalpitch { -2 2 2 }
- Feses = \musicalpitch { -2 3 -2 }
- Fes = \musicalpitch { -2 3 -1 }
- F = \musicalpitch { -2 3 0 }
- Fis = \musicalpitch { -2 3 1 }
- Fisis = \musicalpitch { -2 3 2 }
- Geses = \musicalpitch { -2 4 -2 }
- Ges = \musicalpitch { -2 4 -1 }
- G = \musicalpitch { -2 4 0 }
- Gis = \musicalpitch { -2 4 1 }
- Gisis = \musicalpitch { -2 4 2 }
- Aeses = \musicalpitch { -2 5 -2 }
- Ases = \musicalpitch { -2 5 -2 }
- Aes = \musicalpitch { -2 5 -1 }
- As = \musicalpitch { -2 5 -1 }
- A = \musicalpitch { -2 5 0 }
- Ais = \musicalpitch { -2 5 1 }
- Aisis = \musicalpitch { -2 5 2 }
- Beses = \musicalpitch { -2 6 -2 }
- Bes = \musicalpitch { -2 6 -1 }
- B = \musicalpitch { -2 6 0 }
- Bis = \musicalpitch { -2 6 1 }
- Bisis = \musicalpitch { -2 6 2 }
-
-
-}
-% $Id: norsk.ly,v 1.2 1999/09/02 00:17:49 fred Exp $
+% $Id: norsk.ly,v 1.3 2000/03/23 12:52:56 fred Exp $
%{
%}
-\notenames {
- ceses = \musicalpitch { -1 0 -2 }
- cessess = \musicalpitch { -1 0 -2 }
- ces = \musicalpitch { -1 0 -1 }
- cess = \musicalpitch { -1 0 -1 }
- c = \musicalpitch { -1 0 0 }
- cis = \musicalpitch { -1 0 1 }
- ciss = \musicalpitch { -1 0 1 }
- cisis = \musicalpitch { -1 0 2 }
- cississ = \musicalpitch { -1 0 2 }
- deses = \musicalpitch { -1 1 -2 }
- dessess = \musicalpitch { -1 1 -2 }
- des = \musicalpitch { -1 1 -1 }
- dess = \musicalpitch { -1 1 -1 }
- d = \musicalpitch { -1 1 0 }
- dis = \musicalpitch { -1 1 1 }
- diss = \musicalpitch { -1 1 1 }
- disis = \musicalpitch { -1 1 2 }
- dississ = \musicalpitch { -1 1 2 }
- eeses = \musicalpitch { -1 2 -2 }
- eessess = \musicalpitch { -1 2 -2 }
- eses = \musicalpitch { -1 2 -2 }
- essess = \musicalpitch { -1 2 -2 }
- ees = \musicalpitch { -1 2 -1 }
- eess = \musicalpitch { -1 2 -1 }
- es = \musicalpitch { -1 2 -1 }
- ess = \musicalpitch { -1 2 -1 }
- e = \musicalpitch { -1 2 0 }
- eis = \musicalpitch { -1 2 1 }
- eiss = \musicalpitch { -1 2 1 }
- eisis = \musicalpitch { -1 2 2 }
- eississ = \musicalpitch { -1 2 2 }
- feses = \musicalpitch { -1 3 -2 }
- fessess = \musicalpitch { -1 3 -2 }
- fes = \musicalpitch { -1 3 -1 }
- fess = \musicalpitch { -1 3 -1 }
- f = \musicalpitch { -1 3 0 }
- fis = \musicalpitch { -1 3 1 }
- fiss = \musicalpitch { -1 3 1 }
- fisis = \musicalpitch { -1 3 2 }
- fississ = \musicalpitch { -1 3 2 }
- geses = \musicalpitch { -1 4 -2 }
- gessess = \musicalpitch { -1 4 -2 }
- ges = \musicalpitch { -1 4 -1 }
- gess = \musicalpitch { -1 4 -1 }
- g = \musicalpitch { -1 4 0 }
- g = \musicalpitch { -1 4 0 }
- gis = \musicalpitch { -1 4 1 }
- giss = \musicalpitch { -1 4 1 }
- gisis = \musicalpitch { -1 4 2 }
- gississ = \musicalpitch { -1 4 2 }
- aeses = \musicalpitch { -1 5 -2 }
- aessess = \musicalpitch { -1 5 -2 }
- ases = \musicalpitch { -1 5 -2 }
- assess = \musicalpitch { -1 5 -2 }
- aes = \musicalpitch { -1 5 -1 }
- aess = \musicalpitch { -1 5 -1 }
- as = \musicalpitch { -1 5 -1 }
- ass = \musicalpitch { -1 5 -1 }
- a = \musicalpitch { -1 5 0 }
- ais = \musicalpitch { -1 5 1 }
- aiss = \musicalpitch { -1 5 1 }
- aisis = \musicalpitch { -1 5 2 }
- aississ = \musicalpitch { -1 5 2 }
- bes = \musicalpitch { -1 6 -2 }
- bess = \musicalpitch { -1 6 -2 }
- b = \musicalpitch { -1 6 -1 }
- b = \musicalpitch { -1 6 -1 }
- h = \musicalpitch { -1 6 0 }
- his = \musicalpitch { -1 6 1 }
- hiss = \musicalpitch { -1 6 1 }
- hisis = \musicalpitch { -1 6 2 }
- hississ = \musicalpitch { -1 6 2 }
-
-
- %
- % upper case: 1 octave lower, as usual.
- %
-
-
- Ceses = \musicalpitch { -2 0 -2 }
- Cessess = \musicalpitch { -2 0 -2 }
- Ces = \musicalpitch { -2 0 -1 }
- Cess = \musicalpitch { -2 0 -1 }
- C = \musicalpitch { -2 0 0 }
- Cis = \musicalpitch { -2 0 1 }
- Ciss = \musicalpitch { -2 0 1 }
- Cisis = \musicalpitch { -2 0 2 }
- Cississ = \musicalpitch { -2 0 2 }
- Deses = \musicalpitch { -2 1 -2 }
- Dessess = \musicalpitch { -2 1 -2 }
- Des = \musicalpitch { -2 1 -1 }
- Dess = \musicalpitch { -2 1 -1 }
- D = \musicalpitch { -2 1 0 }
- D = \musicalpitch { -2 1 0 }
- Dis = \musicalpitch { -2 1 1 }
- Diss = \musicalpitch { -2 1 1 }
- Disis = \musicalpitch { -2 1 2 }
- Dississ = \musicalpitch { -2 1 2 }
- Eses = \musicalpitch { -2 2 -2 }
- Essess = \musicalpitch { -2 2 -2 }
- Es = \musicalpitch { -2 2 -1 }
- Ess = \musicalpitch { -2 2 -1 }
- E = \musicalpitch { -2 2 0 }
- E = \musicalpitch { -2 2 0 }
- Eis = \musicalpitch { -2 2 1 }
- Eiss = \musicalpitch { -2 2 1 }
- Eisis = \musicalpitch { -2 2 2 }
- Eississ = \musicalpitch { -2 2 2 }
- Feses = \musicalpitch { -2 3 -2 }
- Fessess = \musicalpitch { -2 3 -2 }
- Fes = \musicalpitch { -2 3 -1 }
- Fess = \musicalpitch { -2 3 -1 }
- F = \musicalpitch { -2 3 0 }
- Fis = \musicalpitch { -2 3 1 }
- Fiss = \musicalpitch { -2 3 1 }
- Fisis = \musicalpitch { -2 3 2 }
- Fississ = \musicalpitch { -2 3 2 }
- Geses = \musicalpitch { -2 4 -2 }
- Gessess = \musicalpitch { -2 4 -2 }
- Ges = \musicalpitch { -2 4 -1 }
- Gess = \musicalpitch { -2 4 -1 }
- G = \musicalpitch { -2 4 0 }
- Gis = \musicalpitch { -2 4 1 }
- Giss = \musicalpitch { -2 4 1 }
- Gisis = \musicalpitch { -2 4 2 }
- Gississ = \musicalpitch { -2 4 2 }
- Aeses = \musicalpitch { -2 5 -2 }
- Aessess = \musicalpitch { -2 5 -2 }
- Ases = \musicalpitch { -2 5 -2 }
- Assess = \musicalpitch { -2 5 -2 }
- Aes = \musicalpitch { -2 5 -1 }
- Aess = \musicalpitch { -2 5 -1 }
- As = \musicalpitch { -2 5 -1 }
- Ass = \musicalpitch { -2 5 -1 }
- A = \musicalpitch { -2 5 0 }
- A = \musicalpitch { -2 5 0 }
- Ais = \musicalpitch { -2 5 1 }
- Aiss = \musicalpitch { -2 5 1 }
- Aisis = \musicalpitch { -2 5 2 }
- Aississ = \musicalpitch { -2 5 2 }
- Bes = \musicalpitch { -2 6 -2 }
- Bess = \musicalpitch { -2 6 -2 }
- B = \musicalpitch { -2 6 -1 }
- H = \musicalpitch { -2 6 0 }
- His = \musicalpitch { -2 6 1 }
- Hiss = \musicalpitch { -2 6 1 }
- Hisis = \musicalpitch { -2 6 2 }
- Hississ = \musicalpitch { -2 6 2 }
-
-}
-
-
-
+\notenames #'(
+ (ceses . ( -1 0 -2 ))
+ (cessess . ( -1 0 -2 ))
+ (ces . ( -1 0 -1 ))
+ (cess . ( -1 0 -1 ))
+ (c . ( -1 0 0 ))
+ (cis . ( -1 0 1 ))
+ (ciss . ( -1 0 1 ))
+ (cisis . ( -1 0 2 ))
+ (cississ . ( -1 0 2 ))
+ (deses . ( -1 1 -2 ))
+ (dessess . ( -1 1 -2 ))
+ (des . ( -1 1 -1 ))
+ (dess . ( -1 1 -1 ))
+ (d . ( -1 1 0 ))
+ (dis . ( -1 1 1 ))
+ (diss . ( -1 1 1 ))
+ (disis . ( -1 1 2 ))
+ (dississ . ( -1 1 2 ))
+ (eeses . ( -1 2 -2 ))
+ (eessess . ( -1 2 -2 ))
+ (eses . ( -1 2 -2 ))
+ (essess . ( -1 2 -2 ))
+ (ees . ( -1 2 -1 ))
+ (eess . ( -1 2 -1 ))
+ (es . ( -1 2 -1 ))
+ (ess . ( -1 2 -1 ))
+ (e . ( -1 2 0 ))
+ (eis . ( -1 2 1 ))
+ (eiss . ( -1 2 1 ))
+ (eisis . ( -1 2 2 ))
+ (eississ . ( -1 2 2 ))
+ (feses . ( -1 3 -2 ))
+ (fessess . ( -1 3 -2 ))
+ (fes . ( -1 3 -1 ))
+ (fess . ( -1 3 -1 ))
+ (f . ( -1 3 0 ))
+ (fis . ( -1 3 1 ))
+ (fiss . ( -1 3 1 ))
+ (fisis . ( -1 3 2 ))
+ (fississ . ( -1 3 2 ))
+ (geses . ( -1 4 -2 ))
+ (gessess . ( -1 4 -2 ))
+ (ges . ( -1 4 -1 ))
+ (gess . ( -1 4 -1 ))
+ (g . ( -1 4 0 ))
+ (g . ( -1 4 0 ))
+ (gis . ( -1 4 1 ))
+ (giss . ( -1 4 1 ))
+ (gisis . ( -1 4 2 ))
+ (gississ . ( -1 4 2 ))
+ (aeses . ( -1 5 -2 ))
+ (aessess . ( -1 5 -2 ))
+ (ases . ( -1 5 -2 ))
+ (assess . ( -1 5 -2 ))
+ (aes . ( -1 5 -1 ))
+ (aess . ( -1 5 -1 ))
+ (as . ( -1 5 -1 ))
+ (ass . ( -1 5 -1 ))
+ (a . ( -1 5 0 ))
+ (ais . ( -1 5 1 ))
+ (aiss . ( -1 5 1 ))
+ (aisis . ( -1 5 2 ))
+ (aississ . ( -1 5 2 ))
+ (bes . ( -1 6 -2 ))
+ (bess . ( -1 6 -2 ))
+ (b . ( -1 6 -1 ))
+ (b . ( -1 6 -1 ))
+ (h . ( -1 6 0 ))
+ (his . ( -1 6 1 ))
+ (hiss . ( -1 6 1 ))
+ (hisis . ( -1 6 2 ))
+ (hississ . ( -1 6 2 ))
+)
+
+
+
+\version "1.3.38";
%
% by Mats Bengtsson.
-\notenames {
- cessess = \musicalpitch { -1 0 -2 }
- cess = \musicalpitch { -1 0 -1 }
- c = \musicalpitch { -1 0 0 }
- ciss = \musicalpitch { -1 0 1 }
- cississ = \musicalpitch { -1 0 2 }
- dessess = \musicalpitch { -1 1 -2 }
- dess = \musicalpitch { -1 1 -1 }
- d = \musicalpitch { -1 1 0 }
- diss = \musicalpitch { -1 1 1 }
- dississ = \musicalpitch { -1 1 2 }
- essess = \musicalpitch { -1 2 -2 }
- ess = \musicalpitch { -1 2 -1 }
- e = \musicalpitch { -1 2 0 }
- eiss = \musicalpitch { -1 2 1 }
- eississ = \musicalpitch { -1 2 2 }
- fessess = \musicalpitch { -1 3 -2 }
- fess = \musicalpitch { -1 3 -1 }
- f = \musicalpitch { -1 3 0 }
- fiss = \musicalpitch { -1 3 1 }
- fississ = \musicalpitch { -1 3 2 }
- gessess = \musicalpitch { -1 4 -2 }
- gess = \musicalpitch { -1 4 -1 }
- g = \musicalpitch { -1 4 0 }
- giss = \musicalpitch { -1 4 1 }
- gississ = \musicalpitch { -1 4 2 }
- assess = \musicalpitch { -1 5 -2 }
- ass = \musicalpitch { -1 5 -1 }
- a = \musicalpitch { -1 5 0 }
- aiss = \musicalpitch { -1 5 1 }
- aississ = \musicalpitch { -1 5 2 }
- hessess = \musicalpitch { -1 6 -2 }
- b = \musicalpitch { -1 6 -1 }
- h = \musicalpitch { -1 6 0 }
- hiss = \musicalpitch { -1 6 1 }
- hississ = \musicalpitch { -1 6 2 }
-
-
- %
- % upper case: 1 octave lower.
- %
-
-
- Cessess = \musicalpitch { -2 0 -2 }
- Cess = \musicalpitch { -2 0 -1 }
- C = \musicalpitch { -2 0 0 }
- Ciss = \musicalpitch { -2 0 1 }
- Cississ = \musicalpitch { -2 0 2 }
- Dessess = \musicalpitch { -2 1 -2 }
- Dess = \musicalpitch { -2 1 -1 }
- D = \musicalpitch { -2 1 0 }
- Diss = \musicalpitch { -2 1 1 }
- Dississ = \musicalpitch { -2 1 2 }
- Essess = \musicalpitch { -2 2 -2 }
- Ess = \musicalpitch { -2 2 -1 }
- E = \musicalpitch { -2 2 0 }
- Eiss = \musicalpitch { -2 2 1 }
- Eississ = \musicalpitch { -2 2 2 }
- Fessess = \musicalpitch { -2 3 -2 }
- Fess = \musicalpitch { -2 3 -1 }
- F = \musicalpitch { -2 3 0 }
- Fiss = \musicalpitch { -2 3 1 }
- Fississ = \musicalpitch { -2 3 2 }
- Gessess = \musicalpitch { -2 4 -2 }
- Gess = \musicalpitch { -2 4 -1 }
- G = \musicalpitch { -2 4 0 }
- Giss = \musicalpitch { -2 4 1 }
- Gississ = \musicalpitch { -2 4 2 }
- Assess = \musicalpitch { -2 5 -2 }
- Ass = \musicalpitch { -2 5 -1 }
- A = \musicalpitch { -2 5 0 }
- Aiss = \musicalpitch { -2 5 1 }
- Aississ = \musicalpitch { -2 5 2 }
- Hessess = \musicalpitch { -2 6 -2 }
- B = \musicalpitch { -2 6 -1 }
- H = \musicalpitch { -2 6 0 }
- Hiss = \musicalpitch { -2 6 1 }
- Hississ = \musicalpitch { -2 6 2 }
-
-
-}
+\notenames #'(
+ (cessess . ( -1 0 -2 ))
+ (cess . ( -1 0 -1 ))
+ (c . ( -1 0 0 ))
+ (ciss . ( -1 0 1 ))
+ (cississ . ( -1 0 2 ))
+ (dessess . ( -1 1 -2 ))
+ (dess . ( -1 1 -1 ))
+ (d . ( -1 1 0 ))
+ (diss . ( -1 1 1 ))
+ (dississ . ( -1 1 2 ))
+ (essess . ( -1 2 -2 ))
+ (ess . ( -1 2 -1 ))
+ (e . ( -1 2 0 ))
+ (eiss . ( -1 2 1 ))
+ (eississ . ( -1 2 2 ))
+ (fessess . ( -1 3 -2 ))
+ (fess . ( -1 3 -1 ))
+ (f . ( -1 3 0 ))
+ (fiss . ( -1 3 1 ))
+ (fississ . ( -1 3 2 ))
+ (gessess . ( -1 4 -2 ))
+ (gess . ( -1 4 -1 ))
+ (g . ( -1 4 0 ))
+ (giss . ( -1 4 1 ))
+ (gississ . ( -1 4 2 ))
+ (assess . ( -1 5 -2 ))
+ (ass . ( -1 5 -1 ))
+ (a . ( -1 5 0 ))
+ (aiss . ( -1 5 1 ))
+ (aississ . ( -1 5 2 ))
+ (hessess . ( -1 6 -2 ))
+ (b . ( -1 6 -1 ))
+ (h . ( -1 6 0 ))
+ (hiss . ( -1 6 1 ))
+ (hississ . ( -1 6 2 ))
+)
+\version "1.3.38";
conversions.append ((1,3,35), conv, 'textEmptyDimension -> textNonEmpty')
+if 1:
+ def conv (str):
+ str = re.sub ("([a-z]+)[ \t]*=[ \t]*\\\\musicalpitch *{([- 0-9]+)} *\n",
+ "(\\1 . (\\2))\n", str)
+ str = re.sub ("\\\\musicalpitch *{([0-9 -]+)}",
+ "\\\\musicalpitch #'(\\1)", str)
+ if re.search ('\\\\notenames',str):
+ sys.stderr.write ('\nNot smart enough to convert to new \\notenames format')
+ return str
+
+ conversions.append ((1,3,38), conv, '\musicalpitch { a b c } -> #\'(a b c)')
+
+
############################
rm -f $(foreach suff, $(INSTALLATION_SUFFIXES), \
$(foreach i, $(INSTALLATION_FILES$(suff)),\
$(INSTALLATION_DIR$(suff)/$(i))))
- rmdir $(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(INSTALLATION_DIR$(suff))/)
+ -rmdir $(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(INSTALLATION_DIR$(suff))/)
projects / lilypond.git / commitdiff