190 files changed, 1925 insertions, 373 deletions
diff --git a/doc/3dformat.html b/doc/3dformat.html
index e60a432..da256c5 100644..100755
--- a/doc/3dformat.html
+++ b/doc/3dformat.html
@@ -30,7 +30,7 @@
     &nbsp;&nbsp;&nbsp; Any web browser supporting javascript and WebGL
     can be used to display this.<br>
     <br>
-    By default ArgyllCMS tools will output VRML format, but the defaul
+    By default ArgyllCMS tools will output X3DOM format, but the defaul
     can be overridden by setting the environment variable<br>
     <b>"ARGYLL_3D_DISP_FORMAT"</b> to <b>"VRML"</b>, <b>"X3D"</b> or <b>"X3DOM"</b><br>
     <br>
@@ -78,8 +78,7 @@
           <th>Function</th>
           <th>Key</th>
         </tr>
-      </thead>
-      <tbody>
+      </thead> <tbody>
         <tr>
           <td>Reset view</td>
           <td>r</td>
diff --git a/doc/ArgyllCMS_arts_tag.html b/doc/ArgyllCMS_arts_tag.html
index 826aa30..826aa30 100644..100755
--- a/doc/ArgyllCMS_arts_tag.html
+++ b/doc/ArgyllCMS_arts_tag.html
diff --git a/doc/ArgyllDoc.html b/doc/ArgyllDoc.html
index f7a0141..5f617e0 100644..100755
--- a/doc/ArgyllDoc.html
+++ b/doc/ArgyllDoc.html
@@ -10,9 +10,9 @@
     <title>Argyll Documentation Top</title>
   </head>
   <body>
-    <h1> Argyll CMS documentation index (V1.7.0)<br>
+    <h1> Argyll CMS documentation index (V1.8.0)<br>
     </h1>
-    Date:&nbsp;&nbsp; 1st May 2015<br>
+    Date:&nbsp;&nbsp; 20th August 2015<br>
     Author: Graeme Gill
     <h2><u><a name="Intro"></a>Introduction</u></h2>
     ArgyllCMS is an ICC compatible color management system, available as
@@ -34,7 +34,7 @@
     provided for each major tool, and a general guide to using the tools
     for typical color management tasks is also available. A mailing list
     provides support for more advanced usage.<br>
-    <p>This is Version 1.7.0, a feature and bug fix update to V1.6.3.
+    <p>This is Version 1.8.0, a feature and bug fix update to V1.7.0.
       The first public release of icclib was in November 1998, and of
       Argyll was in October 2000. Code development commenced in 1995.
       See <a href="ChangesSummary.html">Changes Summary</a> for an
@@ -47,10 +47,10 @@
     <p><font color="#cc0000"><span style="font-weight: bold;">Please
           note that instruments are being driven by ArgyllCMS drivers,
           and that any problems or queries regarding instrument<br>
-          operation </span><span style="font-weight: bold;">should be
-          directed to the Argyll's author(s) or the Argyll mailing list,
-          and not to any</span> <span style="font-weight: bold;">other
-          party.</span></font> </p>
+          operation </span><span style="font-weight: bold;">should
+          first be directed to the Argyll's author(s) or the Argyll
+          mailing list, and not to any</span> <span style="font-weight:
+          bold;">other party.</span></font> </p>
     <p> </p>
     <h2><a href="ColorManagement.html">An Introduction to Color
         Management</a></h2>
@@ -98,6 +98,10 @@
 
 
 
+
+
+
+
 
       discussion</a> of what color management is, and why we need it,
     together with a brief overview of the ICC profile format.<br>
@@ -189,6 +193,64 @@
 
 
 
+
+
+
+
+
+    - Tele-Spectro-Radiometer<br>
+    <br>
+    Image Engineering:<br>
+    <br>
+    &nbsp;&nbsp;&nbsp; <a href="instruments.html#ex1">EX1</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     - Tele-Spectro-Radiometer<br>
     <br>
@@ -216,6 +278,10 @@
 
 
 
+
+
+
+
 
     &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
@@ -311,6 +377,10 @@
 
 
 
+
+
+
+
 
     - "swipe" type reflective spectrometer, that can be used untethered.<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#DTP22">DTP22 Digital
@@ -400,6 +470,10 @@
 
 
 
+
+
+
+
 
     - spot type reflective spectrometer.<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#DTP41">DTP41</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -488,6 +562,10 @@
 
 
 
+
+
+
+
 
     - spot and strip reading reflective spectrometer.<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#DTP41">DTP41T</a>
@@ -578,6 +656,10 @@
 
 
 
+
+
+
+
 
     - spot and strip reading reflective/transmissive spectrometer.<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#dtp51">DTP51</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -666,6 +748,10 @@
 
 
 
+
+
+
+
 
     - strip reading reflective colorimeter.<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#DTP92">DTP92</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -754,6 +840,10 @@
 
 
 
+
+
+
+
 
     - CRT display colorimeter.<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#DTP94">DTP94</a> <font
@@ -903,6 +993,10 @@
 
 
 
+
+
+
+
 
     - display colorimeter. (Treated as a Eye-One Display 2)<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#i1d">CalMAN X2</a>
@@ -992,6 +1086,10 @@
 
 
 
+
+
+
+
 
     - display colorimeter. (Treated as a Eye-One Display 2)<br>
     &nbsp;&nbsp;&nbsp; <a href="instruments.html#Huey">Huey</a> &nbsp;
@@ -1090,6 +1188,10 @@
 
 
 
+
+
+
+
 
     [The Sequel Chroma 4 may also work.]<br>
     <br>
@@ -1180,6 +1282,10 @@
 
 
 
+
+
+
+
 
     - see <a href="instruments.html#i1d">Eye-One Display</a><br>
     <br>
@@ -1275,6 +1381,10 @@
 
 
 
+
+
+
+
 
     [The Spyder 1 has also been reported as working, but this has not
     been confirmed.]<br>
@@ -1297,7 +1407,11 @@
     <br>
     Other:<br>
     &nbsp;&nbsp;&nbsp; <span class="titre"><a
-        href="instruments.html#HCFR">Colorim�tre HCFR</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        href="instruments.html#HCFR">Colorim�tre HCFR</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+
 
 
 
@@ -1456,8 +1570,16 @@
 
 
 
+
+
+
+
 
     - display colorimeter<br>
+    &nbsp;&nbsp;&nbsp; <a href="instruments.html#SMCube">SwatchMate
+      Cube</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+    - reflective colorimeter<br>
     <span style="font-weight: bold;"></span><span class="titre"><br>
       See </span><a href="instruments.html">Operation of particular
       instruments</a> for more instrument specific detail.<br>
@@ -1510,6 +1632,10 @@
 
 
 
+
+
+
+
 
         GNU</span> license <span style="font-weight: bold;">prohibits</span>
       extending these tools<span style="font-weight: bold;"></span>
@@ -1652,6 +1778,10 @@
 
 
 
+
+
+
+
 
       the jcnf library in <span style="font-weight: bold;">jcnf</span>/,
 
@@ -1738,6 +1868,10 @@
 
 
 
+
+
+
+
 
       the files <span style="font-weight: bold;">spectro/xdg_bds.*</span>,
       <span style="font-weight: bold;">spectro/aglob.*</span> and the
@@ -1907,6 +2041,10 @@ calibration
 
 
 
+
+
+
+
 
     and profiling is <a href="http://hoech.net/dispcalGUI/">dispcalGUI</a>
     by Florian H�ch. Others can be found with a suitable <a
@@ -2003,6 +2141,10 @@ href="http://www.google.com/search?hl=en&amp;source=hp&amp;q=argyllcms+GUI&amp;a
 
 
 
+
+
+
+
 
       -? </b>(or some other unrecognized flag, if the "?" character is
     treated specially in your shell, i.e. try "--" on OS X zsh).<br>
@@ -2106,6 +2248,10 @@ href="http://www.google.com/search?hl=en&amp;source=hp&amp;q=argyllcms+GUI&amp;a
 
 
 
+
+
+
+
 
     Verbose mode<br>
     &nbsp;&nbsp; -d
@@ -2195,6 +2341,10 @@ href="http://www.google.com/search?hl=en&amp;source=hp&amp;q=argyllcms+GUI&amp;a
 
 
 
+
+
+
+
 
     Choose a depth 0-4<br>
     &nbsp;&nbsp; -r
@@ -2284,6 +2434,10 @@ href="http://www.google.com/search?hl=en&amp;source=hp&amp;q=argyllcms+GUI&amp;a
 
 
 
+
+
+
+
 
     Use a random depth<br>
     &nbsp;&nbsp; -f
@@ -2376,6 +2530,10 @@ href="http://www.google.com/search?hl=en&amp;source=hp&amp;q=argyllcms+GUI&amp;a
 
 
 
+
+
+
+
 
     Manual<br>
     &nbsp;&nbsp; infile
@@ -2465,6 +2623,10 @@ href="http://www.google.com/search?hl=en&amp;source=hp&amp;q=argyllcms+GUI&amp;a
 
 
 
+
+
+
+
 
     Input file<br>
     &nbsp;&nbsp; outfile
@@ -2558,7 +2720,7 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
     converting color spaces of raster files. <br>
     <br>
     Although it is is a couple of years old now, this <a
-      href="http://www.argyllcms.com/doc/FCMS2010_ArgyllTute.pdf">tutorial</a>
+      href="http://www.argyllcms.com/doc2/FCMS2010_ArgyllTute.pdf">tutorial</a>
     may also be of interest.<br>
     &nbsp; <br>
     <h3 style="color: rgb(0, 0, 0);"><u><a name="Topics"></a>Topical
@@ -2705,6 +2867,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span><big>Generate a profiling test target values .ti1 file. </big><br
         style="font-family: monospace;">
@@ -2795,6 +2961,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         film recorder TIFF files from Argyll .ti1 file. </big><br
         style="font-family: monospace;">
@@ -2885,6 +3055,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         a PS, EPS or TIFF file containing test patch values, ready for
         printing.</big></small>
@@ -2977,6 +3151,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         a test chart using an instrument to create a .ti3 data file.</big><span
         style="font-family: monospace;"> </span><br style="font-family:
@@ -3068,6 +3246,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         and read colorimetric values from a display </big><br
         style="font-family: monospace;">
@@ -3158,6 +3340,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         film colorimetric values using a SpectroScanT (Deprecated ?)</big><br
         style="font-family: monospace;">
@@ -3248,6 +3434,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span><big>Convert a TIFF&nbsp; image of a test chart into .ti3
         device values. <br>
@@ -3343,6 +3533,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         the reading of a device using an ICC or MPP profile. <br>
       </big></small><small><a style="font-family: monospace;"
@@ -3437,6 +3631,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span><big>Convert Colorblind format CMY/RGB test chart into
         Argyll .ti3 CGATS format. </big><br style="font-family:
@@ -3528,6 +3726,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         Kodak Colorflow format CMYK test chart into Argyll .ti3 CGATS
         format. </big><br style="font-family: monospace;">
@@ -3618,6 +3820,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span><big>Convert Gretag/Logo/X-Rite/Barbieri or other format
         RGB or CMYK test chart results into Argyll .ti3 CGATS format. </big></small><br
@@ -3647,6 +3853,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
             LightSpace format RGB .bcs test chart results into Argyll
             .ti3 CGATS format.</big></small></big><br>
@@ -3737,6 +3947,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span><big>Create a fake Argyll .ti3 CMY data file from a CMYK
         profile, as a basis of creating a CMY to CMYK separation<br>
@@ -3757,6 +3971,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         or Merge two or more measurement data files, or average patches
         within a single file.</big></small><br>
@@ -3848,6 +4066,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Create an ICC profile from the .ti3 test data. <br>
     <small><a style="font-family: monospace;" href="mppprof.html">mppprof</a><span
@@ -3937,6 +4159,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Create a Model Printer Profile (MPP) from the .ti3
     test data. <br>
@@ -4027,6 +4253,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Regenerate a device profiles B2A table data by
     inverting the A2B table.
@@ -4118,6 +4348,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Link two device ICC profiles to create a device
     link profile.
@@ -4210,6 +4444,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Color convert a TIFF or JPEG file using a sequence
     of ICC device, device link, abstract profiles and calibration files.
@@ -4300,6 +4538,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     calibration curves to an ICC profile.<br>
     <small><a style="font-family: monospace;" href="icclu.html">icclu&nbsp;</a><span
@@ -4389,6 +4631,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Lookup individual color values through any ICC
     profile table. <br>
@@ -4479,6 +4725,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Lookup individual color values forward or inverted
     though an ICC profile or CAL table. <br>
@@ -4569,6 +4819,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Lookup individual color values though an MPP
     profile. Also create MPP gamut files/views.<br>
@@ -4659,6 +4913,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a TIFF file to monochrome using an ICC device profile <br>
     <h3>Color Tweaking tools<br>
@@ -4757,6 +5015,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a gamut file or VRML file of the color gamut of an ICC profile. <br>
     <small><a style="font-family: monospace;" href="tiffgamut.html">tiffgamut</a><span
@@ -4846,6 +5108,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a gamut file or VRML file of the color gamut of a TIFF or JPEG
     image. <br>
@@ -4936,6 +5202,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Convert one or more gamuts into a VRML 3D
     visualization file. Compute an intersection.<br>
@@ -5028,6 +5298,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Dump the contents of an ICC profile as text. <br>
     <small><a style="font-family: monospace;" href="profcheck.html">profcheck</a><span
@@ -5117,6 +5391,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     an ICC profile against .ti3 test chart data, create pruned .ti3
     file.<br>
@@ -5206,6 +5484,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     </small>Check ICC forward against inverse lookup. <br>
     <small><a style="font-family: monospace;" href="splitti3.html">splitsti3</a><span
@@ -5294,6 +5576,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a CGATS file (ie. a .ti3) into two parts randomly to verify
     profiling. <br>
@@ -5387,6 +5673,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     an MPP profile against .ti3 test chart data. <br>
     <small><a style="font-family: monospace;" href="spotread.html">spotread</a><span
@@ -5475,6 +5765,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     an instrument to read a single spot color value. <br>
     <small><a style="font-family: monospace;" href="colverify.html">colverify</a><span
@@ -5507,6 +5801,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     matching of CIE in two CGATS/.ti3 files (also view differences as
     VRML)<br>
@@ -5596,6 +5894,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a synthetic input, display or output calibration (<a
       href="File_Formats.html#.cal">.cal</a>)file.
@@ -5686,6 +5988,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a Spectrometer to create a Colorimeter Correction Matrix
     (CCMX)&nbsp; or a Colorimeter Calibration Spectral Set (CCSS)&nbsp;
@@ -5778,6 +6084,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       an embedded ICC profile from a TIFF or JPEG file.<br>
     </small><small><a style="font-family: monospace;"
@@ -5873,6 +6183,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     or uninstall display profile, set display calibration from profile
     or .cal file, test displace and dispwin access to a display.<br>
@@ -5969,6 +6283,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Plot a spectrum (.sp, .cmf, .ccss) and calculate CCT and VCT.<br>
     <small><a style="font-family: monospace;" href="spec2cie.html">spec2cie</a><span
@@ -6059,6 +6377,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     reflective spectral .ti3 readings into CIE XYZ and D50 L*a*b*
     readings. Apply FWA, plot spectrums.<br>
@@ -6151,6 +6473,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     calibration curves to an ICC profile.<br>
     <small><a style="font-family: monospace;" href="average.html">average</a><span
@@ -6240,6 +6566,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small><small><big>Average or Merge two or more
         measurement data files, or average patches within a single file.</big></small><br>
@@ -6330,6 +6660,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Convert Colorblind format CMY/RGB test chart into
     Argyll .ti3 CGATS format. <br>
@@ -6420,6 +6754,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Color convert a TIFF or JPEG file using a sequence
     of ICC device, device link, abstract profiles and calibration files.<br>
@@ -6509,6 +6847,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a Spectrometer to create a Colorimeter Correction Matrix
     (CCMX)&nbsp; or a Colorimeter Calibration Spectral Set (CCSS)&nbsp;
@@ -6600,6 +6942,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a test chart using an instrument to create a .ti3 data file. <br>
     <small><a style="font-family: monospace;" href="collink.html">collink</a><span
@@ -6689,6 +7035,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Link two device ICC profiles to create a device
     link profile. <br>
@@ -6779,6 +7129,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Create an ICC profile from the .ti3 test data.<br>
     <font size="-1"><a style="font-family: monospace;"
@@ -6869,6 +7223,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     matching of CIE in two CGATS/.ti3 files (also view differences as
     VRML)<br>
@@ -6962,6 +7320,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     and read colorimetric values from a display <br>
     <small><a style="font-family: monospace;" href="dispwin.html">dispwin</a><span
@@ -7052,6 +7414,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     or uninstall display profile, set display calibration from profile
     or .cal file, test displace and dispwin access to a display.<br>
@@ -7143,6 +7509,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       an embedded ICC profile from a TIFF or JPEG file.<br>
     </small><small><a style="font-family: monospace;"
@@ -7237,6 +7607,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Create a fake Argyll .ti3 CMY data file from a CMYK
     profile, as a basis of creating a CMY to CMYK separation <br>
@@ -7327,6 +7701,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     the reading of a device using an ICC or MPP profile. <br>
     <small><a style="font-family: monospace;" href="filmread.html">filmread</a><span
@@ -7416,6 +7794,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     film colorimetric values using a SpectroScanT (Deprecated ?)<br>
     <small><a style="font-family: monospace;" href="filmtarg.html">filmtarg</a><span
@@ -7505,6 +7887,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     film recorder TIFF files from Argyll .ti1 file. <br>
     <small><a style="font-family: monospace;" href="greytiff.html">greytiff</a><span
@@ -7594,6 +7980,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a TIFF file to monochrome using an ICC device profile <small><a
         style="font-family: monospace;" href="oeminst.html"></a></small><br>
@@ -7684,6 +8074,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Dump the contents of an ICC profile as text. <br>
     <small><a style="font-family: monospace;" href="iccgamut.html">iccgamut</a><span
@@ -7773,6 +8167,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a gamut file or VRML file of the color gamut of an ICC profile. <br>
     <small><a style="font-family: monospace;" href="icclu.html">icclu&nbsp;</a><span
@@ -7862,6 +8260,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Lookup individual color values through any ICC
     profile table. <br>
@@ -7951,6 +8353,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     an instrument to measure an illuminant spectrum, and estimate its UV
     content.<br>
@@ -8044,6 +8450,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Kodak Colorflow format CMYK test chart into Argyll .ti3 CGATS
     format. <br>
@@ -8135,6 +8545,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
           </span><big>Convert LightSpace format RGB .bcs test chart
             results into Argyll .ti3 CGATS format.</big></small></big></small><br>
@@ -8225,6 +8639,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     an MPP profile against .ti3 test chart data. <br>
     <small><a style="font-family: monospace;" href="mpplu.html">mpplu</a><span
@@ -8314,6 +8732,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Lookup individual color values though an MPP
     profile. Also create MPP gamut files/views. <br>
@@ -8404,6 +8826,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Create a Model Printer Profile (MPP) from the .ti3
     test data. <br>
@@ -8498,6 +8924,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a printer calibration .cal file from a .ti3 data file<small><big>.</big></small><br>
     <small><a style="font-family: monospace;" href="printtarg.html">printtarg</a><span
@@ -8587,6 +9017,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         a PS, EPS or TIFF file containing test patch values, ready for
         printing.</big></small><br>
@@ -8677,6 +9111,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     an ICC profile against .ti3 test chart data, create pruned .ti3
     file.<br>
@@ -8772,6 +9210,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Regenerate a device profiles B2A table data by
     inverting the A2B table. <br>
@@ -8862,6 +9304,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Convert a TIFF&nbsp; image of a test chart into
     .ti3 device values. <br>
@@ -8953,6 +9399,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     reflective spectral .ti3 readings into CIE XYZ and D50 L*a*b*
     readings. Apply FWA, plot spectrums.<br>
@@ -9044,6 +9494,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Plot a spectrum (.sp, .cmf, .ccss) and calculate CCT and VCT.<br>
     <small><a style="font-family: monospace;" href="splitti3.html">splitsti3</a><span
@@ -9132,6 +9586,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a CGATS file (ie. a .ti3) into two parts randomly to verify
     profiling. <br>
@@ -9221,6 +9679,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     an instrument to read a single spot color value. <small><a
         style="font-family: monospace;" href="oeminst.html"></a></small><br>
@@ -9310,6 +9772,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a synthetic input, display or output calibration (<a
       href="File_Formats.html#.cal">.cal</a>)file.<br>
@@ -9400,6 +9866,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
         the reading of a device using a synthetic device model. </big></small><br>
     <small><a style="font-family: monospace;" href="targen.html">targen</a><span
@@ -9489,6 +9959,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Generate a profiling test target values .ti1 file.
     <br>
@@ -9579,6 +10053,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     a gamut file or VRML file of the color gamut of a TIFF or JPEG
     image. <br>
@@ -9673,6 +10151,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small><small><big>Convert Gretag/Logo/X-Rite/Barbieri or
         other format RGB or CMYK test chart results into Argyll .ti3
@@ -9764,6 +10246,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     one or more gamuts into a VRML 3D visualization file. Compute an
     intersection.<br>
@@ -9854,6 +10340,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
       </span></small>Lookup individual color values forward or inverted
     though an ICC profile or CAL table. <br>
@@ -9971,6 +10461,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Device test values <br>
     <a href="File_Formats.html#.ti2">.ti2</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -10059,6 +10553,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Device test values &amp; chart layout <br>
     <a href="File_Formats.html#.ti3">.ti3</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -10147,6 +10645,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Device test values &amp; CIE tristimulus/spectral results&nbsp; <a
       href="ti3_format.html">Format details.</a><br>
@@ -10239,6 +10741,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Test chart recognition template. <a href="cht_format.html">Format
       details.</a> <br>
@@ -10328,6 +10834,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     3D gamut surface description <br>
     <a href="File_Formats.html#.sp">.sp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -10416,6 +10926,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Illuminant spectral description <br>
     <a href="File_Formats.html#.cmf">.cmf</a>
@@ -10512,6 +11026,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Standard text based data exchange format <br>
     <a href="File_Formats.html#ICC">ICC</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -10600,6 +11118,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     International Color Consortium profile format <br>
     <a href="File_Formats.html#MPP">MPP</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -10688,6 +11210,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Model device profile format <br>
     <a href="File_Formats.html#TIFF">TIFF</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -10776,6 +11302,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Tag Image File Format raster files. <br>
     <a href="File_Formats.html#JPEG">JPEG</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -10864,6 +11394,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Joint Photographic Experts Group, JPEG File Interchange Format
     raster files. <br>
@@ -10957,6 +11491,10 @@ href="http://www.google.com/search?hl=en&amp;q=windows+command+prompt+tutorial">
 
 
 
+
+
+
+
 
     Virtual Reality Modelling Language 3D file format. <br>
     <a href="File_Formats.html#X3D">X3D</a>
