diff --git a/www/color.html b/www/color.html
index d80c5f7..bfb1378 100644
--- a/www/color.html
+++ b/www/color.html
@@ -1,52 +1,46 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html version="-//W3C//DTD XHTML 1.1//EN"
- xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/1999/xhtml
- http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="-//W3C//DTD XHTML 1.1//EN" xml:lang="en" xsi:schemaLocation="http://www.w3.org/1999/xhtml http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"/>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8"></meta>
+ <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"></meta>
<title>ImageMagick: Color Names</title>
- <meta http-equiv="content-language" content="en-US"/>
- <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
- <meta http-equiv="reply-to" content="magick-users@imagemagick.org"/>
- <meta name="application-name" content="ImageMagick"/>
- <meta name="description" content="Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition, resize, rotate, shear, distort or transform images automagically."/>
- <meta name="application-url" content="http://www.imagemagick.org"/>
- <meta name="generator" content="PHP"/>
- <meta name="keywords" content="color, names, ImageMagick, PerlMagick, image processing, OpenMP, software development library, image, photo, software, Magick++, MagickWand"/>
- <meta name="rating" content="GENERAL"/>
- <meta name="robots" content="INDEX, FOLLOW"/>
- <meta name="generator" content="ImageMagick Studio LLC"/>
- <meta name="author" content="ImageMagick Studio LLC"/>
- <meta name="revisit-after" content="2 DAYS"/>
- <meta name="resource-type" content="document"/>
- <meta name="copyright" content="Copyright (c) 1999-2012 ImageMagick Studio LLC"/>
- <meta name="distribution" content="Global"/>
- <link rel="icon" href="../images/wand.png"/>
- <link rel="shortcut icon" href="../images/wand.ico" type="images/x-icon"/>
- <link rel="canonical" href="http://www.imagemagick.org" />
- <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
+ <meta http-equiv="content-language" content="en-US"></meta>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8"></meta>
+ <meta http-equiv="reply-to" content="magick-users@imagemagick.org"></meta>
+ <meta name="application-name" content="ImageMagick"></meta>
+ <meta name="description" content="Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition, resize, rotate, shear, distort or transform images automagically."></meta>
+ <meta name="application-url" content="http://www.imagemagick.org"></meta>
+ <meta name="generator" content="PHP"></meta>
+ <meta name="keywords" content="color, names, ImageMagick, PerlMagick, image processing, OpenMP, software development library, image, photo, software, Magick++, MagickWand"></meta>
+ <meta name="rating" content="GENERAL"></meta>
+ <meta name="robots" content="INDEX, FOLLOW"></meta>
+ <meta name="generator" content="ImageMagick Studio LLC"></meta>
+ <meta name="author" content="ImageMagick Studio LLC"></meta>
+ <meta name="revisit-after" content="2 DAYS"></meta>
+ <meta name="resource-type" content="document"></meta>
+ <meta name="copyright" content="Copyright (c) 1999-2012 ImageMagick Studio LLC"></meta>
+ <meta name="distribution" content="Global"></meta>
+ <link rel="icon" href="../images/wand.png"></link>
+ <link rel="shortcut icon" href="../images/wand.ico" type="images/x-icon"></link>
+ <link rel="canonical" href="http://www.imagemagick.org"></link>
+ <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"></link>
<!-- Add jQuery library -->
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+ <script type="text/javascript" src="http://localhost/ajax/libs/jquery/1.7/jquery.min.js"></script>
<!-- Add mousewheel plugin (this is optional) -->
<script type="text/javascript" src="http://www.imagemagick.org/fancybox/lib/jquery.mousewheel-3.0.6.pack.js"></script>
<!-- Add fancyBox -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen" />
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen"></link>
<script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.0.6"></script>
<!-- Optionally add helpers - button, thumbnail and/or media -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.css?v=1.0.2" type="text/css" media="screen" />
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.css?v=1.0.2" type="text/css" media="screen"></link>
<script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.js?v=1.0.2"></script>
<script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-media.js?v=1.0.0"></script>
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=2.0.6" type="text/css" media="screen" />
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=2.0.6" type="text/css" media="screen"></link>
<script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
<script type="text/javascript">
@@ -63,15 +57,7 @@
<body id="www-imagemagick-org">
-<script>
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'offline-script','//127.0.0.1/analytics.js','ga');
- ga('create', 'UA-40133312-1', 'imagemagick.org');
- ga('send', 'pageview');
-</script>
<div class="titlebar">
<div style="margin: 17px auto; float: left;">
@@ -83,18 +69,12 @@
google_ad_height = 90;
//-->
</script>
- <script type="text/javascript"
- src="http://127.0.0.1/pagead/show_ads.js">
- </script>
+
</div>
<a href="http://www.imagemagick.org/discourse-server/">
- <img src="../images/logo.jpg"
- alt="ImageMagick Logo"
- style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
+ <img src="../images/logo.jpg" alt="ImageMagick Logo" style="width: 123px; height: 118px; border: 0px; float: right;"></img></a>
<a href="../index.html">
- <img src="../images/sprite.jpg"
- alt="ImageMagick Sprite"
- style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
+ <img src="../images/sprite.jpg" alt="ImageMagick Sprite" style="width: 114px; height: 118px; border: 0px; float: right;"></img></a>
</div>
<div class="westbar">
@@ -146,7 +126,7 @@
<a title="Program Interface: Magick++" href="magick++.html">Magick++</a>
</div>
<div class="sep"></div>
-<div class="menu">
+<div class="menu">
<a title="Install from Source" href="install-source.html">Install from Source</a>
</div>
<div class="sub">
@@ -172,7 +152,7 @@
<div class="menu">
<a title="Site Map" href="sitemap.html">Site Map</a>
</div>
-<div class="sub">
+<div class="sub">
<a title="Site Map: Links" href="links.html">Links</a>
</div>
<div class="sep"></div>
@@ -182,49 +162,20 @@
</div>
<div class="eastbar">
- <script type="text/javascript">
- /* <![CDATA[ */
- (function() {
- var po = document.createElement('offline-script'), t = document.getElementsByTagName('offline-script')[0];
- po.type = 'text/javascript';
- po.async = true;
- po.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
- var script = document.getElementsByTagName('offline-script')[0];
- script.parentNode.insertBefore(po, script);
- })();
- /* ]]> */
- </script>
+
<div> <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.imagemagick.org/"></a></div>
<noscript>
<a href="http://flattr.com/thing/947300/Convert-Edit-And-Compose-Images" target="_blank">
- <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" width="93" height="20" border="0" /></a>
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" width="93" height="20" border="0"></img></a>
</noscript>
- <div class="g-plusone" id="gplusone"></div>
- <script type="text/javascript">
- /* <![CDATA[ */
- window.___gcfg = {
- lang: 'en-US'
- };
-
- (function() {
- var po = document.createElement('offline-script');
- po.type = 'text/javascript';
- po.async = true;
- po.src = 'https://127.0.0.1/js/plusone.js';
- var script = document.getElementsByTagName('offline-script')[0];
- script.parentNode.insertBefore(po, script);
- })();
- var gplusone = document.getElementById("gplusone");
- gplusone.setAttribute("data-size","medium");
- gplusone.setAttribute("data-count","true");
- /* ]]> */
- </script>
+
+
</div>
<div class="main">
<h1>ImageMagick Color Names</h1>
-<p class="navigation-index">[<a href="color.html#usage">Example Usage</a> • <a href="color.html#models">Color Model Specification</a> • <a href="color.html#color_names">List of Color Names</a>]</p>
+<p class="navigation-index">[<a href="color.html#usage">Example Usage</a> • <a href="color.html#models">Color Model Specification</a> • <a href="color.html#color_names">List of Color Names</a>]</p>
<div class="doc-section">
<p>A number of ImageMagick options and methods take a color as an argument. The color can then be given as a color name (there is a limited but large set of these; see below) or it can be given as a set of numbers (in decimal or hexadecimal), each corresponding to a channel in an RGB or RGBA color model. HSL, HSLA, HSB, HSBA, CMYK, or CMYKA color models may also be specified. These topics are briefly described in the sections below.</p>
@@ -241,7 +192,7 @@
<p>Each of the following commands produces the same <em>lime</em> border around the image. (Use "double quotes" for Windows.)</p>
-<p class='crt'><span class="crtprompt"> $ </span><span class='crtin'>convert -bordercolor lime -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $ </span><span class='crtin'>convert -bordercolor '#0f0' -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $ </span><span class='crtin'>convert -bordercolor '#00ff00' -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $ </span><span class='crtin'>convert -bordercolor 'rgb(0,255,0)' -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $ </span><span class='crtin'>convert -bordercolor 'rgb(0,100%,0)' -border 10 image.jpg image.png</span></p>
+<p class="crt"><span class="crtprompt"> $ </span><span class="crtin">convert -bordercolor lime -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $ </span><span class="crtin">convert -bordercolor '#0f0' -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $ </span><span class="crtin">convert -bordercolor '#00ff00' -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $ </span><span class="crtin">convert -bordercolor 'rgb(0,255,0)' -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $ </span><span class="crtin">convert -bordercolor 'rgb(0,100%,0)' -border 10 image.jpg image.png</span></p>
<p>The list of recognized color names (for example, <em>aqua</em>, <em>black</em>, <em>blue</em>, <em>fuchsia</em>, <em>gray</em>, <em>green</em>, <em>lime</em>, <em>maroon</em>, <em>navy</em>, <em>olive</em>, <em>purple</em>, <em>red</em>, <em>silver</em>, <em>teal</em>, <em>white</em>, <em>yellow</em>, and others) is shown in a table further below.</p>
</div>
@@ -257,13 +208,13 @@
#ff0000ff #rrggbbaa
#ffff00000000 #rrrrggggbbbb
#ffff00000000ffff #rrrrggggbbbbaaaa
- rgb(255, 0, 0) an integer in the range 0—255 for each component
- rgb(100.0%, 0.0%, 0.0%) a float in the range 0—100% for each component
-</pre >
+ rgb(255, 0, 0) an integer in the range 0255 for each component
+ rgb(100.0%, 0.0%, 0.0%) a float in the range 0100% for each component
+</pre>
<p>The format of an sRGB value in hexadecimal notation is a '#' immediately followed by either three, six, or twelve hexadecimal characters. The three-digit sRGB notation (#rgb) is converted into six-digit form (#rrggbb) by replicating digits, not by adding zeros. For example, #fb0 expands to #ffbb00. This ensures that white (#ffffff) can be specified with the short notation (#fff) and removes any dependencies on the color depth of the image. Use the hexadecimal notation whenever performance is an issue. ImageMagick does not need to load the expansive color table to interpret a hexadecimal color, e.g., <code>#000000</code>, but it does if <code>black</code> is used instead.</p>
-<p>The format of an sRGB value in the functional notation is 'rgb(<em>r</em>,<em>g</em>,<em>b</em>)', where <em>r</em>, <em>g</em>, and <em>b</em> are either three integer or float values in the range 0—255 or three integer or float percentage values in the range 0—100%. The value 255 corresponds to 100%, and to #F or #FF in the hexadecimal notation: rgb(255, 255, 255) = rgb(100%, 100%, 100%) = #FFF = #FFFFFF. </p>
+<p>The format of an sRGB value in the functional notation is 'rgb(<em>r</em>,<em>g</em>,<em>b</em>)', where <em>r</em>, <em>g</em>, and <em>b</em> are either three integer or float values in the range 0255 or three integer or float percentage values in the range 0100%. The value 255 corresponds to 100%, and to #F or #FF in the hexadecimal notation: rgb(255, 255, 255) = rgb(100%, 100%, 100%) = #FFF = #FFFFFF. </p>
<p>White space characters are allowed around the numerical values, at least if the entire color argument is enclosed in quotes ('single quotes' for Unix-like systems, "double quotes" for Windows).</p>
@@ -287,7 +238,7 @@
graya(50%, 0.5) semi-transparent mid gray
</pre>
-<p>The ImageMagick color model also supports hue-saturation-lightness (HSL) and hue-saturation-brightness (HSB) colors as a complement to numerical sRGB colors. HSL colors are encoding as a triple (hue, saturation, lightness). Likewise HSB colors are encoding as a triple (hue, saturation, brightness). HSL or HSB triples are either direct values (hue 0—360, saturation 0—255, ligthness or brightness 0—255) or as percentage values relative to these ranges.</p>
+<p>The ImageMagick color model also supports hue-saturation-lightness (HSL) and hue-saturation-brightness (HSB) colors as a complement to numerical sRGB colors. HSL colors are encoding as a triple (hue, saturation, lightness). Likewise HSB colors are encoding as a triple (hue, saturation, brightness). HSL or HSB triples are either direct values (hue 0360, saturation 0255, ligthness or brightness 0255) or as percentage values relative to these ranges.</p>
<p>The HSB color system is geometrically represented as a cone with its apex pointing downward. Hue is measured around the perimeter. Saturation is measured from the axis outward. Brightness is measured from the apex upward.</p>
@@ -295,11 +246,11 @@
<p>See <a href="http://en.wikipedia.org/wiki/HSL_and_HSV">http://en.wikipedia.org/wiki/HSL_and_HSV</a> for more details on HSL and HSB color systems.</p>
-<p>Hue is represented as an angle of the color around the circular perimeter of the cone(s) (i.e. the rainbow represented in a circle). Hue values are either integer or floats in the range 0—360 or integer or float percentage values in the range 0—100%. By definition red=0=360 (or 0%=100%), and the other colors are spread around the circle, so green=120 (or 33.3333%), blue=240 (or (66.6667%), etc. As an angle, it implicitly wraps around such that -120=240 and 480=120, for instance. (Students of trigonometry would say that "coterminal angles are equivalent" here; an angle <em>θ</em> can be standardized by computing the equivalent angle, <em>θ</em> mod 360.)</p>
+<p>Hue is represented as an angle of the color around the circular perimeter of the cone(s) (i.e. the rainbow represented in a circle). Hue values are either integer or floats in the range 0360 or integer or float percentage values in the range 0100%. By definition red=0=360 (or 0%=100%), and the other colors are spread around the circle, so green=120 (or 33.3333%), blue=240 (or (66.6667%), etc. As an angle, it implicitly wraps around such that -120=240 and 480=120, for instance. (Students of trigonometry would say that "coterminal angles are equivalent" here; an angle <em>θ</em> can be standardized by computing the equivalent angle, <em>θ</em> mod 360.)</p>
-<p>Saturation is measure outward from the central axis of the cone(s) toward the perimeter of the cone(s). Saturation may be expressed as an integer or float in the range 0—255 or as an integer or float percentage in the range 0—100. Saturation may be thought of as the absence of any "white" mixed with the base color. Thus 255 or 100% is full saturation and corresponds to a point on the outside surface of the cone (HSB) or double cone (HSL). It will be the most "colorful" region. 0 or 0% is no saturation which results in some shade of gray. It occurs along the central axis of the cone or double cone with black at the bottom apex and white at the top.</p>
+<p>Saturation is measure outward from the central axis of the cone(s) toward the perimeter of the cone(s). Saturation may be expressed as an integer or float in the range 0255 or as an integer or float percentage in the range 0100. Saturation may be thought of as the absence of any "white" mixed with the base color. Thus 255 or 100% is full saturation and corresponds to a point on the outside surface of the cone (HSB) or double cone (HSL). It will be the most "colorful" region. 0 or 0% is no saturation which results in some shade of gray. It occurs along the central axis of the cone or double cone with black at the bottom apex and white at the top.</p>
-<p>Brightness and Lightness also may be represented as integers or floats in the range 0—255 or as integer or float percentages in the range 0—100%. Brightness and Lightness are measured from the bottom apex upward to the top of the cone or double cone along the cone(s) central axis. 0 or 0% corresponds to the bottom apex and 255 or 100% corresponds to the top center of the cone for Brightness and to the top apex of the double cone for Lightness.</p>
+<p>Brightness and Lightness also may be represented as integers or floats in the range 0255 or as integer or float percentages in the range 0100%. Brightness and Lightness are measured from the bottom apex upward to the top of the cone or double cone along the cone(s) central axis. 0 or 0% corresponds to the bottom apex and 255 or 100% corresponds to the top center of the cone for Brightness and to the top apex of the double cone for Lightness.</p>
<p>The HSB color system is a little easier to understand than the HSL color system. In the HSB color system, black is at the bottom apex and white is at the top center of the cone on the central axis. The most colorful or saturated colors will then be at the outer edge of the top of the cone at the widest part. Thus at Saturation=100% and Brightness=100%</p>
@@ -339,7 +290,7 @@
hsla(120, 255, 127.5, 1.0) the same, with an alpha value of 1.0
</pre>
-<p>Prior to ImageMagick 6.5.6-6, HSL (HSB) could only be specified with Hue in range 0—360, but Saturation and Lightness (Brightness) as percent in range 0—100%.</p>
+<p>Prior to ImageMagick 6.5.6-6, HSL (HSB) could only be specified with Hue in range 0360, but Saturation and Lightness (Brightness) as percent in range 0100%.</p>
<p>Specify the Lab colors like this:</p>
<pre class="text">
@@ -5104,8 +5055,8 @@
<span id="linkbar-west"> </span>
<span id="linkbar-center">
- <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> •
- <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a> •
+ <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> •
+ <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a> •
<a href="http://jqmagick.imagemagick.org/">JqMagick</a>
</span>
<span id="linkbar-east"> </span>