Update to 12.41

3 months ago · 8afb211a87
39 changed files with 939 additions and 759 deletions
--- a/33
+++ b/33
@ -7,10 +7,33 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.30. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)

+Apr. 7, 2022 - Version 12.41
+
+  - Added support for "OM SYSTEM" maker notes
+  - Added 2 new Sony LensType values (thanks Jos Roost)
+  - Added some new Canon lenses (thanks LibRaw)
+  - Added a new Nikon LensID (thanks Bert Ligtvoet)
+  - Added a new Canon ContinuousDrive value (thanks Wolfgang Gulcker)
+  - Enhanced -v0 option to also print new file name when renaming, moving or
+    copying a file
+  - Updated xmp2exif.args and exif2xmp.args helper files to reflect the IPTC
+    Photometadata Mapping Guidelines version 2202.1
+  - Made "Invalid Xxx data" a minor warning for MakerNote data
+  - Patched to allow writing of MP4 videos which have other tracks with a
+    missing sample description entry
+  - Patched MacOS version to specify directory for external utilities (setfile,
+    xattr, stat, mdls and osascript from /usr/bin, and tag from /usr/local/bin)
+  - Fixed long-standing problem where Windows version could behave differently
+    for -if conditions containing undefined tags
+  - Fixed problem where -W+! combined with -j or -X produced invalid JSON or XML
+    when  processing multiple files
+  - Fixed potential "uninitialized value $time in division" runtime warning when
+    reading MP4 videos
+
 Feb. 9, 2022 - Version 12.40

-  - Added a new Nikon LensID (thanks Wolfgang Exler)
  - Added PageCount tag to return the number of pages in a multi-page TIFF
+  - Added a new Nikon LensID (thanks Wolfgang Exler)
  - Added a few more Sony LensTypes (thanks Jos Roost)
  - Decode some new Canon tags (thanks Mark Reid)
  - Decode another Nikon Z9 tag (thanks Warren Hatch)
@ -20,14 +43,14 @@ Feb. 9, 2022 - Version 12.40
  - Updated photoshop_paths.config to include WorkingPath
  - Patched to allow writing of MP4 videos which have url tracks with a missing
    sample description entry
-  - Fixed typo in the name of a new Nikon tag (thanks Herb)
-  - Fixed description of GPR (General Purpose RAW) file type
+  - Fixed deep recursion error when reading multi-page TIFF images with more
+    than 100 pages
  - Fixed potential deep recursion runtime error when writing nested XMP
    structures
  - Fixed warning which could be generated when writing new
    Composite:GPSCoordinates tag
-  - Fixed deep recursion error when reading multi-page TIFF images with more
-    than 100 pages
+  - Fixed description of GPR (General Purpose RAW) file type
+  - Fixed typo in the name of a new Nikon tag (thanks Herb)

 Jan. 13, 2022 - Version 12.39

--- a/META.json
+++ b/META.json
@ -47,6 +47,6 @@
      }
   },
   "release_status" : "stable",
-   "version" : "12.40",
+   "version" : "12.41",
   "x_serialization_backend" : "JSON::PP version 4.02"
 }
--- a/META.yml
+++ b/META.yml
@ -28,5 +28,5 @@ recommends:
  Time::HiRes: 0
 requires:
  perl: 5.004
-version: 12.40
+version: 12.41
 x_serialization_backend: 'JSON::PP version 4.02'
--- a/4
+++ b/4
@ -107,8 +107,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:

  cd ~/Desktop
-  gzip -dc Image-ExifTool-12.40.tar.gz | tar -xf -
-  cd Image-ExifTool-12.40
+  gzip -dc Image-ExifTool-12.41.tar.gz | tar -xf -
+  cd Image-ExifTool-12.41
  ./exiftool t/images/ExifTool.jpg

 Note:  These commands extract meta information from one of the test images. 
--- a/arg_files/exif2xmp.args
+++ b/arg_files/exif2xmp.args
@ -12,8 +12,10 @@
 #               2013/06/12 - PH Additions for the Exif 2.3 for XMP spec
 #               2015/01/12 - PH Avoid copying to non-standard namespaces
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
+#               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #
 # References:   http://www.metadataworkinggroup.org/specs/
+#               https://iptc.org/std/photometadata/documentation/mappingguidelines/
 #
 # Notes:     1) The first three arguments copy most of the EXIF and GPS tags to
 #               XMP-exif/XMP-tiff, and the remaining arguments handle tags
@ -22,6 +24,8 @@
 #            2) These arguments will not delete existing XMP tags which are
 #               missing from the EXIF.  The XMP tags should be deleted
 #               beforehand if required.
+#
+#            3) EXIF:SubjectArea is not currently mapped into XMP-iptcExt:ImageRegion
 #------------------------------------------------------------------------------
 -XMP-exif:all < EXIF:all
 -XMP-exifEX:all < EXIF:all
@ -37,6 +41,7 @@
 -XMP-xmp:CreatorTool < EXIF:Software
 -XMP-dc:Rights < EXIF:Copyright
 -XMP-dc:Creator < EXIF:Artist
+-XMP-iptcExt:DigitalImageGUID < EXIF:DigImageGUID
 # XMP flash information is translated by the Composite Flash tag
 -Composite:Flash < EXIF:Flash
 # overwrite GPS tags which have different formats in XMP
--- a/arg_files/xmp2exif.args
+++ b/arg_files/xmp2exif.args
@ -14,8 +14,10 @@
 #               2016/09/26 - PH Write Composite SubSec tags
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
 #               2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
+#               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #
 # References:   http://www.metadataworkinggroup.org/specs/
+#               https://iptc.org/std/photometadata/documentation/mappingguidelines/
 #
 # Notes:     1) The first three arguments copy the bulk of the EXIF and GPS
 #               information, and the remaining arguments handle the tags