diff --git a/doc/ArgyllFlow.jpg b/doc/ArgyllFlow.jpg
index 962e42a..962e42a 100644..100755
--- a/doc/ArgyllFlow.jpg
+++ b/doc/ArgyllFlow.jpg
diff --git a/doc/ArgyllFlowThumb.jpg b/doc/ArgyllFlowThumb.jpg
index a98b4ff..a98b4ff 100644..100755
--- a/doc/ArgyllFlowThumb.jpg
+++ b/doc/ArgyllFlowThumb.jpg
diff --git a/doc/CMP_DT_003.jpg b/doc/CMP_DT_003.jpg
index 1975eeb..1975eeb 100644..100755
--- a/doc/CMP_DT_003.jpg
+++ b/doc/CMP_DT_003.jpg
diff --git a/doc/CMP_Digital_Target-4.jpg b/doc/CMP_Digital_Target-4.jpg
index f8cb7a9..f8cb7a9 100644..100755
--- a/doc/CMP_Digital_Target-4.jpg
+++ b/doc/CMP_Digital_Target-4.jpg
diff --git a/doc/CRTspectrum.jpg b/doc/CRTspectrum.jpg
index 82ddd17..82ddd17 100644..100755
--- a/doc/CRTspectrum.jpg
+++ b/doc/CRTspectrum.jpg
diff --git a/doc/ChangesSummary.html b/doc/ChangesSummary.html
index d0eee96..559f521 100644..100755
--- a/doc/ChangesSummary.html
+++ b/doc/ChangesSummary.html
@@ -16,6 +16,48 @@
     <h1> Summary of Argyll CMS Changes since last release</h1>
     <h3>For a <span style="text-decoration: underline;">complete</span>
       and more detailed list of changes, please see the log.txt file.</h3>
+    <h1>[V1.7.0 -&gt; V1.8.0] 20th August 2015</h1>
+    <ul>
+      <li>Added support for the Image Engineering EX1 spectroradiometer.</li>
+      <li>Added support for the SwatchMate Cube reflective colorimeter,
+        with improved accuracy.</li>
+      <li>Added Added Television Lighting Consistency Index (EBU
+        TLCI-2012 Qa)&nbsp; to spotread and specplot output.</li>
+      <li>Added R9 value to CRI value in spotread and specplot output.</li>
+      <li>Added support for "EMISINPUT" type .ti3 file.</li>
+      <li>Build using OpenSSL rather than axTLS if it is built on Linux.</li>
+      <li>Fixed stack space problem in OS X UI programs by expanding
+        main thread proxy to have 8MB instead of the default 512K.</li>
+      <li>Updated built in libtiff to V4.0.4beta.</li>
+      <li>Changed CGATS format to not emit unknown keyword declaration
+        ("KEYWORD") by default.</li>
+      <li>Added inst_calc_cond_mask to inst.h to allow for flags in
+        calibration conditions. A consequence of this is that calc needs
+        to be masked with this when comparing against a specific
+        condition, and the inst_calc_optional_flag should be cleared if
+        it is set, before callint inst-&gt;calibrate() if the user wants
+        to proceed with a particular calibration.</li>
+      <li>Fixed bug with dispcal -e N</li>
+      <li>Fixed bug in xicclu -fg and -kp</li>
+      <li>Added dispcal -x x option to allow reading a chart and
+        manually entering the XYZ values.</li>
+      <li>Fix spyder4 &amp; 5 bug where some display types were set as
+        refresh when they shouldn't be.</li>
+      <li>Fix collink "Warning :- RGB black hack trigger more than
+        once!" when -b is used with input video encoding (-e).</li>
+      <li>Changed colprof so that the default ICC description is the
+        base filename rather than the whole file path.</li>
+      <li>Fix technology type and display type selector
+        "uniqueification" bug&nbsp; that shows up in "ccxxmake -??".</li>
+      <li>Add OEM field to ccmx and ccss files to mark files that have
+        been installed from OEM disk, so that custom ccmx &amp; ccss
+        files can be given suggested selector letter priority (+
+        ref/CRT.ccss).</li>
+      <li>Tweak CGATS write format to avoid scientific notation until
+        the numbers are bigger and smaller (i.e until e6 and e-6 are
+        needed).<br>
+      </li>
+    </ul>
     <h1>[V1.6.3 -&gt; V1.7.0] 1st May 2015</h1>
     <ul>
       <li>Improved gamut mapping to reduce unnecessary changes to less
@@ -924,6 +966,7 @@
 
 
 
+
         </span>for systems with &gt; 3Gig Ram.</li>
       <li>Add support for the Eye-One Monitor spectrometer.</li>
       <li>Added -L option to <span style="font-weight: bold;">printtarg</span>
@@ -960,6 +1003,7 @@
 
 
 
+
         and memory usage issues.</li>
       <li>Fixed issues with Eye-One Pro Rev B timeouts.</li>
       <li>Added new option to collink -fk, that forces 000K input to K
diff --git a/doc/Chroma4.jpg b/doc/Chroma4.jpg
index 917a9e5..917a9e5 100644..100755
--- a/doc/Chroma4.jpg
+++ b/doc/Chroma4.jpg
diff --git a/doc/ColorHug.jpg b/doc/ColorHug.jpg
index 6c5d16a..6c5d16a 100644..100755
--- a/doc/ColorHug.jpg
+++ b/doc/ColorHug.jpg
diff --git a/doc/ColorManagement.html b/doc/ColorManagement.html
index 3adcbe8..3adcbe8 100644..100755
--- a/doc/ColorManagement.html
+++ b/doc/ColorManagement.html
diff --git a/doc/ColorMunki.jpg b/doc/ColorMunki.jpg
index 513d770..513d770 100644..100755
--- a/doc/ColorMunki.jpg
+++ b/doc/ColorMunki.jpg
diff --git a/doc/ColorMunkiCreate.jpg b/doc/ColorMunkiCreate.jpg
index 64b3dbd..64b3dbd 100644..100755
--- a/doc/ColorMunkiCreate.jpg
+++ b/doc/ColorMunkiCreate.jpg
diff --git a/doc/Compiling.html b/doc/Compiling.html
index 942e15e..942e15e 100644..100755
--- a/doc/Compiling.html
+++ b/doc/Compiling.html
diff --git a/doc/CrushedDisplyBlacks.html b/doc/CrushedDisplyBlacks.html
index 3038384..3038384 100644..100755
--- a/doc/CrushedDisplyBlacks.html
+++ b/doc/CrushedDisplyBlacks.html
diff --git a/doc/DC.jpg b/doc/DC.jpg
index 4b3508e..4b3508e 100644..100755
--- a/doc/DC.jpg
+++ b/doc/DC.jpg
diff --git a/doc/DTP20.jpg b/doc/DTP20.jpg
index f5ec164..f5ec164 100644..100755
--- a/doc/DTP20.jpg
+++ b/doc/DTP20.jpg
diff --git a/doc/DTP22.jpg b/doc/DTP22.jpg
index 93d7400..93d7400 100644..100755
--- a/doc/DTP22.jpg
+++ b/doc/DTP22.jpg
diff --git a/doc/DTP41.jpg b/doc/DTP41.jpg
index 1a946e9..1a946e9 100644..100755
--- a/doc/DTP41.jpg
+++ b/doc/DTP41.jpg
diff --git a/doc/DTP51.jpg b/doc/DTP51.jpg
index 946810c..946810c 100644..100755
--- a/doc/DTP51.jpg
+++ b/doc/DTP51.jpg
diff --git a/doc/DTP92.jpg b/doc/DTP92.jpg
index 2570daa..2570daa 100644..100755
--- a/doc/DTP92.jpg
+++ b/doc/DTP92.jpg
diff --git a/doc/DTP94.jpg b/doc/DTP94.jpg
index d99feaf..d99feaf 100644..100755
--- a/doc/DTP94.jpg
+++ b/doc/DTP94.jpg
diff --git a/doc/DocLicense.txt b/doc/DocLicense.txt
index cd2b3b1..cd2b3b1 100644..100755
--- a/doc/DocLicense.txt
+++ b/doc/DocLicense.txt
diff --git a/doc/EX1.jpg b/doc/EX1.jpg
new file mode 100755
index 0000000..0192ba8
--- /dev/null
+++ b/doc/EX1.jpg
diff --git a/doc/Environment.html b/doc/Environment.html
index d02bf6c..b4cd9ca 100644..100755
--- a/doc/Environment.html
+++ b/doc/Environment.html
@@ -41,6 +41,12 @@
       &nbsp;&nbsp;&nbsp; Note that while a reading is being made, a
       character input can abort the reading, just as with normal
       interactive mode.<br>
+      <br>
+      &nbsp;&nbsp;&nbsp; Note that on MSWin systems, the character and
+      return or line fee characters must be written to stdin in a single
+      operation (i.e. testing <span style="font-weight: bold;">ARGYLL_NOT_INTERACTIVE&nbsp;
+      </span>mode manually will probably fail, because the character and
+      return get split up.)<br>
     </div>
     <span style="font-weight: bold;"></span><br>
     <b><a name="ARGYLL_3D_DISP_FORMAT"></a>ARGYLL_3D_DISP_FORMAT<br>
@@ -51,11 +57,13 @@
 
 
 
+
       </b>or <b>X3DOM</b>, which will result in <b>.wrl</b>, <b>.x3d</b>
       and <b>.x3d.html</b> files respectively. See <a href="3dformat">3d
 
 
 
+
         Viewing Format</a>.<br>
     </blockquote>
     <b><br>
@@ -88,6 +96,7 @@ a
 
 
 
+
       delay of 200 msec is allowed between changing a patch color in
       software, and that change appearing in the displayed color itself.
       For some instuments (ie. i1d3, i1pro, ColorMunki, Klein K10-A)
@@ -106,6 +115,7 @@ environment
 
 
 
+
       variable, ie. ARGYLL_MIN_DISPLAY_UPDATE_DELAY_MS=400 would set a
       400 msec minimum delay.<br>
       <span style="font-weight: bold;"><br>
@@ -246,6 +256,7 @@ Base
 
 
 
+
         Directory Specification</a>, and uses the <span
         style="font-weight: bold;">XDG_CACHE_HOME</span> environment
       variable to place per instrument calibration information, and
diff --git a/doc/FWA.html b/doc/FWA.html
index c6b1f4b..c6b1f4b 100644..100755
--- a/doc/FWA.html
+++ b/doc/FWA.html
diff --git a/doc/FWA_measure.jpg b/doc/FWA_measure.jpg
index 7d97fff..7d97fff 100644..100755
--- a/doc/FWA_measure.jpg
+++ b/doc/FWA_measure.jpg
diff --git a/doc/File_Formats.html b/doc/File_Formats.html
index 1741701..70a196a 100644..100755
--- a/doc/File_Formats.html
+++ b/doc/File_Formats.html
@@ -117,7 +117,7 @@
       href="File_Formats.html#CGATS">CGATS</a>, Argyll specific format,
     used to hold a set of display spectral samples. For Colorimeters
     that have known sensor spectral sensitivity information (such as the
-    i1d3 and Spyder4), this allows a calibration to be created that is
+    i1d3 and Spyder4 & Spyder5), this allows a calibration to be created that is
     tuned for a particular display. The file contains a description of
     the display, the display technology type, the type of spectrometer
     used for taking the readings. See <a href="oeminst.html">oeminst</a>
diff --git a/doc/Fluorescent.jpg b/doc/Fluorescent.jpg
index acabf74..acabf74 100644..100755
--- a/doc/Fluorescent.jpg
+++ b/doc/Fluorescent.jpg
diff --git a/doc/HCFR.jpg b/doc/HCFR.jpg
index 9454842..9454842 100644..100755
--- a/doc/HCFR.jpg
+++ b/doc/HCFR.jpg
diff --git a/doc/HCT.jpg b/doc/HCT.jpg
index a1f1f23..a1f1f23 100644..100755
--- a/doc/HCT.jpg
+++ b/doc/HCT.jpg
diff --git a/doc/HiResLaser.jpg b/doc/HiResLaser.jpg
index 66da2eb..66da2eb 100644..100755
--- a/doc/HiResLaser.jpg
+++ b/doc/HiResLaser.jpg
diff --git a/doc/Huey.jpg b/doc/Huey.jpg
index 5f25980..5f25980 100644..100755
--- a/doc/Huey.jpg
+++ b/doc/Huey.jpg
diff --git a/doc/Installing.html b/doc/Installing.html
index 79d8ade..79d8ade 100644..100755
--- a/doc/Installing.html
+++ b/doc/Installing.html
diff --git a/doc/Installing_Linux.html b/doc/Installing_Linux.html
index a26d64c..a26d64c 100644..100755
--- a/doc/Installing_Linux.html
+++ b/doc/Installing_Linux.html
diff --git a/doc/Installing_MSWindows.html b/doc/Installing_MSWindows.html
index 40dcd2c..bb610cd 100644..100755
--- a/doc/Installing_MSWindows.html
+++ b/doc/Installing_MSWindows.html
@@ -61,9 +61,9 @@
     <br>
     &nbsp;So if the current value of PATH is
     "%SystemRoot%\system32;%SystemRoot%" and you unpacked Argyll version
-    1.7.0 in <span style="font-weight: bold;">d:\bin\</span>, then you
+    1.8.0 in <span style="font-weight: bold;">d:\bin\</span>, then you
     would modify PATH to be
-    "%SystemRoot%\system32;%SystemRoot%;d:\bin\Argyll_V1.7.0\bin", -
+    "%SystemRoot%\system32;%SystemRoot%;d:\bin\Argyll_V1.8.0\bin", -
     i.e. you append the path to the Argyll binaries to your PATH,
     separated by the ';' character. The change will take effect when you
     start a new command shell, which you start from Start
diff --git a/doc/Installing_OSX.html b/doc/Installing_OSX.html
index fb01e4a..fb01e4a 100644..100755
--- a/doc/Installing_OSX.html
+++ b/doc/Installing_OSX.html
diff --git a/doc/JETI_1211.jpg b/doc/JETI_1211.jpg
index efbf291..efbf291 100644..100755
--- a/doc/JETI_1211.jpg
+++ b/doc/JETI_1211.jpg
diff --git a/doc/K10A.jpg b/doc/K10A.jpg
index 1a93349..1a93349 100644..100755
--- a/doc/K10A.jpg
+++ b/doc/K10A.jpg
diff --git a/doc/Kgraph1.jpg b/doc/Kgraph1.jpg
index 9f6edf9..9f6edf9 100644..100755
--- a/doc/Kgraph1.jpg
+++ b/doc/Kgraph1.jpg
diff --git a/doc/Kgraph2.jpg b/doc/Kgraph2.jpg
index a7d532d..a7d532d 100644..100755
--- a/doc/Kgraph2.jpg
+++ b/doc/Kgraph2.jpg
diff --git a/doc/Kgraph3.jpg b/doc/Kgraph3.jpg
index f916558..f916558 100644..100755
--- a/doc/Kgraph3.jpg
+++ b/doc/Kgraph3.jpg
diff --git a/doc/Kgraph4.jpg b/doc/Kgraph4.jpg
index 603c9bd..603c9bd 100644..100755
--- a/doc/Kgraph4.jpg
+++ b/doc/Kgraph4.jpg
diff --git a/doc/Kgraph5.jpg b/doc/Kgraph5.jpg
index 1de1b88..1de1b88 100644..100755
--- a/doc/Kgraph5.jpg
+++ b/doc/Kgraph5.jpg
diff --git a/doc/Kgraph6.jpg b/doc/Kgraph6.jpg
index f3981d2..f3981d2 100644..100755
--- a/doc/Kgraph6.jpg
+++ b/doc/Kgraph6.jpg
diff --git a/doc/Kgraph7.jpg b/doc/Kgraph7.jpg
index c2d0686..c2d0686 100644..100755
--- a/doc/Kgraph7.jpg
+++ b/doc/Kgraph7.jpg
diff --git a/doc/Kgraph8.jpg b/doc/Kgraph8.jpg
index 1bb9569..1bb9569 100644..100755
--- a/doc/Kgraph8.jpg
+++ b/doc/Kgraph8.jpg
diff --git a/doc/Kparams.jpg b/doc/Kparams.jpg
index 04e344b..04e344b 100644..100755
--- a/doc/Kparams.jpg
+++ b/doc/Kparams.jpg
diff --git a/doc/LSDC.jpg b/doc/LSDC.jpg
index 2ad2a67..2ad2a67 100644..100755
--- a/doc/LSDC.jpg
+++ b/doc/LSDC.jpg
diff --git a/doc/LabSteps.jpg b/doc/LabSteps.jpg
index d25590f..d25590f 100644..100755
--- a/doc/LabSteps.jpg
+++ b/doc/LabSteps.jpg
diff --git a/doc/License.txt b/doc/License.txt
index a871fcf..a871fcf 100644..100755
--- a/doc/License.txt
+++ b/doc/License.txt
diff --git a/doc/License2.txt b/doc/License2.txt
index 05ca889..05ca889 100644..100755
--- a/doc/License2.txt
+++ b/doc/License2.txt
diff --git a/doc/License3.txt b/doc/License3.txt
index 94a9ed0..94a9ed0 100644..100755
--- a/doc/License3.txt
+++ b/doc/License3.txt
diff --git a/doc/Limitations.html b/doc/Limitations.html
index f3fb811..f3fb811 100644..100755
--- a/doc/Limitations.html
+++ b/doc/Limitations.html
diff --git a/doc/MinorTools.html b/doc/MinorTools.html
index 5e9a5c4..5e9a5c4 100644..100755
--- a/doc/MinorTools.html
+++ b/doc/MinorTools.html
diff --git a/doc/Organisation.html b/doc/Organisation.html
index 738b4ba..738b4ba 100644..100755
--- a/doc/Organisation.html
+++ b/doc/Organisation.html
diff --git a/doc/Overview.html b/doc/Overview.html
index 373d195..373d195 100644..100755
--- a/doc/Overview.html
+++ b/doc/Overview.html
diff --git a/doc/Performance.html b/doc/Performance.html
index 340cec0..340cec0 100644..100755
--- a/doc/Performance.html
+++ b/doc/Performance.html
diff --git a/doc/Q60.jpg b/doc/Q60.jpg
index 1521e04..1521e04 100644..100755
--- a/doc/Q60.jpg
+++ b/doc/Q60.jpg
diff --git a/doc/QPcard201.jpg b/doc/QPcard201.jpg
index dbe1448..dbe1448 100644..100755
--- a/doc/QPcard201.jpg
+++ b/doc/QPcard201.jpg
diff --git a/doc/QPcard202.jpg b/doc/QPcard202.jpg
index 3332bdd..3332bdd 100644..100755
--- a/doc/QPcard202.jpg
+++ b/doc/QPcard202.jpg
diff --git a/doc/SG.jpg b/doc/SG.jpg
index 7dc20e1..7dc20e1 100644..100755
--- a/doc/SG.jpg
+++ b/doc/SG.jpg
diff --git a/doc/SG_footer.txt b/doc/SG_footer.txt
index e82fbc2..e82fbc2 100644..100755
--- a/doc/SG_footer.txt
+++ b/doc/SG_footer.txt
diff --git a/doc/SG_header.txt b/doc/SG_header.txt
index 83af2cd..83af2cd 100644..100755
--- a/doc/SG_header.txt
+++ b/doc/SG_header.txt
diff --git a/doc/SMCube.jpg b/doc/SMCube.jpg
new file mode 100755
index 0000000..e38d23a
--- /dev/null
+++ b/doc/SMCube.jpg
diff --git a/doc/Scenarios.html b/doc/Scenarios.html
index 7b5899f..8cd45c9 100644..100755
--- a/doc/Scenarios.html
+++ b/doc/Scenarios.html
@@ -180,6 +180,7 @@
 
 
 
+
 
       and profiling a display that doesn't have VideoLUT access</a>.<br>
     <br>
@@ -258,6 +259,7 @@
 
 
 
+
 
       -r</span> for an LCD display, or <span style="text-decoration:
       underline; color: rgb(204, 51, 204);">dispcal -yc -r</span> for a
@@ -640,6 +642,7 @@
 
 
 
+
 
     (<span style="font-weight: bold;">-Iw</span>) changes by doing on
     the fly calibrations during the measurements. Instrument black level
@@ -710,6 +713,7 @@
 
 
 
+
 
       Correction Matrix</a>. These are specific to a particular
     Colorimeter and Display make and model combination, although a
@@ -878,6 +882,7 @@
 
 
 
+
 
       SG</a> charts:<br>
     <br>
@@ -946,6 +951,7 @@
 
 
 
+
 
       HCT</a> :<br>
     <br>
@@ -1019,6 +1025,7 @@
 
 
 
+
 
       Imaging DCPro Target</a>:<br>
     <br>
@@ -1083,6 +1090,7 @@
 
 
 
+
 
       201</a>:&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; <a
 href="http://www.qpcard.com/en_b2c/color-reference-cards/instant-camera-raw-profiling-with-qpcard-202.html">QPcard
@@ -1135,6 +1143,7 @@ href="http://www.qpcard.com/en_b2c/color-reference-cards/instant-camera-raw-prof
 
 
 
+
 
       202</a>:<br>
     <br>
@@ -1193,7 +1202,7 @@ href="http://www.qpcard.com/en_b2c/color-reference-cards/instant-camera-raw-prof
       create your own reference file using an instrument and chartread,
       making use of the chart reference file <span style="font-weight:
         bold;">ref/ColorChecker.ti2</span>:<br>
-      &nbsp;&nbsp; <a href="chartread.html">chartread</a> -n -a
+      &nbsp;&nbsp; <a href="chartread.html">chartread</a> -n
       ColorChecker.ti2<br>
       Note that due to the small number of patches, a profile created
       from such a chart is not likely to be very detailed.<br>
@@ -1271,6 +1280,7 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
 
 
 
+
 
         header</a>, and appending <a href="SG_footer.txt">this footer</a>,
       making sure there are no blank lines inserted in the process.
@@ -1298,7 +1308,7 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
       instrument (usually the Eye-One Pro). This can be done using
       chartread,&nbsp; making use of the chart reference file <span
         style="font-weight: bold;">ref/i1_RGB_Scan_1.4.ti2</span>:<br>
-      &nbsp;&nbsp;&nbsp; <a href="chartread.html">chartread</a> -n -a
+      &nbsp;&nbsp;&nbsp; <a href="chartread.html">chartread</a> -n
       i1_RGB_Scan_1.4<br>
       and then rename the resulting <span style="font-weight: bold;">i1_RGB_Scan_1.4.ti3</span>
       file to <span style="font-weight: bold;">i1_RGB_Scan_1.4.cie</span><br>
@@ -1403,6 +1413,7 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
 
 
 
+
 
       documentation</a>).<br>
     <br>
@@ -1856,6 +1867,7 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
 
 
 
+
 
         scanner or camera must be configured and used exactly the same
         as it was when it was profiled.</span></big><br>
@@ -2005,6 +2017,7 @@ then
 
 
 
+
 
     it can save considerable processing time and space if the -b flag is
     used, and the -S flag not used.<br>
@@ -2137,6 +2150,7 @@ then
 
 
 
+
 
     and then used <a href="xicclu.html#g">xicclu</a> to explore the
     effect of the parameters.<br>
@@ -2602,6 +2616,7 @@ chart,
 
 
 
+
 
     and/or to have it included in .ti3 file.<br>
     &nbsp;&nbsp;&nbsp; <a href="cctiff.html#p2">cctiff</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2668,6 +2683,7 @@ an
 
 
 
+
 
     image file.<br>
     &nbsp;&nbsp;&nbsp; <a href="applycal.html#p1">applycal</a>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2726,6 +2742,7 @@ an
 
 
 
+
 
     To incorporate calibration into an ICC profile.<br>
     &nbsp;&nbsp;&nbsp; <a href="chartread.html#I">chartread</a>&nbsp;&nbsp;
@@ -2792,6 +2809,7 @@ a
 
 
 
+
 
     profile chart.<br>
     <br>
@@ -3134,6 +3152,7 @@ a
     MadVR rather than Argyll, start madTPG and then use the option "<b>-d
 
 
