From 84233cb0d957552a3b825ebef65a6b70ffb6090f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 3 Nov 1998 15:31:19 +0100 Subject: [PATCH] release: 1.0.18 --- Documentation/ntweb/index.yo | 11 +-- Documentation/tex/refman.yo | 33 +++------ Documentation/tex/tutorial.yo | 10 +-- NEWS | 37 ++++------ TODO | 3 + VERSION | 4 +- flower/include/dictionary.hh | 5 +- init/declarations.ly | 3 - init/script.ly | 1 - input/test/accid.fly | 6 -- input/test/keys.ly | 4 +- input/test/thumb.ly | 22 ------ input/test/time.fly | 1 - lily/command-request.cc | 4 +- lily/include/command-request.hh | 3 +- lily/include/lookup.hh | 6 +- lily/include/musical-pitch.hh | 2 - lily/include/musical-request.hh | 2 - lily/include/ps-lookup.hh | 2 +- lily/include/tex-lookup.hh | 2 +- lily/key-engraver.cc | 3 +- lily/key-item.cc | 4 +- lily/local-key-engraver.cc | 5 -- lily/local-key-item.cc | 3 +- lily/lookup.cc | 24 ++---- lily/main.cc | 12 +-- lily/musical-pitch.cc | 1 - lily/musical-request.cc | 7 +- lily/parser.yy | 17 +---- lily/ps-lookup.cc | 4 +- lily/tex-lookup.cc | 4 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mf/feta-schrift.mf | 32 -------- mf/feta-toevallig.mf | 33 +-------- mf/out/feta11.afm | 125 ++++++++++++++++---------------- mf/out/feta13.afm | 125 ++++++++++++++++---------------- mf/out/feta16.afm | 125 ++++++++++++++++---------------- mf/out/feta19.afm | 125 ++++++++++++++++---------------- mf/out/feta20.afm | 125 ++++++++++++++++---------------- mf/out/feta23.afm | 125 ++++++++++++++++---------------- mf/out/feta26.afm | 125 ++++++++++++++++---------------- mutopia/gallina.ly | 63 ++++++---------- scripts/convert-mudela.py | 6 +- scripts/ly2dvi.py | 20 ++--- stepmake/bin/package-zip32.sh | 9 +-- tex/lilyponddefs.tex | 2 +- 48 files changed, 584 insertions(+), 721 deletions(-) delete mode 100644 input/test/accid.fly delete mode 100644 input/test/thumb.ly diff --git a/Documentation/ntweb/index.yo b/Documentation/ntweb/index.yo index 4460f700c8..1a3a8df1f1 100644 --- a/Documentation/ntweb/index.yo +++ b/Documentation/ntweb/index.yo @@ -4,11 +4,12 @@ sect(Windows NT Binary Distribution) subsect(Introduction) label(introduction) -This page is dedicated to the distribution of precompiled and preformatted -LilyPond binaries for Windows NT 4.0 . This package is covered under the -GNU General Public License and all of the source and documentation are +This page is dedicated to the distribution of precompiled and +preformatted LilyPond binaries for Windows NT 4.0 . This package is +covered under the GNU General Public License and all of the source is available on the official url(LilyPond Homepage)(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html). +A full set of url(documentation)(http://www.cs.ruu.nl/people/hanwen/lilypond/Documentation/tex/out-www/index.html) in various formats is also available. includefile(../BLURB.in) @@ -69,8 +70,8 @@ itemize( In a batch file you can add the following entries: nl() bf(set LILYPONDPREFIX=em(LilyPond-dir)) nl() bf(set path=%path%;%LILYPONDPREFIX%\bin;em(MiKTeX-dir)\miktex\bin) nl() - bf(set TEXINPUTS=%LILYPONDPREFIX%\texmf\tex\lilypond;;) nl() - bf(set MFINPUTS=%LILYPONDPREFIX%\texmf\mf\public\lilypond;;) nl() + bf(set TEXINPUTS=%LILYPONDPREFIX%\share\lilypond\tex;;) nl() + bf(set MFINPUTS=%LILYPONDPREFIX%\share\lilypond\mf;;) nl() COMMENT( dit(Windows Environment) In the Windows environment you can select properties menu of the My Computer icon. Click on diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 7a2e4ec17a..ae08ad2d24 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -347,7 +347,7 @@ label(notedesc) subsect(Basic Note Specification) A note specification has the form -var(pitch)[var(octavespec)][code(!)][code(?)][var(duration)]. +var(pitch)[var(octavespec)][code(!)][var(duration)]. The pitch of the note is specified by the note's name. LilyPond has predefined note names for various languages. The default @@ -395,11 +395,9 @@ will determine what accidentals to typeset depending on the key and context. A reminder accidental can be forced by using the optional exclamation mark `code(!)' -on the pitch. -A cautionary accidental, i.e., an accidental within paranthesis -can be obtained using the optional question mark `code(?)' on the pitch. +on a pitch. mudela(fragment,verbatim,center)( -cis' d' e' cis' c'? d' e' c'! +cis' d' e' cis' c'! d' e' c' ) @@ -953,14 +951,8 @@ argument var(file) is a string. The full filename including the file(.ly) extension must be given, and the filename must be quoted. (An unquoted string will not work here.) -dit(code(\key) var(pitch) var(type) code(;)) Change the key signature. -var(type) should be code(\major) or code(\minor) to get -var(pitch)-major or var(pitch)-minor, respectively. The second -argument is optional, the default is major keys. -The var(\type) argument can also be given as an integer, which tells -the number of semitones that should be added to the pitch given in the -subsequent code(\key) commands to get the corresponding major key, -e.g. code(\minor) is defined as 3. +dit(code(\key) var(pitch)code(;)) Change key signature to that of +var(pitch)-major. dit(code(\keysignature) var(pitchseq)code(;)) Specify an arbitrary key signature. The pitches from var(pitch) will @@ -1303,6 +1295,9 @@ dit(code(barAlways)) If set to 1 a bar line is drawn after each note. dit(code(defaultBarType)) Sets the default type of bar line. See code(\bar) keyword. + + + dit(code(keyoctaviation)) If set to 1, then keys are the same in all octaves. If set to 0 then the key signature for different octaves can be different and is specified independently: code(\keysignature bes @@ -1328,16 +1323,16 @@ default) if you do not want key signatures printed. dit(code(timeSignatureStyle)) Changes the default two-digit layout for time signatures. The following values are recognized: description( - dit(code(C)) 4/4 and 2/2 are typeset as C and struck C, + dit(code(C)): 4/4 and 2/2 are typeset as C and struck C, respectively. All other time signatures are written with two digits. - dit(code(old)) 2/2, 3/2, 3/4, 4/4, 6/4 and 9/4 are typeset with + dit(code(old)): 2/2, 3/2, 3/4, 4/4, 6/4 and 9/4 are typeset with old-style mensuration marks. All other time signatures are written with two digits. - dit(code(1)) All time signatures are typeset with a single + dit(code(1)): All time signatures are typeset with a single digit, e.g. 3/2 is written as 3. dit(code(C2/2), code(C4/4), code(old2/2), code(old3/2), code(old3/4), code(old4/4), code(old6/4) or - code(old9/4)) Tells Lilypond to use a specific symbol as time + code(old9/4)): Tells Lilypond to use a specific symbol as time signature. ) The different time signature characters are shown below with @@ -1444,10 +1439,6 @@ code(castingalgorithm). Is equal to 1.0. dit(code(\infinity)) Used for setting the Score.beamslopedamping property. Is actually equal to 10000. dit(code(\left)) Used for setting textalignment property. Is equal to -1. -dit(code(\major)) Used as the second argument of the code(\key) -command to get a major key. -dit(code(\minor)) Used as the second argument of the code(\key) -command to get a minor key. dit(code(\mf)) Print mezzoforte symbol on preceeding note. dit(code(\mp)) Print mezzopiano symbol on preceeding note. dit(code(\nobreak)) Prevent a line break in music by using a large diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index cf2e0e5349..02bdaaf9a3 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -696,12 +696,10 @@ dit(code(\clef) var(clefname)) This command sets the current clef for notation, \clef "treble"; c'4 \clef "alto"; c'4 ) -dit(code(\key) var(pitch) var(type)) This command changes the current - key signature. The key signature is printed at the start of every - line. The var(type) argument is set to code(\major) or code(\minor) - to get major or minor keys, respectively. Omitting the second - argument gives major keys. The key of C-minor can thus be specified - as `code(\key es)' or `code(\key \c minor)'. +dit(code(\key) var(pitch)) This command changes the current key signature. The + key signature is printed at the start of every line. The argument + is the name of the corresponding major key. The key of C-minor can + thus be specified as `code(\key es)'. dit(code(\keysignature) var(pitchlist)) diff --git a/NEWS b/NEWS index dd00141caa..69d5f27cc8 100644 --- a/NEWS +++ b/NEWS @@ -1,24 +1,19 @@ ---- ../lilypond-1.0.17/NEWS Tue Oct 20 10:00:46 1998 -++ b/NEWS Fri Oct 23 08:06:22 1998 -@@ -1,3 +1,8 @@ -pl 17.ms1 - - added \thumb (used very often in cello music) in - mf/feta-schrift.mf. - - added /input/test/thumb.ly (example) - - pl 17 - - fixed RPM building. - pl 17.mb2 - - Full support for cautionary accidentals. Try input/test/accid.fly - Note that the font has changed. - -pl 17.mb1 - - bf: No unnecessary warnings about time signatures - - Added optional second argument of \key. Set to \major or \minor - to get a major or minor key. Default: major. - - Parser support for cautionary accidentals, i.e. accidentals - within parantheses. Syntax: cis? The main part of the - implementation is still missing. +pl 18 + - dictionary.hh fix + +pl 17.jbr1 + - stepmake/stepmake/bin/package-zip32.sh: Updated configure statement + and modified win32 specific distribution file names to match + pl 16.hwn1 changes. + - scripts/ly2dvi.py: Modified search paths to match the new lilypond + installation tree. + - scripts/convert-mudela.py: Remove the an existing backup file + before renaming original. This is a WIN32 Python requirement. + - Documentation/ntweb/index.html: Updated documentation to match + new lilypond installation tree. + - lily/main.cc: Fixed LILYPONDPREFIX search paths. + +********** pl 17 - fixed RPM building. diff --git a/TODO b/TODO index 4ea9f0da55..6c18aa1a12 100644 --- a/TODO +++ b/TODO @@ -270,6 +270,8 @@ ydirection and hshift preset * integrate midi-elts from mi2mu and lily? + * cautionary accidental + * score-bar-scripts FMR: Free memory read: * This is occurring while in: @@ -488,6 +490,7 @@ PROJECTS * Keys: - merge key{item} & localkey{item}? + - Major/Minor - spacing, national styles? * Support for TAB diff --git a/VERSION b/VERSION index 0532d0aad6..769196e8e3 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=17 -MY_PATCH_LEVEL=ms1 +PATCH_LEVEL=18 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/flower/include/dictionary.hh b/flower/include/dictionary.hh index 55f0e4fedd..e81242c64f 100644 --- a/flower/include/dictionary.hh +++ b/flower/include/dictionary.hh @@ -181,7 +181,10 @@ public: V operator [] (String k) const { - return elem (k); + V retval; + if (elem_b (k)) + retval = ((Dictionary*)this)->elem (k); + return retval; } V remove (String s) diff --git a/init/declarations.ly b/init/declarations.ly index 675a66269c..d28a53c62f 100644 --- a/init/declarations.ly +++ b/init/declarations.ly @@ -33,9 +33,6 @@ center=0 break = { \penalty = 10000; } nobreak = { \penalty = -10000; } -major = 0 -minor = 3 - \include "property.ly" % music = "\melodic\relative c" diff --git a/init/script.ly b/init/script.ly index 7c96a45122..2a7cd50bcc 100644 --- a/init/script.ly +++ b/init/script.ly @@ -3,7 +3,6 @@ % indexstring follow_into_staff same_dir_as_stem above_below_staff symbol_can_beinverted priority } % -thumb = \script { "thumb" 0 0 1 0 0 } accent = \script { "sforzato" 0 -1 0 0 0 } marcato = \script { "marcato" 0 -1 0 1 0 } staccatissimo = \script { "staccatissimo" 0 -1 0 1 0 } diff --git a/input/test/accid.fly b/input/test/accid.fly deleted file mode 100644 index d7a7775c42..0000000000 --- a/input/test/accid.fly +++ /dev/null @@ -1,6 +0,0 @@ -\time 3/4; -cisis'' cisis! cisis? | -cis cis! cis? | -c c! c? | -ces ces! ces? | -ceses ceses! ceses? | diff --git a/input/test/keys.ly b/input/test/keys.ly index aa12b97e65..211c7c1e20 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -6,8 +6,8 @@ test key itemv breaking \score { \notes { - \key bes; c1 \key c \minor; c1 + \key bes; c1 \key c; c1 \break - \key bes \major; c1 \key d;\break c1 + \key bes; c1 \key d;\break c1 } } diff --git a/input/test/thumb.ly b/input/test/thumb.ly deleted file mode 100644 index 7b4a3a3807..0000000000 --- a/input/test/thumb.ly +++ /dev/null @@ -1,22 +0,0 @@ -\header{ - title="CELLO-THUMBS"; - enteredby="Maarten Storm"; -} - - -% the thumb-script is used in cello music to indicate a note that should -% be played with your thumb. - -\version "1.0.7"; - -\score { \notes \relative c'' { - <[ a8_\thumb a'8-3(> <)b_\thumb b'-3> - <)d_\thumb d'-3]> - } - \paper{ - linewidth = 80.\mm; - castingalgorithm = \Wordwrap; - } -} - - diff --git a/input/test/time.fly b/input/test/time.fly index 5b8f1dfe32..3908c4cf64 100644 --- a/input/test/time.fly +++ b/input/test/time.fly @@ -1,4 +1,3 @@ - \property Staff.timeSignatureStyle = "C" \time 1/1; c''1^"timeSignatureStyle = \"C\"" | diff --git a/lily/command-request.cc b/lily/command-request.cc index aaad0f9fe6..b32dc96ff4 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -322,7 +322,7 @@ Key_change_req::do_print() const Key_change_req::Key_change_req() { - modality_i_ = 0; + minor_b_ = false; ordinary_key_b_= false; } @@ -366,7 +366,7 @@ Key_change_req::flats_i() bool Key_change_req::minor_b() const { - return modality_i_ == 3; + return minor_b_; } int diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index 9449dd33e9..a0afdc8f5e 100644 --- a/lily/include/command-request.hh +++ b/lily/include/command-request.hh @@ -145,7 +145,7 @@ public: class Key_change_req : public Command_req { public: Array pitch_arr_; - int modality_i_; + bool minor_b_; bool ordinary_key_b_; Key_change_req(); @@ -160,6 +160,7 @@ public: int sharps_i(); void transpose (Musical_pitch d); + /// is minor key? bool minor_b() const; }; diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 2e1997cfc1..7efe60bb7e 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -29,10 +29,10 @@ public: Lookup (Symtables const&); virtual ~Lookup (); - Atom accidental (int,bool) const; + Atom accidental (int) const; void add (String, Symtable*); - virtual Atom afm_find (String s, bool warn=true) const = 0; - Atom afm_find (String, String, bool warn=true) const; + 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; diff --git a/lily/include/musical-pitch.hh b/lily/include/musical-pitch.hh index a46471fd61..2c4f1a55de 100644 --- a/lily/include/musical-pitch.hh +++ b/lily/include/musical-pitch.hh @@ -29,8 +29,6 @@ struct Musical_pitch : public Input int octave_i_; /// 0 natural, 1 sharp, etc int accidental_i_; - /// Used for cautionary accidentals - bool cautionary_b_; void init () ; Musical_pitch to_relative_octave (Musical_pitch); diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index e03a3e8646..2f3c3f599c 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -129,8 +129,6 @@ public: /// force/supress printing of accidental. bool forceacc_b_; - /// Cautionary, i.e. parenthesized accidental. - bool cautionary_b_; Note_req(); bool do_equal_b (Request*) const; Rhythmic_req* access_Rhythmic_req () { return Rhythmic_req::access_Rhythmic_req (); } diff --git a/lily/include/ps-lookup.hh b/lily/include/ps-lookup.hh index adbc7ebf6d..2eb9ed025a 100644 --- a/lily/include/ps-lookup.hh +++ b/lily/include/ps-lookup.hh @@ -19,7 +19,7 @@ public: Ps_lookup (Symtables const& s); virtual ~Ps_lookup (); - virtual Atom afm_find (String s, bool warn=true) const; + virtual Atom afm_find (String s) const; virtual Atom* atom_p (String, int, Box) const; virtual String character_str (int i) const; virtual Atom dashed_slur (Array controls, Real thick, Real dash) const; diff --git a/lily/include/tex-lookup.hh b/lily/include/tex-lookup.hh index c0443abd06..cdb9839fcc 100644 --- a/lily/include/tex-lookup.hh +++ b/lily/include/tex-lookup.hh @@ -20,7 +20,7 @@ public: Tex_lookup (Symtables const& s); virtual ~Tex_lookup(); - virtual Atom afm_find (String s, bool warn=true) const; + virtual Atom afm_find (String s) const; virtual String character_str (int i) const; virtual Atom dashed_slur (Array controls, Real thick, Real dash) const; virtual Atom* atom_p (String, int, Box) const; diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 9917b398b0..83fd6ec6db 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -116,7 +116,8 @@ Key_engraver::read_req (Key_change_req const * r) else { p = r->pitch_arr_[0].semitone_pitch (); - p += r->modality_i_; + if (r->minor_b ()) + p += 3; } /* Solve the equation 7*no_of_acc mod 12 = p, -6 <= no_of_acc <= 5 */ int no_of_acc = (7*p) % 12; diff --git a/lily/key-item.cc b/lily/key-item.cc index 44fa94eaee..80e470f10f 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -133,7 +133,7 @@ Key_item::brew_molecule_p() const || (old_pitch_arr_[i] == pitch_arr_[j] && old_acc_arr_[i] != acc_arr_[j])) { - Atom a =lookup_l ()->accidental (0,false); + Atom a =lookup_l ()->accidental (0); a.translate_axis (calculate_position(old_pitch_arr_[i], old_acc_arr_[i]) * inter, Y_AXIS); Molecule m (a); output->add_at_edge (X_AXIS, RIGHT, m); @@ -153,7 +153,7 @@ Key_item::brew_molecule_p() const for (int i =0; i < pitch_arr_.size(); i++) { - Atom a =lookup_l ()->accidental (acc_arr_[i],false); + Atom a =lookup_l ()->accidental (acc_arr_[i]); a.translate_axis (calculate_position(pitch_arr_[i], acc_arr_[i]) * inter, Y_AXIS); Molecule m (a); output->add_at_edge (X_AXIS, RIGHT, m); diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 93098e2293..c6a3a07189 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -67,11 +67,6 @@ Local_key_engraver::process_acknowledged () key_item_p_ = new Local_key_item; announce_element (Score_element_info (key_item_p_, 0)); } - if (note_l->cautionary_b_) - { - note_l->pitch_.cautionary_b_ = true; - } - key_item_p_->add (note_l->pitch_); key_item_p_->add_support (support_l); local_key_.set (note_l->pitch_); diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 3932105466..2b2d0dd5db 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -70,8 +70,7 @@ Local_key_item::brew_molecule_p() const Real dy = (c0_position_i_ + accidental_pitch_arr_[i].notename_i_) * paper()->internote_f (); - Atom a (lookup_l ()->accidental (accidental_pitch_arr_[i].accidental_i_, - accidental_pitch_arr_[i].cautionary_b_)); + Atom a (lookup_l ()->accidental (accidental_pitch_arr_[i].accidental_i_)); a.translate_axis (dy, Y_AXIS); Molecule m(a); diff --git a/lily/lookup.cc b/lily/lookup.cc index 971e9380d7..8ba88483f5 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -53,21 +53,9 @@ Lookup::~Lookup () } Atom -Lookup::accidental (int j, bool cautionary) const +Lookup::accidental (int j) const { - Atom a = afm_find (String ("accidentals") + String ("-") + to_str (j)); - if (cautionary) - { - Box b=a.extent(); - Atom lparen = afm_find (String ("accidentals") + String ("-(")); - lparen.translate_axis(b.x().min(),X_AXIS); - b.unite(lparen.extent()); - Atom rparen = afm_find (String ("accidentals") + String ("-)")); - rparen.translate_axis(b.x().max(),X_AXIS); - b.unite(rparen.extent()); - a = Atom(lparen.str_ + a.str_ + rparen.str_, b); - } - return a; + return afm_find (String ("accidentals") + String ("-") + to_str (j)); } void @@ -77,7 +65,7 @@ Lookup::add (String s, Symtable*p) } Atom -Lookup::afm_find (String s, String str, bool warn) const +Lookup::afm_find (String s, String str) const { if (!afm_p_) { @@ -86,7 +74,7 @@ Lookup::afm_find (String s, String str, bool warn) const *mlog << "]" << flush ; DOUT << this->afm_p_->str (); } - Adobe_font_char_metric m = afm_p_->find_char (s, warn); + Adobe_font_char_metric m = afm_p_->find_char (s); Atom a; if (m.code () < 0) @@ -241,11 +229,11 @@ Atom Lookup::special_time_signature (String s, Array arr) const { String symbolname = "timesig-"+s+"%/%"; - Atom a (afm_find (substitute_args (symbolname, arr), false)); + Atom a (afm_find (substitute_args (symbolname, arr))); if (!a.empty ()) return a; // Try if the full name was given - a = afm_find ("timesig-"+s, false); + a = afm_find ("timesig-"+s); if (!a.empty ()) return a; // Resort to default layout with numbers diff --git a/lily/main.cc b/lily/main.cc index 5b541eb29f..f2a0ec5cf3 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -228,12 +228,14 @@ setup_paths () if (!prefix_directory.empty_b()) { - global_path.add (prefix_directory + "/share/lilypond/init/"); - global_path.add (prefix_directory + "/share/lilypond"); + global_path.add (prefix_directory + "/share/lilypond/ly/"); + global_path.add (prefix_directory + "/share/lilypond/afm/"); + } + else + { + global_path.add (String (DIR_DATADIR) + "/ly/"); + global_path.add (String (DIR_DATADIR) + "/afm/"); } - - global_path.add (String (DIR_DATADIR) + "/ly/"); - global_path.add (String (DIR_DATADIR) + "/afm/"); } diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc index 9603e025d9..e7ffbd7014 100644 --- a/lily/musical-pitch.cc +++ b/lily/musical-pitch.cc @@ -21,7 +21,6 @@ Musical_pitch::init () notename_i_ = 0; octave_i_ = 0; accidental_i_ = 0; - cautionary_b_ = false; } void diff --git a/lily/musical-request.cc b/lily/musical-request.cc index dd7da312df..3ee6004add 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -184,7 +184,6 @@ Note_req::do_equal_b (Request*r) const Note_req::Note_req () { - cautionary_b_ = false; forceacc_b_ = false; } @@ -195,11 +194,7 @@ Note_req::do_print () const { #ifndef NPRINT Melodic_req::do_print (); - if (cautionary_b_) - { - DOUT << " force cautionary accidental\n"; - } - else if (forceacc_b_) + if (forceacc_b_) { DOUT << " force accidental\n"; } diff --git a/lily/parser.yy b/lily/parser.yy index 882241a4bb..bf82af8ec4 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -249,7 +249,6 @@ yylex (YYSTYPE *s, void * v_l) %type abbrev_type %type int unsigned %type script_dir -%type optional_modality %type identifier_init simple_identifier_init block_identifier %type steno_duration notemode_duration %type entered_notemode_duration explicit_duration @@ -902,11 +901,10 @@ verbose_command_req: $$ = new Clef_change_req (*$2); delete $2; } - | KEY NOTENAME_PITCH optional_modality { + | KEY NOTENAME_PITCH { Key_change_req *key_p= new Key_change_req; key_p->pitch_arr_.push(*$2); key_p->ordinary_key_b_ = true; - key_p->modality_i_ = $3; $$ = key_p; delete $2; } @@ -963,15 +961,6 @@ post_request: } ; -optional_modality: - /* empty */ { - $$ = 0; - } - | int { - $$ = $1; - } - ; - sup_quotes: '\'' { $$ = 1; @@ -1030,10 +1019,6 @@ steno_notepitch: | steno_notepitch '!' { $$->forceacc_b_ = ! $$->forceacc_b_; } - | steno_notepitch '?' { - $$->forceacc_b_ = ! $$->forceacc_b_; - $$->cautionary_b_ = ! $$->cautionary_b_; - } ; diff --git a/lily/ps-lookup.cc b/lily/ps-lookup.cc index 62322e738b..8d160b1f88 100644 --- a/lily/ps-lookup.cc +++ b/lily/ps-lookup.cc @@ -43,9 +43,9 @@ Ps_lookup::~Ps_lookup () } Atom -Ps_lookup::afm_find (String s, bool warn) const +Ps_lookup::afm_find (String s) const { - return Lookup::afm_find (s, String ("(\\%03o) show "), warn); + return Lookup::afm_find (s, String ("(\\%03o) show ")); } Atom* diff --git a/lily/tex-lookup.cc b/lily/tex-lookup.cc index 4c3a3e3bcb..4f10886e11 100644 --- a/lily/tex-lookup.cc +++ b/lily/tex-lookup.cc @@ -42,9 +42,9 @@ Tex_lookup::~Tex_lookup() } Atom -Tex_lookup::afm_find (String s, bool warn) const +Tex_lookup::afm_find (String s) const { - return Lookup::afm_find (s, String ("\\char%d"), warn); + return Lookup::afm_find (s, String ("\\char%d")); } Atom* diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index a34c05299c..09bfbe8ac7 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.0.17 -Inschrijf datum: 19OCT98 +Versie: 1.0.18 +Inschrijf datum: 03NOV98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.0.17.tar.gz + 770k lilypond-1.0.18.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.17.tar.gz + 770k lilypond-1.0.18.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 6f9269827a..49776279aa 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.0.17 -Entered-date: 19OCT98 +Version: 1.0.18 +Entered-date: 03NOV98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.0.17.tar.gz + 770k lilypond-1.0.18.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.17.tar.gz + 770k lilypond-1.0.18.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 0464aff56a..fadbc4b4f0 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.0.17 +Version: 1.0.18 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.17.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.18.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 756c1e20ae..7257a45277 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -58,37 +58,6 @@ fet_beginchar("fermata down", "dfermata", "dfermata") y_mirror_char; fet_endchar; -% -% Thumbs are used in cello music. -% TODO : thumbs should look like the finger-font and should be placed in -% the same way in the score. -% - -fet_beginchar("Thumb", "thumb", "thumb") - save thin, height, width, thick; - height# = 5/4 width#; - height# = interline#; - thin = 1.2 stafflinethickness; - thick = 1.4 thin; - set_char_box(width#/2, width#/2, height#/2, height#/2); - - penpos1(thick, 0); - penpos2(thin, 90); - z1r = (w, 0); - z2r = (0, h); - penlabels(1,2); - penstroke z1e{up} .. {left}z2e; - addto currentpicture also currentpicture xscaled -1; - addto currentpicture also currentpicture yscaled -1; - - pickup pencircle scaled thin; - save x,y; - z3r = (0, -h); - z4 = (0, -2h); - penlabels(3,4); - draw z3r -- z4; -fet_endchar; - % % FIXME: rounded endings @@ -210,7 +179,6 @@ fet_beginchar("marcato down", "dmarcato", "dmarcato") xy_mirror_char; fet_endchar; - % % used in french horn music todo % diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index 3477b5d322..7da404d0c7 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -247,37 +247,8 @@ fet_beginchar("Double sharp", "2", "sharpsharp") currentpicture := currentpicture shifted (w/2,0); -fet_endchar; - - -def draw_paren = - save leftindent; - leftindent# := .2 interline#; - define_pixels(leftindent); - set_char_box(0, .5 interline#+stafflinethickness#, - interline#, interline#); - z1 = (leftindent,h); - z2 = (w-stafflinethickness,0); - z3 = (leftindent,-d); - - penpos1(stafflinethickness, 35); - penpos2(2 stafflinethickness, 0); - penpos3(stafflinethickness, -35); - - penlabels(1,2,3); - fill z2l{down} .. simple_serif(z3l, z3r, 90) .. z2r{up} - .. simple_serif(z1r, z1l, 90) .. z2l{down} -- cycle; -enddef; - -fet_beginchar("Right paranthesis", ")", "rightparen") - draw_paren; -fet_endchar; - -fet_beginchar("Left paranthesis", "(", "leftparen") - draw_paren; - currentpicture := currentpicture xscaled -1; - set_char_box(charwd, charbp, chardp, charht); -fet_endchar; + fet_endchar; + fet_endgroup("accidentals"); diff --git a/mf/out/feta11.afm b/mf/out/feta11.afm index 7e8f6f28d6..80e4e0d8c2 100644 --- a/mf/out/feta11.afm +++ b/mf/out/feta11.afm @@ -18,66 +18,69 @@ C 13; N accidentals-0; B 0.00 -4125.00 1833.33 4125.00 ; C 14; N accidentals--1; B -330.03 -1375.00 2200.01 5500.00 ; C 15; N accidentals--2; B -330.03 -1375.00 3987.49 5500.00 ; C 16; N accidentals-2; B 0.00 -1375.00 2750.00 1375.00 ; -C 17; N dots-dot; B 0.00 -618.74 1237.49 618.74 ; -C 18; N dots-repeatcolon; B 0.00 -1375.00 1237.49 1375.00 ; -C 19; N balls--1; B 0.00 -1512.51 5500.00 1512.51 ; -C 20; N balls--1l; B -1375.00 -275.02 6875.00 275.02 ; -C 21; N balls--2; B 0.00 -1512.51 5500.00 1512.51 ; -C 22; N balls--2l; B -1375.00 -275.02 6875.00 275.02 ; -C 23; N balls-0; B 0.00 -1512.51 5445.07 1512.51 ; -C 24; N balls-0l; B -1361.27 -275.02 6806.34 275.02 ; -C 25; N balls-1; B 0.00 -1512.51 3788.07 1512.51 ; -C 26; N balls-1l; B -947.02 -275.02 4735.09 275.02 ; -C 27; N balls-2; B 0.00 -1512.51 3632.84 1512.51 ; -C 28; N balls-2l; B -908.22 -275.02 4541.06 275.02 ; -C 29; N scripts-ufermata; B -3643.77 -206.27 3643.77 3987.55 ; -C 30; N scripts-dfermata; B -3643.77 -3987.55 3643.77 206.27 ; -C 31; N scripts-sforzato; B -2474.99 -1375.00 2474.99 1375.00 ; -C 32; N scripts-staccato; B -412.54 -412.54 412.54 412.54 ; -C 33; N scripts-ustaccatissimo; B -550.05 -200.00 550.05 2750.06 ; -C 34; N scripts-dstaccatissimo; B -550.05 -2750.06 550.05 200.00 ; -C 35; N scripts-tenuto; B -1650.02 -192.52 1650.02 192.52 ; -C 36; N scripts-umarcato; B -1375.00 0.00 1375.00 3025.02 ; -C 37; N scripts-dmarcato; B -1375.00 -3025.02 1375.00 0.00 ; -C 38; N scripts-open; B -1100.00 -1375.00 1100.00 1375.00 ; -C 39; N scripts-stopped; B -1512.51 -1512.51 1512.51 1512.51 ; -C 40; N scripts-upbow; B -1787.50 0.00 1787.50 5720.05 ; -C 41; N scripts-downbow; B -2062.50 0.00 2062.50 3666.66 ; -C 42; N scripts-reverseturn; B -3007.81 -1455.89 3007.81 1455.89 ; -C 43; N scripts-turn; B -3007.81 -1455.89 3007.81 1455.89 ; -C 44; N scripts-trill; B -2750.00 0.00 2750.00 6187.50 ; -C 45; N scripts-upedalheel; B -1375.00 -1375.00 1375.00 1833.33 ; -C 46; N scripts-dpedalheel; B -1375.00 -1833.33 1375.00 1375.00 ; -C 47; N scripts-upedaltoe; B -1375.00 0.00 1375.00 4125.00 ; -C 48; N scripts-dpedaltoe; B -1375.00 -4125.00 1375.00 0.00 ; -C 49; N scripts-flageolet; B -1466.67 -1466.67 1466.67 1466.67 ; -C 50; N scripts-trilelement; B -1833.33 -1375.00 718.64 1375.00 ; -C 51; N scripts-prall; B -3109.31 -1375.00 3109.31 1375.00 ; -C 52; N scripts-mordent; B -3109.31 -1375.00 3109.31 1375.00 ; -C 53; N scripts-prallprall; B -4385.30 -1375.00 4385.30 1375.00 ; -C 54; N scripts-prallmordent; B -4385.30 -1375.00 4385.30 1375.00 ; -C 55; N scripts-upprall; B -4385.30 -1375.00 4385.30 1375.00 ; -C 56; N scripts-downprall; B -4385.30 -1375.00 4385.30 1375.00 ; -C 57; N flags-u3; B -137.51 -8428.77 3393.31 137.51 ; -C 58; N flags-u4; B -137.51 -9803.77 3393.31 137.51 ; -C 59; N flags-u5; B -137.51 -11866.27 3393.31 137.51 ; -C 60; N flags-u6; B -137.51 -14616.27 3393.31 137.51 ; -C 61; N flags-d3; B -137.51 -137.51 3755.11 8016.30 ; -C 62; N flags-d4; B -137.51 -137.51 3755.11 8428.77 ; -C 63; N flags-d5; B -137.51 -137.51 3755.11 10766.30 ; -C 64; N flags-d6; B -137.51 -137.51 3755.11 12141.30 ; -C 65; N clefs-alto; B -2750.00 -5500.00 10236.10 5500.00 ; -C 66; N clefs-alto_change; B -2200.01 -4400.02 8188.93 4400.02 ; -C 67; N clefs-bass; B -1375.00 -6875.00 9900.02 2750.00 ; -C 68; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ; -C 69; N clefs-violin; B -2396.44 -8250.00 10277.13 13750.00 ; -C 70; N clefs-violin_change; B -2082.15 -6600.04 8056.75 11000.06 ; -C 71; N timesig-C4/4; B -4950.01 -2750.00 4674.99 2750.00 ; -C 72; N timesig-C2/2; B -4950.01 -3849.99 4674.99 3849.99 ; -C 73; N timesig-old4/4; B -4812.50 -2062.50 4812.50 2062.50 ; -C 74; N timesig-old2/2; B -4812.50 -2750.00 4812.50 2750.00 ; -C 75; N timesig-old3/2; B -4812.50 -2062.50 4812.50 2062.50 ; -C 76; N timesig-old6/4; B -4812.50 -3437.50 4812.50 3437.50 ; -C 77; N timesig-old9/4; B -4812.50 -3437.50 4812.50 3437.50 ; +C 17; N accidentals-); B 0.00 -2750.00 1650.02 2750.00 ; +C 18; N accidentals-(; B -1650.02 -2750.00 0.00 2750.00 ; +C 19; N dots-dot; B 0.00 -618.74 1237.49 618.74 ; +C 20; N dots-repeatcolon; B 0.00 -1375.00 1237.49 1375.00 ; +C 21; N balls--1; B 0.00 -1512.51 5500.00 1512.51 ; +C 22; N balls--1l; B -1375.00 -275.02 6875.00 275.02 ; +C 23; N balls--2; B 0.00 -1512.51 5500.00 1512.51 ; +C 24; N balls--2l; B -1375.00 -275.02 6875.00 275.02 ; +C 25; N balls-0; B 0.00 -1512.51 5445.07 1512.51 ; +C 26; N balls-0l; B -1361.27 -275.02 6806.34 275.02 ; +C 27; N balls-1; B 0.00 -1512.51 3788.07 1512.51 ; +C 28; N balls-1l; B -947.02 -275.02 4735.09 275.02 ; +C 29; N balls-2; B 0.00 -1512.51 3632.84 1512.51 ; +C 30; N balls-2l; B -908.22 -275.02 4541.06 275.02 ; +C 31; N scripts-ufermata; B -3643.77 -206.27 3643.77 3987.55 ; +C 32; N scripts-dfermata; B -3643.77 -3987.55 3643.77 206.27 ; +C 33; N scripts-thumb; B -1100.00 -1375.00 1100.00 1375.00 ; +C 34; N scripts-sforzato; B -2474.99 -1375.00 2474.99 1375.00 ; +C 35; N scripts-staccato; B -412.54 -412.54 412.54 412.54 ; +C 36; N scripts-ustaccatissimo; B -550.05 -200.00 550.05 2750.06 ; +C 37; N scripts-dstaccatissimo; B -550.05 -2750.06 550.05 200.00 ; +C 38; N scripts-tenuto; B -1650.02 -192.52 1650.02 192.52 ; +C 39; N scripts-umarcato; B -1375.00 0.00 1375.00 3025.02 ; +C 40; N scripts-dmarcato; B -1375.00 -3025.02 1375.00 0.00 ; +C 41; N scripts-open; B -1100.00 -1375.00 1100.00 1375.00 ; +C 42; N scripts-stopped; B -1512.51 -1512.51 1512.51 1512.51 ; +C 43; N scripts-upbow; B -1787.50 0.00 1787.50 5720.05 ; +C 44; N scripts-downbow; B -2062.50 0.00 2062.50 3666.66 ; +C 45; N scripts-reverseturn; B -3007.81 -1455.89 3007.81 1455.89 ; +C 46; N scripts-turn; B -3007.81 -1455.89 3007.81 1455.89 ; +C 47; N scripts-trill; B -2750.00 0.00 2750.00 6187.50 ; +C 48; N scripts-upedalheel; B -1375.00 -1375.00 1375.00 1833.33 ; +C 49; N scripts-dpedalheel; B -1375.00 -1833.33 1375.00 1375.00 ; +C 50; N scripts-upedaltoe; B -1375.00 0.00 1375.00 4125.00 ; +C 51; N scripts-dpedaltoe; B -1375.00 -4125.00 1375.00 0.00 ; +C 52; N scripts-flageolet; B -1466.67 -1466.67 1466.67 1466.67 ; +C 53; N scripts-trilelement; B -1833.33 -1375.00 718.64 1375.00 ; +C 54; N scripts-prall; B -3109.31 -1375.00 3109.31 1375.00 ; +C 55; N scripts-mordent; B -3109.31 -1375.00 3109.31 1375.00 ; +C 56; N scripts-prallprall; B -4385.30 -1375.00 4385.30 1375.00 ; +C 57; N scripts-prallmordent; B -4385.30 -1375.00 4385.30 1375.00 ; +C 58; N scripts-upprall; B -4385.30 -1375.00 4385.30 1375.00 ; +C 59; N scripts-downprall; B -4385.30 -1375.00 4385.30 1375.00 ; +C 60; N flags-u3; B -137.51 -8428.77 3393.31 137.51 ; +C 61; N flags-u4; B -137.51 -9803.77 3393.31 137.51 ; +C 62; N flags-u5; B -137.51 -11866.27 3393.31 137.51 ; +C 63; N flags-u6; B -137.51 -14616.27 3393.31 137.51 ; +C 64; N flags-d3; B -137.51 -137.51 3755.11 8016.30 ; +C 65; N flags-d4; B -137.51 -137.51 3755.11 8428.77 ; +C 66; N flags-d5; B -137.51 -137.51 3755.11 10766.30 ; +C 67; N flags-d6; B -137.51 -137.51 3755.11 12141.30 ; +C 68; N clefs-alto; B -2750.00 -5500.00 10236.10 5500.00 ; +C 69; N clefs-alto_change; B -2200.01 -4400.02 8188.93 4400.02 ; +C 70; N clefs-bass; B -1375.00 -6875.00 9900.02 2750.00 ; +C 71; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ; +C 72; N clefs-violin; B -2396.44 -8250.00 10277.13 13750.00 ; +C 73; N clefs-violin_change; B -2082.15 -6600.04 8056.75 11000.06 ; +C 74; N timesig-C4/4; B -4950.01 -2750.00 4674.99 2750.00 ; +C 75; N timesig-C2/2; B -4950.01 -3849.99 4674.99 3849.99 ; +C 76; N timesig-old4/4; B -4812.50 -2062.50 4812.50 2062.50 ; +C 77; N timesig-old2/2; B -4812.50 -2750.00 4812.50 2750.00 ; +C 78; N timesig-old3/2; B -4812.50 -2062.50 4812.50 2062.50 ; +C 79; N timesig-old6/4; B -4812.50 -3437.50 4812.50 3437.50 ; +C 80; N timesig-old9/4; B -4812.50 -3437.50 4812.50 3437.50 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta13.afm b/mf/out/feta13.afm index 7679a06b19..28475dec29 100644 --- a/mf/out/feta13.afm +++ b/mf/out/feta13.afm @@ -18,66 +18,69 @@ C 13; N accidentals-0; B 0.00 -4875.00 2166.67 4875.00 ; C 14; N accidentals--1; B -390.03 -1625.00 2600.00 6500.00 ; C 15; N accidentals--2; B -390.03 -1625.00 4712.50 6500.00 ; C 16; N accidentals-2; B 0.00 -1625.00 3250.00 1625.00 ; -C 17; N dots-dot; B 0.00 -731.25 1462.50 731.25 ; -C 18; N dots-repeatcolon; B 0.00 -1625.00 1462.50 1625.00 ; -C 19; N balls--1; B 0.00 -1787.52 6500.00 1787.52 ; -C 20; N balls--1l; B -1625.00 -325.03 8125.00 325.03 ; -C 21; N balls--2; B 0.00 -1787.52 6500.00 1787.52 ; -C 22; N balls--2l; B -1625.00 -325.03 8125.00 325.03 ; -C 23; N balls-0; B 0.00 -1787.52 6435.09 1787.52 ; -C 24; N balls-0l; B -1608.78 -325.03 8043.87 325.03 ; -C 25; N balls-1; B 0.00 -1787.52 4476.79 1787.52 ; -C 26; N balls-1l; B -1119.20 -325.03 5596.00 325.03 ; -C 27; N balls-2; B 0.00 -1787.52 4293.33 1787.52 ; -C 28; N balls-2l; B -1073.33 -325.03 5366.67 325.03 ; -C 29; N scripts-ufermata; B -4306.27 -243.77 4306.27 4712.55 ; -C 30; N scripts-dfermata; B -4306.27 -4712.55 4306.27 243.77 ; -C 31; N scripts-sforzato; B -2924.99 -1625.00 2924.99 1625.00 ; -C 32; N scripts-staccato; B -487.55 -487.55 487.55 487.55 ; -C 33; N scripts-ustaccatissimo; B -650.05 -200.00 650.05 3250.06 ; -C 34; N scripts-dstaccatissimo; B -650.05 -3250.06 650.05 200.00 ; -C 35; N scripts-tenuto; B -1950.03 -227.52 1950.03 227.52 ; -C 36; N scripts-umarcato; B -1625.00 0.00 1625.00 3575.03 ; -C 37; N scripts-dmarcato; B -1625.00 -3575.03 1625.00 0.00 ; -C 38; N scripts-open; B -1300.00 -1625.00 1300.00 1625.00 ; -C 39; N scripts-stopped; B -1787.52 -1787.52 1787.52 1787.52 ; -C 40; N scripts-upbow; B -2112.50 0.00 2112.50 6760.04 ; -C 41; N scripts-downbow; B -2437.50 0.00 2437.50 4333.31 ; -C 42; N scripts-reverseturn; B -3554.69 -1720.60 3554.69 1720.60 ; -C 43; N scripts-turn; B -3554.69 -1720.60 3554.69 1720.60 ; -C 44; N scripts-trill; B -3250.00 0.00 3250.00 7312.50 ; -C 45; N scripts-upedalheel; B -1625.00 -1625.00 1625.00 2166.67 ; -C 46; N scripts-dpedalheel; B -1625.00 -2166.67 1625.00 1625.00 ; -C 47; N scripts-upedaltoe; B -1625.00 0.00 1625.00 4875.00 ; -C 48; N scripts-dpedaltoe; B -1625.00 -4875.00 1625.00 0.00 ; -C 49; N scripts-flageolet; B -1733.34 -1733.34 1733.34 1733.34 ; -C 50; N scripts-trilelement; B -2166.67 -1625.00 849.30 1625.00 ; -C 51; N scripts-prall; B -3674.65 -1625.00 3674.65 1625.00 ; -C 52; N scripts-mordent; B -3674.65 -1625.00 3674.65 1625.00 ; -C 53; N scripts-prallprall; B -5182.63 -1625.00 5182.63 1625.00 ; -C 54; N scripts-prallmordent; B -5182.63 -1625.00 5182.63 1625.00 ; -C 55; N scripts-upprall; B -5182.63 -1625.00 5182.63 1625.00 ; -C 56; N scripts-downprall; B -5182.63 -1625.00 5182.63 1625.00 ; -C 57; N flags-u3; B -162.52 -9961.27 4010.27 162.52 ; -C 58; N flags-u4; B -162.52 -11586.27 4010.27 162.52 ; -C 59; N flags-u5; B -162.52 -14023.77 4010.27 162.52 ; -C 60; N flags-u6; B -162.52 -17273.77 4010.27 162.52 ; -C 61; N flags-d3; B -162.52 -162.52 4437.84 9473.80 ; -C 62; N flags-d4; B -162.52 -162.52 4437.84 9961.27 ; -C 63; N flags-d5; B -162.52 -162.52 4437.84 12723.80 ; -C 64; N flags-d6; B -162.52 -162.52 4437.84 14348.80 ; -C 65; N clefs-alto; B -3250.00 -6500.00 12097.24 6500.00 ; -C 66; N clefs-alto_change; B -2600.00 -5200.01 9677.81 5200.01 ; -C 67; N clefs-bass; B -1625.00 -8125.00 11700.03 3250.00 ; -C 68; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ; -C 69; N clefs-violin; B -2832.14 -9750.00 12145.70 16250.00 ; -C 70; N clefs-violin_change; B -2460.72 -7800.02 9521.58 13000.03 ; -C 71; N timesig-C4/4; B -5850.00 -3250.00 5525.00 3250.00 ; -C 72; N timesig-C2/2; B -5850.00 -4549.99 5525.00 4549.99 ; -C 73; N timesig-old4/4; B -5687.50 -2437.50 5687.50 2437.50 ; -C 74; N timesig-old2/2; B -5687.50 -3250.00 5687.50 3250.00 ; -C 75; N timesig-old3/2; B -5687.50 -2437.50 5687.50 2437.50 ; -C 76; N timesig-old6/4; B -5687.50 -4062.50 5687.50 4062.50 ; -C 77; N timesig-old9/4; B -5687.50 -4062.50 5687.50 4062.50 ; +C 17; N accidentals-); B 0.00 -3250.00 1950.03 3250.00 ; +C 18; N accidentals-(; B -1950.03 -3250.00 0.00 3250.00 ; +C 19; N dots-dot; B 0.00 -731.25 1462.50 731.25 ; +C 20; N dots-repeatcolon; B 0.00 -1625.00 1462.50 1625.00 ; +C 21; N balls--1; B 0.00 -1787.52 6500.00 1787.52 ; +C 22; N balls--1l; B -1625.00 -325.03 8125.00 325.03 ; +C 23; N balls--2; B 0.00 -1787.52 6500.00 1787.52 ; +C 24; N balls--2l; B -1625.00 -325.03 8125.00 325.03 ; +C 25; N balls-0; B 0.00 -1787.52 6435.09 1787.52 ; +C 26; N balls-0l; B -1608.78 -325.03 8043.87 325.03 ; +C 27; N balls-1; B 0.00 -1787.52 4476.79 1787.52 ; +C 28; N balls-1l; B -1119.20 -325.03 5596.00 325.03 ; +C 29; N balls-2; B 0.00 -1787.52 4293.33 1787.52 ; +C 30; N balls-2l; B -1073.33 -325.03 5366.67 325.03 ; +C 31; N scripts-ufermata; B -4306.27 -243.77 4306.27 4712.55 ; +C 32; N scripts-dfermata; B -4306.27 -4712.55 4306.27 243.77 ; +C 33; N scripts-thumb; B -1300.00 -1625.00 1300.00 1625.00 ; +C 34; N scripts-sforzato; B -2924.99 -1625.00 2924.99 1625.00 ; +C 35; N scripts-staccato; B -487.55 -487.55 487.55 487.55 ; +C 36; N scripts-ustaccatissimo; B -650.05 -200.00 650.05 3250.06 ; +C 37; N scripts-dstaccatissimo; B -650.05 -3250.06 650.05 200.00 ; +C 38; N scripts-tenuto; B -1950.03 -227.52 1950.03 227.52 ; +C 39; N scripts-umarcato; B -1625.00 0.00 1625.00 3575.03 ; +C 40; N scripts-dmarcato; B -1625.00 -3575.03 1625.00 0.00 ; +C 41; N scripts-open; B -1300.00 -1625.00 1300.00 1625.00 ; +C 42; N scripts-stopped; B -1787.52 -1787.52 1787.52 1787.52 ; +C 43; N scripts-upbow; B -2112.50 0.00 2112.50 6760.04 ; +C 44; N scripts-downbow; B -2437.50 0.00 2437.50 4333.31 ; +C 45; N scripts-reverseturn; B -3554.69 -1720.60 3554.69 1720.60 ; +C 46; N scripts-turn; B -3554.69 -1720.60 3554.69 1720.60 ; +C 47; N scripts-trill; B -3250.00 0.00 3250.00 7312.50 ; +C 48; N scripts-upedalheel; B -1625.00 -1625.00 1625.00 2166.67 ; +C 49; N scripts-dpedalheel; B -1625.00 -2166.67 1625.00 1625.00 ; +C 50; N scripts-upedaltoe; B -1625.00 0.00 1625.00 4875.00 ; +C 51; N scripts-dpedaltoe; B -1625.00 -4875.00 1625.00 0.00 ; +C 52; N scripts-flageolet; B -1733.34 -1733.34 1733.34 1733.34 ; +C 53; N scripts-trilelement; B -2166.67 -1625.00 849.30 1625.00 ; +C 54; N scripts-prall; B -3674.65 -1625.00 3674.65 1625.00 ; +C 55; N scripts-mordent; B -3674.65 -1625.00 3674.65 1625.00 ; +C 56; N scripts-prallprall; B -5182.63 -1625.00 5182.63 1625.00 ; +C 57; N scripts-prallmordent; B -5182.63 -1625.00 5182.63 1625.00 ; +C 58; N scripts-upprall; B -5182.63 -1625.00 5182.63 1625.00 ; +C 59; N scripts-downprall; B -5182.63 -1625.00 5182.63 1625.00 ; +C 60; N flags-u3; B -162.52 -9961.27 4010.27 162.52 ; +C 61; N flags-u4; B -162.52 -11586.27 4010.27 162.52 ; +C 62; N flags-u5; B -162.52 -14023.77 4010.27 162.52 ; +C 63; N flags-u6; B -162.52 -17273.77 4010.27 162.52 ; +C 64; N flags-d3; B -162.52 -162.52 4437.84 9473.80 ; +C 65; N flags-d4; B -162.52 -162.52 4437.84 9961.27 ; +C 66; N flags-d5; B -162.52 -162.52 4437.84 12723.80 ; +C 67; N flags-d6; B -162.52 -162.52 4437.84 14348.80 ; +C 68; N clefs-alto; B -3250.00 -6500.00 12097.24 6500.00 ; +C 69; N clefs-alto_change; B -2600.00 -5200.01 9677.81 5200.01 ; +C 70; N clefs-bass; B -1625.00 -8125.00 11700.03 3250.00 ; +C 71; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ; +C 72; N clefs-violin; B -2832.14 -9750.00 12145.70 16250.00 ; +C 73; N clefs-violin_change; B -2460.72 -7800.02 9521.58 13000.03 ; +C 74; N timesig-C4/4; B -5850.00 -3250.00 5525.00 3250.00 ; +C 75; N timesig-C2/2; B -5850.00 -4549.99 5525.00 4549.99 ; +C 76; N timesig-old4/4; B -5687.50 -2437.50 5687.50 2437.50 ; +C 77; N timesig-old2/2; B -5687.50 -3250.00 5687.50 3250.00 ; +C 78; N timesig-old3/2; B -5687.50 -2437.50 5687.50 2437.50 ; +C 79; N timesig-old6/4; B -5687.50 -4062.50 5687.50 4062.50 ; +C 80; N timesig-old9/4; B -5687.50 -4062.50 5687.50 4062.50 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta16.afm b/mf/out/feta16.afm index f1562888fd..dc4514f324 100644 --- a/mf/out/feta16.afm +++ b/mf/out/feta16.afm @@ -18,66 +18,69 @@ C 13; N accidentals-0; B 0.00 -6000.00 2666.67 6000.00 ; C 14; N accidentals--1; B -480.03 -2000.00 3200.01 8000.00 ; C 15; N accidentals--2; B -480.03 -2000.00 5799.99 8000.00 ; C 16; N accidentals-2; B 0.00 -2000.00 4000.00 2000.00 ; -C 17; N dots-dot; B 0.00 -900.00 1799.99 900.00 ; -C 18; N dots-repeatcolon; B 0.00 -2000.00 1799.99 2000.00 ; -C 19; N balls--1; B 0.00 -2200.01 8000.00 2200.01 ; -C 20; N balls--1l; B -2000.00 -400.02 10000.00 400.02 ; -C 21; N balls--2; B 0.00 -2200.01 8000.00 2200.01 ; -C 22; N balls--2l; B -2000.00 -400.02 10000.00 400.02 ; -C 23; N balls-0; B 0.00 -2200.01 7920.04 2200.01 ; -C 24; N balls-0l; B -1980.01 -400.02 9900.05 400.02 ; -C 25; N balls-1; B 0.00 -2200.01 5509.86 2200.01 ; -C 26; N balls-1l; B -1377.47 -400.02 6887.33 400.02 ; -C 27; N balls-2; B 0.00 -2200.01 5284.09 2200.01 ; -C 28; N balls-2l; B -1321.03 -400.02 6605.12 400.02 ; -C 29; N scripts-ufermata; B -5300.02 -300.02 5300.02 5800.05 ; -C 30; N scripts-dfermata; B -5300.02 -5800.05 5300.02 300.02 ; -C 31; N scripts-sforzato; B -3599.98 -2000.00 3599.98 2000.00 ; -C 32; N scripts-staccato; B -600.04 -600.04 600.04 600.04 ; -C 33; N scripts-ustaccatissimo; B -800.05 -200.00 800.05 4000.06 ; -C 34; N scripts-dstaccatissimo; B -800.05 -4000.06 800.05 200.00 ; -C 35; N scripts-tenuto; B -2400.02 -280.01 2400.02 280.01 ; -C 36; N scripts-umarcato; B -2000.00 0.00 2000.00 4400.02 ; -C 37; N scripts-dmarcato; B -2000.00 -4400.02 2000.00 0.00 ; -C 38; N scripts-open; B -1600.00 -2000.00 1600.00 2000.00 ; -C 39; N scripts-stopped; B -2200.01 -2200.01 2200.01 2200.01 ; -C 40; N scripts-upbow; B -2600.00 0.00 2600.00 8320.05 ; -C 41; N scripts-downbow; B -3000.00 0.00 3000.00 5333.31 ; -C 42; N scripts-reverseturn; B -4375.00 -2117.65 4375.00 2117.65 ; -C 43; N scripts-turn; B -4375.00 -2117.65 4375.00 2117.65 ; -C 44; N scripts-trill; B -4000.00 0.00 4000.00 9000.00 ; -C 45; N scripts-upedalheel; B -2000.00 -2000.00 2000.00 2666.67 ; -C 46; N scripts-dpedalheel; B -2000.00 -2666.67 2000.00 2000.00 ; -C 47; N scripts-upedaltoe; B -2000.00 0.00 2000.00 6000.00 ; -C 48; N scripts-dpedaltoe; B -2000.00 -6000.00 2000.00 0.00 ; -C 49; N scripts-flageolet; B -2133.33 -2133.33 2133.33 2133.33 ; -C 50; N scripts-trilelement; B -2666.67 -2000.00 1045.30 2000.00 ; -C 51; N scripts-prall; B -4522.66 -2000.00 4522.66 2000.00 ; -C 52; N scripts-mordent; B -4522.66 -2000.00 4522.66 2000.00 ; -C 53; N scripts-prallprall; B -6378.65 -2000.00 6378.65 2000.00 ; -C 54; N scripts-prallmordent; B -6378.65 -2000.00 6378.65 2000.00 ; -C 55; N scripts-upprall; B -6378.65 -2000.00 6378.65 2000.00 ; -C 56; N scripts-downprall; B -6378.65 -2000.00 6378.65 2000.00 ; -C 57; N flags-u3; B -200.01 -12260.03 4935.68 200.01 ; -C 58; N flags-u4; B -200.01 -14260.03 4935.68 200.01 ; -C 59; N flags-u5; B -200.01 -17260.03 4935.68 200.01 ; -C 60; N flags-u6; B -200.01 -21260.03 4935.68 200.01 ; -C 61; N flags-d3; B -200.01 -200.01 5461.91 11660.05 ; -C 62; N flags-d4; B -200.01 -200.01 5461.91 12260.03 ; -C 63; N flags-d5; B -200.01 -200.01 5461.91 15660.05 ; -C 64; N flags-d6; B -200.01 -200.01 5461.91 17660.05 ; -C 65; N clefs-alto; B -4000.00 -8000.00 14888.90 8000.00 ; -C 66; N clefs-alto_change; B -3200.01 -6400.02 11911.18 6400.02 ; -C 67; N clefs-bass; B -2000.00 -10000.00 14400.02 4000.00 ; -C 68; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ; -C 69; N clefs-violin; B -3485.72 -12000.00 14948.55 20000.00 ; -C 70; N clefs-violin_change; B -3028.58 -9600.04 11718.89 16000.06 ; -C 71; N timesig-C4/4; B -7200.01 -4000.00 6799.99 4000.00 ; -C 72; N timesig-C2/2; B -7200.01 -5599.98 6799.99 5599.98 ; -C 73; N timesig-old4/4; B -7000.00 -3000.00 7000.00 3000.00 ; -C 74; N timesig-old2/2; B -7000.00 -4000.00 7000.00 4000.00 ; -C 75; N timesig-old3/2; B -7000.00 -3000.00 7000.00 3000.00 ; -C 76; N timesig-old6/4; B -7000.00 -5000.00 7000.00 5000.00 ; -C 77; N timesig-old9/4; B -7000.00 -5000.00 7000.00 5000.00 ; +C 17; N accidentals-); B 0.00 -4000.00 2400.02 4000.00 ; +C 18; N accidentals-(; B -2400.02 -4000.00 0.00 4000.00 ; +C 19; N dots-dot; B 0.00 -900.00 1799.99 900.00 ; +C 20; N dots-repeatcolon; B 0.00 -2000.00 1799.99 2000.00 ; +C 21; N balls--1; B 0.00 -2200.01 8000.00 2200.01 ; +C 22; N balls--1l; B -2000.00 -400.02 10000.00 400.02 ; +C 23; N balls--2; B 0.00 -2200.01 8000.00 2200.01 ; +C 24; N balls--2l; B -2000.00 -400.02 10000.00 400.02 ; +C 25; N balls-0; B 0.00 -2200.01 7920.04 2200.01 ; +C 26; N balls-0l; B -1980.01 -400.02 9900.05 400.02 ; +C 27; N balls-1; B 0.00 -2200.01 5509.86 2200.01 ; +C 28; N balls-1l; B -1377.47 -400.02 6887.33 400.02 ; +C 29; N balls-2; B 0.00 -2200.01 5284.09 2200.01 ; +C 30; N balls-2l; B -1321.03 -400.02 6605.12 400.02 ; +C 31; N scripts-ufermata; B -5300.02 -300.02 5300.02 5800.05 ; +C 32; N scripts-dfermata; B -5300.02 -5800.05 5300.02 300.02 ; +C 33; N scripts-thumb; B -1600.00 -2000.00 1600.00 2000.00 ; +C 34; N scripts-sforzato; B -3599.98 -2000.00 3599.98 2000.00 ; +C 35; N scripts-staccato; B -600.04 -600.04 600.04 600.04 ; +C 36; N scripts-ustaccatissimo; B -800.05 -200.00 800.05 4000.06 ; +C 37; N scripts-dstaccatissimo; B -800.05 -4000.06 800.05 200.00 ; +C 38; N scripts-tenuto; B -2400.02 -280.01 2400.02 280.01 ; +C 39; N scripts-umarcato; B -2000.00 0.00 2000.00 4400.02 ; +C 40; N scripts-dmarcato; B -2000.00 -4400.02 2000.00 0.00 ; +C 41; N scripts-open; B -1600.00 -2000.00 1600.00 2000.00 ; +C 42; N scripts-stopped; B -2200.01 -2200.01 2200.01 2200.01 ; +C 43; N scripts-upbow; B -2600.00 0.00 2600.00 8320.05 ; +C 44; N scripts-downbow; B -3000.00 0.00 3000.00 5333.31 ; +C 45; N scripts-reverseturn; B -4375.00 -2117.65 4375.00 2117.65 ; +C 46; N scripts-turn; B -4375.00 -2117.65 4375.00 2117.65 ; +C 47; N scripts-trill; B -4000.00 0.00 4000.00 9000.00 ; +C 48; N scripts-upedalheel; B -2000.00 -2000.00 2000.00 2666.67 ; +C 49; N scripts-dpedalheel; B -2000.00 -2666.67 2000.00 2000.00 ; +C 50; N scripts-upedaltoe; B -2000.00 0.00 2000.00 6000.00 ; +C 51; N scripts-dpedaltoe; B -2000.00 -6000.00 2000.00 0.00 ; +C 52; N scripts-flageolet; B -2133.33 -2133.33 2133.33 2133.33 ; +C 53; N scripts-trilelement; B -2666.67 -2000.00 1045.30 2000.00 ; +C 54; N scripts-prall; B -4522.66 -2000.00 4522.66 2000.00 ; +C 55; N scripts-mordent; B -4522.66 -2000.00 4522.66 2000.00 ; +C 56; N scripts-prallprall; B -6378.65 -2000.00 6378.65 2000.00 ; +C 57; N scripts-prallmordent; B -6378.65 -2000.00 6378.65 2000.00 ; +C 58; N scripts-upprall; B -6378.65 -2000.00 6378.65 2000.00 ; +C 59; N scripts-downprall; B -6378.65 -2000.00 6378.65 2000.00 ; +C 60; N flags-u3; B -200.01 -12260.03 4935.68 200.01 ; +C 61; N flags-u4; B -200.01 -14260.03 4935.68 200.01 ; +C 62; N flags-u5; B -200.01 -17260.03 4935.68 200.01 ; +C 63; N flags-u6; B -200.01 -21260.03 4935.68 200.01 ; +C 64; N flags-d3; B -200.01 -200.01 5461.91 11660.05 ; +C 65; N flags-d4; B -200.01 -200.01 5461.91 12260.03 ; +C 66; N flags-d5; B -200.01 -200.01 5461.91 15660.05 ; +C 67; N flags-d6; B -200.01 -200.01 5461.91 17660.05 ; +C 68; N clefs-alto; B -4000.00 -8000.00 14888.90 8000.00 ; +C 69; N clefs-alto_change; B -3200.01 -6400.02 11911.18 6400.02 ; +C 70; N clefs-bass; B -2000.00 -10000.00 14400.02 4000.00 ; +C 71; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ; +C 72; N clefs-violin; B -3485.72 -12000.00 14948.55 20000.00 ; +C 73; N clefs-violin_change; B -3028.58 -9600.04 11718.89 16000.06 ; +C 74; N timesig-C4/4; B -7200.01 -4000.00 6799.99 4000.00 ; +C 75; N timesig-C2/2; B -7200.01 -5599.98 6799.99 5599.98 ; +C 76; N timesig-old4/4; B -7000.00 -3000.00 7000.00 3000.00 ; +C 77; N timesig-old2/2; B -7000.00 -4000.00 7000.00 4000.00 ; +C 78; N timesig-old3/2; B -7000.00 -3000.00 7000.00 3000.00 ; +C 79; N timesig-old6/4; B -7000.00 -5000.00 7000.00 5000.00 ; +C 80; N timesig-old9/4; B -7000.00 -5000.00 7000.00 5000.00 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta19.afm b/mf/out/feta19.afm index e1f742fdbd..a47de18d52 100644 --- a/mf/out/feta19.afm +++ b/mf/out/feta19.afm @@ -18,66 +18,69 @@ C 13; N accidentals-0; B 0.00 -7125.00 3166.67 7125.00 ; C 14; N accidentals--1; B -570.04 -2375.00 3800.02 9500.00 ; C 15; N accidentals--2; B -570.04 -2375.00 6887.48 9500.00 ; C 16; N accidentals-2; B 0.00 -2375.00 4750.00 2375.00 ; -C 17; N dots-dot; B 0.00 -1068.74 2137.48 1068.74 ; -C 18; N dots-repeatcolon; B 0.00 -2375.00 2137.48 2375.00 ; -C 19; N balls--1; B 0.00 -2612.52 9500.00 2612.52 ; -C 20; N balls--1l; B -2375.00 -475.04 11875.00 475.04 ; -C 21; N balls--2; B 0.00 -2612.52 9500.00 2612.52 ; -C 22; N balls--2l; B -2375.00 -475.04 11875.00 475.04 ; -C 23; N balls-0; B 0.00 -2612.52 9405.09 2612.52 ; -C 24; N balls-0l; B -2351.27 -475.04 11756.36 475.04 ; -C 25; N balls-1; B 0.00 -2612.52 6543.00 2612.52 ; -C 26; N balls-1l; B -1635.76 -475.04 8178.76 475.04 ; -C 27; N balls-2; B 0.00 -2612.52 6274.89 2612.52 ; -C 28; N balls-2l; B -1568.73 -475.04 7843.61 475.04 ; -C 29; N scripts-ufermata; B -6293.78 -356.28 6293.78 6887.57 ; -C 30; N scripts-dfermata; B -6293.78 -6887.57 6293.78 356.28 ; -C 31; N scripts-sforzato; B -4274.98 -2375.00 4274.98 2375.00 ; -C 32; N scripts-staccato; B -712.55 -712.55 712.55 712.55 ; -C 33; N scripts-ustaccatissimo; B -950.07 -200.00 950.07 4750.09 ; -C 34; N scripts-dstaccatissimo; B -950.07 -4750.09 950.07 200.00 ; -C 35; N scripts-tenuto; B -2850.04 -332.53 2850.04 332.53 ; -C 36; N scripts-umarcato; B -2375.00 0.00 2375.00 5225.04 ; -C 37; N scripts-dmarcato; B -2375.00 -5225.04 2375.00 0.00 ; -C 38; N scripts-open; B -1900.01 -2375.00 1900.01 2375.00 ; -C 39; N scripts-stopped; B -2612.52 -2612.52 2612.52 2612.52 ; -C 40; N scripts-upbow; B -3087.51 0.00 3087.51 9880.07 ; -C 41; N scripts-downbow; B -3562.50 0.00 3562.50 6333.31 ; -C 42; N scripts-reverseturn; B -5195.31 -2514.71 5195.31 2514.71 ; -C 43; N scripts-turn; B -5195.31 -2514.71 5195.31 2514.71 ; -C 44; N scripts-trill; B -4750.00 0.00 4750.00 10687.50 ; -C 45; N scripts-upedalheel; B -2375.00 -2375.00 2375.00 3166.67 ; -C 46; N scripts-dpedalheel; B -2375.00 -3166.67 2375.00 2375.00 ; -C 47; N scripts-upedaltoe; B -2375.00 0.00 2375.00 7125.00 ; -C 48; N scripts-dpedaltoe; B -2375.00 -7125.00 2375.00 0.00 ; -C 49; N scripts-flageolet; B -2533.34 -2533.34 2533.34 2533.34 ; -C 50; N scripts-trilelement; B -3166.67 -2375.00 1241.30 2375.00 ; -C 51; N scripts-prall; B -5370.65 -2375.00 5370.65 2375.00 ; -C 52; N scripts-mordent; B -5370.65 -2375.00 5370.65 2375.00 ; -C 53; N scripts-prallprall; B -7574.63 -2375.00 7574.63 2375.00 ; -C 54; N scripts-prallmordent; B -7574.63 -2375.00 7574.63 2375.00 ; -C 55; N scripts-upprall; B -7574.63 -2375.00 7574.63 2375.00 ; -C 56; N scripts-downprall; B -7574.63 -2375.00 7574.63 2375.00 ; -C 57; N flags-u3; B -237.52 -14558.78 5861.15 237.52 ; -C 58; N flags-u4; B -237.52 -16933.78 5861.15 237.52 ; -C 59; N flags-u5; B -237.52 -20496.28 5861.15 237.52 ; -C 60; N flags-u6; B -237.52 -25246.28 5861.15 237.52 ; -C 61; N flags-d3; B -237.52 -237.52 6486.07 13846.31 ; -C 62; N flags-d4; B -237.52 -237.52 6486.07 14558.78 ; -C 63; N flags-d5; B -237.52 -237.52 6486.07 18596.31 ; -C 64; N flags-d6; B -237.52 -237.52 6486.07 20971.31 ; -C 65; N clefs-alto; B -4750.00 -9500.00 17680.59 9500.00 ; -C 66; N clefs-alto_change; B -3800.02 -7600.04 14144.50 7600.04 ; -C 67; N clefs-bass; B -2375.00 -11875.00 17100.04 4750.00 ; -C 68; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ; -C 69; N clefs-violin; B -4139.30 -14250.00 17751.40 23750.00 ; -C 70; N clefs-violin_change; B -3596.45 -11400.05 13916.18 19000.09 ; -C 71; N timesig-C4/4; B -8550.02 -4750.00 8074.98 4750.00 ; -C 72; N timesig-C2/2; B -8550.02 -6649.98 8074.98 6649.98 ; -C 73; N timesig-old4/4; B -8312.50 -3562.50 8312.50 3562.50 ; -C 74; N timesig-old2/2; B -8312.50 -4750.00 8312.50 4750.00 ; -C 75; N timesig-old3/2; B -8312.50 -3562.50 8312.50 3562.50 ; -C 76; N timesig-old6/4; B -8312.50 -5937.50 8312.50 5937.50 ; -C 77; N timesig-old9/4; B -8312.50 -5937.50 8312.50 5937.50 ; +C 17; N accidentals-); B 0.00 -4750.00 2850.04 4750.00 ; +C 18; N accidentals-(; B -2850.04 -4750.00 0.00 4750.00 ; +C 19; N dots-dot; B 0.00 -1068.74 2137.48 1068.74 ; +C 20; N dots-repeatcolon; B 0.00 -2375.00 2137.48 2375.00 ; +C 21; N balls--1; B 0.00 -2612.52 9500.00 2612.52 ; +C 22; N balls--1l; B -2375.00 -475.04 11875.00 475.04 ; +C 23; N balls--2; B 0.00 -2612.52 9500.00 2612.52 ; +C 24; N balls--2l; B -2375.00 -475.04 11875.00 475.04 ; +C 25; N balls-0; B 0.00 -2612.52 9405.09 2612.52 ; +C 26; N balls-0l; B -2351.27 -475.04 11756.36 475.04 ; +C 27; N balls-1; B 0.00 -2612.52 6543.00 2612.52 ; +C 28; N balls-1l; B -1635.76 -475.04 8178.76 475.04 ; +C 29; N balls-2; B 0.00 -2612.52 6274.89 2612.52 ; +C 30; N balls-2l; B -1568.73 -475.04 7843.61 475.04 ; +C 31; N scripts-ufermata; B -6293.78 -356.28 6293.78 6887.57 ; +C 32; N scripts-dfermata; B -6293.78 -6887.57 6293.78 356.28 ; +C 33; N scripts-thumb; B -1900.01 -2375.00 1900.01 2375.00 ; +C 34; N scripts-sforzato; B -4274.98 -2375.00 4274.98 2375.00 ; +C 35; N scripts-staccato; B -712.55 -712.55 712.55 712.55 ; +C 36; N scripts-ustaccatissimo; B -950.07 -200.00 950.07 4750.09 ; +C 37; N scripts-dstaccatissimo; B -950.07 -4750.09 950.07 200.00 ; +C 38; N scripts-tenuto; B -2850.04 -332.53 2850.04 332.53 ; +C 39; N scripts-umarcato; B -2375.00 0.00 2375.00 5225.04 ; +C 40; N scripts-dmarcato; B -2375.00 -5225.04 2375.00 0.00 ; +C 41; N scripts-open; B -1900.01 -2375.00 1900.01 2375.00 ; +C 42; N scripts-stopped; B -2612.52 -2612.52 2612.52 2612.52 ; +C 43; N scripts-upbow; B -3087.51 0.00 3087.51 9880.07 ; +C 44; N scripts-downbow; B -3562.50 0.00 3562.50 6333.31 ; +C 45; N scripts-reverseturn; B -5195.31 -2514.71 5195.31 2514.71 ; +C 46; N scripts-turn; B -5195.31 -2514.71 5195.31 2514.71 ; +C 47; N scripts-trill; B -4750.00 0.00 4750.00 10687.50 ; +C 48; N scripts-upedalheel; B -2375.00 -2375.00 2375.00 3166.67 ; +C 49; N scripts-dpedalheel; B -2375.00 -3166.67 2375.00 2375.00 ; +C 50; N scripts-upedaltoe; B -2375.00 0.00 2375.00 7125.00 ; +C 51; N scripts-dpedaltoe; B -2375.00 -7125.00 2375.00 0.00 ; +C 52; N scripts-flageolet; B -2533.34 -2533.34 2533.34 2533.34 ; +C 53; N scripts-trilelement; B -3166.67 -2375.00 1241.30 2375.00 ; +C 54; N scripts-prall; B -5370.65 -2375.00 5370.65 2375.00 ; +C 55; N scripts-mordent; B -5370.65 -2375.00 5370.65 2375.00 ; +C 56; N scripts-prallprall; B -7574.63 -2375.00 7574.63 2375.00 ; +C 57; N scripts-prallmordent; B -7574.63 -2375.00 7574.63 2375.00 ; +C 58; N scripts-upprall; B -7574.63 -2375.00 7574.63 2375.00 ; +C 59; N scripts-downprall; B -7574.63 -2375.00 7574.63 2375.00 ; +C 60; N flags-u3; B -237.52 -14558.78 5861.15 237.52 ; +C 61; N flags-u4; B -237.52 -16933.78 5861.15 237.52 ; +C 62; N flags-u5; B -237.52 -20496.28 5861.15 237.52 ; +C 63; N flags-u6; B -237.52 -25246.28 5861.15 237.52 ; +C 64; N flags-d3; B -237.52 -237.52 6486.07 13846.31 ; +C 65; N flags-d4; B -237.52 -237.52 6486.07 14558.78 ; +C 66; N flags-d5; B -237.52 -237.52 6486.07 18596.31 ; +C 67; N flags-d6; B -237.52 -237.52 6486.07 20971.31 ; +C 68; N clefs-alto; B -4750.00 -9500.00 17680.59 9500.00 ; +C 69; N clefs-alto_change; B -3800.02 -7600.04 14144.50 7600.04 ; +C 70; N clefs-bass; B -2375.00 -11875.00 17100.04 4750.00 ; +C 71; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ; +C 72; N clefs-violin; B -4139.30 -14250.00 17751.40 23750.00 ; +C 73; N clefs-violin_change; B -3596.45 -11400.05 13916.18 19000.09 ; +C 74; N timesig-C4/4; B -8550.02 -4750.00 8074.98 4750.00 ; +C 75; N timesig-C2/2; B -8550.02 -6649.98 8074.98 6649.98 ; +C 76; N timesig-old4/4; B -8312.50 -3562.50 8312.50 3562.50 ; +C 77; N timesig-old2/2; B -8312.50 -4750.00 8312.50 4750.00 ; +C 78; N timesig-old3/2; B -8312.50 -3562.50 8312.50 3562.50 ; +C 79; N timesig-old6/4; B -8312.50 -5937.50 8312.50 5937.50 ; +C 80; N timesig-old9/4; B -8312.50 -5937.50 8312.50 5937.50 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta20.afm b/mf/out/feta20.afm index 7b7bb8be82..6a7654ac97 100644 --- a/mf/out/feta20.afm +++ b/mf/out/feta20.afm @@ -18,66 +18,69 @@ C 13; N accidentals-0; B 0.00 -7500.00 3333.33 7500.00 ; C 14; N accidentals--1; B -600.04 -2500.00 4000.02 10000.00 ; C 15; N accidentals--2; B -600.04 -2500.00 7249.98 10000.00 ; C 16; N accidentals-2; B 0.00 -2500.00 5000.00 2500.00 ; -C 17; N dots-dot; B 0.00 -1125.00 2249.98 1125.00 ; -C 18; N dots-repeatcolon; B 0.00 -2500.00 2249.98 2500.00 ; -C 19; N balls--1; B 0.00 -2750.02 10000.00 2750.02 ; -C 20; N balls--1l; B -2500.00 -500.03 12500.00 500.03 ; -C 21; N balls--2; B 0.00 -2750.02 10000.00 2750.02 ; -C 22; N balls--2l; B -2500.00 -500.03 12500.00 500.03 ; -C 23; N balls-0; B 0.00 -2750.02 9900.09 2750.02 ; -C 24; N balls-0l; B -2475.02 -500.03 12375.10 500.03 ; -C 25; N balls-1; B 0.00 -2750.02 6887.33 2750.02 ; -C 26; N balls-1l; B -1721.83 -500.03 8609.16 500.03 ; -C 27; N balls-2; B 0.00 -2750.02 6605.15 2750.02 ; -C 28; N balls-2l; B -1651.29 -500.03 8256.44 500.03 ; -C 29; N scripts-ufermata; B -6625.03 -375.03 6625.03 7250.06 ; -C 30; N scripts-dfermata; B -6625.03 -7250.06 6625.03 375.03 ; -C 31; N scripts-sforzato; B -4499.97 -2500.00 4499.97 2500.00 ; -C 32; N scripts-staccato; B -750.05 -750.05 750.05 750.05 ; -C 33; N scripts-ustaccatissimo; B -1000.06 -200.00 1000.06 5000.08 ; -C 34; N scripts-dstaccatissimo; B -1000.06 -5000.08 1000.06 200.00 ; -C 35; N scripts-tenuto; B -3000.03 -350.02 3000.03 350.02 ; -C 36; N scripts-umarcato; B -2500.00 0.00 2500.00 5500.03 ; -C 37; N scripts-dmarcato; B -2500.00 -5500.03 2500.00 0.00 ; -C 38; N scripts-open; B -2000.00 -2500.00 2000.00 2500.00 ; -C 39; N scripts-stopped; B -2750.02 -2750.02 2750.02 2750.02 ; -C 40; N scripts-upbow; B -3250.02 0.00 3250.02 10400.07 ; -C 41; N scripts-downbow; B -3750.00 0.00 3750.00 6666.64 ; -C 42; N scripts-reverseturn; B -5468.75 -2647.06 5468.75 2647.06 ; -C 43; N scripts-turn; B -5468.75 -2647.06 5468.75 2647.06 ; -C 44; N scripts-trill; B -5000.00 0.00 5000.00 11250.00 ; -C 45; N scripts-upedalheel; B -2500.00 -2500.00 2500.00 3333.33 ; -C 46; N scripts-dpedalheel; B -2500.00 -3333.33 2500.00 2500.00 ; -C 47; N scripts-upedaltoe; B -2500.00 0.00 2500.00 7500.00 ; -C 48; N scripts-dpedaltoe; B -2500.00 -7500.00 2500.00 0.00 ; -C 49; N scripts-flageolet; B -2666.67 -2666.67 2666.67 2666.67 ; -C 50; N scripts-trilelement; B -3333.33 -2500.00 1306.64 2500.00 ; -C 51; N scripts-prall; B -5653.30 -2500.00 5653.30 2500.00 ; -C 52; N scripts-mordent; B -5653.30 -2500.00 5653.30 2500.00 ; -C 53; N scripts-prallprall; B -7973.28 -2500.00 7973.28 2500.00 ; -C 54; N scripts-prallmordent; B -7973.28 -2500.00 7973.28 2500.00 ; -C 55; N scripts-upprall; B -7973.28 -2500.00 7973.28 2500.00 ; -C 56; N scripts-downprall; B -7973.28 -2500.00 7973.28 2500.00 ; -C 57; N flags-u3; B -250.02 -15325.03 6169.62 250.02 ; -C 58; N flags-u4; B -250.02 -17825.03 6169.62 250.02 ; -C 59; N flags-u5; B -250.02 -21575.03 6169.62 250.02 ; -C 60; N flags-u6; B -250.02 -26575.03 6169.62 250.02 ; -C 61; N flags-d3; B -250.02 -250.02 6827.44 14575.06 ; -C 62; N flags-d4; B -250.02 -250.02 6827.44 15325.03 ; -C 63; N flags-d5; B -250.02 -250.02 6827.44 19575.06 ; -C 64; N flags-d6; B -250.02 -250.02 6827.44 22075.06 ; -C 65; N clefs-alto; B -5000.00 -10000.00 18611.10 10000.00 ; -C 66; N clefs-alto_change; B -4000.02 -8000.03 14888.92 8000.03 ; -C 67; N clefs-bass; B -2500.00 -12500.00 18000.03 5000.00 ; -C 68; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ; -C 69; N clefs-violin; B -4357.15 -15000.00 18685.68 25000.00 ; -C 70; N clefs-violin_change; B -3785.74 -12000.05 14648.60 20000.08 ; -C 71; N timesig-C4/4; B -9000.02 -5000.00 8499.98 5000.00 ; -C 72; N timesig-C2/2; B -9000.02 -6999.97 8499.98 6999.97 ; -C 73; N timesig-old4/4; B -8750.00 -3750.00 8750.00 3750.00 ; -C 74; N timesig-old2/2; B -8750.00 -5000.00 8750.00 5000.00 ; -C 75; N timesig-old3/2; B -8750.00 -3750.00 8750.00 3750.00 ; -C 76; N timesig-old6/4; B -8750.00 -6250.00 8750.00 6250.00 ; -C 77; N timesig-old9/4; B -8750.00 -6250.00 8750.00 6250.00 ; +C 17; N accidentals-); B 0.00 -5000.00 3000.03 5000.00 ; +C 18; N accidentals-(; B -3000.03 -5000.00 0.00 5000.00 ; +C 19; N dots-dot; B 0.00 -1125.00 2249.98 1125.00 ; +C 20; N dots-repeatcolon; B 0.00 -2500.00 2249.98 2500.00 ; +C 21; N balls--1; B 0.00 -2750.02 10000.00 2750.02 ; +C 22; N balls--1l; B -2500.00 -500.03 12500.00 500.03 ; +C 23; N balls--2; B 0.00 -2750.02 10000.00 2750.02 ; +C 24; N balls--2l; B -2500.00 -500.03 12500.00 500.03 ; +C 25; N balls-0; B 0.00 -2750.02 9900.09 2750.02 ; +C 26; N balls-0l; B -2475.02 -500.03 12375.10 500.03 ; +C 27; N balls-1; B 0.00 -2750.02 6887.33 2750.02 ; +C 28; N balls-1l; B -1721.83 -500.03 8609.16 500.03 ; +C 29; N balls-2; B 0.00 -2750.02 6605.15 2750.02 ; +C 30; N balls-2l; B -1651.29 -500.03 8256.44 500.03 ; +C 31; N scripts-ufermata; B -6625.03 -375.03 6625.03 7250.06 ; +C 32; N scripts-dfermata; B -6625.03 -7250.06 6625.03 375.03 ; +C 33; N scripts-thumb; B -2000.00 -2500.00 2000.00 2500.00 ; +C 34; N scripts-sforzato; B -4499.97 -2500.00 4499.97 2500.00 ; +C 35; N scripts-staccato; B -750.05 -750.05 750.05 750.05 ; +C 36; N scripts-ustaccatissimo; B -1000.06 -200.00 1000.06 5000.08 ; +C 37; N scripts-dstaccatissimo; B -1000.06 -5000.08 1000.06 200.00 ; +C 38; N scripts-tenuto; B -3000.03 -350.02 3000.03 350.02 ; +C 39; N scripts-umarcato; B -2500.00 0.00 2500.00 5500.03 ; +C 40; N scripts-dmarcato; B -2500.00 -5500.03 2500.00 0.00 ; +C 41; N scripts-open; B -2000.00 -2500.00 2000.00 2500.00 ; +C 42; N scripts-stopped; B -2750.02 -2750.02 2750.02 2750.02 ; +C 43; N scripts-upbow; B -3250.02 0.00 3250.02 10400.07 ; +C 44; N scripts-downbow; B -3750.00 0.00 3750.00 6666.64 ; +C 45; N scripts-reverseturn; B -5468.75 -2647.06 5468.75 2647.06 ; +C 46; N scripts-turn; B -5468.75 -2647.06 5468.75 2647.06 ; +C 47; N scripts-trill; B -5000.00 0.00 5000.00 11250.00 ; +C 48; N scripts-upedalheel; B -2500.00 -2500.00 2500.00 3333.33 ; +C 49; N scripts-dpedalheel; B -2500.00 -3333.33 2500.00 2500.00 ; +C 50; N scripts-upedaltoe; B -2500.00 0.00 2500.00 7500.00 ; +C 51; N scripts-dpedaltoe; B -2500.00 -7500.00 2500.00 0.00 ; +C 52; N scripts-flageolet; B -2666.67 -2666.67 2666.67 2666.67 ; +C 53; N scripts-trilelement; B -3333.33 -2500.00 1306.64 2500.00 ; +C 54; N scripts-prall; B -5653.30 -2500.00 5653.30 2500.00 ; +C 55; N scripts-mordent; B -5653.30 -2500.00 5653.30 2500.00 ; +C 56; N scripts-prallprall; B -7973.28 -2500.00 7973.28 2500.00 ; +C 57; N scripts-prallmordent; B -7973.28 -2500.00 7973.28 2500.00 ; +C 58; N scripts-upprall; B -7973.28 -2500.00 7973.28 2500.00 ; +C 59; N scripts-downprall; B -7973.28 -2500.00 7973.28 2500.00 ; +C 60; N flags-u3; B -250.02 -15325.03 6169.62 250.02 ; +C 61; N flags-u4; B -250.02 -17825.03 6169.62 250.02 ; +C 62; N flags-u5; B -250.02 -21575.03 6169.62 250.02 ; +C 63; N flags-u6; B -250.02 -26575.03 6169.62 250.02 ; +C 64; N flags-d3; B -250.02 -250.02 6827.44 14575.06 ; +C 65; N flags-d4; B -250.02 -250.02 6827.44 15325.03 ; +C 66; N flags-d5; B -250.02 -250.02 6827.44 19575.06 ; +C 67; N flags-d6; B -250.02 -250.02 6827.44 22075.06 ; +C 68; N clefs-alto; B -5000.00 -10000.00 18611.10 10000.00 ; +C 69; N clefs-alto_change; B -4000.02 -8000.03 14888.92 8000.03 ; +C 70; N clefs-bass; B -2500.00 -12500.00 18000.03 5000.00 ; +C 71; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ; +C 72; N clefs-violin; B -4357.15 -15000.00 18685.68 25000.00 ; +C 73; N clefs-violin_change; B -3785.74 -12000.05 14648.60 20000.08 ; +C 74; N timesig-C4/4; B -9000.02 -5000.00 8499.98 5000.00 ; +C 75; N timesig-C2/2; B -9000.02 -6999.97 8499.98 6999.97 ; +C 76; N timesig-old4/4; B -8750.00 -3750.00 8750.00 3750.00 ; +C 77; N timesig-old2/2; B -8750.00 -5000.00 8750.00 5000.00 ; +C 78; N timesig-old3/2; B -8750.00 -3750.00 8750.00 3750.00 ; +C 79; N timesig-old6/4; B -8750.00 -6250.00 8750.00 6250.00 ; +C 80; N timesig-old9/4; B -8750.00 -6250.00 8750.00 6250.00 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta23.afm b/mf/out/feta23.afm index f5b55de4ed..0b1d600910 100644 --- a/mf/out/feta23.afm +++ b/mf/out/feta23.afm @@ -18,66 +18,69 @@ C 13; N accidentals-0; B 0.00 -8437.50 3750.00 8437.50 ; C 14; N accidentals--1; B -675.03 -2812.50 4500.02 11250.00 ; C 15; N accidentals--2; B -675.03 -2812.50 8156.23 11250.00 ; C 16; N accidentals-2; B 0.00 -2812.50 5625.00 2812.50 ; -C 17; N dots-dot; B 0.00 -1265.63 2531.23 1265.63 ; -C 18; N dots-repeatcolon; B 0.00 -2812.50 2531.23 2812.50 ; -C 19; N balls--1; B 0.00 -3093.77 11250.00 3093.77 ; -C 20; N balls--1l; B -2812.50 -562.53 14062.50 562.53 ; -C 21; N balls--2; B 0.00 -3093.77 11250.00 3093.77 ; -C 22; N balls--2l; B -2812.50 -562.53 14062.50 562.53 ; -C 23; N balls-0; B 0.00 -3093.77 11137.57 3093.77 ; -C 24; N balls-0l; B -2784.40 -562.53 13921.97 562.53 ; -C 25; N balls-1; B 0.00 -3093.77 7748.26 3093.77 ; -C 26; N balls-1l; B -1937.07 -562.53 9685.33 562.53 ; -C 27; N balls-2; B 0.00 -3093.77 7430.80 3093.77 ; -C 28; N balls-2l; B -1857.70 -562.53 9288.50 562.53 ; -C 29; N scripts-ufermata; B -7453.16 -421.90 7453.16 8156.31 ; -C 30; N scripts-dfermata; B -7453.16 -8156.31 7453.16 421.90 ; -C 31; N scripts-sforzato; B -5062.47 -2812.50 5062.47 2812.50 ; -C 32; N scripts-staccato; B -843.80 -843.80 843.80 843.80 ; -C 33; N scripts-ustaccatissimo; B -1125.06 -200.00 1125.06 5625.08 ; -C 34; N scripts-dstaccatissimo; B -1125.06 -5625.08 1125.06 200.00 ; -C 35; N scripts-tenuto; B -3375.03 -393.77 3375.03 393.77 ; -C 36; N scripts-umarcato; B -2812.50 0.00 2812.50 6187.53 ; -C 37; N scripts-dmarcato; B -2812.50 -6187.53 2812.50 0.00 ; -C 38; N scripts-open; B -2250.00 -2812.50 2250.00 2812.50 ; -C 39; N scripts-stopped; B -3093.77 -3093.77 3093.77 3093.77 ; -C 40; N scripts-upbow; B -3656.27 0.00 3656.27 11700.07 ; -C 41; N scripts-downbow; B -4218.75 0.00 4218.75 7499.97 ; -C 42; N scripts-reverseturn; B -6152.34 -2977.94 6152.34 2977.94 ; -C 43; N scripts-turn; B -6152.34 -2977.94 6152.34 2977.94 ; -C 44; N scripts-trill; B -5625.00 0.00 5625.00 12656.25 ; -C 45; N scripts-upedalheel; B -2812.50 -2812.50 2812.50 3750.00 ; -C 46; N scripts-dpedalheel; B -2812.50 -3750.00 2812.50 2812.50 ; -C 47; N scripts-upedaltoe; B -2812.50 0.00 2812.50 8437.50 ; -C 48; N scripts-dpedaltoe; B -2812.50 -8437.50 2812.50 0.00 ; -C 49; N scripts-flageolet; B -3000.00 -3000.00 3000.00 3000.00 ; -C 50; N scripts-trilelement; B -3750.00 -2812.50 1469.97 2812.50 ; -C 51; N scripts-prall; B -6359.99 -2812.50 6359.99 2812.50 ; -C 52; N scripts-mordent; B -6359.99 -2812.50 6359.99 2812.50 ; -C 53; N scripts-prallprall; B -8969.97 -2812.50 8969.97 2812.50 ; -C 54; N scripts-prallmordent; B -8969.97 -2812.50 8969.97 2812.50 ; -C 55; N scripts-upprall; B -8969.97 -2812.50 8969.97 2812.50 ; -C 56; N scripts-downprall; B -8969.97 -2812.50 8969.97 2812.50 ; -C 57; N flags-u3; B -281.27 -17240.65 6940.84 281.27 ; -C 58; N flags-u4; B -281.27 -20053.15 6940.84 281.27 ; -C 59; N flags-u5; B -281.27 -24271.90 6940.84 281.27 ; -C 60; N flags-u6; B -281.27 -29896.90 6940.84 281.27 ; -C 61; N flags-d3; B -281.27 -281.27 7680.88 16396.93 ; -C 62; N flags-d4; B -281.27 -281.27 7680.88 17240.65 ; -C 63; N flags-d5; B -281.27 -281.27 7680.88 22021.93 ; -C 64; N flags-d6; B -281.27 -281.27 7680.88 24834.43 ; -C 65; N clefs-alto; B -5625.00 -11250.00 20937.50 11250.00 ; -C 66; N clefs-alto_change; B -4500.02 -9000.03 16750.08 9000.03 ; -C 67; N clefs-bass; B -2812.50 -14062.50 20250.03 5625.00 ; -C 68; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ; -C 69; N clefs-violin; B -4901.80 -16875.00 21021.40 28125.00 ; -C 70; N clefs-violin_change; B -4258.94 -13500.05 16479.68 22500.08 ; -C 71; N timesig-C4/4; B -10125.02 -5625.00 9562.48 5625.00 ; -C 72; N timesig-C2/2; B -10125.02 -7874.97 9562.48 7874.97 ; -C 73; N timesig-old4/4; B -9843.75 -4218.75 9843.75 4218.75 ; -C 74; N timesig-old2/2; B -9843.75 -5625.00 9843.75 5625.00 ; -C 75; N timesig-old3/2; B -9843.75 -4218.75 9843.75 4218.75 ; -C 76; N timesig-old6/4; B -9843.75 -7031.25 9843.75 7031.25 ; -C 77; N timesig-old9/4; B -9843.75 -7031.25 9843.75 7031.25 ; +C 17; N accidentals-); B 0.00 -5625.00 3375.03 5625.00 ; +C 18; N accidentals-(; B -3375.03 -5625.00 0.00 5625.00 ; +C 19; N dots-dot; B 0.00 -1265.63 2531.23 1265.63 ; +C 20; N dots-repeatcolon; B 0.00 -2812.50 2531.23 2812.50 ; +C 21; N balls--1; B 0.00 -3093.77 11250.00 3093.77 ; +C 22; N balls--1l; B -2812.50 -562.53 14062.50 562.53 ; +C 23; N balls--2; B 0.00 -3093.77 11250.00 3093.77 ; +C 24; N balls--2l; B -2812.50 -562.53 14062.50 562.53 ; +C 25; N balls-0; B 0.00 -3093.77 11137.57 3093.77 ; +C 26; N balls-0l; B -2784.40 -562.53 13921.97 562.53 ; +C 27; N balls-1; B 0.00 -3093.77 7748.26 3093.77 ; +C 28; N balls-1l; B -1937.07 -562.53 9685.33 562.53 ; +C 29; N balls-2; B 0.00 -3093.77 7430.80 3093.77 ; +C 30; N balls-2l; B -1857.70 -562.53 9288.50 562.53 ; +C 31; N scripts-ufermata; B -7453.16 -421.90 7453.16 8156.31 ; +C 32; N scripts-dfermata; B -7453.16 -8156.31 7453.16 421.90 ; +C 33; N scripts-thumb; B -2250.00 -2812.50 2250.00 2812.50 ; +C 34; N scripts-sforzato; B -5062.47 -2812.50 5062.47 2812.50 ; +C 35; N scripts-staccato; B -843.80 -843.80 843.80 843.80 ; +C 36; N scripts-ustaccatissimo; B -1125.06 -200.00 1125.06 5625.08 ; +C 37; N scripts-dstaccatissimo; B -1125.06 -5625.08 1125.06 200.00 ; +C 38; N scripts-tenuto; B -3375.03 -393.77 3375.03 393.77 ; +C 39; N scripts-umarcato; B -2812.50 0.00 2812.50 6187.53 ; +C 40; N scripts-dmarcato; B -2812.50 -6187.53 2812.50 0.00 ; +C 41; N scripts-open; B -2250.00 -2812.50 2250.00 2812.50 ; +C 42; N scripts-stopped; B -3093.77 -3093.77 3093.77 3093.77 ; +C 43; N scripts-upbow; B -3656.27 0.00 3656.27 11700.07 ; +C 44; N scripts-downbow; B -4218.75 0.00 4218.75 7499.97 ; +C 45; N scripts-reverseturn; B -6152.34 -2977.94 6152.34 2977.94 ; +C 46; N scripts-turn; B -6152.34 -2977.94 6152.34 2977.94 ; +C 47; N scripts-trill; B -5625.00 0.00 5625.00 12656.25 ; +C 48; N scripts-upedalheel; B -2812.50 -2812.50 2812.50 3750.00 ; +C 49; N scripts-dpedalheel; B -2812.50 -3750.00 2812.50 2812.50 ; +C 50; N scripts-upedaltoe; B -2812.50 0.00 2812.50 8437.50 ; +C 51; N scripts-dpedaltoe; B -2812.50 -8437.50 2812.50 0.00 ; +C 52; N scripts-flageolet; B -3000.00 -3000.00 3000.00 3000.00 ; +C 53; N scripts-trilelement; B -3750.00 -2812.50 1469.97 2812.50 ; +C 54; N scripts-prall; B -6359.99 -2812.50 6359.99 2812.50 ; +C 55; N scripts-mordent; B -6359.99 -2812.50 6359.99 2812.50 ; +C 56; N scripts-prallprall; B -8969.97 -2812.50 8969.97 2812.50 ; +C 57; N scripts-prallmordent; B -8969.97 -2812.50 8969.97 2812.50 ; +C 58; N scripts-upprall; B -8969.97 -2812.50 8969.97 2812.50 ; +C 59; N scripts-downprall; B -8969.97 -2812.50 8969.97 2812.50 ; +C 60; N flags-u3; B -281.27 -17240.65 6940.84 281.27 ; +C 61; N flags-u4; B -281.27 -20053.15 6940.84 281.27 ; +C 62; N flags-u5; B -281.27 -24271.90 6940.84 281.27 ; +C 63; N flags-u6; B -281.27 -29896.90 6940.84 281.27 ; +C 64; N flags-d3; B -281.27 -281.27 7680.88 16396.93 ; +C 65; N flags-d4; B -281.27 -281.27 7680.88 17240.65 ; +C 66; N flags-d5; B -281.27 -281.27 7680.88 22021.93 ; +C 67; N flags-d6; B -281.27 -281.27 7680.88 24834.43 ; +C 68; N clefs-alto; B -5625.00 -11250.00 20937.50 11250.00 ; +C 69; N clefs-alto_change; B -4500.02 -9000.03 16750.08 9000.03 ; +C 70; N clefs-bass; B -2812.50 -14062.50 20250.03 5625.00 ; +C 71; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ; +C 72; N clefs-violin; B -4901.80 -16875.00 21021.40 28125.00 ; +C 73; N clefs-violin_change; B -4258.94 -13500.05 16479.68 22500.08 ; +C 74; N timesig-C4/4; B -10125.02 -5625.00 9562.48 5625.00 ; +C 75; N timesig-C2/2; B -10125.02 -7874.97 9562.48 7874.97 ; +C 76; N timesig-old4/4; B -9843.75 -4218.75 9843.75 4218.75 ; +C 77; N timesig-old2/2; B -9843.75 -5625.00 9843.75 5625.00 ; +C 78; N timesig-old3/2; B -9843.75 -4218.75 9843.75 4218.75 ; +C 79; N timesig-old6/4; B -9843.75 -7031.25 9843.75 7031.25 ; +C 80; N timesig-old9/4; B -9843.75 -7031.25 9843.75 7031.25 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta26.afm b/mf/out/feta26.afm index bd5369910d..3ef7426b93 100644 --- a/mf/out/feta26.afm +++ b/mf/out/feta26.afm @@ -18,66 +18,69 @@ C 13; N accidentals-0; B 0.00 -9750.00 4333.33 9750.00 ; C 14; N accidentals--1; B -780.04 -3250.00 5200.03 13000.00 ; C 15; N accidentals--2; B -780.04 -3250.00 9424.99 13000.00 ; C 16; N accidentals-2; B 0.00 -3250.00 6500.00 3250.00 ; -C 17; N dots-dot; B 0.00 -1462.50 2924.99 1462.50 ; -C 18; N dots-repeatcolon; B 0.00 -3250.00 2924.99 3250.00 ; -C 19; N balls--1; B 0.00 -3575.03 13000.00 3575.03 ; -C 20; N balls--1l; B -3250.00 -650.04 16250.00 650.04 ; -C 21; N balls--2; B 0.00 -3575.03 13000.00 3575.03 ; -C 22; N balls--2l; B -3250.00 -650.04 16250.00 650.04 ; -C 23; N balls-0; B 0.00 -3575.03 12870.12 3575.03 ; -C 24; N balls-0l; B -3217.53 -650.04 16087.65 650.04 ; -C 25; N balls-1; B 0.00 -3575.03 8953.54 3575.03 ; -C 26; N balls-1l; B -2238.39 -650.04 11191.93 650.04 ; -C 27; N balls-2; B 0.00 -3575.03 8586.67 3575.03 ; -C 28; N balls-2l; B -2146.67 -650.04 10733.34 650.04 ; -C 29; N scripts-ufermata; B -8612.53 -487.53 8612.53 9425.08 ; -C 30; N scripts-dfermata; B -8612.53 -9425.08 8612.53 487.53 ; -C 31; N scripts-sforzato; B -5849.96 -3250.00 5849.96 3250.00 ; -C 32; N scripts-staccato; B -975.07 -975.07 975.07 975.07 ; -C 33; N scripts-ustaccatissimo; B -1300.08 -200.00 1300.08 6500.10 ; -C 34; N scripts-dstaccatissimo; B -1300.08 -6500.10 1300.08 200.00 ; -C 35; N scripts-tenuto; B -3900.04 -455.03 3900.04 455.03 ; -C 36; N scripts-umarcato; B -3250.00 0.00 3250.00 7150.04 ; -C 37; N scripts-dmarcato; B -3250.00 -7150.04 3250.00 0.00 ; -C 38; N scripts-open; B -2600.00 -3250.00 2600.00 3250.00 ; -C 39; N scripts-stopped; B -3575.03 -3575.03 3575.03 3575.03 ; -C 40; N scripts-upbow; B -4225.02 0.00 4225.02 13520.10 ; -C 41; N scripts-downbow; B -4875.00 0.00 4875.00 8666.64 ; -C 42; N scripts-reverseturn; B -7109.38 -3441.18 7109.38 3441.18 ; -C 43; N scripts-turn; B -7109.38 -3441.18 7109.38 3441.18 ; -C 44; N scripts-trill; B -6500.00 0.00 6500.00 14625.00 ; -C 45; N scripts-upedalheel; B -3250.00 -3250.00 3250.00 4333.33 ; -C 46; N scripts-dpedalheel; B -3250.00 -4333.33 3250.00 3250.00 ; -C 47; N scripts-upedaltoe; B -3250.00 0.00 3250.00 9750.00 ; -C 48; N scripts-dpedaltoe; B -3250.00 -9750.00 3250.00 0.00 ; -C 49; N scripts-flageolet; B -3466.67 -3466.67 3466.67 3466.67 ; -C 50; N scripts-trilelement; B -4333.33 -3250.00 1698.62 3250.00 ; -C 51; N scripts-prall; B -7349.30 -3250.00 7349.30 3250.00 ; -C 52; N scripts-mordent; B -7349.30 -3250.00 7349.30 3250.00 ; -C 53; N scripts-prallprall; B -10365.28 -3250.00 10365.28 3250.00 ; -C 54; N scripts-prallmordent; B -10365.28 -3250.00 10365.28 3250.00 ; -C 55; N scripts-upprall; B -10365.28 -3250.00 10365.28 3250.00 ; -C 56; N scripts-downprall; B -10365.28 -3250.00 10365.28 3250.00 ; -C 57; N flags-u3; B -325.03 -19922.53 8020.51 325.03 ; -C 58; N flags-u4; B -325.03 -23172.53 8020.51 325.03 ; -C 59; N flags-u5; B -325.03 -28047.53 8020.51 325.03 ; -C 60; N flags-u6; B -325.03 -34547.53 8020.51 325.03 ; -C 61; N flags-d3; B -325.03 -325.03 8875.67 18947.57 ; -C 62; N flags-d4; B -325.03 -325.03 8875.67 19922.53 ; -C 63; N flags-d5; B -325.03 -325.03 8875.67 25447.57 ; -C 64; N flags-d6; B -325.03 -325.03 8875.67 28697.57 ; -C 65; N clefs-alto; B -6500.00 -13000.00 24194.44 13000.00 ; -C 66; N clefs-alto_change; B -5200.03 -10400.05 19355.70 10400.05 ; -C 67; N clefs-bass; B -3250.00 -16250.00 23400.04 6500.00 ; -C 68; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ; -C 69; N clefs-violin; B -5664.29 -19500.00 24291.40 32500.00 ; -C 70; N clefs-violin_change; B -4921.46 -15600.08 19043.21 26000.14 ; -C 71; N timesig-C4/4; B -11700.03 -6500.00 11049.99 6500.00 ; -C 72; N timesig-C2/2; B -11700.03 -9099.96 11049.99 9099.96 ; -C 73; N timesig-old4/4; B -11375.00 -4875.00 11375.00 4875.00 ; -C 74; N timesig-old2/2; B -11375.00 -6500.00 11375.00 6500.00 ; -C 75; N timesig-old3/2; B -11375.00 -4875.00 11375.00 4875.00 ; -C 76; N timesig-old6/4; B -11375.00 -8125.00 11375.00 8125.00 ; -C 77; N timesig-old9/4; B -11375.00 -8125.00 11375.00 8125.00 ; +C 17; N accidentals-); B 0.00 -6500.00 3900.04 6500.00 ; +C 18; N accidentals-(; B -3900.04 -6500.00 0.00 6500.00 ; +C 19; N dots-dot; B 0.00 -1462.50 2924.99 1462.50 ; +C 20; N dots-repeatcolon; B 0.00 -3250.00 2924.99 3250.00 ; +C 21; N balls--1; B 0.00 -3575.03 13000.00 3575.03 ; +C 22; N balls--1l; B -3250.00 -650.04 16250.00 650.04 ; +C 23; N balls--2; B 0.00 -3575.03 13000.00 3575.03 ; +C 24; N balls--2l; B -3250.00 -650.04 16250.00 650.04 ; +C 25; N balls-0; B 0.00 -3575.03 12870.12 3575.03 ; +C 26; N balls-0l; B -3217.53 -650.04 16087.65 650.04 ; +C 27; N balls-1; B 0.00 -3575.03 8953.54 3575.03 ; +C 28; N balls-1l; B -2238.39 -650.04 11191.93 650.04 ; +C 29; N balls-2; B 0.00 -3575.03 8586.67 3575.03 ; +C 30; N balls-2l; B -2146.67 -650.04 10733.34 650.04 ; +C 31; N scripts-ufermata; B -8612.53 -487.53 8612.53 9425.08 ; +C 32; N scripts-dfermata; B -8612.53 -9425.08 8612.53 487.53 ; +C 33; N scripts-thumb; B -2600.00 -3250.00 2600.00 3250.00 ; +C 34; N scripts-sforzato; B -5849.96 -3250.00 5849.96 3250.00 ; +C 35; N scripts-staccato; B -975.07 -975.07 975.07 975.07 ; +C 36; N scripts-ustaccatissimo; B -1300.08 -200.00 1300.08 6500.10 ; +C 37; N scripts-dstaccatissimo; B -1300.08 -6500.10 1300.08 200.00 ; +C 38; N scripts-tenuto; B -3900.04 -455.03 3900.04 455.03 ; +C 39; N scripts-umarcato; B -3250.00 0.00 3250.00 7150.04 ; +C 40; N scripts-dmarcato; B -3250.00 -7150.04 3250.00 0.00 ; +C 41; N scripts-open; B -2600.00 -3250.00 2600.00 3250.00 ; +C 42; N scripts-stopped; B -3575.03 -3575.03 3575.03 3575.03 ; +C 43; N scripts-upbow; B -4225.02 0.00 4225.02 13520.10 ; +C 44; N scripts-downbow; B -4875.00 0.00 4875.00 8666.64 ; +C 45; N scripts-reverseturn; B -7109.38 -3441.18 7109.38 3441.18 ; +C 46; N scripts-turn; B -7109.38 -3441.18 7109.38 3441.18 ; +C 47; N scripts-trill; B -6500.00 0.00 6500.00 14625.00 ; +C 48; N scripts-upedalheel; B -3250.00 -3250.00 3250.00 4333.33 ; +C 49; N scripts-dpedalheel; B -3250.00 -4333.33 3250.00 3250.00 ; +C 50; N scripts-upedaltoe; B -3250.00 0.00 3250.00 9750.00 ; +C 51; N scripts-dpedaltoe; B -3250.00 -9750.00 3250.00 0.00 ; +C 52; N scripts-flageolet; B -3466.67 -3466.67 3466.67 3466.67 ; +C 53; N scripts-trilelement; B -4333.33 -3250.00 1698.62 3250.00 ; +C 54; N scripts-prall; B -7349.30 -3250.00 7349.30 3250.00 ; +C 55; N scripts-mordent; B -7349.30 -3250.00 7349.30 3250.00 ; +C 56; N scripts-prallprall; B -10365.28 -3250.00 10365.28 3250.00 ; +C 57; N scripts-prallmordent; B -10365.28 -3250.00 10365.28 3250.00 ; +C 58; N scripts-upprall; B -10365.28 -3250.00 10365.28 3250.00 ; +C 59; N scripts-downprall; B -10365.28 -3250.00 10365.28 3250.00 ; +C 60; N flags-u3; B -325.03 -19922.53 8020.51 325.03 ; +C 61; N flags-u4; B -325.03 -23172.53 8020.51 325.03 ; +C 62; N flags-u5; B -325.03 -28047.53 8020.51 325.03 ; +C 63; N flags-u6; B -325.03 -34547.53 8020.51 325.03 ; +C 64; N flags-d3; B -325.03 -325.03 8875.67 18947.57 ; +C 65; N flags-d4; B -325.03 -325.03 8875.67 19922.53 ; +C 66; N flags-d5; B -325.03 -325.03 8875.67 25447.57 ; +C 67; N flags-d6; B -325.03 -325.03 8875.67 28697.57 ; +C 68; N clefs-alto; B -6500.00 -13000.00 24194.44 13000.00 ; +C 69; N clefs-alto_change; B -5200.03 -10400.05 19355.70 10400.05 ; +C 70; N clefs-bass; B -3250.00 -16250.00 23400.04 6500.00 ; +C 71; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ; +C 72; N clefs-violin; B -5664.29 -19500.00 24291.40 32500.00 ; +C 73; N clefs-violin_change; B -4921.46 -15600.08 19043.21 26000.14 ; +C 74; N timesig-C4/4; B -11700.03 -6500.00 11049.99 6500.00 ; +C 75; N timesig-C2/2; B -11700.03 -9099.96 11049.99 9099.96 ; +C 76; N timesig-old4/4; B -11375.00 -4875.00 11375.00 4875.00 ; +C 77; N timesig-old2/2; B -11375.00 -6500.00 11375.00 6500.00 ; +C 78; N timesig-old3/2; B -11375.00 -4875.00 11375.00 4875.00 ; +C 79; N timesig-old6/4; B -11375.00 -8125.00 11375.00 8125.00 ; +C 80; N timesig-old9/4; B -11375.00 -8125.00 11375.00 8125.00 ; EndCharMetrics EndFontMetrics diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index ffaa8941cd..b693616337 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -29,8 +29,8 @@ either. /Mats -Tested Features: Note placement, multipart score, figured base, \breve, - time signature styles + +Tested Features: Note placement, multipart score, figured base, \breve %} %{ @@ -47,28 +47,8 @@ definition below. --MB \version "1.0.7"; -global = \notes { - \property StaffGroup.timeSignatureStyle = "old" - \time 4/4; - \tempo 4=80; - \skip 1*31; - \property StaffGroup.timeSignatureStyle = "1" - \time 3/2; - \bar ":|:"; - \tempo 2=140; - \skip 1.*15; - \property StaffGroup.timeSignatureStyle = "old" +vi1=\notes \relative c'' { \time 4/4; - \tempo 4=80; - \skip 1; - \bar ":|:"; - \skip 1*13; - \bar "|."; -} - -vi1=\type Staff = vi1 < -\global -\notes \relative c'' { [d8 d d d] d4 [a16 b c a] | [b8 g ][ g g16 a][ b8 g ][ g g16 a] | @@ -100,8 +80,9 @@ vi1=\type Staff = vi1 < [c8 g ][ g g16 f] e4 d | r8 g [g g16 f] e4 d | r8 [d16 a ][ b8 b16 c] a2 | - b1 | - + b1 | + \time 3/2; + \tempo 2=140; r4 d d d d d | e1. | r4 c c c c c | @@ -117,7 +98,8 @@ vi1=\type Staff = vi1 < a4 [c8 b] a4 [b8 c] f,4 [g8 a] | d,4 g g g g g | a [d,8 c] b4 [c8 d] a2 | - + \time 4/4; + \tempo 4=80; b1 | [d8 d d d] d4 [a16 b c a] | [b8 g ][ g g16 a] [b8 g ][ g g16 a] | @@ -132,11 +114,11 @@ vi1=\type Staff = vi1 < fis4 g2 fis!4 | \cadenza 1; g\breve -}> + \bar "|."; +} -vi2=\type Staff = vi2 < -\global -\notes \relative c'' { +vi2=\notes \relative c'' { + \time 4/4; r1 | r | r | [d8 d d d] d4 [a16 b c a] | @@ -167,7 +149,7 @@ vi2=\type Staff = vi2 < e4 d r8 [c16 g ][ b8 b16 c] | a4 g2 fis4 | g1 | - + \time 3/2; r1. | r4 [g'8 f] e4 [f8 g] c,4 [d8 e] | a,1. | @@ -183,7 +165,7 @@ vi2=\type Staff = vi2 < c,4 a a a a a | b [d8 c] b4 [c8 d] d,4 e | fis2 g fis! | - + \time 4/4; g1 | r1 | r1 | [g'8 g g g] g4 [d16 e f d] | @@ -197,13 +179,13 @@ vi2=\type Staff = vi2 < [a d c b ][ a g fis e] d4 d' | \cadenza 1; b\breve -}> + \bar "|."; +} -bc=\type Staff = bc < -\global -\notes\transpose c'{ +bc=\notes\transpose c'{ \clef "bass"; + \time 4/4; G2 d^"4 3" | G1 | g2 c4 G | d1^"3 4 3" | @@ -221,7 +203,7 @@ bc=\type Staff = bc < G1^"3 4 3" | c4 B c g | c B c G | d1^"3 4 3" | G1 | - + \time 3/2; g1. | c | f | d^"\\textsharp" | g | c | @@ -230,9 +212,8 @@ bc=\type Staff = bc < d^"\\textsharp" | e | f | g1 B2 | d1.^"3 4 3" | - + \time 4/4; G1 | - \bar ":|:"; g2 fis | g G | g1^"3 4 3" | c | G^"3 4 3" | c2 G | @@ -241,10 +222,12 @@ bc=\type Staff = bc < ) d^"3 4 3" | \cadenza 1; G\breve -}> + \bar "|."; +} \score{ \type StaffGroup < + \property StaffGroup.timeSignatureStyle = "old" \vi1 \vi2 \bc diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index ee6d05a229..f8b10a9080 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -14,7 +14,7 @@ # - rewrite in python program_name = 'convert-mudela' -version = '0.3' +version = '0.4' import os @@ -319,6 +319,10 @@ def do_one_file (infile_name): outfile.close () if __main__.edit: + try: + os.remove(infile_name + '~') + except: + pass os.rename (infile_name, infile_name + '~') os.rename (infile_name + '.NEW', infile_name) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 74c5495c08..3fbc2e2155 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -14,7 +14,7 @@ Output: DVI file """ name = 'ly2dvi' -version = '0.0.5' +version = '0.0.6' errorlog = '' import sys @@ -444,14 +444,14 @@ class Properties: t='' if os.environ.has_key ('TEXINPUTS'): t = os.pathsep + os.environ['TEXINPUTS'] - os.environ['TEXINPUTS'] = os.path.join(this.get('root'), 'texmf', - 'tex', 'lilypond' ) + t + os.environ['TEXINPUTS'] = os.path.join(this.get('root'), 'share', + 'lilypond', 'tex' ) + t t='' if os.environ.has_key ('MFINPUTS'): t = os.pathsep + os.environ['MFINPUTS'] - os.environ['MFINPUTS'] = os.path.join(this.get('root'), 'texmf', - 'mf', 'public', 'lilypond' ) + t + os.environ['MFINPUTS'] = os.path.join(this.get('root'), 'share', + 'lilypond', 'mf' ) + t if os.environ.has_key('TMP'): this.__set('tmp',os.environ['TMP'],'environment') @@ -505,8 +505,8 @@ class Properties: """ if os.name == 'nt': - path = os.path.join(this.get('root'), 'texmf', 'tex', - 'lilypond', var) + path = os.path.join(this.get('root'), 'share', 'lilypond', + 'tex', var) else: path ='' cmd =('kpsewhich tex %s %s' % (var,errorlog)) @@ -514,8 +514,8 @@ class Properties: path = pipe.readline ()[:-1] # chop off \n return_status = pipe.close() if return_status and not path: - path = os.path.join(this.get('root'), 'texmf', 'tex', - 'lilypond', var) + path = os.path.join(this.get('root'), 'share', 'lilypond', + 'tex', var) fd = open(path, 'r') return fd @@ -554,7 +554,7 @@ class Properties: else: # Windows apps like edit choke on .lilyrc dotFilename='_lilyrc' - for d in [os.path.join(this.get('root'),'share','lilypond'), \ + for d in [os.path.join(this.get('root'),'share','lilypond','ly'), \ os.environ['HOME'], os.curdir ]: file=os.path.join(d,dotFilename) try: diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh index e299418333..45574a1824 100644 --- a/stepmake/bin/package-zip32.sh +++ b/stepmake/bin/package-zip32.sh @@ -40,10 +40,7 @@ distdir=/tmp/${name} rm -f ${srcdir}/config.cache PYTHON=${PYTHON:-python} ${srcdir}/configure --prefix=${distdir} \ - --srcdir=${srcdir} \ - --enable-tex-prefix=${distdir}/texmf \ - --enable-tex-dir=${distdir}/texmf/tex \ - --enable-mf-dir=${distdir}/texmf/mf + --srcdir=${srcdir} if ! make ; then echo "make failed" @@ -80,7 +77,7 @@ cp $CYGWIN_LIB $distdir/bin # # Rename python files to .py # -mv $distdir/bin/ly2dvi32 $distdir/bin/ly2dvi.py +mv $distdir/bin/ly2dvi $distdir/bin/ly2dvi.py mv $distdir/bin/convert-mudela $distdir/bin/convert-mudela.py mv $distdir/bin/mudela-book $distdir/bin/mudela-book.py @@ -89,7 +86,7 @@ mv $distdir/bin/mudela-book $distdir/bin/mudela-book.py # mkdir $distdir/doc cp Documentation/man/out/*.txt $distdir/doc -mv $distdir/doc/ly2dvi32.txt $distdir/doc/ly2dvi_py.txt +mv $distdir/doc/ly2dvi32.txt $distdir/doc/ly2dvi.txt cd $distdir/.. $ZIP_CMD $ZIP_FILE $name echo "Wrote $ZIP_FILE" diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 4312a117a8..38ea9553e8 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -165,7 +165,7 @@ %compatibility %urg -\fetdef\repeatcolon{20} +\fetdef\repeatcolon{18} \def\repeatbar{\repeatstopbar} \def\startrepeat{\repeatstartbar} \def\repeatbarstartrepeat{\repeatstopstart} -- 2.39.5