Merge branch 'release/2.0.0+repack-1'2.0.0+repack-1

1 files changed, 83 insertions, 4 deletions

diff --git a/doc/chartread.html b/doc/chartread.html
index 19f4add..e39b936 100644..100755
--- a/doc/chartread.html
+++ b/doc/chartread.html
@@ -30,6 +30,9 @@ 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
@@ -48,6 +51,9 @@ transmission
 
 
 
+
+
+
         measurement mode<br>
       </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#d">-d</a><span
@@ -62,6 +68,9 @@ measurement
 
 
 
+
+
+
         mode (white Y relative results)</span></small><small><span
         style="font-family: monospace;"></span></small><small><span
         style="font-family: monospace;"><br>
@@ -74,6 +83,9 @@ measurement
 
 
 
+
+
+
         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
@@ -87,6 +99,9 @@ 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
@@ -101,6 +116,9 @@ 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
@@ -109,6 +127,9 @@ Take
 
 
 
+
+
+
         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
@@ -123,6 +144,9 @@ 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
@@ -144,6 +168,9 @@ partly
 
 
 
+
+
+
         read chart<br>
         &nbsp;<a href="#I">-I</a>
         file.cal&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Override
@@ -156,6 +183,9 @@ partly
 
 
 
+
+
+
         Set filter configuration:<br>
         &nbsp;
         n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -165,6 +195,9 @@ partly
 
 
 
+
+
+
         None<br>
         &nbsp;
         p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -174,6 +207,9 @@ partly
 
 
 
+
+
+
         Polarising filter<br>
         &nbsp;
         6&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -183,6 +219,9 @@ partly
 
 
 
+
+
+
         D65<br>
         &nbsp;
         u&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -192,11 +231,17 @@ partly
 
 
 
+
+
+
         U.V. Cut</span></font><small><span style="font-family:
         monospace;"></span><span style="font-family: monospace;"></span></small><br>
     &nbsp; <font size="-1"><span style="font-family: monospace;"><a
           href="#A">-A N|A|X|G</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+
+
+
         XRGA conversion</span></font> (default N)<br>
     <font size="-1"><span style="font-family: monospace;">&nbsp;</span><a
         style="font-family: monospace;" href="#N">-N</a><span
@@ -224,6 +269,9 @@ 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;
@@ -239,6 +287,9 @@ Samples
 
 
 
+
+
+
       for calibration</span><br>
     <small><span style="font-family: monospace;">&nbsp;</span><a style="
         font-family: monospace;" href="#Q">-Q observ</a><span
@@ -254,12 +305,17 @@ 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
-        style="font-family: monospace;">, 1964_10, S&amp;B 1955_2, shaw,
-        J&amp;V 1978_2</span></small><small><span style="font-family:
-        monospace;"></span></small><font size="-1"><span
+        style="font-family: monospace;">, 1964_10, </span></small><small><span
+        style="font-family: monospace;"><tt><small>2012_2, 2012_10, </small></tt>S&amp;B
+
+        1955_2, shaw, J&amp;V 1978_2 or file.cmf</span></small><small><span
+        style="font-family: monospace;"></span></small><font size="-1"><span
         style="font-family: monospace;"></span></font><br>
     <font size="-1"><span style="font-family: monospace;"> &nbsp;<a
           href="#T">-T ratio</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -272,6 +328,9 @@ 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;
@@ -284,6 +343,9 @@ 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;
@@ -294,6 +356,9 @@ 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
@@ -309,6 +374,9 @@ Override
 
 
 
+
+
+
         &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
@@ -458,6 +526,9 @@ Override
 
 
 
+
+
+
       -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>
@@ -531,7 +602,9 @@ Override
     information (ie. the X-Rite <span style="font-weight: bold;">i1d3</span>,
     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>
+    particular type of display. A list of contributed <span
+      style="font-weight: bold;">ccss</span> files is <a
+      href="ccsss.html">here</a>.<br>
     <br>
     <a name="T"></a> The -<span style="font-weight: bold;">T ratio</span>
     argument modifies the patch consistency tolerance threshold for some
@@ -553,12 +626,18 @@ Override
     observer. The default.<br>
     &nbsp; <b>1964_10</b> selects the standard CIE 1964 10 degree
     observer.<br>
+    <b>&nbsp; 2012_2</b> selects the proposed CIE 2012 2 degree
+    observer.<br>
+    &nbsp; <b>2012_10</b> selects the proposed CIE 2012 10 degree
+    observer.<br>
     &nbsp; <b>1955_2</b> selects the Stiles and Birch 1955 2 degree
     observer<br>
     &nbsp; <b>1978_2 </b>selects the Judd and Voss 1978 2 degree
     observer<br>
     &nbsp; <b>shaw</b> selects the Shaw and Fairchild 1997 2 degree
     observer<br>
+    &nbsp; <i><b>file.cmf</b></i> selects an observer specified by the
+    given <a href="File_Formats.html#.cmf">.cmf</a> file.<br>
     <br>
     <a name="S"></a>The <b>-S</b> flag causes the normal "wrong strip"
     and "unexpected value" warnings to be suppressed. There may be a lot