From 972f8777056c3069a091542637892e408c97ce99 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Mon, 5 Mar 2018 15:16:41 +0100
Subject: [PATCH] Revert "Introduced tutti tags to standards"

This reverts commit ce4f3a6b86a0cb1cc008845cc9243e9abc3fd2ac.

Since tutti tags have been incorporated into the `\dr` and `\fr` commands used by `\tutti`
there's no need for them to occur in music definitions
---
 standards/24_44_standards.side.ily | 60 +++++++++---------------------
 standards/34_standards.side.ily    | 24 ++++--------
 standards/68_standards.side.ily    | 38 ++++++-------------
 standards/98_standards.side.ily    | 14 ++-----
 4 files changed, 40 insertions(+), 96 deletions(-)

diff --git a/standards/24_44_standards.side.ily b/standards/24_44_standards.side.ily
index 2414887..33841a5 100644
--- a/standards/24_44_standards.side.ily
+++ b/standards/24_44_standards.side.ily
@@ -4,89 +4,63 @@
 
 % Midparts
 midone = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
-	  {
+	\tutti {
 		d8:32( |
 		\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32
 		d16. g32 \tuplet 3/2 { d16 g d }			\flamg g8
-
-	  }
-	>>
+	}
 }
 
 midtwo = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
-	  {
+	\tutti {
 		d8:32( |
 		g16.) d32-> g16. g32		d16. g32-> d16. d32
 		\flamg g8 [ d8:32( ]		g8)
-	  }
-	>>
+	}
 }
 midthree = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
-	  {
+	\tutti {
 		d8:32( |			
 		g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g %|
 		\flam g8 [  d8:32( ]		g8)
-	  }
-	>>
+	}
 }
 midfour = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
-	  {
+	\tutti {
 		d8:32( |
 		\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32
 		\drag d16. [  \drag g32  d32 g d g ]	d8
-	  }
-	>>
+	}
 }
 % Endings
 endone = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 }
-	  {
+	\tutti {
 		g8 |
 		\flamd d4 	d4:32(	
-		d4) r8
-	  }
-	>>
+		d4)
+	}	r8
 }
 
 endtwo = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
-	  {
+	\tutti {
 		d8:32( |
 		g8) \flamd d16. g32		d16. \flamg g32 d16. g32
 		\flamd d8[ d8:32( ]		g8)
-	  }
-	>>
+	}
 }
 endthree = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 }
-	  {
+	\tutti {
 		d8:32( |
 		d4)		d4:32(
 		d4) 
-		r8
-	  }
-	>>
+	} 	r8
 }
 endfour = \drummode {
-	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
-	  {
+	\tutti {
 		d8:32( |
 		\triplet { g16) d g } \flam d16. g32	d32 g d g d16. g32
 		\flam d8[ d8:32( ]		g8)
-	  }
-	>>
+	}
 }
 
 % Several Parts
diff --git a/standards/34_standards.side.ily b/standards/34_standards.side.ily
index 5c5ec64..3a7be70 100644
--- a/standards/34_standards.side.ily
+++ b/standards/34_standards.side.ily
@@ -4,29 +4,21 @@
 
 % Midparts
 midone = \drummode {
-	<<
-	  \tag #'tutti \tutti { s4 s4 s4 }
-	  { \flamd d8 d8:32(	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8 }
-	>> |
+	\tutti {
+	  \flamd d8 d8:32(	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8
+	} |
 }
 midtwo = \drummode {
-	<<
-	  \tag #'tutti { s8 \tutti { s8 s4 s4 } }
-	  { d8) d8:32( 	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8 }
-	>> |
+	d8) \tutti {
+	  d8:32( 	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8
+	} |
 }
 % Endings
 endone = \drummode {
-	<<
-	  \tag #'tutti \tutti { s4 s4 s4 }
-	  { \flam d4 	d4:32(	d4)  }
-	>> |
+	\flamd \tutti { d4 	d4:32(	d4)  }
 }
 endtwo = \drummode {
-	<<
-	  \tag #'tutti { s4 \tutti { s4 s4 } }
-	  { d4) d4:32( d4) }
-	>> |
+	d4) \tutti { d4:32(  d4)  }
 }
 
 % Several Parts
diff --git a/standards/68_standards.side.ily b/standards/68_standards.side.ily
index 85f1707..a257b9a 100644
--- a/standards/68_standards.side.ily
+++ b/standards/68_standards.side.ily
@@ -1,54 +1,38 @@
 \version "2.18.2"
 
 \include "lilydrum.ly"
-
 % Midpart
 midone = \drummode {
-	<<
-	  \tag #'tutti \tutti { s4. s4. | s4. s4 }
-	  {
+	\tutti {
 		\flam d8. g16 d8		d4.:32( |
-		d8.) g16 d8		\flam d4
-	  }
-	>>
+		d8.) g16 d8		\flamd d4
+	}
 }
 midtwo = \drummode {%Stonehaven PnD
-	<<
-	  \tag #'tutti \tutti { s4. s4. | s4. s4 }
-	  {
+	\tutti {
 		\flam d8. g16 \flam d8	d16 g d g-> d g |
 		d8. g16 d8	\flam d4
-	  }
-	>>
+	}
 }
 % Endings
 endone = \drummode {
-	<<
-	  \tag #'tutti \tutti { s4. s4. | s4. s4 }
-	  {
+	\tutti {
 		\flam d8. d16:64( d8)		d4.:32( |
 		d8.) g16 d8 		\flamd d4
-	  }
-	>>
+	}
 }
 
 endtwo = \drummode {
-	<<
-	  \tag #'tutti \tutti { s4. s4. | s4. s4 }
-	  {
+	\tutti {
 		\flam d8. g16 d8	d16 g d g d8 |
 		d4.:32(		d4)
-	  }
-	>>
+	}
 }
 endthree = \drummode {%Stonehaven PnD
-	<<
-	  \tag #'tutti \tutti { s4. s4. | s4. s4 }
-	  {
+	\tutti {
 		\flam d8. g16 d32 g d g	d8. g16 \flam d8 |
 		d4.:32(		d4)
-	  }
-	>>
+	}
 }
 % Parts
 pempty = \drummode {
diff --git a/standards/98_standards.side.ily b/standards/98_standards.side.ily
index 73299f3..4f55df6 100644
--- a/standards/98_standards.side.ily
+++ b/standards/98_standards.side.ily
@@ -4,9 +4,7 @@
 composerSide = "E.T. de Boone, 05-01-2017"
 % Midparts
 midone = \drummode {
-	<<
-	  \tutti { s8 | s4. s4. s4. | s4. s4. s4 }
-	  {
+	\tutti {
 		d16 g |
 		\flam d8. g16:64( g8)
 		d4.:32(
@@ -15,14 +13,11 @@ midone = \drummode {
 		d8. \flam g16 d8
 		d4.:32(
 		d4)
-	 }
-   >>
+	}
 }
 % Endings
 endone = \drummode {
-	<<
-	  \tutti { s8 | s4. s4. s4. | s4. s4. s4 }
-	  {
+	\tutti {
 		g8 |
 		\flam d8. d16 g8
 		\flam d4 \drag g8
@@ -31,8 +26,7 @@ endone = \drummode {
 		d8. \flam g16 d8
 		d4.:32(
 		d4)
-	  }
-	>>
+	}
 }
 
 % Several Parts