Merge branch 'master' into func_resolver

color_names.hpp

+#define SASS_COLOR_NAMES_INCLUDED
+
+namespace Sass {
+
+	const char* color_names[] =
+	{
+		"aliceblue",
+		"antiquewhite",
+		"aqua",
+		"aquamarine",
+		"azure",
+		"beige",
+		"bisque",
+		"black",
+		"blanchedalmond",
+		"blue",
+		"blueviolet",
+		"brown",
+		"burlywood",
+		"cadetblue",
+		"chartreuse",
+		"chocolate",
+		"coral",
+		"cornflowerblue",
+		"cornsilk",
+		"crimson",
+		"cyan",
+		"darkblue",
+		"darkcyan",
+		"darkgoldenrod",
+		"darkgray",
+		"darkgrey",
+		"darkgreen",
+		"darkkhaki",
+		"darkmagenta",
+		"darkolivegreen",
+		"darkorange",
+		"darkorchid",
+		"darkred",
+		"darksalmon",
+		"darkseagreen",
+		"darkslateblue",
+		"darkslategray",
+		"darkslategrey",
+		"darkturquoise",
+		"darkviolet",
+		"deeppink",
+		"deepskyblue",
+		"dimgray",
+		"dimgrey",
+		"dodgerblue",
+		"firebrick",
+		"floralwhite",
+		"forestgreen",
+		"fuchsia",
+		"gainsboro",
+		"ghostwhite",
+		"gold",
+		"goldenrod",
+		"gray",
+		"grey",
+		"green",
+		"greenyellow",
+		"honeydew",
+		"hotpink",
+		"indianred",
+		"indigo",
+		"ivory",
+		"khaki",
+		"lavender",
+		"lavenderblush",
+		"lawngreen",
+		"lemonchiffon",
+		"lightblue",
+		"lightcoral",
+		"lightcyan",
+		"lightgoldenrodyellow",
+		"lightgray",
+		"lightgrey",
+		"lightgreen",
+		"lightpink",
+		"lightsalmon",
+		"lightseagreen",
+		"lightskyblue",
+		"lightslategray",
+		"lightslategrey",
+		"lightsteelblue",
+		"lightyellow",
+		"lime",
+		"limegreen",
+		"linen",
+		"magenta",
+		"maroon",
+		"mediumaquamarine",
+		"mediumblue",
+		"mediumorchid",
+		"mediumpurple",
+		"mediumseagreen",
+		"mediumslateblue",
+		"mediumspringgreen",
+		"mediumturquoise",
+		"mediumvioletred",
+		"midnightblue",
+		"mintcream",
+		"mistyrose",
+		"moccasin",
+		"navajowhite",
+		"navy",
+		"oldlace",
+		"olive",
+		"olivedrab",
+		"orange",
+		"orangered",
+		"orchid",
+		"palegoldenrod",
+		"palegreen",
+		"paleturquoise",
+		"palevioletred",
+		"papayawhip",
+		"peachpuff",
+		"peru",
+		"pink",
+		"plum",
+		"powderblue",
+		"purple",
+		"red",
+		"rosybrown",
+		"royalblue",
+		"saddlebrown",
+		"salmon",
+		"sandybrown",
+		"seagreen",
+		"seashell",
+		"sienna",
+		"silver",
+		"skyblue",
+		"slateblue",
+		"slategray",
+		"slategrey",
+		"snow",
+		"springgreen",
+		"steelblue",
+		"tan",
+		"teal",
+		"thistle",
+		"tomato",
+		"turquoise",
+		"violet",
+		"wheat",
+		"white",
+		"whitesmoke",
+		"yellow",
+		"yellowgreen",
+		// sentinel value
+		0
+	}
+
+	const double color_values[] =
+	{
+		0xf0, 0xf8, 0xff,
+		0xfa, 0xeb, 0xd7,
+		0x00, 0xff, 0xff,
+		0x7f, 0xff, 0xd4,
+		0xf0, 0xff, 0xff,
+		0xf5, 0xf5, 0xdc,
+		0xff, 0xe4, 0xc4,
+		0x00, 0x00, 0x00,
+		0xff, 0xeb, 0xcd,
+		0x00, 0x00, 0xff,
+		0x8a, 0x2b, 0xe2,
+		0xa5, 0x2a, 0x2a,
+		0xde, 0xb8, 0x87,
+		0x5f, 0x9e, 0xa0,
+		0x7f, 0xff, 0x00,
+		0xd2, 0x69, 0x1e,
+		0xff, 0x7f, 0x50,
+		0x64, 0x95, 0xed,
+		0xff, 0xf8, 0xdc,
+		0xdc, 0x14, 0x3c,
+		0x00, 0xff, 0xff,
+		0x00, 0x00, 0x8b,
+		0x00, 0x8b, 0x8b,
+		0xb8, 0x86, 0x0b,
+		0xa9, 0xa9, 0xa9,
+		0xa9, 0xa9, 0xa9,
+		0x00, 0x64, 0x00,
+		0xbd, 0xb7, 0x6b,
+		0x8b, 0x00, 0x8b,
+		0x55, 0x6b, 0x2f,
+		0xff, 0x8c, 0x00,
+		0x99, 0x32, 0xcc,
+		0x8b, 0x00, 0x00,
+		0xe9, 0x96, 0x7a,
+		0x8f, 0xbc, 0x8f,
+		0x48, 0x3d, 0x8b,
+		0x2f, 0x4f, 0x4f,
+		0x2f, 0x4f, 0x4f,
+		0x00, 0xce, 0xd1,
+		0x94, 0x00, 0xd3,
+		0xff, 0x14, 0x93,
+		0x00, 0xbf, 0xff,
+		0x69, 0x69, 0x69,
+		0x69, 0x69, 0x69,
+		0x1e, 0x90, 0xff,
+		0xb2, 0x22, 0x22,
+		0xff, 0xfa, 0xf0,
+		0x22, 0x8b, 0x22,
+		0xff, 0x00, 0xff,
+		0xdc, 0xdc, 0xdc,
+		0xf8, 0xf8, 0xff,
+		0xff, 0xd7, 0x00,
+		0xda, 0xa5, 0x20,
+		0x80, 0x80, 0x80,
+		0x80, 0x80, 0x80,
+		0x00, 0x80, 0x00,
+		0xad, 0xff, 0x2f,
+		0xf0, 0xff, 0xf0,
+		0xff, 0x69, 0xb4,
+		0xcd, 0x5c, 0x5c,
+		0x4b, 0x00, 0x82,
+		0xff, 0xff, 0xf0,
+		0xf0, 0xe6, 0x8c,
+		0xe6, 0xe6, 0xfa,
+		0xff, 0xf0, 0xf5,
+		0x7c, 0xfc, 0x00,
+		0xff, 0xfa, 0xcd,
+		0xad, 0xd8, 0xe6,
+		0xf0, 0x80, 0x80,
+		0xe0, 0xff, 0xff,
+		0xfa, 0xfa, 0xd2,
+		0xd3, 0xd3, 0xd3,
+		0xd3, 0xd3, 0xd3,
+		0x90, 0xee, 0x90,
+		0xff, 0xb6, 0xc1,
+		0xff, 0xa0, 0x7a,
+		0x20, 0xb2, 0xaa,
+		0x87, 0xce, 0xfa,
+		0x77, 0x88, 0x99,
+		0x77, 0x88, 0x99,
+		0xb0, 0xc4, 0xde,
+		0xff, 0xff, 0xe0,
+		0x00, 0xff, 0x00,
+		0x32, 0xcd, 0x32,
+		0xfa, 0xf0, 0xe6,
+		0xff, 0x00, 0xff,
+		0x80, 0x00, 0x00,
+		0x66, 0xcd, 0xaa,
+		0x00, 0x00, 0xcd,
+		0xba, 0x55, 0xd3,
+		0x93, 0x70, 0xd8,
+		0x3c, 0xb3, 0x71,
+		0x7b, 0x68, 0xee,
+		0x00, 0xfa, 0x9a,
+		0x48, 0xd1, 0xcc,
+		0xc7, 0x15, 0x85,
+		0x19, 0x19, 0x70,
+		0xf5, 0xff, 0xfa,
+		0xff, 0xe4, 0xe1,
+		0xff, 0xe4, 0xb5,
+		0xff, 0xde, 0xad,
+		0x00, 0x00, 0x80,
+		0xfd, 0xf5, 0xe6,
+		0x80, 0x80, 0x00,
+		0x6b, 0x8e, 0x23,
+		0xff, 0xa5, 0x00,
+		0xff, 0x45, 0x00,
+		0xda, 0x70, 0xd6,
+		0xee, 0xe8, 0xaa,
+		0x98, 0xfb, 0x98,
+		0xaf, 0xee, 0xee,
+		0xd8, 0x70, 0x93,
+		0xff, 0xef, 0xd5,
+		0xff, 0xda, 0xb9,
+		0xcd, 0x85, 0x3f,
+		0xff, 0xc0, 0xcb,
+		0xdd, 0xa0, 0xdd,
+		0xb0, 0xe0, 0xe6,
+		0x80, 0x00, 0x80,
+		0xff, 0x00, 0x00,
+		0xbc, 0x8f, 0x8f,
+		0x41, 0x69, 0xe1,
+		0x8b, 0x45, 0x13,
+		0xfa, 0x80, 0x72,
+		0xf4, 0xa4, 0x60,
+		0x2e, 0x8b, 0x57,
+		0xff, 0xf5, 0xee,
+		0xa0, 0x52, 0x2d,
+		0xc0, 0xc0, 0xc0,
+		0x87, 0xce, 0xeb,
+		0x6a, 0x5a, 0xcd,
+		0x70, 0x80, 0x90,
+		0x70, 0x80, 0x90,
+		0xff, 0xfa, 0xfa,
+		0x00, 0xff, 0x7f,
+		0x46, 0x82, 0xb4,
+		0xd2, 0xb4, 0x8c,
+		0x00, 0x80, 0x80,
+		0xd8, 0xbf, 0xd8,
+		0xff, 0x63, 0x47,
+		0x40, 0xe0, 0xd0,
+		0xee, 0x82, 0xee,
+		0xf5, 0xde, 0xb3,
+		0xff, 0xff, 0xff,
+		0xf5, 0xf5, 0xf5,
+		0xff, 0xff, 0x00,
+		0x9a, 0xcd, 0x32,
+		// sentinel value
+		0xfff
+	}
+
+}
\ No newline at end of file

