lilypond-1.3.37

diff --git a/Documentation/faq.texi b/Documentation/faq.texi
index 6cc6c1cb8d649de82185e37aa2f814e1f32f5fc0..6953ff89b7ad3b1e7ea8a7dca1ae744265228ae6 100644 (file)
--- a/Documentation/faq.texi
+++ b/Documentation/faq.texi
@@ -440,12 +440,20 @@ Direct PS output is still experimental.  For creating nice looking ps
 output, use TeX and @code{dvips}.
 
   
-@subsubsection The beams and slurs are gone if use the XDvi magnifying glass!?
+@subsubsection The beams and slurs are gone when using the XDvi magnifying glass!?
 
-The beams and slurs are done in PostScript.  XDvi doesn't show
-PostScript in the magnifying glass.  Complain to the XDvi maintainers.
+Various dynamic symbols, such as beams, crescendi, slurs are done in
+PostScript.  XDvi doesn't show PostScript in the magnifying glass.
+Complain to the XDvi maintainers.
 
 
+@subsubsection Beams, slurs and crescendi are not displayed at all!
+
+See previous answer.  XDvi uses GhostScript for displaying PostScript,
+check that you have GhostScript installed.  If you use a different
+DVI viewer, check if it will display embedded PostScript.  Don't worry,
+the symbols should appear on the printout.
+
 @subsubsection A lot of musical stuff doesn't make it to the MIDI file, eg.  dynamics, articulation, etc.
 
 The MIDI output was originally put in as a proof that MIDI could be

