CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Graham Percival <[EMAIL PROTECTED]>     05/06/14 05:44:20

Modified files:
        Documentation/user: advanced-notation.itely 
                            notation-appendices.itely 
        .              : ChangeLog 

Log message:
        Added color names.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/advanced-notation.itely.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/notation-appendices.itely.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3775&tr2=1.3776&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3775 lilypond/ChangeLog:1.3776
--- lilypond/ChangeLog:1.3775   Tue Jun 14 03:51:59 2005
+++ lilypond/ChangeLog  Tue Jun 14 05:44:20 2005
@@ -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  <[EMAIL PROTECTED]>
 
        * lily/program-option.cc (LY_DEFINE): new function ly_add_option.
Index: lilypond/Documentation/user/advanced-notation.itely
diff -u lilypond/Documentation/user/advanced-notation.itely:1.32 
lilypond/Documentation/user/advanced-notation.itely:1.33
--- lilypond/Documentation/user/advanced-notation.itely:1.32    Tue Jun 14 
03:52:00 2005
+++ lilypond/Documentation/user/advanced-notation.itely Tue Jun 14 05:44:19 2005
@@ -2056,7 +2056,7 @@
 @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 @@
 @end lilypond
 
 
[EMAIL PROTECTED] List of colors
-
[EMAIL PROTECTED]
-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
[EMAIL PROTECTED]
 
-Where N is in the range 0-100.
[EMAIL PROTECTED] verbatim
+Appendix: @ref{List of colors}.
 
 
 @refbugs
Index: lilypond/Documentation/user/notation-appendices.itely
diff -u lilypond/Documentation/user/notation-appendices.itely:1.8 
lilypond/Documentation/user/notation-appendices.itely:1.9
--- lilypond/Documentation/user/notation-appendices.itely:1.8   Sat Nov 13 
20:46:35 2004
+++ lilypond/Documentation/user/notation-appendices.itely       Tue Jun 14 
05:44:19 2005
@@ -7,6 +7,7 @@
 @menu
 * Chord name chart::            
 * MIDI instruments::            
+* List of colors::              
 * The Feta font::               
 @end menu
 
@@ -72,6 +73,103 @@
 cello                     lead 6 (voice) 
 @end example 
 
+
[EMAIL PROTECTED] List of colors
[EMAIL PROTECTED] List of colors
+
[EMAIL PROTECTED] Normal colors
+
[EMAIL PROTECTED]
+black       white          red         green
+blue        cyan           magenta     yellow
+grey        darkred        darkgreen   darkblue
+darkcyan    darkmagenta    darkyellow
[EMAIL PROTECTED] verbatim
+
+
[EMAIL PROTECTED] 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'').
+
+
[EMAIL PROTECTED] Color Names without a numerical suffix:
+
[EMAIL PROTECTED]
+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
[EMAIL PROTECTED] verbatim
+
+
[EMAIL PROTECTED] Color names with a numerical suffix
+
+In the following names the suffix N can be a number in the range 1-4:
+
[EMAIL PROTECTED]
+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
[EMAIL PROTECTED] verbatim
+
+
[EMAIL PROTECTED] Grey Scale
+
+A grey scale can be obtained using:
+
[EMAIL PROTECTED]
+greyN
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED]
+Where N is in the range 0-100.
+
+
 @node The Feta font
 @appendixsec The Feta font
 


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to