@ -24,6 +26,8 @@
 #            2) These arguments will not delete existing EXIF tags which are
 #               missing from the XMP.  The EXIF tags should be deleted
 #               beforehand if required.
+#
+#            3) XMP-iptcExt:ImageRegion is not currently mapped into EXIF:SubjectArea
 #------------------------------------------------------------------------------
 -EXIF:all < XMP-exif:all
 -EXIF:all < XMP-exifEX:all
@ -37,7 +41,9 @@
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate
 -EXIF:Software < XMP-xmp:CreatorTool
 -EXIF:Copyright < XMP-dc:Rights
+-EXIF:Artist < XMP-plus:ImageCreatorName
 -EXIF:Artist < XMP-dc:Creator
+-EXIF:DigImageGUID < XMP-iptcExt:DigitalImageGUID
 # XMP flash information is translated by the Composite Flash tag
 -EXIF:Flash < Composite:Flash
 # generate GPS tags which have been combined into other XMP tags
--- a/73
+++ b/73
@ -8,9 +8,10 @@
 #               (See html/history.html for revision history)
 #------------------------------------------------------------------------------
 use strict;
+use warnings;
 require 5.004;

-my $version = '12.40';
+my $version = '12.41';

 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@ -109,6 +110,8 @@ my %database;       # lookup for database information based on file name (in Exi
 my %filterExt;      # lookup for filtered extensions
 my %ignore;         # directory names to ignore
 my $ignoreHidden;   # flag to ignore hidden files
+my %outComma;       # flag that output text file needs a comma
+my %outTrailer;     # trailer for output text file
 my %preserveTime;   # preserved timestamps for files
 my %printFmt;       # the contents of the print format file
 my %setTags;        # hash of list references for tags to set from files
@ -441,6 +444,8 @@ undef %database;
 undef %endDir;
 undef %filterExt;
 undef %ignore;
+undef %outComma;
+undef %outTrailer;
 undef %printFmt;
 undef %preserveTime;
 undef %setTags;
@ -1821,8 +1826,21 @@ if ($filtered and not $validFile) {
 PrintCSV() if $csv and not $isWriting;

 # print folder/file trailer if necessary
-print $sectTrailer if $sectTrailer and not $textOut;
-print $fileTrailer if $fileTrailer and not $textOut and not $fileHeader;
+if ($textOut) {
+    foreach (keys %outTrailer) {
+        next unless $outTrailer{$_};
+        if ($mt->Open(\*OUTTRAIL, $_, '>>')) {
+            my $fp = \*OUTTRAIL;
+            print $fp $outTrailer{$_};
+            close $fp;
+        } else {
+            Error("Error appending to $_\n");
+        }
+    }
+} else {
+    print $sectTrailer if $sectTrailer;
+    print $fileTrailer if $fileTrailer and not $fileHeader;
+}

 my $totWr = $countGoodWr + $countBadWr + $countSameWr + $countCopyWr +
            $countGoodCr + $countBadCr;
@ -2160,6 +2178,9 @@ sub GetImageInfo($$)
        $tmpText = $outfile unless $append;
    }

