lilypond-1.3.43

diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index 15418e5a662b479a50097e4df7b414e79e25deb4..a73d49e5c97404cd4a031cf988eac7f3f7fc07d0 100644 (file)
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -480,8 +480,8 @@ no clef is printed upon creation.
 
   @item @code{instrument}, @code{instr} @propertytype{string}
     @indexcode{instrument}@indexcode{instr}  
-    If @code{Staff_margin_engraver}
-@cindex Staff_margin_engraver
+    If @code{Instrument_name_engraver}
+@cindex Instrument_name_engraver
  is
     added to the Staff translator, then the @code{instrument} property
     is used to label the first line of the staff and the @code{instr}

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index eb8dc396e14f387abeca82dfbd5a9d2b5856e28d..62540f26360e96ff74e0127005070d6825c5a09e 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2759,7 +2759,7 @@ The engravers for paper output are:
 
   @item @code{Staff_group_bar_engraver}@indexcode{Staff_group_bar_engraver}
 
-  @item @code{Staff_margin_engraver}@indexcode{Staff_margin_engraver}  
+  @item @code{Instrument_name_engraver}@indexcode{Instrument_name_engraver}
     Prints the name of the instrument (specified by
     @code{Staff.instrument} and @code{Staff.instr}) at the left of the
     staff.

diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly
index 4fce5022c5dbd8ca7bc997e18db4b41623222fa4..e397bb363b360179586206ad3bf85bb0825d13d4 100644 (file)
--- a/input/test/banter-chords.ly
+++ b/input/test/banter-chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 \header{
 enteredby =     "jcn";

diff --git a/input/test/bar-break.ly b/input/test/bar-break.ly
index 5eff32f3a33d1e6b220061da255f7206e16461ae..e9606a07ac8e2c6214a021566d4793987e74150c 100644 (file)
--- a/input/test/bar-break.ly
+++ b/input/test/bar-break.ly
@@ -12,7 +12,7 @@
        linewidth=150.0\mm;
     \translator {
       \StaffContext
-        \consists "Staff_margin_engraver";
+        \consists "Instrument_name_engraver";
        numberOfStaffLines  = #1
         marginScriptPadding = #30  % urg: this is in PT
        instrument = #"Foo"
@@ -20,7 +20,7 @@
     }
     \translator {
       \StaffGroupContext
-        \consists "Staff_margin_engraver";
+        \consists "Instrument_name_engraver";
         marginScriptPadding = #10  % urg: this is in PT
        instrument = #" \n \n \n \n \n \n \n \n \n \nPiano\n(For rehearsal only)"
       }

diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly
index 808d7b9186b3256b91428187c4bdb6d08b465954..c4a4ab84df80aa249a8b476d443f321cb055f8b9 100644 (file)
--- a/input/test/bar-scripts.ly
+++ b/input/test/bar-scripts.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.5";
+\version "1.3.42";
 
 onestaff = \context Staff = foo\notes  {
        \property Staff.instr = instr

diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly
index 26d9920c70360a1273adae9f972b3996adaadc37..eeeb0062f27edc85ba5d400a5b847e245f17aea2 100644 (file)
--- a/input/test/beam-chord.ly
+++ b/input/test/beam-chord.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 \score{
        \notes\transpose c'{

diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly
index 27e00e64b203c7c309523e293ff545c060331365..0cc40434da58726901c7f0c22b5dc89673ccdd0b 100644 (file)
--- a/input/test/beam-cross-staff.ly
+++ b/input/test/beam-cross-staff.ly
@@ -30,4 +30,4 @@
        }
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly
index 3be056715da68ac7e38cc0b5586ba74628cdc18c..626449eaa8e84121954fcdaa795667dcfa9ac10a 100644 (file)
--- a/input/test/beam-isknee.ly
+++ b/input/test/beam-isknee.ly
@@ -21,4 +21,4 @@
        }
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/beams.ly b/input/test/beams.ly
index d73c211332931cba7e10125a438938b9a58f8408..aa6dd1088653ce2a127d8bb595a150b05479af44 100644 (file)
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -6,7 +6,7 @@ copyright =      "PD";
 
 TestedFeatures =        "beams and beamflags";
 }
