Added color names.

diff --git a/ChangeLog b/ChangeLog
index f581b8505d6743030fea51b9f98fa6e129101180..ff45959c2ea075b829aa0ba1abb047b1aa787acc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
        * Documentation/user/advanced-notation.itely: included
        color names.
 
+       * Documentation/user/advanced-notation.itely,
+       Documentation/usr/notation-appendices.itely: moved
+       color names into an appendix.
+
 2005-06-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/program-option.cc (LY_DEFINE): new function ly_add_option.

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index b2ba6f8330e47a3923eda5d9f5bb510b9eea02bb..70b7071309262c95f4ee68311e6acb75ba092b18 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -2056,7 +2056,7 @@ made invisible.
 @subsection Coloring objects
 
 Individual objects may be assigned colors.  You may use the
-color names listed below.
+color names listed in the @ref{List of colors}.
 
 @lilypond[quote,raggedright,verbatim,fragment,relative=1]
 \override NoteHead #'color = #red
@@ -2115,91 +2115,9 @@ deliberate nonsense.
 @end lilypond
 
 
-@subsubheading List of colors
-
-@verbatim
-Normal colors
-=============
-
-black, white, red, green, blue, cyan, magenta, yellow, grey,
-darkred, darkgreen, darkblue, darkcyan, darkmagenta, darkyellow.
-
-X color names
-===============
-
-X color names come several variants:
-
-Any name that is spelled as a single word with capitalisation
-(e.g. "LightSlateBlue") can also be spelled as space separated
-words without capitalisation (e.g. "light slate blue").
-
-The word "grey" can always be spelled "gray" (e.g. "DarkSlateGray"). 
-
-Some names can take a numerical suffix (e.g. "LightSalmon4").
-
-Color Names without a numerical suffix:
----------------------------------------
-
-snow           GhostWhite      WhiteSmoke      gainsboro       FloralWhite
-OldLace                linen           AntiqueWhite    PapayaWhip      BlanchedAlmond
-bisque         PeachPuff       NavajoWhite     moccasin        cornsilk
-ivory          LemonChiffon    seashell        honeydew        MintCream
-azure          AliceBlue       lavender        LavenderBlush   MistyRose
-white          black           DarkSlateGrey   DimGrey         SlateGrey
-LightSlateGrey grey            LightGrey       MidnightBlue    navy
-NavyBlue       CornflowerBlue  DarkSlateBlue   SlateBlue       MediumSlateBlue
-LightSlateBlue MediumBlue      RoyalBlue       blue            DodgerBlue
-DeepSkyBlue    SkyBlue         LightSkyBlue    SteelBlue       LightSteelBlue
-LightBlue      PowderBlue      PaleTurquoise   DarkTurquoise   MediumTurquoise
-turquoise      cyan            LightCyan       CadetBlue       MediumAquamarine
-aquamarine     DarkGreen       DarkOliveGreen  DarkSeaGreen    SeaGreen
-MediumSeaGreen LightSeaGreen   PaleGreen       SpringGreen     LawnGreen
-green          chartreuse      MediumSpringGreen       GreenYellow     LimeGreen
-YellowGreen    ForestGreen     OliveDrab       DarkKhaki       khaki
-PaleGoldenrod  LightGoldenrodYellow    LightYellow     yellow  gold
-LightGoldenrod goldenrod       DarkGoldenrod   RosyBrown       IndianRed
-SaddleBrown    sienna          peru            burlywood       beige
-wheat          SandyBrown      tan             chocolate       firebrick
-brown          DarkSalmon      salmon          LightSalmon     orange
-DarkOrange     coral           LightCoral      tomato          OrangeRed
-red            HotPink         DeepPink        pink            LightPink
-PaleVioletRed  maroon          MediumVioletRed VioletRed       magenta
-violet         plum            orchid          MediumOrchid    DarkOrchid
-DarkViolet     BlueViolet      purple          MediumPurple    thistle
-DarkGrey       DarkBlue        DarkCyan        DarkMagenta     DarkRed
-LightGreen
-
-Color names with a numerical suffix
------------------------------------
-
-In the following names the suffix N can be a number in the range 1-4:
-
-snowN          seashellN       AntiqueWhiteN   bisqueN         PeachPuffN
-NavajoWhiteN   LemonChiffonN   cornsilkN       ivoryN          honeydewN
-LavenderBlushN MistyRoseN      azureN          SlateBlueN      RoyalBlueN
-blueN          DodgerBlueN     SteelBlueN      DeepSkyBlueN    SkyBlueN
-LightSkyBlueN  LightSteelBlueN LightBlueN      LightCyanN      PaleTurquoiseN
-CadetBlueN     turquoiseN      cyanN           aquamarineN     DarkSeaGreenN
-SeaGreenN      PaleGreenN      SpringGreenN    greenN          chartreuseN
-OliveDrabN     DarkOliveGreenN khakiN          LightGoldenrodN LightYellowN
-yellowN                goldN           goldenrodN      DarkGoldenrodN  RosyBrownN
-IndianRedN     siennaN         burlywoodN      wheatN          tanN
-chocolateN     firebrickN      brownN          salmonN         LightSalmonN
-orangeN                DarkOrangeN     coralN          tomatoN         OrangeRedN
-redN           DeepPinkN       HotPinkN        pinkN           LightPinkN
-PaleVioletRedN maroonN         VioletRedN      magentaN        orchidN
-plumN          MediumOrchidN   DarkOrchidN     purpleN         MediumPurpleN
-thistleN
-
-Grey Scale
-----------
-
-A grey scale can be obtained using:
-
-greyN
-
-Where N is in the range 0-100.
-@end verbatim
+@seealso
+
+Appendix: @ref{List of colors}.
 
 
 @refbugs

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 83252437e69fe58d7ae5b39e4b5bc2ac6a2d124c..3a3c22fa33f447430dd0ef4ca1fd2a470f4191ba 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -7,6 +7,7 @@
 @menu
 * Chord name chart::            
 * MIDI instruments::            