+    # restore state of comma flag for this file if appending
+    $comma = $outComma{$outfile} if $append and ($textOverwrite & 0x02);
+
    # print the results for this file
    if (%printFmt) {
        # output using print format file (-p) option
@ -2221,7 +2242,7 @@ sub GetImageInfo($$)
        if ($fp) {
            # print file header (only once)
            if ($fileHeader) {
-                print $fp $fileHeader;
+                print $fp $fileHeader unless defined $outfile and ($created{$outfile} or $appended{$outfile});
                undef $fileHeader unless $textOut;
            }
            if ($html) {
@ -2674,9 +2695,17 @@ TAG:    foreach $tag (@foundTags) {
        }
    }
    if ($outfile) {
-        # write section and file trailers before closing the file
-        print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
-        print $fp $fileTrailer if $fileTrailer;
+        if ($textOverwrite & 0x02) {
+            # save state of this file if we may be appending
+            $outComma{$outfile} = $comma;
+            $outTrailer{$outfile} = '';
+            $outTrailer{$outfile} .= $sectTrailer and $sectTrailer = '' if $sectTrailer;
+            $outTrailer{$outfile} .= $fileTrailer if $fileTrailer;
+        } else {
+            # write section and file trailers before closing the file
+            print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
+            print $fp $fileTrailer if $fileTrailer;
+        }
        close($fp);
        undef $tmpText;
        if ($lineCount) {
@ -2926,7 +2955,7 @@ sub SetImageInfo($$$)
            }
        }
        if (defined $outfile) {
-            $verbose and print $vout "'${infile}' --> '${outfile}'\n";
+            defined $verbose and print $vout "'${infile}' --> '${outfile}'\n";
            # create output directory if necessary
            CreateDirectory($outfile);
            # set temporary file (automatically erased on abnormal exit)
@ -5136,13 +5165,14 @@ The following examples demonstrate basic use of the B<-csv> option:
    # update metadata for all images in a directory from CSV file
    exiftool -csv=a.csv dir

-Empty values are ignored when importing (unless the B<-f> option is used and
-the API MissingTagValue is set to an empty string, in which case the tag is
+When importing, empty values are ignored unless the B<-f> option is used and
+the API MissingTagValue is set to an empty string (in which case the tag is
 deleted).  Also, FileName and Directory columns are ignored if they exist
-(ie. ExifTool will not attempt to write these tags with a CSV import).  To
-force a tag to be deleted, use the B<-f> option and set the value to "-" in
-the CSV file (or to the MissingTagValue if this API option was used).
-Multiple databases may be imported in a single command.
+(ie. ExifTool will not attempt to write these tags with a CSV import), but
+all other columns are imported.  To force a tag to be deleted, use the B<-f>
+option and set the value to "-" in the CSV file (or to the MissingTagValue
+if this API option was used).  Multiple databases may be imported in a
+single command.

 When exporting a CSV file, the B<-g> or B<-G> option adds group names to the
 tag headings.  If the B<-a> option is used to allow duplicate tag names, the
@ -5436,7 +5466,7 @@ with this command:

 produces output like this:

-    -- Generated by ExifTool 12.40 --
+    -- Generated by ExifTool 12.41 --
    File: a.jpg - 2003:10:31 15:44:19
    (f/5.6, 1/60s, ISO 100)
    File: b.jpg - 2006:05:23 11:57:38
@ -5555,7 +5585,9 @@ level greater than 0, most other options are ignored and normal console
 output is suppressed unless specific tags are extracted.  Using B<-v0>
 causes the console output buffer to be flushed after each line (which may be
 useful to avoid delays when piping exiftool output), and prints the name of
-each processed file when writing.  Also see the B<-progress> option.
+each processed file when writing and the new file name when renaming,
+moving or copying.  Verbose levels above B<-v0> do not flush after each
+line.  Also see the B<-progress> option.

 =item B<-w>[+|!] I<EXT> or I<FMT> (B<-textOut>)

@ -5768,11 +5800,10 @@ an XMP extension for the output file.
 =item B<-a>, B<--a> (B<-duplicates>, B<--duplicates>)

 Allow (B<-a>) or suppress (B<--a>) duplicate tag names to be extracted.  By
-default, duplicate tags are suppressed when reading unless the B<-ee> or
-B<-X> options are used or the Duplicates option is enabled in the
-configuration file. This option has an affect when writing only to allow
-duplicate Warning messages to be shown.  Duplicate tags are always extracted
-when copying.
+default, duplicate tags are suppressed when reading unless the B<-ee> or B<-X>
+options are used or the Duplicates option is enabled in the configuration file.
+When writing, this option allows multiple Warning messages to be shown.
+Duplicate tags are always extracted when copying.

 =item B<-e> (B<--composite>)

--- a/html/ExifTool.pdf
+++ b/html/ExifTool.pdf
@ -12,7 +12,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     1)Tj
+(                           -- Image::ExifTool 12.41 --                                     1)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (EXIFTOOL\(1\)           User Contributed Perl Documentation          EXIFTOOL\(1\))Tj
@ -189,7 +189,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     2)Tj
+(                           -- Image::ExifTool 12.41 --                                     2)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (         ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SVG   r)Tj
@ -384,7 +384,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     3)Tj
+(                           -- Image::ExifTool 12.41 --                                     3)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (       Exports nothing by default, but "ImageInfo" and all static methods may)Tj
@ -619,7 +619,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     4)Tj
+(                           -- Image::ExifTool 12.41 --                                     4)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           are interpreted:)Tj
@ -768,7 +768,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     5)Tj
+(                           -- Image::ExifTool 12.41 --                                     5)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               There will be 1:1 correspondence between the requested tags and)Tj
@ -923,7 +923,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     6)Tj
+(                           -- Image::ExifTool 12.41 --                                     6)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           details about the encodings.  By default, most returned values are)Tj
@ -1114,7 +1114,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     7)Tj
+(                           -- Image::ExifTool 12.41 --                                     7)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               name documentation\) as a block.  Setting this to a value of 2)Tj
@ -1267,7 +1267,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     8)Tj
+(                           -- Image::ExifTool 12.41 --                                     8)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               Fallback internal IPTC character set to assume if IPTC)Tj
@ -1414,7 +1414,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                     9)Tj
+(                           -- Image::ExifTool 12.41 --                                     9)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               format is different when copying tags with)Tj
@ -1567,7 +1567,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    10)Tj
+(                           -- Image::ExifTool 12.41 --                                    10)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               also avoid extracting any EXIF MakerNote information, and will)Tj
@ -1720,7 +1720,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    11)Tj
+(                           -- Image::ExifTool 12.41 --                                    11)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               Default is undef.)Tj
@ -1911,7 +1911,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    12)Tj
+(                           -- Image::ExifTool 12.41 --                                    12)Tj
 /TT4 1 Tf
 0 -2.7333 TD
 (           ListJoin)Tj
@ -2054,7 +2054,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    13)Tj
+(                           -- Image::ExifTool 12.41 --                                    13)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               Flag set to assume that QuickTime date/time values are stored)Tj
@ -2203,7 +2203,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    14)Tj
+(                           -- Image::ExifTool 12.41 --                                    14)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               converted when the DateFormat option is used.  Default is)Tj
@ -2356,7 +2356,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    15)Tj
+(                           -- Image::ExifTool 12.41 --                                    15)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (               by prefixing the parameter name with a dollar sign just like)Tj
@ -2541,7 +2541,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    16)Tj
+(                           -- Image::ExifTool 12.41 --                                    16)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (       Inputs:)Tj
@ -2714,7 +2714,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    17)Tj
+(                           -- Image::ExifTool 12.41 --                                    17)Tj
 /TT4 1 Tf
 0 -2.7333 TD
 (       To be clear, it is NOT necessary to call "ExtractInfo" or "ImageInfo")Tj
@ -2849,7 +2849,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    18)Tj
+(                           -- Image::ExifTool 12.41 --                                    18)Tj
 /TT4 1 Tf
 0 -2.7333 TD
 (   G)Tj
@ -3070,7 +3070,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    19)Tj
+(                           -- Image::ExifTool 12.41 --                                    19)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (       is set, otherwise the ValueConv value is returned.  The PrintConv)Tj
@ -3213,7 +3213,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    20)Tj
+(                           -- Image::ExifTool 12.41 --                                    20)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           undefined for any non-rational tag.  The Raw value should always)Tj
@ -3370,7 +3370,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    21)Tj
+(                           -- Image::ExifTool 12.41 --                                    21)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           # write structured information as a serialized string)Tj
@ -3517,7 +3517,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    22)Tj
+(                           -- Image::ExifTool 12.41 --                                    22)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           NoFlat)Tj
@ -3708,7 +3708,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    23)Tj
+(                           -- Image::ExifTool 12.41 --                                    23)Tj
 /TT4 1 Tf
 0 -2.7333 TD
 (   G)Tj
