Doc - NR + CG: Clarify Emmentaler is the 'font' and Feta/Parmesan are glyphs

[lilypond.git] / Documentation / notation / notation-appendices.itely

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index 68f5cb717967868e317e9a87f9d2dcc47f2859a0..ab7547b5f9458fb6d9ee6d1bbd5d901259f2a76f 100644 (file)
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -21,7 +21,7 @@
 * Predefined paper sizes::
 * MIDI instruments::
 * List of colors::
-* The Feta font::
+* The Emmentaler font::
 * Note head styles::
 * Clef styles::
 * Text markup commands::
@@ -204,7 +204,7 @@ Augmented triad, @*minor seventh
 @tab
 @code{aug7}
 @tab
-@code{c1:aug}
+@code{c1:aug7}
 @tab
 @lilypond[line-width=2.1\cm,noragged-right,notime]
 <<
@@ -236,7 +236,7 @@ Minor triad, @*major seventh
 @tab
 @code{m7+}
 @tab
-@code{m7+}
+@code{c1:m7+}
 @tab
 @lilypond[line-width=2.1\cm,noragged-right,notime]
 <<
@@ -859,12 +859,12 @@ darkcyan    darkmagenta    darkyellow
 X color names come several variants:
 
 Any name that is spelled as a single word with capitalization
-(e.g. @q{LightSlateBlue}) can also be spelled as space separated
-words without capitalization (e.g. @q{light slate blue}).
+(e.g., @q{LightSlateBlue}) can also be spelled as space separated
+words without capitalization (e.g., @q{light slate blue}).
 
-The word @q{grey} can always be spelled @q{gray} (e.g. @q{DarkSlateGray}).
+The word @q{grey} can always be spelled @q{gray} (e.g., @q{DarkSlateGray}).
 
-Some names can take a numerical suffix (e.g. @q{LightSalmon4}).
+Some names can take a numerical suffix (e.g., @q{LightSalmon4}).
 
 
 @subsubheading Color Names without a numerical suffix:
@@ -937,18 +937,37 @@ greyN
 Where N is in the range 0-100.
 
 
-@node The Feta font
-@appendixsec The Feta font
+@node The Emmentaler font
+@appendixsec The Emmentaler font
+
 
+@cindex Emmentaler font
+@cindex Font, Emmentaler
 @cindex Feta font
 @cindex Font, Feta
+@cindex Parmesan font
+@cindex Font, Parmesan
+
+The Emmentaler font consists of two @emph{sub-sets} of glyphs.
+@qq{Feta}, used for clasical notation and @qq{Parmesan}, sed for Ancient
+notation.
+
+Any glyph within the Emmentaler font can be accessed directly by using
+text markup along with the name of the glyph (as shown in the tables
+below).  For example;
+
+@example
+g^\markup @{\musicglyph #"scripts.segno" @}
+@end example
+
+@noindent
+or
 
-The following symbols are available in the Emmentaler font and may be
-accessed directly using text markup with the name of the glyph
-as shown in the tables below,
-such as @code{g^\markup @{\musicglyph #"scripts.segno" @}} or
-@code{\markup @{\musicglyph #"five"@}}.  For more information,
-see @ref{Formatting text}.
+@example
+\markup @{\musicglyph #"five"@}.
+@end example
+
+For more information see @ref{Formatting text}.
 
 
 @menu
@@ -2352,7 +2371,6 @@ or in the source code.
 * parser::
 * parser variable::
 * prob::
-* simple closure::
 * smob::
 * stencil::
 @end menu
@@ -2367,7 +2385,7 @@ An association list or @strong{alist} for short is a Scheme pair
 which associates a value with a key: @w{@code{(key . value)}}.  For
 example, in @file{scm/lily.scm}, the alist
 @w{@qq{type-p-name-alist}} associates certain type predicates
-(e.g.@tie{}@code{ly:music?}) with names (e.g.@tie{}@qq{music}) so
+(e.g., @code{ly:music?}) with names (e.g., @qq{music}) so
 that type-check failures can be reported with a console message that
 includes the name of the expected type predicate.
 
@@ -2389,12 +2407,11 @@ performed.
 @unnumberedsubsec closure
 
 @cindex closure
-@cindex simple closure
 
 In Scheme, a @strong{closure} is created when a function, usually
 a lambda expression, is passed as a variable.  The closure contains
 the function's code plus references to the lexical bindings of the
-function's free variables (i.e. those variables used in the
+function's free variables (i.e., those variables used in the
 expression but defined outside it).  When this function is applied
 to different arguments later, the free variable bindings that were
 captured in the closure are used to obtain the values of the free
@@ -2402,13 +2419,6 @@ variables to be used in the calculation.  One useful property of
 closures is the retention of internal variable values between
 invocations, so permitting state to be maintained.
 
-A @strong{simple closure} is a closure whose expression has no free
-variables and hence no free variable bindings.
-
-A simple closure is represented in LilyPond by a smob containing
-the expression and a method to apply the expression to a passed
-list of arguments.
-
 
 @node glyph
 @unnumberedsubsec glyph
@@ -2629,12 +2639,6 @@ to hold the formatted content of system grobs and titling blocks
 during page layout.
 
 
-@node simple closure
-@unnumberedsubsec simple closure
-
-See @ref{closure}.
-
-
 @node smob
 @unnumberedsubsec smob