From 1f3579b543de896b60d9c11f7a9d51b15612f34c Mon Sep 17 00:00:00 2001
From: James Lowe <pkx166h@gmail.com>
Date: Fri, 4 Jul 2014 06:35:06 +0100
Subject: [PATCH] Doc:NR Appendix - Clef Styles - added G2 and modernTab Clefs

Issue 3988

Added two Clefs to notation-appendices.itely - Clef Styles

\clef "G2" and \clef moderntab

Removed excessive brackets in the @lilypond constructions and
updated the '\clef tab' entry so that it engraves correct out
put by adding a \new TabStaff block in the @lilypond example.
---
 .../notation/notation-appendices.itely        | 217 ++++++++----------
 1 file changed, 101 insertions(+), 116 deletions(-)

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index bf8ac4efd7..23aef2f865 100644
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -1246,241 +1246,226 @@ The following table shows all the different clef styles possible
 
 @multitable @columnfractions .30 .2 .30 .2
 
-@item
-@b{Example}
+@headitem
+Example
 @tab
-@b{Output}
+Output
 @tab
-@b{Example}
+Example
 @tab
-@b{Output}
+Output
 
 
 @item
 @code{\clef G}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef G
-  { c1 }
-}
+\clef G c1
 @end lilypond
+
 @tab
-@code{\clef treble}
+@code{\clef "G2"}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef treble
-  { c1 }
-}
+\clef "G2"
+c1
 @end lilypond
 
 @item
-@code{\clef violin}
+@code{\clef treble}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef violin
-  { c1 }
-}
+\clef treble
+c1
 @end lilypond
+
 @tab
-@code{\clef french}
+@code{\clef violin}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef french
-  { c1 }
-}
+\clef violin
+c1
 @end lilypond
 
 @item
-@code{\clef GG}
+@code{\clef french}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef GG
-  { c1 }
-}
+\clef french
+c1
 @end lilypond
 
 @tab
-@code{\clef tenorG}
+@code{\clef GG}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef tenorG
-  { c1 }
-}
+\clef GG
+c1
 @end lilypond
 
 @item
-@code{\clef soprano}
+@code{\clef tenorG}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef soprano
-  { c1 }
-}
+\clef tenorG
+c1
 @end lilypond
 
 @tab
-@code{\clef mezzosoprano}
+@code{\clef soprano}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef mezzosoprano
-  { c1 }
-}
+\clef soprano
+c1
 @end lilypond
 
 @item
-@code{\clef C}
+@code{\clef mezzosoprano}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef C
-  { c1 }
-}
+\clef mezzosoprano
+c1
 @end lilypond
 
 @tab
-@code{\clef alto}
+@code{\clef C}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef alto
-  { c1 }
-}
+\clef C
+c1
 @end lilypond
 
 @item
-@code{\clef tenor}
+@code{\clef alto}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef tenor
-  { c1 }
-}
+\clef alto
+c1
 @end lilypond
 
 @tab
-@code{\clef baritone}
+@code{\clef tenor}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef baritone
-  { c1 }
-}
+\clef tenor
+c1
 @end lilypond
 
 @item
-@code{\clef varC}
+@code{\clef baritone}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef varC
-  { c1 }
-}
+\clef baritone
+c1
 @end lilypond
 
 @tab
-@code{\clef altovarC}
+@code{\clef varC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef altovarC
-  { c1 }
-}
+\clef varC
+c1
 @end lilypond
 
 @item
-@code{\clef tenorvarC}
+@code{\clef altovarC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef tenorvarC
-  { c1 }
-}
+\clef altovarC
+c1
 @end lilypond
 
 @tab
-@code{\clef baritonevarC}
+@code{\clef tenorvarC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef baritonevarC
-  { c1 }
-}
+\clef tenorvarC
+c1
 @end lilypond
 
 @item
-@code{\clef varbaritone}
+@code{\clef baritonevarC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef varbaritone
-  { c1 }
-}
+\clef baritonevarC
+c1
 @end lilypond
 
 @tab
-@code{\clef baritonevarF}
+@code{\clef varbaritone}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef baritonevarF
-  { c1 }
-}
+\clef varbaritone
+c1
 @end lilypond
 
 @item
-@code{\clef F}
+@code{\clef baritonevarF}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef F
-  { c1 }
-}
+\clef baritonevarF
+c1
 @end lilypond
 
 @tab
-@code{\clef bass}
+@code{\clef F}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef bass
-  { c1 }
-}
+\clef F
+c1
 @end lilypond
 
 @item
-@code{\clef subbass}
+@code{\clef bass}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef subbass
-  { c1 }
-}
+\clef bass
+c1
 @end lilypond
 
 @tab
+@code{\clef subbass}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef subbass
+c1
+@end lilypond
+
+@item
 @code{\clef percussion}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef percussion
-  { c1 }
+\clef percussion
+c1
+@end lilypond
+
+@tab
+@c @example does not work as expected within multitables
+@code{
+\new TabStaff @{ @*
+@ @ \clef tab @*
+@}
+}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\new TabStaff {
+  \clef tab
+  c1
 }
 @end lilypond
 
 @item
-@code{\clef tab}
+@c @example does not work as expected within multitables
+@code{
+\new TabStaff @{ @*
+@ @ \clef moderntab @*
+@}
+}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef tab
-  { c1 }
+\new TabStaff {
+  \clef moderntab
+  c1
 }
 @end lilypond
 
-- 
2.39.2