+
 
       madvr</b>" in dispcal, dispread and dispwin. Leave the MadTPG
     "VideoLUT" and "3dluts" buttons in their default&nbsp; (enabled)
@@ -3195,6 +3214,7 @@ a
 
 
 
+
 
         interactive adjustment mode can be used to set the white point.
         Note that while adjusting the neutral axis for neutrality may
@@ -3228,6 +3248,7 @@ a
 
 
 
+
 
           of where to apply display per channel calibration curves.</b></li>
       <li>Choose one of the Absolute Colorimetric intents in collink
@@ -3720,6 +3741,7 @@ a
 
 
 
+
 
         TV.cal </tt>EBU3213_PAL.icm TV.icm SD_PAL.icm</tt><tt><br>
     </tt><tt> </tt><tt><br>
@@ -3745,6 +3767,7 @@ a
 
 
 
+
 
         TV.cal </tt>SMPTE_RP145_NTSC.icm TV.icm SD_NTSC.icm</tt><br>
     <br>
@@ -3777,6 +3800,7 @@ a
 
 
 
+
 
         TV.cal </tt>EBU3213_PAL.icm TV.icm SD_PAL.icm</tt><tt><br>
     </tt><tt> </tt><tt><br>
@@ -3802,6 +3826,7 @@ a
 
 
 
+
 
         TV.cal </tt>SMPTE_RP145_NTSC.icm TV.icm SD_NTSC.icm</tt><br>
     <br>
diff --git a/doc/Smile.jpg b/doc/Smile.jpg
index 66a6b00..66a6b00 100644..100755
--- a/doc/Smile.jpg
+++ b/doc/Smile.jpg
diff --git a/doc/Source.html b/doc/Source.html
index 5ea423e..5ea423e 100644..100755
--- a/doc/Source.html
+++ b/doc/Source.html
diff --git a/doc/Spyd2.jpg b/doc/Spyd2.jpg
index 8f8eff5..8f8eff5 100644..100755
--- a/doc/Spyd2.jpg
+++ b/doc/Spyd2.jpg
diff --git a/doc/Spyd3.jpg b/doc/Spyd3.jpg
index e1ab16f..e1ab16f 100644..100755
--- a/doc/Spyd3.jpg
+++ b/doc/Spyd3.jpg
diff --git a/doc/Spyd3x.jpg b/doc/Spyd3x.jpg
index 8916915..8916915 100644..100755
--- a/doc/Spyd3x.jpg
+++ b/doc/Spyd3x.jpg
diff --git a/doc/Spyd4.jpg b/doc/Spyd4.jpg
index 0d1b1b6..0d1b1b6 100644..100755
--- a/doc/Spyd4.jpg
+++ b/doc/Spyd4.jpg
diff --git a/doc/Spyd5.jpg b/doc/Spyd5.jpg
new file mode 100755
index 0000000..86b4be2
--- /dev/null
+++ b/doc/Spyd5.jpg
diff --git a/doc/SpyderChecker.jpg b/doc/SpyderChecker.jpg
index e50a205..e50a205 100644..100755
--- a/doc/SpyderChecker.jpg
+++ b/doc/SpyderChecker.jpg
diff --git a/doc/VideoEOTFs.html b/doc/VideoEOTFs.html
index 526477c..526477c 100644..100755
--- a/doc/VideoEOTFs.html
+++ b/doc/VideoEOTFs.html
diff --git a/doc/WideGamutColmters.html b/doc/WideGamutColmters.html
index 67a5817..67a5817 100644..100755
--- a/doc/WideGamutColmters.html
+++ b/doc/WideGamutColmters.html
diff --git a/doc/YellowGreen.jpg b/doc/YellowGreen.jpg
index 16f637f..16f637f 100644..100755
--- a/doc/YellowGreen.jpg
+++ b/doc/YellowGreen.jpg
diff --git a/doc/afiles b/doc/afiles
index db6632f..88f7406 100644..100755
--- a/doc/afiles
+++ b/doc/afiles
@@ -39,6 +39,7 @@ Spyd2.jpg
 Spyd3.jpg
 Spyd3x.jpg
 Spyd4.jpg
+Spyd5.jpg
 i1d.jpg
 i1d3_1.jpg
 i1d3_2.jpg
@@ -48,6 +49,8 @@ sl.jpg
 ss.jpg
 JETI_1211.jpg
 ColorHug.jpg
+EX1.jpg
+SMCube.jpg
 mox.jpg
 moxxr.jpg
 Chroma4.jpg
diff --git a/doc/applycal.html b/doc/applycal.html
index 5c5e661..5c5e661 100644..100755
--- a/doc/applycal.html
+++ b/doc/applycal.html
diff --git a/doc/average.html b/doc/average.html
index 231df92..231df92 100644..100755
--- a/doc/average.html
+++ b/doc/average.html
diff --git a/doc/cal_format.html b/doc/cal_format.html
index 361a329..361a329 100644..100755
--- a/doc/cal_format.html
+++ b/doc/cal_format.html
diff --git a/doc/calvschar.html b/doc/calvschar.html
index f194d79..f194d79 100644..100755
--- a/doc/calvschar.html
+++ b/doc/calvschar.html
diff --git a/doc/cb2ti3.html b/doc/cb2ti3.html
index d999075..d999075 100644..100755
--- a/doc/cb2ti3.html
+++ b/doc/cb2ti3.html
diff --git a/doc/ccmxs.html b/doc/ccmxs.html
index 1ceaeac..1ceaeac 100644..100755
--- a/doc/ccmxs.html
+++ b/doc/ccmxs.html
diff --git a/doc/ccmxs/DTP-94_1964_10_Dell_2408W.ccmx b/doc/ccmxs/DTP-94_1964_10_Dell_2408W.ccmx
index c1d0e8c..c1d0e8c 100644..100755
--- a/doc/ccmxs/DTP-94_1964_10_Dell_2408W.ccmx
+++ b/doc/ccmxs/DTP-94_1964_10_Dell_2408W.ccmx
diff --git a/doc/ccmxs/DTP-94_1997_Shaw_Dell_2408W.ccmx b/doc/ccmxs/DTP-94_1997_Shaw_Dell_2408W.ccmx
index 168fc51..168fc51 100644..100755
--- a/doc/ccmxs/DTP-94_1997_Shaw_Dell_2408W.ccmx
+++ b/doc/ccmxs/DTP-94_1997_Shaw_Dell_2408W.ccmx
diff --git a/doc/ccmxs/DTP-94_Dell_2408W.ccmx b/doc/ccmxs/DTP-94_Dell_2408W.ccmx
index bf58d48..bf58d48 100644..100755
--- a/doc/ccmxs/DTP-94_Dell_2408W.ccmx
+++ b/doc/ccmxs/DTP-94_Dell_2408W.ccmx
diff --git a/doc/ccmxs/DTP-94_Dell_U2410.ccmx b/doc/ccmxs/DTP-94_Dell_U2410.ccmx
index 0d7c610..0d7c610 100644..100755
--- a/doc/ccmxs/DTP-94_Dell_U2410.ccmx
+++ b/doc/ccmxs/DTP-94_Dell_U2410.ccmx
diff --git a/doc/ccmxs/EyeOne_Display_1_NEC1990SXi.ccmx b/doc/ccmxs/EyeOne_Display_1_NEC1990SXi.ccmx
index b8d3072..b8d3072 100644..100755
--- a/doc/ccmxs/EyeOne_Display_1_NEC1990SXi.ccmx
+++ b/doc/ccmxs/EyeOne_Display_1_NEC1990SXi.ccmx
diff --git a/doc/ccmxs/EyeOne_Display_2_EIZO_S2233W.ccmx b/doc/ccmxs/EyeOne_Display_2_EIZO_S2233W.ccmx
index c3f9d80..c3f9d80 100644..100755
--- a/doc/ccmxs/EyeOne_Display_2_EIZO_S2233W.ccmx
+++ b/doc/ccmxs/EyeOne_Display_2_EIZO_S2233W.ccmx
diff --git a/doc/ccmxs/EyeOne_Display_2_NEC1990SXi.ccmx b/doc/ccmxs/EyeOne_Display_2_NEC1990SXi.ccmx
index c70758e..c70758e 100644..100755
--- a/doc/ccmxs/EyeOne_Display_2_NEC1990SXi.ccmx
+++ b/doc/ccmxs/EyeOne_Display_2_NEC1990SXi.ccmx
diff --git a/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1931.ccmx b/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1931.ccmx
index 4500b0e..4500b0e 100644..100755
--- a/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1931.ccmx
+++ b/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1931.ccmx
diff --git a/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1964.ccmx b/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1964.ccmx
index 1d8e082..1d8e082 100644..100755
--- a/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1964.ccmx
+++ b/doc/ccmxs/EyeOne_Display_LT_U2410_Standard_1964.ccmx
diff --git a/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1931.ccmx b/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1931.ccmx
index e6be5d5..e6be5d5 100644..100755
--- a/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1931.ccmx
+++ b/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1931.ccmx
diff --git a/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1964.ccmx b/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1964.ccmx
index 1de91c9..1de91c9 100644..100755
--- a/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1964.ccmx
+++ b/doc/ccmxs/EyeOne_Display_LT_U2410_sRGB_1964.ccmx
diff --git a/doc/ccmxs/Huey_Acer_al2016w.ccmx b/doc/ccmxs/Huey_Acer_al2016w.ccmx
index 288a230..288a230 100644..100755
--- a/doc/ccmxs/Huey_Acer_al2016w.ccmx
+++ b/doc/ccmxs/Huey_Acer_al2016w.ccmx
diff --git a/doc/ccmxs/Huey_Eizo_CG243.ccmx b/doc/ccmxs/Huey_Eizo_CG243.ccmx
index 29e21bd..29e21bd 100644..100755
--- a/doc/ccmxs/Huey_Eizo_CG243.ccmx
+++ b/doc/ccmxs/Huey_Eizo_CG243.ccmx
diff --git a/doc/ccmxs/Huey_HP_compaq_6730s.ccmx b/doc/ccmxs/Huey_HP_compaq_6730s.ccmx
index 26f11ae..26f11ae 100644..100755
--- a/doc/ccmxs/Huey_HP_compaq_6730s.ccmx
+++ b/doc/ccmxs/Huey_HP_compaq_6730s.ccmx
diff --git a/doc/ccmxs/Huey_HP_lp2475w.ccmx b/doc/ccmxs/Huey_HP_lp2475w.ccmx
index c33ee75..c33ee75 100644..100755
--- a/doc/ccmxs/Huey_HP_lp2475w.ccmx
+++ b/doc/ccmxs/Huey_HP_lp2475w.ccmx
diff --git a/doc/ccmxs/Huey_NEC1990SXi.ccmx b/doc/ccmxs/Huey_NEC1990SXi.ccmx
index 97f8d8a..97f8d8a 100644..100755
--- a/doc/ccmxs/Huey_NEC1990SXi.ccmx
+++ b/doc/ccmxs/Huey_NEC1990SXi.ccmx
diff --git a/doc/ccmxs/Huey_NEC_Spectraview_241.ccmx b/doc/ccmxs/Huey_NEC_Spectraview_241.ccmx
index f7341da..f7341da 100644..100755
--- a/doc/ccmxs/Huey_NEC_Spectraview_241.ccmx
+++ b/doc/ccmxs/Huey_NEC_Spectraview_241.ccmx
diff --git a/doc/ccmxs/NEC_EyeOne_Display_2_NEC2690WUXi2.ccmx b/doc/ccmxs/NEC_EyeOne_Display_2_NEC2690WUXi2.ccmx
index a6c29fc..a6c29fc 100644..100755
--- a/doc/ccmxs/NEC_EyeOne_Display_2_NEC2690WUXi2.ccmx
+++ b/doc/ccmxs/NEC_EyeOne_Display_2_NEC2690WUXi2.ccmx
diff --git a/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1931.ccmx b/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1931.ccmx
index 0cbe855..0cbe855 100644..100755
--- a/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1931.ccmx
+++ b/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1931.ccmx
diff --git a/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1964.ccmx b/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1964.ccmx
index d1960b3..d1960b3 100644..100755
--- a/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1964.ccmx
+++ b/doc/ccmxs/Spyder2_EIZO_S2433W_standard_1964.ccmx
diff --git a/doc/ccmxs/Spyder3_EIZO_S2233_standard_1964.ccmx b/doc/ccmxs/Spyder3_EIZO_S2233_standard_1964.ccmx
index 214a680..214a680 100644..100755
--- a/doc/ccmxs/Spyder3_EIZO_S2233_standard_1964.ccmx
+++ b/doc/ccmxs/Spyder3_EIZO_S2233_standard_1964.ccmx
diff --git a/doc/ccmxs/Spyder3_EIZO_S2243W_standard_1931.ccmx b/doc/ccmxs/Spyder3_EIZO_S2243W_standard_1931.ccmx
index 7fbf60b..7fbf60b 100644..100755
--- a/doc/ccmxs/Spyder3_EIZO_S2243W_standard_1931.ccmx
+++ b/doc/ccmxs/Spyder3_EIZO_S2243W_standard_1931.ccmx
diff --git a/doc/ccmxs/Spyder3_HP_LP2475w.ccmx b/doc/ccmxs/Spyder3_HP_LP2475w.ccmx
index 40e990c..40e990c 100644..100755
--- a/doc/ccmxs/Spyder3_HP_LP2475w.ccmx
+++ b/doc/ccmxs/Spyder3_HP_LP2475w.ccmx
diff --git a/doc/ccmxs/Spyder3_NEC2690WUXi2.ccmx b/doc/ccmxs/Spyder3_NEC2690WUXi2.ccmx
index 2a663bc..2a663bc 100644..100755
--- a/doc/ccmxs/Spyder3_NEC2690WUXi2.ccmx
+++ b/doc/ccmxs/Spyder3_NEC2690WUXi2.ccmx
diff --git a/doc/ccmxs/Spyder3_NEC_PA301W.ccmx b/doc/ccmxs/Spyder3_NEC_PA301W.ccmx
index b0dd777..b0dd777 100644..100755
--- a/doc/ccmxs/Spyder3_NEC_PA301W.ccmx
+++ b/doc/ccmxs/Spyder3_NEC_PA301W.ccmx
diff --git a/doc/cctiff.html b/doc/cctiff.html
index c19d5c5..5a9ca82 100644..100755
--- a/doc/cctiff.html
+++ b/doc/cctiff.html
@@ -3,7 +3,7 @@
   <head>
     <title>cctiff</title>
     <meta http-equiv="content-type" content="text/html;
-      charset=ISO-8859-1">
+      charset=windows-1252">
     <meta name="author" content="Graeme Gill">
   </head>
   <body>
@@ -22,6 +22,7 @@
           style="font-style: italic;">profile.icm</span> | [-d dir]
         calibration.cal ...} <span style="font-style: italic;">infile.tif
 
+
           outfile.tif</span></span></small><small><span
         style="font-family: monospace;"></span><br style="font-family:
         monospace;">
@@ -33,12 +34,14 @@
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;
 
+
         &nbsp;&nbsp; Verbose</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#c">-c</a><span
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;
 
+
         &nbsp;&nbsp; Combine linearisation curves into one transform</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -46,6 +49,7 @@
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;
 
+
         &nbsp;&nbsp; Use slow precise floating point conversion, rather
         than fast integer routines.</span><br style="font-family:
         monospace;">
@@ -54,6 +58,7 @@
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;
 
+
         &nbsp;&nbsp; Check fast result against precise, and report
         differences.<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
@@ -71,8 +76,10 @@
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Choose
         output encoding from 1..n<br>
         &nbsp;<a href="#f">-f [T|J]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
         Set output format to Tiff or Jpeg (Default is same as input)<br>
         &nbsp;<a href="#q">-q quality</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
         Set JPEG quality 1..100 (Default 80)<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#a">-a</a><span
@@ -84,11 +91,15 @@
           href="#I">-I</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Ignore
 
+
         any file or profile colorspace mismatches<br>
         &nbsp;<a href="#D">-D</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Don't
 
+
         append or set the output TIFF description<br>
+        &nbsp;<a href="#N">-N</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        Output uncompressed TIFF (default LZW)<br>
         <br>
       </span></small><small><span style="font-family: monospace;"></span><span
         style="font-family: monospace;"><br>
@@ -100,12 +111,14 @@ Don't
         TIFF or JPEG file.<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
       </span></small><small><span style="font-family: monospace;">This
         may be an ICC file or TIFF or JPEG file with embedded profile.</span></small><br>
     <small><span style="font-family: monospace;"><br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Then
 
+
         for each profile in the linked sequence:<br style="font-family:
           monospace;">
       </span></small><small><span style="font-family: monospace;"></span></small><small><span
@@ -122,6 +135,7 @@ Then
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;
 
+
         &nbsp;&nbsp;&nbsp; s = saturation, a = absolute colorimetric<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;
       </span><a style="font-family: monospace;" href="#o">-o order<span
@@ -132,6 +146,7 @@ Then
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 r
 
+
         = reverse (priority: monochrome &gt; matrix &gt; lut)</span></small><small><span
         style="font-family: monospace;"></span><br style="font-family:
         monospace;">
@@ -143,10 +158,12 @@ r
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 (May
 
+
         be embedded profile in TIFF or JPEG file)<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 or
 
+
         each calibration file in sequence:<br style="font-family:
           monospace;">
       </span></small><small><span style="font-family: monospace;"></span></small><small><span
@@ -168,6 +185,7 @@ or
             style="font-family: monospace;"></span></i></a><span
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
         A calibration file.</span></small><br>
     <small><span style="font-family: monospace;"></span><span
         style="font-family: monospace;"></span><span style="font-family:
@@ -182,9 +200,8 @@ or
         style="font-family: monospace;"> &nbsp; &nbsp; &nbsp;
         &nbsp;&nbsp; A </span><a style="font-family: monospace;"
         href="File_Formats.html#TIFF">TIFF</a><span style="font-family:
-        monospace;">
-        or <a href="File_Formats.html#JPEG">JPEG</a> Raster file that
-        will be the input raster to be transformed.</span><br
+        monospace;"> or <a href="File_Formats.html#JPEG">JPEG</a>
+        Raster file that will be the input raster to be transformed.</span><br
         style="font-family: monospace;">
       &nbsp;<span style="font-family: monospace;"></span><a
         style="font-family: monospace;" href="#p4"><i>outfile.tif</i></a><span
@@ -283,6 +300,10 @@ or
     <a name="D"></a>The <span style="font-weight: bold;">-D</span> flag
     stops the description tag being set or appended to by cctiff.<br>
     <br>
+    <a name="N"></a>By default any TIFF output file will be LZW
+    compressed, but the <span style="font-weight: bold;">-N</span> flag
+    will cause any TIFF file to be saved uncompressed.<br>
+    <br>
     <small><a name="e"></a></small><small>The <span style="font-weight:
         bold;">-e profile.[icm | tiff | jpg]</span> option allows an ICC
       profile to be embedded in the </small>destination TIFF or JPEG
diff --git a/doc/ccxxmake.html b/doc/ccxxmake.html
index f83afc8..a2a9080 100644..100755
--- a/doc/ccxxmake.html
+++ b/doc/ccxxmake.html
@@ -32,9 +32,10 @@
     information built into them&nbsp; (ie. the X-Rite <span
       style="font-weight: bold;">i1d3</span>, and<span
       style="font-weight: bold;"><span style="font-weight: bold;"></span></span>
-    DataColor <span style="font-weight: bold;">Spyder4</span>), <span
-      style="font-weight: bold;">ccxxmake</span> allows a creation of a
-    calibration spectral sample (<a href="File_Formats.html#.ccss">ccss</a>)
+    DataColor <span style="font-weight: bold;">Spyder4 &amp; Spyder5</span>),
+
+    <span style="font-weight: bold;">ccxxmake</span> allows a creation
+    of a calibration spectral sample (<a href="File_Formats.html#.ccss">ccss</a>)
     for a particular <span style="font-weight: bold;">Display</span>,
     by making use a reference <span style="font-weight: bold;">Spectrometer</span>
     instrument. This can then be used to improve the accuracy of
@@ -73,6 +74,8 @@
 
 
 
+
+
       &nbsp; &nbsp; &nbsp; Verbose mode</small><br>
     &nbsp; <a href="#S">-S</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Create
@@ -96,8 +99,10 @@ rather
 
 
 
+
+
     than CCMX<br>
-    &nbsp; <a href="#f">-f file1.ti3[,file2.ti3]</a>
+    &nbsp; <a href="#f">-f ref.ti3[,targ.ti3]</a>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Create
 from
@@ -122,6 +127,8 @@ two
 
 
 
+
+
     .ti3 files rather than measure.<br style="font-family: monospace;">
     <span style="font-family: monospace;">&nbsp;</span><font
       style="font-family: monospace;" size="-1"><a href="#display">-display
@@ -143,6 +150,8 @@ two
 
 
 
+
+
         displayname</a>&nbsp; [X11 only] Choose X11 display name</font><br
       style="font-family: monospace;">
     <font style="font-family: monospace;" size="-1"></font><font
@@ -177,6 +186,8 @@ m
 
 
 
+
+
       for VideoLUT access.</font><br style="font-family: monospace;">
     <font style="font-family: monospace;" size="-1">&nbsp;<a href="#d">-d
 
@@ -197,6 +208,8 @@ m
 
 
 
+
+
         n</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Choose
 the
@@ -223,6 +236,8 @@ list
 
 
 
+
+
       (default 1)</font><br>
     <span style="font-family: monospace;">&nbsp;<a href="#dweb">-dweb[:port]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -247,6 +262,8 @@ list
 
 
 
+
+
       Display via a web server at port (default 8080)</span><br>
     <span style="font-family: monospace;">&nbsp;<a href="#dmadvr">-dmadvr</a>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -262,10 +279,14 @@ list
 
 
 
+
+
       [MSWin] Display via MadVR Video Renderer</span><br>
     <tt>&nbsp;</tt><tt><a href="#dcc">-dcc[:n]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </tt><tt>Display via n'th ChromeCast (default 1, ? for list)</tt><br
       style="font-family: monospace;">
     <font style="font-family: monospace;" size="-1">&nbsp;</font><font
@@ -288,6 +309,8 @@ list
 
 
 
+
+
       Use telephoto mode (ie. for a projector) (if available)</font><br
       style="font-family: monospace;">
     &nbsp; <tt></tt><tt><font size="-1"><a href="#y">-y X</a>
@@ -311,11 +334,17 @@ list
 
 
 
+
+
         Display type - instrument specific list to choose from.</font></tt><tt>
       (CCMX)</tt><tt><br>
     </tt><tt>&nbsp;<a href="#z">-z disptype</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
       Different display type for spectrometer (see -y)</tt><tt><br>
     </tt><tt> </tt><tt>&nbsp;</tt><tt><a href="#P">-P ho,vo,ss[,vs]</a></tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
       Position test window and scale it</tt><br style="font-family:
       monospace;">
     <font style="font-family: monospace;" size="-1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -344,6 +373,8 @@ center,
 
 
 
+
+
       1.0 = right/bottom etc.</font><br style="font-family: monospace;">
     <font style="font-family: monospace;" size="-1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 ss:
@@ -371,6 +402,8 @@ normal,
 
 
 
+
+
       2.0 = double etc.</font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -385,6 +418,8 @@ normal,
 
 
 
+
+
         ss,vs: = optional horizontal, vertical scale.</span></font><br
       style="font-family: monospace;">
     <font style="font-family: monospace;" size="-1">&nbsp;</font><font
