patch::: 1.3.33.jcn2

diff --git a/VERSION b/VERSION
index 3aec424aab5c19401d35b1f380fabc3c0fb17d07..9712be5b96e0456a004cd6d988a96ad7d2511b31 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=33
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 842b45bce0fb151ee0d4f1ce1baf1391f811351a..5f8601d498dd982fdcb5f18740dffbd493e82f35 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,21 +1,8 @@
-
-\header{
-%% URG
-Clarinetti ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Clarinetti\\hss}\\hbox to0pt{\\hss (B\\textflat)\\hss}\vss}";
-Cl ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Cl.\\hss}\\hbox to0pt{\\hss (B\\textflat)\\hss}\vss}";
-Corni ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Corni\\hss}\\hbox to0pt{\\hss (E\\textflat)\\hss}\vss}";
-Cor ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Cor.\\hss}\\hbox to0pt{\\hss (E\\textflat)\\hss}\vss}";
-Trombe ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Trombe\\hss}\\hbox to0pt{\\hss (C)\\hss}\vss}";
-Tbe ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Tbe.\\hss}\\hbox to0pt{\\hss (C)\\hss}\vss}";
-Timpani ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Timpani\\hss}\\hbox to0pt{\\hss (C-G)\\hss}\vss}";
-VioloncelloContrabasso ="\\hss\\vbox to0pt{\vss\\hbox to0pt{\\hss Violoncello\\hss}\\hbox to0pt{\\hss e\\hss}\\hbox to0pt{\\hss Contrabasso\\hss}\vss}";
-VcCb ="\\hss\\vbox to0pt{\vss\\hbox to0pt{\\hss Vc.\\hss}\\hbox to0pt{\\hss Cb.\\hss}\vss}";
-}
-
 flauti = \notes \relative c' {
   \property Staff.instrument   = #"2 Flauti"
   \property Staff.instr                = #"Fl."
-  c1 \break c
+  c1 
+  \break c
   \bar"|.";
 }
 
@@ -26,9 +13,6 @@ oboi = \notes \relative c' {
 }
 
 clarinetti = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaClarinetti         "
-  %%\property Staff.instr      = #"\\mudelaCl    "
-
   \property Staff.instrument   = #"2 Clarinetti\n(B\\textflat)"
   \property Staff.instr                = #"Cl.\n(B\\textflat)"
 
@@ -42,9 +26,6 @@ fagotti = \notes \relative c' {
 }
 
 corni = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaCorni      "
-  %%\property Staff.instr      = #"\\mudelaCor    "
-
   \property Staff.instrument   = #"2 Corni\n(E\\textflat)"
   \property Staff.instr                = #"Cor.\n(E\\textflat)"
 
@@ -52,9 +33,6 @@ corni = \notes \relative c' {
 }
 
 trombe = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaTrombe        "
-  %%\property Staff.instr      = #"\\mudelaTbe    "
-
   \property Staff.instrument   = #"2 Trombe\n(C)"
   \property Staff.instr                = #"Tbe.\n(C)"
 
@@ -62,9 +40,6 @@ trombe = \notes \relative c' {
 }
 
 timpani = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaTimpani         "
-  %%\property Staff.instr      = #"Timp."
-
   \property Staff.instrument   = #"Timpani\n(C-G)"
   \property Staff.instr                = #"Timp."
 
@@ -90,14 +65,13 @@ viola = \notes \relative c' {
 }
 
 violoncello = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaVioloncelloContrabasso         "
-  %%\property Staff.instr      = #"\\mudelaVcCb    "
-
   \property Staff.instrument   = #"Violoncello\ne\nContrabasso"
   \property Staff.instr                = #"Vc.\nCb."
   c1 c
 }
 
