patch::: 1.3.80.mb1

[lilypond.git] / input / test / coriolan-margin.ly

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 5f8601d498dd982fdcb5f18740dffbd493e82f35..865543e8f1646f970ba318c536c5f63206496376 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,8 +1,11 @@
 flauti = \notes \relative c' {
   \property Staff.instrument   = #"2 Flauti"
   \property Staff.instr                = #"Fl."
+  \time 4/4;
   c1 
   \break c
+%  \break c
+%  \break c
   \bar"|.";
 }
 
@@ -61,7 +64,8 @@ violino2 = \notes \relative c' {
 viola = \notes \relative c' {
   \property Staff.instrument   = #"Viola"
   \property Staff.instr                = #"Vla."
-  c1 c
+  c1 c 
+  %c
 }
 
 violoncello = \notes \relative c' {
@@ -79,47 +83,26 @@ 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
-    }
+     { 
+       \skip 1; 
+       % Hmm: this forces a staff-bracket, that's good!
+       % However, I can't find where is decided on staff-bracket yes/no
+     }
     >
     \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{
@@ -137,7 +120,17 @@ violoncello = \notes \relative c' {
        linewidth=150.0\mm;
     \translator {
       \HaraKiriStaffContext
-      marginScriptPadding = #55  %% urg, this is in pt
+    }
+    \translator {
+      \OrchestralScoreContext
+      timeSignatureStyle = #"C"
+      % 16 pt
+      instrumentScriptPadding = #55  %% urg, this is in pt
+      instrScriptPadding = #35
+      % 20pt
+      %instrumentScriptPadding = #60  %% urg, this is in pt
+      %instrScriptPadding = #40
+      marginScriptHorizontalAlignment = #1
     }
   }
 }