diff --git a/www/color.html b/www/color.html
index b37b11d..3529d3d 100644
--- a/www/color.html
+++ b/www/color.html
@@ -8,13 +8,13 @@
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="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
+ <meta name="google-site-verification" content="_bMOCDpkx9ZAzBwb2kF3PRHbfUUdFj2uO8Jd1AXArz4"/>
<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 and transform images automagically."/>
+ <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"/>
@@ -24,42 +24,55 @@
<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-2013 ImageMagick Studio LLC"/>
+ <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://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
- <!-- Optionaly include easing and/or mousewheel plugins -->
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.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/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>
+ <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/source/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen" />
+ <script type="text/javascript" src="http://www.imagemagick.org/fancybox/source/jquery.fancybox.pack.js?v=2.0.6"></script>
- <!-- Optionaly include button and/or thumbnail helpers -->
- <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></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" />
+ <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/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />
- <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></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" />
+ <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">
$(document).ready(function() {
$(".fancybox").fancybox();
});
</script>
+
<!-- ImageMagick style -->
- <link rel="stylesheet" href="http://www.localhost/cse/style/look/default.css" type="text/css" />
<style type="text/css" media="all">
@import url("../www/magick.css");
</style>
</head>
<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;">
<script type="text/javascript">
@@ -71,10 +84,10 @@
//-->
</script>
<script type="text/javascript"
- src="http://localhost/pagead/show_ads.js">
+ src="http://127.0.0.1/pagead/show_ads.js">
</script>
</div>
-<a href="../discourse-server">
+<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>
@@ -153,7 +166,7 @@
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Search" href="http://www.imagemagick.org/script/search.php">Search</a>
+ <a title="Search" href="search.html">Search</a>
</div>
<div class="sep"></div>
<div class="menu">
@@ -164,75 +177,48 @@
</div>
<div class="sep"></div>
<div class="menu">
- <a rel="follow" title="Sponsors" href="support.html">Sponsors:</a>
-
- <a href="http://www.networkredux.com"> <img src="../images/networkredux.png" width="140" height="31" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a>
- <a href="http://www.dinodirect.com/ipads-tablets/"> <img src="../images/dino-direct.jpg" width="140" height="90" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a><!-- 201208010120 mickey@163... -->
-<div class="sponsbox">
-<div class="sponsor">
- <a rel="follow" title="Sponsor: The Fastest & Easiest Way to Find Images" href="http://www.graphicsfactory.com">The Fastest & Easiest Way to Find Images</a><!-- 201210010270 graphicsfac... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: VPS" href="http://www.interdominios.com/vps">VPS</a><!-- 201209010090 barsh@inter... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Werbebanner Werbeplane" href="http://www.allesbanner.de">Werbebanner Werbeplane</a><!-- 201212010450 info@druck... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Entertainment News & Photos" href="http://www.zimbio.com">Entertainment News & Photos</a><!-- 201211010540 bd@zimb... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: LED24" href="http://led24.de/">LED24</a><!-- 201207010270 info@led24... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Best Website Hosting" href="http://www.top-cheap-web-hosting.com">Best Website Hosting</a><!-- 201304010090 eunge.liu-->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Android Tablet" href="http://www.dinodirect.com/ipads-tablets/">Android Tablet</a><!-- 201208010120 mickey@163... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Web Site Hosting" href="http://webhostinggeeks.com">Web Site Hosting</a><!-- 201302010900 funds@enmob... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Premium Quality Stock Photos" href="http://www.f1online.pro/en/">Premium Quality Stock Photos</a><!-- 2012080100540 ... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 2012070100250 ... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Managed Server" href="http://www.robhost.de">Managed Server</a><!-- 201210010720 klikics... -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Druckerei" href="http://www.allesdruck.de">Druckerei</a><!-- 201303011500 r.leo -->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Names List" href="http://www.listofnames.info">Names List</a><!-- 2012110100180 grimshrat@busyb-->
-</div>
-<div class="sponsor">
- <a rel="follow" title="Sponsor: Web Hosting" href="http://www.hostucan.com">Web Hosting</a><!-- 2012120100150 racent marketing@webhosting...-->
-</div>
-</div>
+ <a title="Support ImageMagick Development" href="support.html">Support ImageMagick Development</a>
</div>
</div>
<div class="eastbar">
- <div class="g-plusone" id="gplusone"></div>
<script type="text/javascript">
- window.___gcfg = {
- lang: 'en-US'
- };
-
+ /* <![CDATA[ */
(function() {
- var po = document.createElement('offline-script');
- po.type = 'text/javascript'; po.async = true;
- po.src = 'https://apis.localhost/js/plusone.js';
- var script = document.getElementsByTagName('offline-script')[0];
- script.parentNode.insertBefore(po, script);
+ 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);
})();
- var gplusone = document.getElementById("gplusone");
- gplusone.setAttribute("data-size","medium");
- gplusone.setAttribute("data-count","false");
+ /* ]]> */
</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>
+ </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">
@@ -247,11 +233,7 @@
<h2><a id="color-converter"></a>Interactive Color Converter</h2>
<div class="doc-section">
-<p>Use the
-<a href="../www/contrib/color-converter.html">Color Converter</a>
-to supply any valid ImageMagick color specification as described below to see a
-color swatch of that color and to convert to all the other color models.
-</p>
+<p>Use the <a href="../contrib/color-converter.html">Color Converter</a> to supply any valid ImageMagick color specification as described below to see a color swatch of that color and to convert to all the other color models.</p>
</div>
<h2><a id="usage"></a>Example Usage</h2>
@@ -267,7 +249,7 @@
<h2><a id="models"></a>Color Model Specification</h2>
<div class="doc-section">
-<p>The RGB, CMYK, HSL and HSB color models are used in numerical color specifications. These examples all specify the same red RGB color:</p>
+<p>The sRGB, CMYK, HSL and HSB color models are used in numerical color specifications. These examples all specify the same red sRGB color:</p>
<pre class="text">
#f00 #rgb
@@ -279,13 +261,13 @@
rgb(100.0%, 0.0%, 0.0%) a float in the range 0—100% for each component
</pre >
-<p>The format of an RGB value in hexadecimal notation is a '#' immediately followed by either three, six, or twelve hexadecimal characters. The three-digit RGB 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., <kbd>#000000</kbd>, but it does if <kbd>black</kbd> is used instead.</p>
+<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 RGB 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 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>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>
-<p>The RGB color model is extended in this specification to include <em>alpha</em> to allow specification of the transparency of a color. These examples all specify the same color:</p>
+<p>The sRGB color model is extended in this specification to include <em>alpha</em> to allow specification of the transparency of a color. These examples all specify the same color:</p>
<pre class="text">
rgb(255, 0, 0) range 0 - 255
@@ -296,7 +278,7 @@
<p>The format of an RGBA value in the functional notation is 'rgba(<em>r</em>,<em>g</em>,<em>b</em>,<em>a</em>)', where <em>r</em>, <em>g</em>, and <em>b</em> are as described above for the RGB functional notation, and where the alpha value <em>a</em> ranges from 0.0 (fully transparent) to 1.0 (fully opaque).</p>
-<p>There is also a color called 'none' that is fully transparent. This color is shorthand for <kbd>rgba(0, 0, 0, 0.0)</kbd>.</p>
+<p>There is also a color called 'none' that is fully transparent. This color is shorthand for <code>rgba(0, 0, 0, 0.0)</code>.</p>
<p>Gray values are conviently defined with a single intensity value or an intensity value and an alpha value:</p>
@@ -305,7 +287,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 RGB 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 0—360, saturation 0—255, ligthness or brightness 0—255) 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>
@@ -359,6 +341,24 @@
<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>Specify the Lab colors like this:</p>
+<pre class="text">
+ cielab(62.253188, 23.950124, 48.410653)
+</pre>
+
+<p>Or specify colors generically with the <code>icc-color</code> keyword, for example:</p>
+<pre class="text">
+ icc-color(cmyk, 0.11, 0.48, 0.83, 0.00)
+ icc-color(rgb, white)
+</pre>
+
+<p>Or specify uncalibrated device colors with the <code>device-</code> keyword, for example:</p>
+<pre class="text">
+ device-gray(0.5)
+ device-rgb(0.5, 1.0, 0.0)
+ device-cmyk(0.11, 0.48, 0.83, 0.00)
+</pre>
+
</div>
<h2><a id="color_names"></a>List of Color Names</h2>
@@ -5102,9 +5102,11 @@
<div id="linkbar">
<span id="linkbar-west"> </span>
+
<span id="linkbar-center">
- <a href="../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>
</div>
@@ -5113,16 +5115,5 @@
<span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>
</div>
<div style="clear: both; margin: 0; width: 100%; "></div>
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-17690367-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('offline-script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.localhost/ga.js';
- var s = document.getElementsByTagName('offline-script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
</body>
</html>