Merge branch 'master' of git+ssh://reinhold@repo.or.cz/srv/git/orchestrallily

.gitignore

 *~
+test.*
+test_cases.p*
+*.bak
+Documentation/texi
+Documentation/orchestrallily
+test
+
+

Documentation/orchestrallily.tely

@@ -20,7 +20,7 @@
 @c *******************************************************
 
 @copying
-This is the documentation of the OrchestralLily package for Liliypond, the GNU music
+This is the documentation of the OrchestralLily package for Lilypond, the GNU music
 typesetting application.
 
 Copyright @copyright{} 2008 Reinhold Kainhofer, @email{reinhold@@kainhofer.com}
@@ -54,7 +54,7 @@ Copyright @copyright{} 2008 Reinhold Kainhofer, @email{reinhold@@kainhofer.com}
 
 @ifnottex
 @node Top
-@top The OrchestralLily Pckage
+@top The OrchestralLily Package
 
 @itemize
 @item @b{Description}: A @uref{http://www.lilypond.org/, Lilypond} package to easily generate orchestral scores and other complex scores.
@@ -203,7 +203,7 @@ DadaSSoloSettings = {
 @end lilypond
 
 
-In full scores, the violoncello and contrabasso staff is typically shown with a bracket (StaffGroup) of their own, and the solo staves are shown without any bracket. To achieve this, all you have to do is to define the correct score structure (including a VcB staff group, consisting only of the Vc staff):
+In full scores, the violoncello and contrabass staff is typically shown with a bracket (StaffGroup) of their own, and the solo staves are shown without any bracket. To achieve this, all you have to do is to define the correct score structure (including a VcB staff group, consisting only of the Vc staff):
 
 @lilypond[quote,verbatim]
 \version "2.11.40"
@@ -627,7 +627,7 @@ The list can contain each identifier only once, but they do not have to form onl
 @lilyverb{\setUseBook ##t}
   * Typical call: @code{\setUseBook ##t}
   * Description: Declare whether the scores are called within a @code{\book} section or as top-level. 
-  * Explanation: Internall, a score needs to be created differently if it should be printed inside a @code{\book} environment. Unfortunately, it is not possible in lilypond to detect the current environment, so this function is needed to explicitly declare that the following scores are inserted inside a @code{\book} environment.
+  * Explanation: Internally, a score needs to be created differently if it should be printed inside a @code{\book} environment. Unfortunately, it is not possible in lilypond to detect the current environment, so this function is needed to explicitly declare that the following scores are inserted inside a @code{\book} environment.
   * Parameters: 
     * @b{inside book} ... @code{##t} if the following scores are inside a @code{\book} environment, @code{##f} if not (default)
 setUseBook = #(define-music-function (parser location usebook) (boolean?) 
@@ -714,7 +714,7 @@ FIXME: not yet documented
 @node Can I use different variable names?
 @unnumberedsec I don't like the variable names, can I use a different order?
 
-If you don't like that the variables are generated as @code{\PieceInstrumentVarname}, you can override this behaviour by redefining the scheme function @code{(namedPieceInstrObject piece instr name)}. The default implementation is:
+If you don't like that the variables are generated as @code{\PieceInstrumentVarname}, you can override this behavior by redefining the scheme function @code{(namedPieceInstrObject piece instr name)}. The default implementation is:
 @lilyverb{@c
 #(define (namedPieceInstrObject piece instr name)
   (let* (

test_cases.ly

+\version "2.11.40"
+\include "orchestrallily.ly"
+
+\header { title = "OrchestralLily Structure test case" }
+
+% TestPieceName = "Test piece"
+
+
+TestIiMusic = \relative c' {\voiceOne c4 g' c, b' }
+TestIiiMusic = \relative c'' {\voiceTwo c2 c,8 e g c}
+TestIiiLyrics = \lyricmode { Da, da -- da -- da -- da! }
+TestIiiiMusic = \relative c { c1 }
+TestIivMusic = \relative c' { c2 c2 }
+TestIvMusic = \relative c' { d1 }
+TestIviMusic = \relative c' { d2 d2 }
+TestIviiMusic = \relative c' { e1 }
+TestIviiiMusic = \relative c' { e2 e2 }
+TestIixMusic = \figuremode { <6>2 <6 _!>2 }
+TestIxMusic = \drummode { crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat }
+
+
+\orchestralScoreStructure #'(
+  ("SG" "StaffGroup" ("Ii" "Iii" "Iiii"))
+  ("CS" "ChoirStaff" ("Ii" "Iii" "Iiii"))
+  ("GS" "GrandStaff" ("Ii" "Iii" "Iiii"))
+  ("Parallel" "ParallelMusic" ("Ii" "Iii" "Iiii"))
+  ("Simultaneous" "SimultaneousMusic" ("Ii" "Iii" "Iiii"))
+  
+  ("NG1" "GrandStaff" ("Ii" "Iii"))
+  ("NG2" "ChoirStaff" ("Iiii" "NG1"))
+  ("NG3" "GrandStaff" ("Iiv" "Iv"))
+  ("NG4" "ParallelMusic" ("Ivi" "Ivii"))
+  ("NestedGroups" "StaffGroup" ("NG1" "NG2" "NG3" "NG4"))
+  
+  ("Staff" "Staff" ("Ii"))
+  ("Ix" "DrumStaff" ())
+  ("ParallelStaff" "ParallelVoicesStaff" ("Ii" "Iii"))
+
+  ("Combined2" "PartCombinedStaff" ("Ivi" "Iiv"))
+  ("Combined1" "PartCombinedStaff" ("Iiv"))
+  ("Combined1x" "PartCombinedStaff" ("Iiv" "something"))
+  ("Combinedx" "PartCombinedStaff" ("something"))
+    
+  ("FigBStaff" "ParallelVoicesStaff" ("Ii" "Iix"))
+)
+\orchestralVoiceTypes #'(
+  ("Ix" "DrumVoice")
+  ("Iix" "FiguredBass")
+)
+
+
+\markup{"Single Instrument"}
+\createScore #"Test" #'("Ii")
+
+\markup{"Multiple toplevel Instruments"}
+\createScore #"Test" #'("Ii" "Iiv" "Iv")
+
+
+
+\markup{"Lyrics to voice"}
+\createScore #"Test" #'("Iii")
+
+\markup{"Instrument & short instrument name"}
+IiInstrumentName = "Instrument 1"
+IiShortInstrumentName = "I.1"
+TestIiMusic = \relative c' { c4 g' c, b' \break c1 }
+\createScore #"Test" #'("Ii")
+% reset the values!
+IiInstrumentName = ""
+IiShortInstrumentName = ""
+TestIiMusic = \relative c' { c4 g' c, b' }
+
+\markup {"Clef for instrument"}
+IiiiClef = \clef "bass"
+\createScore #"Test" #'("Iiii")
+
+\markup {"Settings"}
+TestSettings = {\mark\markup{\italic "Slow."}}
+\createScore #"Test" #'("Ii")
+TestSettings = {}
+
+
+
+% Staff groups:
+\markup{"StaffGroup"}
+\createScore #"Test" #'("SG")
+\markup{"ChoirStaff"}
+\createScore #"Test" #'("CS")
+\markup{"GrandStaff"}
+\createScore #"Test" #'("GS")
+\markup{"ParallelMusic"}
+\createScore #"Test" #'("Parallel")
+\markup{"SimultaneousMusic"}
+\createScore #"Test" #'("Simultaneous")
+
+\markup{"Nested Groups"}
+\createScore #"Test" #'("NestedGroups")
+
+% Staves
+\markup{"Staff"}
+\createScore #"Test" #'("Staff")
+
+\markup{"Drum staff"}
+\createScore #"Test" #'("Ix")
+
+\markup{"Part-combination"}
+\createScore #"Test" #'("Combined2")
+\markup{"Part-combination, only one voice given"}
+\createScore #"Test" #'("Combined1")
+\markup{"Part-combination, only one existing voice"}
+\createScore #"Test" #'("Combined1x")
+\markup{"Part-combination, no existing voice given"}
+\createScore #"Test" #'("Combinedx")
+
+\markup{"Staff with parallel voices"}
+\createScore #"Test" #'("ParallelStaff")
+
+
+\markup{"Staff with figured bass"}
+\createScore #"Test" #'("FigBStaff")
+