Updated version 1.9.1+repack from 'upstream/1.9.1+repack'

with Debian dir 98a996367aa69ae41accf9c6d369f600bc94de80

6 files changed, 797 insertions, 279 deletions

diff --git a/ref/CMP_Digital_Target-7.cht b/ref/CMP_Digital_Target-7.cht
new file mode 100644
index 0000000..d188517
--- /dev/null
+++ b/ref/CMP_Digital_Target-7.cht
@@ -0,0 +1,638 @@
+
+BOXES 571
+  F _ _ 100 200 3100 200 3100 2100 100 2100
+  D ALL ALL _ _ 3200 2100 0 100 0 0
+  X A Z   1 19 100 100 100 200 100 100
+  X 2A 2D 1 19 100 100 2700 200 100 100
+
+BOX_SHRINK 12
+
+REF_ROTATION 0.0
+
+XLIST 31
+  100 1 1
+  200 1 1
+  300 1 1
+  400 1 1
+  500 1 1
+  600 1 1
+  700 1 1
+  800 1 1
+  900 1 1
+  1000 1 1
+  1100 1 1
+  1200 1 1
+  1300 1 1
+  1400 1 1
+  1500 1 1
+  1600 1 1
+  1700 1 1
+  1800 1 1
+  1900 1 1
+  2000 1 1
+  2100 1 1
+  2200 1 1
+  2300 1 1
+  2400 1 1
+  2500 1 1
+  2600 1 1
+  2700 1 1
+  2800 1 1
+  2900 1 1
+  3000 1 1
+  3100 1 1
+
+YLIST 21
+  200 1 1
+  300 1 1
+  400 1 1
+  500 1 1
+  600 1 1
+  700 1 1
+  800 1 1
+  900 1 1
+  1000 1 1
+  1100 1 1
+  1200 1 1
+  1300 1 1
+  1400 1 1
+  1500 1 1
+  1500 1 1
+  1600 1 1
+  1700 1 1
+  1800 1 1
+  1900 1 1
+  2000 1 1
+  2100 1 1
+
+EXPECTED XYZ 570
+  A1  31.9  22.6  21.2
+  A2  7.6  21.5  7.5
+  A3  72.2  69.4  57.8
+  A4  20.9  34.4  14.4
+  A5  79.8  83.0  57.4
+  A6  37.7  36.5  30.8
+  A7  13.6  14.4  45.1
+  A8  65.7  60.9  23.2
+  A9  24.7  16.2  33.1
+  A10  2.5  1.4  7.6
+  A11  31.1  15.9  1.3
+  A12  29.7  32.5  50.3
+  A13  10.4  15.3  28.4
+  A14  18.4  28.1  7.1
+  A15  12.1  19.0  18.5
+  A16  29.9  47.3  21.8
+  A17  19.8  14.3  30.7
+  A18  41.8  24.4  1.5
+  A19  12.1  11.0  36.1
+  B1  20.9  13.2  29.7
+  B2  8.7  8.5  34.4
+  B3  2.3  1.5  2.4
+  B4  20.0  15.3  37.2
+  B5  15.5  8.4  1.2
+  B6  40.6  22.0  28.0
+  B7  16.3  33.2  10.0
+  B8  9.0  23.6  7.5
+  B9  46.9  62.0  25.3
+  B10  5.0  12.8  6.1
+  B11  16.1  8.4  16.3
+  B12  41.6  57.7  10.6
+  B13  13.9  9.9  28.1
+  B14  30.7  18.0  29.8
+  B15  27.9  13.9  17.4
+  B16  34.8  18.3  1.3
+  B17  16.0  32.5  17.9
+  B18  77.1  81.7  62.3
+  B19  42.7  29.8  12.1
+  C1  17.0  34.3  13.1
+  C2  25.7  13.2  1.4
+  C3  32.5  50.1  22.9
+  C4  16.0  18.7  1.6
+  C5  32.6  32.1  54.2
+  C6  13.4  16.4  47.5
+  C7  12.8  10.1  31.5
+  C8  41.0  37.8  1.7
+  C9  40.0  29.0  36.6
+  C10  26.8  31.3  1.9
+  C11  3.5  9.5  2.3
+  C12  9.1  7.9  31.1
+  C13  18.4  28.5  2.7
+  C14  7.2  7.6  35.4
+  C15  18.9  33.4  39.7
+  C16  44.9  39.1  13.4
+  C17  2.4  1.7  9.2
+  C18  45.9  31.4  42.3
+  C19  2.0  4.2  1.5
+  D1  3.5  2.7  17.7
+  D2  19.4  21.4  42.5
+  D3  8.2  7.4  31.0
+  D4  21.7  26.2  55.4
+  D5  20.5  38.0  7.7
+  D6  48.0  31.0  5.2
+  D7  80.7  83.9  61.0
+  D8  22.4  15.0  20.4
+  D9  4.8  13.5  2.8
+  D10  9.4  23.6  13.7
+  D11  71.6  66.5  59.1
+  D12  21.1  38.6  10.1
+  D13  35.8  17.9  12.3
+  D14  57.6  67.8  59.6
+  D15  26.8  44.2  5.8
+  D16  2.0  4.9  5.4
+  D17  40.2  34.7  13.7
+  D18  6.6  9.0  4.1
+  D19  51.9  44.0  27.1
+  E1  32.3  34.5  15.5
+  E2  29.9  17.4  29.0
+  E3  39.5  42.9  15.5
+  E4  55.3  42.2  6.4
+  E5  23.8  24.5  22.9
+  E6  9.0  18.1  6.4
+  E7  10.5  8.8  31.7
+  E8  9.8  25.0  7.6
+  E9  74.1  71.0  48.7
+  E10  48.2  59.8  60.9
+  E11  47.6  31.4  1.9
+  E12  8.4  7.7  7.1
+  E13  7.4  7.4  33.5
+  E14  24.6  12.3  5.5
+  E15  27.4  26.1  22.7
+  E16  41.6  28.8  4.8
+  E17  1.2  2.8  3.2
+  E18  77.3  76.1  57.2
+  E19  45.5  60.1  4.3
+  F1  42.3  22.5  26.0
+  F2  43.9  39.2  7.1
+  F3  7.8  7.4  32.0
+  F4  12.3  15.9  46.9
+  F5  31.2  16.0  1.3
+  F6  37.9  21.6  31.1
+  F7  9.1  23.4  4.2
+  F8  19.0  12.1  28.6
+  F9  8.1  8.5  36.2
+  F10  34.7  21.2  34.1
+  F11  33.2  37.5  26.6
+  F12  72.6  80.1  26.5
+  F13  54.3  57.6  28.9
+  F14  17.5  18.8  6.2
+  F15  41.9  23.1  17.6
+  F16  37.4  36.2  54.6
+  F17  45.2  45.8  21.8
+  F18  9.2  8.0  31.4
+  F19  24.0  21.5  12.7
+  G1  15.0  17.1  13.6
+  G2  16.8  17.7  47.7
+  G3  50.7  64.8  40.5
+  G4  66.0  71.2  28.6
+  G5  19.9  36.8  25.4
+  G6  15.6  32.5  18.2
+  G7  15.3  13.4  38.6
+  G8  14.5  31.2  12.6
+  G9  57.8  44.3  21.9
+  G10  14.3  25.5  42.1
+  G11  6.4  3.7  6.6
+  G12  33.6  34.6  31.0
+  G13  4.1  6.2  16.1
+  G14  26.7  14.0  1.3
+  G15  34.9  47.5  27.1
+  G16  40.7  29.1  1.3
+  G17  37.4  20.1  1.5
+  G18  8.0  21.2  3.8
+  G19  28.9  41.3  13.5
+  H1  43.0  25.0  9.0
+  H2  38.5  21.6  1.4
+  H3  8.5  7.5  31.0
+  H4  42.0  23.7  30.9
+  H5  17.8  28.2  2.8
+  H6  1.4  1.1  4.8
+  H7  51.7  64.1  4.1
+  H8  1.8  1.5  1.8
+  H9  4.7  9.1  8.9
+  H10  22.5  42.9  28.6
+  H11  60.6  59.2  43.6
+  H12  2.6  1.7  12.1
+  H13  74.8  77.5  52.1
+  H14  23.8  40.8  23.3
+  H15  38.7  24.4  36.0
+  H16  18.1  12.8  31.6
+  H17  24.9  21.0  45.0
+  H18  30.5  18.8  30.8
+  H19  14.6  25.6  24.7
+  I1  5.7  4.0  19.0
+  I2  12.8  9.4  28.2
+  I3  29.3  44.1  3.0
+  I4  8.1  7.5  32.0
+  I5  1.4  2.0  1.2
+  I6  49.0  42.5  28.4
+  I7  7.1  7.3  34.5
+  I8  17.5  34.0  23.3
+  I9  35.8  22.1  34.9
+  I10  10.0  24.9  11.3
+  I11  6.7  7.3  1.2
+  I12  16.1  32.9  21.4
+  I13  8.6  8.9  32.0
+  I14  21.2  13.5  29.3
+  I15  7.9  8.7  34.2
+  I16  78.9  81.9  68.4
+  I17  44.3  60.2  17.1
+  I18  13.9  30.5  12.5
+  I19  13.0  7.2  1.4
+  J1  9.7  23.5  6.5
+  J2  12.4  28.5  7.7
+  J3  17.8  24.2  56.1
+  J4  76.2  80.6  47.7
+  J5  20.6  35.9  34.0
+  J6  1.9  1.4  7.7
+  J7  72.5  70.7  46.5
+  J8  0.9  0.8  2.0
+  J9  54.8  44.5  1.8
+  J10  57.7  42.8  13.1
+  J11  57.7  59.9  46.7
+  J12  14.2  6.8  15.7
+  J13  24.0  21.2  1.6
+  J14  8.1  15.3  12.5
+  J15  68.4  59.9  38.8
+  J16  17.9  15.1  6.1
+  J17  5.0  4.5  2.1
+  J18  53.3  37.1  26.2
+  J19  26.2  37.2  33.5
+  K1  17.1  11.8  29.9
+  K2  1.8  1.8  1.1
+  K3  40.6  22.8  9.9
+  K4  8.8  14.3  27.9
+  K5  35.3  20.8  31.6
+  K6  20.0  33.3  47.9
+  K7  12.2  21.3  7.6
+  K8  6.7  5.4  20.8
+  K9  12.8  18.9  30.3
+  K10  31.1  19.6  22.4
+  K11  56.6  55.4  6.7
+  K12  21.6  12.2  1.9
+  K13  25.4  38.1  57.2
+  K14  24.3  21.7  46.4
+  K15  7.9  7.4  5.5
+  K16  49.2  55.7  9.0
+  K17  33.0  49.9  31.4
+  K18  81.4  84.5  65.4
+  K19  25.8  16.6  5.3
+  L1  66.6  68.8  62.7
+  L2  37.1  36.0  26.7
+  L3  36.6  40.4  56.0
+  L4  36.6  22.5  34.7
+  L5  20.2  35.7  32.8
+  L6  31.2  30.0  13.0
+  L7  21.6  12.2  2.0
+  L8  0.8  0.8  0.7
+  L9  0.7  0.7  0.6
+  L10  0.9  0.9  0.8
+  L11  1.2  1.2  1.1
+  L12  12.2  21.2  7.5
+  L13  3.6  2.3  14.9
+  L14  26.0  12.6  6.3
+  L15  51.3  56.3  17.2
+  L16  59.3  65.3  54.1
+  L17  37.2  20.2  2.3
+  L18  14.7  11.3  5.9
+  L19  20.3  35.8  34.4
+  M1  2.5  1.9  1.2
+  M2  40.3  22.5  29.7
+  M3  21.1  42.5  14.2
+  M4  11.8  16.5  15.5
+  M5  10.3  5.9  1.2
+  M6  12.6  25.3  14.4
+  M7  56.7  55.4  6.8
+  M8  1.5  1.5  1.3
+  M9  1.5  1.6  1.3
+  M10  1.8  1.9  1.5
+  M11  1.9  1.9  1.6
+  M12  6.7  5.3  20.7
+  M13  23.4  43.2  12.5
+  M14  53.4  45.9  47.1
+  M15  22.4  20.7  37.0
+  M16  8.6  7.8  31.8
+  M17  4.6  3.1  1.3
+  M18  62.8  60.2  2.6
+  M19  3.7  2.7  1.3
+  N1  28.2  32.6  47.8
+  N2  17.8  16.7  14.7
+  N3  35.0  38.6  31.1
+  N4  28.7  14.8  1.3
+  N5  15.1  30.2  29.6
+  N6  59.7  49.0  31.7
+  N7  31.0  19.6  22.4
+  N8  2.3  2.3  1.9
+  N9  2.5  2.6  2.1
+  N10  2.7  2.8  2.3
+  N11  2.9  2.9  2.4
+  N12  13.1  18.9  30.3
+  N13  14.4  14.5  45.8
+  N14  48.3  36.3  1.0
+  N15  5.8  5.5  3.6
+  N16  17.8  32.2  19.1
+  N17  19.1  33.8  35.3
+  N18  34.8  21.1  33.0
+  N19  7.6  20.5  3.8
+  O1  29.2  45.4  39.0
+  O2  41.2  23.7  12.0
+  O3  30.4  15.5  1.3
+  O4  14.4  29.3  28.1
+  O5  1.3  1.2  1.0
+  O6  42.4  36.8  52.8
+  O7  12.9  19.0  30.5
+  O8  4.0  4.1  3.3
+  O9  5.8  6.0  4.7
+  O10  7.6  7.9  6.2
+  O11  8.5  8.8  7.0
+  O12  31.0  19.6  22.4
+  O13  40.7  33.1  14.4
+  O14  9.8  13.1  5.2
+  O15  34.6  22.4  3.0
+  O16  23.3  28.6  35.2
+  O17  34.8  17.2  12.5
+  O18  22.8  26.2  17.9
+  O19  25.2  12.8  1.5
+  P1  64.4  66.6  43.5
+  P2  20.5  28.7  46.5
+  P3  12.4  9.4  28.8
+  P4  4.5  2.6  4.6
+  P5  45.0  51.5  35.8
+  P6  60.3  69.7  4.5
+  P7  6.8  5.4  20.9
+  P8  11.9  12.3  9.9
+  P9  13.8  14.3  11.5
+  P10  15.8  16.4  13.1
+  P11  18.6  19.3  15.5
+  P12  58.6  57.7  7.1
+  P13  7.4  15.4  33.0
+  P14  23.8  23.1  33.3
+  P15  6.6  13.1  2.1
+  P16  29.5  19.6  4.5
+  P17  20.7  20.1  27.9
+  P18  47.5  30.7  9.3
+  P19  9.9  23.4  23.2
+  Q1  28.1  14.4  1.3
+  Q2  9.3  5.4  1.4
+  Q3  23.8  27.7  6.1
+  Q4  19.6  28.6  14.4
+  Q5  12.9  11.7  1.3
+  Q6  7.6  7.5  33.6
+  Q7  12.2  21.3  7.6
+  Q8  21.3  22.2  17.8
+  Q9  25.1  26.2  20.9
+  Q10  30.9  32.2  26.0
+  Q11  35.4  36.8  29.7
+  Q12  20.8  11.7  1.8
+  Q13  6.6  8.4  5.6
+  Q14  15.9  14.9  16.8
+  Q15  9.9  9.0  39.5
+  Q16  20.1  20.2  28.5
+  Q17  34.9  18.3  1.4
+  Q18  10.8  8.8  30.7
+  Q19  51.3  43.9  42.6
+  R1  1.0  1.7  1.7
+  R2  21.7  37.2  35.0
+  R3  33.0  26.0  44.3
+  R4  35.3  21.7  34.5
+  R5  63.9  61.6  52.8
+  R6  72.6  70.6  54.1
+  R7  21.6  12.2  2.0
+  R8  39.9  41.5  33.6
+  R9  45.7  47.4  38.6
+  R10  50.8  52.7  42.6
+  R11  57.2  59.4  48.2
+  R12  11.6  20.6  7.4
+  R13  15.2  26.0  26.9
+  R14  39.4  33.9  16.0
+  R15  28.3  29.3  19.2
+  R16  39.3  30.3  15.8
+  R17  60.8  49.5  52.7
+  R18  21.3  38.8  13.5
+  R19  31.4  16.1  1.2
+  S1  13.7  30.4  12.7
+  S2  39.9  21.6  27.3
+  S3  9.0  16.6  2.2
+  S4  19.2  20.0  15.7
+  S5  3.7  6.9  1.6
+  S6  44.5  25.3  29.8
+  S7  56.7  55.5  6.8
+  S8  64.0  66.5  54.2
+  S9  71.8  74.4  60.6
+  S10  80.2  83.3  67.4
+  S11  82.9  86.1  70.1
+  S12  6.6  5.2  19.6
+  S13  31.1  35.8  2.9
+  S14  29.2  18.4  8.8
+  S15  5.6  15.6  3.2
+  S16  18.4  13.3  7.0
+  S17  9.2  23.5  4.2
+  S18  54.2  43.2  2.0
+  S19  8.5  7.7  31.3
+  T1  27.1  17.2  31.4
+  T2  11.1  10.9  37.5
+  T3  32.1  16.5  1.1
+  T4  10.7  25.2  3.7
+  T5  47.7  52.9  42.7
+  T6  8.8  14.6  6.0
+  T7  31.3  19.8  22.6
+  T8  13.0  19.0  30.5
+  T9  6.8  5.4  20.8
+  T10  12.3  21.3  7.6
+  T11  21.6  12.2  2.0
+  T12  56.4  55.2  6.7
+  T13  18.3  11.9  28.5
+  T14  19.6  36.8  5.4
+  T15  38.2  21.2  1.4
+  T16  6.0  7.7  16.7
+  T17  1.7  1.4  1.1
+  T18  4.1  12.1  6.4
+  T19  12.0  28.0  6.6
+  U1  64.4  73.6  9.8
+  U2  8.7  22.6  3.9
+  U3  13.6  14.3  44.6
+  U4  13.1  29.1  19.5
+  U5  6.5  13.1  2.0
+  U6  45.7  31.7  25.9
+  U7  34.9  46.2  64.6
+  U8  11.4  26.6  4.0
+  U9  1.7  2.1  1.8
+  U10  56.0  42.9  49.4
+  U11  58.0  46.5  26.1
+  U12  33.9  17.4  1.4
+  U13  22.4  24.9  6.2
+  U14  27.5  13.9  16.1
+  U15  15.9  32.5  20.2
+  U16  33.3  17.3  1.1
+  U17  26.5  28.1  53.0
+  U18  79.1  80.2  65.2
+  U19  44.1  41.1  4.6
+  V1  5.9  13.4  14.4
+  V2  40.0  50.4  42.4
+  V3  15.1  31.8  6.4
+  V4  10.8  5.8  10.8
+  V5  59.9  52.9  31.4
+  V6  6.7  7.9  5.1
+  V7  30.6  17.9  29.5
+  V8  16.8  23.4  56.2
+  V9  35.0  26.2  13.8
+  V10  8.0  22.0  7.1
+  V11  5.4  3.4  1.1
+  V12  28.2  46.1  14.8
+  V13  14.0  7.1  5.9
+  V14  20.2  19.2  11.1
+  V15  30.1  18.6  32.1
+  V16  16.4  32.8  22.8
+  V17  57.3  43.5  12.4
+  V18  49.7  32.6  21.1
+  V19  48.7  53.0  61.0
+  W1  72.6  79.0  34.3
+  W2  8.7  6.2  2.6
+  W3  19.0  17.6  45.1
+  W4  10.3  11.7  1.5
+  W5  28.3  29.3  19.2
+  W6  45.8  26.8  33.1
+  W7  6.9  13.6  14.0
+  W8  39.7  59.2  22.8
+  W9  27.9  45.6  10.2
+  W10  0.9  1.3  1.5
+  W11  18.6  32.0  44.2
+  W12  40.9  23.6  4.4
+  W13  64.3  56.8  32.7
+  W14  67.4  72.9  4.1
+  W15  2.8  6.8  1.9
+  W16  29.9  17.3  28.7
+  W17  72.9  75.2  65.6
+  W18  4.1  9.1  9.5
+  W19  1.7  5.0  2.0
+  X1  15.8  26.4  44.2
+  X2  42.9  55.2  46.0
+  X3  22.3  11.7  1.1
+  X4  82.6  85.8  69.6
+  X5  1.4  1.2  1.0
+  X6  32.6  46.8  15.6
+  X7  31.0  34.4  7.5
+  X8  80.2  81.7  65.2
+  X9  66.8  58.4  56.3
+  X10  11.2  26.7  11.9
+  X11  29.4  29.9  54.4
+  X12  14.9  15.3  15.1
+  X13  14.6  8.4  1.0
+  X14  12.6  9.6  1.4
+  X15  56.7  63.5  44.2
+  X16  36.0  19.1  1.3
+  X17  44.9  52.8  2.8
+  X18  69.3  76.2  62.8
+  X19  63.9  73.0  7.6
+  Y1  38.6  52.7  30.2
+  Y2  16.0  19.6  8.5
+  Y3  57.3  43.4  33.4
+  Y4  26.5  22.1  5.5
+  Y5  5.7  15.8  3.3
+  Y6  58.4  46.3  51.3
+  Y7  81.7  84.3  66.0
+  Y8  14.3  11.1  1.3
+  Y9  4.4  13.9  3.1
+  Y10  64.1  60.7  8.8
+  Y11  18.0  34.1  27.2
+  Y12  34.9  18.4  1.3
+  Y13  23.5  39.2  35.9
+  Y14  45.7  47.1  44.0
+  Y15  27.1  18.6  36.9
+  Y16  12.4  28.5  7.3
+  Y17  39.4  40.7  27.4
+  Y18  3.5  9.1  2.2
+  Y19  15.1  13.9  7.7
+  Z1  28.1  23.3  15.1
+  Z2  63.2  58.8  7.8
+  Z3  4.1  11.1  2.4
+  Z4  1.1  0.9  2.9
+  Z5  73.3  79.9  64.5
+  Z6  8.6  9.0  5.5
+  Z7  7.9  7.8  33.6
+  Z8  28.8  44.3  38.3
+  Z9  31.3  16.0  1.1
+  Z10  27.4  26.5  19.1
+  Z11  2.0  1.4  8.3
+  Z12  8.5  7.7  31.5
+  Z13  15.6  18.1  1.7
+  Z14  18.3  34.1  3.7
+  Z15  2.0  2.1  0.9
+  Z16  33.5  24.8  41.9
+  Z17  6.7  3.4  6.7
+  Z18  63.8  57.5  14.1
+  Z19  78.3  82.8  66.9
+  2A1  0.9  1.1  0.9
+  2A2  19.6  13.8  5.9
+  2A3  38.7  21.2  9.9
+  2A4  12.4  28.7  8.0
+  2A5  10.2  9.9  16.8
+  2A6  47.3  32.1  42.4
+  2A7  8.5  22.3  3.9
+  2A8  1.7  2.9  1.4
+  2A9  14.3  10.1  27.8
+  2A10  24.7  15.1  1.3
+  2A11  40.4  55.4  48.2
+  2A12  12.5  28.6  6.6
+  2A13  17.0  12.5  15.7
+  2A14  14.6  16.9  11.6
+  2A15  35.4  36.8  29.1
+  2A16  11.2  14.4  7.2
+  2A17  8.1  22.0  12.6
+  2A18  14.7  14.8  43.4
+  2A19  52.6  34.1  36.1
+  2B1  8.2  21.5  3.7
+  2B2  40.1  55.9  5.0
+  2B3  8.5  8.6  35.2
+  2B4  23.3  16.1  34.6
+  2B5  66.3  74.2  52.1
+  2B6  66.5  70.5  66.1
+  2B7  7.9  7.3  31.5
+  2B8  23.4  40.5  20.0
+  2B9  53.1  55.4  36.6
+  2B10  23.4  30.2  26.5
+  2B11  7.7  20.8  3.7
+  2B12  13.5  11.6  32.2
+  2B13  65.4  74.1  61.6
+  2B14  34.7  21.0  33.0
+  2B15  32.4  16.3  4.5
+  2B16  44.5  39.0  18.5
+  2B17  39.8  22.5  5.0
+  2B18  45.2  26.2  19.4
+  2B19  7.2  7.7  35.3
+  2C1  42.8  48.7  62.0
+  2C2  2.4  5.9  1.8
+  2C3  20.1  26.5  5.2
+  2C4  13.8  30.3  9.9
+  2C5  12.2  9.3  29.9
+  2C6  23.7  15.2  31.0
+  2C7  21.9  39.4  13.3
+  2C8  67.5  58.5  45.1
+  2C9  20.1  13.5  30.7
+  2C10  14.3  7.0  6.2
+  2C11  45.5  59.1  51.0
+  2C12  71.1  79.0  57.3
+  2C13  7.1  7.8  36.9
+  2C14  81.9  84.9  66.1
+  2C15  7.1  6.1  27.2
+  2C16  2.8  1.8  12.5
+  2C17  7.6  8.6  1.2
+  2C18  13.3  16.4  27.7
+  2C19  59.2  68.5  4.0
+  2D1  24.7  15.9  35.5
+  2D2  27.6  17.5  15.1
+  2D3  10.0  8.5  31.6
+  2D4  1.8  2.0  6.8
+  2D5  7.6  20.5  3.8
+  2D6  1.3  1.6  1.1
+  2D7  67.9  74.5  4.7
+  2D8  37.8  40.3  56.9
+  2D9  21.7  29.5  9.7
+  2D10  24.5  27.3  22.3
+  2D11  8.6  7.3  3.6
+  2D12  8.1  11.8  14.9
+  2D13  14.5  7.6  2.0
+  2D14  17.5  13.6  35.9
+  2D15  26.0  16.5  1.2
+  2D16  37.5  20.6  5.1
+  2D17  76.8  74.9  62.0
+  2D18  73.7  79.1  41.9
+  2D19  42.6  25.1  4.4
diff --git a/ref/ColorCheckerSG.ti2 b/ref/ColorCheckerSG.ti2
index 7459061..239b9e6 100644
--- a/ref/ColorCheckerSG.ti2
+++ b/ref/ColorCheckerSG.ti2
@@ -1,284 +1,163 @@
-CTI3   
+CTI2   
 