css_color_names.txt

-AliceBlue 		#F0F8FF
-AntiqueWhite 		#FAEBD7
-Aqua 			#00FFFF
-Aquamarine 		#7FFFD4
-Azure 			#F0FFFF
-Beige 			#F5F5DC
-Bisque 			#FFE4C4
-Black 			#000000
-BlanchedAlmond	 	#FFEBCD
-Blue 			#0000FF
-BlueViolet 		#8A2BE2
-Brown 			#A52A2A
-BurlyWood 		#DEB887
-CadetBlue 		#5F9EA0
-Chartreuse 		#7FFF00
-Chocolate 		#D2691E
-Coral 			#FF7F50
-CornflowerBlue 		#6495ED
-Cornsilk 		#FFF8DC
-Crimson 		#DC143C
-Cyan 			#00FFFF
-DarkBlue 		#00008B
-DarkCyan 		#008B8B
-DarkGoldenRod 		#B8860B
-DarkGray 		#A9A9A9
-DarkGrey 		#A9A9A9
-DarkGreen 		#006400
-DarkKhaki 		#BDB76B
-DarkMagenta 		#8B008B
-DarkOliveGreen	 	#556B2F
-Darkorange 		#FF8C00
-DarkOrchid 		#9932CC
-DarkRed 		#8B0000
-DarkSalmon 		#E9967A
-DarkSeaGreen 		#8FBC8F
-DarkSlateBlue 		#483D8B
-DarkSlateGray 		#2F4F4F
-DarkSlateGrey 		#2F4F4F
-DarkTurquoise 		#00CED1
-DarkViolet 		#9400D3
-DeepPink 		#FF1493
-DeepSkyBlue 		#00BFFF
-DimGray 		#696969
-DimGrey 		#696969
-DodgerBlue 		#1E90FF
-FireBrick 		#B22222
-FloralWhite 		#FFFAF0
-ForestGreen 		#228B22
-Fuchsia 		#FF00FF
-Gainsboro 		#DCDCDC
-GhostWhite 		#F8F8FF
-Gold 			#FFD700
-GoldenRod 		#DAA520
-Gray 			#808080
-Grey 			#808080
-Green 			#008000
-GreenYellow 		#ADFF2F
-HoneyDew 		#F0FFF0
-HotPink 		#FF69B4
-IndianRed  		#CD5C5C
-Indigo  		#4B0082
-Ivory 			#FFFFF0
-Khaki 			#F0E68C
-Lavender 		#E6E6FA
-LavenderBlush 		#FFF0F5
-LawnGreen 		#7CFC00
-LemonChiffon 		#FFFACD
-LightBlue 		#ADD8E6
-LightCoral 		#F08080
-LightCyan 		#E0FFFF
-LightGoldenRodYellow 	#FAFAD2
-LightGray 		#D3D3D3
-LightGrey 		#D3D3D3
-LightGreen 		#90EE90
-LightPink 		#FFB6C1
-LightSalmon 		#FFA07A
-LightSeaGreen 		#20B2AA
-LightSkyBlue 		#87CEFA
-LightSlateGray 		#778899
-LightSlateGrey 		#778899
-LightSteelBlue 		#B0C4DE
-LightYellow 		#FFFFE0
-Lime 			#00FF00
-LimeGreen 		#32CD32
-Linen 			#FAF0E6
-Magenta 		#FF00FF
-Maroon 			#800000
-MediumAquaMarine 	#66CDAA
-MediumBlue 		#0000CD
-MediumOrchid 		#BA55D3
-MediumPurple 		#9370D8
-MediumSeaGreen 		#3CB371
-MediumSlateBlue 	#7B68EE
-MediumSpringGreen 	#00FA9A
-MediumTurquoise 	#48D1CC
-MediumVioletRed 	#C71585
-MidnightBlue 		#191970
-MintCream 		#F5FFFA
-MistyRose 		#FFE4E1
-Moccasin 		#FFE4B5
-NavajoWhite 		#FFDEAD
-Navy 			#000080
-OldLace 		#FDF5E6
-Olive 			#808000
-OliveDrab 		#6B8E23
-Orange 			#FFA500
-OrangeRed 		#FF4500
-Orchid		 	#DA70D6
-PaleGoldenRod 		#EEE8AA
-PaleGreen 		#98FB98
-PaleTurquoise 		#AFEEEE
-PaleVioletRed 		#D87093
-PapayaWhip 		#FFEFD5
-PeachPuff 		#FFDAB9
-Peru 			#CD853F
-Pink 			#FFC0CB
-Plum 			#DDA0DD
-PowderBlue 		#B0E0E6
-Purple 			#800080
-Red 			#FF0000
-RosyBrown 		#BC8F8F
-RoyalBlue 		#4169E1
-SaddleBrown 		#8B4513
-Salmon 			#FA8072
-SandyBrown 		#F4A460
-SeaGreen 		#2E8B57
-SeaShell 		#FFF5EE
-Sienna 			#A0522D
-Silver 			#C0C0C0
-SkyBlue 		#87CEEB
-SlateBlue 		#6A5ACD
-SlateGray 		#708090
-SlateGrey 		#708090
-Snow 			#FFFAFA
-SpringGreen 		#00FF7F
-SteelBlue 		#4682B4
-Tan 			#D2B48C
-Teal 			#008080
-Thistle 		#D8BFD8
-Tomato 			#FF6347
-Turquoise 		#40E0D0
-Violet 			#EE82EE
-Wheat 			#F5DEB3
-White 			#FFFFFF
-WhiteSmoke 		#F5F5F5
-Yellow 			#FFFF00
-YellowGreen 		#9ACD32
\ No newline at end of file