@@ -408,6 +443,8 @@ normal,
 
 
 
+
+
       Fill whole screen with black background</font><br
       style="font-family: monospace;">
     <small style="font-family: monospace;">&nbsp;<span
@@ -438,6 +475,8 @@ on
 
 
 
+
+
       test window<br>
     </small><font style="font-family: monospace;" size="-1">&nbsp;<a
         href="#N">-N</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -459,6 +498,8 @@ on
 
 
 
+
+
       Disable initial calibration of instrument</font><small
       style="font-family: monospace;"> if possible<br>
     </small><span style="font-family: monospace;">&nbsp;</span><font
@@ -482,6 +523,8 @@ on
 
 
 
+
+
       Use high resolution spectrum mode (if available)</font><font
       style="font-family: monospace;" size="-1"></font><br
       style="font-family: monospace;">
@@ -504,6 +547,8 @@ on
 
 
 
+
+
         "command"</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
       Invoke shell "command" each time a color is set<br>
     </font><small style="font-family: monospace;">&nbsp;<a href="#o">-o
@@ -539,6 +584,8 @@ sequence
 
 
 
+
+
       combination steps (default 3)</font><br style="font-family:
       monospace;">
     <font style="font-family: monospace;" size="-1">&nbsp;<a href="#W">-W
@@ -560,6 +607,8 @@ sequence
 
 
 
+
+
         n|h|x</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Override
 serial
@@ -586,6 +635,8 @@ n
 
 
 
+
+
       none, h = HW, x = Xon/Xoff</font><br style="font-family:
       monospace;">
     <small style="font-family: monospace;">&nbsp;<a href="#D">-D [level]</a>
@@ -615,6 +666,8 @@ overall
 
 
 
+
+
       description</small><br>
     <small style="font-family: monospace;">&nbsp;<a href="#I">-I
         "displayname"</a> &nbsp;&nbsp;&nbsp;&nbsp; </small><span
@@ -624,6 +677,8 @@ overall
       &nbsp;</small><small style="font-family: monospace;"><a href="#T">-t
 
 
+
+
         dtech</a>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
       Set display technology type<br>
@@ -631,26 +686,36 @@ overall
       c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
       CRT<br>
       &nbsp;&nbsp;&nbsp;
       m&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
       Plasma<br>
       &nbsp;&nbsp;&nbsp;
       l&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
       LCD<br>
       &nbsp;&nbsp;&nbsp;
       1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
       LCD CCFL<br>
       &nbsp;&nbsp;&nbsp;
       2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       CCFL IPS<br>
@@ -658,6 +723,8 @@ overall
       3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       CCFL VPA<br>
@@ -665,6 +732,8 @@ overall
       4&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       CCFL TFT<br>
@@ -672,6 +741,8 @@ overall
       L&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       CCFL Wide Gamut<br>
@@ -679,6 +750,8 @@ overall
       5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       CCFL Wide Gamut IPS<br>
@@ -686,6 +759,8 @@ overall
       6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       CCFL Wide Gamut VPA<br>
@@ -693,6 +768,8 @@ overall
       7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       CCFL Wide Gamut TFT<br>
@@ -700,6 +777,8 @@ overall
       e&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       White LED<br>
@@ -707,6 +786,8 @@ overall
       8&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       White LED IPS<br>
@@ -714,6 +795,8 @@ overall
       9&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       White LED VPA<br>
@@ -721,6 +804,8 @@ overall
       a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       White LED TFT<br>
@@ -728,6 +813,8 @@ overall
       b&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RGB LED<br>
@@ -735,6 +822,8 @@ overall
       b&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RGB LED IPS<br>
@@ -742,6 +831,8 @@ overall
       c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RGB LED VPA<br>
@@ -749,6 +840,8 @@ overall
       d&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RGB LED TFT<br>
@@ -756,6 +849,8 @@ overall
       h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RG Phosphor<br>
@@ -763,6 +858,8 @@ overall
       e&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RG Phosphor IPS<br>
@@ -770,6 +867,8 @@ overall
       f&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RG Phosphor VPA<br>
@@ -777,6 +876,8 @@ overall
       g&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LCD
       RG Phosphor TFT<br>
@@ -784,6 +885,8 @@ overall
       o&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LED
       OLED<br>
@@ -791,6 +894,8 @@ overall
       a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>LED
       AMOLED<br>
@@ -798,6 +903,8 @@ overall
       p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>DLP
       Projector<br>
@@ -805,6 +912,8 @@ overall
       h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>DLP
       Projector RGB Filter Wheel<br>
@@ -812,6 +921,8 @@ overall
       i&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>DPL
       Projector RGBW Filter Wheel<br>
@@ -819,6 +930,8 @@ overall
       j&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>DLP
       Projector RGBCMY Filter Wheel<br>
@@ -826,6 +939,8 @@ overall
       u&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
+
     </small><small style="font-family: monospace;"><small
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp; </small>Unknown<br>
     </small> <tt>&nbsp;<a href="#U">-U c</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -835,6 +950,8 @@ overall
 
 
 
+
+
       Set UI selection character(s)</tt><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#Yrn">-<font size="-1">Y</font>
@@ -853,12 +970,16 @@ overall
 
 
 
+
+
         &nbsp;&nbsp;&nbsp;&nbsp; Override refresh, non-refresh display
         mode</span></font><br>
     <tt>&nbsp;<a href="#YR">-Y R:<i>rate</i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
+
+
       Override measured refresh rate with rate Hz</tt><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#YA">-<font size="-1">Y</font>A</a><span
@@ -891,8 +1012,8 @@ overall
     that allows calibrating any suitable Colorimeter to the Display.<br>
     <br>
     <a name="f"></a><span style="font-weight: bold;">-f <span
-        style="font-style: italic;">file1.ti3[,file2.ti3]</span></span>
-    By <span style="text-decoration: underline;">default</span> <span
+        style="font-style: italic;">ref.ti3[,targ.ti3]</span></span> By
+    <span style="text-decoration: underline;">default</span> <span
       style="font-weight: bold;">ccxxmake</span> creates a <span
       style="font-weight: bold;">CCMX</span> file by displaying test
     patches on the screen, and then prompting you to measure them
@@ -964,6 +1085,8 @@ overall
 
 
 
+
+
       1,2</span> . Some experimentation may be needed using <a
       href="dispwin.html">dispwin</a> on such systems, to discover what
     screen has access to the VideoLUT hardware, and which screens the
@@ -990,10 +1113,11 @@ overall
     <br>
     <a name="dmadvr"></a><span style="font-weight: bold;">-dmadvr</span>
     [MSWin only] causes test patches to be displayed using the MadVR
-    video renderer. Note that you may have to start the video playback
-    software and load a video clip in pause for this to work. MadVR
-    rendering does not need or support VideoLUT access. Test patch
-    colors <u>will</u> be processed by the MadVR 3dLut.<br>
+    video renderer. Note that will have to start <b>MadTPG</b> before
+    running ccxxmake, and that while you can adjust the "Test Pattern
+    Configuration" controls, you should <u>not</u> normally alter the
+    "Existing Calibration" controls, as ccxxmake will set these
+    appropriately. <br>
     <br>
     <a name="dcc"></a><span style="font-weight: bold;">-dcc</span> or <b>-dcc:<i>no</i></b>
     causes test patches to be displayed using and available <a
@@ -1106,6 +1230,8 @@ overall
 
 
 
+
+
       of particular instruments</a> for more details. This may give
     better accuracy for display measurements.<br>
     <br>
@@ -1213,6 +1339,8 @@ overall
 
 
 
+
+
     <b>-Y n</b> options overrides the refresh display mode set by the <a
       href="spotread.html#y">-y display type selection</a>, with <b>-Y</b><span
       style="font-weight: bold;"> r</span> forcing refresh display mode,
diff --git a/doc/chartread.html b/doc/chartread.html
index 18d0144..4d5b005 100644..100755
--- a/doc/chartread.html
+++ b/doc/chartread.html
@@ -3,7 +3,7 @@
   <head>
     <title>chartread</title>
     <meta http-equiv="content-type" content="text/html;
-      charset=ISO-8859-1">
+      charset=windows-1252">
     <meta name="author" content="Graeme Gill">
   </head>
   <body>
@@ -26,6 +26,7 @@
 Verbose
 
 
+
         mode</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#c">-c listno</a><span
@@ -40,6 +41,7 @@ Use
 transmission
 
 
+
         measurement mode<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#d">-d</a><span
@@ -50,6 +52,7 @@ display
 measurement
 
 
+
         mode (white Y relative results)</span></small><small><span
         style="font-family: monospace;"></span></small><small><span
         style="font-family: monospace;"><br>
@@ -58,6 +61,7 @@ measurement
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         Display type - instrument specific list to choose from.</span></font><br>
     <small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#e">-e</a><span
@@ -67,6 +71,7 @@ emissive&nbsp;
 measurement
 
 
+
         mode (absolute results)<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#p">-p</a><span
@@ -77,17 +82,15 @@ patch
 by
 
 
+
         patch rather than strip</span></small><br>
     <small><span style="font-family: monospace;"></span>&nbsp; <a
         style="font-family: monospace;" href="#x">-x [lx]</a><span
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Take
-external
-values,
-
-
-        either L*a*b* (-xl) or XYZ (-xx).</span><br style="font-family:
-        monospace;">
+        manually entered
+        values, either L*a*b* (-xl) or XYZ (-xx).</span><br
+        style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#n">-n</a><span
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -96,6 +99,7 @@ values,
 Don't
 
 
+
         save spectral information (default saves spectral)<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#l">-l</a><span
@@ -113,6 +117,7 @@ reading
 partly
 
 
+
         read chart<br>
         &nbsp;<a href="#I">-I</a>
         file.cal&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Override
@@ -121,26 +126,31 @@ partly
         monospace;"><a href="#F">-F filter</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         Set filter configuration:<br>
         &nbsp;
         n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         None<br>
         &nbsp;
         p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         Polarising filter<br>
         &nbsp;
         6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         D65<br>
         &nbsp;
         u&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         U.V. Cut</span></font><small><span style="font-family:
         monospace;"></span><span style="font-family: monospace;"></span></small><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
@@ -165,6 +175,7 @@ partly
 
 
 
+
         Apply Colorimeter Correction Matrix</span></font><br>
     <span style="font-family: monospace;">&nbsp;<a href="#X2">-X
         file.ccss</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -176,6 +187,7 @@ Samples
 
 
 
+
       for calibration</span><br>
     <small><span style="font-family: monospace;">&nbsp;</span><a style="
         font-family: monospace;" href="#Q">-Q observ</a><span
@@ -187,6 +199,7 @@ Samples
 
 
 
+
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; </span></small><small><span
         style="font-family: monospace;">1931_2 </span></small><small><span
         style="font-family: monospace;"> (def.)</span></small><small><span
@@ -201,6 +214,7 @@ strip
 patch
 
 
+
         consistency tolerance by ratio (if available)<br>
       </span></font><font size="-1"><span style="font-family:
         monospace;">&nbsp;<a href="#S">-S</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -209,12 +223,14 @@ wrong
 strip
 
 
+
         &amp; unexpected value warnings</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
           href="#W">-W n|h|x</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Override
 
 
+
         serial port flow control: n = none, h = HW, x = Xon/Xoff</span></font><br
       style="font-family: monospace;">
     <small><span style="font-family: monospace;"></span><small
@@ -226,6 +242,7 @@ Override
         style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         &nbsp;Base name for input[</span><a style="font-family:
         monospace;" href="File_Formats.html#.ti2">.ti2</a><span
         style="font-family: monospace;">]/output[</span><a
@@ -307,8 +324,8 @@ Override
     is not reliable for certain media.<br>
     <br>
     <a name="x"></a> The <span style="font-weight: bold;">-x</span>
-    flag causes chartread to expect values to be entered for each
-    reading, rather than using an instrument to do the
+    flag causes chartread to expect values to be manually entered for
+    each reading, rather than using an instrument to do the
     measurements.&nbsp; This mode is ideal if your instrument is not
     supported by Argyll. Either XYZ or L*a*b* values can be entered,
     depending on what option follows <span style="font-weight: bold;"><span
@@ -371,6 +388,7 @@ Override
     ink limit calculations wouldn't be accurate. To overcome this and
     allow such a scenario, the <span style="font-weight: bold;">chartread
 
+
       -I</span> parameter allows overriding the .ti2 calibration curves
     placed in the resulting .ti3 file with the actual calibration that
     was used for that particular print.<br>
@@ -424,13 +442,11 @@ Override
     colorimeter instruments calibration. This will only work with
     colorimeters that rely on sensor spectral sensitivity calibration
     information (ie. the X-Rite <span style="font-weight: bold;">i1d3</span>,
-    or the DataColor <span style="font-weight: bold;">Spyder4</span>).This
-can
-improve
-a
-
-
-    colorimeters accuracy for a particular type of display.<br>
+    or the DataColor <span style="font-weight: bold;">Spyder4 &amp;
+      Spyder 5</span>).This
+    can
+    improve
+    a colorimeters accuracy for a particular type of display.<br>
     <br>
     <a name="T"></a> The -<span style="font-weight: bold;">T ratio</span>
     argument modifies the patch consistency tolerance threshold for some
diff --git a/doc/cht_format.html b/doc/cht_format.html
index 80a3e9e..80a3e9e 100644..100755
--- a/doc/cht_format.html
+++ b/doc/cht_format.html
diff --git a/doc/collink.html b/doc/collink.html
index edd58b1..0bb3e77 100644..100755
--- a/doc/collink.html
+++ b/doc/collink.html
@@ -60,6 +60,7 @@
 
 
 
+
         Verbose<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#A">-A "manufacturer"</a><span
@@ -123,6 +124,7 @@ existing
 
 
 
+
         profile, rather than link (Debug option)</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -170,6 +172,7 @@ clut
 
 
 
+
         res. set by -q</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#n">-n</a><span
@@ -211,6 +214,7 @@ preserve
 
 
 
+
         device curves in result</span><br style="font-family:
         monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -277,6 +281,7 @@ Include
 
 
 
+
         abstract profile in link</span></small><br>
     <small><span style="font-family: monospace;"><small><span
             style="font-family: monospace;">&nbsp;</span><a
@@ -296,6 +301,7 @@ Include
 
 
 
+
         Append calibration curves to 3dlut<br style="font-family:
           monospace;">
       </span> <span style="font-family: monospace;">&nbsp;</span><a
@@ -338,6 +344,7 @@ Mode
 
 
 
+
         (default)</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#g">-g [src.gam]</a><span
@@ -383,6 +390,7 @@ Gamut
 
 
 
+
         Mapping Mode using inverse outprofile A2B [optional source
         gamut]</span><br style="font-family: monospace;">
       <br style="font-family: monospace;">
@@ -432,6 +440,7 @@ s
 
 
 
+
         = saturation, a = absolute colorimetric</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -478,6 +487,7 @@ s
 
 
 
+
         = saturation, a = absolute colorimetric</span><br
         style="font-family: monospace;">
       <br style="font-family: monospace;">
@@ -527,6 +537,7 @@ a
 
 
 
+
         Absolute Colorimetric (in Jab) [ICC Absolute Colorimetric]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 aw
@@ -566,6 +577,7 @@ aw
 
 
 
+
         Absolute Colorimetric (in Jab) with scaling to fit white point<br
           style="font-family: monospace;">
       </span><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -606,6 +618,7 @@ aa
 
 
 
+
         Absolute Appearance</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 r
@@ -645,6 +658,7 @@ r
 
 
 
+
         White Point Matched Appearance [ICC Relative Colorimetric]</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -685,6 +699,7 @@ la
 
 
 
+
         Luminance matched Appearance</span><br style="font-family:
         monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -725,6 +740,7 @@ p
 
 
 
+
         Perceptual (Preferred) [ICC Perceptual]<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 pa
@@ -763,6 +779,7 @@ pa
 
 
 
+
         - Perceptual Appearance</span></small><br style="font-family:
       monospace;">
     <small><span style="font-family: monospace;"></span><span
@@ -804,6 +821,7 @@ ms
 
 
 
+
         Saturation</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 s
@@ -843,6 +861,7 @@ s
 
 
 
+
         Enhanced Saturation [ICC Saturation]</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -883,6 +902,7 @@ al
 
 
 
+
         Absolute Colorimetric (Lab)<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -915,6 +935,7 @@ al
 
 
 
+
         rl - White Point Matched Colorimetric (Lab)</span><span
         style="font-family: monospace;"></span><br style="font-family:
         monospace;">
@@ -929,6 +950,7 @@ al
 
 
 
+
         Use RGB-&gt;RGB forced black point hack<br style="font-family:
           monospace;">
       </span> <span style="font-family: monospace;">&nbsp;</span><a
@@ -974,6 +996,7 @@ either
 
 
 
+
         an enumerated choice, or a parameter</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -1019,6 +1042,7 @@ either
 
 
 
+
         an enumerated choice, or a parameter:value change<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; pp - Practical
@@ -1062,6 +1086,7 @@ either
 
 
 
+
         &nbsp; pe - Print evaluation environment (CIE 116-1995)<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;
@@ -1101,6 +1126,7 @@ either
 
 
 
+
         &nbsp; pc - Critical print evaluation environment (ISO-3664 P1)</span></small><small><span
         style="font-family: monospace;"></span><span style="font-family:
         monospace;"></span><span style="font-family: monospace;"></span><span
@@ -1148,6 +1174,7 @@ either
 
 
 
+
         mb - Monitor in bright work environment</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp; &nbsp;
@@ -1206,6 +1233,7 @@ n
 
 
 
+
         = auto, a = average, m = dim, d = dark,</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1246,6 +1274,7 @@ n
 
 
 
+
         c = transparency (default average)</span><br style="font-family:
         monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1286,6 +1315,7 @@ Adapted
 
 
 
+
         white point as XYZ (default media white)</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1326,6 +1356,7 @@ Adapted
 
 
 
+
         white point as x, y</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 a:adaptation&nbsp;
@@ -1365,6 +1396,7 @@ Adaptatation
 
 
 
+
         luminance in cd.m^2 (default 50.0)</span><br style="font-family:
         monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1406,6 +1438,7 @@ Background
 
 
 
+
         of image luminance (default 20)<br>
         &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; l:imagewhite&nbsp;
         Image white in cd.m^2 if surround = auto (default 250)</span></small><br
@@ -1450,6 +1483,7 @@ light
 
 
 
+
             % of image luminance (default 0)<br>
           </span></small>&nbsp;</span><span style="font-family:
         monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1480,6 +1514,7 @@ light
 
 
 
+
         g:X:Y:Z&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare color as XYZ
         (default media white)</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1507,6 +1542,7 @@ light
 
 
 
+
         g:x:y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare
         color as x, y</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -1549,6 +1585,7 @@ source
 
 
 
+
         total ink limit, 0 - 400% (estimate by default)</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -1591,6 +1628,7 @@ source
 
 
 
+
         total ink limit, 0 - 100% (estimate by default)</span><br
         style="font-family: monospace;">
       <br style="font-family: monospace;">
@@ -1640,6 +1678,7 @@ t
 
 
 
+
         = transfer K from source to destination, e = retain K of
         destination B2A table</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1680,6 +1719,7 @@ z
 
 
 
+
         = zero K, h = 0.5 K, x = maximum K, r = ramp K (default)</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -1723,6 +1763,7 @@ p
 
 
 
+
         = black level generation curve parameters</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -1767,6 +1808,7 @@ q
 
 
 
+
         = transfer source K to dual curve limits</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -1814,6 +1856,7 @@ destination
 
 
 
+
         total ink limit, 0 - 400% (estimate by default)</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a
@@ -1856,6 +1899,7 @@ destination
 
 
 
+
         total ink limit, 0 - 100% (estimate by default)<br>
         &nbsp;<a href="#3">-3 flag</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -1887,6 +1931,7 @@ destination
 
 
 
+
         Create "3DLut" output file as well as devlink<br>
         &nbsp;&nbsp;&nbsp;&nbsp;
         e&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1919,6 +1964,7 @@ destination
 
 
 
+
         eeColor .txt file</span></small><br>
     <tt>&nbsp;&nbsp;&nbsp;&nbsp;
       m&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1939,6 +1985,7 @@ destination
 
 
 
+
       MadVR .3dlut&nbsp;&nbsp; file</tt><br>
     <tt>&nbsp;<a href="#Ib">-I B</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -1948,6 +1995,7 @@ destination
 
 
 
+
       Use BT.1886 source EOTF with technical gamma 2.4</tt><tt><br>
     </tt><tt>&nbsp;<a href="#Ib">-I b:g.g</a>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Use
@@ -1994,6 +2042,7 @@ destination
 
 
 
+
         Video encode input as:<br>
         &nbsp;<a href="#E">-E flag</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -2025,6 +2074,7 @@ destination
 
 
 
+
         Video encode output as:</span></small><small><span
         style="font-family: monospace;"><small><span style="font-family:
             monospace;"><br>
@@ -2048,6 +2098,7 @@ destination
 
 
 
+
             normal RGB 0..1 levels (default)<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             t&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2069,11 +2120,13 @@ destination
 
 
 
+
             RGB (16-235)/255 "TV" levels</span></small></span></small><br>
     <small><span style="font-family: monospace;"><small><span
             style="font-family: monospace;"><small><span
                 style="font-family: monospace;"><small><span
                     style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
+
                     T
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -2094,6 +2147,7 @@ destination
 
 
 
+
                     RGB (16-235)/255 "TV" levels, clip WTW [Input Only]</span></small></span></small><br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2115,6 +2169,7 @@ destination
 
 
 
+
             Rec601 YCbCr SD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2136,6 +2191,7 @@ destination
 
 
 
+
             Rec709 1125/60Hz YCbCr HD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2157,6 +2213,7 @@ destination
 
 
 
+
             Rec709 1250/50Hz YCbCr HD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2178,6 +2235,7 @@ destination
 
 
 
+
             Rec2020 YCbCr UHD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             C&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2199,6 +2257,7 @@ destination
 
 
 
+
             Rec2020 Constant Luminance YCbCr UHD (16-235,240)/255 "TV"
             levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
@@ -2221,6 +2280,7 @@ destination
 
 
 
+
             xvYCC Rec601 YCbCr Rec709 Prims. SD (16-235,240)/255 "TV"
             levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
@@ -2243,6 +2303,7 @@ destination
 
 
 
+
             xvYCC Rec709 YCbCr Rec709 Prims. HD (16-235,240)/255 "TV"
             levels<br>
           </span></small>&nbsp;</span></small>&nbsp; <small><span
@@ -2285,6 +2346,7 @@ gamut
 
 
 
+
         gammap_p.x3d.html and gammap_s.x3d.html diagostics</span></small><small><br>
       <span style="font-family: monospace;"></span></small><span
       style="font-family: monospace;">&nbsp;<span
@@ -2329,6 +2391,7 @@ ICC
 
 
 
+
       profile. A </span><small><span style="font-family: monospace;">TIFF
 
 
@@ -2365,6 +2428,7 @@ ICC
 
 
 
+
         or JPEG file with embedded profile may be used here.</span></small><br
       style="font-family: monospace;">
     &nbsp; <span style="font-family: monospace;"><span
@@ -2409,6 +2473,7 @@ ICC
 
 
 
+
       profile. </span><span style="font-family: monospace;">A </span><small><span
         style="font-family: monospace;">TIFF or JPEG file with embedded
         profile may be used here.</span></small><br style="font-family:
@@ -2514,6 +2579,7 @@ ICC
 
 
 
+
     &nbsp;Override clut res. set by <b>-q</b><br>
     <br>
     This sets the basic quality of the resulting link, by choosing the
@@ -2701,6 +2767,7 @@ ICC
 
 
 
+
     &nbsp;<b>p</b> = perceptual, <b>r</b> = relative colorimetric,<br>
     &nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <b>s</b>
@@ -2836,9 +2903,11 @@ ICC
     <a name="b"></a> The <b>-b</b> flag forces RGB source 0,0,0 to map
     to RGB destination 0,0,0. This may be useful for Video
     proofing/calibration purposes, where the source is a standard
-    colorspace such as Rec709, and the display device is well behaved
-    with black at 0,0,0. By forcing the black mapping, any slight
-    raising of the black due to display profile tolerances is avoided.<br>
+    colorspace such as Rec709, and the display device is <u>well
+      behaved</u> with black at 0,0,0, and forcing the black mapping
+    avoids any slight raising of the black due to display profile
+    tolerances. On the other hand, any "dead zone" above zero device
+    input, won't be corrected.<br>
     <br>
     <a name="c"></a><a name="d"></a> The <b>-c</b> and <b>-d</b>
     options allow specification of the viewing conditions for the source
@@ -2957,6 +3026,7 @@ ICC
 
 
 
+
       &nbsp; &nbsp;_______&nbsp; enle<br>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2996,6 +3066,7 @@ ICC
 
 
 
+
       &nbsp; &nbsp;/<br>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 |&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3035,6 +3106,7 @@ ICC
 
 
 
+
       &nbsp; /<br>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3074,6 +3146,7 @@ ICC
 
 
 
+
       &nbsp;/<br>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3113,6 +3186,7 @@ ICC
 
 
 
+
       /<br>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
       stle&nbsp; | ------/<br>
@@ -3158,6 +3232,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
       Black<br>
       <br>
     </tt>For minimum sensitivity of printed output to the lighting
@@ -3355,6 +3430,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     </b>Full output offset with effective gamma of 2.2<b><br>
     </b><b></b><b>-I B</b><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -3364,6 +3440,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     </b>Full input offset (BT.1886 like) with technical gamma of 2.4.
     This exactly implements the BT.1886 specification.<b><br>
     </b><b>-I G</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3374,6 +3451,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     Full output offset with technical gamma of 2.2<br>
     <br>
     <b>-I b</b><b>:2.3</b><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3384,6 +3462,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     </b>Full input offset (BT.1886 like) with effective gamma of 2.3<b>
       <br>
     </b><b> -I g:2.3</b><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3394,6 +3473,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     </b>Full output offset with effective gamma of 2.3<b><br>
     </b><b> -I B:2.35</b><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -3403,6 +3483,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     </b>Full input offset (BT.1886 like) with technical gamma of 2.35<br>
     <b> -I G:2.35</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -3412,6 +3493,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     Full output offset with technical gamma of 2.35<br>
     <br>
     <b>-I b</b><b>:0.4:2.3</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3424,6 +3506,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
     Same as above.<b><br>
     </b><b> -I B:0.4:2.35</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 60% input
     offset, 40% output offset with technical gamma of 2.35 <b><br>
@@ -3441,6 +3524,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
                     style="font-family: monospace;"><small><span
                         style="font-family: monospace;"><small><span
                             style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
+
                             T
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -3461,10 +3545,12 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
                             RGB (16-235)/255 "TV" levels, clip WTW
                             [Input Only]<br>
                           </span></small></span></small></span></small></span></small>&nbsp;&nbsp;&nbsp;&nbsp;
 
+
             x&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
@@ -3484,6 +3570,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             xvYCC Rec601 YCbCr Rec709 Prims. SD (16-235,240)/255 "TV"
             levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
@@ -3506,6 +3593,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             xvYCC Rec709 YCbCr Rec709 Prims. HD (16-235,240)/255 "TV"
             levels</span></small></span></small><br>
     <br>
@@ -3550,6 +3638,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             normal RGB 0..1 full range levels (default)<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             t&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3571,6 +3660,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             RGB (16-235)/255 "TV" levels</span></small></span></small><small><span
         style="font-family: monospace;"><small><span style="font-family:
             monospace;"></span></small></span></small><br>
@@ -3578,6 +3668,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
             style="font-family: monospace;"><small><span
                 style="font-family: monospace;"></span></small>&nbsp;&nbsp;&nbsp;&nbsp;
 
+
             6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
@@ -3597,6 +3688,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             Rec601 YCbCr SD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3618,6 +3710,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             Rec709 1125/60Hz YCbCr HD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3639,6 +3732,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             Rec709 1250/50Hz YCbCr HD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3660,6 +3754,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             Rec2020 YCbCr UHD (16-235,240)/255 "TV" levels<br>
             &nbsp;&nbsp;&nbsp;&nbsp;
             C&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3681,6 +3776,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
             Rec2020 Constant Luminance YCbCr UHD (16-235,240)/255 "TV"
             levels</span></small></span></small><br>
     <small><span style="font-family: monospace;"><small><span
@@ -3740,6 +3836,7 @@ White&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb
 
 
 
+
       Usage Scenarios</a> page.<br>
     <br>
     <br>
diff --git a/doc/colorchecker.jpg b/doc/colorchecker.jpg
index 464dd11..464dd11 100644..100755
--- a/doc/colorchecker.jpg
+++ b/doc/colorchecker.jpg
diff --git a/doc/colprof.html b/doc/colprof.html
index b3b6df2..b3b6df2 100644..100755
--- a/doc/colprof.html
+++ b/doc/colprof.html
diff --git a/doc/colverify.html b/doc/colverify.html
index daebbdd..daebbdd 100644..100755
--- a/doc/colverify.html
+++ b/doc/colverify.html
diff --git a/doc/cube.jpg b/doc/cube.jpg
index 929273c..929273c 100644..100755
--- a/doc/cube.jpg
+++ b/doc/cube.jpg
diff --git a/doc/dispcal.html b/doc/dispcal.html
index 993124d..ff96ff2 100644..100755
--- a/doc/dispcal.html
+++ b/doc/dispcal.html
@@ -68,6 +68,8 @@
 
 
 
+
+
 
         Verbose mode<br>
       </span></font><font size="-1"><span style="font-family:
@@ -133,6 +135,8 @@ for
 
 
 
+
+
 
         VideoLUT access.</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
@@ -189,6 +193,8 @@ list
 
 
 
+
+
 
         1)</span></font><br>
     <span style="font-family: monospace;">&nbsp;<a href="#dweb">-dweb[:port]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -235,6 +241,8 @@ list
 
 
 
+
+
 
       Display via a web server at port (default 8080)</span><br>
     <span style="font-family: monospace;">&nbsp;<a href="#dmadvr">-dmadvr</a>
@@ -266,6 +274,8 @@ list
 
 
 
+
+
 
       [MSWin] Display via MadVR Video Renderer</span><br>
     <tt>&nbsp;</tt><tt><a href="#dcc">-dcc[:n]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -276,6 +286,8 @@ list
 
 
 
+
+
 
     </tt><tt>Display via n'th ChromeCast (default 1, ? for list)</tt><br
       style="font-family: monospace;">
@@ -328,6 +340,8 @@ list
 
 
 
+
+
 
         listno</a><span style="font-family: monospace;"> &nbsp; &nbsp;
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Set communication port from
@@ -404,6 +418,8 @@ list
 
 
 
+
+
 
         Fast ICC Profile Description string (Default "outfile")<br>
         &nbsp;<a href="#u">-u</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -459,6 +475,8 @@ ICC
 
 
 
+
+
 
         profile VideoLUTs</span><span style="font-family: monospace;"></span><span
         style="font-family: monospace;"></span><br style="font-family:
@@ -510,6 +528,8 @@ ICC
 
 
 
+
+
 
         Quality - Low, Medium (def), High<br>
         &nbsp;<a href="#p">-p</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -546,6 +566,8 @@ ICC
 
 
 
+
+
 
         Use telephoto mode (ie. for a projector) (if available)<br>
         &nbsp;</span></font><font size="-1"><span style="font-family:
@@ -595,6 +617,8 @@ ICC
 
 
 
+
+
 
         Display type - instrument specific list to choose from.</span></font><font
       size="-1"><span style="font-family: monospace;"><br
@@ -654,6 +678,8 @@ in
 
 
 
+
+
 
         deg. K (deflt.)<br>
       </span></font><font size="-1"><span style="font-family:
@@ -711,6 +737,8 @@ temperaturee
 
 
 
+
+
 
         in deg. K</span></font><br style="font-family: monospace;">
     <font size="-1"><span style="font-family: monospace;"></span><span
@@ -761,6 +789,8 @@ temperaturee
 
 
 
+
+
 
         Set the target white point as chromaticity coordinates</span><br
         style="font-family: monospace;">
@@ -811,6 +841,8 @@ temperaturee
 
 
 
+
+
 
         Set the target white brightness in cd/m^2</span><br
         style="font-family: monospace;">
@@ -861,6 +893,8 @@ temperaturee
 
 
 
+
+
 
         Set the target response curve gamma (Def. 2.4)</span><br
         style="font-family: monospace;">
@@ -909,6 +943,8 @@ temperaturee
 
 
 
+
+
 
         Use "-gl" for L*a*b* curve</span><br style="font-family:
         monospace;">
@@ -957,6 +993,8 @@ temperaturee
 
 
 
+
+
 
         &nbsp; &nbsp;&nbsp;&nbsp;&nbsp; Use "-gs" for sRGB curve<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1012,6 +1050,8 @@ use
 
 
 
+
+
 
         -a as well!)<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1059,6 +1099,8 @@ use
 
 
 
+
+
 
         Use "-g240" for SMPTE 240M curve </span></font><font size="-1"><span
         style="font-family: monospace;">(should use -a as well!)</span></font><br>
@@ -1107,6 +1149,8 @@ use
 
 
 
+
+
 
         Use "-G2.4 -f0" for BT.1886</span></font>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -1146,6 +1190,8 @@ use
 
 
 
+
+
 
     <br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
@@ -1206,6 +1252,8 @@ output
 
 
 
+
+
 
         offset (default all output offset)<br>
         &nbsp;<a href="#a">-a ambient</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1253,6 +1301,8 @@ output
 
 
 
+
+
 
         Use viewing condition adjustment for ambient in Lux<br>
       </span></font><font size="-1"><span style="font-family:
@@ -1270,6 +1320,8 @@ output
 
 
 
+
+
 
         Use forced black point hack<br>
       </span></font> <font size="-1"><span style="font-family:
@@ -1319,6 +1371,8 @@ output
 
 
 
+
+
 
         Set the target black brightness in cd/m^2</span></font><br
       style="font-family: monospace;">
@@ -1370,6 +1424,8 @@ output
 
 
 
+
+
 
         Run n verify passes on final curves<br>
       </span></font><font size="-1"><span style="font-family:
@@ -1421,6 +1477,8 @@ output
 
 
 
+
+
 
         Run only verify pass on installed calibration curves</span></font><br
       style="font-family: monospace;">
@@ -1481,6 +1539,8 @@ center,
 
 
 
+
+
 
         = right/bottom etc.</span><br style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1536,6 +1596,8 @@ normal,
 
 
 
+
+
 
         = double etc.<br>
       </span></font><font size="-1"><span style="font-family:
@@ -1571,6 +1633,8 @@ normal,
 
 
 
+
+
 
         ss,vs: = optional horizontal, vertical scale.</span></font><br>
     <font size="-1"><span style="font-family: monospace;"> &nbsp;<a
@@ -1620,6 +1684,8 @@ normal,
 
 
 
+
+
 
         Fill whole screen with black background</span></font><font
       size="-1"><span style="font-family: monospace;"></span></font><br>
@@ -1649,6 +1715,8 @@ normal,
 
 
 
+
+
 
       </span></font><small><span style="font-family: monospace;">Video
         encode output as (16-235)/255 "TV" levels</span></small><br
@@ -1709,6 +1777,8 @@ on
 
 
 
+
+
 
         test window<br>
       </span></font><font size="-1"><span style="font-family:
@@ -1762,6 +1832,8 @@ on
 
 
 
+
+
 
         Disable initial calibration of instrument if possible</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
@@ -1819,6 +1891,8 @@ on
 
 
 
+
+
 
         Apply Colorimeter Correction Matrix</span></font><br>
     <span style="font-family: monospace;">&nbsp;<a href="#X2">-X
@@ -1870,6 +1944,8 @@ Calibration
 
 
 
+
+
 
       Spectral Samples for calibration</span><font size="-1"><span
         style="font-family: monospace;"><br>
@@ -1923,6 +1999,8 @@ Calibration
 
 
 
+
+
 
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 1931_2 </span></small><small><span
         style="font-family: monospace;">(def.)</span></small><small><span
@@ -1973,6 +2051,8 @@ Calibration
 
 
 
+
+
 
         Drift compensation, Black: -Ib, White: -Iw, Both: -Ibw</span></small><br>
     <small><span style="font-family: monospace;"><tt>&nbsp;<a href="#YR">-Y
@@ -1989,6 +2069,8 @@ Calibration
 
 
 
+
+
 
             R:<i>rate</i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -2004,6 +2086,8 @@ Calibration
 
 
 
+
+
 
           Override measured refresh rate with rate Hz<br>
         </tt>&nbsp;</span></small><font size="-1"><span
@@ -2087,6 +2171,8 @@ none,
 
 
 
+
+
 
         h = HW, x = Xon/Xoff</span></font><font size="-1"><span
         style="font-family: monospace;"></span></font><br>
@@ -2138,6 +2224,8 @@ none,
 
 
 
+
+
 
         Print debug diagnostics to stderr</span></font><br
       style="font-family: monospace;">
@@ -2189,6 +2277,8 @@ none,
 
 
 
+
+
 
       </span><span style="font-family: monospace;">Base name for created
         or updated </span></font><font size="-1"><a style="font-family:
@@ -2307,6 +2397,8 @@ none,
 
 
 
+
+
 
       1,2</span> . Some experimentation may be needed using <a
       href="dispwin.html">dispwin</a> on such systems, to discover what
@@ -2346,13 +2438,11 @@ none,
     <br>
     <a name="dmadvr"></a><span style="font-weight: bold;">-dmadvr</span>
     [MSWin only] causes test patches to be displayed using the MadVR
-    video renderer. Note that you may have to start the video playback
-    software and load a video clip in pause for this to work. MadVR
-    rendering does not need or support VideoLUT access, but be aware
-    that the state of the Graphics Card VideoLUTs may affect the
-    results, and therefore may have to be set appropriately using
-    dispwin. Test patch colors will <u>not</u> be processed by the
-    MadVR 3dLut by default.<br>
+    video renderer. Note that will have to start <b>MadTPG</b> before
+    running dispcal, and that while you can adjust the "Test Pattern
+    Configuration" controls, you should <u>not</u> normally alter the
+    "Existing Calibration" controls, as dispcal will set these
+    appropriately. <br>
     <br>
     <a name="dcc"></a><span style="font-weight: bold;">-dcc</span> or <b>-dcc:<i>no</i></b>
     causes test patches to be displayed using and available <a
@@ -2364,6 +2454,8 @@ none,
     but should be accurate within � 1 bit. You may have to modify any
     firewall to permit port 8081 to be accessed on your machine if it
     falls back to the Default receiver (see <a href="Installing.html">installation
+
+
 
       instructions</a> for your platform).<br>
     <br>
@@ -2620,6 +2712,8 @@ Set
 
 
 
+
+
 
     the target response curve gamma. This is normally an exponential
     curve (output = input ^gamma), and defaults to 2.4 on MSWindows and
@@ -2674,6 +2768,8 @@ the
 
 
 
+
+
 
     L* curve, which is the response of the CIE L*a*b* perceptual
     colorspace (<span style="font-weight: bold;">-gl</span>). the REC
@@ -2779,6 +2875,8 @@ As
 
 
 
+
+
 
     explained above, the gamma value provided to the <span
       style="font-weight: bold;">-g</span> option is used to set and
@@ -2918,6 +3016,8 @@ If
 
 
 
+
+
 
     the black point is not being set completely to the same hue as the
     white point (ie. because the <span style="font-weight: bold;">-k</span>
@@ -2942,10 +3042,10 @@ If
     to destination 0,0,0. This may be useful with displays that have a
     very dark black point, and with an instrument is unable to measure
     it precisely, and where it is known in some other way that the
-    display is very well behaved from black (i.e. that it has no "dead
-    zone" above zero device input). Using this option with a display
-    that is not well behaved, may result in a loss of shadow detail.
-    This will override any <b>-k</b> factor.<br>
+    display is <u>very well behaved</u> from black (i.e. that it has no
+    "dead zone" above zero device input). Using this option with a
+    display that is <u>not</u> well behaved, may result in a loss of
+    shadow detail. This will override any <b>-k</b> factor.<br>
     <br>
     <a name="B"></a><span style="font-weight: bold;">-B</span>&nbsp; Set
     the target brightness of black in cd/m^2 (i.e. the absolute Y
@@ -3076,56 +3176,9 @@ If
     colorimeter instruments calibration. This will only work with
     colorimeters that rely on sensor spectral sensitivity calibration
     information (ie. the X-Rite <span style="font-weight: bold;">i1d3</span>,
-    or the DataColor <span style="font-weight: bold;">Spyder4</span>).This
-can
-improve
-a
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    colorimeters accuracy for a particular type of display.<br>
+    or the DataColor <span style="font-weight: bold;">Spyder4 &amp;
+      Spyder 5</span>).This can improve a colorimeters accuracy for a
+    particular type of display.<br>
     <br>
     <a name="Q"></a> The <b>-Q</b> flag allows specifying a tristimulus
     observer, and is used to compute PCS (Profile Connection Space)
diff --git a/doc/dispprofloc.html b/doc/dispprofloc.html
index 668ed16..668ed16 100644..100755
--- a/doc/dispprofloc.html
+++ b/doc/dispprofloc.html
diff --git a/doc/dispread.html b/doc/dispread.html
index a30ab25..f7fe551 100644..100755
--- a/doc/dispread.html
+++ b/doc/dispread.html
@@ -50,6 +50,10 @@
 
 
 
+
+
+
+
 
       &nbsp;&nbsp;&nbsp;&nbsp; Verbose mode<br>
       &nbsp;</small><font size="-1"><a style="font-family: monospace;"
@@ -98,6 +102,10 @@ m
 
 
 
+
+
+
+
 
         for VideoLUT access.</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
@@ -138,6 +146,10 @@ list
 
 
 
+
+
+
+
 
         (default 1)</span></font><small style="font-family: monospace;"><br>
     </small><span style="font-family: monospace;">&nbsp;<a href="#dweb">-dweb[:port]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -172,6 +184,10 @@ list
 
 
 
+
+
+
+
 
       Display via a web server at port (default 8080)</span><br>
     <span style="font-family: monospace;">&nbsp;<a href="#dmadvr">-dmadvr</a>
@@ -194,10 +210,18 @@ list
 
 
 
+
+
+
+
 
       [MSWin] Display via MadVR Video Renderer</span><br>
     <tt>&nbsp;</tt><tt><a href="#dcc">-dcc[:n]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
+
+
 
     </tt><tt>Display via n'th ChromeCast (default 1, ? for list)</tt><br>
     <small style="font-family: monospace;"> <span style="font-family:
@@ -236,6 +260,10 @@ list
 
 
 
+
+
+
+
 
         Use telephoto mode (ie. for a projector) (if available)</span></font><br>
     &nbsp; <font size="-1"><span style="font-family: monospace;"><a
@@ -272,6 +300,10 @@ Display
 
 
 
+
+
+
+
 
         type - instrument specific list to choose from.</span></font><br>
     <small style="font-family: monospace;">&nbsp;<span
@@ -306,6 +338,10 @@ Display
 
 
 
+
+
+
+
 
       Load calibration file into display while reading<br>
     </small><small style="font-family: monospace;">&nbsp;<span
@@ -341,6 +377,10 @@ Apply
 
 
 
+
+
+
+
 
       calibration file to test values while reading</small><br>
     <tt>&nbsp;<a href="#V">-V</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -354,6 +394,10 @@ Apply
 
 
 
+
+
+
+
 
       [MSWin] Enable MadVR color management (3dLut)</tt><br>
     <small style="font-family: monospace;">&nbsp;<a href="#s">-s</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -386,6 +430,10 @@ Apply
 
 
 
+
+
+
+
 
       &nbsp;&nbsp;&nbsp;&nbsp; Save spectral information (default don't
       save)<br>
@@ -429,6 +477,10 @@ center,
 
 
 
+
+
+
+
 
       1.0 = right/bottom etc.<br>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -468,6 +520,10 @@ normal,
 
 
 
+
+
+
+
 
       2.0 = double etc.<br>
     </font><font size="-1"><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -493,6 +549,10 @@ normal,
 
 
 
+
+
+
+
 
         ss,vs: = optional horizontal, vertical scale.</span></font><br>
     <font style="font-family: monospace;" size="-1"> &nbsp;</font><font
@@ -527,6 +587,10 @@ normal,
 
 
 
+
+
+
+
 
         Fill whole screen with black background</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span></font><font
@@ -546,6 +610,10 @@ normal,
 
 
 
+
+
+
+
 
       </span></font><small><span style="font-family: monospace;">Video
         encode output as (16-235)/255 "TV" levels</span></small><br>
@@ -566,6 +634,10 @@ normal,
 
 
 
+
+
+
+
 
       </span></font><small><span style="font-family: monospace;">Quantize
 test
@@ -582,6 +654,10 @@ fit
 
 
 
+
+
+
+
 
         in nbits</span></small><br style="font-family: monospace;">
     <small style="font-family: monospace;">&nbsp;<span
@@ -622,6 +698,10 @@ redirect
 
 
 
+
+
+
+
 
       on test window<br>
     </small><small style="font-family: monospace;">&nbsp;<a href="#J">-J</a>
@@ -655,6 +735,10 @@ redirect
 
 
 
+
+
+
+
 
       &nbsp;&nbsp;&nbsp;&nbsp; Run calibration first</small><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
@@ -688,6 +772,10 @@ redirect
 
 
 
+
+
+
+
 
         Disable initial calibration of instrument if possible<br>
       </span></font><font size="-1"><span style="font-family:
@@ -736,6 +824,10 @@ Y
 
 
 
+
+
+
+
 
         100</span></font><small><span style="font-family: monospace;"></span></small><br>
     &nbsp; <font size="-1"><span style="font-family: monospace;"><a
@@ -769,6 +861,10 @@ Y
 
 
 
+
+
+
+
 
         Apply Colorimeter Correction Matrix</span></font><br>
     <span style="font-family: monospace;">&nbsp;<a href="#X2">-X
@@ -805,6 +901,10 @@ Calibration
 
 
 
+
+
+
+
 
       Spectral Samples for calibration</span><font size="-1"><span
         style="font-family: monospace;"><br>
@@ -843,6 +943,10 @@ Calibration
 
 
 
+
+
+
+
 
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 1931_2 </span></small><small><span
         style="font-family: monospace;">(def.)</span></small><small><span
@@ -886,6 +990,10 @@ Both:
 
 
 
+
+
+
+
 
         -Ibw</span></small><br>
     <small><span style="font-family: monospace;"><tt>&nbsp;<a href="#YR">-Y
@@ -896,6 +1004,10 @@ Both:
 
 
 
+
+
+
+
 
             R:<i>rate</i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -905,6 +1017,10 @@ Both:
 
 
 
+
+
+
+
 
           Override measured refresh rate with rate Hz<br>
         </tt>&nbsp;</span></small><font size="-1"><span
@@ -932,6 +1048,10 @@ Both:
 
 
 
+
+
+
+
 
         Use non-adaptive integration time mode (if available).</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
@@ -951,6 +1071,11 @@ Both:
         href="#M">-M "command"</a><span style="font-family: monospace;">
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Invoke shell
         "command" each time a color is measured</span></font><br>
+    <small>&nbsp; <a style="font-family: monospace;" href="#x">-x x</a><span
+        style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Take
+        manually entered
+        XYZ values</span></small><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
           href="#W">-W n|h|x</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Override
@@ -989,6 +1114,10 @@ n
 
 
 
+
+
+
+
 
         none, h = HW, x = Xon/Xoff</span></font><br>
     <small style="font-family: monospace;">&nbsp;<a href="#D">-D [level]</a>
@@ -1024,6 +1153,10 @@ n
 
 
 
+
+
+
+
 
       Base name for input[<a href="File_Formats.html#.ti1">.ti1</a>]/output[<a
         href="File_Formats.html#.ti3">.ti3</a>] file.<br>
@@ -1121,6 +1254,10 @@ n
 
 
 
+
+
+
+
 
       1,2</span> . Some experimentation may be needed using <a
       href="dispwin.html">dispwin</a> on such systems, to discover what
@@ -1160,14 +1297,12 @@ n
     <br>
     <a name="dmadvr"></a><span style="font-weight: bold;">-dmadvr</span>
     [MSWin only] causes test patches to be displayed using the MadVR
-    video renderer. Note that you may have to start the video playback
-    software and load a video clip in pause for this to work. MadVR
-    rendering does not need or support VideoLUT access, so the <a
-      href="#K">-K</a> option should be used to read calibrated values.
-    Be aware that the state of the Graphics Card VideoLUTs may affect
-    the results, and therefore may have to be set appropriately using
-    dispwin. By default the test patch colors will <u>not</u> be
-    processed by the MadVR 3dLut (see the -<a href="#V">V</a> flag).<br>
+    video renderer. Note that will have to start <b>MadTPG</b> before
+    running dispread, and that while you can adjust the "Test Pattern
+    Configuration" controls, you should <u>not</u> normally alter the
+    "Existing Calibration" controls, as dispread will set these
+    appropriately. See also <tt><a
+        href="file:///D:/src/argyll/doc/dispread.html#V">-V</a> flag.</tt><br>
     <br>
     <a name="dcc"></a><span style="font-weight: bold;">-dcc</span> or <b>-dcc:<i>no</i></b>
     causes test patches to be displayed using and available <a
@@ -1178,7 +1313,11 @@ n
     up-samples the test patch and transforms from RGB to YCC and back,
     but should be accurate within � 1 bit. You may have to modify any
     firewall to permit port 8081 to be accessed on your machine if it
-    falls back to the Default receiver (see <a href="Installing.html">installation
+    falls back to the Default receiver (see <a href="Installing.html">installation
+
+
+
+
       instructions</a> for your platform).<br>
     <br>
     <a name="c"></a> <span style="font-weight: bold;">-c</span>: The
@@ -1388,41 +1527,9 @@ n
     colorimeter instruments calibration. This will only work with
     colorimeters that rely on sensor spectral sensitivity calibration
     information (ie. the X-Rite <span style="font-weight: bold;">i1d3</span>,
-    or the DataColor <span style="font-weight: bold;">Spyder4</span>).This
-can
-improve
-a
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    colorimeters accuracy for a particular type of display.<br>
+    or the DataColor <span style="font-weight: bold;">Spyder4 &amp;
+      Spyder 5</span>).This can improve a colorimeters accuracy for a
+    particular type of display.<br>
     <br>
     <a name="Q"></a> The <b>-Q</b> flag allows specifying a tristimulus
     observer, and is used to compute PCS (Profile Connection Space)
@@ -1515,6 +1622,14 @@ a
     will abort. Note that a test window will also be created on the
     system running dispread.<br>
     <br>
+    <a name="x"></a> The <b>-x</b> flag causes dispread to expect
+    values to be manually entered for each reading, rather than using an
+    instrument to do the measurements.&nbsp; This mode is ideal if your
+    instrument is not supported by Argyll. XYZ values should be entered.
+    It is possible to navigate about the test values being measured, so
+    as to do them in any order, as well as re-do values, in case of any
+    mistakes.<br>
+    <br>
     <a name="W"></a>The <b>-W</b> <span style="font-weight: bold;">n|h|x</span>
     parameter overrides the default serial communications flow control
     setting. The value <span style="font-weight: bold;">n</span> turns
diff --git a/doc/dispwin.html b/doc/dispwin.html
index 6036e76..05db989 100644..100755
--- a/doc/dispwin.html
+++ b/doc/dispwin.html
@@ -50,6 +50,7 @@ Verbose
 
 
 
+
 
         mode<br>
       </span></font><font size="-1"><span style="font-family:
@@ -79,6 +80,7 @@ optionally
 
 
 
+
 
         choose a different display m for Video LUT access.<br>
       </span></font><font size="-1"><span style="font-family:
@@ -99,6 +101,7 @@ X11]
 
 
 
+
 
         Choose the display from the following list (default 1)<br>
       </span></font><span style="font-family: monospace;">&nbsp;<a
@@ -115,6 +118,7 @@ X11]
 
 
 