-DESCRIPTOR "Argyll Calibration Target chart information 3"
-ORIGINATOR "Argyll target"
-CREATED "Thu Feb 04 12:14:29 2010"
-KEYWORD "DEVICE_CLASS"
-DEVICE_CLASS "INPUT"
-KEYWORD "COLOR_REP"
-COLOR_REP "XYZ_RGB"
+DESCRIPTOR "Argyll Calibration Target chart information 2"
+ORIGINATOR "Argyll printtarg"
+CREATED "Mon Feb 10 15:05:27 2014"
+KEYWORD "TARGET_INSTRUMENT"
+TARGET_INSTRUMENT   "GretagMacbeth SpectroScan"
 
-KEYWORD "STDEV_R"
-KEYWORD "STDEV_G"
-NUMBER_OF_FIELDS 10
+COLOR_REP   "RGB"
+STEPS_IN_PASS   10
+PASSES_IN_STRIPS2   14
+STRIP_INDEX_PATTERN "A-Z, A-Z"
+PATCH_INDEX_PATTERN "@-9,0-9;01-99"
+INDEX_ORDER "STRIP_THEN_PATCH"
+
+NUMBER_OF_FIELDS 8
 BEGIN_DATA_FORMAT
-SAMPLE_ID XYZ_X XYZ_Y XYZ_Z RGB_R RGB_G RGB_B STDEV_R STDEV_G STDEV_B 
+SAMPLE_ID SAMPLE_LOC XYZ_X XYZ_Y XYZ_Z RGB_R RGB_G RGB_B
 END_DATA_FORMAT
 