+* List of colors::              
 * The Feta font::               
 @end menu
 
@@ -72,6 +73,103 @@ viola                     lead 5 (charang)     gunshot
 cello                     lead 6 (voice) 
 @end example 
 
+
+@node List of colors
+@appendixsec List of colors
+
+@subsubheading Normal colors
+
+@verbatim
+black       white          red         green
+blue        cyan           magenta     yellow
+grey        darkred        darkgreen   darkblue
+darkcyan    darkmagenta    darkyellow
+@end verbatim
+
+
+@subsubheading X color names
+
+X color names come several variants:
+
+Any name that is spelled as a single word with capitalisation
+(e.g. ``LightSlateBlue'') can also be spelled as space separated
+words without capitalisation (e.g. ``light slate blue'').
+
+The word ``grey'' can always be spelled ``gray'' (e.g. ``DarkSlateGray''). 
+
+Some names can take a numerical suffix (e.g. ``LightSalmon4'').
+
+
+@subsubheading Color Names without a numerical suffix:
+
+@verbatim
+snow           GhostWhite      WhiteSmoke      gainsboro       FloralWhite
+OldLace                linen           AntiqueWhite    PapayaWhip      BlanchedAlmond
+bisque         PeachPuff       NavajoWhite     moccasin        cornsilk
+ivory          LemonChiffon    seashell        honeydew        MintCream
+azure          AliceBlue       lavender        LavenderBlush   MistyRose
+white          black           DarkSlateGrey   DimGrey         SlateGrey
+LightSlateGrey grey            LightGrey       MidnightBlue    navy
+NavyBlue       CornflowerBlue  DarkSlateBlue   SlateBlue       MediumSlateBlue
+LightSlateBlue MediumBlue      RoyalBlue       blue            DodgerBlue
+DeepSkyBlue    SkyBlue         LightSkyBlue    SteelBlue       LightSteelBlue
+LightBlue      PowderBlue      PaleTurquoise   DarkTurquoise   MediumTurquoise
+turquoise      cyan            LightCyan       CadetBlue       MediumAquamarine
+aquamarine     DarkGreen       DarkOliveGreen  DarkSeaGreen    SeaGreen
+MediumSeaGreen LightSeaGreen   PaleGreen       SpringGreen     LawnGreen
+green          chartreuse      MediumSpringGreen       GreenYellow     LimeGreen
+YellowGreen    ForestGreen     OliveDrab       DarkKhaki       khaki
+PaleGoldenrod  LightGoldenrodYellow    LightYellow     yellow  gold
+LightGoldenrod goldenrod       DarkGoldenrod   RosyBrown       IndianRed
+SaddleBrown    sienna          peru            burlywood       beige
+wheat          SandyBrown      tan             chocolate       firebrick
+brown          DarkSalmon      salmon          LightSalmon     orange
+DarkOrange     coral           LightCoral      tomato          OrangeRed
+red            HotPink         DeepPink        pink            LightPink
+PaleVioletRed  maroon          MediumVioletRed VioletRed       magenta
+violet         plum            orchid          MediumOrchid    DarkOrchid
+DarkViolet     BlueViolet      purple          MediumPurple    thistle
+DarkGrey       DarkBlue        DarkCyan        DarkMagenta     DarkRed
+LightGreen
+@end verbatim
+
+
+@subsubheading Color names with a numerical suffix
+
+In the following names the suffix N can be a number in the range 1-4:
+
+@verbatim
+snowN          seashellN       AntiqueWhiteN   bisqueN         PeachPuffN
+NavajoWhiteN   LemonChiffonN   cornsilkN       ivoryN          honeydewN
+LavenderBlushN MistyRoseN      azureN          SlateBlueN      RoyalBlueN
+blueN          DodgerBlueN     SteelBlueN      DeepSkyBlueN    SkyBlueN
+LightSkyBlueN  LightSteelBlueN LightBlueN      LightCyanN      PaleTurquoiseN
+CadetBlueN     turquoiseN      cyanN           aquamarineN     DarkSeaGreenN
+SeaGreenN      PaleGreenN      SpringGreenN    greenN          chartreuseN
+OliveDrabN     DarkOliveGreenN khakiN          LightGoldenrodN LightYellowN
+yellowN                goldN           goldenrodN      DarkGoldenrodN  RosyBrownN
+IndianRedN     siennaN         burlywoodN      wheatN          tanN
+chocolateN     firebrickN      brownN          salmonN         LightSalmonN
+orangeN                DarkOrangeN     coralN          tomatoN         OrangeRedN
+redN           DeepPinkN       HotPinkN        pinkN           LightPinkN
+PaleVioletRedN maroonN         VioletRedN      magentaN        orchidN
+plumN          MediumOrchidN   DarkOrchidN     purpleN         MediumPurpleN
+thistleN
+@end verbatim
+
+
+@subsubheading Grey Scale
+
+A grey scale can be obtained using:
+
+@example
+greyN
+@end example
+
+@noindent
+Where N is in the range 0-100.
+
+
 @node The Feta font
 @appendixsec The Feta font