From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Fri, 16 Dec 2011 13:31:38 +0000 (+0100)
Subject: Fix typos, incipit etc.
X-Git-Url: https://repo.or.cz/w/orchestrallily.git/commitdiff_plain/a60af027f09ddad3f57c4ba65251abb93748c06a

Fix typos, incipit etc.
---

diff --git a/oly_settings_choralscore.ily b/oly_settings_choralscore.ily
index e44b37b..614a882 100644
--- a/oly_settings_choralscore.ily
+++ b/oly_settings_choralscore.ily
@@ -3,6 +3,7 @@
 #(ly:set-option 'relative-includes #t)
 #(ly:set-option 'incipit #t)
 \include "oly_settings_fullscore.ily"
+#(ly:set-option 'incipit #f)
 
 % Don't print short instruments name, they are clear from the beginning
 OShortInstrumentName = \markup\null
diff --git a/oly_settings_names.ily b/oly_settings_names.ily
index 960c36c..0d0dd68 100644
--- a/oly_settings_names.ily
+++ b/oly_settings_names.ily
@@ -182,11 +182,11 @@ SShortInstrumentName = "S."
 % SShortInstrumentName = ##f
 AShortInstrumentName = "A."
 TShortInstrumentName = "T."
-TShortInstrumentName = "T.1"
-TShortInstrumentName = "T.2"
+TIShortInstrumentName = "T.1"
+TIIShortInstrumentName = "T.2"
 BShortInstrumentName = "B."
-BShortInstrumentName = "B.1"
-BShortInstrumentName = "B.2"
+BIShortInstrumentName = "B.1"
+BIIShortInstrumentName = "B.2"
 SSoloShortInstrumentName  = "S.Solo"
 ASoloShortInstrumentName  = "A.Solo"
 TSoloShortInstrumentName  = "T.Solo"
@@ -241,11 +241,11 @@ cueCh = "Coro"
 cueS = "S."
 cueA = "A."
 cueT = "T."
-cueT = "T.1"
-cueT = "T.2"
+cueTI = "T.1"
+cueTII = "T.2"
 cueB = "B."
-cueB = "B.1"
-cueB = "B.2"
+cueBI = "B.1"
+cueBII = "B.2"
 cueO = "Org."
 cueBC = "B.C."
 
@@ -407,11 +407,11 @@ BMidiInstrument = "voice oohs"
 SMidiInstrument = "synth voice"
 AMidiInstrument = "choir aahs"
 TMidiInstrument = "voice oohs"
-TMidiInstrument = \TMidiInstrument
-TMidiInstrument = \TMidiInstrument
+TIMidiInstrument = \TMidiInstrument
+TIIMidiInstrument = \TMidiInstrument
 BMidiInstrument = "synth voice"
-BMidiInstrument = \BMidiInstrument
-BMidiInstrument = \BMidiInstrument
+BIMidiInstrument = \BMidiInstrument
+BIIMidiInstrument = \BMidiInstrument
 SSoloMidiInstrument = "synth voice"
 TSoloMidiInstrument = "synth voice"
 BSoloMidiInstrument = "synth voice"
diff --git a/oly_settings_vocalscore.ily b/oly_settings_vocalscore.ily
index ca482fd..989d3d3 100644
--- a/oly_settings_vocalscore.ily
+++ b/oly_settings_vocalscore.ily
@@ -22,6 +22,7 @@
 % TShortInstrumentName = ""
 % BShortInstrumentName = ""
 % PShortInstrumentName = ""
+#(ly:set-option 'incipit #f)
 
 \header {
   instrument = \VocalScoreTitle
diff --git a/oly_settings_vocalvoice.ily b/oly_settings_vocalvoice.ily
index 8303bfc..1b5c875 100644
--- a/oly_settings_vocalvoice.ily
+++ b/oly_settings_vocalvoice.ily
@@ -2,6 +2,7 @@
 % lilypond settings for vocal scores
 #(ly:set-option 'relative-includes #t)
 \include "oly_settings_global.ily"
+#(ly:set-option 'incipit #f)
 
 \paper {
   ragged-bottom = ##f
diff --git a/orchestrallily.ily b/orchestrallily.ily
index 3a781c6..f79cb89 100644
--- a/orchestrallily.ily
+++ b/orchestrallily.ily
@@ -176,8 +176,8 @@ conditionalBreak = #(define-music-function (parser location) ()
 
 ; Piano reduction
   ;("Piano" "SimultaneousMusic" ("Organ"))
-  ("OrganScore" "SimultaneousMusic" ("ChoralScore" "O"))
-  ("VocalScore" "SimultaneousMusic" ("ChoralScore" "P"))
+  ("OrganScore" "SimultaneousMusic" ("SoloChoirScore" "O"))
+  ("VocalScore" "SimultaneousMusic" ("SoloChoirScore" "P"))
   ("Particell"  "SimultaneousMusic" ("ChoralScore" "BassGroup"))
 
 ; Full scores: Orchestral score and long score including organ
@@ -546,7 +546,7 @@ orchestralVoiceTypes = #(define-music-function (parser location types) (list?)
   (cond
       ((and (pair? music) (ly:music? (car music)) (not-null? (cdr music)) (ly:music? (cadr music)))
           ;(ly:message "Part-combine with two music expressions")
-          (oly:staff_handler_internal parser piece name "Staff" (list (make-part-combine-music parser music))))
+          (oly:staff_handler_internal parser piece name "Staff" (list (make-part-combine-music parser music 0))))
       ((null? music)
           ;;(ly:warning "Part-combine without any music expressions")
           '())