From 6e6bc627249868c0d0fb39755ad98938f102be5a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:10:24 +0000 Subject: [PATCH] lilypond-0.1.56 --- ANNOUNCE | 13 ++++++----- init/feta11.ly | 1 + init/feta13.ly | 1 + init/feta16.ly | 1 + init/feta19.ly | 1 + init/feta20.ly | 1 + init/feta23.ly | 1 + init/feta26.ly | 1 + init/script.ly | 1 + input/font-body.ly | 21 +---------------- input/font26.ly | 3 ++- lily/stem.cc | 7 ++++-- mf/feta-schrift.mf | 21 +++++++++++++---- tex/feta11.tex | 57 +++++++++++++++++++++++----------------------- tex/feta13.tex | 57 +++++++++++++++++++++++----------------------- tex/feta16.tex | 57 +++++++++++++++++++++++----------------------- tex/feta19.tex | 57 +++++++++++++++++++++++----------------------- tex/feta20.tex | 57 +++++++++++++++++++++++----------------------- tex/feta23.tex | 57 +++++++++++++++++++++++----------------------- tex/feta26.tex | 57 +++++++++++++++++++++++----------------------- 20 files changed, 243 insertions(+), 229 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f21190a248..3b3c6fb30f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -32,7 +32,8 @@ WHAT'S NEW SINCE VERSION 0.1? * Better MIDI importing -* Easier to use due to better scripts and input format enhancements +* Easier to use due to better shell scripts and input format +enhancements * MusixTeX not needed anymore @@ -45,16 +46,16 @@ customizable notenames. MIDI output lets you check if you have entered the correct notes. MIDI to Mudela conversion through the mi2mu program. -Font size selectable (26pt, 20pt, 16pt staffsize) for each score. +Font size selectable (from 26pt downto 11 pt) for each score. Multiple staffs in one score. Each staff may have various different meters. Multiple voices within one staff (up to four handled graciously); beams optionally shared between voices. Multiple scores within one input file. Each score is output to a different file. -Beams, slurs, chords, super/subscripts (accents and text), -general n-plet (triplet, quadruplets, etc.), lyrics, transposition, -dynamics (both absolute and hairpin style), clef changes, meter -changes, cadenza-mode, key changes, repeat bars. +Beams, slurs, chords, super/subscripts (accents and text), general +n-plet (triplet, quadruplets, etc.), lyrics, transposition, dynamics +(both absolute and hairpin style), clef changes, meter changes, +cadenza-mode, key changes, repeat bars. Integration with LaTeX through Perl scripts. diff --git a/init/feta11.ly b/init/feta11.ly index 744ff61814..e168a29ea9 100644 --- a/init/feta11.ly +++ b/init/feta11.ly @@ -52,6 +52,7 @@ "stopped" "\\plusstop" -1.51\pt 1.51\pt -1.51\pt 1.51\pt "upbow" "\\upbow" -1.79\pt 1.79\pt 0.00\pt 5.72\pt "downbow" "\\downbow" -2.06\pt 2.06\pt 0.00\pt 3.67\pt + "reverseturn" "\\reverseturn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt "turn" "\\turn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt "trill" "\\trill" -2.75\pt 2.75\pt 0.00\pt 6.19\pt "upedalheel" "\\upedalheel" -1.38\pt 1.38\pt -1.38\pt 1.83\pt diff --git a/init/feta13.ly b/init/feta13.ly index 13a530df76..95b304a524 100644 --- a/init/feta13.ly +++ b/init/feta13.ly @@ -52,6 +52,7 @@ "stopped" "\\plusstop" -1.79\pt 1.79\pt -1.79\pt 1.79\pt "upbow" "\\upbow" -2.11\pt 2.11\pt 0.00\pt 6.76\pt "downbow" "\\downbow" -2.44\pt 2.44\pt 0.00\pt 4.33\pt + "reverseturn" "\\reverseturn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt "turn" "\\turn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt "trill" "\\trill" -3.25\pt 3.25\pt 0.00\pt 7.31\pt "upedalheel" "\\upedalheel" -1.62\pt 1.62\pt -1.62\pt 2.17\pt diff --git a/init/feta16.ly b/init/feta16.ly index 0521352920..bd8655ac9f 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -52,6 +52,7 @@ "stopped" "\\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt "upbow" "\\upbow" -2.60\pt 2.60\pt 0.00\pt 8.32\pt "downbow" "\\downbow" -3.00\pt 3.00\pt 0.00\pt 5.33\pt + "reverseturn" "\\reverseturn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt "turn" "\\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt "trill" "\\trill" -4.00\pt 4.00\pt 0.00\pt 9.00\pt "upedalheel" "\\upedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt diff --git a/init/feta19.ly b/init/feta19.ly index da3fb72d61..a6d822225e 100644 --- a/init/feta19.ly +++ b/init/feta19.ly @@ -52,6 +52,7 @@ "stopped" "\\plusstop" -2.61\pt 2.61\pt -2.61\pt 2.61\pt "upbow" "\\upbow" -3.09\pt 3.09\pt 0.00\pt 9.88\pt "downbow" "\\downbow" -3.56\pt 3.56\pt 0.00\pt 6.33\pt + "reverseturn" "\\reverseturn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt "turn" "\\turn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt "trill" "\\trill" -4.75\pt 4.75\pt 0.00\pt 10.69\pt "upedalheel" "\\upedalheel" -2.38\pt 2.38\pt -2.38\pt 3.17\pt diff --git a/init/feta20.ly b/init/feta20.ly index 80eab9310b..ca0bac6deb 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -52,6 +52,7 @@ "stopped" "\\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt "upbow" "\\upbow" -3.25\pt 3.25\pt 0.00\pt 10.40\pt "downbow" "\\downbow" -3.75\pt 3.75\pt 0.00\pt 6.67\pt + "reverseturn" "\\reverseturn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt "turn" "\\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt "trill" "\\trill" -5.00\pt 5.00\pt 0.00\pt 11.25\pt "upedalheel" "\\upedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt diff --git a/init/feta23.ly b/init/feta23.ly index 7cbe8810b5..37036963f7 100644 --- a/init/feta23.ly +++ b/init/feta23.ly @@ -52,6 +52,7 @@ "stopped" "\\plusstop" -3.09\pt 3.09\pt -3.09\pt 3.09\pt "upbow" "\\upbow" -3.66\pt 3.66\pt 0.00\pt 11.70\pt "downbow" "\\downbow" -4.22\pt 4.22\pt 0.00\pt 7.50\pt + "reverseturn" "\\reverseturn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt "turn" "\\turn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt "trill" "\\trill" -5.62\pt 5.62\pt 0.00\pt 12.66\pt "upedalheel" "\\upedalheel" -2.81\pt 2.81\pt -2.81\pt 3.75\pt diff --git a/init/feta26.ly b/init/feta26.ly index 79595c1a1a..6afbde925b 100644 --- a/init/feta26.ly +++ b/init/feta26.ly @@ -52,6 +52,7 @@ "stopped" "\\plusstop" -3.58\pt 3.58\pt -3.58\pt 3.58\pt "upbow" "\\upbow" -4.23\pt 4.23\pt 0.00\pt 13.52\pt "downbow" "\\downbow" -4.88\pt 4.88\pt 0.00\pt 8.67\pt + "reverseturn" "\\reverseturn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt "turn" "\\turn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt "trill" "\\trill" -6.50\pt 6.50\pt 0.00\pt 14.62\pt "upedalheel" "\\upedalheel" -3.25\pt 3.25\pt -3.25\pt 4.33\pt diff --git a/init/script.ly b/init/script.ly index 951327232c..d032f44a8b 100644 --- a/init/script.ly +++ b/init/script.ly @@ -20,6 +20,7 @@ rtoe = \script { "dpedaltoe" 0 0 1 0 0 } turn = \script { "turn" 0 0 1 0 0 } open = \script { "open" 0 0 1 0 0 } flageolet = \script { "flageolet" 0 0 1 0 0 } +reverseturn = \script { "reverseturn" 0 0 1 0 0 } % could we do without this bloat? diff --git a/input/font-body.ly b/input/font-body.ly index 5ed8e12545..19e7078057 100644 --- a/input/font-body.ly +++ b/input/font-body.ly @@ -12,7 +12,7 @@ FontBody= \melodic{ c4 g c' a' \bar ":|"; a\ppp-\upbow a\pp-\downbow a\p^\turn a\mp^\fermata | a\mf_\fermata a\f-\stopped a\ff-\open a\fff^\trill| - a\fp a4.\sf a4.\sfz | % a\fz a\rf + a\fp-\reverseturn a4.\sf a4.\sfz | % a\fz a\rf [c8-\prall c-\mordent] [a'-\prallmordent a'-\prallprall] [c-\upprall a'-\downprall] [a' c] | [c \< d e f] [as' ges' f' e'] @@ -38,25 +38,6 @@ FontBody= \melodic{ a'^\flageolet \textstyle "roman"; -%{ % default abbreviations - c4 c4: c4:32 c4: c4 c2. - 'a1 - 'a1:32 - 'c4:8 c': 'c4:16 c': -% [ 'c8:16 'c 'c 'c ] [ a a a a ] -% [ 'c 'f 'b e ] -% [ 'c16:32 'c 'c 'c ] [ a16:32 a a a ] -%% % there's still some hairy beam bugfixing todo -%% [ c'8:16 g d 'a ] -%% [ c'16:32 g d 'a ] -%% [ 'c8:32 'f 'b e ] - [:32 c16 e] - [:32 c16 e] - [:16 c8 e] - [:16 e4 g] - [:16 e2 g] - [:16 e1 g] -%} \meter 1/2; a2 | \meter 3/2; < a1. { s4 \ppp \< s4 \! s4 \fff s4 \> s4 \! s4\ppp} > diff --git a/input/font26.ly b/input/font26.ly index 535383d46e..e811da1d99 100644 --- a/input/font26.ly +++ b/input/font26.ly @@ -7,8 +7,9 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\include "paper26.ly"; +\include "paper26.ly" \include "font-body.ly" + \score{ \FontBody \paper{ diff --git a/lily/stem.cc b/lily/stem.cc index 41175bdb5f..25fa1c13ff 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -307,12 +307,15 @@ Real Stem::note_delta_f () const { Real r=0; - if (head_l_arr_.size() && stem_xdir_ != CENTER) + if (head_l_arr_.size()) { Interval head_wid(0, head_l_arr_[0]->width ().length ()); Real rule_thick(paper ()->rule_thickness ()); Interval stem_wid(-rule_thick/2, rule_thick/2); - r = head_wid[stem_xdir_] - stem_wid[stem_xdir_]; + if (stem_xdir_ == CENTER) + r = head_wid.center (); + else + r = head_wid[stem_xdir_] - stem_wid[stem_xdir_]; } return r; } diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 56c36f18a3..8b28f2a47b 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -281,7 +281,8 @@ fet_endchar; % % Inspired by a computer-set version of Auf dem Strom by Baerenreiter. % -fet_beginchar("Turn","turn","turn") + +def draw_turn = save thin, thick, ball_diam, darkness; save wd, ht, thick_nibangle, ball_nib_thick; save turndir; @@ -291,7 +292,7 @@ fet_beginchar("Turn","turn","turn") ht# = 18/17 interline#; darkness = 1.20 stafflinethickness; - set_char_box(wd#/2, wd#/2, ht#/2, ht#/2); + set_char_box(wd#/2, wd#/2, ht#/2, ht#/2); thick_nibangle = 60; thick = 3 darkness; @@ -317,7 +318,6 @@ fet_beginchar("Turn","turn","turn") swoosh := z1l{curl 0} .. z2l .. z3l{up} .. {left}z4l -- z4r .. z3r{down} .. z2r{left} ; fill swoosh .. (swoosh scaled -1) .. cycle; - penlabels(2,3,4); x5r = x4; y5r = y4l - ball_diam /2; @@ -331,8 +331,21 @@ fet_beginchar("Turn","turn","turn") fill ploop scaled -1; +enddef; + +fet_beginchar("Reverse turn","reverseturn","reverseturn") + draw_turn; + currentpicture := currentpicture yscaled -1; penlabels(5,6,7); - + penlabels(2,3,4); +fet_endchar; + + +fet_beginchar("Turn","turn","turn") + draw_turn; + + penlabels(5,6,7); + penlabels(2,3,4); fet_endchar; diff --git a/tex/feta11.tex b/tex/feta11.tex index 85b527d241..000928bb16 100644 --- a/tex/feta11.tex +++ b/tex/feta11.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} % flags -\fetdef\eighthflag{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} % clefs -\fetdef\altoclef{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} diff --git a/tex/feta13.tex b/tex/feta13.tex index 36ddfd16bb..b6243d57c0 100644 --- a/tex/feta13.tex +++ b/tex/feta13.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} % flags -\fetdef\eighthflag{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} % clefs -\fetdef\altoclef{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} diff --git a/tex/feta16.tex b/tex/feta16.tex index 75ec2c0d0d..7eda188ab9 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} % flags -\fetdef\eighthflag{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} % clefs -\fetdef\altoclef{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} diff --git a/tex/feta19.tex b/tex/feta19.tex index 9b2e912425..a98b36dff0 100644 --- a/tex/feta19.tex +++ b/tex/feta19.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} % flags -\fetdef\eighthflag{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} % clefs -\fetdef\altoclef{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} diff --git a/tex/feta20.tex b/tex/feta20.tex index dd4c4c5340..973c4a946a 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} % flags -\fetdef\eighthflag{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} % clefs -\fetdef\altoclef{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} diff --git a/tex/feta23.tex b/tex/feta23.tex index 38b341eb46..56e72d5e5e 100644 --- a/tex/feta23.tex +++ b/tex/feta23.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} % flags -\fetdef\eighthflag{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} % clefs -\fetdef\altoclef{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} diff --git a/tex/feta26.tex b/tex/feta26.tex index c51172933a..1090ffaf6f 100644 --- a/tex/feta26.tex +++ b/tex/feta26.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} % flags -\fetdef\eighthflag{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} % clefs -\fetdef\altoclef{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} -- 2.39.5