lilypond-1.3.134

diff --git a/Documentation/user/tricks.itely b/Documentation/user/tricks.itely
index 9e4ded359c4e01214eeaac169fac795b3b869c47..8a7e3a539d4bf923851010afe2d30b1e579d035b 100644 (file)
--- a/Documentation/user/tricks.itely
+++ b/Documentation/user/tricks.itely
@@ -252,7 +252,7 @@ Metrome hack...
 
 \score {
   \notes\relative c'' {
-    a1^#`(rows ,dotted-eight-note " = 64")
+    a1^#`((rows (font-relative-size . -1)) ,dotted-eight-note " = 64")
   }
   \paper {
     linewidth = -1.;
@@ -271,6 +271,11 @@ Metrome hack...
 @node Apply hacking
 @section Apply hacking
 
+[Add Parenthesed note head example?]
+
+[Add Smart transpose example?]
+
+
 @lilypond[verbatim]
 music = \notes { c'4 d'4( e'4 f'4 }
 

diff --git a/input/tricks/metronome.ly b/input/tricks/metronome.ly
index 1b5bacfa58b5038555f9e7fb2e3b76b4be6fc0e9..859f09f4c54961bd4900528396acaa1bc39844a6 100644 (file)
--- a/input/tricks/metronome.ly
+++ b/input/tricks/metronome.ly
@@ -18,7 +18,7 @@
 
 \score {
   \notes\relative c'' {
-    a1^#`(rows ,dotted-eight-note " = 64")
+    a1^#`((rows (font-relative-size . -1)) ,dotted-eight-note " = 64")
   }
   \paper {
     linewidth = -1.;

diff --git a/make/ly.make b/make/ly.make
index e41d3bd055ad91221a779e94c4ec265d09696fe2..f3a595d95d9a726fd2b22e6b1088c542dd92812f 100644 (file)
--- a/make/ly.make
+++ b/make/ly.make
@@ -70,7 +70,7 @@ $(outdir)/%-book.ps: $(outdir)/%.ps
 #
 # Also clean hand-compiled stuff in cwd
 #
-localclean: local-auto-gen-clean local-letter-clean
+localclean: local-auto-gen-clean
 
 # Compose string from two parts: must not remove myself.
 auto-gen-tag=Generated
@@ -80,5 +80,3 @@ local-auto-gen-clean:
        rm -f `grep -l '$(auto-gen-tag)' *`
        rm -f *.dvi *.png
 
-local-letter-clean:
-       rm -f $(outdir)-letter/*

diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly
index d78dae7a978bdc1bc58bd5c003ec0ff58dfbb557..a676500b7ff9b1460ffbffb403fa14fc75c905c5 100644 (file)
--- a/mutopia/Coriolan/bassi.ly
+++ b/mutopia/Coriolan/bassi.ly
@@ -21,7 +21,7 @@ bassiGroup =  \context PianoStaff = bassi_group \notes <
                \property Staff.midiInstrument = #"contrabass"
                \property Staff.instrument = #"Contrabasso"
                \property Staff.instr = #"Cb."
-%              \property Staff.transposing = #-12
+               \property Staff.transposing = #-12
                \clef "bass"; 
                %\property Staff.clefGlyph = #"clefs-F"
                %\property Staff.clefPosition = #2

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index 76a551b9e20acac65f5a128b49c84ded3cb274d7..73bd1d222eb45f8f308c8201a2ce1c129f2f137d 100644 (file)
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -64,4 +64,3 @@ archiGroup =  \context StaffGroup = archi_group <
        \include "coriolan-paper.ly"
        \include "coriolan-midi.ly"
 }
-

diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly
index a365e6653aa43c98afa85a94bbf210da769b372c..acfdc4ed95a798ebd7519bfd48dc66981a6020e6 100644 (file)
--- a/mutopia/J.S.Bach/Duette/global-i.ly
+++ b/mutopia/J.S.Bach/Duette/global-i.ly
@@ -1,4 +1,4 @@
-\version "1.3.117";
+\version "1.3.122";
 
 globalI =  \notes{
        \time 12/8;

diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly
index 056f9a2dde0f323a061b1a4f5024d8b5688d26d8..4bae8e8b0189c891e5f5b96e75ec6b7cf0016cd5 100644 (file)
--- a/mutopia/J.S.Bach/Duette/global-ii.ly
+++ b/mutopia/J.S.Bach/Duette/global-ii.ly
@@ -1,7 +1,7 @@
-\version "1.3.117";
+\version "1.3.122";
 
 globalIi =  \notes{
        \time 4/4;
-       \property Staff.timeSignatureStyle = "C2/2"
+       \property Staff.TimeSignature \override #'style = #'C2/2
        \key a\minor;
 }

diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly
index e775ffc451834a64f7fdbf34609eb3675c5d6987..713333dc537546f66468489006c156f6f1cffe91 100644 (file)
--- a/mutopia/J.S.Bach/Duette/viola-i.ly
+++ b/mutopia/J.S.Bach/Duette/viola-i.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 \include "global-i.ly"
 \include "violoncello-i.ly";

diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly
index e8f02155cc72b1c1bd12d5ca28ab5b266524b185..502a52cafb6e7e3e5460e87c57a567eda9cd7efb 100644 (file)
--- a/mutopia/J.S.Bach/Duette/viola-ii.ly
+++ b/mutopia/J.S.Bach/Duette/viola-ii.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 \include "global-ii.ly"
 \include "violoncello-ii.ly";

diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly
index acec5f0502a67dbf1cbbbec73a580c9c5ea4243c..843ff1af78f10fe01aa3b8f1b0e3d1f67c6ccc35 100644 (file)
--- a/mutopia/J.S.Bach/Duette/viola-part.ly
+++ b/mutopia/J.S.Bach/Duette/viola-part.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 % {
 

diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly
index 0f62881ea3223fdf1e131ce969def0eeee7dbcd2..9ea395694f216c8dfe80d7212c186bebf0d3e62e 100644 (file)
--- a/mutopia/J.S.Bach/Duette/violino-ii.ly
+++ b/mutopia/J.S.Bach/Duette/violino-ii.ly
@@ -8,7 +8,7 @@ enteredby =     "jcn";
 copyright =    "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 violinoIi =  \notes\relative c''{
   R1*8 |
@@ -68,7 +68,7 @@ violinoIi =  \notes\relative c''{
   %<a2 b, d4><gis\prall b,4 d>| checkme
   \context Staff<
     \context Voice { 
-      \property Voice.verticalDirection=1
+      \stemUp\slurUp\tieUp
       <a2 b,>gis\prall|a8 g f4~f8 e(d)cis|
 %105
       d c bes4~bes8 a(gis)fis|gis4 e <e' a,><f a,>|
@@ -77,7 +77,7 @@ violinoIi =  \notes\relative c''{
       a1|
     }
     \context Voice=x { 
-      \property Voice.verticalDirection=-1
+      \stemDown\slurDown\tieDown
       d,4 s<d b'>s|<a2 d> s2|
 %105
       <d g,> s2|s1|
@@ -93,12 +93,12 @@ violinoIi =  \notes\relative c''{
 
 violinoIiStaff =  \context Staff = violino <
   %urg
-  % \notes\property Voice.textStyle = "large" s4^"Moderato"
-  % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"}
+  % \notes\property Voice.TextScript \set #'font-style = #'large s4^"Moderato"
+  % \notes {s4. \property Voice.TextScript \set #'font-style = #'large s4^"Moderato"}
   % urg, timidity violino patches broken?
   %\property Staff.instrument = "violin"
   \property Staff.instrument = "viola"
   \violinoIi
   \globalIi
 >
-\version "1.3.117";
+\version "1.3.122";

diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly
index 4f535e7fd85e030046f4b362072cf7ee20aa5f10..25b0782c3d7c57db5ea41c5bb098eb10a2ac2dca 100644 (file)
--- a/mutopia/J.S.Bach/Duette/violino-part.ly
+++ b/mutopia/J.S.Bach/Duette/violino-part.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 % {
 

diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly
index 222fb716e7a5e2410437f4e2c8f5bcc385e0a507..7bd4401da92084ce9bcd19330f220a070178ba7b 100644 (file)
--- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly
+++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 % {
 \include "violino-i.ly";

diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly
index ac3bbd788ac6694061d005f66317ec171146eabd..f0a6cef0800a204b5adcec76ed12b53fa3af21e8 100644 (file)
--- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly
+++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly
@@ -8,7 +8,7 @@ enteredby =     "jcn";
 copyright =    "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 violoncelloIi =  \notes\relative c{
   r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis|
@@ -52,7 +52,8 @@ violoncelloIi =  \notes\relative c{
 %75
   e dis8 cis dis2\prall|e4 b' e2~|e dis\prall|e r4 d|cis bes(a\prall)g|
 %80
-  bes, g'(()f\prall)e|g, e'(()d\prall)cis|d8()a d e f g as f|d e f4.(e8 d)c|
+  %FIXME: did Bach really use phrasing marks?
+  bes, g'\(()f\prall\)e|g, e'\(()d\prall\)cis|d8()a d e f g as f|d e f4.(e8 d)c|
   b c d4.(c8 b)a|
 %85
   b()g b c d()e b d|e4 e, a2~|a4 g8 fis g2~|g4 a8 b c2~|c4 bes8 a bes2~|

diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly
index ba58376170048a1b7b2ec9f3e3c5bebc11710233..135d9c04e6e988c245f81d1a3584a5a055e15d66 100644 (file)
--- a/mutopia/J.S.Bach/Duette/violoncello-part.ly
+++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 % {
 

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index c8a19658b79f31c2b5950dafbf8835f65d2cdd03..348161524142f8e1dd240053ba68972f431164ba 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -389,7 +389,7 @@ if 1:
 
 if 1:
        def conv (str):
-               str = re.sub ('beamAuto([^=]+)= *"([0-9]+)/([0-9]+)" *;',
+               str = re.sub ('"?beamAuto([^"=]+)"? *= *"([0-9]+)/([0-9]+)" *;*',
                              'beamAuto\\1 = #(make-moment \\2 \\3)',
                              str)
                return str
@@ -506,15 +506,19 @@ if 1:
                str = re.sub ('basicLocalKeyProperties' ,"Accidentals", str)
                str = re.sub ('basicMarkProperties' ,"Accidentals", str)                                
                str = re.sub ('basic([A-Za-z_]+)Properties', '\\1', str)
+
                return str
        
        conversions.append (((1,3,92), conv, 'basicXXXProperties -> XXX'))
 
 if 1:
        def conv (str):
+               # Ugh, but meaning of \stemup changed too
+               # maybe we should do \stemup -> \stemUp\slurUp\tieUp ?
                str = re.sub ('\\\\stemup', '\\\\stemUp', str)
                str = re.sub ('\\\\stemdown', '\\\\stemDown', str)
                str = re.sub ('\\\\stemboth', '\\\\stemBoth', str)
+               
                str = re.sub ('\\\\slurup', '\\\\slurUp', str)
                str = re.sub ('\\\\slurboth', '\\\\slurBoth', str)
                str = re.sub ('\\\\slurdown', '\\\\slurDown', str)
@@ -531,7 +535,13 @@ if 1:
                str = re.sub ('\\\\voicetwo', '\\\\voiceTwo', str)
                str = re.sub ('\\\\voicethree', '\\\\voiceThree', str)
                str = re.sub ('\\\\voicefour', '\\\\voiceFour', str)
-               
+
+               # I don't know exactly when these happened...
+               str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?(1|(\\\\up))', '\\\\stemUp\\\\slurUp\\\\tieUp', str)
+               str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?((-1)|(\\\\down))', '\\\\stemDown\\\\slurDown\\\\tieDown', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?(1|(\\\\up))', '\\\\\\1Up', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?((-1)|(\\\\down))', '\\\\\\1Down', str)
+
                return str
        
        conversions.append (((1,3,93), conv,
@@ -550,10 +560,17 @@ if 1:
        
        conversions.append (((1,3,97), conv, 'ChordName -> ChordNames'))
 
+
+## TODO: add lots of these
+       
 if 1:
        def conv (str):
-               str = re.sub ('\\\\property *Voice *[.] *textStyle *= *"([^"]*)"', '\\\\property Voice.TextScript \\\\set #\'font-style = #\'\\1', str)
-               str = re.sub ('\\\\property *Lyrics *[.] *textStyle *= *"([^"]*)"', '\\\\property Lyrics.LyricText \\\\set #\'font-style = #\'\\1', str)
+               str = re.sub ('\\\\property *"?Voice"? *[.] *"?textStyle"? *= *"([^"]*)"', '\\\\property Voice.TextScript \\\\set #\'font-style = #\'\\1', str)
+               str = re.sub ('\\\\property *"?Lyrics"? *[.] *"?textStyle"? *= *"([^"]*)"', '\\\\property Lyrics.LyricText \\\\set #\'font-style = #\'\\1', str)
+
+               str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?timeSignatureStyle"? *= *"([^"]*)"', '\\\\property \\1.TimeSignature \\\\override #\'style = #\'\\2', str) 
+
+               str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?horizontalNoteShift"? *= *"?#?([0-9]+)"?', '\\\\property \\1.NoteColumn \\\\override #\'horizonta-shift = #\\2', str) 
 
                return str
        
@@ -561,10 +578,10 @@ if 1:
 
 if 1:
        def conv (str):
-               str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str)
-               str = re.sub ('beamAutoBegin_([0-9]*) *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str)
-               str = re.sub ('beamAutoEnd *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str)
-               str = re.sub ('beamAutoBegin *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str)
+               str = re.sub ('"?beamAutoEnd_([0-9]*)"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str)
+               str = re.sub ('"?beamAutoBegin_([0-9]*)"? *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str)
+               str = re.sub ('"?beamAutoEnd"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str)
+               str = re.sub ('"?beamAutoBegin"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str)
 
 
                return str