@ -3899,7 +3899,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    24)Tj
+(                           -- Image::ExifTool 12.41 --                                    24)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           tag names are not case sensitive, and may be prefixed by one or)Tj
@ -4050,7 +4050,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    25)Tj
+(                           -- Image::ExifTool 12.41 --                                    25)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           between groups.)Tj
@ -4303,7 +4303,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    26)Tj
+(                           -- Image::ExifTool 12.41 --                                    26)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           0\) ExifTool object reference)Tj
@ -4484,7 +4484,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    27)Tj
+(                           -- Image::ExifTool 12.41 --                                    27)Tj
 /TT4 1 Tf
 0 -2.7333 TD
 (           1-N\) Groups in order of priority.  If no groups are specified, the)Tj
@ -4695,7 +4695,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    28)Tj
+(                           -- Image::ExifTool 12.41 --                                    28)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           0\) ExifTool object reference)Tj
@ -4842,7 +4842,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    29)Tj
+(                           -- Image::ExifTool 12.41 --                                    29)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           the format type of the extracted value.  Generated only if the)Tj
@ -5067,7 +5067,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    30)Tj
+(                           -- Image::ExifTool 12.41 --                                    30)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (       Inputs:)Tj
@ -5362,7 +5362,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    31)Tj
+(                           -- Image::ExifTool 12.41 --                                    31)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           RAF, RIFF, RSRC, RTF, Radiance, Rawzor, Real, Red, SVG, SigmaRaw,)Tj
@ -5517,7 +5517,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    32)Tj
+(                           -- Image::ExifTool 12.41 --                                    32)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           a group name are returned as 2 hex digits.\))Tj
@ -5772,7 +5772,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    33)Tj
+(                           -- Image::ExifTool 12.41 --                                    33)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (       Can the specified file be written?)Tj
@ -6029,7 +6029,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    34)Tj
+(                           -- Image::ExifTool 12.41 --                                    34)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (           The encoding of file names is specified via the "CharsetFileName")Tj
@ -6242,7 +6242,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    35)Tj
+(                           -- Image::ExifTool 12.41 --                                    35)Tj
 /TT4 1 Tf
 0 -1.6333 TD
 (       ISO 2022 character set shifting is not supported.  Instead, a warning)Tj
@ -6423,7 +6423,7 @@ BT
 /GS1 gs
 0 Tc
 0 Tw
-(                           -- Image::ExifTool 12.40 --                                    36)Tj
+(                           -- Image::ExifTool 12.41 --                                    36)Tj
 /TT4 1 Tf
 0 -2.7333 TD
 (   P)Tj
@ -7322,8 +7322,8 @@ endobj
 endobj
 121 0 obj
 <<
-/CreationDate (D:20220209071759-05'00')
-/ModDate (D:20220209071759-05'00')
+/CreationDate (D:20220407133711-04'00')
+/ModDate (D:20220407133711-04'00')
 /Producer (Apple pstopdf)
 >>
 endobj
@ -7464,7 +7464,7 @@ trailer
 /Size 123
 /Root 122 0 R
 /Info 121 0 R
-/ID [<1dfa2704643968625360efa8137aec83><1dfa2704643968625360efa8137aec83>]
+/ID [<701c1af50404a6d60be858476cbfc14b><701c1af50404a6d60be858476cbfc14b>]
 >>
 startxref
 175378
--- a/html/Shift.pdf
+++ b/html/Shift.pdf
@ -593,8 +593,8 @@ endobj
 endobj
 16 0 obj
 <<
-/CreationDate (D:20220209071800-05'00')
-/ModDate (D:20220209071800-05'00')
+/CreationDate (D:20220407133711-04'00')
+/ModDate (D:20220407133711-04'00')
 /Producer (Apple pstopdf)
 >>
 endobj
@ -630,7 +630,7 @@ trailer
 /Size 18
 /Root 17 0 R
 /Info 16 0 R
-/ID [<8a6b1cc7c134ddd2a21736301b7957c8><8a6b1cc7c134ddd2a21736301b7957c8>]
+/ID [<6d156f2b2da41f7f9bde1bbc9e4cbea9><6d156f2b2da41f7f9bde1bbc9e4cbea9>]
 >>
 startxref
 11800
--- a/html/TagNames/Canon.html
+++ b/html/TagNames/Canon.html
@ -992,6 +992,7 @@
  <br>4 = Continuous, Low
  <br>5 = Continuous, High
  <br>6 = Silent Single
+  <br>8 = Continuous, High+
  <br>9 = Single, Silent
  <br>10 = Continuous, Silent</td></tr></table>
 </td></tr>
@ -1477,6 +1478,7 @@ attempting to identify the specific lens model.</p>
 </tr><tr><td>53</td><td>= Canon EF-S 18-55mm f/3.5-5.6 III</td>
 </tr><tr><td>54</td><td>= Canon EF-S 55-250mm f/4-5.6 IS II</td>
 </tr><tr><td>60</td><td>= Irix 11mm f/4</td>
+</tr><tr><td>63</td><td>= Irix 30mm F1.4 Dragonfly</td>
 </tr><tr><td>80</td><td>= Canon TS-E 50mm f/2.8L Macro</td>
 </tr><tr><td>81</td><td>= Canon TS-E 90mm f/2.8L Macro</td>
 </tr><tr><td>82</td><td>= Canon TS-E 135mm f/4L Macro</td>
@ -1853,6 +1855,9 @@ attempting to identify the specific lens model.</p>
 </tr><tr><td>61182.25</td><td>= Canon RF 100-400mm F5.6-8 IS USM + RF1.4x</td>
 </tr><tr><td>61182.26</td><td>= Canon RF 100-400mm F5.6-8 IS USM + RF2x</td>
 </tr><tr><td>61182.27</td><td>= Canon RF 16mm F2.8 STM</td>