-NUMBER_OF_SETS 264
+NUMBER_OF_SETS 140
 BEGIN_DATA
-A01 3.8500 3.2200 1.9000 3.0870 1.9150 1.9568 0.18288 0.33530 0.13814 
-A02 4.8900 3.2700 1.6000 4.3780 1.1194 1.5620 0.18986 0.21677 0.15053 
-A03 5.8700 3.3100 1.3300 7.0969 0.79829 1.4596 0.19608 0.13702 0.21648 
-A04 6.3000 3.3800 1.1900 9.3444 0.79154 1.6415 0.24898 0.11159 0.21239 
-A05 13.010 11.440 7.6400 14.232 7.8664 9.0240 0.51082 0.34461 0.40609 
-A06 16.140 11.990 6.8100 19.112 4.9827 7.4008 0.27379 0.27636 0.24485 
-A07 19.350 12.410 6.0600 24.550 2.9139 6.6589 0.44040 0.23921 0.36013 
-A08 20.410 11.970 5.3000 28.200 1.9757 5.6575 0.32681 0.17783 0.34406 
-A09 43.500 42.810 32.650 50.412 41.562 43.136 0.83769 0.58646 0.66130 
-A10 45.580 42.370 30.950 52.491 37.167 40.121 0.65668 0.68089 0.75167 
-A11 48.990 43.200 29.900 55.546 34.358 38.456 0.89084 0.72144 0.46689 
-A12 50.730 44.020 29.960 59.252 33.923 39.172 0.67792 0.64492 0.71595 
-A13 74.460 78.760 66.060 86.999 87.136 83.095 0.84067 0.78370 1.0173 
-A14 75.660 76.420 64.080 88.257 85.809 81.940 0.97591 0.87575 0.93144 
-A15 78.360 81.340 65.410 89.349 87.424 79.630 0.80575 0.84750 0.90746 
-A16 70.520 73.300 59.160 83.248 81.172 76.884 0.59765 0.53177 0.91515 
-A17 74.980 75.980 60.690 86.615 83.456 77.766 0.59041 0.64935 0.85237 
-A18 72.850 77.300 60.250 85.072 85.370 78.761 0.67171 0.77803 0.78435 
-A19 73.090 75.520 64.540 85.077 84.325 81.725 0.60827 0.53488 0.74148 
-B01 3.4700 3.0800 1.4100 2.9819 1.8666 1.5474 0.25109 0.26023 0.14749 
-B02 4.4100 3.2500 0.90000 3.9091 1.1519 0.44191 0.19422 0.17547 0.17939 
-B03 5.0400 3.2300 0.58000 5.7842 0.78053 0.49340 0.39093 0.14767 0.25096 
-B04 5.1900 3.1100 0.47000 6.2788 0.70721 0.41772 0.082907 0.18786 0.25207 
-B05 13.360 11.590 5.5600 14.926 7.8469 6.2059 0.44744 0.41222 0.43440 
-B06 15.970 12.030 3.6900 19.562 5.8030 4.2553 0.47005 0.19252 0.20287 
-B07 19.200 12.490 2.2000 25.891 4.1954 2.6920 0.33271 0.22817 0.18918 
-B08 19.730 11.520 1.1700 29.809 2.8266 1.9401 0.23472 0.24036 0.14395 
-B09 42.190 41.840 29.340 52.125 42.714 40.345 0.71433 0.70374 0.66837 
-B10 44.830 42.170 25.930 54.839 39.132 35.238 0.62084 0.61210 0.58037 
-B11 48.060 42.900 23.010 60.127 37.706 33.524 0.63887 0.38462 0.62824 
-B12 49.630 43.080 21.340 63.922 37.324 32.146 0.65762 0.54522 0.68989 
-B13 66.210 72.540 64.610 81.667 84.767 81.706 0.65741 0.59295 0.68550 
-B14 70.160 67.100 60.330 84.214 77.614 79.176 0.57243 0.69736 0.83505 
-B15 75.460 78.690 51.580 87.872 84.913 72.334 0.64511 0.86763 0.77954 
-B16 57.470 59.580 47.660 65.637 62.374 61.374 0.46048 0.54234 0.88766 
-B17 68.330 66.450 49.050 80.849 69.402 66.741 0.47062 0.59840 0.78706 
-B18 63.890 70.290 51.300 75.219 79.157 68.777 0.46400 0.45401 0.74257 
-B19 61.120 62.160 59.790 74.928 72.212 78.002 0.52358 0.56321 0.65812 
-C01 4.9700 4.7500 1.9800 3.8530 2.8861 1.9553 0.22700 0.21393 0.14122 
-C02 5.1800 4.6500 1.2300 4.3282 2.3874 0.79270 0.23735 0.24096 0.13415 
-C03 5.5100 4.5800 0.71000 4.8509 1.9934 0.37347 0.30081 0.24896 0.16563 
-C04 5.7700 4.6100 0.67000 5.4652 2.2904 0.39892 0.31940 0.40663 0.17898 
-C05 24.570 23.440 10.140 29.971 21.188 14.074 0.87441 0.65043 0.60853 
-C06 28.100 24.640 5.2200 35.224 19.484 6.2233 0.47051 0.51996 0.34475 
-C07 31.150 25.280 2.2000 43.555 21.569 1.7662 0.53328 0.28476 0.22826 
-C08 30.850 23.680 1.3500 47.906 23.705 0.73860 0.48852 0.54401 0.30082 
-C09 49.160 49.360 32.370 61.372 52.131 41.915 1.0230 0.96228 0.93947 
-C10 51.720 50.720 26.530 66.081 50.197 35.277 0.52582 0.59072 0.68577 
-C11 55.240 53.140 21.930 73.019 53.527 32.275 0.44506 0.61523 0.51984 
-C12 56.870 53.620 18.460 76.306 55.256 27.858 0.73837 0.62107 0.67223 
-C13 57.680 65.650 62.700 69.094 79.718 80.057 0.50745 0.49506 0.65851 
-C14 63.460 56.660 55.490 79.979 64.212 75.539 0.48047 0.70668 0.61269 
-C15 73.000 76.110 40.780 87.834 83.405 60.764 0.46451 0.49319 0.94645 
-C16 44.730 46.380 36.800 49.238 47.428 48.251 0.66946 0.56694 0.71058 
-C17 60.640 55.730 38.100 77.490 58.018 53.328 0.50391 0.73108 0.76100 
-C18 52.150 60.270 41.500 59.790 70.951 55.734 0.51624 0.54134 0.69219 
-C19 48.130 49.180 54.380 55.359 55.873 71.348 0.69989 0.65714 0.84068 
-D01 4.1900 4.4100 1.9300 3.1562 3.1899 2.0240 0.14406 0.17903 0.20820 
-D02 4.4800 4.7200 1.2400 3.1439 3.1237 0.90907 0.22921 0.19312 0.19845 
-D03 4.5500 4.7800 0.80000 3.1884 3.4386 0.76835 0.18973 0.19251 0.14068 
-D04 4.3200 4.5300 0.78000 2.7510 3.7222 0.39598 0.089835 0.21097 0.093653 
-D05 27.330 28.550 12.950 32.935 30.788 16.103 0.86272 0.76614 1.0290 
-D06 28.680 30.040 7.2500 34.121 32.521 9.2587 0.39709 0.61832 0.39734 
-D07 29.510 31.010 3.4100 36.086 34.806 2.1211 0.45752 0.42772 0.32549 
-D08 27.550 28.440 1.8300 37.395 33.673 0.41712 0.48746 0.39838 0.24261 
-D09 56.060 58.190 38.210 68.806 62.355 48.849 0.83407 1.0243 1.0103 
-D10 56.030 58.460 30.020 69.259 58.718 33.748 0.64690 0.51168 0.69310 
-D11 56.200 59.330 24.440 73.375 62.236 30.616 0.61702 0.52252 0.65243 
-D12 56.190 59.410 19.140 77.878 67.860 28.599 0.75670 0.62150 0.58932 
-D13 48.210 57.420 59.530 51.811 71.459 76.862 0.52665 0.65682 0.77453 
-D14 58.180 49.140 51.360 72.528 46.885 68.418 0.52499 0.49346 0.72705 
-D15 70.980 73.730 33.630 87.340 80.456 47.511 0.58420 0.59197 0.74605 
-D16 34.310 35.730 28.220 36.385 34.641 36.216 0.65565 0.55419 0.71008 
-D17 54.270 47.530 29.580 71.607 44.334 41.932 0.46944 0.43555 0.66646 
-D18 41.670 50.640 32.280 40.678 55.829 39.983 0.43992 0.47148 0.62583 
-D19 36.950 37.820 48.090 37.649 36.082 58.334 0.42908 0.54659 0.83641 
-E01 4.1500 4.7500 2.0300 3.1080 3.5881 2.3054 0.15860 0.18960 0.21718 
-E02 4.0000 4.9800 1.3700 2.2371 3.5825 0.94616 0.25476 0.27294 0.19591 
-E03 3.3000 4.4900 0.86000 1.6523 4.0563 0.38062 0.19385 0.38560 0.11779 
-E04 3.1100 4.3000 0.86000 1.5621 5.4761 0.39158 0.26069 0.52827 0.12416 
-E05 13.110 14.900 7.0600 15.304 17.657 10.409 0.47522 0.71252 0.51942 
-E06 12.260 15.230 4.1800 12.178 18.905 5.5227 0.25140 0.45664 0.32497 
-E07 11.530 15.570 2.2700 11.698 21.930 1.9527 0.26015 0.27007 0.21988 
-E08 9.6900 13.740 1.5100 10.276 19.833 0.79976 0.39423 0.37372 0.23614 
-E09 39.150 42.080 27.330 45.518 46.666 38.440 0.69913 0.70519 0.71247 
-E10 37.430 41.510 22.230 44.807 49.208 32.547 0.55033 0.61108 0.60908 
-E11 36.990 42.500 18.850 43.914 51.799 27.847 0.33881 0.53443 0.59872 
-E12 36.400 42.580 16.270 43.530 52.579 24.028 0.42317 0.40277 0.79064 
-E13 39.970 49.810 56.150 39.429 62.735 72.585 0.51788 0.70956 0.61542 
-E14 52.080 41.070 46.360 60.752 30.200 56.615 0.61389 0.53882 0.50726 
-E15 68.710 70.760 26.450 86.100 76.861 38.303 0.41619 0.79801 0.68629 
-E16 25.700 26.970 21.280 27.203 25.514 27.365 0.37071 0.36979 0.64204 
-E17 48.530 40.600 22.000 63.064 33.698 32.716 0.65833 0.49787 0.51247 
-E18 31.620 40.820 23.350 33.628 51.020 34.670 0.45510 0.54658 0.59089 
-E19 31.190 31.190 43.400 29.013 27.025 51.220 0.47563 0.55117 0.57962 
-F01 1.5100 1.9100 1.0600 0.027596 0.75636 0.74985 0.15629 0.19236 0.22766 
-F02 1.2900 2.0400 0.98000 4.9390e-004 1.0482 0.39366 0.027695 0.20025 0.047727 
-F03 1.1600 2.0900 0.82000 1.2211e-003 1.3702 0.39338 0.055216 0.20402 0.055216 
-F04 1.1400 2.0400 0.80000 5.2010e-004 1.8140 0.39216 0.028412 0.19742 8.7191e-017 
-F05 6.5300 8.2500 5.1300 6.0620 8.7613 6.3749 0.21856 0.39993 0.34077 
-F06 5.6100 8.6600 4.3800 5.0928 12.540 5.5351 0.32257 0.22932 0.31753 
-F07 4.6000 8.7700 3.7000 3.9791 14.933 5.5371 0.22839 0.40306 0.31189 
-F08 3.4500 7.6300 2.7800 3.1943 13.637 5.0607 0.18371 0.31217 0.28611 
-F09 37.800 41.070 30.910 42.311 46.542 44.099 0.66414 0.71461 0.48054 
-F10 35.920 40.760 29.030 37.090 45.514 41.038 0.54192 0.47361 0.49637 
-F11 35.420 41.990 29.070 33.769 46.586 39.188 0.63863 0.44377 0.74150 
-F12 34.000 41.800 28.000 32.661 47.456 39.230 0.38028 0.53728 0.61597 
-F13 32.130 42.120 51.990 33.383 57.669 70.984 0.45695 0.68345 0.74883 
-F14 45.720 33.340 40.770 54.515 21.176 49.435 0.62848 0.60201 0.59089 
-F15 66.260 67.290 19.650 85.509 74.348 30.963 0.34004 0.66164 0.72944 
-F16 17.020 18.070 14.400 18.492 17.628 19.716 0.41175 0.41125 0.55653 
-F17 41.590 32.530 15.160 55.337 23.031 22.717 0.32869 0.58391 0.55775 
-F18 26.260 35.260 18.810 29.664 47.253 28.577 0.65266 0.49301 0.47012 
-F19 24.300 23.600 37.480 19.299 17.238 43.015 0.51151 0.45280 0.37522 
-G01 2.3100 3.0000 2.2700 0.84520 2.3174 1.9294 0.18283 0.18185 0.16146 
-G02 2.0000 3.2100 2.5800 0.75456 2.8979 2.5428 0.15935 0.25240 0.20833 
-G03 1.6600 3.2100 2.7500 0.76882 3.1767 2.7895 0.13653 0.18762 0.18509 
-G04 1.5800 3.0300 2.6000 0.72753 3.5401 3.1385 0.21153 0.23805 0.12733 
-G05 8.9900 11.080 8.7900 8.6417 12.633 13.013 0.23258 0.38272 0.51760 
-G06 7.6800 11.300 9.5600 6.0762 14.162 13.630 0.34219 0.48961 0.37830 
-G07 6.5200 11.500 10.200 4.7151 15.595 15.675 0.18999 0.25121 0.34355 
-G08 5.5000 10.850 10.550 3.9310 15.708 18.487 0.17658 0.18808 0.38867 
-G09 38.290 41.750 33.450 41.221 46.682 47.377 0.47434 0.65583 0.69760 
-G10 35.830 41.160 34.110 34.960 46.653 48.630 0.43230 0.33577 0.68757 
-G11 34.560 41.830 35.630 33.586 49.866 51.379 0.54290 0.54558 0.79591 
-G12 33.690 42.140 36.700 33.047 50.497 52.510 0.47475 0.63324 0.64506 
-G13 25.950 35.680 48.000 25.821 49.453 66.662 0.37812 0.43551 0.68026 
-G14 40.600 27.620 36.140 49.315 12.855 43.923 0.59407 0.51249 0.39980 
-G15 63.720 63.630 14.350 85.087 71.090 23.531 0.42910 0.70922 0.51323 
-G16 10.850 11.820 9.5800 12.480 12.126 12.956 0.45159 0.26832 0.47760 
-G17 37.230 27.640 11.620 47.527 14.544 15.337 0.27575 0.21502 0.45406 
-G18 20.280 28.970 14.150 22.086 39.214 21.499 0.22375 0.42080 0.58054 
-G19 17.700 16.740 31.700 11.092 8.9799 34.605 0.30961 0.25432 0.34654 
-H01 2.5600 3.0400 2.9200 1.0797 1.6510 2.5225 0.19148 0.29249 0.31180 
-H02 2.3400 3.2000 4.1200 0.75605 1.9921 3.9184 0.20879 0.18831 0.34399 
-H03 2.1200 3.2800 5.4300 1.1188 2.6942 5.7632 0.18331 0.31552 0.43690 
-H04 2.0600 3.1800 5.2900 0.95250 3.6569 9.1081 0.19606 0.26991 0.32976 
-H05 10.070 11.600 11.240 8.3322 11.376 15.622 0.28376 0.42701 0.40381 
-H06 9.0100 11.680 14.810 5.4932 11.765 20.056 0.091608 0.41488 0.57575 
-H07 8.2200 12.000 19.420 4.9770 14.064 28.422 0.20715 0.32326 0.42487 
-H08 7.2500 11.550 21.450 3.2684 15.675 34.112 0.21933 0.26892 0.44285 
-H09 39.250 42.310 36.810 41.417 46.807 52.636 0.40783 0.63180 0.70186 
-H10 37.580 41.850 40.370 37.620 47.457 56.394 0.40780 0.38262 0.60753 
-H11 37.160 43.070 45.790 35.702 50.905 63.199 0.32421 0.46580 0.63305 
-H12 36.270 43.780 49.470 33.495 51.722 65.912 0.49238 0.80083 0.50501 
-H13 21.470 30.780 44.220 17.358 41.175 60.322 0.53191 0.33884 0.71172 
-H14 36.490 23.350 32.380 42.559 7.4512 37.794 0.63662 0.37435 0.45301 
-H15 61.580 60.550 10.950 83.946 67.032 17.125 0.47747 0.68565 0.68924 
-H16 8.2100 8.7100 6.9100 7.7370 6.7073 7.1914 0.30311 0.32664 0.38434 
-H17 33.040 23.260 8.3800 41.945 9.7770 9.4041 0.36608 0.27977 0.29341 
-H18 16.220 24.350 10.410 14.161 31.400 14.036 0.50870 0.42853 0.33315 
-H19 12.860 11.840 26.820 6.7641 4.8816 27.846 0.21234 0.35512 0.43660 
-I01 4.2200 4.4400 5.2800 2.5804 3.1209 5.5388 0.19793 0.22097 0.23814 
-I02 4.3500 4.4800 8.3600 2.1950 2.9540 8.2511 0.21318 0.37273 0.15204 
-I03 4.4000 4.4400 11.940 1.5551 2.3277 13.781 0.13059 0.32101 0.44139 
-I04 4.4800 4.5800 12.170 1.5183 2.7011 16.873 0.18903 0.18775 0.54146 
-I05 15.150 15.780 15.230 14.098 13.280 19.482 0.38631 0.35696 0.61921 
-I06 14.560 15.120 19.520 11.398 11.740 26.460 0.39190 0.31696 0.53900 
-I07 14.370 14.810 24.480 9.0951 10.558 31.378 0.31653 0.47750 0.40616 
-I08 14.110 14.760 30.030 8.8994 12.525 38.791 0.19577 0.41303 0.47520 
-I09 41.030 42.580 36.940 44.643 44.074 50.860 0.49120 0.38131 0.77241 
-I10 40.850 42.230 40.730 43.872 44.287 55.517 0.47835 0.37431 0.74007 
-I11 40.860 42.330 45.050 42.122 43.554 59.117 0.48773 0.61376 0.75436 
-I12 41.310 42.730 47.770 40.877 43.038 60.455 0.52027 0.78243 0.89880 
-I13 17.260 25.930 40.230 11.385 33.626 53.134 0.24543 0.46746 0.49207 
-I14 32.660 19.630 28.810 37.259 3.1300 31.648 0.53636 0.22763 0.56347 
-I15 59.370 57.180 7.7900 81.619 61.582 10.428 0.45678 0.75637 0.50761 
-I16 4.9700 5.3200 4.3200 4.1247 4.2743 4.4333 0.25062 0.28647 0.22229 
-I17 28.620 18.880 5.4800 37.742 6.2496 5.7060 0.30537 0.26137 0.31918 
-I18 11.580 18.980 7.2500 10.598 26.684 8.8664 0.26978 0.44054 0.42495 
-I19 9.5800 8.3400 22.870 4.2150 3.2891 23.893 0.21095 0.25111 0.44678 
-I20 0.45000 0.40000 0.33000 0.39216 0.39216 0.54897 8.7185e-017 8.7185e-017 0.19577 
-I21 2.2800 1.7800 0.98000 1.5621 0.40380 0.78485 0.17869 0.12419 0.10123 
-I22 2.3700 1.9500 0.85000 1.6757 0.52953 0.77981 0.20785 0.19502 0.097289 
-J01 2.1500 1.9000 2.6000 0.80586 0.46230 2.3504 0.14574 0.18600 0.061302 
-J02 2.5700 2.0000 4.7200 0.88254 0.50462 3.8319 0.23987 0.27408 0.28547 
-J03 2.9300 1.9500 8.1000 1.1741 0.79211 7.0759 0.059711 0.10088 0.41081 
-J04 3.1500 1.9200 10.760 1.1579 0.78634 9.8197 0.13923 0.054971 0.30540 
-J05 11.730 11.600 11.810 10.434 9.0014 15.080 0.27064 0.18087 0.39725 
-J06 12.980 11.930 16.190 9.8203 6.5823 18.989 0.42140 0.31577 0.43052 
-J07 13.910 12.070 20.950 9.0486 5.3905 24.287 0.43191 0.32612 0.46685 
-J08 14.010 11.590 24.350 9.4663 4.4573 26.676 0.46513 0.26033 0.44412 
-J09 40.750 41.220 36.340 46.279 42.745 50.219 0.48484 0.49432 0.71791 
-J10 41.260 41.070 39.740 46.208 41.530 53.967 0.39057 0.37860 0.69962 
-J11 42.630 41.680 44.510 46.276 39.907 57.241 0.36909 0.43099 0.77240 
-J12 44.020 41.780 49.250 46.523 38.842 60.774 0.60050 0.54935 0.80146 
-J13 13.820 21.690 35.980 6.4384 27.059 47.284 0.27804 0.44682 0.53798 
-J14 28.870 16.330 25.080 33.360 1.4880 26.700 0.54686 0.35986 0.50147 
-J15 56.040 52.290 4.9700 79.215 55.635 5.6027 0.36036 0.67586 0.40739 
-J16 2.4600 2.6300 2.2900 2.0271 1.9425 2.1126 0.22979 0.25009 0.22276 
-J17 24.040 14.750 3.1500 32.513 3.3788 3.9462 0.38941 0.25099 0.22979 
-J18 8.1200 14.490 4.5500 6.8312 20.787 5.0280 0.26878 0.48921 0.37476 
-J19 5.9800 4.7900 17.760 1.9349 1.4360 18.258 0.25534 0.19476 0.43841 
-J20 8.2600 5.3700 1.0400 9.0085 1.2119 1.6117 0.45009 0.24630 0.21888 
-J21 11.520 7.8100 1.6200 15.322 3.1307 1.6660 0.28794 0.15307 0.22993 
-J22 14.670 10.720 2.6000 19.118 4.7445 3.3211 0.27061 0.23207 0.23572 
-K01 5.6300 4.7000 4.8600 3.1669 2.3147 4.3372 0.16578 0.17296 0.16002 
-K02 6.7400 4.5800 7.2300 4.7712 1.7242 5.8628 0.19822 0.36800 0.19901 
-K03 8.0400 4.4800 9.7300 7.0830 0.83482 8.6422 0.34393 0.17784 0.40049 
-K04 9.3900 4.7600 11.790 9.3140 0.83699 11.430 0.19932 0.17903 0.39652 
-K05 16.660 15.390 14.440 15.838 10.461 17.251 0.32001 0.40528 0.46694 
-K06 18.720 15.180 18.230 18.124 6.6879 21.403 0.40410 0.17228 0.49710 
-K07 21.560 15.500 22.970 21.965 5.3109 25.015 0.24740 0.23832 0.38336 
-K08 23.000 15.020 25.370 24.105 3.1608 26.801 0.32492 0.16608 0.48978 
-K09 42.500 42.020 36.050 47.117 40.740 49.022 0.53629 0.37845 0.70340 
-K10 44.550 41.630 39.710 49.817 36.865 51.366 0.65172 0.52763 0.69630 
-K11 47.190 41.960 44.030 49.582 31.706 51.769 0.59677 0.49442 0.61865 
-K12 49.900 43.140 47.210 49.812 27.011 52.296 0.66045 0.55640 0.61863 
-K13 10.610 17.440 31.240 4.4300 21.053 41.922 0.22576 0.30726 0.65920 
-K14 24.840 13.190 21.000 29.807 0.40689 21.925 0.51521 0.12873 0.23282 
-K15 53.120 48.050 3.1900 76.497 50.546 1.9742 0.42392 0.89083 0.22911 
-K16 1.0500 1.1400 1.1300 0.37611 0.38958 0.78350 0.16012 0.11365 0.056938 
-K17 19.930 11.340 1.6700 28.212 1.8825 1.9270 0.20132 0.19250 0.18652 
-K18 5.3000 10.470 2.7300 4.6984 16.487 2.7171 0.27557 0.20947 0.35113 
-K19 3.9500 2.7600 13.940 1.1640 0.78992 13.028 0.14201 0.087689 0.38375 
-K20 30.610 26.430 11.040 37.280 17.799 14.056 0.42873 0.33930 0.49948 
-K21 34.910 29.600 11.780 46.591 23.876 16.346 0.59613 0.61207 0.58881 
-K22 38.950 34.570 18.400 50.441 29.451 25.122 0.41109 0.46425 0.53273 
-L01 3.8800 3.1200 2.3200 2.3754 1.1903 2.4650 0.23374 0.24751 0.21411 
-L02 4.9300 3.2000 2.6900 3.5670 0.87669 2.4249 0.19064 0.19083 0.21057 
-L03 5.7500 3.1400 3.0200 6.2627 0.88805 2.7596 0.15419 0.19237 0.13238 
-L04 7.3100 3.7900 3.4000 12.143 0.79340 5.0822 0.36514 0.10735 0.18096 
-L05 13.290 11.540 9.3900 13.257 6.7371 11.007 0.53413 0.39748 0.52457 
-L06 16.220 11.730 10.320 17.565 4.3606 11.749 0.41329 0.23326 0.22842 
-L07 19.950 12.080 12.060 23.621 1.9646 12.957 0.36857 0.073970 0.44540 
-L08 20.790 11.310 12.010 27.319 1.1467 14.145 0.39539 0.24605 0.48567 
-L09 43.220 42.090 33.780 49.604 40.742 46.106 0.73537 0.46689 0.65281 
-L10 45.520 41.880 34.650 52.432 36.546 46.285 0.70127 0.47543 0.81335 
-L11 49.040 42.870 35.980 52.918 31.732 45.276 0.56655 0.49649 0.63589 
-L12 51.030 43.830 37.780 56.056 30.451 46.847 0.71159 0.54349 0.47579 
-L13 7.4500 12.770 25.590 3.1210 15.741 36.868 0.16774 0.41923 0.54315 
-L14 21.260 10.760 17.730 25.639 0.67463 17.297 0.33435 0.23099 0.28299 
-L15 49.450 43.120 2.1400 71.709 42.401 0.77056 0.63981 0.77745 0.15935 
-L16 0.47000 0.49000 0.50000 0.39216 0.39242 0.44227 8.7191e-017 0.020117 0.17760 
-L17 16.040 8.4900 0.78000 22.615 0.77695 0.80931 0.41597 0.098510 0.17603 
-L18 2.9100 6.5000 1.3900 2.3795 10.578 0.82736 0.41720 0.36726 0.25065 
-L19 2.5000 1.4500 10.280 0.87774 0.87456 9.0192 0.19100 0.19050 0.23749 
-L20 38.700 33.980 20.860 46.392 26.795 27.748 0.70761 0.62342 0.62702 
-L21 39.360 35.230 21.230 49.082 30.312 29.444 0.78808 0.53733 0.63082 
-L22 41.360 38.770 23.510 49.490 34.663 31.428 0.65330 0.41753 0.60905 
-GS00 79.470 82.510 69.040 94.066 92.950 89.438 0.92099 0.93414 1.0465 
-GS01 72.620 74.940 59.170 83.147 81.219 77.715 0.78271 0.68705 0.94766 
-GS02 63.150 65.110 51.570 72.917 70.218 68.669 1.6258 1.2707 1.2120 
-GS03 54.720 56.510 45.030 62.183 59.826 59.273 1.1706 0.93329 0.94511 
-GS04 48.100 49.810 39.240 54.449 52.983 53.093 0.94040 0.74898 0.81106 
-GS05 42.220 43.640 34.450 46.328 44.248 45.944 0.67400 0.50032 0.83337 
-GS06 37.330 38.700 30.500 38.317 37.642 39.414 0.73797 0.55911 0.80063 
-GS07 32.380 33.610 26.110 33.430 32.555 34.311 0.65078 0.68590 0.53545 
-GS08 27.560 28.700 22.110 28.329 27.391 29.319 0.58496 0.47730 0.62283 
-GS09 22.500 23.400 17.990 24.816 23.504 25.107 0.34653 0.55560 0.46821 
-GS10 18.770 19.550 14.830 19.965 19.162 21.933 0.53943 0.57276 0.50639 
-GS11 15.480 16.080 12.040 16.404 15.001 17.243 0.45210 0.41568 0.49656 
-GS12 12.690 13.290 9.9800 12.196 12.177 13.695 0.44316 0.26670 0.48288 
-GS13 10.350 10.810 7.9700 9.2053 9.3069 10.577 0.20471 0.20663 0.38564 
-GS14 8.3900 8.7700 6.3700 6.8434 6.6000 6.6948 0.44020 0.30795 0.33660 
-GS15 6.4500 6.7900 4.9700 5.0530 5.1099 5.4164 0.19533 0.41922 0.22533 
-GS16 4.9500 5.1800 3.7000 3.5418 3.5969 4.0009 0.21349 0.20376 0.24671 
-GS17 3.5800 3.8200 2.7600 2.2466 2.3553 2.3640 0.20655 0.13937 0.14287 
-GS18 2.7600 2.8900 2.0600 1.1077 1.1790 1.5754 0.28160 0.25904 0.24353 
-GS19 1.9700 2.0800 1.4500 0.35943 0.40395 0.79579 0.18424 0.11867 0.11747 
-GS20 1.2200 1.3100 0.98000 0.23507 0.31297 0.70239 0.19729 0.21133 0.18880 
-GS21 1.0000 1.0500 0.74000 0.38400 0.38523 0.77548 0.10266 0.10537 0.10605 
-GS22 0.87000 0.89000 0.65000 0.39216 0.39216 0.74886 8.7126e-017 8.7126e-017 0.16598 
-GS23 0.34000 0.32000 0.32000 0.39226 0.39237 0.43006 0.012929 0.018274 0.16840 
+1  "A01" 88.2480 87.5060 67.6240 99.2353 99.7118 99.5554
+2  "A02" 0.794510 0.785690 0.624230 3.14714 4.68603 5.08608
+3  "A03" 18.3810 18.1460 14.1200 54.0301 65.6038 60.7520 
+4  "A04" 88.6800 87.9440 68.0980 99.0451 99.4536 99.2556 
+5  "A05" 0.824100 0.810630 0.656110 3.10665 4.43021 4.90322 
+6  "A06" 18.4400 18.2040 14.1760 52.4803 64.1539 59.5981 
+7  "A07" 88.6450 87.9000 67.9470 98.8924 98.9556 99.1026 
+8  "A08" 0.832010 0.821550 0.664060 3.16261 3.84029 4.35848 
+9  "A09" 18.1170 17.8910 13.9510 49.3671 61.6291 56.5615 
+10 "A10" 88.8710 88.1260 68.0820 98.6642 99.1385 99.0660
+11 "B01" 18.0200 17.7950 13.9090 55.0686 66.0592 61.9429
+12 "B02" 13.9470 7.22560 8.26540 68.1681 0.0450395 56.4805
+13 "B03" 35.6280 27.8520 32.8420 88.8315 59.9937 99.6552
+14 "B04" 10.6720 5.28080 15.2480 43.1040 0.0502000 87.5639
+15 "B05" 14.4130 15.7890 39.3970 21.7750 70.1273 99.9547 
+16 "B06" 20.6780 26.2380 36.8920 35.2551 99.0188 77.5504 
+17 "B07" 1.45030 2.34850 2.56120 2.04420 12.9928 18.2739 
+18 "B08" 18.0380 25.7190 27.0400 32.3543 99.9619 64.7212 
+19 "B09" 3.37980 3.27430 1.57890 8.38116 9.89768 6.55200 
+20 "B10" 18.4840 18.2440 14.1910 51.0152 63.0221 58.4410 
+21 "C01" 0.825050 0.814760 0.657280 3.45013 5.01294 5.40847 
+22 "C02" 4.57810 3.29160 5.61620 12.9428 4.08519 38.0010 
+23 "C03" 14.5950 11.3080 24.2900 43.8628 27.8035 99.9476 
+24 "C04" 2.74320 2.49490 8.91480 0.0841099 5.05299 57.3589 
+25 "C05" 22.9170 25.7880 40.2490 47.8425 89.5040 94.9187 
+26 "C06" 1.83670 2.40490 5.02520 0.0925296 8.61708 42.0348 
+26 "C07" 26.4450 26.6910 42.3540 60.2448 80.4263 99.6501 
+28 "C08" 10.2540 16.9170 17.2820 20.7339 88.7631 52.2998 
+29 "C09" 19.0520 27.2060 12.2700 41.1843 99.8507 35.2397 
+30 "C10" 0.805310 0.795850 0.639850 3.03575 4.08577 4.67877 
+31 "D01" 88.4950 87.7520 67.9080 99.5510 99.5464 99.5571 
+32 "D02" 61.9490 61.4510 55.8040 96.4784 96.5058 99.5547 
+33 "D03" 70.8290 63.5300 49.3270 99.7724 92.6467 98.0025 
+34 "D04" 55.9600 62.6940 49.9140 89.0089 99.9676 94.1003 
+35 "D05" 71.1690 64.5570 44.5670 99.8200 93.1762 96.0933 
+36 "D06" 58.4250 62.2180 28.8560 95.2652 97.4714 85.5067 
+37 "D07" 38.5680 30.1250 8.72090 97.7247 60.9183 25.4159 
+38 "D08" 38.9330 32.3110 15.6350 94.9899 67.4615 67.8546 
+39 "D09" 9.70690 17.2520 8.69020 18.0329 94.3103 15.6986 
+40 "D10" 88.8520 88.1030 68.1490 98.8895 98.9418 99.0172 
+41 "E01" 18.1400 17.9140 13.9700 56.1278 67.1050 63.4896 
+42 "E02" 8.91530 6.95450 2.01090 42.6753 18.3928 0.240737
+43 "E03" 39.6620 29.4150 2.05650 99.8589 57.9921 0.763152
+44 "E04" 3.84910 2.21640 16.3130 0.0356264 1.61558 77.2429
+45 "E05" 88.5440 87.7950 67.9070 99.2218 99.5992 99.5562
+46 "E06" 0.797860 0.786020 0.637060 3.24176 4.79711 5.19033
+47 "E07" 57.9520 50.1120 24.1350 99.8375 83.3955 73.6909
+48 "E08" 55.6470 45.0930 20.4680 99.9381 76.3745 66.0755
+49 "E09" 1.80460 2.87160 1.55130 4.48621 18.0239 4.30997
+50 "E10" 18.2860 18.0540 14.0520 52.1381 63.9931 59.5867
+51 "F01" 0.821450 0.811590 0.652140 3.57770 5.15708 5.53341
+52 "F02" 37.5450 31.1590 14.8630 96.5601 68.3501 70.3025 
+53 "F03" 9.33780 7.45630 25.3510 10.9434 23.1229 99.7024 
+54 "F04" 12.1560 19.3000 4.12860 23.1756 99.6011 0.0467819 
+55 "F05" 54.5560 53.7060 42.1400 94.0193 93.9462 95.0190 
+56 "F06" 6.40720 6.33990 5.06690 17.0382 27.4615 23.1311 
+57 "F07" 35.9410 31.6060 12.5440 92.1715 71.6310 56.7871 
+58 "F08" 37.1160 32.6870 16.7870 90.7079 71.9484 62.7050 
+59 "F09" 17.6330 26.2060 16.5150 36.1091 99.9776 44.7211 
+60 "F10" 0.817450 0.803300 0.648070 3.03016 4.52847 4.93133 
+61 "G01" 88.1180 87.3790 67.6390 99.6063 99.6546 99.6378 
+62 "G02" 14.1420 14.4220 21.7790 31.5235 64.4645 88.2405 
+63 "G03" 27.0730 16.1500 6.52890 99.3019 18.8709 29.9070 
+64 "G04" 19.3760 9.31950 1.23360 92.7481 0.0514771 0.996714 
+65 "G05" 33.4270 32.9730 25.9370 79.6111 83.8506 83.8771 
+66 "G06" 11.0640 10.9460 8.65770 33.3576 46.6792 41.8190 
+67 "G07" 16.1500 13.5220 3.95020 63.4164 39.5547 3.47786 
+68 "G08" 37.6610 32.4480 16.8480 92.7905 70.2031 67.4679 
+69 "G09" 21.4030 28.6380 6.93640 38.7589 99.9778 0.496405 
+70 "G10" 88.7630 88.0110 68.0300 99.1885 99.2266 99.3112 
+71 "H01" 18.2340 18.0030 14.0320 57.6571 67.9088 64.2915 
+72 "H02" 7.93780 10.0280 2.21420 16.0406 60.3414 0.0759039 
+73 "H03" 5.32950 3.13280 7.61040 18.4523 0.0274370 48.8589 
+74 "H04" 58.2760 57.3920 3.84380 97.3325 94.4934 8.98711 
+75 "H05" 18.0560 17.8320 13.9270 55.2642 65.9668 62.1343 
+76 "H06" 27.8670 27.4770 21.6560 72.6082 79.1552 77.6922 
+77 "H07" 40.9840 36.1270 18.8500 94.1035 76.7796 72.9008 
+78 "H08" 38.1290 32.7720 16.0850 93.5800 70.8410 66.5429 
+79 "H09" 10.9120 18.9050 3.25920 18.3400 97.6540 1.11200 
+80 "H10" 18.3150 18.0830 14.0770 54.1252 65.7287 61.1352 
+81 "I01" 0.877970 0.866490 0.692530 3.89803 5.52321 5.87104 
+82 "I02" 20.9640 18.5090 28.0310 63.1732 61.5508 99.2533 
+83 "I03" 33.5760 40.9120 5.28710 76.4298 99.9653 9.91792 
+84 "I04" 28.7570 16.5770 19.4170 97.5162 15.7443 99.9554 
+85 "I05" 8.34090 8.24580 6.46760 26.2127 37.6943 32.9267 
+86 "I06" 47.5260 46.8020 36.7430 91.1191 92.1693 92.7183 
+87 "I07" 18.5620 14.2840 2.53620 71.7667 36.8616 0.0762142 
+88 "I08" 10.9170 8.92160 2.27380 49.8294 27.4643 0.0776073 
+89 "I09" 17.4380 28.5650 5.55330 34.9025 99.9410 12.7946 
+90 "I10" 0.821180 0.807980 0.647830 3.47476 5.04339 5.42659 
+91 "J01" 88.4510 87.7100 67.8900 99.8550 99.9501 99.9252 
+92 "J02" 28.2480 36.7910 28.9770 62.3789 99.9741 75.3109 
+93 "J03" 46.4790 40.8160 3.05390 99.6210 80.8061 2.48062 
+94 "J04" 10.7330 14.6700 25.4470 21.5610 81.2289 77.0705 
+95 "J05" 1.94760 1.93530 1.62720 4.71988 8.24480 7.82566 
+96 "J06" 72.4300 71.6040 56.5980 98.1204 98.3388 99.1073 
+97 "J07" 39.0010 31.8440 12.6630 96.0770 67.9382 46.5024 
+98 "J08" 41.2900 34.6190 13.3580 96.8660 72.4588 54.8591 
+99 "J09" 34.2630 30.1940 5.39700 90.2234 70.2202 0.0623386 
+100 "J10" 88.6890 87.9420 67.9450 99.2152 99.2801 99.5654 
+101 "K01" 18.2870 18.0550 14.0940 59.0025 69.1409 65.5487 
+102 "K02" 69.7990 64.7750 36.6120 99.6822 95.7093 91.7473 
+103 "K03" 65.6850 71.9500 50.5420 96.8438 99.8905 97.2996 
+104 "K04" 65.7350 62.3550 54.3800 98.3442 95.6648 99.6471 
+105 "K05" 56.6400 60.8890 55.7810 93.0084 99.2612 98.7282 
+106 "K06" 40.8830 40.3150 31.7710 87.4846 90.0455 89.9846 
+107 "K07" 14.7360 14.5610 11.2750 47.0421 59.2067 53.9164 
+108 "K08" 2.93200 2.88900 2.29030 7.41163 11.4541 9.79805 
+109 "K09" 26.2580 30.2340 4.53580 63.1341 93.2221 0.0298406
+110 "K10" 18.2730 18.0420 14.0570 55.2930 66.4439 62.3838 
+111 "L01" 0.862840 0.850990 0.693220 3.87962 5.48970 5.85651
+112 "L02" 6.16360 3.50110 1.81220 38.1729 0.0962079 3.80448
+113 "L03" 26.3380 13.4420 1.40110 99.7165 4.53211 1.36954 
+114 "L04" 38.5470 28.0920 19.9310 99.9731 55.0042 83.5153 
+115 "L05" 39.7740 29.2290 14.6560 99.9422 58.7798 61.5525 
+116 "L06" 46.5510 31.0860 1.68400 99.8180 54.7591 3.14563 
+117 "L07" 40.3200 44.8880 2.28100 81.9478 98.4938 0.688775 
+118 "L08" 30.8790 30.5350 4.30920 83.9547 79.4768 0.0391914 
+119 "L09" 34.3480 43.5170 4.20490 69.3966 99.9270 0.0658071 
+120 "L10" 0.800670 0.788840 0.635170 3.97289 5.83698 5.98220 
+121 "M01" 18.1930 17.9660 14.0100 59.6309 69.7719 66.1588 
+122 "M02" 23.9480 12.4740 6.90150 99.7706 4.70147 59.4602 
+123 "M03" 4.91740 2.88340 3.24780 28.1391 0.561666 23.5497 
+124 "M04" 22.8350 11.3090 2.24090 99.8063 1.68667 20.7720 
+125 "M05" 37.8580 20.9420 3.22960 99.8275 25.8631 6.21660 
+126 "M06" 68.6210 59.7530 4.77180 97.8760 92.5321 9.30162 
+127 "M07" 62.1430 60.5650 3.45590 96.8719 96.3609 10.1197 
+128 "M08" 36.4040 42.0820 3.08240 80.3325 98.4745 0.724150 
+129 "M09" 3.84880 2.97780 0.821780 16.4467 9.88207 4.80164 
+130 "M10" 18.2420 18.0100 14.0270 56.4231 67.0989 63.5167 
+131 "N01" 88.2290 87.5100 67.7730 99.7306 99.7388 99.7304 
+132 "N02" 18.2350 18.0070 14.0330 58.4655 68.6862 65.0329 
+133 "N03" 0.902820 0.890040 0.724140 3.68406 5.33264 5.63854 
+134 "N04" 88.5680 87.8170 67.9670 99.6812 99.9152 99.8513 
+135 "N05" 18.1220 17.8970 13.9580 56.8631 66.9076 63.7330 
+136 "N06" 0.910530 0.896090 0.727430 3.61138 5.17412 5.50048 
+137 "N07" 88.7080 87.9570 67.9660 99.5758 99.5768 99.5772 
+138 "N08" 18.1980 17.9690 14.0030 56.1060 66.6952 63.0654 
+139 "N09" 0.843350 0.831020 0.672600 3.93895 5.79967 5.81986 
+140 "N10" 88.8180 88.0710 68.1240 99.5289 99.6025 99.5746 
 END_DATA
