* input/test/nested-groups.ly: remove. move content (to next).

	* input/test/staff-bracket.ly: replace content (from prev), this
	has been already in templates.

diff --git a/ChangeLog b/ChangeLog
index beaba48fe80ad87c84a65d88e516a164625909d9..be55b78dcb2a6bcbd61f72f13465002f1a8bc0ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-03  Heikki Junes <hjunes@cc.hut.fi>
+
+       * input/test/nested-groups.ly: remove. move content (to next). 
+       * input/test/staff-bracket.ly: replace content (from prev), this 
+       has been already in templates.
+
 2004-03-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * stepmake/autogen.sh: Only issue warning about running configure

diff --git a/input/test/nested-groups.ly b/input/test/nested-groups.ly
deleted file mode 100644 (file)
index 519da6c..0000000
--- a/input/test/nested-groups.ly
+++ /dev/null
@@ -1,45 +0,0 @@
-\version "2.1.26" 
-
-\header{ texidoc="@cindex Nested Staff Groups
-Staffs can be nested in various combinations. Here, @code{StaffGroup}
-and @code{ChoirStaff} produce similar straight brackets, whereas 
-@code{GrandStaff} produces curly brackets. In @code{InnerStaffGroup} 
-and @code{InnerChoirStaff}, the brackets are shifted leftwards.
-
-"
-}
-
-\score { \notes
-<<
-  \new StaffGroup << 
-  \new Staff {c' d' e' f'}
-  \new InnerStaffGroup <<
-   \new Staff {c' d' e' f'}
-   \new GrandStaff <<
-     \new Staff {c' d' e' f'}
-     \new Staff {c' d' e' f'}
-   >>
-  \new Staff {c' d' e' f'}
-  >>
-  \new ChoirStaff <<
-   \new Staff {c' d' e' f'}
-    \new InnerStaffGroup <<
-     \new Staff {c' d' e' f'}
-    >>
-   \new Staff {c' d' e' f'}
-  >>
-  >>
-  \new ChoirStaff << 
-   \new Staff {c' d' e' f'}
-   \new InnerChoirStaff <<
-    \new Staff {c' d' e' f'}
-    \new Staff {c' d' e' f'}
-   >>
-   \new Staff {c' d' e' f'}
-  >>
-
->>
-
- \paper { raggedright = ##t}
-}
-

diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index cf6ea6596c678ae365d1685c6e752479c5e6d099..519da6c6d77f1f8fe0fb72434fcc8f4267c68d73 100644 (file)
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,27 +1,45 @@
-\version "2.1.26"
+\version "2.1.26" 
 
-\header{texidoc = "@cindex Staff Bracket
-In a music with piano accompaniment, staff brackets, like the one in 
-this example can be used. "
+\header{ texidoc="@cindex Nested Staff Groups
+Staffs can be nested in various combinations. Here, @code{StaffGroup}
+and @code{ChoirStaff} produce similar straight brackets, whereas 
+@code{GrandStaff} produces curly brackets. In @code{InnerStaffGroup} 
+and @code{InnerChoirStaff}, the brackets are shifted leftwards.
+
+"
 }
 
-\score
-{
-  \new StaffGroup \notes \relative c'' <<
-      \new Staff {  b1 }
-    \new PianoStaff <<
-      \new Staff \notes { b1 }
-      \new Staff \notes { b1 }
-    >> 
+\score { \notes
+<<
+  \new StaffGroup << 
+  \new Staff {c' d' e' f'}
+  \new InnerStaffGroup <<
+   \new Staff {c' d' e' f'}
+   \new GrandStaff <<
+     \new Staff {c' d' e' f'}
+     \new Staff {c' d' e' f'}
+   >>
+  \new Staff {c' d' e' f'}
+  >>
+  \new ChoirStaff <<
+   \new Staff {c' d' e' f'}
+    \new InnerStaffGroup <<
+     \new Staff {c' d' e' f'}
+    >>
+   \new Staff {c' d' e' f'}
+  >>
   >>
+  \new ChoirStaff << 
+   \new Staff {c' d' e' f'}
+   \new InnerChoirStaff <<
+    \new Staff {c' d' e' f'}
+    \new Staff {c' d' e' f'}
+   >>
+   \new Staff {c' d' e' f'}
+  >>
+
+>>
 
-  \paper {
-    \translator
-    {
-      \StaffContext
-      \consists Instrument_name_engraver
-    }
-    raggedright=##t
-  }
+ \paper { raggedright = ##t}
 }