-\version "1.3.5";
+\version "1.3.42";
 
 \score{
        <

diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly
index da77f7b461884e5fd60f07ee92658509a6a817d2..efa0424573b1e4a5c82d7615b61e6847242e7d51 100644 (file)
--- a/input/test/breathing-sign.ly
+++ b/input/test/breathing-sign.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 \score {
   \notes \relative c' {

diff --git a/input/test/broken.ly b/input/test/broken.ly
index 55d23edbed7df31de43d47b0c91fd41c29d1fcc2..26626169e1a839378305713825825a7c82fbfe84 100644 (file)
--- a/input/test/broken.ly
+++ b/input/test/broken.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs" +
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 shortlong = \notes{
        c4()c( c c  |

diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly
index 1de6ac3c505e7ceff6926a7621bfeb610487bd8d..ab7d7e993e6eaf057bbb9c850604fb6023767eae 100644 (file)
--- a/input/test/chord-inversion.ly
+++ b/input/test/chord-inversion.ly
@@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{
        >
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly
index 04534576fa0cdd48f4ee82396fca013450aad7b1..ab5e8fb1c21441b1c1686032f619de0056caf305 100644 (file)
--- a/input/test/chord-table.ly
+++ b/input/test/chord-table.ly
@@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{
 
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/chords.ly b/input/test/chords.ly
index 9c00e7f71ec1dc612fd498d6b2d3f6a2c8040a17..4d1383e2adbd7560412d78a8ffb699c2d6ab814d 100644 (file)
--- a/input/test/chords.ly
+++ b/input/test/chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 %{
 Would this be acceptable/good enough/convenient for entry?

diff --git a/input/test/clefs.ly b/input/test/clefs.ly
index 726e7fe9e34fce9460997d22f8289d85c9ef2b6d..227b8a931a0875820da3b9294a4a901cd0548d77 100644 (file)
--- a/input/test/clefs.ly
+++ b/input/test/clefs.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 \score {
        \notes{ 

diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index 46e7c42e7ebbea3f3d61fb51f00386d5fb3a6273..ea481c472ac213aeb8fe46ac6ba67993e7c531c7 100644 (file)
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,7 +5,7 @@ enteredby =      "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
-\version "1.3.5";
+\version "1.3.42";
 
 twovoice = \context Staff \notes < 
        \context Voice=i { \stemdown c4 d e f g2~  g4 a [c8 d e f] c2| }

diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly
index 434590731fa8ce9e5afeb20cd655d6155ce67231..55b91522327e1f5c5ea2c13d17e7b486b8f5dbc2 100644 (file)
--- a/input/test/defaultbars.ly
+++ b/input/test/defaultbars.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 
 \score {

diff --git a/input/test/extender.ly b/input/test/extender.ly
index cce1ba02c4c90d05494a82446cb23f6664fc1392..ff42bcce2bbd390b8eef8ffdb3506c7e8f160c0b 100644 (file)
--- a/input/test/extender.ly
+++ b/input/test/extender.ly
@@ -5,4 +5,4 @@
        >
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index ac340aed2035533b0c4f0b0acc40fed1839216e2..146e52e7ac6fb77f38caf37923be56bdaf3354a3 100644 (file)
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -42,4 +42,4 @@ extra-staff.ly:
 }
 
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index c6401107773c795afde48ab899dbcb4cf9e706b4..5ff097f6f9c5d9774d3c719ce5261c5757f84df7 100644 (file)
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 FontBody=      \notes\transpose c''{ 
                \bar "|:";

diff --git a/input/test/font.ly b/input/test/font.ly
index 0aef283cba72ee7506e7afcd6c217669d664a35e..83741ed452c64fd6052c688484221eb9b63507fd 100644 (file)
--- a/input/test/font.ly
+++ b/input/test/font.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 \include "font-body.ly"
 \score{

diff --git a/input/test/font16.ly b/input/test/font16.ly
index 8b0a2d1ba1bd7d27814f07f617f78838093c7428..a05324fd6a2fdced402a75f921c04b488b594e24 100644 (file)
--- a/input/test/font16.ly
+++ b/input/test/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 \include "paper16.ly"
 \include "font-body.ly"
 

diff --git a/input/test/font20.ly b/input/test/font20.ly
index 60bbb05da8c6aaf37df9a4bd50c18f7fe472f060..4c2440e14a66b123da4bff19017c553633c54715 100644 (file)
--- a/input/test/font20.ly
+++ b/input/test/font20.ly
@@ -17,5 +17,5 @@ TestedFeatures =
            gourlay_maxmeasures =5.;
        }
 }
-\version "1.3.5"; 
+\version "1.3.42"; 
 

diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly
index 4e8ac8a0d97a4b3c35ac5f62a1bfb60c97e867b3..61354761e32252ff299701b739c35394cc136587 100644 (file)
--- a/input/test/gmsusd.ly
+++ b/input/test/gmsusd.ly
@@ -3,7 +3,7 @@
 
 % perhaps the current modifier approach is too simplistic
 
-\version "1.3.5";
+\version "1.3.42";
 
 gmsus=\notes\relative c \chords{ 
        g1

diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index 784eaff03932dd604aecfc528e7f4e2be567940c..a3de6d41c69f6dcaadc3e1a3518b6fb9049f515e 100644 (file)
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 %{
 

diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly
index 8680850bb226055fd0a9db7a7e82aef5db92fe2a..0bf06da305541d674e73b049051359d2436bae43 100644 (file)
--- a/input/test/hara-kiri-switch.ly
+++ b/input/test/hara-kiri-switch.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 voiceOne = \notes \relative c'' {
        a1 a a

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 1981674bcd06ec807fbb9790c423b2147fac297f..c09fb85c826a1a357eb219b321d0ee2ba2f20e64 100644 (file)
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 toeter_i = \notes\relative c <{
                \property Staff.instrument = #"Toeters"

diff --git a/input/test/hyphen.ly b/input/test/hyphen.ly
index 26558228e06ecfe02aadf639034f3844fdd5e575..f97c78d878f57288d71835fb1a6e363c86123fc5 100644 (file)
--- a/input/test/hyphen.ly
+++ b/input/test/hyphen.ly
@@ -5,7 +5,7 @@
        >
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 
 
 
 

diff --git a/input/test/incipit.ly b/input/test/incipit.ly
index a64d76932c2c48975ebd26e5d5afb938b34defb7..b2cf14733f6e0bb308e506eb8466076bb5bb6e0e 100644 (file)
--- a/input/test/incipit.ly
+++ b/input/test/incipit.ly
@@ -6,7 +6,7 @@
    /Mats B
 %}
 
-\version "1.3.5";
+\version "1.3.42";
 
 incipit = \notes\relative c'{
   <b1 fis' b d>

diff --git a/input/test/keys.ly b/input/test/keys.ly
index f17302463325db1920e5d9c040f8ec4c4ccca6f1..99bf45142da5302ff3d6cab9fb73cb391cdd2eb7 100644 (file)
--- a/input/test/keys.ly
+++ b/input/test/keys.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 %{
 test key itemv breaking

diff --git a/input/test/keys2.ly b/input/test/keys2.ly
index bbef861b3cc6218416d2efe3e0293a5232d7363b..944cc8fb16cdbbd5201093ef07d21ee7e2df11c1 100644 (file)
--- a/input/test/keys2.ly
+++ b/input/test/keys2.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 
 blah = \notes {

diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly
index 98eb91407c1401c9d7cf6fefac6fbc12c7abcc6d..fe6e070526384dfb13ff58c8b4477a85f388968f 100644 (file)
--- a/input/test/knee-mult.ly
+++ b/input/test/knee-mult.ly
@@ -21,4 +21,4 @@
        }
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/knee.ly b/input/test/knee.ly
index eee5e3887e47f93b953030d6e6c625f65f33beae..b48bfd7bd86d6e55af41b1c99f5b7a76fd94db19 100644 (file)
--- a/input/test/knee.ly
+++ b/input/test/knee.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 \score{
        \notes\relative c'{
                [c16 \stemdown c'' \stemboth c,, d]

diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly
index 3c63f9f257488f8c5a4acea8de39084236e0b9bf..ae6a1f405b874ccab12fc72d822d1cc048474060 100644 (file)
--- a/input/test/lyric-combine.ly
+++ b/input/test/lyric-combine.ly
@@ -7,7 +7,7 @@ enteredby =      "HWN, chords by Johan Vromans";
 copyright =     "public domain";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 m =\notes  \relative c'' {
        \property Staff.automaticMelismata = ##t

diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly
index 89146f1c4ecbccc4dfff6c143b85a35610fc3bcc..724732b04a4b59e7c9da2f31086f49a23c334e1b 100644 (file)
--- a/input/test/lyrics.ly
+++ b/input/test/lyrics.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 $somewhat_long = \lyrics{
        \property Lyrics . textStyle = "roman" 

diff --git a/input/test/mark.ly b/input/test/mark.ly
index 8d65150c3792d72c580d6cf7245170872c3e4edc..da4369262ad69ef792f8d4bfd9ccb625147e35c7 100644 (file)
--- a/input/test/mark.ly
+++ b/input/test/mark.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 global = \notes {
   s1 | \mark "A";

diff --git a/input/test/memory.ly b/input/test/memory.ly
index ba5bead23e479793f6d0c393dfc3c0c7773dff6a..ab1260b632886473fb489485ffb30847e1aac949 100644 (file)
--- a/input/test/memory.ly
+++ b/input/test/memory.ly
@@ -11,5 +11,5 @@ bla = \notes {
        >
        \paper { Gourlay_maxmeaures = 2.; }
 }
-\version "1.3.5"; 
+\version "1.3.42"; 
 

diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly
index e6761b7fb9d98271e32417c81ea792f3a646d295..f6a35de05accdeedf986771ec40ad92d69e43e4e 100644 (file)
--- a/input/test/multi-rest.ly
+++ b/input/test/multi-rest.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 voice_one = \notes\transpose c''{  \stemup
        R1 * 2 | f'4-. r r2 | R1 * 3 |

diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly
index 8c0580921580706211d8dc7459f3ac63883b6af6..813b3964187832b1d3d393c4e43f32b5fdc085ca 100644 (file)
--- a/input/test/noteheadstyle.ly
+++ b/input/test/noteheadstyle.ly
@@ -36,4 +36,4 @@ c4 c2 c8  c16 c16  c1
        
     }
 }
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly
index 56e220ce04361d5a11e5baf7ce0860987f3f17c3..c4d177381b1277eaf2f448e7ded385c447592465 100644 (file)
--- a/input/test/notemode-chords.ly
+++ b/input/test/notemode-chords.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 \score{
        \notes \transpose c''{

diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly
index 0cfe57e9362f6901f0fc7404909271a58a892148..d13b04c84a63493e84feb1dc7d813e6075eb5136 100644 (file)
--- a/input/test/orchestscore.ly
+++ b/input/test/orchestscore.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 m = \notes \relative c''{
 c1 | c2 c | c c | c c | \break c c | c c | c c | c c | 
@@ -92,7 +92,7 @@ c1 | c2 c | c c | c c | \break c c | c c | c c | c c |
         minVerticalAlign = 2.2*\staffheight; 
     }
     \translator { \StaffContext
-       \consists "Staff_margin_engraver";
+       \consists "Instrument_name_engraver";
         marginScriptPadding = 15.0;
     }
   }

diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index 6fcd07e08f02cf7afcf52ccd1b5ae3aa268d2b2d..de27172cf2de4c8b2ca541df9dc62ab40bc67226 100644 (file)
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 \score {
 

diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly
index de22b4a611766733ce5cf2edbf5a17747f6b5ac6..05dc23fbdf31e483997c1d89e0a8d2c2249c96f8 100644 (file)
--- a/input/test/rest-collision.ly
+++ b/input/test/rest-collision.ly
@@ -38,4 +38,4 @@ restsII = \context Staff \notes {
        }
 }      
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/scripts.ly b/input/test/scripts.ly
index 73eb6c0455354e8c89fde97175fff6a46bd0bbd9..a84dfc2700cd77dac38d2f0ae7182a647210683f 100644 (file)
--- a/input/test/scripts.ly
+++ b/input/test/scripts.ly
@@ -1,5 +1,5 @@
        
-\version "1.3.5";
+\version "1.3.42";
 
 
 blah =         \notes{ \transpose c'' {

diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index 66d3d96948eb0e4f7defee9b6d1f9dd9dfe3ee0b..6eddcb7cf76acb483927cfdb44da76ff0fe43e3d 100644 (file)
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs" +
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 shortlong = \notes{
        c4()c( c c  |

diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly
index e0eca072b66380c85e5b03dc315601111e6aab26..914afd1fe5188a43dde2c805505722e336345ad8 100644 (file)
--- a/input/test/slur-cross-staff.ly
+++ b/input/test/slur-cross-staff.ly
@@ -36,4 +36,4 @@
        }
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
index 4a505be00b50160e365b00372afa1a9a1cf04d48..4372acc205ce69f3f42eb324aa06d46f62a5dc51 100644 (file)
--- a/input/test/slur-damping.ly
+++ b/input/test/slur-damping.ly
@@ -1,5 +1,5 @@
 % test damping
-\version "1.3.5";
+\version "1.3.42";
 
 \score{
        \notes\relative c'{

diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly
index 45fc0460192667ea197917d3c9a9f21222e4a085..9ae3325894f9a00ef4aae06e19d86fa89ebebd41 100644 (file)
--- a/input/test/slur-dash.ly
+++ b/input/test/slur-dash.ly
@@ -1,4 +1,4 @@
-\version "1.3.5";
+\version "1.3.42";
 
 \score{
        \notes{

diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index 0c956ea94cd13df60202217be922d55449ec3073..03debe0993b1e33ed84c6580aa153d7a353a47cd 100644 (file)
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.5";
+\version "1.3.42";
 
 \score{
        \notes\transpose c'{

diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly
index 0488af93877aef3e133276ac35d898c5519937e8..89ff29ad66b05c6a2841125fc92f6d1c21cc19e5 100644 (file)
--- a/input/test/spacing-2.ly
+++ b/input/test/spacing-2.ly
@@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues.  Urtext. Editions Henry Lemoine, Paris.";
 }
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 401725c56a1545b7c26d33a6b50142844cb193a3..15c560e9094548bdb8044c9e19065466128a3063 100644 (file)
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,7 +6,7 @@ copyright =      "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 multipart = \notes \relative c'{ 
     \context StaffGroup < 

diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly
index e653b0b2d5c2cd2372ebe91e4fb68cc6e1bf60e8..f0db341dcf22663d50611b8f64d71aee70038d46 100644 (file)
--- a/input/test/span-bars.ly
+++ b/input/test/span-bars.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.5";
+\version "1.3.42";
 nt = \notes { c1 \break c1 c1 } 
 stuff = \notes \relative c'' <
   \context Staff = stone  { \nt }

diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly
index d93efd28f7c4ba741cce15cadba5036c0dda8efc..712773b5cc8c2e880d9408b469a28a3b5399dfb7 100644 (file)
--- a/input/test/staff-margin-partial.ly
+++ b/input/test/staff-margin-partial.ly
@@ -1,5 +1,10 @@
 % test staff margin with partial measure.
+
+\version "1.3.42";
+
 \score {
 \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 }
-\paper { \translator { \StaffContext \consists Staff_margin_engraver; }}
+  \paper {
+    \translator { \StaffContext \consists Instrument_name_engraver; }
+  }
 }

diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly
index 1e2ec60b600b2ad762b5ac65abd802a645e3c6cf..7a7972964228e52a318ec61b1257ee62bcf2a27e 100644 (file)
--- a/input/test/staff-margin.ly
+++ b/input/test/staff-margin.ly
@@ -1,6 +1,6 @@
 
        
-\version "1.3.5";
+\version "1.3.42";
 
 \score {
 
@@ -15,8 +15,8 @@ linewidth=-1.0;
 \translator { \ScoreContext
        %textVerticalAlignment = #0
        }
-%\translator { \StaffContext \consists "Staff_margin_engraver"; }
-%\translator { \PianoStaffContext \consists "Staff_margin_engraver"; }
+%\translator { \StaffContext \consists "Instrument_name_engraver"; }
+%\translator { \PianoStaffContext \consists "Instrument_name_engraver"; }
 \translator { \StaffContext \consists "New_staff_margin_engraver"; }
 \translator { \PianoStaffContext \consists "New_staff_margin_engraver"; }
 }}

diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly
index 61df82d328b62be085acb71ee08543e2f0a51d7e..6ee2f1ad7555f2c589fdf9b22e0f16741a12cb04 100644 (file)
--- a/input/test/staff-side-slur.ly
+++ b/input/test/staff-side-slur.ly
@@ -11,11 +11,11 @@
                \translator { \OrchestralScoreContext }
                \translator {
                        \StaffContext
-                       \consists "Staff_margin_engraver";
+                       \consists "Instrument_name_engraver";
                        marginHangOnClef = 1;
                }
        }
 }
 
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index 43a7e1909546402471af9dbd70fb04f233b7f471..48beef13b1fe66dec587838332bbfe667b3488e8 100644 (file)
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -14,4 +14,4 @@
 >
 \paper { linewidth = -1.; }
 }
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly
index 022a9ae6445de0d0b7903cc2590f1b1ec313fc81..9ed889d5f1f87354422504b82eff2bdf28cfe958 100644 (file)
--- a/input/test/stem-tremolo.ly
+++ b/input/test/stem-tremolo.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.5";
+\version "1.3.42";
 \score{
        \context Voice\notes \relative c''{
                %%?

diff --git a/input/test/stem.ly b/input/test/stem.ly
index 5621c4302e079ce20eccfaeaf9bf922b28a9ec71..1ccb9c59784c9c6086ee66cd76dcd588292eb615 100644 (file)
--- a/input/test/stem.ly
+++ b/input/test/stem.ly
@@ -8,7 +8,7 @@ of beams";
        
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 beamintervals = \notes{
                \time 7/4;

diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly
index 5a53e73286041e418099f4488ac9f079c53ac653..dc61889f27dcfe0bd7351dbf744de47d47f199ac 100644 (file)
--- a/input/test/tchaikovsky.ly
+++ b/input/test/tchaikovsky.ly
@@ -7,7 +7,7 @@ enteredby =     "Maarten Storm";
 instrument=    "Violoncello";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 % this is an example of extreme dynamics
 

diff --git a/input/test/thumb.ly b/input/test/thumb.ly
index 795af1647fb33d058319f251e817822403604fff..acd3319b8d7a8787a28dbcdbc9509c1f1cc10304 100644 (file)
--- a/input/test/thumb.ly
+++ b/input/test/thumb.ly
@@ -7,7 +7,7 @@
 % the thumb-script is used in cello music to indicate a note that should
 % be played with your thumb. 
 
-\version "1.3.5";
+\version "1.3.42";
 
 \score { \notes \relative c'' {
                [<a8_\thumb a'8-3(> <)b_\thumb b'-3>

diff --git a/input/test/title.ly b/input/test/title.ly
index c20c9741f8b53f4f5ff89713fa7cd5eaf81d3aa7..261668a4faafd16561b538a32f4b3031382e1891 100644 (file)
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -10,7 +10,7 @@ source =      "urtext";
 instrument=    "Instrument";
 }
 
-\version "1.3.5";
+\version "1.3.42";
 
 \score{
        \notes

diff --git a/input/test/transposition.ly b/input/test/transposition.ly
index 6c4d9b0e2c72a95a38c196ad734ccd629d57204d..93aa1084734fff4c2c4778405fc407ffcb60f60d 100644 (file)
--- a/input/test/transposition.ly
+++ b/input/test/transposition.ly
@@ -22,7 +22,7 @@ copyright =    "public domain";
 }
 
 
-\version "1.3.5";
+\version "1.3.42";
 
 vOne = \notes \relative c''{
         \clef"violin";

diff --git a/input/test/tup.ly b/input/test/tup.ly
index e228bfac844b072f09579b3503076f290bc7aeaa..8c1d54b4c3b4facd7505718565face08af7d1f99 100644 (file)
--- a/input/test/tup.ly
+++ b/input/test/tup.ly
@@ -8,4 +8,4 @@
                 }
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly
index b4321d3762ad803f5f110f2b2e5433a739f93b9d..0ec7feb0d0fd03a4736aaac05254792b7e403026 100644 (file)
--- a/input/test/twinkle-as5.ly
+++ b/input/test/twinkle-as5.ly
@@ -6,7 +6,7 @@ enteredby =     "hwn and jcn";
 copyright =    "public domain";
 }
 
-\version "1.3.25";
+\version "1.3.42";
 
 \include "paper-as5.ly"
 

diff --git a/input/test/updown.ly b/input/test/updown.ly
index f21e78a10967fd5cffc580ffc831e8a0bddb2a3c..9b19cefadd9eafff0179bd131a1ffd630cff63c6 100644 (file)
--- a/input/test/updown.ly
+++ b/input/test/updown.ly
@@ -10,7 +10,7 @@
        {\voicetwo c}>
        
        
-       \version "1.0.21"; 
+       \version "1.3.42"; 
        
   }
   \paper { }  

diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly
index 67f85f575f5e472c210479cb85b4d08c6a0c0aef..23ab328f83a3e269d045f77a5a501f3b3b575f72 100644 (file)
--- a/input/test/vertical-align.ly
+++ b/input/test/vertical-align.ly
@@ -1,5 +1,5 @@
 
-\version "1.3.5";
+\version "1.3.42";
 
 \score {
 \notes <

diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly
index 5a4f99162834210004551931b2d4903d9155d195..53a6aaf63622691c8eed568dc0f8705df364da76 100644 (file)
--- a/input/test/vertical-text.ly
+++ b/input/test/vertical-text.ly
@@ -15,4 +15,4 @@
        }
 }
 
-\version "1.3.5"; 
+\version "1.3.42"; 

diff --git a/input/trip.ly b/input/trip.ly
index 89d41edeeb53746beaa0193d6a36de7006bbdad7..09ef7e35d889997c195fbf2f324641ef08b9b2fb 100644 (file)
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -159,6 +159,12 @@ fugaIIPedal = \notes \relative c {
   \context Score  \notes <
     \context PianoStaff <
       \context Staff = treble {
+       \property Staff.instrument = #"right"
+       \property Staff.instr = #"rt"
+       \property PianoStaff.instrument = #"hands"
+       \property PianoStaff.instr = #"hs"
+
+
        \property Score.midiInstrument = "church organ"
         \praeludiumRight r1 \fugaIIRight }
       \context Staff = bass { 
@@ -166,6 +172,9 @@ fugaIIPedal = \notes \relative c {
     > 
     \context Staff = pedal \relative c  <
       {
+       \property Staff.instrument = #"left"
+       \property Staff.instr = #"lt"
+
         \time 4/4;
        \key e; 
   \clef bass;
@@ -189,6 +198,12 @@ fugaIIPedal = \notes \relative c {
   \paper {
 
    \translator { \OrchestralScoreContext }
+       \translator { \PianoStaffContext
+               \consists "Instrument_name_engraver";
+       }
+       \translator { \StaffContext
+               \consists "Instrument_name_engraver";
+       }
   }
 
   \midi {

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 24900b3f8132b9e9c37e9b7a2b29500f3923aee6..9f2047dfdadbd68969439d812eef544cd7c1112e 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -101,7 +101,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
 
 
          Item * edge = new Item;
-         SCM edge_sym =   ly_symbol2scm ("Left_edge_item");
+         SCM edge_sym = ly_symbol2scm ("Left_edge_item");
          edge->set_elt_property ("break-align-symbol", edge_sym);
 
          /*

diff --git a/lily/lexer.ll b/lily/lexer.ll
index cbe754c5c38ea7518cc8e29e52a07dba6fd9c3a0..1f75b5d39be343abb967de051c805834056c70cc 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -38,8 +38,8 @@
 #include "main.hh"
 #include "musical-request.hh"
 #include "identifier.hh"
-#include "mudela-version.hh"
 #include "version.hh"
+#include "mudela-version.hh"
 
 void strip_trailing_white (String&);
 void strip_leading_white (String&);

diff --git a/lily/main.cc b/lily/main.cc
index d0f568c836315fe50202cf0a1aa6ef2e5e2a0bfa..fcbd09e5c62a6fe8a543e3502314ceb80752d3f5 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -129,7 +129,7 @@ _(
     "localedir: `" DIR_LOCALEDIR "'\n"
     "\n";
 
-  print_mudela_versions (cout);
+
   cout << endl;
 
   cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;

diff --git a/lily/parser.yy b/lily/parser.yy
index 8f3762b595434dbbab2d9f2163418db4f2532a28..39019cbe2678906de78bb9f7bcf3c3217ee9a463 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -42,15 +42,16 @@
 #include "auto-change-music.hh"
 #include "output-property.hh"
 
-// mmm
-Mudela_version oldest_version ("1.3.4");
-
 bool
 is_duration_b (int t)
 {
   return t == 1 << intlog2(t);
 }
 
+
+// mmm JUNKME ?
+Mudela_version oldest_version ("1.3.42");
+
 void
 print_mudela_versions (ostream &os)
 {
@@ -58,6 +59,7 @@ print_mudela_versions (ostream &os)
     << endl;
 }
 
+
 // needed for bison.simple's malloc() and free()
 #include <malloc.h>
 

diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly
index ed54d15b1008a31f98f8a1ce2f50b4a186c9ddb6..d5c12324caffa9d5264728ccaa84d60741420b69 100644 (file)
--- a/ly/book-fragment.ly
+++ b/ly/book-fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.4";
+\version "1.3.42";
 
 
 \include "declarations.ly"

diff --git a/ly/book-init.ly b/ly/book-init.ly
index 8c75bf5d8c2bc9c8fdf089748f75e41356a19cba..09c7f6601dda2e08fbfbe1f07da38c02939f76b5 100644 (file)
--- a/ly/book-init.ly
+++ b/ly/book-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.4";
+\version "1.3.42";
 
 
 \include "declarations.ly";

diff --git a/ly/catalan.ly b/ly/catalan.ly
index a2f842c2f3e8961f108272fc72cc65278dc1bbf7..d8545e00a4a61dc283031931cef819bf57f6a849 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -71,4 +71,4 @@
 
 
 
-\version "1.3.38";
+\version "1.3.42";

diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly
index 94c73777087ad7335f2085b16149ae905e6eb2b7..32688fd45a81ea665059f824eb3a104698203008 100644 (file)
--- a/ly/center-fragment.ly
+++ b/ly/center-fragment.ly
@@ -1,7 +1,7 @@
 % Toplevel initialisation file. 
        
 
-\version "1.3.4";
+\version "1.3.42";
 
 
 \include "declarations.ly"

diff --git a/ly/center.ly b/ly/center.ly
index 6bc0ab2825a0ba99b23adfaf67dff36eabd2e6e9..e08c2114bca288844923e11d7ee75d5caf6f8375 100644 (file)
--- a/ly/center.ly
+++ b/ly/center.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.4";
+\version "1.3.42";
 
 
 \include "declarations.ly"

diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 9c0902ba0003d7580c8d5d249a53595fd55190d6..f39aa16a3318c2b37449f262077eaa853adcc0b6 100644 (file)
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -49,4 +49,4 @@
 
 }
 
-\version "1.3.38";
+\version "1.3.42";

diff --git a/ly/english.ly b/ly/english.ly
index 52022eb097ea73e566ef16a4ad13b78c1153055a..1a611b9d08bedf0f8679e913917931dcea06c905 100644 (file)
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -77,5 +77,5 @@
        (bss . ( -1 6 2 ))
 )
 
-\version "1.3.38";
+\version "1.3.42";
 

diff --git a/ly/fragment.ly b/ly/fragment.ly
index 93722c224fbc92068bc0b90c1022754e16eb33bf..ca24d7eb51af7daeeaf2ef783ad2f1fb96aaf7a5 100644 (file)
--- a/ly/fragment.ly
+++ b/ly/fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.4";
+\version "1.3.42";
 
 
 \include "declarations.ly"

diff --git a/ly/init-as.fly b/ly/init-as.fly
index 33e720073b7ced2ab80e5b111361a5427ae236ed..e076e4467b85c189980fb37c5fec360a377874a8 100644 (file)
--- a/ly/init-as.fly
+++ b/ly/init-as.fly
@@ -1,6 +1,6 @@
 % Toplevel AsciiScript initialisation file. 
 
-\version "1.3.24";
+\version "1.3.42";
 
 \include "declarations-as.ly"
 

diff --git a/ly/init-as.ly b/ly/init-as.ly
index c07c5d9cbb1bfb63dd779e83857e1edd0060f46f..923aa1ba6b784ab8b79209994f427a8e454b8432 100644 (file)
--- a/ly/init-as.ly
+++ b/ly/init-as.ly
@@ -1,6 +1,6 @@
 % Toplevel AsciiScript initialisation file. 
 
-\version "1.3.24";
+\version "1.3.42";
 
 \include "declarations-as.ly"
 

diff --git a/ly/init.fly b/ly/init.fly
index 6c9992e379dc81b2cd1dd7ec950d7f3e68c9a4d5..cc941a123fa21ebd721ff6f1baeb9e56fe6179ca 100644 (file)
--- a/ly/init.fly
+++ b/ly/init.fly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.5";
+\version "1.3.42";
 
 
 \include "declarations.ly"

diff --git a/ly/init.ly b/ly/init.ly
index 748f075f3c43f3db659984fb5eb7572dcc4bcb6c..04c15677b7d06258840236c3f5c127802f74766d 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.4";
+\version "1.3.42";
 
 
 \include "declarations.ly";

diff --git a/ly/init.sly b/ly/init.sly
index 294bdad3bd96bec29b80591fc3b74905b244d493..af663b0138d315648ba44a1644750db2645f4634 100644 (file)
--- a/ly/init.sly
+++ b/ly/init.sly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.3.4";
+\version "1.3.42";
 
 
 \include "declarations.ly"

diff --git a/ly/italiano.ly b/ly/italiano.ly
index e8bd6b48848effa74f16ce92c4c08043cee2118b..e3752a931928c55badf217faf86f46c55ced3cc7 100644 (file)
--- a/ly/italiano.ly
+++ b/ly/italiano.ly
@@ -48,4 +48,4 @@
        (sidd . ( -1 6 2 ))
 }
 
-\version "1.3.38";
+\version "1.3.42";

diff --git a/ly/norsk.ly b/ly/norsk.ly
index d1e9a1ad04518399d3808378e64be64814a42b24..f6d714a122d5e6a28ebfae249e8d25752577548e 100644 (file)
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -1,5 +1,5 @@
 
-%      $Id: norsk.ly,v 1.3 2000/03/23 12:52:56 fred Exp $      
+%      $Id: norsk.ly,v 1.4 2000/04/04 17:00:58 fred Exp $      
 
 %{
 
@@ -104,4 +104,4 @@
 
 
 
-\version "1.3.38";
+\version "1.3.42";

diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly
index 5c8c5d5db53581cb90aaf54f838d992be0ec49c3..edbbdf23f621c234f449efb906151f0b5a4f2e93 100644 (file)
--- a/ly/paper-as5.ly
+++ b/ly/paper-as5.ly
@@ -1,6 +1,6 @@
 % paper-as5.ly
 
-\version "1.3.24";
+\version "1.3.42";
 
 paper_as_five = \paper {
        staffheight = 5.\char;

diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly
index 655a642f747008c98705b28d395ab07d6fd35337..6e44c78abba1f45833c9078de6cffa33b464b361 100644 (file)
--- a/ly/paper-as9.ly
+++ b/ly/paper-as9.ly
@@ -1,6 +1,6 @@
 % paper-as9.ly
 
-\version "1.3.24";
+\version "1.3.42";
 
 paper_as_nine = \paper {
        staffheight = 9.\char;

diff --git a/ly/paper16.ly b/ly/paper16.ly
index 6d2a93da7985705ce2be9dff466082cde882ceb0..be59707f540c543a2ab4fbac301ebbc534e7a890 100644 (file)
--- a/ly/paper16.ly
+++ b/ly/paper16.ly
@@ -2,7 +2,7 @@
 
 
 
-\version "1.3.4";
+\version "1.3.42";
 
 paper_sixteen = \paper {
        staffheight = 16.0\pt;

diff --git a/ly/paper20.ly b/ly/paper20.ly
index de1c7d33422b7a8eee2f136734f46e02831be50c..308bc86ca46d4d981da782583d684c921da3cb2a 100644 (file)
--- a/ly/paper20.ly
+++ b/ly/paper20.ly
@@ -1,7 +1,7 @@
 % paper20.ly
 
 
-\version "1.3.4";
+\version "1.3.42";
 
 paper_twenty = \paper {
        staffheight = 20.0\pt;

diff --git a/ly/paper23.ly b/ly/paper23.ly
index aa9d14dfb7b8afa399b825f4515f943bff15f69f..efa2d331073639439b53c776a137578da20341c4 100644 (file)
--- a/ly/paper23.ly
+++ b/ly/paper23.ly
@@ -1,7 +1,7 @@
 % paper23.ly
 
 
-\version "1.3.4";
+\version "1.3.42";
 
 paper_twentythree = \paper {
        staffheight = 23.0\pt;

diff --git a/ly/property.ly b/ly/property.ly
index 306fc176c083e4fbff6c4e2ab9e9734c1e2b59ea..0599e32c312a7ee092d5140700ff98204c9d0512 100644 (file)
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS.
 
 %}
 
-\version "1.3.4";
+\version "1.3.42";
 
 %hmm, (these) abbrevs suck, imo
 % i guess they're meant as some form of doco
@@ -121,6 +121,6 @@ autoBeamOff = \property Voice.noAutoBeaming = ##t
 autoBeamOn = \property Voice.noAutoBeaming = ##f
 
 
-emptyText = \property Voice.textEmptyDimension = ##t
-fatText = \property Voice.textEmptyDimension = ##f
+emptyText = \property Voice.textNonEmpty = ##f
+fatText = \property Voice.textNonEmpty = ##t
 

diff --git a/ly/svenska.ly b/ly/svenska.ly
index a986af1b0772c7c07030f1ab78d6a9adb4d461dd..2c18b3d686c34fee2fcd8570bb028129fed462d7 100644 (file)
--- a/ly/svenska.ly
+++ b/ly/svenska.ly
@@ -40,4 +40,4 @@
        (hiss . ( -1 6 1 ))
        (hississ . ( -1 6 2 ))
 )
-\version "1.3.38";
+\version "1.3.42";

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index d64dfcddb9d43d0929bc7af1d1d73c09dd894f92..1bfa4f6370ab617eceb7e2cb2eb296bc1b195615 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -457,6 +457,14 @@ if 1:
        conversions.append ((1,3,41), conv,
                            '[:16 c4 d4 ] -> \repeat "tremolo" 2 { c16 d16 }')
 
+if 1:
+       def conv (str):
+               str = re.sub ('Staff_margin_engraver' , 'Instrument_name_engraver', str)
+               return str
+
+       conversions.append ((1,3,42), conv,
+                           'Staff_margin_engraver deprecated, use Instrument_name_engraver')
+
 ############################