Added color names.

diff --git a/ChangeLog b/ChangeLog
index 84011bbff55a97896cb4ef48f9b17547e2d9e7a0..f581b8505d6743030fea51b9f98fa6e129101180 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-14  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/topdocs/INSTALL.texi: update vim info;
+       thanks Simon Bailey!
+
+       * Documentation/user/advanced-notation.itely: included
+       color names.
+
 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 1560bb3ba753f9d7c4b854626f8e9ec868747829..b2ba6f8330e47a3923eda5d9f5bb510b9eea02bb 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -2055,11 +2055,10 @@ made invisible.
 @node Coloring objects
 @subsection Coloring objects
 
-@c FIXME: need link to missing list of colors
-Individual objects may be assigned colors.  You may use color names
-listed HERE
+Individual objects may be assigned colors.  You may use the
+color names listed below.
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,raggedright,verbatim,fragment,relative=1]
 \override NoteHead #'color = #red
 c4 c
 \override NoteHead #'color = #(x11-color 'LimeGreen)
@@ -2116,6 +2115,93 @@ 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
+
+
 @refbugs
 Not all x11 colors are distinguishable in a web browser.  For web use
 normal colors are recommended. 
@@ -2124,12 +2210,6 @@ An x11 color is not necessarily exactly the same shade as a similarly
 named normal color. 
 
 
-@seealso
-
-COLORLIST
-
-
-
 @node Automatic notation
 @section Automatic notation