diff --git a/ref/afiles b/ref/afiles
index bd8a2f1..1b1fc6c 100644
--- a/ref/afiles
+++ b/ref/afiles
@@ -17,6 +17,7 @@ CMP_DT_003.cht
 CMP_Digital_Target-4.cht
 CMP_Digital_Target-4.ti2
 CMP_Digital_Target-4.cie
+CMP_Digital_Target-7.cht
 ColorChecker.cht
 ColorChecker.cie
 ColorChecker.ti2
diff --git a/ref/linear.cal b/ref/linear.cal
index 9c88605..bdbf22c 100644
--- a/ref/linear.cal
+++ b/ref/linear.cal
@@ -2,7 +2,7 @@ CAL
 
 DESCRIPTOR "Argyll Device Calibration Curves"
 ORIGINATOR "Argyll synthcal"
-CREATED "Mon Oct 26 01:10:48 2015"
+CREATED "Tue Sep 27 01:29:33 2016"
 DEVICE_CLASS "DISPLAY"
 COLOR_REP "RGB"
 
diff --git a/ref/sRGB.icm b/ref/sRGB.icm
index 9d33a4b..59b4507 100644
--- a/ref/sRGB.icm
+++ b/ref/sRGB.icm
diff --git a/ref/strange.cal b/ref/strange.cal
index 5f2e94d..94bacf5 100644
--- a/ref/strange.cal
+++ b/ref/strange.cal
@@ -2,7 +2,7 @@ CAL
 
 DESCRIPTOR "Argyll Device Calibration Curves"
 ORIGINATOR "Argyll synthcal"
-CREATED "Mon Oct 26 01:10:48 2015"
+CREATED "Tue Sep 27 01:29:33 2016"
 DEVICE_CLASS "DISPLAY"
 COLOR_REP "RGB"