+
 
       Display via a web server at port (default 8080)</span><br>
     <span style="font-family: monospace;">&nbsp;<a
@@ -123,6 +127,7 @@ X11]
       [MSWin] Display via MadVR Video Renderer</span><br>
     <tt>&nbsp;</tt><tt><a href="#dcc">-dcc[:n]</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
 
     </tt><tt></tt><tt>Display via n'th ChromeCast (default 1, ? for
       list)</tt><br style="font-family: monospace;">
@@ -147,6 +152,7 @@ ho,vi:
 
 
 
+
 
         = left/top, 0.5 = center, 1.0 = right/bottom etc.</span><br
         style="font-family: monospace;">
@@ -167,6 +173,7 @@ ss:
 
 
 
+
 
         = half, 1.0 = normal, 2.0 = double etc.<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -180,6 +187,7 @@ ss:
 
 
 
+
 
         ss,vs: = optional horizontal, vertical scale.<br>
         &nbsp;</span></font><font size="-1"><span style="font-family:
@@ -201,6 +209,7 @@ whole
 
 
 
+
 
         screen with black background</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span></font><font
@@ -211,6 +220,7 @@ whole
 
 
 
+
 
       </span></font><small><span style="font-family: monospace;">Video
         encode output as (16-235)/255 "TV" levels</span></small><br
@@ -247,6 +257,7 @@ just
 
 
 
+
 
         video LUT loading &amp; Beeps<br>
       </span></font><font size="-1"><span style="font-family:
@@ -268,6 +279,7 @@ native
 
 
 
+
 
         display values (rather than through Video LUT&nbsp; and C.M.)<br>
         &nbsp;<a href="#s">-s <span style="font-style: italic;">filename.cal</span></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -287,6 +299,7 @@ the
 
 
 
+
 
         currently loaded Video LUT to 'filename'<br>
       </span></font><font size="-1"><span style="font-family:
@@ -308,6 +321,7 @@ a
 
 
 
+
 
         linear display calibration (clear calibration)</span></font><font
       size="-1"><span style="font-family: monospace;"><br>
@@ -330,6 +344,7 @@ that
 
 
 
+
 
         calfile/profile cal. is currently loaded in LUT<br>
       </span></font><font size="-1"><span style="font-family:
@@ -349,6 +364,7 @@ that
 
 
 
+
 
       </span></font><font size="-1"><span style="font-family:
         monospace;">Install profile for display and use it's calibration<br>
@@ -369,6 +385,7 @@ that
 
 
 
+
 
       </span></font><font size="-1"><span style="font-family:
         monospace;">Un-install profile for display<br>
@@ -389,6 +406,7 @@ the
 
 
 
+
 
         install/uninstall scope for OS X [nlu] or Vista [lu]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -408,6 +426,7 @@ is
 
 
 
+
 
         one of: n = network, l = local system, u = user (default)<br>
       </span></font><font size="-1"><span style="font-family:
@@ -428,6 +447,7 @@ is
 
 
 
+
 
       </span></font><font size="-1"><span style="font-family:
         monospace;">Load installed profiles cal. into Video LUT<br>
@@ -448,6 +468,7 @@ is
 
 
 
+
 
         [<span style="font-weight: bold;">X11 only</span>] Run in daemon
         loader mode for given X11 server <br>
@@ -470,6 +491,7 @@ debug
 
 
 
+
 
         diagnostics to stderr</span></font><font size="-1"><span
         style="font-family: monospace;"></span></font><font size="-1"><span
@@ -495,6 +517,7 @@ display
 
 
 
+
 
         calibration (<a href="cal_format.html">.cal</a> or .icm) into
         LUT, and exit.</span><span style="font-family: monospace;"></span><span
@@ -566,6 +589,7 @@ the
 
 
 
+
 
     difficulty cause by TwinView and MergedFB in X11 based systems, you
     can optionally specify a separate display number after the display
@@ -605,13 +629,11 @@ the
     <br>
     <a name="dmadvr"></a><span style="font-weight: bold;">-dmadvr</span>
     [MSWin only] causes test patches to be displayed using the MadVR
-    video renderer. Note that you may have to start the video playback
-    software and load a video clip in pause for this to work. MadVR
-    rendering does not need or support VideoLUT access, but be aware
-    that the state of the Graphics Card VideoLUTs may affect the results
-    (check this using dispwin). Test patch colors <u>will</u> be
-    processed by the MadVR 3dLut by default (see <a href="#n">-n</a>
-    flag).<br>
+    video renderer. Note that will have to start <b>MadTPG</b> before
+    running dispread, and that while you can adjust the "Test Pattern
+    Configuration" controls, you should <u>not</u> normally alter the
+    "Existing Calibration" controls, as dispread will set these
+    appropriately. See <a href="#n">-n</a> flag.<br>
     <br>
     <a name="dcc"></a><span style="font-weight: bold;">-dcc</span> or <b>-dcc:<i>no</i></b>
     causes test patches to be displayed using and available <a
@@ -622,7 +644,8 @@ the
     up-samples the test patch and transforms from RGB to YCC and back,
     but should be accurate within � 1 bit. You may have to modify any
     firewall to permit port 8081 to be accessed on your machine if it
-    falls back to the Default receiver (see <a href="Installing.html">installation
+    falls back to the Default receiver (see <a href="Installing.html">installation
+
       instructions</a> for your platform).<br>
     <br>
     <a name="P"></a> The <span style="font-weight: bold;">-P</span>
diff --git a/doc/evalInputTargets.html b/doc/evalInputTargets.html
index 91a38f1..91a38f1 100644..100755
--- a/doc/evalInputTargets.html
+++ b/doc/evalInputTargets.html
diff --git a/doc/extracticc.html b/doc/extracticc.html
index 73e572b..73e572b 100644..100755
--- a/doc/extracticc.html
+++ b/doc/extracticc.html
diff --git a/doc/extractttag.html b/doc/extractttag.html
index 90174b4..90174b4 100644..100755
--- a/doc/extractttag.html
+++ b/doc/extractttag.html
diff --git a/doc/fakeCMY.html b/doc/fakeCMY.html
index 3122073..3122073 100644..100755
--- a/doc/fakeCMY.html
+++ b/doc/fakeCMY.html
diff --git a/doc/fakeread.html b/doc/fakeread.html
index 376e971..376e971 100644..100755
--- a/doc/fakeread.html
+++ b/doc/fakeread.html
diff --git a/doc/filmread.html b/doc/filmread.html
index 2109b99..2109b99 100644..100755
--- a/doc/filmread.html
+++ b/doc/filmread.html
diff --git a/doc/filmtarg.html b/doc/filmtarg.html
index ba1c060..ba1c060 100644..100755
--- a/doc/filmtarg.html
+++ b/doc/filmtarg.html
diff --git a/doc/gamma.html b/doc/gamma.html
index 2a9cec3..2a9cec3 100644..100755
--- a/doc/gamma.html
+++ b/doc/gamma.html
diff --git a/doc/gamutmapping1.jpg b/doc/gamutmapping1.jpg
index e962666..e962666 100644..100755
--- a/doc/gamutmapping1.jpg
+++ b/doc/gamutmapping1.jpg
diff --git a/doc/greytiff.html b/doc/greytiff.html
index caccece..caccece 100644..100755
--- a/doc/greytiff.html
+++ b/doc/greytiff.html
diff --git a/doc/i1d.jpg b/doc/i1d.jpg
index e7cc159..e7cc159 100644..100755
--- a/doc/i1d.jpg
+++ b/doc/i1d.jpg
diff --git a/doc/i1d3_1.jpg b/doc/i1d3_1.jpg
index afb77a3..afb77a3 100644..100755
--- a/doc/i1d3_1.jpg
+++ b/doc/i1d3_1.jpg
diff --git a/doc/i1d3_2.jpg b/doc/i1d3_2.jpg
index 306f830..306f830 100644..100755
--- a/doc/i1d3_2.jpg
+++ b/doc/i1d3_2.jpg
diff --git a/doc/i1m.jpg b/doc/i1m.jpg
index efbf55f..efbf55f 100644..100755
--- a/doc/i1m.jpg
+++ b/doc/i1m.jpg
diff --git a/doc/i1p.jpg b/doc/i1p.jpg
index 7e59c06..7e59c06 100644..100755
--- a/doc/i1p.jpg
+++ b/doc/i1p.jpg
diff --git a/doc/i1pro2.jpg b/doc/i1pro2.jpg
index 8b3cbec..8b3cbec 100644..100755
--- a/doc/i1pro2.jpg
+++ b/doc/i1pro2.jpg
diff --git a/doc/i1proDriver.html b/doc/i1proDriver.html
index 0894f59..0894f59 100644..100755
--- a/doc/i1proDriver.html
+++ b/doc/i1proDriver.html
diff --git a/doc/i1proDriver.xls b/doc/i1proDriver.xls
index ca1cdf5..ca1cdf5 100644..100755
--- a/doc/i1proDriver.xls
+++ b/doc/i1proDriver.xls
diff --git a/doc/i1proHiRes.html b/doc/i1proHiRes.html
index d6eef6a..d6eef6a 100644..100755
--- a/doc/i1proHiRes.html
+++ b/doc/i1proHiRes.html
diff --git a/doc/i1proHiRes.jpg b/doc/i1proHiRes.jpg
index c07b37c..c07b37c 100644..100755
--- a/doc/i1proHiRes.jpg
+++ b/doc/i1proHiRes.jpg
diff --git a/doc/i1proHiRes.zip b/doc/i1proHiRes.zip
index 49721f9..49721f9 100644..100755
--- a/doc/i1proHiRes.zip
+++ b/doc/i1proHiRes.zip
diff --git a/doc/i1scan14.jpg b/doc/i1scan14.jpg
index 94b68fb..94b68fb 100644..100755
--- a/doc/i1scan14.jpg
+++ b/doc/i1scan14.jpg
diff --git a/doc/iccdump.html b/doc/iccdump.html
index 8be51f3..8be51f3 100644..100755
--- a/doc/iccdump.html
+++ b/doc/iccdump.html
diff --git a/doc/iccgamut.html b/doc/iccgamut.html
index 47df32c..47df32c 100644..100755
--- a/doc/iccgamut.html
+++ b/doc/iccgamut.html
diff --git a/doc/iccgamutmapping.html b/doc/iccgamutmapping.html
index 8deab44..8deab44 100644..100755
--- a/doc/iccgamutmapping.html
+++ b/doc/iccgamutmapping.html
diff --git a/doc/icclu.html b/doc/icclu.html
index 9a95fbf..9a95fbf 100644..100755
--- a/doc/icclu.html
+++ b/doc/icclu.html
diff --git a/doc/illumread.html b/doc/illumread.html
index 9b65b2f..9b65b2f 100644..100755
--- a/doc/illumread.html
+++ b/doc/illumread.html
diff --git a/doc/illumread_1.jpg b/doc/illumread_1.jpg
index 97b5382..97b5382 100644..100755
--- a/doc/illumread_1.jpg
+++ b/doc/illumread_1.jpg
diff --git a/doc/illumread_2.jpg b/doc/illumread_2.jpg
index 6fef757..6fef757 100644..100755
--- a/doc/illumread_2.jpg
+++ b/doc/illumread_2.jpg
diff --git a/doc/illumread_3.jpg b/doc/illumread_3.jpg
index fcab321..fcab321 100644..100755
--- a/doc/illumread_3.jpg
+++ b/doc/illumread_3.jpg
diff --git a/doc/illumread_4.jpg b/doc/illumread_4.jpg
index 6c955c0..6c955c0 100644..100755
--- a/doc/illumread_4.jpg
+++ b/doc/illumread_4.jpg
diff --git a/doc/illumread_5.jpg b/doc/illumread_5.jpg
index 5462e8f..5462e8f 100644..100755
--- a/doc/illumread_5.jpg
+++ b/doc/illumread_5.jpg
diff --git a/doc/illumread_6.jpg b/doc/illumread_6.jpg
index a91a63e..a91a63e 100644..100755
--- a/doc/illumread_6.jpg
+++ b/doc/illumread_6.jpg
diff --git a/doc/instruments.html b/doc/instruments.html
index f5897d5..2a970bd 100644..100755
--- a/doc/instruments.html
+++ b/doc/instruments.html
@@ -41,6 +41,66 @@
 
 
 
+
+
+
+
+
+    - Tele-Spectro-Radiometer<br>
+    <br>
+    Image Engineering:<br>
+    <br>
+    &nbsp;&nbsp;&nbsp; <a href="#ex1">EX1</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     - Tele-Spectro-Radiometer<br>
     <br>
@@ -95,6 +155,10 @@
 
 
 
+
+
+
+
 
     - "swipe" type reflective spectrometer, that can be used untethered.<br>
     &nbsp;&nbsp;&nbsp; <a href="#DTP22">DTP22 Digital Swatchbook</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -137,6 +201,10 @@
 
 
 
+
+
+
+
 
     - spot type reflective spectrometer.<br>
     &nbsp;&nbsp;&nbsp; <a href="#DTP41">DTP41</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -179,6 +247,10 @@
 
 
 
+
+
+
+
 
     - spot and strip reading reflective spectrometer.<br>
     &nbsp;&nbsp;&nbsp; <a href="#DTP41">DTP41T</a> &nbsp; &nbsp; &nbsp;
@@ -223,6 +295,10 @@
 
 
 
+
+
+
+
 
     - spot and strip reading reflective/transmissive spectrometer.<br>
     &nbsp;&nbsp;&nbsp; <a href="#dtp51">DTP51</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -265,6 +341,10 @@
 
 
 
+
+
+
+
 
     - strip reading reflective colorimeter.<br>
     &nbsp;&nbsp;&nbsp; <a href="#DTP92">DTP92</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -307,6 +387,10 @@
 
 
 
+
+
+
+
 
     - CRT display colorimeter.<br>
     &nbsp;&nbsp;&nbsp; <a href="#DTP94">DTP94</a> <font size="-1">"Optix
@@ -349,6 +433,10 @@
 
 
 
+
+
+
+
 
       XR"</font> or "Optix XR2" or "Optix Pro"- display colorimeter.<br>
     <a href="#ColorMunki"><span style="text-decoration: underline;"></span></a>&nbsp;&nbsp;&nbsp;
@@ -391,6 +479,10 @@
 
 
 
+
+
+
+
 
     <a href="#ColorMunki"><span style="text-decoration: underline;">ColorMunki</span></a>
     Design or Photo&nbsp;
@@ -487,6 +579,10 @@
 
 
 
+
+
+
+
 
     - display colorimeter. (Treated as a Eye-One Display 2)<br>
     &nbsp;&nbsp;&nbsp; <a href="#i1d">CalMAN X2</a>
@@ -530,6 +626,10 @@
 
 
 
+
+
+
+
 
     - display colorimeter. (Treated as a Eye-One Display 2)<br>
     &nbsp;&nbsp;&nbsp; <a href="#Huey">Huey</a> &nbsp; &nbsp; &nbsp;
@@ -582,6 +682,10 @@
 
 
 
+
+
+
+
 
     [The Sequel Chroma 4 may also work.]<br>
     <br>
@@ -626,6 +730,10 @@
 
 
 
+
+
+
+
 
     - see <a href="#i1d">Eye-One Display</a><br>
     <br>
@@ -675,6 +783,10 @@
 
 
 
+
+
+
+
 
     [The Spyder 1 also seems to work.]<br>
     &nbsp;&nbsp;&nbsp;&nbsp; <a href="#spyd3">Spyder 3</a> &nbsp;
@@ -696,7 +808,11 @@
     <br>
     Other:<br>
     &nbsp;&nbsp;&nbsp; <span class="titre"><a href="#HCFR">Colorim�tre
-        HCFR</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        HCFR</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+
 
 
 
@@ -769,9 +885,18 @@
 
 
 
+
+
+
+
 
-    - display colorimeter<span class="titre"><br>
-    </span><br>
+    - display colorimeter<span class="titre"></span><br>
+    &nbsp;&nbsp;&nbsp; <a href="#SMCube">SwatchMate Cube</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+    - reflective colorimeter<br>
+    <br>
     Other instruments can be supported indirectly, since patch result
     files created by other packages can be imported into Argyll.<br>
     <span class="titre"><br>
@@ -1082,6 +1207,10 @@
 
 
 
+
+
+
+
 
       type</span> selection parameter. Depending on the instrument, this
     may combine two related functions: 1) Changing the measurement mode
@@ -1211,14 +1340,32 @@
       </span><span style="font-weight: bold;">Availability:<br>
         <br>
       </span>The <span style="font-weight: bold;">specbos 1211</span><span
-        style="font-weight: bold;"> </span>and <b>1201</b>from <a
+        style="font-weight: bold;"> </span>and <b>1201</b> from <a
         href="http://www.jeti.com/">JETI</a>&nbsp; are currently
       available instruments. These are reference grade instruments
       capable of emissive and ambient measurements, and are often used
       for monitor, projector and cinema calibration &amp;
-      characterization, and colorimeter calibration, amongst many other
-      uses.<br>
+      characterization, lighting measurement and colorimeter
+      calibration, amongst many other uses.<br>
     </p>
+    <hr size="2" width="100%">
+    <p><span style="font-weight: bold;"><a name="ex1"></a><span
+          style="font-weight: bold;">Image Engineering EX1<br>
+        </span></span></p>
+    <img alt="Image Engineering EX1" src="EX1.jpg" height="158"
+      width="253"> <span style="font-weight: bold;"><br>
+    </span><span style="font-weight: bold;"><br>
+      Availability:<br>
+      <br>
+    </span>The <a
+href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/ex1">Image
+
+
+
+      Engineering EX1</a> is a currently available instruments. This is
+    a high resolution spectrometer intended for the measurement of light
+    sources.
+    <p> </p>
     <p><br>
     </p>
     <hr size="2" width="100%">
@@ -1235,6 +1382,10 @@
 
 
 
+
+
+
+
 
       <a href="http://www.kleininstruments.com/">Klein Instruments</a>&nbsp;
 
@@ -1242,6 +1393,10 @@
 
 
 
+
+
+
+
 
       is a currently available instrument. It is noted for it's speed,
       high precision, and ability to measure to very low light
@@ -1553,6 +1708,10 @@
 
 
 
