From 386ea15db743c9dd4922ac43847045d2c9e2fab8 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:50:29 +0000
Subject: [PATCH] lilypond-1.1.49
---
NEWS | 29 +++++-
VERSION | 2 +-
input/opus-130.ly | 2 +-
input/test/font-body.ly | 6 +-
input/test/test-lyrics.ly | 8 +-
input/twinkle-pop.ly | 4 +-
input/twinkle.ly | 8 +-
lily/local-key-engraver.cc | 6 +-
lily/lookup.cc | 99 +++++++------------
mutopia/Coriolan/coriolan.ly | 4 +-
mutopia/F.Schubert/standchen.ly | 6 +-
.../J.S.Bach/Petites-Preludes/preludes-1.ly | 6 +-
.../J.S.Bach/Petites-Preludes/preludes-2.ly | 6 +-
.../J.S.Bach/Petites-Preludes/preludes-4.ly | 26 ++---
.../J.S.Bach/Petites-Preludes/preludes-5.ly | 12 +--
.../J.S.Bach/Petites-Preludes/preludes-6.ly | 8 +-
mutopia/J.S.Bach/violino-i.ly | 6 +-
mutopia/L.Mozart/sinfonia.ly | 4 +-
mutopia/N.W.Gade/global.ly | 2 +-
mutopia/N.W.Gade/parts.ly | 11 +--
mutopia/N.W.Gade/score.ly | 4 +-
mutopia/los-toros-oboe.ly | 40 ++++----
scm/lily.scm | 4 +-
scripts/convert-mudela.py | 14 ++-
24 files changed, 166 insertions(+), 151 deletions(-)
diff --git a/NEWS b/NEWS
index 1b90a27d70..2eedaf8bb1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+pl 48.hwn1
+ - \property hshift -> \property horizontalNoteShift (mudela 1.0.21)
+ - cleaned up collision. \property hshift = 2 now supported.
+ - Spacing:
+ * bf: don't divide strength by distance if distance == 0.0
+ * cleaned up Spacing_spanner
+ * simplistic optical illusion spacing for opposite stems.
+ - don't use Protected_scm for Score_element::element_property_alist_
+ - some scsii fixes.
+ - Lookup cleanups; junked Lookup::paper_l_
+ - abc-2-ly: tuplets, guitar chords., chords,
+
+pl 48.mb2
+ - bf: correct accidentals after tied over note.
+
+pl 48.mb1
+ - bf, lookup.cc: Count '{' also directly after a TeX macro
+ - bf: textstyle->textStyle in all examples.
+
+pl 48.jcn1
+ - bd: interstaff slurs at line break
+
+pl 48.uu1
+ - add a WX field to AFM output.
+ - add space before ; in AFM output
+
+*********
pl 47.jcn1
- bf: interstaff slurs (urg: more segfaults in scm_gc_mark ())
@@ -267,7 +294,7 @@ pl 37.script2
* G_script_column
* G_script_column_engraver
- pl 37.script1
+pl 37.script1
- major Script rehack:
* G_stem_staff_side_item
* G_script
diff --git a/VERSION b/VERSION
index b8326958da..5364f24d9a 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=1
-PATCH_LEVEL=48
+PATCH_LEVEL=49
MY_PATCH_LEVEL=
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff --git a/input/opus-130.ly b/input/opus-130.ly
index 4b43254c49..06ba443e75 100644
--- a/input/opus-130.ly
+++ b/input/opus-130.ly
@@ -11,7 +11,7 @@ copyright = "public domain";
% \version "1.0.16";
tempi = \notes {
- \property Voice.textstyle = "large"
+ \property Voice.textStyle = "large"
s8^"Allegro assai"
}
diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 7e2b30aa53..ad8d70d77c 100644
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,4 +1,4 @@
-\version "1.0.20";
+\version "1.0.21";
FontBody= \notes\transpose c''{
\bar "|:";
@@ -30,7 +30,7 @@ FontBody= \notes\transpose c''{
\transpose c'{
\time 4/4;
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
\property Voice . noteHeadStyle = "diamond"
c1^"1" d2^"2" e4^"3"
\property Voice . noteHeadStyle = "cross"
@@ -43,7 +43,7 @@ FontBody= \notes\transpose c''{
a^"0"_"9"
a'^\flageolet
- \property Voice . textstyle = "roman"
+ \property Voice . textStyle = "roman"
\time 1/2; a2 |
\time 3/2; < a1.
{ s4 \ppp \< s4 \! s4 \fff s4 \> s4 \! s4\ppp} >
diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly
index 8f0294019b..f0cc24574e 100644
--- a/input/test/test-lyrics.ly
+++ b/input/test/test-lyrics.ly
@@ -1,7 +1,7 @@
-\version "1.0.20";
+\version "1.0.21";
$somewhat_long = \lyrics{
- \property Lyrics . textstyle = "roman"
+ \property Lyrics . textStyle = "roman"
AaaaaaA2
BbbbbbB2
CcccccC2
@@ -11,7 +11,7 @@ $somewhat_long = \lyrics{
}
$rather_long = \lyrics{
- \property Lyrics . textstyle = "roman"
+ \property Lyrics . textStyle = "roman"
LLLLoooonggggg2
Syyllllaaabbble2
LLLLoooonggggg2
@@ -21,7 +21,7 @@ $rather_long = \lyrics{
}
$quite_long = \lyrics{
- \property Lyrics . textstyle = "roman"
+ \property Lyrics . textStyle = "roman"
LLLLLLLLLooooongggggggg2
Syyyyyyyyyyyyylllllllaaaaaabbble2
LLLLLLLLLooooongggggggg2
diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index b9c21ed950..c7fb240f10 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -11,7 +11,7 @@ copyright = "public domain";
Tested Features lyrics and chords
%}
-\version "1.0.20";
+\version "1.0.21";
melodie = \notes\relative c'' {
\clef "violin";
@@ -38,7 +38,7 @@ acc = \chords {
}
text = \lyrics{
- \property Lyrics . textstyle = "italic"
+ \property Lyrics . textStyle = "italic"
Ah!4 vous dir- ai_- je ma man2
Ce4 qui cau- se mon tour- ment2
diff --git a/input/twinkle.ly b/input/twinkle.ly
index 5a10ae11f7..b791a6d665 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -19,7 +19,7 @@ traditional song in various languages.
Tested Features: lyrics, interleaving lyrics and staffs, repeats
%}
-\version "1.0.20";
+\version "1.0.21";
melody = \notes \relative c'' {
\clef violin;
@@ -76,8 +76,8 @@ hegedraagjetekst = \lyrics{
}
texte = \lyrics{
- \property Lyrics . textstyle" = "italic"
-% \property Lyrics . textstyle" = "roman"
+ \property Lyrics . textStyle" = "italic"
+% \property Lyrics . textStyle" = "roman"
Ah!4 vous dir- ai_- je ma- man2
Ce4 qui cau- se mon tour- ment2
Pa-4 pa veut que je rai- son- ne
@@ -87,7 +87,7 @@ texte = \lyrics{
}
texti = \lyrics{
- \property "Lyrics"."textstyle" = "roman"
+ \property "Lyrics"."textStyle" = "roman"
Twin-4 kle, twin- kle, lit- tle star,2
How4 I won- der what you are.2
Up4 a- bove the world so high,2
diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index 8506350e39..22bb2d1540 100644
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -58,7 +58,11 @@ Local_key_engraver::process_acknowledged ()
if (tied_l_arr_.find_l (support_l) &&
!note_l->forceacc_b_)
- continue;
+ {
+ if (!forget)
+ local_key_.set (note_l->pitch_);
+ continue;
+ }
if (!note_l->forceacc_b_
&& local_key_.different_acc (note_l->pitch_))
diff --git a/lily/lookup.cc b/lily/lookup.cc
index 11a6d49e94..b28cc21c59 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -31,14 +31,12 @@
Lookup::Lookup ()
{
- paper_l_ = 0;
afm_l_ = 0;
}
Lookup::Lookup (Lookup const& s)
{
font_name_ = s.font_name_;
- paper_l_ = 0;
afm_l_ = 0;
}
@@ -137,14 +135,14 @@ Lookup::notehead (int j, String type) const
}
Molecule
-Lookup::simple_bar (String type, Real h) const
+Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const
{
SCM thick = ly_symbol ("barthick_" + type);
Real w = 0.0;
- if (paper_l_->scope_p_->elem_b (thick))
+ if (paper_l->scope_p_->elem_b (thick))
{
- w = paper_l_->get_realvar (thick);
+ w = paper_l->get_realvar (thick);
}
else
{
@@ -156,18 +154,19 @@ Lookup::simple_bar (String type, Real h) const
Molecule
-Lookup::bar (String str, Real h) const
+Lookup::bar (String str, Real h, Paper_def *paper_l) const
{
if (str == "[")
return staff_bracket (h);
else if (str == "{")
return staff_brace (h);
- Real kern = paper_l_->get_var ("bar_kern");
- Real thinkern = paper_l_->get_var ("bar_thinkern");
- Molecule thin = simple_bar ("thin", h);
- Molecule thick = simple_bar ("thick", h);
- Molecule colon = afm_find ("dots-repeatcolon");
+ Real kern = paper_l->get_var ("bar_kern");
+ Real thinkern = paper_l->get_var ("bar_thinkern");
+
+ Molecule thin = simple_bar ("thin", h, paper_l);
+ Molecule thick = simple_bar ("thick", h, paper_l);
+ Molecule colon = afm_find ("dots-repeatcolon", paper_l);
Molecule m;
@@ -177,7 +176,7 @@ Lookup::bar (String str, Real h) const
}
if (str == "scorepostbreak")
{
- return simple_bar ("score", h);
+ return simple_bar ("score", h, paper_l);
}
else if (str == "|")
{
@@ -325,7 +324,7 @@ Lookup::rest (int j, bool o, String style) const
Molecule
-Lookup::special_time_signature (String s, int n, int d) const
+Lookup::special_time_signature (String s, int n, int d, Paper_def*pap) const
{
// First guess: s contains only the signature style
String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
@@ -340,7 +339,7 @@ Lookup::special_time_signature (String s, int n, int d) const
return m;
// Resort to default layout with numbers
- return time_signature (n,d);
+ return time_signature (n,d,pap);
}
Molecule
@@ -360,20 +359,6 @@ Lookup::filledbox (Box b ) const
return m;
}
-Molecule
-Lookup::stem (Real y1, Real y2) const
-{
- if (y1 > y2)
- {
- Real t = y1;
- y1 = y2;
- y2 = t;
- }
- Real stem_width = paper_l_->get_var ("stemthickness");
- return filledbox (Box (Interval (-stem_width/2,stem_width/2),
- Interval (y1, y2)));
-}
-
/**
@@ -387,22 +372,22 @@ static Real mag_steps[] = {1, 1, 1.200, 1.440, 1.7280, 2.074, 2.488};
*/
Molecule
-Lookup::text (String style, String text) const
+Lookup::text (String style, String text, Paper_def *paper_l) const
{
Molecule m;
if (style.empty_b ())
style = "roman";
int font_mag = 1;
- Real font_h = paper_l_->get_var ("font_normal");
- if (paper_l_->scope_p_->elem_b ("font_" + style))
+ Real font_h = paper_l->get_var ("font_normal");
+ if (paper_l->scope_p_->elem_b ("font_" + style))
{
- font_h = paper_l_->get_var ("font_" + style);
+ font_h = paper_l->get_var ("font_" + style);
}
- if (paper_l_->scope_p_->elem_b ("magnification_" + style))
+ if (paper_l->scope_p_->elem_b ("magnification_" + style))
{
- font_mag = (int)paper_l_->get_var ("magnification_" + style);
+ font_mag = (int)paper_l->get_var ("magnification_" + style);
}
/*
@@ -425,9 +410,12 @@ Lookup::text (String style, String text) const
for (int i = 0; i < text.length_i (); i++)
{
- if (text[i]=='\\')
- for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
- ;
+ if (text[i]=='\\')
+ {
+ for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
+ ;
+ i--; // Compensate for the increment in the outer loop!
+ }
else
{
if (text[i] == '{')
@@ -480,11 +468,11 @@ Lookup::text (String style, String text) const
Molecule
-Lookup::time_signature (int num, int den) const
+Lookup::time_signature (int num, int den, Paper_def *paper_l) const
{
String sty = "number";
- Molecule n (text (sty, to_str (num)));
- Molecule d (text (sty, to_str (den)));
+ Molecule n (text (sty, to_str (num), paper_l));
+ Molecule d (text (sty, to_str (den), paper_l));
n.align_to (X_AXIS, CENTER);
d.align_to (X_AXIS, CENTER);
Molecule m;
@@ -518,10 +506,9 @@ Lookup::staff_brace (Real y) const
}
Molecule
-Lookup::hairpin (Real width, bool decresc, bool continued) const
+Lookup::hairpin (Real width, Real height, bool decresc, bool continued) const
{
Molecule m;
- Real height = paper_l_->staffheight_f () / 6;
String hairpin = String (decresc ? "de" : "") + "crescendo";
Atom at (gh_list (ly_symbol (hairpin),
@@ -537,22 +524,15 @@ Lookup::hairpin (Real width, bool decresc, bool continued) const
}
Molecule
-Lookup::plet (Real dy , Real dx, Direction dir) const
+Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real interline_f, Direction dir) const
{
Molecule m;
- SCM thick = tuplet_thick_scm_sym;
- Real t = 0.1 PT;
- if (paper_l_->scope_p_->elem_b (thick))
- {
- t = paper_l_->get_realvar (thick);
- }
- Real interline_f = paper_l_->get_realvar (interline_scm_sym);
Atom at (gh_list(tuplet_scm_sym,
gh_double2scm (interline_f),
gh_double2scm (dx),
gh_double2scm (dy),
- gh_double2scm (t),
+ gh_double2scm (thick),
gh_int2scm (dir),
SCM_UNDEFINED));
m.add_atom (&at);
@@ -602,23 +582,16 @@ Lookup::staff_bracket (Real y) const
}
Molecule
-Lookup::volta (Real w, bool last_b) const
+Lookup::volta (Real w, Real thick, Real interline_f, bool last_b) const
{
Molecule m;
- SCM thick = volta_thick_scm_sym;
- Real t = 0.1 PT;
- if (paper_l_->scope_p_->elem_b (thick))
- {
- t = paper_l_->get_realvar (thick);
- }
+
Atom at (gh_list (volta_scm_sym,
gh_double2scm (w),
- gh_double2scm (t),
+ gh_double2scm (thick),
gh_int2scm (last_b),
SCM_UNDEFINED));
- Real interline_f = paper_l_->get_realvar (interline_scm_sym);
-
m.dim_[Y_AXIS] = Interval (-interline_f, interline_f);
m.dim_[X_AXIS] = Interval (0, w);
@@ -627,12 +600,12 @@ Lookup::volta (Real w, bool last_b) const
}
Molecule
-Lookup::accordion (SCM s) const
+Lookup::accordion (SCM s, Real interline_f) const
{
Molecule m;
String sym = ly_scm2string(SCM_CAR(s));
String reg = ly_scm2string(SCM_CAR(SCM_CDR(s)));
- Real interline_f = paper_l_->get_realvar(interline_scm_sym);
+
if (sym == "Discant")
{
Molecule r = afm_find("scripts-accDiscant");
diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index aaa82c488b..70a369b32b 100644
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -7,7 +7,7 @@ enteredby = "JCN";
copyright = "public domain";
}
-\version "1.0.20";
+\version "1.0.21";
\include "global.ly"
@@ -66,7 +66,7 @@ strijkers = \context StaffGroup = strijkers_group <
\score{
<
- \property Score . textstyle = "italic"
+ \property Score . textStyle = "italic"
\$legno
\$koper
diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly
index 8012f243ec..d76cc6f888 100644
--- a/mutopia/F.Schubert/standchen.ly
+++ b/mutopia/F.Schubert/standchen.ly
@@ -16,7 +16,7 @@ multiple \paper{}s in one \score
Note: Original key F.
%}
-\version "1.0.20";
+\version "1.0.21";
$vocal_verse1 = \notes\relative c''{
% ugh: treble/bass
@@ -260,7 +260,7 @@ $treble_through = \notes \relative c'{
< { a4.-> )f8 } { a4. f8 } > |
<e2 e'> r4 |
<es!2 es'! > r4 |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
<d2_"decresc." d'> r4 |
%75
<b2 b'> r4 |
@@ -271,7 +271,7 @@ $treble_through = \notes \relative c'{
<e4. g> [<e8-. g-.(> <e-. g-.> <e-. )g-.>] |
<f4. g> [<b,8-. g'-.(> <d-. g-.> <f-. )g-.>] |
%80
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
<e2._"dim." g> |
<g,2. e' g> |
<g2.-\fermata e' g> |
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
index 728f9e4ca8..ecb7306334 100644
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
@@ -12,12 +12,12 @@ enteredby = "jcn";
copyright = "public domain";
}
-\version "1.0.20";
+\version "1.0.21";
% upper = \context Staff \notes\relative c {
upper = \context Staff=upper \notes\relative c {
\context Voice=i
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
% rediculous dim...
% r16\p_"legato"\< g''-1( c-3 )e-5 r g,-1( c )e
r16\p\< g''-1( c-3 )e-5 r g,-1( c )e
@@ -88,7 +88,7 @@ upper = \context Staff=upper \notes\relative c {
% lower = \context Staff \notes\relative c{
lower = \context Staff=lower \notes\relative c{
\context Voice=i
- \property Voice . textstyle = "roman"
+ \property Voice . textStyle = "roman"
c4-5 e-3 g-\mordent^"(\\textsharp)" g,4 |
d'4-\mordent-5 f-3 a-\mordent^"(\\textsharp)" a,4 |
e'-5 e'-\mordent-1 a,-4 b-\upprall |
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
index dac1d147e2..d77cc32d9e 100644
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
@@ -10,10 +10,10 @@ enteredby = "jcn";
copyright = "public domain";
}
-\version "1.0.20";
+\version "1.0.21";
upper = \context Staff \notes\relative c{
\context Voice=i
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
r8\mf c'-1( e-2 g-4 e-2 c-1 bes'-5 g-3 |
)a-4\< c,-1( f-2 a-4 f c c'-5 a-3 |
)b-4 g-1( b-2 d-4 b-2 g f'-5 \!d-3 |
@@ -88,7 +88,7 @@ lower = \context Staff \notes\relative c{
g'-\mordent g, g'-\mordent g, |
g'8 g,-5( b-4 d-2 b-4 g-5 f'!-1 d-3 |
)e-2 c-4 e-2 g-1 e-3 c-5 c' e,-4 |
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
f1^"3\\_1" ~ |
f8 d-3 e-2 c-4 g'4-1 g,^"5\\_2" |
<c1 c,1>
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
index cfb68c0695..e40697f63e 100644
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -8,17 +8,17 @@ composer = "Johann Sebastian Bach (1685-1750)";
enteredby = "jcn";
copyright = "public domain";
}
-\version "1.0.20";
+\version "1.0.21";
one = \context Staff \notes\relative c {
\context Voice=i
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
% r16\p_"legato"
r16\p
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
d'-1( fis-3 d-1 a'-2 b-3 cis-4 a-3
d-3 cis-2 d-1 e-2 d-1 fis-3 e-2 d-1 |
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
\stemup
)cis4-2 fis-5 ~ fis8 fis-4 e4-3 ~ |
e16\< \stemboth a,16( cis a d-2 e fis d-1
@@ -30,13 +30,13 @@ one = \context Staff \notes\relative c {
<a4-5( e> <fis-4 d-2> < )g!16-5 d> fis-2 g-3 a-4
\stemboth
g-3 b a g |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
% fis_"dim." e fis-3 g fis-3 a-5 g fis
fis e fis-3 g fis-3 a-5 g fis
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
% e4-"2\\_5" ~ e16 e,( fis g |
e4 ~ e16 e,( fis g |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
% a-4_"dim." g-1 a b a-2 c-4 b a
a-4 g-1 a b a-2 c-4 b a
g-1 fis-2 g-3 a g-3 b a g |
@@ -44,13 +44,13 @@ one = \context Staff \notes\relative c {
)fis4\p
\skip 4*7; |
%10
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
% d'4.\mf cis8-"4\\_5" ~ cis b4-5 a8-"4\\_5" ~ |
d'4.\mf cis8 ~ cis b4-5 a8 ~ |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
% a g4-5 fis8-4 ~ fis16 fis-4-"dim." e-3 d-2
a g4-5 fis8-4 ~ fis16 fis-4 e-3 d-2
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
% e4-"3\\_5" ~ |
e4 ~ |
e16 e-5 d cis d4-5 ~ d16 d-5 cis b cis4-5 |
@@ -72,7 +72,7 @@ one = \context Staff \notes\relative c {
two = \context Staff \notes\relative c{
\context Voice=ii
\stemup
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
fis4-1( e8-2 a4 a4 gis8-2 |
) a8
\translator Staff=upper \stemdown
@@ -165,11 +165,11 @@ four = \context Staff \notes\relative c{
\skip 1*9;
\context Voice=iv
\stemup
- \property Voice.hshift = 1
+ \property Voice.horizontalNoteShift = 1
%10
a''2 fis |
d s |
-% \property Voice.hshift = 0
+% \property Voice.horizontalNoteShift = 0
\skip 1*2; |
s4
\translator Staff=lower \stemup
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
index 7306045676..420a85766d 100644
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -8,11 +8,11 @@ composer = "Johann Sebastian Bach (1685-1750)";
enteredby = "jcn";
copyright = "public domain";
}
-\version "1.0.20";
+\version "1.0.21";
upper = \context Staff \notes\relative c{
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
\context Voice=i
% d'8-1\p a'-5-"legato" f-3 d-1 a'-5 f-3 |
d'8-1\p a'-5 f-3 d-1 a'-5 f-3 |
@@ -30,10 +30,10 @@ upper = \context Staff \notes\relative c{
<
{
\stemup
- \property Voice . textstyle = "roman"
+ \property Voice . textStyle = "roman"
c4-\mordent^"(\\textsharp)"\p r r |
c4-\mordent^"(\\textsharp)" r r
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
}
\context Voice=ii { \stemdown a4 r r | a4 r r }
> |
@@ -128,9 +128,9 @@ lower = \context Staff \notes\relative c{
g!-5 es'-1 c-1 g-5 es'-1 c-1 |
fis,4-5 r r
d-4( ) fis d-5 |
- \property Voice . textstyle = "roman"
+ \property Voice . textStyle = "roman"
g4-\mordent^"(\\textsharp)" r r8 f!8 |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
e4-\prall r r |
f4-\mordent r r8 e |
d4 r8 f-1 e d |
diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index 2aec8613d0..f0259058a3 100644
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -8,7 +8,7 @@ composer = "Johann Sebastian Bach (1685-1750)";
enteredby = "jcn";
copyright = "public domain";
}
-\version "1.0.20";
+\version "1.0.21";
one = \context Staff \notes\relative c{
@@ -67,7 +67,7 @@ three = \context Staff \notes\relative c{
e8.-\mordent f16 d8.-\prall-4 c16-5 \stemboth )c4.-5 d8-4 |
\stemdown
e4 ~ e16 f-2( e-3 d-4 cis a b cis-3 d-4 e-3 f-2 d-4 |
- \property Voice . textstyle = "finger"
+ \property Voice . textStyle = "finger"
)bes!2-"5\\_4" a ~ |
a a |
d, cis'-5 |
@@ -82,10 +82,10 @@ four = \context Staff \notes\relative c{
d2-3 cis-4 |
\skip 1*3; |
%5
- \translator Staff=upper \stemup \property Voice.hshift = 1
+ \translator Staff=upper \stemup \property Voice.horizontalNoteShift = 1
a'4 gis-2 ~ gis16 gis-3 fis e
\skip 4*1;
- \translator Staff=lower \stemdown \property Voice.hshift = 0
+ \translator Staff=lower \stemdown \property Voice.horizontalNoteShift = 0
\stemup
b2-1 a-1 |
g a4. gis16 a |
diff --git a/mutopia/J.S.Bach/violino-i.ly b/mutopia/J.S.Bach/violino-i.ly
index 8634e194fa..940f740103 100644
--- a/mutopia/J.S.Bach/violino-i.ly
+++ b/mutopia/J.S.Bach/violino-i.ly
@@ -31,10 +31,10 @@ $violino_i = \notes\relative c'' {
$violino_i_staff = \context Staff = violino <
<
%urg
- % \notes\property Voice.textstyle = "large" s4^"Moderato"
- % \notes {s4. \property Voice.textstyle = "large" s4^"Moderato"}
+ % \notes\property Voice.textStyle = "large" s4^"Moderato"
+ % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"}
\$violino_i
>
\$global_i
>
-\version "1.0.20";
+\version "1.0.21";
diff --git a/mutopia/L.Mozart/sinfonia.ly b/mutopia/L.Mozart/sinfonia.ly
index 8637d416f4..7d78a101be 100644
--- a/mutopia/L.Mozart/sinfonia.ly
+++ b/mutopia/L.Mozart/sinfonia.ly
@@ -41,7 +41,7 @@ global = \notes{
}
tempi = \notes{
- \property Voice.textstyle = "large"
+ \property Voice.textStyle = "large"
s8^"Allegro"
}
@@ -383,4 +383,4 @@ bassocontinuo = \notes \relative c'{
\midi{ \tempo 4 = 100; }
}
-\version "1.0.20";
+\version "1.0.21";
diff --git a/mutopia/N.W.Gade/global.ly b/mutopia/N.W.Gade/global.ly
index f2de39bfbe..b679595ffc 100644
--- a/mutopia/N.W.Gade/global.ly
+++ b/mutopia/N.W.Gade/global.ly
@@ -17,7 +17,7 @@ global=\notes {
marks=\notes {
\time 3/4;
-\property Voice.textstyle = "Large"
+\property Voice.textStyle = "Large"
\skip 2.*31;
s2 s8 s^"\\Allegromoltovivace"
\time 2/4;
diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly
index 32616d92f0..beb95deccd 100644
--- a/mutopia/N.W.Gade/parts.ly
+++ b/mutopia/N.W.Gade/parts.ly
@@ -11,7 +11,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
% Process with 'ly2dvi -s parts.ly' to get the separate parts.
-\version "1.0.20";
+\version "1.0.21";
\include "global.ly"
\include "wood.ly"
@@ -29,11 +29,11 @@ my_paper = \paper {
markScriptPadding = "6.0";
barNumberScriptPadding = "11.0";
textScriptPadding = 5.0;
- textstyle = "italic";
+ textStyle = "italic";
textEmptyDimension = 1;
}
}
-%{
+
\score{
\context Staff <
\context Voice <
@@ -54,7 +54,7 @@ my_paper = \paper {
\tempo 4=120;
}
}
-%}
+
\score{
\context Staff <
\context Voice <
@@ -75,7 +75,7 @@ my_paper = \paper {
\tempo 4=120;
}
}
-%{
+
\score{
\context Voice <
\globalNoKey
@@ -325,4 +325,3 @@ my_paper = \paper {
\tempo 4=120;
}
}
-%}
\ No newline at end of file
diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly
index 64fa9c6fbe..878267faea 100644
--- a/mutopia/N.W.Gade/score.ly
+++ b/mutopia/N.W.Gade/score.ly
@@ -8,7 +8,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
"Statens Musikbibliotek, Stockholm, Sweden";
}
-\version "1.0.20";
+\version "1.0.21";
\include "global.ly"
\include "wood.ly"
@@ -133,7 +133,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
\translator { \StaffContext
\consists "Staff_margin_engraver";
marginScriptPadding = "15.0";
- textstyle = "italic";
+ textStyle = "italic";
textScriptPadding = 5.0;
textEmptyDimension = 1;
}
diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 6d52d4ccae..0c89debf8b 100644
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -8,7 +8,7 @@ enteredby = "jcn";
copyright = "public domain";
latexheaders= "headers";
}
-\version "1.0.20";
+\version "1.0.21";
@@ -17,16 +17,16 @@ latexheaders= "headers";
hoboonestart = \notes
\relative c'{
% ugh: cant copy: allegro/primo tempo
- \property Voice . textstyle = "large"
+ \property Voice . textStyle = "large"
[es''16-.^"Allegro" es-. es-. es-.] [es8-. d-.] |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
}
hobooneintro = \notes \relative c'{
-% \property Voice . textstyle = "roman"
+% \property Voice . textStyle = "roman"
% [es''16-.-"Allegro" es-. es-. es-.] [es8-. d-.] |
-% \property Voice . textstyle = "italic"
+% \property Voice . textStyle = "italic"
[f''8.-> es16(] [)d8 c-.] |
[bes16( c d es] [)d8 c-.] |
[bes-. as->~] [as16( g f g] |
@@ -94,18 +94,18 @@ hoboonemid = \notes \relative c'{
[d16-. d-. d-. d-.] [d8.-. es16->] |
[d16 d d d] [d8 es16-.] r16-\fermata^"court"^"tr\\`es" |
% Un peu plus lent.
- \property Voice . textstyle = "bold"
+ \property Voice . textStyle = "bold"
% ugh
-% d4(\<^"Un peu plus lent" \property Voice . textstyle = "italic _"tr\\`es \\'el\\'egant"
+% d4(\<^"Un peu plus lent" \property Voice . textStyle = "italic _"tr\\`es \\'el\\'egant"
% d4(\^"Un peu plus lent et \\'el\\'egant"<
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
d4(\<
[e8 \!fis8] |
% [)b-. a-.] [g16( fis e )d] |
- \property Voice . textstyle = "bold"
+ \property Voice . textStyle = "bold"
[)b-.^"Un peu plus lent et \\'el\\'egant" a-.] [g,,16( fis' e )d] |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
[d( c b\< c] [)\!fis'8-. e-.] |
d,,4-> ~ [d16 e( fis g] |
[a b\< d fis] [)\!a8-. g-.] |
@@ -141,9 +141,9 @@ hoboonemid = \notes \relative c'{
hoboonesecondstart = \notes \relative c'{
% ugh: cant copy: allegro/primo tempo
- \property Voice . textstyle = "large"
+ \property Voice . textStyle = "large"
[es''16-.\ff^"Tempo 1$^o$" es-. es-. es-.] [es8-. d-.] |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
}
@@ -182,7 +182,7 @@ hoboonelast = \notes \relative c'{
[bes'16-.\ff bes-. bes-. bes-.] [bes8-. ces16->] r16^"court"-\fermata |
% ugh: eight measures rest (ugh: r1 -> four beats...)
% eiht measures rest..
- \property Voice . textstyle = "bold"
+ \property Voice . textStyle = "bold"
% r2^"Un peu plus lent et \\'el\\'egant"
R2*8
% r4 r8\p bes |
@@ -190,7 +190,7 @@ hoboonelast = \notes \relative c'{
r8\p bes,, |
% g2->^"Un peu plus lent et \\'el\\'egant" ~ |
g2-> ~ |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
g8 r r c |
c2-> ~ |
c8 r r bes'\f |
@@ -220,9 +220,9 @@ hoboonelast = \notes \relative c'{
g8-. r f4-> ~ |
[f8 es-. ces8.-. as16-.] |
% `a deux
- \property Voice . textstyle = "large"
+ \property Voice . textStyle = "large"
[ces8.->^"Plus vite" bes16-.(] [a bes es d] |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
[)c!8.-> bes16] [a( bes es )d] |
[c->( bes es )d] [c->( bes es )d] |
% same measure
@@ -231,9 +231,9 @@ hoboonelast = \notes \relative c'{
[g )f d( es] [f g as a] |
[c )bes bes,( c] [d es f g] |
[as g f g] [as bes c d] |
- \property Voice . textstyle = "large"
+ \property Voice . textStyle = "large"
[)es-.^"Tempo 1$^o$" g,-. g-. g-.] [g8-. g-.] |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
bes4.-> g8-. |
gis2->( |
)as! |
@@ -248,9 +248,9 @@ hoboonelast = \notes \relative c'{
g4.-> g8-. |
es4.-> es8-. |
bes4.-> bes8-. |
- \property Voice . textstyle = "large"
+ \property Voice . textStyle = "large"
g'4.->^"Presto" g8-. |
- \property Voice . textstyle = "italic"
+ \property Voice . textStyle = "italic"
es4.-> es8-. |
[bes-. bes-. es-. g-.] |
[bes-. bes,-. es-. g-.] |
diff --git a/scm/lily.scm b/scm/lily.scm
index d5f9845de1..718515e4ff 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -106,9 +106,9 @@
(("Clef_item" "Span_bar") . (minimum_space 3.7))
(("Time_signature" "Span_bar") . (minimum_space 2.0))
(("Key_item" "Span_bar") . (minimum_space 2.5))
- (("Staff_bar" "Time_signature") . (minimum_space 1.0))
+ (("Staff_bar" "Time_signature") . (minimum_space 2.0))
(("Time_signature" "begin-of-note") . (extra_space 1.0)) ; Huh? see twinkle.ly
- (("Key_item" "begin-of-note") . (extra_space 3.0))
+ (("Key_item" "begin-of-note") . (extra_space 2.5))
(("Staff_bar" "begin-of-note") . (extra_space 1.0))
(("Clef_item" "begin-of-note") . (minimum_space 5.0))
)
diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index ea0ed1e921..4909d29dc7 100644
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -308,7 +308,7 @@ if 1:
return newlines
conversions.append ((1,0,18), conv,
- '\\repeat NUM Music Alternative -> \repeat FOLDSTR Music Alternative')
+ '\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative')
if 1:
def conv(lines):
@@ -338,6 +338,18 @@ if 1:
'{,tie,slur}ydirection -> {v,tieV,slurV}erticalDirection')
+if 1:
+ def conv(lines):
+ newlines =[]
+ for x in lines:
+ x = re.sub ('hshift','horizontalNoteShift', x)
+ newlines.append (x)
+ return newlines
+
+ conversions.append ((1,0,21), conv,
+ 'hshift -> horizontalNoteShift')
+
+
############################
--
2.39.5