From 486e234ea1edc215f036aa83a6fc4a4d43e4fb62 Mon Sep 17 00:00:00 2001
From: Joachim Schmitz <jojo@schmitz-digital.de>
Date: Wed, 10 Jun 2020 16:45:46 +0200
Subject: [PATCH] Use "Merge matching rests" in the closed score SATB and
 barbershop templates

---
 share/templates/02-Choral/04-SATB_Closed_Score.mscx          | 2 ++
 share/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscx  | 2 ++
 share/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscx  | 2 ++
 share/templates/02-Choral/08-Barbershop_Quartet_(Men).mscx   | 2 ++
 share/templates/02-Choral/09-Barbershop_Quartet_(Women).mscx | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/share/templates/02-Choral/04-SATB_Closed_Score.mscx b/share/templates/02-Choral/04-SATB_Closed_Score.mscx
index 6fccf41f8e98c..17f4e431ecdfc 100644
--- a/share/templates/02-Choral/04-SATB_Closed_Score.mscx
+++ b/share/templates/02-Choral/04-SATB_Closed_Score.mscx
@@ -31,6 +31,7 @@
         <StaffType group="pitched">
           <name>stdNormal</name>
           </StaffType>
+        <mergeMatchingRests>1</mergeMatchingRests>
         <bracket type="0" span="2" col="0"/>
         </Staff>
       <trackName>Women</trackName>
@@ -100,6 +101,7 @@ A</longName>
           </StaffType>
         <defaultConcertClef>G8vb</defaultConcertClef>
         <defaultTransposingClef>F</defaultTransposingClef>
+        <mergeMatchingRests>1</mergeMatchingRests>
         </Staff>
       <trackName>Men</trackName>
       <Instrument>
diff --git a/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscx b/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscx
index 7cd12479c115f..bdee99981487b 100644
--- a/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscx
+++ b/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscx
@@ -31,6 +31,7 @@
         <StaffType group="pitched">
           <name>stdNormal</name>
           </StaffType>
+        <mergeMatchingRests>1</mergeMatchingRests>
         <bracket type="0" span="2" col="0"/>
         </Staff>
       <trackName>Women</trackName>
@@ -99,6 +100,7 @@
           </StaffType>
         <defaultConcertClef>G8vb</defaultConcertClef>
         <defaultTransposingClef>F</defaultTransposingClef>
+        <mergeMatchingRests>1</mergeMatchingRests>
         </Staff>
       <trackName>Men</trackName>
       <Instrument>
diff --git a/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscx b/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscx
index 478f391744987..11659366c9507 100644
--- a/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscx
+++ b/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscx
@@ -31,6 +31,7 @@
         <StaffType group="pitched">
           <name>stdNormal</name>
           </StaffType>
+        <mergeMatchingRests>1</mergeMatchingRests>
         <bracket type="0" span="2" col="0"/>
         </Staff>
       <trackName>Women</trackName>
@@ -99,6 +100,7 @@
           </StaffType>
         <defaultConcertClef>G8vb</defaultConcertClef>
         <defaultTransposingClef>F</defaultTransposingClef>
+        <mergeMatchingRests>1</mergeMatchingRests>
         </Staff>
       <trackName>Men</trackName>
       <Instrument>
diff --git a/share/templates/02-Choral/08-Barbershop_Quartet_(Men).mscx b/share/templates/02-Choral/08-Barbershop_Quartet_(Men).mscx
index 5ce1dc00083e4..e27d42e52af2a 100644
--- a/share/templates/02-Choral/08-Barbershop_Quartet_(Men).mscx
+++ b/share/templates/02-Choral/08-Barbershop_Quartet_(Men).mscx
@@ -32,6 +32,7 @@
           <name>stdNormal</name>
           </StaffType>
         <defaultClef>G8vb</defaultClef>
+        <mergeMatchingRests>1</mergeMatchingRests>
         <bracket type="0" span="2" col="0"/>
         </Staff>
       <trackName>TENOR LEAD</trackName>
@@ -102,6 +103,7 @@ LEAD</longName>
           </StaffType>
         <defaultConcertClef>G8vb</defaultConcertClef>
         <defaultTransposingClef>F</defaultTransposingClef>
+        <mergeMatchingRests>1</mergeMatchingRests>
         </Staff>
       <trackName>BARITONE BASS</trackName>
       <Instrument>
diff --git a/share/templates/02-Choral/09-Barbershop_Quartet_(Women).mscx b/share/templates/02-Choral/09-Barbershop_Quartet_(Women).mscx
index ed0eb6519969b..6d05607bd24b6 100644
--- a/share/templates/02-Choral/09-Barbershop_Quartet_(Women).mscx
+++ b/share/templates/02-Choral/09-Barbershop_Quartet_(Women).mscx
@@ -32,6 +32,7 @@
           <name>stdNormal</name>
           </StaffType>
         <defaultClef>G</defaultClef>
+        <mergeMatchingRests>1</mergeMatchingRests>
         <bracket type="0" span="2" col="0"/>
         </Staff>
       <trackName>TENOR LEAD</trackName>
@@ -102,6 +103,7 @@ LEAD</longName>
           </StaffType>
         <defaultConcertClef>G</defaultConcertClef>
         <defaultTransposingClef>F8va</defaultTransposingClef>
+        <mergeMatchingRests>1</mergeMatchingRests>
         </Staff>
       <trackName>BARITONE BASS</trackName>
       <Instrument>