+</tr><tr><td>61182.28</td><td>= Canon RF 400mm F2.8L IS USM</td>
+</tr><tr><td>61182.29</td><td>= Canon RF 400mm F2.8L IS USM + RF1.4x</td>
+</tr><tr><td>61182.30</td><td>= Canon RF 400mm F2.8L IS USM + RF2x</td>
 </tr><tr><td>61491</td><td>= Canon CN-E 14mm T3.1 L F</td>
 </tr><tr><td>61492</td><td>= Canon CN-E 24mm T1.5 L F</td>
 </tr><tr><td>61494</td><td>= Canon CN-E 85mm T1.3 L F</td>
@ -6549,7 +6554,10 @@ valid for all camera models)</span></span></td></tr>
  <br>283 = Canon RF 100-400mm F5.6-8 IS USM
  <br>284 = Canon RF 100-400mm F5.6-8 IS USM + RF1.4x
  <br>285 = Canon RF 100-400mm F5.6-8 IS USM + RF2x
-  <br>288 = Canon RF 16mm F2.8 STM</span></td></tr>
+  <br>288 = Canon RF 16mm F2.8 STM
+  <br>289 = Canon RF 400mm F2.8L IS USM
+  <br>290 = Canon RF 400mm F2.8L IS USM + RF1.4x
+  <br>291 = Canon RF 400mm F2.8L IS USM + RF2x</span></td></tr>
 </table></td></tr></table></blockquote>

 <h2><a name='SerialInfo'>Canon SerialInfo Tags</a></h2>
@ -11612,7 +11620,7 @@ SX280, and CR3 images from cameras such as the EOS M50.</p>

 <hr>
 (This document generated automatically by Image::ExifTool::BuildTagLookup)
-<br><i>Last revised Feb 9, 2022</i>
+<br><i>Last revised Apr 7, 2022</i>
 <p class=lf><a href='index.html'>&lt;-- ExifTool Tag Names</a></p>
 </body>
 </html>
--- a/html/TagNames/DNG.html
+++ b/html/TagNames/DNG.html
@ -99,6 +99,7 @@ still proprietary) Adobe format.</p>
  <br>MakerNoteNintendo
  <br>MakerNoteOlympus
  <br>MakerNoteOlympus2
+  <br>MakerNoteOlympus3
  <br>MakerNoteLeica
  <br>MakerNoteLeica2
  <br>MakerNoteLeica3
@ -143,7 +144,7 @@ still proprietary) Adobe format.</p>
  <br>MakerNoteUnknownText
  <br>MakerNoteUnknownBinary
  <br>MakerNoteUnknown</td>
-<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td>
+<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td>
 <td>--&gt; <a href='Apple.html'>Apple Tags</a>
  <br>--&gt; <a href='Nikon.html'>Nikon Tags</a>
  <br>--&gt; <a href='Canon.html'>Canon Tags</a>
@ -189,6 +190,7 @@ still proprietary) Adobe format.</p>
  <br>--&gt; <a href='Nintendo.html'>Nintendo Tags</a>
  <br>--&gt; <a href='Olympus.html'>Olympus Tags</a>
  <br>--&gt; <a href='Olympus.html'>Olympus Tags</a>
+  <br>--&gt; <a href='Olympus.html'>Olympus Tags</a>
  <br>--&gt; <a href='Panasonic.html'>Panasonic Tags</a>
  <br>--&gt; <a href='Panasonic.html#Leica2'>Panasonic Leica2 Tags</a>
  <br>--&gt; <a href='Panasonic.html#Leica3'>Panasonic Leica3 Tags</a>
@ -302,7 +304,7 @@ information.</p>

 <hr>
 (This document generated automatically by Image::ExifTool::BuildTagLookup)
-<br><i>Last revised Oct 22, 2019</i>
+<br><i>Last revised Apr 7, 2022</i>
 <p class=lf><a href='index.html'>&lt;-- ExifTool Tag Names</a></p>
 </body>
 </html>
--- a/html/TagNames/EXIF.html
+++ b/html/TagNames/EXIF.html
@ -1885,6 +1885,7 @@ hours, 2. If present, the time zone offset of ModifyDate)</span></span></td></tr
  <br>MakerNoteNintendo
  <br>MakerNoteOlympus
  <br>MakerNoteOlympus2
+  <br>MakerNoteOlympus3
  <br>MakerNoteLeica
  <br>MakerNoteLeica2
  <br>MakerNoteLeica3
@ -1929,8 +1930,8 @@ hours, 2. If present, the time zone offset of ModifyDate)</span></span></td></tr
  <br>MakerNoteUnknownText
  <br>MakerNoteUnknownBinary
  <br><u>MakerNoteUnknown</u></td>
-<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td>
-<td class=c>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD</td>
+<td class=c>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef<br>undef</td>
+<td class=c>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD<br>ExifIFD</td>
 <td>--&gt; <a href='Apple.html'>Apple Tags</a>
  <br>--&gt; <a href='Nikon.html'>Nikon Tags</a>
  <br>--&gt; <a href='Canon.html'>Canon Tags</a>
@ -1976,6 +1977,7 @@ hours, 2. If present, the time zone offset of ModifyDate)</span></span></td></tr
  <br>--&gt; <a href='Nintendo.html'>Nintendo Tags</a>
  <br>--&gt; <a href='Olympus.html'>Olympus Tags</a>
  <br>--&gt; <a href='Olympus.html'>Olympus Tags</a>
+  <br>--&gt; <a href='Olympus.html'>Olympus Tags</a>
  <br>--&gt; <a href='Panasonic.html'>Panasonic Tags</a>
  <br>--&gt; <a href='Panasonic.html#Leica2'>Panasonic Leica2 Tags</a>
  <br>--&gt; <a href='Panasonic.html#Leica3'>Panasonic Leica3 Tags</a>
