Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 8a5860b

Browse files
montegouldingmontegoulding
committed
Merge branch 'patch-1' of https://github.com/meiradarocha/livecode into meiradarocha-patch-1
2 parents 52d15d9 + e1db625 commit 8a5860b

3 files changed

Lines changed: 105 additions & 101 deletions

File tree

‎docs/dictionary/function/colorNames.lcdoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,6 @@ linkColor (property), selectionHandleColor (property)
4747

4848
Tags: ui
4949

50+
Changes:
51+
In LiveCode 8.1 the Gray1-100 colors were corrected to match the shades
52+
of gray from the [X11 color names](https://en.wikipedia.org/wiki/X11_color_names).

‎docs/notes/bugfix-7344.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Correct named shades of gray (Gray1-100) to match the X11 color names

‎engine/src/rgb.cpp‎

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -175,107 +175,107 @@ static MCRGB color_table[] =
175175
{"Goldenrod3", 198, 142, 23},
176176
{"Goldenrod4", 128, 88, 23},
177177
{"Gray", 190, 190, 190},
178-
{"Gray0", 0, 0, 0},
179-
{"Gray1", 21, 5, 23},
180-
{"Gray10", 21, 5, 23},
181-
{"Gray100", 255, 255, 255},
182-
{"Gray11", 21, 5, 23},
183-
{"Gray12", 21, 5, 23},
184-
{"Gray13", 21, 5, 23},
185-
{"Gray14", 21, 5, 23},
186-
{"Gray15", 21, 5, 23},
187-
{"Gray16", 21, 5, 23},
188-
{"Gray17", 21, 5, 23},
189-
{"Gray18", 37, 5, 23},
190-
{"Gray19", 37, 5, 23},
191-
{"Gray2", 21, 5, 23},
192-
{"Gray20", 37, 5, 23},
193-
{"Gray21", 43, 27, 23},
194-
{"Gray22", 43, 27, 23},
195-
{"Gray23", 48, 34, 23},
196-
{"Gray24", 48, 34, 38},
197-
{"Gray25", 52, 40, 38},
198-
{"Gray26", 52, 40, 44},
199-
{"Gray27", 56, 45, 44},
200-
{"Gray28", 59, 49, 49},
201-
{"Gray29", 62, 53, 53},
202-
{"Gray3", 21, 5, 23},
203-
{"Gray30", 65, 56, 57},
204-
{"Gray31", 65, 56, 60},
205-
{"Gray32", 70, 62, 63},
206-
{"Gray33", 70, 62, 65},
207-
{"Gray34", 74, 67, 68},
208-
{"Gray35", 76, 70, 70},
209-
{"Gray36", 78, 72, 72},
210-
{"Gray37", 80, 74, 75},
211-
{"Gray38", 84, 78, 79},
212-
{"Gray39", 86, 80, 81},
213-
{"Gray4", 10, 10, 10},
214-
{"Gray40", 102, 102, 102},
215-
{"Gray41", 105, 105, 105},
216-
{"Gray42", 107, 107, 107},
217-
{"Gray43", 110, 110, 110},
218-
{"Gray44", 100, 96, 96},
219-
{"Gray45", 102, 99, 98},
220-
{"Gray46", 105, 101, 101},
221-
{"Gray47", 109, 105, 104},
222-
{"Gray48", 110, 106, 107},
223-
{"Gray49", 114, 110, 109},
224-
{"Gray5", 13, 13, 13},
225-
{"Gray50", 116, 113, 112},
226-
{"Gray51", 120, 116, 115},
227-
{"Gray52", 122, 119, 119},
228-
{"Gray53", 124, 121, 121},
229-
{"Gray54", 128, 125, 124},
230-
{"Gray55", 130, 128, 126},
231-
{"Gray56", 133, 131, 129},
232-
{"Gray57", 135, 133, 131},
233-
{"Gray58", 139, 137, 135},
234-
{"Gray59", 141, 139, 137},
235-
{"Gray6", 15, 15, 15},
236-
{"Gray60", 143, 142, 141},
237-
{"Gray61", 147, 145, 144},
238-
{"Gray62", 149, 148, 146},
239-
{"Gray63", 153, 151, 149},
240-
{"Gray64", 154, 153, 152},
241-
{"Gray65", 158, 156, 155},
242-
{"Gray66", 160, 159, 157},
243-
{"Gray67", 163, 162, 160},
244-
{"Gray68", 165, 164, 163},
245-
{"Gray69", 169, 168, 166},
246-
{"Gray7", 18, 18, 18},
247-
{"Gray70", 172, 171, 169},
248-
{"Gray71", 174, 173, 172},
249-
{"Gray72", 177, 177, 175},
250-
{"Gray73", 179, 179, 177},
251-
{"Gray74", 183, 182, 180},
252-
{"Gray75", 185, 184, 182},
253-
{"Gray76", 188, 187, 186},
254-
{"Gray77", 190, 190, 188},
255-
{"Gray78", 193, 193, 191},
256-
{"Gray79", 195, 196, 194},
257-
{"Gray8", 20, 20, 20},
258-
{"Gray80", 199, 199, 197},
259-
{"Gray81", 202, 202, 201},
260-
{"Gray82", 204, 204, 203},
261-
{"Gray83", 208, 207, 207},
262-
{"Gray84", 210, 210, 209},
263-
{"Gray85", 213, 213, 212},
264-
{"Gray86", 215, 215, 215},
265-
{"Gray87", 219, 219, 217},
266-
{"Gray88", 221, 221, 220},
267-
{"Gray89", 224, 224, 224},
268-
{"Gray9", 21, 5, 23},
269-
{"Gray90", 226, 227, 225},
270-
{"Gray91", 229, 230, 228},
271-
{"Gray92", 232, 233, 232},
272-
{"Gray93", 235, 235, 234},
273-
{"Gray94", 238, 238, 238},
274-
{"Gray95", 240, 241, 240},
275-
{"Gray96", 244, 244, 243},
276-
{"Gray97", 246, 246, 245},
277-
{"Gray98", 249, 249, 250},
278-
{"Gray99", 251, 251, 251},
178+
{"Gray0", 0, 0, 0},
179+
{"Gray1", 3, 3, 3},
180+
{"Gray2", 5, 5, 5},
181+
{"Gray3", 8, 8, 8},
182+
{"Gray4", 10, 10, 10},
183+
{"Gray5", 13, 13, 13},
184+
{"Gray6", 15, 15, 15},
185+
{"Gray7", 18, 18, 18},
186+
{"Gray8", 20, 20, 20},
187+
{"Gray9", 23, 23, 23},
188+
{"Gray10", 26, 26, 26},
189+
{"Gray11", 28, 28, 28},
190+
{"Gray12", 31, 31, 31},
191+
{"Gray13", 33, 33, 33},
192+
{"Gray14", 36, 36, 36},
193+
{"Gray15", 38, 38, 38},
194+
{"Gray16", 41, 41, 41},
195+
{"Gray17", 43, 43, 43},
196+
{"Gray18", 46, 46, 46},
197+
{"Gray19", 48, 48, 48},
198+
{"Gray20", 51, 51, 51},
199+
{"Gray21", 54, 54, 54},
200+
{"Gray22", 56, 56, 56},
201+
{"Gray23", 59, 59, 59},
202+
{"Gray24", 61, 61, 61},
203+
{"Gray25", 64, 64, 64},
204+
{"Gray26", 66, 66, 66},
205+
{"Gray27", 69, 69, 69},
206+
{"Gray28", 71, 71, 71},
207+
{"Gray29", 74, 74, 74},
208+
{"Gray30", 77, 77, 77},
209+
{"Gray31", 79, 79, 79},
210+
{"Gray32", 82, 82, 82},
211+
{"Gray33", 84, 84, 84},
212+
{"Gray34", 87, 87, 87},
213+
{"Gray35", 89, 89, 89},
214+
{"Gray36", 92, 92, 92},
215+
{"Gray37", 94, 94, 94},
216+
{"Gray38", 97, 97, 97},
217+
{"Gray39", 99, 99, 99},
218+
{"Gray40", 102, 102, 102},
219+
{"Gray41", 105, 105, 105},
220+
{"Gray42", 107, 107, 107},
221+
{"Gray43", 110, 110, 110},
222+
{"Gray44", 112, 112, 112},
223+
{"Gray45", 115, 115, 115},
224+
{"Gray46", 117, 117, 117},
225+
{"Gray47", 120, 120, 120},
226+
{"Gray48", 122, 122, 122},
227+
{"Gray49", 125, 125, 125},
228+
{"Gray50", 128, 128, 128},
229+
{"Gray51", 130, 130, 130},
230+
{"Gray52", 133, 133, 133},
231+
{"Gray53", 135, 135, 135},
232+
{"Gray54", 138, 138, 138},
233+
{"Gray55", 140, 140, 140},
234+
{"Gray56", 143, 143, 143},
235+
{"Gray57", 145, 145, 145},
236+
{"Gray58", 148, 148, 148},
237+
{"Gray59", 150, 150, 150},
238+
{"Gray60", 153, 153, 153},
239+
{"Gray61", 156, 156, 156},
240+
{"Gray62", 158, 158, 158},
241+
{"Gray63", 161, 161, 161},
242+
{"Gray64", 163, 163, 163},
243+
{"Gray65", 166, 166, 166},
244+
{"Gray66", 168, 168, 168},
245+
{"Gray67", 171, 171, 171},
246+
{"Gray68", 173, 173, 173},
247+
{"Gray69", 176, 176, 176},
248+
{"Gray70", 179, 179, 179},
249+
{"Gray71", 181, 181, 181},
250+
{"Gray72", 184, 184, 184},
251+
{"Gray73", 186, 186, 186},
252+
{"Gray74", 189, 189, 189},
253+
{"Gray75", 191, 191, 191},
254+
{"Gray76", 194, 194, 194},
255+
{"Gray77", 196, 196, 196},
256+
{"Gray78", 199, 199, 199},
257+
{"Gray79", 201, 201, 201},
258+
{"Gray80", 204, 204, 204},
259+
{"Gray81", 207, 207, 207},
260+
{"Gray82", 209, 209, 209},
261+
{"Gray83", 212, 212, 212},
262+
{"Gray84", 214, 214, 214},
263+
{"Gray85", 217, 217, 217},
264+
{"Gray86", 219, 219, 219},
265+
{"Gray87", 222, 222, 222},
266+
{"Gray88", 224, 224, 224},
267+
{"Gray89", 227, 227, 227},
268+
{"Gray90", 230, 230, 230},
269+
{"Gray91", 232, 232, 232},
270+
{"Gray92", 235, 235, 235},
271+
{"Gray93", 237, 237, 237},
272+
{"Gray94", 240, 240, 240},
273+
{"Gray95", 242, 242, 242},
274+
{"Gray96", 245, 245, 245},
275+
{"Gray97", 247, 247, 247},
276+
{"Gray98", 250, 250, 250},
277+
{"Gray99", 252, 252, 252},
278+
{"Gray100", 255, 255, 255},
279279
{"Green", 0, 255, 0},
280280
{"Green1", 95, 251, 23},
281281
{"Green2", 0, 238, 0},

0 commit comments

Comments
 (0)