+
+
+
+
 
     CRT display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Cathode Ray
     Tube display, that is of the Refresh type [Default, CB2].<br>
@@ -1615,6 +1774,10 @@
 
 
 
+
+
+
+
 
     LCD display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Liquid
     Crystal Display, that is of the Non-Refresh type [default, CB1].<br>
@@ -1658,6 +1821,10 @@
 
 
 
+
+
+
+
 
     CRT display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Cathode Ray
     Tube display, that is of the Refresh type [CB2].<br>
@@ -1717,6 +1884,10 @@ Gretag
 
 
 
+
+
+
+
 
     MacBeth (Now X-Rite) is a discontinued instrument. It is often
     available second hand. If buying it second hand, make sure it comes
@@ -1962,6 +2133,10 @@ Gretag
 
 
 
+
+
+
+
 
       Smile</span> are:<br>
     <br>
@@ -1992,6 +2167,10 @@ Gretag
 
 
 
+
+
+
+
 
     LCD with LED back-light&nbsp;&nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; A Liquid Crystal display that uses
@@ -2039,6 +2218,10 @@ Gretag
 
 
 
+
+
+
+
 
     LCD display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Liquid
     Crystal Display, that is of the Non-Refresh type. [Default, CB1]<br>
@@ -2082,6 +2265,10 @@ Gretag
 
 
 
+
+
+
+
 
     CRT display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; A
     Cathode Ray Tube display, that is of the Refresh type. [CB2]<br>
@@ -2144,6 +2331,10 @@ href="http://www8.hp.com/us/en/products/oas/product-detail.html?oid=5225568">HP
 
 
 
+
+
+
+
 
       DreamColor</a> instruments are also reported to work. They will
     appear as a be a the same as the i1Display Pro.<br>
@@ -2258,6 +2449,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
       Pro</a> is still available.<br>
     <span style="font-weight: bold;"></span><br>
@@ -2305,6 +2500,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     LCD display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Liquid
     Crystal Display, that is of the Non-Refresh type. [Default, CB1]<br>
@@ -2348,6 +2547,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     CRT display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Cathode Ray
     Tube display, that is of the Refresh type. [CB2]<br>
@@ -2416,6 +2619,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     CRT display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Cathode Ray
     Tube display, that is of the Refresh type.<br>
@@ -2459,6 +2666,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     LCD display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Liquid
     Crystal Display, that is of the Non-Refresh type.<br>
@@ -2535,6 +2746,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     LCD display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; A Liquid Crystal
     Display, that is of the Non-Refresh type. [Default, CB1]<br>
@@ -2578,6 +2793,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     CRT display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Cathode Ray
     Tube display, that is of the Refresh type. [CB2]<br>
@@ -2744,6 +2963,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     - normal gamut Liquid Crystal Display with standard Cold Cathode
     Fluorescent Lamp backlight.<br>
@@ -2796,6 +3019,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; Wide Gamut LCD, RGB LED
     Backlight - wide gamut Liquid Crystal Display with RGB LED
@@ -2843,6 +3070,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     - normal gamut Liquid Crystal Display with alternative Cold Cathode
     Fluorescent Lamp backlight (Laptop ?)<br>
@@ -2874,7 +3105,11 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
     </span><span style="font-weight: bold;">Operation:<br>
     </span><br>
     These instruments are capable of using using CCSS (<a
-      href="file:///D:/src/argyll/doc/File_Formats.html#ccss">Colorimeter
+      href="file:///D:/src/argyll/doc/File_Formats.html#ccss">Colorimeter
+
+
+
+
       Calibration Spectral Sample</a>) files, and this also gives the
     instrument the capability of using a non-default standard observer.
     CCSS files can be created using the <a
@@ -2960,6 +3195,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     - normal gamut Liquid Crystal Display with standard Cold Cathode
     Fluorescent Lamp backlight.<br>
@@ -3012,6 +3251,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; Wide Gamut LCD, RGB LED
     Backlight - wide gamut Liquid Crystal Display with RGB LED
@@ -3059,6 +3302,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     - normal gamut Liquid Crystal Display with alternative Cold Cathode
     Fluorescent Lamp backlight (Laptop ?)<br>
@@ -3116,6 +3363,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
       HCFR Probe</span> is a kit instrument from <span
       style="font-weight: bold;"></span> <a
@@ -3177,6 +3428,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     LCD display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Liquid
     Crystal Display [Default].<br>
@@ -3220,6 +3475,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     CRT display&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; A Cathode Ray
     Tube display.<br>
@@ -3239,14 +3498,17 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
     is a low cost display colorimeter instrument from <span
       style="font-weight: bold;"></span> <a
       href="http://www.hughski.com/">Hughski</a>. <br>
+    ArgyllCMS will also work with the <a
+      href="http://www.hughski.com/colorhug2.html">ColorHug2</a>.<br>
     <br>
     <span style="font-weight: bold;">Operation:</span><br>
     <span style="font-weight: bold;"><span style="font-weight: bold;"></span></span><br>
     Due to the nature of its sensor, the ColorHug accuracy is quite
-    dependent on the instrument calibration matrix. A custom .CCMX will
-    greatly assist it's accuracy, although a workaround is to calibrate
-    your display using its native white point, rather than aiming for
-    some absolute white point such as D65.<br>
+    dependent on the instrument calibration matrix. (The <b>ColorHug2</b>
+    is much more forgiving though). A custom .CCMX will greatly assist
+    it's accuracy, although a workaround is to calibrate your display
+    using its native white point, rather than aiming for some absolute
+    white point such as D65.<br>
     <br>
     The Display Selections for this instrument are:<br>
     <br>
@@ -3260,6 +3522,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     LCD, CCFL Backlight [Default]<br>
     &nbsp;&nbsp; <b>c</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3273,6 +3539,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     CRT display<br>
     &nbsp;&nbsp; <b>p</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3286,6 +3556,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     Projector<br>
     &nbsp;&nbsp; <b>e</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3298,6 +3572,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     LCD, White LED Backlight<br>
     &nbsp;&nbsp; <b>F</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3311,6 +3589,10 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     Factory matrix (For Calibration) [CB1]<br>
     &nbsp;&nbsp;<b> R</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -3324,9 +3606,104 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&amp;ca=2">Huey
 
 
 
+
+
+
+
 
     Raw Reading (For Factory matrix Calibration) [CB2]<br>
     <br>
+    <hr style="width: 100%; height: 2px;"><br>
+    <a name="SMCube"></a><span style="font-weight: bold;">SwatchMate
+      Cube<br>
+      <br>
+      <img alt="SwatchMate Cube" src="SMCube.jpg" height="205"
+        width="169"><br>
+      <br>
+    </span><span style="font-weight: bold;">Availability:<br>
+      <br>
+    </span>The Cube from <a href="http://www.swatchmate.com/">SwatchMate</a>
+    is a currently available entry level Colorimeter, with <a
+      href="http://www.argyllcms.com/doc2/smcube/smcube1.html">somewhat
+      limited accuracy</a>. The ArgyllCMS driver provides two
+    alternative calibrations that noticably <a
+      href="http://www.argyllcms.com/doc2/smcube/smcube2.html">improve
+      this accuracy</a>.<br>
+    <br>
+    The Calibration Selections for this instrument are:<br>
+    <br>
+    &nbsp;&nbsp; <b>m</b>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+    Matt surfaces [Default]<br>
+    &nbsp;&nbsp; <b>g</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    Gloss surfaces<br>
+    &nbsp;&nbsp; <b>N</b>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+
+
+    Native Calibration<br>
+    <br>
+    <span style="font-weight: bold;">Operation:<br>
+    </span><br>
+    The Cube must be connected via USB for operation with ArgyllCMS, and
+    can be connected either by USB or using Bluetooth LE when used with
+    <a href="http://www.argyllpro.com.au/">ArgyllPRO ColorMeter</a> on
+    capable Android devices.<br>
+    <br>
+    The Cube goes to sleep fairly rapidly and must be woken up by
+    pressing the top of it before connecting via USB to be recognized by
+    ArgyllCMS, although once connected, and with an ArgyllCMS utility
+    running, it should stay awake.<br>
+    <br>
+    When connecting via Bluetooth to ColorMeter, the foreground
+    application will be the one that connects to it.<br>
+    <br>
+    The ability to measure values into its own memory and recover them
+    later is not supported, since it is not possible to use the
+    ArgyllCMS calibrations with this feature.<br>
+    <br>
+    <span style="font-weight: bold;">Calibration:</span><br>
+    <br>
+    As well as the normal white calibration step, the ArgyllCMS driver
+    offers two option supplemental calibration steps that can improve
+    accuracy, but both require appropriate calibration conditions. You
+    can use <a href="spotread.html">spotread</a> with the 'k' command
+    to trigger this calibration.<br>
+    <br>
+    The <b>black calibration</b> requires a light trap, and the easiest
+    way of providing this is to place the Cube in a location that is
+    dark (i.e. not illuminated directly by any light) and some distance
+    from any surface. A practical approach I have used is to place the
+    measuring end in a thick black sock, and hide it from direct
+    illumination while this calibration step is done.<br>
+    <br>
+    The <b>gloss calibration</b> requires a black glossy surface. I
+    have used a paint catalog gloss paint black sample square for this,
+    but some other completely black glossy surface of sufficient size
+    such as a glossy black plastic item or a smooth surface painted in
+    gloss black paint should also work.<br>
+    <br>
+    <br>
+    <br>
     <br>
     <br>
     <br>
diff --git a/doc/invprofcheck.html b/doc/invprofcheck.html
index bd611b3..65502ee 100644..100755
--- a/doc/invprofcheck.html
+++ b/doc/invprofcheck.html
@@ -1,133 +1,168 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
-  <title>invprofcheck</title>
-  <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-  <meta name="author" content="Graeme Gill">
-</head>
-<body>
-<h2><b>profile/invprofcheck</b></h2>
-<h3>Summary</h3>
-Check <a href="File_Formats.html#ICC">ICC</a> forward against reverse
-lookup.
-<br>
-<h3>Usage Summary</h3>
-<small><span style="font-family: monospace;">usage: invprofcheck
-[-options] </span><span
- style="font-style: italic; font-family: monospace;">profile.icm</span><br
- style="font-family: monospace;">
-<span style="font-family: monospace;">&nbsp;-v [level]&nbsp;&nbsp;
-verbosity level (default 1), 2 to print each DE</span><br
- style="font-family: monospace;">
-<span style="font-family: monospace;">&nbsp;-l
-limit&nbsp;&nbsp;&nbsp;&nbsp; set total ink
-limit (estimate by default)<br>
-</span></small><small><span style="font-family: monospace;">&nbsp;-L
-klimit &nbsp;&nbsp; set black channel ink
-limit (estimate by default)</span></small><br
- style="font-family: monospace;">
-<small><span style="font-family: monospace;"></span><span
- style="font-family: monospace;">&nbsp;-h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-high res test (27)</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">&nbsp;-u&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Ultra high res test (61)<br>
-&nbsp;-R res&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Specific grid
-resolution<br style="font-family: monospace;">
-</span><span style="font-family: monospace;">&nbsp;-c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Show CIE94 delta E values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">&nbsp;-k&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Show CIEDE2000 delta E values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">&nbsp;-w&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-create X3DOM visualisation (profile.x3d.html)</span><br
- style="font-family: monospace;">
-<span style="font-family: monospace;">&nbsp;-x&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Use X3DOM axes</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">&nbsp;-e&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Color vectors acording to delta E</span><br
- style="font-family: monospace;">
-<span style="font-style: italic; font-family: monospace;">&nbsp;profile.icm</span><span
- style="font-family: monospace;">&nbsp;
-Profile to check</span></small>
-<br>
-<h3>Usage Details and Discussion</h3>
-<b>invprofcheck</b> provides a way of checking how well an&nbsp;<a
- href="File_Formats.html#ICC">ICC</a> profile inverse transform inverts
-the forward transform. For devices with more than 4 channels, a total
-ink limit is assumed, and (if no <span style="font-weight: bold;">-l</span>
-parameter is given) a reasonable number is deduced from the reverse
-table. A grid of device values is created, and the transform from
-PCS-&gt;device, and then device-&gt;PCS is computed in L*a*b* space.
-The average, maximum and RMS error delta E values are computed and
-displayed in the chosen delta E metric. A <a
- href="File_Formats.html#X3DOM">X3DOM</a> plot of the error vectors can
-be created. <span style="font-weight: bold;">invprofcheck</span> tries
-to only test in-gamut color values. Note that because it scans a device
-grid, for a CMYK device, the density of test points will be
-progressively higher in the dark regions, and the average and RMS
-values will be distorted by the denser sampling.<br>
-<br>
-The <b>-v</b> flag prints out extra information during the checking. A
-value greater than 1 will print the color values of each test point.<br>
-<br>
-The <b>-l</b> flag allows setting a total ink limit (TAC) for printing
-devices. If a device has a total ink limit, and hasn't been
-characterised with device values above this limit, then plotting the
-gamut in these areas will almost certainly be misleading. The ink limit
-will be in final calibrated device values if the profile includes
-calibration information.<br>
-<br>
-The <b>-L</b> flag allows setting a black channel ink limit for
-printing
-devices. If a device has a black ink limit, and hasn't been
-characterised with device values above this limit, then plotting the
-gamut in these areas will almost certainly be misleading. The black ink
-limit
-will be final calibrated device values if the profile
-includes calibration information.<br>
-<br>
-The default device grid is relativy low, and 11 (ie. 11 x 11 x 11 for
-an RGB device, 11 x 11 x 11 x 11 for a CMYK device etc.).<br>
-<br>
-The <span style="font-weight: bold;">-h</span> flag selects a higher
-device grid resolution of 27.<br>
-<br>
-The <span style="font-weight: bold;">-u</span> flag selects an
-extremely high device grid resolution of 61. This will probably take a
-long time to run.<br>
-<br>
-The <span style="font-weight: bold;">-G res</span> option allows a
-specific grid resolution to be used.<br>
-<br>
-The <b>-c</b> option causes the error differences to be
-displayed
-in CIE94 delta E, rather than plain L*a*b* delta E. CIE94 delta E has a
-closer
-correspondence with perceived color differences than the default CIE76
-delta E values.<br>
-<br>
-The <b>-k</b> option causes the error differences to be
-displayed
-in CIEDE2000 delta E, rather than plain L*a*b* delta E. CIEDE2000 delta
-E has a
-closer
-correspondence with perceived color differences than either CIE76 or
-CIE94 delta E values.<br>
-<br>
-The <b>-w</b> creates a <a href="File_Formats.html#X3DOM">X3DOM</a> 3D
-visualization
-of the differences between the test points and the profiles prediction
-of
-the resulting colors.<br>
-<br>
-The <b>-x</b> flag adds Lab axes to the X3DOM output.<br>
-<br>
-The <span style="font-weight: bold;">-e</span> flag causes the error
-vectors in the X3DOM output to be color coded according to their
-lengths, from longest to shortest: yellow, red, magenta, blue, cyan and
-green.<br>
-<br>
-<br>
-<br>
-</body>
+  <head>
+    <title>invprofcheck</title>
+    <meta http-equiv="content-type" content="text/html;
+      charset=windows-1252">
+    <meta name="author" content="Graeme Gill">
+  </head>
+  <body>
+    <h2><b>profile/invprofcheck</b></h2>
+    <h3>Summary</h3>
+    Check <a href="File_Formats.html#ICC">ICC</a> forward against
+    reverse
+    lookup.
+    <br>
+    <h3>Usage Summary</h3>
+    <small><span style="font-family: monospace;">usage: invprofcheck
+        [-options] </span><span style="font-style: italic; font-family:
+        monospace;">profile.icm</span><br style="font-family:
+        monospace;">
+      <span style="font-family: monospace;">&nbsp;-v [level]&nbsp;&nbsp;
+        verbosity level (default 1), 2 to print each DE</span><br
+        style="font-family: monospace;">
+      <span style="font-family: monospace;">&nbsp;-l
+        limit&nbsp;&nbsp;&nbsp;&nbsp; set total ink
+        limit (estimate by default)<br>
+      </span></small><small><span style="font-family: monospace;">&nbsp;-L
+klimit
+        &nbsp;&nbsp; set black channel ink
+        limit (estimate by default)</span></small><br
+      style="font-family: monospace;">
+    <small><span style="font-family: monospace;"></span><span
+        style="font-family: monospace;">&nbsp;-h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+high
+        res test (27)</span><br style="font-family: monospace;">
+      <span style="font-family: monospace;">&nbsp;-u&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Ultra
+        high res test (61)<br>
+        &nbsp;-R res&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Specific grid
+        resolution<br>
+        &nbsp;-I&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        Do bwd to fwd check<br style="font-family: monospace;">
+      </span><span style="font-family: monospace;">&nbsp;-c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Show
+        CIE94 delta E values</span><br style="font-family: monospace;">
+      <span style="font-family: monospace;">&nbsp;-k&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Show
+        CIEDE2000 delta E values</span><br style="font-family:
+        monospace;">
+      <span style="font-family: monospace;">&nbsp;-w&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+create
+        X3DOM visualisation (profile.x3d.html)</span><br
+        style="font-family: monospace;">
+      <span style="font-family: monospace;">&nbsp;-x&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Use
+        X3DOM axes</span><br style="font-family: monospace;">
+      <span style="font-family: monospace;">&nbsp;-e&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Color
+        vectors acording to delta E</span><br style="font-family:
+        monospace;">
+      <span style="font-style: italic; font-family: monospace;">&nbsp;profile.icm</span><span
+        style="font-family: monospace;">&nbsp;
+        Profile to check</span></small>
+    <br>
+    <h3>Usage Details and Discussion</h3>
+    <b>invprofcheck</b> provides a way of checking how well an&nbsp;<a
+      href="File_Formats.html#ICC">ICC</a> profile inverse transform
+    inverts
+    the forward transform. For devices with more than 4 channels, a
+    total
+    ink limit is assumed, and (if no <span style="font-weight: bold;">-l</span>
+    parameter is given) a reasonable number is deduced from the reverse
+    table. A grid of device values is created, and the transform from
+    PCS-&gt;device, and then device-&gt;PCS is computed in L*a*b* space.
+    The average, maximum and RMS error delta E values are computed and
+    displayed in the chosen delta E metric. A <a
+      href="File_Formats.html#X3DOM">X3DOM</a> plot of the error vectors
+    can
+    be created. <span style="font-weight: bold;">invprofcheck</span>
+    tries
+    to only test in-gamut color values. Note that because it scans a
+    device
+    grid, for a CMYK device, the density of test points will be
+    progressively higher in the dark regions, and the average and RMS
+    values will be distorted by the denser sampling.<br>
+    <br>
+    The <b>-v</b> flag prints out extra information during the
+    checking. A
+    value greater than 1 will print the color values of each test point.<br>
+    <br>
+    The <b>-l</b> flag allows setting a total ink limit (TAC) for
+    printing
+    devices. If a device has a total ink limit, and hasn't been
+    characterised with device values above this limit, then plotting the
+    gamut in these areas will almost certainly be misleading. The ink
+    limit
+    will be in final calibrated device values if the profile includes
+    calibration information.<br>
+    <br>
+    The <b>-L</b> flag allows setting a black channel ink limit for
+    printing
+    devices. If a device has a black ink limit, and hasn't been
+    characterised with device values above this limit, then plotting the
+    gamut in these areas will almost certainly be misleading. The black
+    ink
+    limit
+    will be final calibrated device values if the profile
+    includes calibration information.<br>
+    <br>
+    The default device grid is relativy low, and 11 (ie. 11 x 11 x 11
+    for
+    an RGB device, 11 x 11 x 11 x 11 for a CMYK device etc.).<br>
+    <br>
+    The <span style="font-weight: bold;">-h</span> flag selects a
+    higher
+    device grid resolution of 27.<br>
+    <br>
+    The <span style="font-weight: bold;">-u</span> flag selects an
+    extremely high device grid resolution of 61. This will probably take
+    a
+    long time to run.<br>
+    <br>
+    The <span style="font-weight: bold;">-G res</span> option allows a
+    specific grid resolution to be used.<br>
+    <br>
+    If the <b>-I</b> option is used, then the grid is in L*a*b* space,
+    so out of gamut clipping behavior can be examined. Delta E's will be
+    high due to the clipping.<br>
+    <br>
+    The <b>-c</b> option causes the error differences to be
+    displayed
+    in CIE94 delta E, rather than plain L*a*b* delta E. CIE94 delta E
+    has a
+    closer
+    correspondence with perceived color differences than the default
+    CIE76
+    delta E values.<br>
+    <br>
+    The <b>-k</b> option causes the error differences to be
+    displayed
+    in CIEDE2000 delta E, rather than plain L*a*b* delta E. CIEDE2000
+    delta
+    E has a
+    closer
+    correspondence with perceived color differences than either CIE76 or
+    CIE94 delta E values.<br>
+    <br>
+    The <b>-w</b> creates a <a href="File_Formats.html#X3DOM">X3DOM</a>
+    3D
+    visualization
+    of the differences between the test points and the profiles
+    prediction
+    of
+    the resulting colors.<br>
+    <br>
+    The <b>-x</b> flag adds Lab axes to the X3DOM output.<br>
+    <br>
+    The <span style="font-weight: bold;">-e</span> flag causes the
+    error
+    vectors in the X3DOM output to be color coded according to their
+    lengths, from longest to shortest: yellow, red, magenta, blue, cyan
+    and
+    green.<br>
+    <br>
+    <br>
+    <br>
+  </body>
 </html>
diff --git a/doc/kodak2ti3.html b/doc/kodak2ti3.html
index 5485506..5485506 100644..100755
--- a/doc/kodak2ti3.html
+++ b/doc/kodak2ti3.html
diff --git a/doc/monitorcontrols.html b/doc/monitorcontrols.html
index 83ab695..83ab695 100644..100755
--- a/doc/monitorcontrols.html
+++ b/doc/monitorcontrols.html
diff --git a/doc/mox.jpg b/doc/mox.jpg
index f3c7166..f3c7166 100644..100755
--- a/doc/mox.jpg
+++ b/doc/mox.jpg
diff --git a/doc/moxxr.jpg b/doc/moxxr.jpg
index 579d7fc..579d7fc 100644..100755
--- a/doc/moxxr.jpg
+++ b/doc/moxxr.jpg
diff --git a/doc/mppcheck.html b/doc/mppcheck.html
index cd44989..cd44989 100644..100755
--- a/doc/mppcheck.html
+++ b/doc/mppcheck.html
diff --git a/doc/mpplu.html b/doc/mpplu.html
index 8d4e755..8d4e755 100644..100755
--- a/doc/mpplu.html
+++ b/doc/mpplu.html
diff --git a/doc/mppprof.html b/doc/mppprof.html
index 5446451..5446451 100644..100755
--- a/doc/mppprof.html
+++ b/doc/mppprof.html
diff --git a/doc/oeminst.html b/doc/oeminst.html
index d1daccd..d1daccd 100644..100755
--- a/doc/oeminst.html
+++ b/doc/oeminst.html
diff --git a/doc/printcal.html b/doc/printcal.html
index 89264c5..89264c5 100644..100755
--- a/doc/printcal.html
+++ b/doc/printcal.html
diff --git a/doc/printtarg.html b/doc/printtarg.html
index 0d86cac..0d86cac 100644..100755
--- a/doc/printtarg.html
+++ b/doc/printtarg.html
diff --git a/doc/profcheck.html b/doc/profcheck.html
index a85e07e..a85e07e 100644..100755
--- a/doc/profcheck.html
+++ b/doc/profcheck.html
diff --git a/doc/refine.html b/doc/refine.html
index 36a0ae4..36a0ae4 100644..100755
--- a/doc/refine.html
+++ b/doc/refine.html
diff --git a/doc/revfix.html b/doc/revfix.html
index 4892de2..4892de2 100644..100755
--- a/doc/revfix.html
+++ b/doc/revfix.html
diff --git a/doc/scanin.html b/doc/scanin.html
index 96d3cc2..96d3cc2 100644..100755
--- a/doc/scanin.html
+++ b/doc/scanin.html
diff --git a/doc/sl.jpg b/doc/sl.jpg
index aaf330f..aaf330f 100644..100755
--- a/doc/sl.jpg
+++ b/doc/sl.jpg
diff --git a/doc/spec2cie.html b/doc/spec2cie.html
index d25b0a0..7911948 100644..100755
--- a/doc/spec2cie.html
+++ b/doc/spec2cie.html
@@ -16,6 +16,7 @@
     <tt><small>spec2cie [options] <span style="font-style: italic;">input.ti3
 
 
