From d16e7279d4bb3c48bb319fe87c1f2ae86de7df3d Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Fri, 17 Sep 2010 14:25:32 +0200
Subject: [PATCH] Vc and Cb are always identical, so use VcB only

---
 Czerny_BeatusVir19_Instrument_Cb.ly                  | 10 ----------
 Czerny_BeatusVir19_Instrument_Vc.ly                  | 10 ----------
 Czerny_BeatusVir19_Instrument_VcB.ly                 | 10 ++++++++++
 Czerny_BeatusVir19_Music_BeatusVir.ily               |  6 ++----
 Makefile                                             |  2 +-
 TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex |  7 ++-----
 TeX_Czerny_BeatusVir19_Score_Instruments.tex         |  7 ++-----
 7 files changed, 17 insertions(+), 35 deletions(-)
 delete mode 100644 Czerny_BeatusVir19_Instrument_Cb.ly
 delete mode 100644 Czerny_BeatusVir19_Instrument_Vc.ly
 create mode 100644 Czerny_BeatusVir19_Instrument_VcB.ly

diff --git a/Czerny_BeatusVir19_Instrument_Cb.ly b/Czerny_BeatusVir19_Instrument_Cb.ly
deleted file mode 100644
index ba0eebe..0000000
--- a/Czerny_BeatusVir19_Instrument_Cb.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.29"
-\include "Czerny_BeatusVir19_Settings_Instrument.ily"
-
-\header {
-  instrument = \CbInstrumentName
-  scorenumber = \markup{\scoreNumber \CbNumber}
-}
-
-\createScore #"BeatusVir" #'("Cb")
-
diff --git a/Czerny_BeatusVir19_Instrument_Vc.ly b/Czerny_BeatusVir19_Instrument_Vc.ly
deleted file mode 100644
index 14ff2f1..0000000
--- a/Czerny_BeatusVir19_Instrument_Vc.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.13.29"
-\include "Czerny_BeatusVir19_Settings_Instrument.ily"
-
-\header {
-  instrument = \VcInstrumentName
-  scorenumber = \markup{\scoreNumber \VcNumber}
-}
-
-\createScore #"BeatusVir" #'("Vc")
-
diff --git a/Czerny_BeatusVir19_Instrument_VcB.ly b/Czerny_BeatusVir19_Instrument_VcB.ly
new file mode 100644
index 0000000..d4cd5c1
--- /dev/null
+++ b/Czerny_BeatusVir19_Instrument_VcB.ly
@@ -0,0 +1,10 @@
+\version "2.13.29"
+\include "Czerny_BeatusVir19_Settings_Instrument.ily"
+
+\header {
+  instrument = \VcBInstrumentName
+  scorenumber = \markup{\scoreNumber \VcBNumber}
+}
+
+\createScore #"BeatusVir" #'("VcB")
+
diff --git a/Czerny_BeatusVir19_Music_BeatusVir.ily b/Czerny_BeatusVir19_Music_BeatusVir.ily
index 7e7f0cf..8c391d3 100644
--- a/Czerny_BeatusVir19_Music_BeatusVir.ily
+++ b/Czerny_BeatusVir19_Music_BeatusVir.ily
@@ -1213,13 +1213,11 @@ BeatusVirVcMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "BeatusVirVcMusic" { \BeatusVirVcMusic }
 
 
-BeatusVirCbMusic = \relative c' {
+BeatusVirVcBMusic = \relative c' {
   s8
   % TODO
 }
-\addQuote "BeatusVirCbMusic" { \BeatusVirCbMusic }
-
+\addQuote "BeatusVirVcBMusic" { \BeatusVirVcBMusic }
 
diff --git a/Makefile b/Makefile
index ad3334e..1da1e61 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ OUT=out
 
 base = Czerny_BeatusVir19
 SRCS = $(base)_Music_BeatusVir.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
-instruments = ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Vc Cb
+instruments = ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B VcB
 scores = Long Full Vocal Choral Original
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
diff --git a/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex b/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex
index 2307ce7..44c8e05 100644
--- a/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex
+++ b/TeX_Czerny_BeatusVir19_Include_ContentsMaterial.itex
@@ -15,11 +15,9 @@
 \scorelistbox{
 Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 
-\LongScoreName{} (-\LongScoreNumber),
 \FullScoreName{} (-\FullScoreNumber),
 \VocalScoreName{} (-\VocalScoreNumber),
-\ChoralScoreName{} (-\ChoralScoreNumber),
-\OriginalScoreName{} (-\OriginalScoreNumber);
+\ChoralScoreName{} (-\ChoralScoreNumber);
 
 \ClIName{} (-\ClINumber),
 \ClIIName{} (-\ClIINumber),
@@ -37,8 +35,7 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 \AName{} (-\ANumber),
 \TName{} (-\TNumber),
 \BName{} (-\BNumber),
-\VcName{} (-\VcNumber),
-\CbName{} (-\CbNumber).
+\VcBName{} (-\VcBNumber).
 
 }
 \end{center}
diff --git a/TeX_Czerny_BeatusVir19_Score_Instruments.tex b/TeX_Czerny_BeatusVir19_Score_Instruments.tex
index 08cc715..4bbe9b3 100644
--- a/TeX_Czerny_BeatusVir19_Score_Instruments.tex
+++ b/TeX_Czerny_BeatusVir19_Score_Instruments.tex
@@ -64,11 +64,8 @@
 \addcontentsline{toc}{section}{\BName}
 \includescore{Instrument_B}
 \phantomsection
-\addcontentsline{toc}{section}{\VcName}
-\includescore{Instrument_Vc}
-\phantomsection
-\addcontentsline{toc}{section}{\CbName}
-\includescore{Instrument_Cb}
+\addcontentsline{toc}{section}{\VcBName}
+\includescore{Instrument_VcB}
 
 
 
-- 
GitLab