From 17fecdfc86780cccffdf8fb91a1394da2980860a Mon Sep 17 00:00:00 2001
From: James Lowe <pkx166h@gmail.com>
Date: Wed, 18 Jun 2014 00:35:39 +0100
Subject: [PATCH] NR 1.1.3 and Changes update w/ new Clef Appendix

Updated changes.tely to show the extra variations on the new Clef glyphs
(i.e. there are 4 separate glyphs but there are different \clef names using
those glyphs but in different positions.

Added a new Appendix to the NR showing all the standard \clef types
(not including 'ancient music' clefs) in a table, illustrating their
names and where middle c sits relative to the clef. Because of this
I have modified 1.1.3 referencing this appendix instead of listing
them all directly in the Clef section. Also added two useful Clef
related snippets that were already created.
---
 Documentation/changes.tely                    |  10 +-
 .../notation/notation-appendices.itely        | 252 ++++++++++++++++++
 Documentation/notation/pitches.itely          |  63 ++---
 3 files changed, 287 insertions(+), 38 deletions(-)

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 71320d7ea5..b58b35a4ef 100644
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -235,14 +235,17 @@ A new note head style for Tabulature has been added;
 @code{TabNoteHead.style = #'slash}.
 
 @item
-Four new Clefs have been added.  @emph{Double G}, @emph{Tenor G},
-@emph{Varpercussion} and @emph{varC}.
+Four new Clef glyphs have been added @emph{Double G}, @emph{Tenor G},
+@emph{Varpercussion} and @emph{varC} and their related tessitura.
 @lilypond[verbatim,quote,fragment]
   \override Staff.Clef.full-size-change = ##t
 
   \clef "GG" c c c c
   \clef "tenorG" c c c c
   \clef "varC" c c c c
+  \clef "altovarC" c c c c
+  \clef "tenorvarC" c c c c
+  \clef "baritonevarC" c c c c
   \clef "varpercussion" c c c c
 
   \break
@@ -251,6 +254,9 @@ Four new Clefs have been added.  @emph{Double G}, @emph{Tenor G},
   \clef "GG" c c c c
   \clef "tenorG" c c c c
   \clef "varC" c c c c
+  \clef "altovarC" c c c c
+  \clef "tenorvarC" c c c c
+  \clef "baritonevarC" c c c
   \clef "varpercussion" c c c c
 @end lilypond
 
diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index 2e8ff7841c..bf8ac4efd7 100644
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -23,6 +23,7 @@
 * List of colors::
 * The Feta font::
 * Note head styles::
+* Clef styles::
 * Text markup commands::
 * Text markup list commands::
 * List of special characters::
@@ -1227,6 +1228,7 @@ see @ref{Formatting text}.
 	     \doc-chars #kievan
 @end lilypond
 
+
 @node Note head styles
 @appendixsec Note head styles
 
@@ -1236,6 +1238,256 @@ The following styles may be used for note heads.
 @lilypondfile[noindent]{note-head-style.ly}
 
 
+@node Clef styles
+@appendixsec Clef styles
+
+The following table shows all the different clef styles possible
+(including where @emph{middle C} sits relative to the clef).
+
+@multitable @columnfractions .30 .2 .30 .2
+
+@item
+@b{Example}
+@tab
+@b{Output}
+@tab
+@b{Example}
+@tab
+@b{Output}
+
+
+@item
+@code{\clef G}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef G
+  { c1 }
+}
+@end lilypond
+@tab
+@code{\clef treble}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef treble
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef violin}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef violin
+  { c1 }
+}
+@end lilypond
+@tab
+@code{\clef french}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef french
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef GG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef GG
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef tenorG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef tenorG
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef soprano}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef soprano
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef mezzosoprano}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef mezzosoprano
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef C}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef C
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef alto}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef alto
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef tenor}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef tenor
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef baritone}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef baritone
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef varC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef varC
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef altovarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef altovarC
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef tenorvarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef tenorvarC
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef baritonevarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef baritonevarC
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef varbaritone}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef varbaritone
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef baritonevarF}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef baritonevarF
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef F}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef F
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef bass}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef bass
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef subbass}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef subbass
+  { c1 }
+}
+@end lilypond
+
+@tab
+@code{\clef percussion}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef percussion
+  { c1 }
+}
+@end lilypond
+
+@item
+@code{\clef tab}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+{
+  \clef tab
+  { c1 }
+}
+@end lilypond
+
+
+@end multitable
+
+
 @node Text markup commands
 @appendixsec Text markup commands
 
diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index b5cc66246d..307a9b5820 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -1104,8 +1104,16 @@ This section discusses how to alter the output of pitches.
 @funindex \clef
 @funindex clef
 
-The clef may be altered.  Middle C is shown in every example.  The
-following clef names can (but do not need to) be enclosed in quotes.
+Without any explicit command, the default clef for LilyPond is the
+treble (or @emph{G}) clef.
+
+@lilypond[verbatim,quote,relative=1,ragged-right]
+c2 c
+@end lilypond
+
+However, the clef can be changed by using the @code{\clef} command and
+an appropriate clef name.  @emph{Middle C} is shown in each of the
+following examples.
 
 @lilypond[verbatim,quote,relative=1]
 \clef treble
@@ -1118,36 +1126,17 @@ c2 c
 c2 c
 @end lilypond
 
-Other clefs include:
-
-@lilypond[verbatim,quote,relative=1]
-\clef french
-c2 c
-\clef soprano
-c2 c
-\clef mezzosoprano
-c2 c
-\clef baritone
-c2 c
+For the full range of possible clef names see @ref{Clef styles}.
 
-\break
+Specialized clefs, such as those used in @emph{Ancient} music, are
+described in @ref{Mensural clefs} and @ref{Gregorian clefs}.  Music that
+requires tablature clefs is discussed in @ref{Default tablatures} and
+@ref{Custom tablatures}.
 
-\clef varbaritone
-c2 c
-\clef subbass
-c2 c
-\clef percussion
-c2 c
-
-\break
-
-\clef G   % synonym for treble
-c2 c
-\clef F   % synonym for bass
-c2 c
-\clef C   % synonym for alto
-c2 c
-@end lilypond
+@cindex Cue clefs
+@cindex Clefs with cue notes
+For mixing clefs when using cue notes, see the @code{\cueClef} and
+@code{\cueDuringWithClef} commands in @ref{Formatting cue notes}.
 
 @cindex transposing clef
 @cindex clef, transposing
@@ -1191,13 +1180,12 @@ c2 c
 The pitches are displayed as if the numeric argument were
 given without parentheses/brackets.
 
-Some special purpose clefs are described in @ref{Mensural clefs},
-@ref{Gregorian clefs}, @ref{Default tablatures}, and @ref{Custom
-tablatures}.  For mixing different clefs when using cue notes within a
-score, see the @code{\cueClef} and @code{\cueDuringWithClef} functions
-in @ref{Formatting cue notes}.
-
 @snippets
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{forcing-a-clef-symbol-to-be-displayed.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{keep-change-clefs-full-sized.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {tweaking-clef-properties.ly}
@@ -1210,6 +1198,9 @@ Notation Reference:
 @ref{Custom tablatures},
 @ref{Formatting cue notes}.
 
+Installed Files:
+@file{../scm/parser-clef.scm}.
+
 Snippets:
 @rlsr{Pitches}.
 
-- 
2.39.5