+\include "paper16.ly"
+
 \score {
   < 
     \context StaffGroup ="legni" < 
@@ -105,21 +79,47 @@ violoncello = \notes \relative c' {
       \context Staff ="oboi" \oboi
       \context Staff ="clarinetti" \clarinetti 
       \context Staff ="fagotti" \fagotti 
+    { %%urg
+      \skip 1; 
+      \context Staff="flauti" \property Staff.marginScriptPadding = #25
+      \context Staff ="oboi" \property Staff.marginScriptPadding = #25
+      \context Staff ="clarinetti" \property Staff.marginScriptPadding = #25
+      \context Staff ="fagotti" \property Staff.marginScriptPadding = #25
+    }
     >
     \context StaffGroup ="ottoni" <
       \context Staff ="corni" \corni
       \context Staff ="trombe" \trombe
+    { %%urg
+      \skip 1; 
+      \context Staff="corni" \property Staff.marginScriptPadding = #25
+      \context Staff ="trome" \property Staff.marginScriptPadding = #25
+    }
     >
     \context StaffGroup ="timpani" <
       \context Staff ="timpani" \timpani
+    { %%urg
+      \skip 1; 
+      \context Staff="timpani" \property Staff.marginScriptPadding = #25
+    }
     >
     \context StaffGroup ="archi" <
       \context GrandStaff ="violini" <
         \context Staff ="violino1" \violino1
         \context Staff ="violino2" \violino2
+    { %%urg
+      \skip 1; 
+      \context Staff="violino1" \property Staff.marginScriptPadding = #25
+      \context Staff="violino2" \property Staff.marginScriptPadding = #25
+    }
       >
       \context Staff ="viola" \viola
       \context Staff ="violoncello" \violoncello
+    { %%urg
+      \skip 1; 
+      \context Staff="viola" \property Staff.marginScriptPadding = #25
+      \context Staff="violoncello" \property Staff.marginScriptPadding = #25
+    }
     >
   >
  \header{
@@ -132,12 +132,12 @@ violoncello = \notes \relative c' {
        }
 
   \paper {
+       \paper_sixteen
        indent=100.0\mm;
        linewidth=150.0\mm;
     \translator {
-      \StaffContext
-      \consists Staff_margin_engraver;
-      staffMarginHorizontalPadding = #-12
+      \HaraKiriStaffContext
+      marginScriptPadding = #55  %% urg, this is in pt
     }
   }
 }

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index dff3e7259325bfbbb768d40d0e4fafe8d564660f..e38df9cfbfac1524d147307db125301ef5fa5305 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -208,6 +208,8 @@ Dynamic_engraver::do_process_music ()
       text_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0));
       text_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
        (Side_position_interface::aligned_on_self);
+      //text_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
+      //  (Side_position_interface::aligned_side);
       announce_element (Score_element_info (text_p_, text_req_l_));
     }
 
@@ -294,6 +296,8 @@ Dynamic_engraver::do_process_music ()
          cresc_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0));
          cresc_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
            (Side_position_interface::aligned_on_self);
+         //cresc_p_->dim_cache_[Y_AXIS]->off_callbacks_.push
+         // (Side_position_interface::aligned_side);
          announce_element (Score_element_info (cresc_p_, span_req_l_drul_[START]));
        }
     }

diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index a7f4dbb1d5d2519f0b4254163185d6de5229eaed..cbaf7772452ab9602a57ab8398e13a9a97b5c097 100644 (file)
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -1,15 +1,17 @@
 \paper{
        \paper_sixteen
+       % slurs are never beautiful (no steep slurs)
+       slur_beautiful = 0.0;
 
        %%
-       \translator { \VoiceContext \remove "Dynamic_engraver"; }
+       %%\translator { \VoiceContext \remove "Dynamic_engraver"; }
 
        \translator {
                \VoiceContext
                \name "VoiceOne";
 
                %%
-               \remove "Dynamic_engraver";
+               %%\remove "Dynamic_engraver";
 
                %%\consists "Line_number_engraver";
                verticalDirection = #1
@@ -28,7 +30,7 @@
        }
        \translator { 
                \HaraKiriStaffContext 
-               marginScriptPadding = #10  %% urg, this is in pt
+               marginScriptPadding = #55  %% urg, this is in pt
                \accepts "VoiceOne";
                \accepts "VoiceTwo";
        }

diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index 5f863ca3e2db3235cd2b0f03dcbd15ef92e7f4bf..7d8ad0eba0ddc90021b5d88398c22af8ce8b3b65 100644 (file)
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -1,7 +1,9 @@
 \paper {
+       % slurs are never beautiful (no steep slurs)
+       slur_beautiful = 0.0;
        \translator { 
                \OrchestralPartStaffContext 
-               marginScriptPadding = #10  %% urg, this is in pt
+               marginScriptPadding = #55  %% urg, this is in pt
        }
        \translator {
                \VoiceContext