@ -3812,7 +3814,7 @@ these unless they already exist in the file)</span></span></td></tr>

 <hr>
 (This document generated automatically by Image::ExifTool::BuildTagLookup)
-<br><i>Last revised Oct 16, 2021</i>
+<br><i>Last revised Apr 7, 2022</i>
 <p class=lf><a href='index.html'>&lt;-- ExifTool Tag Names</a></p>
 </body>
 </html>
--- a/html/TagNames/Nikon.html
+++ b/html/TagNames/Nikon.html
@ -8732,6 +8732,7 @@ used to specify the lens for ExifTool to choose in these cases (see the
 </tr><tr><td>'82 34 76 A6 38 40 4B 0E'</td><td>= Sigma 150-600mm F5-6.3 DG OS HSM | C</td>
 </tr><tr><td>'82 48 8E 8E 24 24 87 0E'</td><td>= AF-S VR Nikkor 300mm f/2.8G IF-ED</td>
 </tr><tr><td>'83 00 B0 B0 5A 5A 88 04'</td><td>= FSA-L2, EDG 65, 800mm F13 G</td>
+</tr><tr><td>'87 2C 2D 8E 2C 40 4B 0E'</td><td>= Sigma 18-300mm F3.5-6.3 DC Macro HSM</td>
 </tr><tr><td>'88 54 50 50 0C 0C 4B 06'</td><td>= Sigma 50mm F1.4 DG HSM | A</td>
 </tr><tr><td>'89 30 2D 80 2C 40 4B 0E'</td><td>= Sigma 18-200mm F3.5-6.3 DC Macro OS HS | C</td>
 </tr><tr><td>'89 3C 53 80 30 3C 8B 06'</td><td>= AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED</td>
@ -8949,7 +8950,7 @@ used to specify the lens for ExifTool to choose in these cases (see the

 <hr>
 (This document generated automatically by Image::ExifTool::BuildTagLookup)
-<br><i>Last revised Feb 9, 2022</i>
+<br><i>Last revised Apr 7, 2022</i>
 <p class=lf><a href='index.html'>&lt;-- ExifTool Tag Names</a></p>
 </body>
 </html>
--- a/html/TagNames/Olympus.html
+++ b/html/TagNames/Olympus.html
@ -845,196 +845,196 @@ Vivitar are not listed.</p>
 <td>'S0093'</td><td>= E-P7</td>
 </tr><tr><td>'D4311'</td><td>= FE-140,X-725</td>
 <td class=b>'D4479'</td><td class=b>= VG130,D710</td>
-<td>'SR45'</td><td>= D220</td>
+<td>'S0095'</td><td>= OM-1</td>
 </tr><tr><td>'D4312'</td><td>= FE150,X730</td>
 <td class=b>'D4480'</td><td class=b>= VG120,D705</td>
-<td>'SR55'</td><td>= D320L</td>
+<td>'SR45'</td><td>= D220</td>
 </tr><tr><td>'D4313'</td><td>= FE160,X735</td>
 <td class=b>'D4482'</td><td class=b>= VR310,D720</td>
-<td>'SR83'</td><td>= D340L</td>
+<td>'SR55'</td><td>= D320L</td>
 </tr><tr><td>'D4314'</td><td>= u740,S740</td>
 <td class=b>'D4484'</td><td class=b>= VR320,D725</td>
-<td>'SR85'</td><td>= C830L,D340R</td>
+<td>'SR83'</td><td>= D340L</td>
 </tr><tr><td>'D4315'</td><td>= u750,S750</td>
 <td class=b>'D4486'</td><td class=b>= VR330,D730</td>
-<td>'SR852'</td><td>= C860L,D360L</td>
+<td>'SR85'</td><td>= C830L,D340R</td>
 </tr><tr><td>'D4316'</td><td>= u730/S730</td>
 <td class=b>'D4488'</td><td class=b>= VG110,D700</td>
-<td>'SR872'</td><td>= C900Z,D400Z</td>
+<td>'SR852'</td><td>= C860L,D360L</td>
 </tr><tr><td>'D4317'</td><td>= FE115,X715</td>
 <td class=b>'D4490'</td><td class=b>= SP-610UZ</td>
-<td>'SR874'</td><td>= C960Z,D460Z</td>
+<td>'SR872'</td><td>= C900Z,D400Z</td>
 </tr><tr><td>'D4321'</td><td>= SP550UZ</td>
 <td class=b>'D4492'</td><td class=b>= SZ-10</td>
-<td>'SR951'</td><td>= C2000Z</td>
+<td>'SR874'</td><td>= C960Z,D460Z</td>
 </tr><tr><td>'D4322'</td><td>= SP510UZ</td>
 <td class=b>'D4494'</td><td class=b>= SZ-20</td>
-<td>'SR952'</td><td>= C21</td>
+<td>'SR951'</td><td>= C2000Z</td>
 </tr><tr><td>'D4324'</td><td>= FE170,X760</td>
 <td class=b>'D4496'</td><td class=b>= SZ-30MR</td>
-<td>'SR953'</td><td>= C21T.commu</td>
+<td>'SR952'</td><td>= C21</td>
 </tr><tr><td>'D4326'</td><td>= FE200</td>
 <td class=b>'D4498'</td><td class=b>= SP-810UZ</td>
-<td>'SR954'</td><td>= C2020Z</td>
+<td>'SR953'</td><td>= C21T.commu</td>
 </tr><tr><td>'D4327'</td><td>= FE190/X750</td>
 <td class=b>'D4500'</td><td class=b>= SZ-11</td>
-<td>'SR955'</td><td>= C990Z,D490Z</td>
+<td>'SR954'</td><td>= C2020Z</td>
 </tr><tr><td>'D4328'</td><td>= u760,S760</td>
 <td class=b>'D4504'</td><td class=b>= TG-615</td>
-<td>'SR956'</td><td>= C211Z</td>
+<td>'SR955'</td><td>= C990Z,D490Z</td>
 </tr><tr><td>'D4330'</td><td>= FE180/X745</td>
 <td class=b>'D4508'</td><td class=b>= TG-620</td>
-<td>'SR959'</td><td>= C990ZS,D490Z</td>
+<td>'SR956'</td><td>= C211Z</td>
 </tr><tr><td>'D4331'</td><td>= u1000/S1000</td>
 <td class=b>'D4510'</td><td class=b>= TG-820</td>
-<td>'SR95A'</td><td>= C2100UZ</td>
+<td>'SR959'</td><td>= C990ZS,D490Z</td>
 </tr><tr><td>'D4332'</td><td>= u770SW,S770SW</td>
 <td class=b>'D4512'</td><td class=b>= TG-1</td>
-<td>'SR971'</td><td>= C100,D370</td>
+<td>'SR95A'</td><td>= C2100UZ</td>
 </tr><tr><td>'D4333'</td><td>= FE240/X795</td>
 <td class=b>'D4516'</td><td class=b>= SH-21</td>
-<td>'SR973'</td><td>= C2,D230</td>
+<td>'SR971'</td><td>= C100,D370</td>
 </tr><tr><td>'D4334'</td><td>= FE210,X775</td>
 <td class=b>'D4519'</td><td class=b>= SZ-14</td>
-<td>'SX151'</td><td>= E100RS</td>
+<td>'SR973'</td><td>= C2,D230</td>
 </tr><tr><td>'D4336'</td><td>= FE230/X790</td>
 <td class=b>'D4520'</td><td class=b>= SZ-31MR</td>
-<td>'SX351'</td><td>= C3000Z / C3030Z</td>
+<td>'SX151'</td><td>= E100RS</td>
 </tr><tr><td>'D4337'</td><td>= FE220,X785</td>
 <td class=b>'D4521'</td><td class=b>= SH-25MR</td>
-<td>'SX354'</td><td>= C3040Z</td>
+<td>'SX351'</td><td>= C3000Z / C3030Z</td>
 </tr><tr><td>'D4338'</td><td>= u725SW,S725SW</td>
 <td class=b>'D4523'</td><td class=b>= SP-720UZ</td>
-<td>'SX355'</td><td>= C2040Z</td>
+<td>'SX354'</td><td>= C3040Z</td>
 </tr><tr><td>'D4339'</td><td>= FE250/X800</td>
 <td class=b>'D4529'</td><td class=b>= VG170</td>
-<td>'SX357'</td><td>= C700UZ</td>
+<td>'SX355'</td><td>= C2040Z</td>
 </tr><tr><td>'D4341'</td><td>= u780,S780</td>
 <td class=b>'D4531'</td><td class=b>= XZ-2</td>
-<td>'SX358'</td><td>= C200Z,D510Z</td>
+<td>'SX357'</td><td>= C700UZ</td>
 </tr><tr><td>'D4343'</td><td>= u790SW,S790SW</td>
 <td class=b>'D4535'</td><td class=b>= SP-620UZ</td>
-<td>'SX374'</td><td>= C3100Z,C3020Z</td>
+<td>'SX358'</td><td>= C200Z,D510Z</td>
 </tr><tr><td>'D4344'</td><td>= u1020,S1020</td>
 <td class=b>'D4536'</td><td class=b>= TG-320</td>
-<td>'SX552'</td><td>= C4040Z</td>
+<td>'SX374'</td><td>= C3100Z,C3020Z</td>
 </tr><tr><td>'D4346'</td><td>= FE15,X10</td>
 <td class=b>'D4537'</td><td class=b>= VR340,D750</td>
-<td>'SX553'</td><td>= C40Z,D40Z</td>
+<td>'SX552'</td><td>= C4040Z</td>
 </tr><tr><td>'D4348'</td><td>= FE280,X820,C520</td>
 <td class=b>'D4538'</td><td class=b>= VG160,X990,D745</td>
-<td>'SX556'</td><td>= C730UZ</td>
+<td>'SX553'</td><td>= C40Z,D40Z</td>
 </tr><tr><td>'D4349'</td><td>= FE300,X830</td>
 <td class=b>'D4541'</td><td class=b>= SZ-12</td>
-<td>'SX558'</td><td>= C5050Z</td>
+<td>'SX556'</td><td>= C730UZ</td>
 </tr><tr><td>'D4350'</td><td>= u820,S820</td>
 <td class=b>'D4545'</td><td class=b>= VH410</td>
-<td>'SX571'</td><td>= C120,D380</td>
+<td>'SX558'</td><td>= C5050Z</td>
 </tr><tr><td>'D4351'</td><td>= u1200,S1200</td>
 <td class=b>'D4546'</td><td class=b>= XZ-10</td>
-<td>'SX574'</td><td>= C300Z,D550Z</td>
+<td>'SX571'</td><td>= C120,D380</td>
 </tr><tr><td>'D4352'</td><td>= FE270,X815,C510</td>
 <td class=b>'D4547'</td><td class=b>= TG-2</td>
-<td>'SX575'</td><td>= C4100Z,C4000Z</td>
+<td>'SX574'</td><td>= C300Z,D550Z</td>
 </tr><tr><td>'D4353'</td><td>= u795SW,S795SW</td>
 <td class=b>'D4548'</td><td class=b>= TG-830</td>
-<td>'SX751'</td><td>= X200,D560Z,C350Z</td>
+<td>'SX575'</td><td>= C4100Z,C4000Z</td>
 </tr><tr><td>'D4354'</td><td>= u1030SW,S1030SW</td>
 <td class=b>'D4549'</td><td class=b>= TG-630</td>
-<td>'SX752'</td><td>= X300,D565Z,C450Z</td>
+<td>'SX751'</td><td>= X200,D560Z,C350Z</td>
 </tr><tr><td>'D4355'</td><td>= SP560UZ</td>
 <td class=b>'D4550'</td><td class=b>= SH-50</td>
-<td>'SX753'</td><td>= C750UZ</td>
+<td>'SX752'</td><td>= X300,D565Z,C450Z</td>
 </tr><tr><td>'D4356'</td><td>= u1010,S1010</td>
 <td class=b>'D4553'</td><td class=b>= SZ-16,DZ-105</td>
-<td>'SX754'</td><td>= C740UZ</td>
+<td>'SX753'</td><td>= C750UZ</td>
 </tr><tr><td>'D4357'</td><td>= u830,S830</td>
 <td class=b>'D4562'</td><td class=b>= SP-820UZ</td>
-<td>'SX755'</td><td>= C755UZ</td>
+<td>'SX754'</td><td>= C740UZ</td>
 </tr><tr><td>'D4359'</td><td>= u840,S840</td>
 <td class=b>'D4566'</td><td class=b>= SZ-15</td>
-<td>'SX756'</td><td>= C5060WZ</td>
+<td>'SX755'</td><td>= C755UZ</td>
 </tr><tr><td>'D4360'</td><td>= FE350WIDE,X865</td>
 <td class=b>'D4572'</td><td class=b>= STYLUS1</td>
-<td>'SX757'</td><td>= C8080WZ</td>
+<td>'SX756'</td><td>= C5060WZ</td>
 </tr><tr><td>'D4361'</td><td>= u850SW,S850SW</td>
 <td class=b>'D4574'</td><td class=b>= TG-3</td>
-<td>'SX758'</td><td>= X350,D575Z,C360Z</td>
+<td>'SX757'</td><td>= C8080WZ</td>
 </tr><tr><td>'D4362'</td><td>= FE340,X855,C560</td>
 <td class=b>'D4575'</td><td class=b>= TG-850</td>
-<td>'SX759'</td><td>= X400,D580Z,C460Z</td>
+<td>'SX758'</td><td>= X350,D575Z,C360Z</td>
 </tr><tr><td>'D4363'</td><td>= FE320,X835,C540</td>
 <td class=b>'D4579'</td><td class=b>= SP-100EE</td>
-<td>'SX75A'</td><td>= AZ-2ZOOM</td>
+<td>'SX759'</td><td>= X400,D580Z,C460Z</td>
 </tr><tr><td>'D4364'</td><td>= SP570UZ</td>
 <td class=b>'D4580'</td><td class=b>= SH-60</td>
-<td>'SX75B'</td><td>= D595Z,C500Z</td>
+<td>'SX75A'</td><td>= AZ-2ZOOM</td>
 </tr><tr><td>'D4366'</td><td>= FE330,X845,C550</td>
 <td class=b>'D4581'</td><td class=b>= SH-1</td>
-<td>'SX75C'</td><td>= X550,D545Z,C480Z</td>
+<td>'SX75B'</td><td>= D595Z,C500Z</td>
 </tr><tr><td>'D4368'</td><td>= FE310,X840,C530</td>
 <td class=b>'D4582'</td><td class=b>= TG-835</td>
-<td>'SX75D'</td><td>= IR-300</td>
+<td>'SX75C'</td><td>= X550,D545Z,C480Z</td>
 </tr><tr><td>'D4370'</td><td>= u1050SW,S1050SW</td>
 <td class=b>'D4585'</td><td class=b>= SH-2 / SH-3</td>
-<td>'SX75F'</td><td>= C55Z,C5500Z</td>
+<td>'SX75D'</td><td>= IR-300</td>
 </tr><tr><td>'D4371'</td><td>= u1060,S1060</td>
 <td class=b>'D4586'</td><td class=b>= TG-4</td>
-<td>'SX75G'</td><td>= C170,D425</td>
+<td>'SX75F'</td><td>= C55Z,C5500Z</td>
 </tr><tr><td>'D4372'</td><td>= FE370,X880,C575</td>
 <td class=b>'D4587'</td><td class=b>= TG-860</td>
-<td>'SX75J'</td><td>= C180,D435</td>
+<td>'SX75G'</td><td>= C170,D425</td>
 </tr><tr><td>'D4374'</td><td>= SP565UZ</td>
 <td class=b>'D4591'</td><td class=b>= TG-870</td>
-<td>'SX771'</td><td>= C760UZ</td>
+<td>'SX75J'</td><td>= C180,D435</td>
 </tr><tr><td>'D4377'</td><td>= u1040,S1040</td>
 <td class=b>'D4593'</td><td class=b>= TG-5</td>
-<td>'SX772'</td><td>= C770UZ</td>
+<td>'SX771'</td><td>= C760UZ</td>
 </tr><tr><td>'D4378'</td><td>= FE360,X875,C570</td>
 <td class=b>'D4603'</td><td class=b>= TG-6</td>
-<td>'SX773'</td><td>= C745UZ</td>
+<td>'SX772'</td><td>= C770UZ</td>
 </tr><tr><td>'D4379'</td><td>= FE20,X15,C25</td>
 <td class=b>'D4809'</td><td class=b>= C2500L</td>
-<td>'SX774'</td><td>= X250,D560Z,C350Z</td>
+<td>'SX773'</td><td>= C745UZ</td>
 </tr><tr><td>'D4380'</td><td>= uT6000,ST6000</td>
 <td class=b>'D4842'</td><td class=b>= E-10</td>
-<td>'SX775'</td><td>= X100,D540Z,C310Z</td>
+<td>'SX774'</td><td>= X250,D560Z,C350Z</td>
 </tr><tr><td>'D4381'</td><td>= uT8000,ST8000</td>
 <td class=b>'D4856'</td><td class=b>= C-1</td>
-<td>'SX776'</td><td>= C460ZdelSol</td>
+<td