diff --git a/input/test/bar-break.ly b/input/test/bar-break.ly
index d45a9ddf0190fb8c14ce59a47023030f712ecda4..5eff32f3a33d1e6b220061da255f7206e16461ae 100644 (file)
--- a/input/test/bar-break.ly
+++ b/input/test/bar-break.ly
@@ -2,22 +2,27 @@
 {
   \context StaffGroup = a < 
     \context PianoStaff = b <
-      \context Staff = "c" \notes\relative c'' { b1 \break b }
-      \context Staff = "d" \notes\relative c'' { b1 \break b }
+      \context Staff = "c" \notes\relative c'' { b4 b \bar "empty"; \break b b }
+      \context Staff = "d" \notes\relative c'' { b4 b b b }
     >
   >
 
   \paper {
        indent=100.0\mm;
        linewidth=150.0\mm;
-    \translator
-    {
+    \translator {
       \StaffContext
         \consists "Staff_margin_engraver";
        numberOfStaffLines  = #1
-        marginScriptPadding = #10  % urg: this is in PT
+        marginScriptPadding = #30  % urg: this is in PT
        instrument = #"Foo"
-       instr = #"Foo"
+       instr = #"Bar"
     }
+    \translator {
+      \StaffGroupContext
+        \consists "Staff_margin_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/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index 44b2547008b8e7c2e28eccd7d3265b4b3a0486c7..b4807e3a9d9324f2cb8397b02f492af7376437eb 100644 (file)
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -40,6 +40,7 @@ private:
   Drul_array<Span_req*> span_req_l_drul_;
   Array<Audio_dynamic_tuple> dynamic_tuple_arr_;
   Array<Audio_dynamic_tuple> finished_dynamic_tuple_arr_;
+  Direction dir_;
   Direction finished_dir_;
 };
 
@@ -109,6 +110,7 @@ Span_dynamic_performer::do_process_music ()
 
   if (span_req_l_drul_[STOP])
     {
+      finished_dir_ = dir_;
       if (!span_start_req_l_)
        {
          span_req_l_drul_[STOP]->warning (_ ("can't find start of (de)crescendo"));
@@ -117,8 +119,6 @@ Span_dynamic_performer::do_process_music ()
        {
          span_start_req_l_ = 0;
          finished_dynamic_tuple_arr_ = dynamic_tuple_arr_;
-         finished_dir_ = span_req_l_drul_[STOP]->span_type_str_ == "crescendo"
-           ? RIGHT : LEFT;
          dynamic_tuple_arr_.clear ();
          if (finished_dynamic_tuple_arr_.size ())
            dynamic_tuple_arr_.push (finished_dynamic_tuple_arr_.top ());
@@ -127,6 +127,8 @@ Span_dynamic_performer::do_process_music ()
 
   if (span_req_l_drul_[START])
     {
+      dir_ = span_req_l_drul_[START]->span_type_str_ == "crescendo"
+       ? RIGHT : LEFT;
       span_start_req_l_ = span_req_l_drul_[START];
       audio_p_ = new Audio_dynamic (0);
       Audio_element_info info (audio_p_, 0);

diff --git a/ly/engraver.ly b/ly/engraver.ly
index d5d4842896b8373dd770f87f0ee46c5010739587..c8f6b73bdbd52b7ee1d2146a386777471babbeba 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -170,6 +170,7 @@ GraceContext=\translator {
 
        \consists "Rhythmic_column_engraver";
        \consists "Dynamic_engraver";
+       \consists "Text_engraver";
 
        \consists "Property_engraver";
 

diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index 3defda7a5bc1f7bf694d4c90aaf5355ec9612719..2b3b88b76d445dc32611b1363ab4ed5066233b35 100644 (file)
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -40,8 +40,9 @@
        }
        \translator { 
                \ScoreContext 
-               textEmptyDimension = ##t
+               %textEmptyDimension = ##t
                textStyle = #"italic"
+               timeSignatureStyle = #"C"
        }
        \translator { \OrchestralScoreContext }
 }

diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index f16655066b84931b3a2d820a412f8b398b23dea6..7ec5642f26dfbb7f580dfb3f9d38115731a75779 100644 (file)
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -28,7 +28,7 @@
                %% Aargh: absulute dynamics:
                \remove "Text_engraver";
        }
-
+       % Hmm
        \translator {
                \StaffContext
                \accepts "VoiceOne";
@@ -37,10 +37,18 @@
                instrScriptPadding = #35  %% urg, this is in pt
                maximumRestCount = #1
        }
-       \translator { \OrchestralPartStaffContext }
+       \translator { 
+               \OrchestralPartStaffContext 
+               \accepts "VoiceOne";
+               \accepts "VoiceTwo";
+               instrumentScriptPadding = #55  %% urg, this is in pt
+               instrScriptPadding = #35  %% urg, this is in pt
+               maximumRestCount = #1
+       }
        \translator { 
                \ScoreContext skipBars = ##t 
-               textEmptyDimension = ##t
+               %textEmptyDimension = ##t
                textStyle = #"italic"
+               timeSignatureStyle = #"C"
        }
 }

diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index dc20e838cc1553a4d9bc300f7713ec48815c827d..467f9e8c73acdf1dc6c99858122e6665ebac7c35 100644 (file)
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -16,8 +16,8 @@
 (define generic-stem-properties
   (cons "Stem"
        (list
-        (list 'stemVerticalDirection dir? 'direction)
         (list 'verticalDirection dir? 'direction)       
+        (list 'stemVerticalDirection dir? 'direction)
         (list 'stemLength number? 'length)
         (list 'flagStyle string? 'flag-style)
         (list 'stemCentered boolean? 'stem-centered)
@@ -28,8 +28,8 @@
 
 (define generic-dot-properties
   (cons "Dots" (list
-               (list 'dotDirection dir? 'direction)
                (list 'verticalDirection dir? 'direction)
+               (list 'dotDirection dir? 'direction)
                )
        ))
 
@@ -91,8 +91,8 @@
 (define generic-breathing-sign-properties
   (cons "Breathing_sign"
        (list
-        (list 'breathingSignVerticalDirection dir? 'direction)
         (list 'verticalDirection dir? 'direction)
+        (list 'breathingSignVerticalDirection dir? 'direction)
         )))
 
 (define generic-clef-properties
@@ -113,13 +113,13 @@
 
 (define generic-tie-properties
   (cons "Tie" (list
-              (list 'tieVerticalDirection dir? 'direction)
               (list 'verticalDirection dir? 'direction)
+              (list 'tieVerticalDirection dir? 'direction)
   )))
 (define generic-tie-column-properties
   (cons "Tie_column" (list
-                     (list 'tieVerticalDirection dir? 'direction)
                      (list 'verticalDirection dir? 'direction)
+                     (list 'tieVerticalDirection dir? 'direction)
   )))
 
 
@@ -141,8 +141,8 @@
 (define generic-slur-properties
   (cons "Slur"
        (list
-        (list 'slurVerticalDirection dir? 'direction)
         (list 'verticalDirection dir? 'direction)       
+        (list 'slurVerticalDirection dir? 'direction)
         (list 'slurDash number? 'dashed))))
 
 (define generic-timesig-properties

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 7714a5695c0b7ec9afb5ef4a5e3d91b3c619696c..5970042939f1f2515b4197e967cc1a2548d5b98e 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -281,7 +281,7 @@ if 1:
        def conv(str):
                str =  re.sub ('SkipBars','skipBars', str)
                str =  re.sub ('fontsize','fontSize', str)
-               str =  re.sub ('midi_instrument','midiInstrument', x)                   
+               str =  re.sub ('midi_instrument','midiInstrument', str)                 
                        
                return str
 
@@ -293,7 +293,7 @@ if 1:
        def conv(str):
                str =  re.sub ('tieydirection','tieVerticalDirection', str)
                str =  re.sub ('slurydirection','slurVerticalDirection', str)
-               str =  re.sub ('ydirection','verticalDirection', x)                     
+               str =  re.sub ('ydirection','verticalDirection', str)                   
                        
                return str