Merge new upstream release

1 files changed, 49 insertions, 36 deletions

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,