+
           output.ti3<br>
           &nbsp;</span></small></tt><tt><small>-v
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -23,6 +24,7 @@
     <tt><small><small>&nbsp;<a href="spec2cie.html#I">-I <i>illum</i></a>&nbsp;&nbsp;
 
 
+
           &nbsp;&nbsp; Override actual instrument illuminant in .ti3
           file:<br>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -31,6 +33,7 @@
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
           (only used in conjunction with <span style="font-weight:
             bold;">-f</span>)<br>
         </small></small></tt><tt><small><small>&nbsp;<a
@@ -40,6 +43,7 @@
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
           M0, M1, M2, A, C, D50 (def.), D50M2, D65, F5, F8, F10 or
           file.sp]<br>
         </small></small></tt><tt><small><small><small>&nbsp;<a
@@ -52,19 +56,22 @@
             &nbsp;</small></small><a href="#o">-o <i>observ</i></a>&nbsp;
 
 
+
         &nbsp;&nbsp; Choose CIE Observer for spectral data:<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;
 &nbsp;&nbsp;
 
 
+
         1931_2 </small></tt><tt><small> (def.)</small></tt><tt><small>,
-        1964_10, S&amp;B 1955_2, shaw, J&amp;V 1978_2<br>
+        1964_10, S&amp;B 1955_2, shaw, J&amp;V 1978_2 or file.cmf<br>
         &nbsp;<a href="#p">-n</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Don't
 output
 
 
+
         spectral values<br>
       </small></tt><tt><small>&nbsp;<a href="#p">-p</a>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -73,10 +80,12 @@ output
 Measurement
 
 
+
         file<br>
         &nbsp;<span style="font-style: italic;">output.ti3</span>&nbsp;&nbsp;&nbsp;&nbsp;
 
 
+
         Converted measurement file</small></tt><br>
     <h3>Comments</h3>
     This program takes the (usually reflective) spectral data in a .ti3
@@ -129,6 +138,7 @@ Measurement
     computation illuminant used for FWA (see <b>-i</b> below<b>). </b>See
 
 
+
     <a href="colprof.html#f">colprof -f</a> for a fuller explanation. <br>
     <br>
     <a name="i"></a>The <b>-i</b> parameter allows specifying a
@@ -185,6 +195,8 @@ Measurement
     &nbsp; <b>shaw</b> selects the Shaw and Fairchild 1997 2 degree
     observer<br>
     <br>
+    or a .cmf file can be provided as an argument.<br>
+    <br>
     Note that if an observer other than 1931 2 degree is chosen, the
     resulting ICC profile will not be standard, and cannot be freely
     interchanged with other profiles that that us the standard 1931 2
diff --git a/doc/specplot.html b/doc/specplot.html
index 05b260b..45c9f72 100644..100755
--- a/doc/specplot.html
+++ b/doc/specplot.html
@@ -3,36 +3,42 @@
   <head>
     <title>specplot</title>
     <meta http-equiv="content-type" content="text/html;
-      charset=ISO-8859-1">
+      charset=windows-1252">
     <meta name="author" content="Graeme Gill">
   </head>
   <body>
     <h2><b>xicc/specplot</b></h2>
     <h3>Summary</h3>
     A simple tool to plot spectrum files (.sp, .cmf, .ccss etc.), and
-    compute the&nbsp; CCT and VCT, CRI, XYZ, x,y and L*a*b* values.<br>
+    compute the&nbsp; CCT and VCT, CRI, TLCI, XYZ, x,y and L*a*b*
+    values.<br>
     <h3>Usage summary<br>
     </h3>
     <tt><small>specplot [<span style="font-style: italic;">infile1.sp,
           infile2.sp, ...</span>]</small></tt><tt><br>
     </tt><tt>&nbsp;-v&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
       verbose</tt><tt><br>
     </tt><tt>&nbsp;-c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
       combine multiple files into one plot</tt><tt><br>
     </tt><tt>&nbsp;-z&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 don't
+
       make range cover zero</tt><tt><br>
     </tt><tt>&nbsp;-u
       level&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; plot effect
       of adding estimated UV level</tt><tt><br>
     </tt><tt>&nbsp;-U&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
       plot effect of adding range of estimated UV level</tt><tt><br>
     </tt><tt>&nbsp;[infile.sp ...]&nbsp; spectrum files to plot</tt><tt><br>
     </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
       default is all built in illuminants</tt><br>
     <h3></h3>
     <h3>Usage Details and Discussion</h3>
diff --git a/doc/splitti3.html b/doc/splitti3.html
index 05bad37..05bad37 100644..100755
--- a/doc/splitti3.html
+++ b/doc/splitti3.html
diff --git a/doc/spotread.html b/doc/spotread.html
index f3964f5..3fe030f 100644..100755
--- a/doc/spotread.html
+++ b/doc/spotread.html
@@ -46,6 +46,7 @@
 
 
 
+
         &nbsp; &nbsp; &nbsp; Verbose mode</span><br style="font-family:
         monospace;">
       <span style="font-family: monospace;"></span><span
@@ -78,6 +79,7 @@
 
 
 
+
         &nbsp; &nbsp; &nbsp; Print spectrum for each reading.</span></small><br
       style="font-family: monospace;">
     <small><span style="font-family: monospace;"></span><span
@@ -115,6 +117,7 @@
 
 
 
+
         Set COM port, 1..4 (default 1)</span><span style="font-family:
         monospace;"></span><span style="font-family: monospace;"><br
           style="font-family: monospace;">
@@ -146,6 +149,7 @@
 
 
 
+
         &nbsp; &nbsp; &nbsp; Use transmission measurement mode</span><br
         style="font-family: monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a style="
@@ -177,6 +181,7 @@
 
 
 
+
         Use emissive measurement mode (absolute results)<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#eb">-eb</a><span
@@ -207,6 +212,7 @@
 
 
 
+
         Use display white brightness relative measurement mode<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#ew">-ew</a><span
@@ -220,6 +226,7 @@
 
 
 
+
         Use display white point relative chromatically adjusted mode<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#p">-p</a><span
@@ -250,6 +257,7 @@
 
 
 
+
         Use telephoto measurement mode (absolute results)<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#pb">-pb</a><span
@@ -280,6 +288,7 @@
 
 
 
+
         Use </span></small><small><span style="font-family: monospace;">projector</span></small><small><span
         style="font-family: monospace;"> white brightness relative
         measurement mode<br>
@@ -312,6 +321,7 @@
 
 
 
+
         Use </span></small><small><span style="font-family: monospace;">projector</span></small><small><span
         style="font-family: monospace;"> </span></small><small><span
         style="font-family: monospace;">white point relative
@@ -345,6 +355,7 @@
 
 
 
+
         Use ambient measurement mode (absolute results)<br>
         &nbsp;<a href="#f">-f</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -372,6 +383,7 @@
 
 
 
+
         Use ambient flash measurement mode (absolute results)<br>
       </span></small><font size="-1"><span style="font-family:
         monospace;">&nbsp;<a href="#y">-y X</a>
@@ -401,6 +413,7 @@
 
 
 
+
         Display type - instrument specific list to choose from.</span></font><br>
     <small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="spotread.html#I">-I illum</a><span
@@ -428,6 +441,7 @@ M0,
 
 
 
+
         M1, M2, A, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp</span></small><br
       style="font-family: monospace;">
     <small><span style="font-family: monospace;"></span><span
@@ -472,6 +486,7 @@ D50
 
 
 
+
         D50M2, D65, F5, F8, F10 or file.sp</span><br style="font-family:
         monospace;">
       <span style="font-family: monospace;">&nbsp;</span><a style="
@@ -506,6 +521,7 @@ D50
 
 
 
+
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; </span></small><small><span
         style="font-family: monospace;">1931_2 </span></small><small><span
         style="font-family: monospace;"> (def.)</span></small><small><span
@@ -539,6 +555,7 @@ D50
 
 
 
+
         Set filter configuration:<br>
         &nbsp;&nbsp;
         n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -567,6 +584,7 @@ D50
 
 
 
+
         None<br>
         &nbsp;&nbsp;
         p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -595,6 +613,7 @@ D50
 
 
 
+
         Polarising filter<br>
         &nbsp;&nbsp;
         6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -623,6 +642,7 @@ D50
 
 
 
+
         D65<br>
         &nbsp;&nbsp;
         u&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -651,6 +671,7 @@ D50
 
 
 
+
         U.V. Cut<br>
         &nbsp;<a href="#E">-E extrafilterfile</a>&nbsp;&nbsp;&nbsp;
         Apply extra filter compensation file<br>
@@ -682,6 +703,7 @@ D50
 
 
 
+
         Display Yxy instead of Lab<br>
       </span></font><font size="-1"><span style="font-family:
         monospace;">&nbsp;<a href="#h">-h</a>
@@ -711,6 +733,7 @@ D50
 
 
 
+
         Display LCh instead of Lab</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
           href="#V">-V</a>
@@ -740,6 +763,7 @@ D50
 
 
 
+
         Show running average and std. devation from ref.</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
           href="#T">-T</a>
@@ -769,7 +793,8 @@ D50
 
 
 
-        Display correlated color temperatures and CRI<br>
+
+        Display correlated color temperatures, CRI and TLCI<br>
       </span></font><font size="-1"><span style="font-family:
         monospace;">&nbsp;<a href="#N">-N</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -797,6 +822,7 @@ D50
 
 
 
+
         Disable initial calibration of instrument if possible</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;<a
           href="spotread.html#O">-O</a>
@@ -826,6 +852,7 @@ D50
 
 
 
+
         Do one cal. or measure and exit</span></font><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#H">-H</a><span
@@ -860,6 +887,7 @@ D50
 
 
 
+
         Apply Colorimeter Correction Matrix</span></font><br>
     <span style="font-family: monospace;">&nbsp;<a href="#X2">-X
         file.ccss</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -893,6 +921,7 @@ Samples
 
 
 
+
       for calibration</span><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#Yrn">-<font size="-1">Y</font>
@@ -915,6 +944,7 @@ Samples
 
 
 
+
         &nbsp;&nbsp;&nbsp;&nbsp; Override refresh, non-refresh display
         mode</span></font><br>
     <tt>&nbsp;<a href="#YR">-Y R:<i>rate</i></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -927,6 +957,7 @@ Samples
 
 
 
+
       Override measured refresh rate with rate Hz</tt><br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
         style=" font-family: monospace;" href="#YA">-<font size="-1">Y </font>A</a><span
@@ -969,6 +1000,7 @@ none,
 
 
 
+
         h = HW, x = Xon/Xoff</span></font><br>
     <small><span style="font-family: monospace;">&nbsp;</span><a style="
         font-family: monospace;" href="#D">-D [level]</a><span
@@ -1002,6 +1034,7 @@ none,
 
 
 
+
         Optional file to save reading results<br style="font-family:
           monospace;">
       </span></font><small><span style="font-family: monospace;"></span><span
@@ -1059,6 +1092,7 @@ none,
 
 
 
+
             &nbsp;&nbsp; <br>
           </td>
         </tr>
@@ -1190,9 +1224,11 @@ none,
     during <u>measurement</u>, overriding the default <b>D50</b> or
     CIE computation illuminant used for FWA (see <b>-i</b> below<b>). </b>If
 
+
     using <b>M0</b>, <b>M1</b> or <b>M2</b>, then the <b>-i</b>
     option is <b>not</b> normally used. See <a href="colprof.html#f">colprof
 
+
       -f</a> for a fuller explanation. <br>
     <br>
     <a name="i"></a>The <b>-i</b> parameter allows specifying a
@@ -1263,12 +1299,12 @@ none,
     CIEDE2000 error to the measured color. The last is the daylight
     color that has a minimum CIEDE2000 error to the measured color. The
     delta E between the closest temperature and the measured color is
-    also shown for each. The Color Rendering Index (CRI Ra) is also
-    computed if the instrument is capable of spectral measurement. If
-    the notation <span style="font-weight: bold;">(Invalid)</span> is
-    displayed after the CRI, then this means that the the spectrum white
-    point is to far from the black body and Daylight locus to be
-    meaningful.<br>
+    also shown for each. The Color Rendering Index (CRI Ra) including
+    the R9 value, plus the TLCI (Qa) is also computed if the instrument
+    is capable of spectral measurement. If the notation <span
+      style="font-weight: bold;">(Invalid)</span> is displayed after the
+    CRI or TLCI, then this means that the the spectrum white point is to
+    far from the black body and Daylight locus to be meaningful.<br>
     <br>
     <a name="N"></a> <span style="font-weight: bold;">-N</span> Any
     instrument that requires regular calibration will ask for
@@ -1306,35 +1342,11 @@ none,
     colorimeter instruments calibration. This will only work with
     colorimeters that rely on sensor spectral sensitivity calibration
     information (ie. the X-Rite <span style="font-weight: bold;">i1d3</span>,
-    or the DataColor <span style="font-weight: bold;">Spyder4</span>).This
-can
-improve
-a
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    colorimeters accuracy for a particular type of display.<br>
+    or the DataColor <span style="font-weight: bold;">Spyder4 &amp;
+      Spyder5</span>).This
+    can
+    improve
+    a colorimeters accuracy for a particular type of display.<br>
     <br>
     <a name="Yrn"></a> The -<span style="font-weight: bold;">Y r </span>and
 
@@ -1354,6 +1366,7 @@ a
 
 
 
+
     <b>-Y n</b> options overrides the refresh display mode set by the <a
       href="#y">-y display type selection</a>, with <b>-Y</b><span
       style="font-weight: bold;"> r</span> forcing refresh display mode,
diff --git a/doc/srgbplot.gif b/doc/srgbplot.gif
index 6226a97..6226a97 100644..100755
--- a/doc/srgbplot.gif
+++ b/doc/srgbplot.gif
diff --git a/doc/ss.jpg b/doc/ss.jpg
index 93875a5..93875a5 100644..100755
--- a/doc/ss.jpg
+++ b/doc/ss.jpg
diff --git a/doc/surface.jpg b/doc/surface.jpg
index cf412fb..cf412fb 100644..100755
--- a/doc/surface.jpg
+++ b/doc/surface.jpg
diff --git a/doc/synthcal.html b/doc/synthcal.html
index 89f3fed..89f3fed 100644..100755
--- a/doc/synthcal.html
+++ b/doc/synthcal.html
diff --git a/doc/synthread.html b/doc/synthread.html
index 116a43d..116a43d 100644..100755
--- a/doc/synthread.html
+++ b/doc/synthread.html
diff --git a/doc/targen.html b/doc/targen.html
index 3aa1bb4..3aa1bb4 100644..100755
--- a/doc/targen.html
+++ b/doc/targen.html
diff --git a/doc/ti3_format.html b/doc/ti3_format.html
index c42a124..38a1eb7 100644..100755
--- a/doc/ti3_format.html
+++ b/doc/ti3_format.html
@@ -3,7 +3,7 @@
   <head>
     <title>Target Information 3 Format File (.ti3)</title>
     <meta http-equiv="content-type" content="text/html;
-      charset=ISO-8859-1">
+      charset=windows-1252">
     <meta name="author" content="Graeme Gill">
   </head>
   <body>
@@ -55,10 +55,16 @@
     There shall be a <span style="font-weight: bold;">DEVICE_CLASS</span>
     keyword that has a value of <span style="font-weight: bold;">"OUTPUT</span>",
 
-    "<span style="font-weight: bold;">DISPLAY</span>" or <span
-      style="font-weight: bold;">"INPUT"</span>.<br>
+
+
+    "<span style="font-weight: bold;">DISPLAY</span>",&nbsp; <span
+      style="font-weight: bold;">"INPUT"</span> or <span
+      style="font-weight: bold;">"EMISINPUT"</span>.<br>
     This indicates to the profile program what type of device the color
-    information is from.<br>
+    information is from. (An OUTPUT device is typically a printer. An
+    INPUT device is typically a Scanner or Camera with data from a
+    reflective reference chart. An EMISINPUT is a camera with emissive
+    reference data. ).<br>
     <br>
     An <span style="font-weight: bold;">"OUTPUT"</span> type device may
     have a <span style="font-weight: bold;">TOTAL_INK_LIMIT</span>
@@ -73,6 +79,8 @@
     keyword that contains the absolute XYZ value of white in candelas
     per meter squared, e.g. <span style="font-weight: bold;">"112.334770
 
+
+
       119.657745 121.474236".<br>
       <br>
     </span>A display device may also have a <span style="font-weight:
@@ -93,32 +101,36 @@
     This is used by the profiling program to determine the spectral
     characteristics of the instrument illuminant if Fluorescent Whitener
     Compensation is desired. The value shall be one of:<br>
-    <br>
-    <b>&nbsp;&nbsp;&nbsp; "Xrite DTP20"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Xrite DTP22"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Xrite DTP41"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Xrite DTP51"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Xrite DTP92"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Xrite DTP94"</b><b><br>
-    </b><b> &nbsp;&nbsp; "GretagMacbeth Spectrolino"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "GretagMacbeth SpectroScan"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "GretagMacbeth SpectroScanT"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Spectrocam"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "GretagMacbeth i1 Display 1"</b><b><br>
-    </b><b>&nbsp;&nbsp;&nbsp; "GretagMacbeth i1 Display 2"</b><b><br>
-    </b><b>&nbsp;&nbsp;&nbsp; "Xrite i1 DisplayPro, ColorMunki Display"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "GretagMacbeth i1 Monitor"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "GretagMacbeth i1 Pro"</b><b><br>
-    </b><b>&nbsp;&nbsp;&nbsp; "X-Rite i1 Pro 2"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "X-Rite ColorMunki"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Colorimtre HCFR"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "ColorVision Spyder2"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "Datacolor Spyder3"</b><b><br>
-    </b><b>&nbsp;&nbsp;&nbsp; "Datacolor Spyder4"</b><b><br>
-    </b><b> &nbsp;&nbsp;&nbsp; "GretagMacbeth Huey"</b><b><br>
-    </b><b>&nbsp;&nbsp;&nbsp; "ColorMunki Smile"</b><b><br>
-    </b><b>&nbsp;&nbsp;&nbsp; "Hughski ColorHug"</b><br>
-    <br>
+    <blockquote> <b>"X-Rite DTP20"</b><br>
+      <b>"X-Rite DTP22"</b><br>
+      <b>"X-Rite DTP41"</b><br>
+      <b>"X-Rite DTP51"</b><br>
+      <b>"X-Rite DTP92"</b><br>
+      <b>"X-Rite DTP94"</b><br>
+      <b>"GretagMacbeth Spectrolino"</b><br>
+      <b>"GretagMacbeth SpectroScan"</b><br>
+      <b>"GretagMacbeth SpectroScanT"</b><br>
+      <b>"Spectrocam"</b><br>
+      <b>"GretagMacbeth i1 Display 1"</b><br>
+      <b>"GretagMacbeth i1 Display 2"</b><br>
+      <b>"X-Rite i1 DisplayPro, ColorMunki Display"</b><br>
+      <b>"GretagMacbeth i1 Monitor"</b><br>
+      <b>"GretagMacbeth i1 Pro"</b><br>
+      <b>"X-Rite i1 Pro 2"</b><br>
+      <b>"X-Rite ColorMunki"</b><br>
+      <b>"Colorimtre HCFR"</b><br>
+      <b>"ColorVision Spyder1"</b><br>
+      <b>"ColorVision Spyder2"</b><br>
+      <b>"Datacolor Spyder3"</b><br>
+      <b>"Datacolor Spyder4"</b><br>
+      <b>"Datacolor Spyder5"</b><br>
+      <b>"GretagMacbeth Huey"</b><br>
+      <b>"ColorMunki Smile"</b><br>
+      <b>"JETI specbos 1201"</b><br>
+      <b>"JETI specbos"</b><br>
+      <b>"Klein K-10"</b><br>
+      <b>"Image Engineering EX1"</b><br>
+    </blockquote>
     All instruments except the Spectrocam are assumed to have an "A"
     type illuminant (incandescent lamp of&nbsp; 2850 degrees Kelvin.)<br>
     <br>
@@ -157,35 +169,51 @@
     <span style="font-weight: bold;"><span style="font-weight: bold;"></span></span>&nbsp;&nbsp;&nbsp;
 Cyan
 
+
+
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     C<br>
     &nbsp;&nbsp;&nbsp; Magenta &nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;
     &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;&nbsp; M<br>
     &nbsp;&nbsp;&nbsp; Yellow &nbsp; &nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     Y<br>
     &nbsp;&nbsp;&nbsp; Black &nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     K<br>
     &nbsp;&nbsp;&nbsp; Orange &nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     O<br>
     &nbsp;&nbsp;&nbsp; Red
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     R<br>
     &nbsp;&nbsp;&nbsp; Green &nbsp; &nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     G<br>
     &nbsp;&nbsp;&nbsp; Blue &nbsp;&nbsp; &nbsp;&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     B<br>
     &nbsp;&nbsp;&nbsp; White &nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;
@@ -193,18 +221,26 @@ Cyan
     &nbsp;&nbsp;&nbsp; Light Cyan
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     c<br>
     &nbsp;&nbsp;&nbsp; Light
     Magenta&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     m<br>
     &nbsp;&nbsp;&nbsp; Light
     Yellow&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     y<br>
     &nbsp;&nbsp;&nbsp; Light
     Black&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
     k<br>
     &nbsp;&nbsp;&nbsp; Medium Cyan&nbsp;
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2c<br>
diff --git a/doc/tiffgamut.html b/doc/tiffgamut.html
index 6aea52d..6aea52d 100644..100755
--- a/doc/tiffgamut.html
+++ b/doc/tiffgamut.html
diff --git a/doc/timage.html b/doc/timage.html
index 2daed27..2daed27 100644..100755
--- a/doc/timage.html
+++ b/doc/timage.html
diff --git a/doc/txt2ti3.html b/doc/txt2ti3.html
index 0fc467d..0fc467d 100644..100755
--- a/doc/txt2ti3.html
+++ b/doc/txt2ti3.html
diff --git a/doc/ucmm.html b/doc/ucmm.html
index 31d95cb..31d95cb 100644..100755
--- a/doc/ucmm.html
+++ b/doc/ucmm.html
diff --git a/doc/viewgam.html b/doc/viewgam.html
index 9c3e3f0..9c3e3f0 100644..100755
--- a/doc/viewgam.html
+++ b/doc/viewgam.html
diff --git a/doc/xicclu.html b/doc/xicclu.html
index cf572fe..cf572fe 100644..100755
--- a/doc/xicclu.html
+++ b/doc/xicclu.html