diff --git a/www/color.html b/www/color.html
index fec67de..0de39d1 100644
--- a/www/color.html
+++ b/www/color.html
@@ -1,47 +1,54 @@
-<!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">
+
+<!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">
<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"></meta>
- <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"></meta>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+ <meta name=viewport content="width=device-width, initial-scale=0.3333334">
+ <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"/>
<title>ImageMagick: Color Names</title>
- <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>
+ <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="A collection of tools and libraries to read, write, and manipulate an image in any of the more popular image formats."/>
+ <meta name="application-url" content="http://www.imagemagick.org"/>
+ <meta name="generator" content="PHP"/>
+ <meta name="keywords" content="color, names, convert, edit, compose, image, pixel"/>
+ <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"/>
<!-- Add jQuery library -->
- <script type="text/javascript" src="http://localhost/ajax/libs/jquery/1.7/jquery.min.js"></script>
+ <script type="text/javascript" src="http://localhost/ajax/libs/jquery/2.1.0/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>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.0.6"></script>
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.1.5" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.1.5"></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>
- <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-buttons.css?v=1.0.5" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-buttons.js?v=1.0.5"></script>
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-media.js?v=1.0.6"></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>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.css?v=1.0.7" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/helpers/jquery.fancybox-thumbs.js?v=1.0.7"></script>
<script type="text/javascript">
$(document).ready(function() {
@@ -57,7 +64,15 @@
<body id="www-imagemagick-org">
+<script type="text/javascript">
+ (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','//www.google-analytics.com/analytics.js','ga');
+ ga('create', 'UA-40133312-1', 'imagemagick.org');
+ ga('send', 'pageview');
+</script>
<div class="titlebar">
<div style="margin: 17px auto; float: left;">
@@ -69,12 +84,18 @@
google_ad_height = 90;
//-->
</script>
-
+ <script type="text/javascript"
+ src="http://localhost/pagead/show_ads.js">
+ </script>
</div>
<a href="../discourse-server">
- <img src="../images/logo.jpg" alt="ImageMagick Logo" style="width: 123px; height: 118px; border: 0px; float: right;"></img></a>
+ <img src="../images/logo.jpg"
+ alt="ImageMagick Logo" width="123" height="118"
+ style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
<a href="http://www.imagemagick.org/ImageMagick-7.0.0/index.html">
- <img src="../images/sprite.jpg" alt="ImageMagick Sprite" style="width: 114px; height: 118px; border: 0px; float: right;"></img></a>
+ <img src="../images/sprite.jpg"
+ alt="ImageMagick Sprite" width="114" height="118"
+ style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
</div>
<div class="westbar">
@@ -126,7 +147,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">
@@ -152,21 +173,50 @@
<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>
</div>
<div class="eastbar">
-
+ <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://apis.google.com/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>
+ <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"></img></a>
+ <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" width="93" height="20" border="0" /></a>
</noscript>
-
-
+ <div class="g-plusone" data-size="standard" data-count="true"></div>
</div>
<div class="main">
@@ -189,7 +239,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"> $magick> </span><span class="crtin">convert -bordercolor lime -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $magick> </span><span class="crtin">convert -bordercolor '#0f0' -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $magick> </span><span class="crtin">convert -bordercolor '#00ff00' -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $magick> </span><span class="crtin">convert -bordercolor 'rgb(0,255,0)' -border 10 image.jpg image.png</span><span class="crtout"></span><span class="crtprompt"> $magick> </span><span class="crtin">convert -bordercolor 'rgb(0,100%,0)' -border 10 image.jpg image.png</span></p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert -bordercolor lime -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>convert -bordercolor '#0f0' -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>convert -bordercolor '#00ff00' -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>convert -bordercolor 'rgb(0,255,0)' -border 10 image.jpg image.png</span><span class='crtout'></span><span class="crtprompt"> $magick> </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>
@@ -207,7 +257,7 @@
#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>
+</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>
@@ -252,19 +302,19 @@
<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>
<pre class="text">
- hsb(0%, 100%, 100%) or hsl(0, 255, 255) full red
- hsb(33.3333%, 100%, 100%) or hsl(120, 255, 255) full green
- hsb(33.3333%, 100%, 75%) or hsl(120, 255, 191.25) medium green
- hsb(33.3333%, 100%, 50%) or hsl(120, 255, 127.5) dark green
- hsb(33.3333%, 100%, 25%) or hsl(120, 255, 63.75) very dark green
- hsb(33.3333%, 50%, 50%) or hsl(120, 127.5, 127.5) pastel green
+ hsb(0%, 100%, 100%) or hsb(0, 255, 255) full red
+ hsb(33.3333%, 100%, 100%) or hsb(120, 255, 255) full green
+ hsb(33.3333%, 100%, 75%) or hsb(120, 255, 191.25) medium green
+ hsb(33.3333%, 100%, 50%) or hsb(120, 255, 127.5) dark green
+ hsb(33.3333%, 100%, 25%) or hsb(120, 255, 63.75) very dark green
+ hsb(33.3333%, 50%, 50%) or hsb(120, 127.5, 127.5) pastel green
</pre>
<p>In the HSL color system, black is at the bottom apex and white is at the top apex. However, saturation is largest at the middle of the double cone on its outer perimeter and thus at a lightness value of 50%. The most colorful or saturated colors will then be at the outer edge of the double cone at its widest part. Thus at Saturation=100% and Brightness=50%</p>
<pre class="text">
hsl(0%, 100%, 50%) or hsl(0, 255, 127.5) full red
- hsb(33.3333%, 100%, 100%) or hsl(120, 255, 255) white
+ hsl(33.3333%, 100%, 100%) or hsl(120, 255, 255) white
hsl(33.3333%, 100%, 75%) or hsl(120, 255, 191.25) pastel green
hsl(33.3333%, 100%, 50%) or hsl(120, 255, 127.5) full green
hsl(33.3333%, 100%, 25%) or hsl(120, 255, 63.75) dark green
@@ -549,7 +599,7 @@
<tr>
<td align="right">maroon</td>
- <td align="center" style="background-color: rgb(128, 0, 0)">maroon</td>
+ <td align="center" style="background-color: rgb(128, 0, 0)">maroon (SVG compliance)</td>
<td align="left">rgb(128, 0, 0)</td>
<td align="left">#800000</td>
</tr>
@@ -703,7 +753,7 @@
<tr>
<td align="right">maroon</td>
- <td align="center" style="background-color: rgb(176, 48, 96)">maroon</td>
+ <td align="center" style="background-color: rgb(176, 48, 96)">maroon (X11 compliance)</td>
<td align="left">rgb(176, 48, 96)</td>
<td align="left">#B03060</td>
</tr>
@@ -1011,7 +1061,7 @@
<tr>
<td align="right">purple</td>
- <td align="center" style="background-color: rgb(128, 0, 128)">purple</td>
+ <td align="center" style="background-color: rgb(128, 0, 128)">purple (SVG compliance)</td>
<td align="left">rgb(128, 0, 128)</td>
<td align="left">#800080</td>
</tr>
@@ -1095,7 +1145,7 @@
<tr>
<td align="right">purple</td>
- <td align="center" style="background-color: rgb(160, 32, 240)">purple</td>
+ <td align="center" style="background-color: rgb(160, 32, 240)">purple (X11 compliance)</td>
<td align="left">rgb(160, 32, 240)</td>
<td align="left">#A020F0</td>
</tr>
@@ -5052,15 +5102,15 @@
<span id="linkbar-west"> </span>
<span id="linkbar-center">
- <a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
<a href="../discourse-server">Discourse Server</a> •
+ <a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</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>
</div>
<div class="footer">
- <span id="footer-west">© 1999-2013 ImageMagick Studio LLC</span>
+ <span id="footer-west">© 1999-2014 ImageMagick Studio LLC</span>
<span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>
</div>
<div style="clear: both; margin: 0; width: 100%; "></div>