exiftool_vendored 10.49.0 → 10.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e98343581b6323974bb3e7f8d70f7675a6084c
-  data.tar.gz: df8e93c5915e28853f63d21b07776444af83a23c
+  metadata.gz: c9bbeec52de7180ba7164158cbd9bcc52768f56e
+  data.tar.gz: a9bb84204d3e36b430a336964f5171ab99ab3585
 SHA512:
-  metadata.gz: 34d69a0af2030129a9d9564dc01de154d31fe4c3eb86b4bc6d4cddc9622c494f03b86e8f3cff652324abd1c3f4df2cf6c03cd93a6b8537fdde925c982ec73a21
-  data.tar.gz: e4fbbc7fe6bbd8b60093c4370350ebe35385ece69b24d746b1b4e7c2bd0610b5c8daa49cdf26da0041f3d457b3884e800cf08d23dd5f74804eeba8f4d0dd0b9d
+  metadata.gz: 3406356b68a7a6ad9bdd2164a2a6661d08e24438c353b9abe220e2abda673ccd6ff536c4ca6e5f2ec99aea8bf2e65c16d5f56399741ed5277d3206c9ee02df13
+  data.tar.gz: 1b76b463ad708a4f21466e0445caccc33a0411275c0520b23bfd0ab5092ffba1ac9f563228016c90ff55418674f65d8acd67fddbe7506049b04fcb3b62742537

data/bin/{Image-ExifTool-10.49/Changes → Changes}

@@ -4,9 +4,83 @@ ExifTool Version History
 
 RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 
-Note: The most recent production release is Version 10.40. (Other versions are
+Note: The most recent production release is Version 10.55. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+June 6, 2017 - Version 10.56
+
+  - Removed ordering constraints between Geotag/Geosync and Geotime assignments
+    on the command line
+  - Removed debugging print statement left in photoshop_paths.config
+
+June 5, 2017 - Version 10.55 (production release)
+
+  - Added support for GIF multimedia extensions
+  - Added a couple of new Sony/Minolta lenses (thanks Chris)
+  - Added a new Nikon LensID (thanks Jakob Dettner)
+  - Added new Composite TotalPathPoints tag to photoshop_paths.config
+  - Decode a number of new Sony tags and updated some others (thanks Jos Roost)
+  - Decode a new Pentax tag and fixed decoding of another (thanks Andras
+    Salamon)
+  - Updated iptcCore.args for new IPTC specification
+  - Changed description of a couple of AVI Model tags to match EXIF
+  - Patched tests to avoid failures with Perl 5.25.11 due to missing "." in @INC
+  - Fixed an incorrect warning from the experimental Validate feature
+
+May 26, 2017 - Version 10.54
+
+  - Added support for Google XMP GImage and GAudio tags
+  - Added a new Olympus CameraType (thanks LibRaw)
+  - Added a two new Sony lenses and decode more ILCE-9 tags (thanks Jos Roost)
+  - Added new values to some Pentax tags (thanks Andras Salamon)
+  - Added a new Canon LensType
+  - Added an additional checks to the experimental -validate feature
+  - Improved user-defined FileTypes feature to provide more flexibility
+  - Enhanced -ext option to allow specific files extensions to be processed
+    along with supported files
+  - API Changes:
+      - Added ListJoin option to replace List and ListSep options
+
+May 17, 2017 - Version 10.53
+
+  - Added support for "MeSa" Photoshop IRB resource
+  - Made XMP-GSpherical tags writable
+  - Improved German translations (thanks Jobi)
+
+May 12, 2017 - Version 10.52
+
+  - Added some new values to a number of FujiFilm tags and changed some others
+    (thanks Albert Shan)
+  - Decode a number of new Sony tags for the ILCE-9 (thanks Jos Roost)
+  - Made SonyISO writable
+  - Changed behaviour of advanced formatting expression for Shortcut tags so it
+    now applies to the combined value rather than individual constituent values
+  - Minor changes to some Pentax print conversions
+  - Fixed problem using new NoDups utility with Shortcut tags
+
+May 2, 2017 - Version 10.51
+
+  - Added "NoDups" utility function for use in advanced formatting expressions
+  - Added a new Pentax LensType (thanks JohnK)
+  - Added some new Pentax DriveMode values (thanks Andras Salamon)
+  - Enhanced -ver option to report Perl include directories with -v2
+  - Improved warning message when advanced formatting expression returns undef
+  - Minor change to a few FujiFilm print conversion strings (thanks Albert Shan)
+  - Changed behaviour when interpolating Shortcut tags in a string (the values
+    are now separated according to the -sep option setting instead of simply
+    being concatenated)
+  - Patched to allow file times to be set on systems where futimes is not
+    available
+
+Apr. 20, 2017 - Version 10.50 (production release)
+
+  - Decode a new Pentax tag (thanks Andras Salamon)
+  - Improved decoding of Olympus DriveMode (thanks Herbert Kauer)
+  - Improved handling of errors from utime when setting file times
+  - Fixed potential hang problem when reading corrupted QuickTime metadata
+  - Fixed problem deleting duplicate EXIF tags when writing other tags at the
+    same time
+
 Apr. 10, 2017 - Version 10.49
 
   - Added "DateFmt" utility function for use in advanced formatting expressions

data/bin/{Image-ExifTool-10.49/META.json → META.json}

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "10.49"
+   "version" : "10.56"
 }

data/bin/{Image-ExifTool-10.49/META.yml → META.yml}

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 10.49
+version: 10.56

data/bin/{Image-ExifTool-10.49/README → README}

@@ -101,8 +101,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-10.49.tar.gz | tar -xf -
-  cd Image-ExifTool-10.49
+  gzip -dc Image-ExifTool-10.56.tar.gz | tar -xf -
+  cd Image-ExifTool-10.56
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/exif2iptc.args

@@ -12,9 +12,9 @@
 # Notes:     1) IPTC requires a timezone but EXIF does not support one, so
 #               the local timezone is assumed when writing the IPTC times
 #
-#            2) These arguments will not delete IPTC tags which are missing
-#               from the EXIF.  The IPTC tags should be deleted beforehand if
-#               required.
+#            2) These arguments will not delete existing IPTC tags which are
+#               missing from the EXIF.  The IPTC tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -IPTC:By-line < EXIF:Artist
 -IPTC:CopyrightNotice < EXIF:Copyright

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/exif2xmp.args

@@ -18,9 +18,9 @@
 #               XMP-exif/XMP-tiff, and the remaining arguments handle tags
 #               which have different names and/or formats in EXIF and XMP.
 #
-#            2) These arguments will not delete XMP tags which are missing
-#               from the EXIF.  The XMP tags should be deleted beforehand if
-#               required.
+#            2) These arguments will not delete existing XMP tags which are
+#               missing from the EXIF.  The XMP tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -XMP-exif:all < EXIF:all
 -XMP-exifEX:all < EXIF:all

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/gps2xmp.args

@@ -13,9 +13,9 @@
 #               the XMP GPS coordinate and date/time tags are composites of
 #               more than one EXIF GPS tag, so they are handled separately.
 #
-#            2) These arguments will not delete XMP tags which are missing
-#               from the GPS.  The XMP tags should be deleted beforehand if
-#               required.
+#            2) These arguments will not delete existing XMP tags which are
+#               missing from the GPS.  The XMP GPS tags should be deleted
+#               first with "-xmp:gps*=" if required.
 #------------------------------------------------------------------------------
 -XMP:all < GPS:all
 -XMP:GPSLatitude < Composite:GPSLatitude

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/iptc2exif.args

@@ -9,9 +9,9 @@
 #
 # Revisions:    2011/09/13 - P. Harvey Created
 #
-# Notes:        These arguments will not delete EXIF tags which are missing
-#               from the IPTC.  The EXIF tags should be deleted beforehand if
-#               required.
+# Notes:        These arguments will not delete existing EXIF tags which are
+#               missing from the IPTC.  The EXIF tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -EXIF:Artist < IPTC:By-line
 -EXIF:Copyright < IPTC:CopyrightNotice

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/iptc2xmp.args

@@ -21,9 +21,9 @@
 #
 # Notes:     1) Also updates Photoshop:IPTCDigest as per MWG recommendation.
 #
-#            2) These arguments will not delete XMP tags which are missing
-#               from the IPTC.  The XMP tags should be deleted beforehand if
-#               required.
+#            2) These arguments will not delete existing XMP tags which are
+#               missing from the IPTC.  The XMP tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -XMP-dc:Creator < IPTC:By-line
 -XMP-dc:Description < IPTC:Caption-Abstract

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/iptcCore.args

@@ -9,6 +9,7 @@
 #
 # Revisions:    2011/12/28 - P. Harvey Created (IPTC Core version 1.1)
 #               2015/04/21 - PH Updated to IPTC Extension version 1.2
+#               2017/06/02 - PH Updated to IPTC Extension version 1.3
 #
 # References:   http://www.iptc.org/IPTC4XMP/
 #
@@ -98,7 +99,7 @@
 -XMP-iptcExt:ArtworkCircaDateCreated
 -XMP-iptcExt:ArtworkStylePeriod
 -XMP-iptcExt:ArtworkSourceInvURL
--XMP-iptcExt:ArtworkSContentDescription
+-XMP-iptcExt:ArtworkContentDescription
 -XMP-iptcExt:ArtworkContributionDescription
 -XMP-iptcExt:ArtworkPhysicalDescription
 
@@ -171,6 +172,14 @@
 -XMP-iptcExt:RegistryID
 -XMP-iptcExt:RegistryItemID
 -XMP-iptcExt:RegistryOrganisationID
+-XMP-iptcExt:RegistryEntryRole
+
+# Genre struct
+-XMP-iptcExt:Genre
+-XMP-iptcExt:GenreCvId
+-XMP-iptcExt:GenreCvTermId
+-XMP-iptcExt:GenreCvTermName
+-XMP-iptcExt:GenreCvTermRefinedAbout
 
 #
 # plus schema

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/pdf2xmp.args

@@ -11,9 +11,9 @@
 #
 # References:   http://www.adobe.com/devnet/xmp/
 #
-# Notes:        These arguments will not delete XMP tags which are missing
-#               from the PDF.  The XMP tags should be deleted beforehand if
-#               required.
+# Notes:        These arguments will not delete existing XMP tags which are
+#               missing from the PDF.  The XMP tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -XMP-dc:Title < PDF:Title
 -XMP-dc:Creator < PDF:Author

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/xmp2exif.args

@@ -19,9 +19,9 @@
 #               information, and the remaining arguments handle the tags
 #               which have different names and/or formats in XMP and EXIF.
 #
-#            2) These arguments will not delete EXIF tags which are missing
-#               from the XMP.  The EXIF tags should be deleted beforehand if
-#               required.
+#            2) These arguments will not delete existing EXIF tags which are
+#               missing from the XMP.  The EXIF tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -EXIF:all < XMP-exif:all
 -EXIF:all < XMP-exifEX:all

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/xmp2gps.args

@@ -16,9 +16,9 @@
 #               and time parts respectively when writing date-only and
 #               time-only tags with a date/time value.
 #
-#            2) These arguments will not delete GPS tags which are missing
-#               from the XMP.  The GPS tags should be deleted beforehand if
-#               required.
+#            2) These arguments will not delete existing GPS tags which are
+#               missing from the XMP.  The GPS tags should be deleted with
+#               "-gps:all=" first if required.
 #------------------------------------------------------------------------------
 -GPS:all < XMP-exif:all
 -GPS:GPSLatitudeRef < Composite:GPSLatitudeRef

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/xmp2iptc.args

@@ -30,9 +30,9 @@
 #               for more information about converting the IPTC encoding:
 #               http://owl.phy.queensu.ca/~phil/exiftool/faq.html#Q10
 #
-#            3) These arguments will not delete IPTC tags which are missing
-#               from the XMP.  The IPTC tags should be deleted beforehand if
-#               required.
+#            3) These arguments will not delete existing IPTC tags which are
+#               missing from the XMP.  The IPTC tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -IPTC:By-line < XMP-dc:Creator
 -IPTC:Caption-Abstract < XMP-dc:Description

data/bin/{Image-ExifTool-10.49/arg_files → arg_files}/xmp2pdf.args

@@ -11,9 +11,9 @@
 #
 # References:   http://www.adobe.com/devnet/xmp/
 #
-# Notes:        These arguments will not delete PDF tags which are missing
-#               from the XMP.  The PDF tags should be deleted beforehand if
-#               required.
+# Notes:        These arguments will not delete existing PDF tags which are
+#               missing from the XMP.  The PDF tags should be deleted
+#               beforehand if required.
 #------------------------------------------------------------------------------
 -PDF:Title < XMP-dc:Title
 -PDF:Author < XMP-dc:Creator

data/bin/{Image-ExifTool-10.49/config_files → config_files}/example.config

@@ -310,12 +310,15 @@ use Image::ExifTool::MIE;
 # User-defined file types to recognize
 %Image::ExifTool::UserDefined::FileTypes = (
     XXX => { # <-- the extension of the new file type (case insensitive)
-        # BaseType specifies the format upon which this file is based.
-        # If BaseType is defined, then the file will be fully supported,
-        # and in this case the Magic pattern should not be defined
+        # BaseType specifies the format upon which this file is based (case
+        # sensitive).  If BaseType is defined, then the file will be fully
+        # supported, and in this case the Magic pattern should not be defined
         BaseType => 'TIFF',
         MIMEType => 'image/x-xxx',
         Description => 'My XXX file type',
+        # if the BaseType is writable by ExifTool, then the new file type
+        # will also be writable unless otherwise specified, like this:
+        Writable => 0,
     },
     YYY => {
         # without BaseType, the file will be recognized but not supported
@@ -329,6 +332,10 @@ use Image::ExifTool::MIE;
         # unless otherwise specified
         Description => 'My ZZZ file type',
     },
+    # if only BaseType is specified, then the following simplified syntax
+    # may be used.  In this example, files with extension "TTT" will be
+    # processed as JPEG files
+    TTT => 'JPEG',
 );
 
 # Specify default ExifTool option values

data/bin/{Image-ExifTool-10.49/config_files → config_files}/photoshop_paths.config

@@ -13,14 +13,15 @@
 #               An "AllPaths" shortcut tag is also provided represent all
 #               Photoshop path tags.  This shortcut must be used when copying
 #               because these tags are marked as "Protected" so they won't be
-#               copied by default.
+#               copied by default (also see the notes below).
 #
 #               Path anchor points are converted to pixel coordinates by the
 #               Composite PathPixXXX tags, and an "AllPathPix" shortcut is
 #               provided to represent these tags.
 #
 #               Finally, a Composite PathCount tag is provided to return the
-#               number of paths in an image.
+#               number of paths in an image, and a TotalPathPoints tag counts
+#               the total number of path anchor points.
 #
 # Notes:     1) Print conversion must be disabled to be able to copy the paths
 #               (via either the -n option, or by adding a "#" to the tag name,
@@ -65,6 +66,7 @@
 #               2017/02/22 - PH Fixed problem printing some paths
 #               2017/03/19 - PH Added "-" or "+" at the start of closed or open
 #                               subpath respectively
+#               2017/06/03 - PH Added TotalPathPoints
 #
 # References:   http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,1621.0.html
 #               http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3910.0.html
@@ -144,12 +146,30 @@ sub PrintPath($$;$$)
                 map { $_-0x7d0 => sprintf('Path%x', $_) } (0x7d0 .. 0xbb5),
             },
             ValueConv => sub {
-                my $val = shift;
+                my ($val, $self) = @_;
                 my $count = 0;
-                defined $_ and ++$count foreach @$val;
+                my $pts = 0;
+                foreach (@$val) {
+                    next unless defined $_;
+                    ++$count;
+                    # determine the total number of path anchor points
+                    my $len = length($$_) - 26;
+                    for ($pos=0; $pos<=$len; $pos+=26) {
+                        SetByteOrder('MM');
+                        my $type = Get16u($_, $pos);
+                        last if $type == 0x2f23; # (start of path name added by ExifTool)
+                        next unless {1=>1,2=>1,4=>1,5=>1}->{$type};
+                        ++$pts;
+                    }
+                }
+                $$self{TotalPathPoints} = $pts;
                 return $count;
             },
         },
+        TotalPathPoints => {
+            Require => 'PathCount',
+            ValueConv => '$$self{TotalPathPoints}',
+        },
         map { sprintf('PathPix%x', $_) => {
             Require => {
                 0 => 'ImageWidth',

data/bin/{Image-ExifTool-10.49/exiftool → exiftool}

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '10.49';
+my $version = '10.56';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -136,7 +136,7 @@ my $executeID;      # -execute ID number
 my $fileHeader;     # header to print to output file (or console, once)
 my $fileTrailer;    # trailer for output file
 my $filtered;       # flag indicating file was filtered by name
-my $filterFlag;     # file filter flag (0x01=deny extensions, 0x02=allow extensions)
+my $filterFlag;     # file filter flag (0x01=deny extensions, 0x02=allow extensions, 0x04=add ext)
 my $fixLen;         # flag to fix description lengths when writing alternate languages
 my $forcePrint;     # string to use for missing tag values (undef to not print them)
 my $helped;         # flag to avoid printing help if no tags specified
@@ -207,6 +207,7 @@ my %jsonChar = ( '"'=>'"', '\\'=>'\\', "\t"=>'t', "\n"=>'n', "\r"=>'r' );
 
 # options requiring additional arguments
 # (used only to skip over these arguments when reading -stay_open ARGFILE)
+# (arg is converted to lower case then tested again unless an entry was found with the same case)
 my %optArgs = (
     '-tagsfromfile' => 1, '-addtagsfromfile' => 1, '-alltagsfromfile' => 1,
     '-@' => 1,
@@ -217,7 +218,8 @@ my %optArgs = (
     '-d' => 1, '-dateformat' => 1,
     '-D' => 0, # necessary to avoid matching lower-case equivalent
     '-echo' => 1, '-echo1' => 1, '-echo2' => 1, '-echo3' => 1, '-echo4' => 1,
-    '-ext' => 1, '--ext' => 1, '-extension' => 1, '--extension' => 1,
+    '-ext' => 1, '--ext' => 1, '-ext+' => 1, '--ext+' => 1,
+        '-extension' => 1, '--extension' => 1, '-extension+' => 1, '--extension+' => 1,
     '-fileorder' => 1,
     '-geotag' => 1,
     '-globaltimeshift' => 1,
@@ -494,7 +496,7 @@ $mt = new Image::ExifTool;      # create ExifTool object
 $mt->Options(Duplicates => 0) unless %Image::ExifTool::UserDefined::Options
     and defined $Image::ExifTool::UserDefined::Options{Duplicates};
 
-# default is to join lists if the List option was set in the config file
+# default is to join lists if the List option was set to zero in the config file
 $joinLists = 1 if defined $mt->Options('List') and not $mt->Options('List');
 
 # preserve FileCreateDate if possible
@@ -635,6 +637,10 @@ for (;;) {
                 $ver = eval "require $alt and \$${alt}::VERSION" and $_ = $alt if not $ver and $alt;
                 printf "  %-28s %s\n", $_, $ver || '(not installed)';
             }
+            if ($verbose > 1) {
+                print "Include directories:\n";
+                print "  $_\n" foreach @INC;
+            }
         } else {
             print "$version$str$Image::ExifTool::RELEASE\n";
         }
@@ -804,13 +810,13 @@ for (;;) {
         next;
     }
     # (-execute handled at top of loop)
-    if (/^-?ext(ension)?$/i) {
+    if (/^-?ext(ension)?(\+)?$/i) {
         my $ext = shift;
         defined $ext or Error("Expecting extension for -ext option\n"), $badCmd=1, next;
-        $ext =~ s/^\.//;    # remove leading '.' if it exists
-        my $flag = /^-/ ? 0 : 1;
+        my $flag = /^-/ ? 0 : ($2 ? 2 : 1);
         $filterFlag |= (0x01 << $flag);
-        $filterExt{uc($ext)} = $flag;
+        $ext =~ s/^\.//;    # remove leading '.' if it exists
+        $filterExt{uc($ext)} = $flag ? 1 : 0;
         next;
     }
     if (/^f$/ or $a eq 'forceprint') {
@@ -1179,13 +1185,15 @@ for (;;) {
             $useMWG = 1;
         } elsif (/^([-\w]+:)*(filename|directory)\b/i) {
             $doSetFileName = 1;
-        } elsif (/^([-\w]+:)*(geotag|geotime)\b/i) {
-            if (lc $2 eq 'geotag') {
-                if ((not defined $addGeotime or $addGeotime) and length $val) {
+        } elsif (/^([-\w]+:)*(geotag|geotime|geosync)\b/i) {
+            if (lc $2 eq 'geotime') {
+                $addGeotime = '';
+            } else {
+                # add geotag/geosync commands first
+                unshift @newValues, pop @newValues;
+                if (lc $2 eq 'geotag' and (not defined $addGeotime or $addGeotime) and length $val) {
                     $addGeotime = ($1 || '') . 'Geotime<DateTimeOriginal#';
                 }
-            } else {
-                $addGeotime = '';
             }
         }
     } else {
@@ -4043,8 +4051,8 @@ when one is expected.
 A command-line interface to L<Image::ExifTool|Image::ExifTool>, used for
 reading and writing meta information in a variety of file types.  I<FILE> is
 one or more source file names, directory names, or C<-> for the standard
-input.  Metadata is read from source files and printed in readable form
-to the console (or written to output text files with B<-w>).
+input.  Metadata is read from source files and printed in readable form to
+the console (or written to output text files with B<-w>).
 
 To write or delete metadata, tag values are assigned using the
 -I<TAG>=[I<VALUE>] syntax, or the B<-geotag> option.  To copy or move
@@ -4186,7 +4194,7 @@ L<Processing control|/Processing control>
   -a          (-duplicates)        Allow duplicate tags to be extracted
   -e          (--composite)        Do not calculate composite tags
   -ee         (-extractEmbedded)   Extract information from embedded files
-  -ext EXT    (-extension)         Process files with specified extension
+  -ext[+] EXT (-extension)         Process files with specified extension
   -F[OFFSET]  (-fixBase)           Fix the base for maker notes offsets
   -fast[NUM]                       Increase speed for slow devices
   -fileOrder [-]TAG                Set file processing order
@@ -4235,7 +4243,6 @@ L<Advanced options|/Advanced options>
   -srcfile FMT                     Process a different source file
   -stay_open FLAG                  Keep reading -@ argfile even after EOF
   -userParam PARAM[=VAL]           Set user parameter (API UserParam opt)
-  -windowTitle TITLE               Set console window title for each file
 
 =head2 Option Details
 
@@ -4438,13 +4445,14 @@ E<quot>'-I<SRCTAG>-E<lt>I<DSTTAG>'E<quot>.
 An extension of the redirection feature allows strings involving tag names
 to be used on the right hand side of the C<E<lt>> symbol with the syntax
 E<quot>'-I<DSTTAG>E<lt>I<STR>'E<quot>, where tag names in I<STR> are
-prefixed with a C<$> symbol.  See the B<-p> option for more details about
-this syntax.  Strings starting with a C<=> sign must insert a single space
-after the C<E<lt>> to avoid confusion with the C<E<lt>=> operator which sets
-the tag value from the contents of a file.  A single space at the start of
-the string is removed if it exists, but all other whitespace in the string
-is preserved.  See note 8 below about using shortcuts or wildcards with the
-redirection feature.
+prefixed with a C<$> symbol.  See the B<-p> option and the
+L</Advanced formatting feature> section for more details about this syntax. 
+Strings starting with a C<=> sign must insert a single space after the
+C<E<lt>> to avoid confusion with the C<E<lt>=> operator which sets the tag
+value from the contents of a file.  A single space at the start of the
+string is removed if it exists, but all other whitespace in the string is
+preserved.  See note 8 below about using the redirection feature with
+list-type stags, shortcuts or when using wildcards in tag names.
 
 See L</COPYING EXAMPLES> for examples using B<-tagsFromFile>.
 
@@ -4503,11 +4511,12 @@ B<-struct> option for details.
 8) With the redirection feature, copying a tag directly (ie.
 E<quot>'-I<DSTTAG>E<lt>I<SRCTAG>'E<quot>) is not the same as interpolating
 its value inside a string (ie. E<quot>'-I<DSTTAG>E<lt>$I<SRCTAG>'E<quot>)
-for L<shortcut tags|Image::ExifTool::Shortcuts> or tag names containing
-wildcards.  When copying directly, the values of each matching source tag
-are copied individually to the destination tag (as if multiple redirection
-arguments were used).  However, when interpolated inside a string, the
-values of shortcut tags are concatenated, and wildcards are not allowed.
+for list-type tags, L<shortcut tags|Image::ExifTool::Shortcuts>, or tag
+names containing wildcards.  When copying directly, the values of each
+matching source tag are copied individually to the destination tag (as if
+they were separate assignments).  However, when interpolated inside a
+string, list items and the values of shortcut tags are concatenated (with a
+separator set by the B<-sep> option), and wildcards are not allowed.
 
 =item B<-x> I<TAG> (B<-exclude>)
 
@@ -4533,7 +4542,7 @@ between images, but allows the metadata to be altered by editing the
 intermediate file (C<out.args> in this example):
 
     exiftool -args -G1 --filename --directory src.jpg > out.args
-    exiftool -@ out.args dst.jpg
+    exiftool -@ out.args -sep ", " dst.jpg
 
 Note:  Be careful when copying information with this technique since it is
 easy to write tags which are normally considered "unsafe".  For instance,
@@ -4541,9 +4550,10 @@ the FileName and Directory tags are excluded in the example above to avoid
 renaming and moving the destination file.  Also note that the second command
 above will produce warning messages for any tags which are not writable.
 
-As well, the B<-sep> option should be used when reading back to maintain
-separate list items, and the B<-struct> option may be used when extracting
-to preserve structured XMP information.
+As well, the B<-sep> option should be used as in the second command above to
+maintain separate list items when writing metadata back to image files, and
+the B<-struct> option may be used when extracting to preserve structured XMP
+information.
 
 =item B<-b> (B<-binary>)
 
@@ -4643,8 +4653,9 @@ as the exported file.  The first row of the I<CSVFILE> must be the ExifTool
 tag names (with optional group names) for each column of the file, and
 values must be separated by commas.  A special "SourceFile" column specifies
 the files associated with each row of information (and a SourceFile of "*"
-may be used to define default tags to be imported for all files).  The
-following examples demonstrate basic use of this option:
+may be used to define default tags to be imported for all files which are
+combined with any tags specified for the specific SourceFile processed).
+The following examples demonstrate basic use of this option:
 
     # generate CSV file with common tags from all images in a directory
     exiftool -common -csv dir > out.csv
@@ -4784,11 +4795,12 @@ If I<JSONFILE> is specified, the file is imported and the tag definitions
 from the file are used to set tag values on a per-file basis.  The special
 "SourceFile" entry in each JSON object associates the information with a
 specific target file.  An object with a missing SourceFile or a SourceFile
-of "*" defines default tags for all target files.  The imported JSON file
-must have the same format as the exported JSON files with the exception that
-the B<-g> option is not compatible with the import file format (use B<-G>
-instead). Additionally, tag names in the input JSON file may be suffixed
-with a C<#> to disable print conversion.
+of "*" defines default tags for all target files which are combined with any
+tags specified for the specific SourceFile processed.  The imported JSON
+file must have the same format as the exported JSON files with the exception
+that the B<-g> option is not compatible with the import file format (use
+B<-G> instead). Additionally, tag names in the input JSON file may be
+suffixed with a C<#> to disable print conversion.
 
 Unlike CSV import, empty values are not ignored, and will cause an empty
 value to be written if supported by the specific metadata type.  Tags are
@@ -4896,13 +4908,17 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 10.49 --
+    -- Generated by ExifTool 10.56 --
     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
     (f/8.0, 1/13s, ISO 100)
     -- end --
 
+The values of List-type tags with multiple items and Shortcut tags
+representing multiple tags are joined according the the B<-sep> option
+setting when interpolated in the string.
+
 When B<-ee> (B<-extractEmbedded>) is combined with B<-p>, embedded documents
 are effectively processed as separate input files.
 
@@ -4912,31 +4928,8 @@ to set the value of missing tags to '-' (but this may be configured via the
 MissingTagValue API option), or the B<-m> option may be used to ignore minor
 warnings and leave the missing values empty.
 
-An B<advanced formatting feature> allows an arbitrary Perl expression to be
-applied to the value of any tag by placing it inside the braces after the
-tag name, separated by a semicolon.  The expression acts on the value of the
-tag through the default input variable (C<$_>), and has access to the full
-ExifTool API through the current ExifTool object (C<$self>).  It may contain
-any valid Perl code, including translation (C<tr///>) and substitution
-(C<s///>) operations, but note that braces within the expression must be
-balanced.  The example below prints the camera Make with spaces translated
-to underlines, and multiple consecutive underlines replaced by a single
-underline:
-
-    exiftool -p '${make;tr/ /_/;s/__+/_/g}' image.jpg
-
-A default expression of C<tr(/\\?*:|"E<lt>E<gt>\0)()d> is assumed if the
-expression is empty (ie. C<${TAG;}>).  This removes the characters / \ ? * :
-| E<lt> E<gt> and null from the printed value.  (These characters are
-illegal in Windows file names, so this feature is useful if tag values are
-used in file names.)
-
-ExifTool provides a C<DateFmt> utility to simplify reformatting of
-individual date/time values.  The function acts on a standard EXIF-formatted
-date/time value in C<$_> and formats it according to the specified format
-string (see the B<-d> option).  For example:
-
-    exiftool -p '${createdate#;DateFmt("%Y-%m-%d_%H%M%S")}' a.jpg
+The L</Advanced formatting feature> may be used to modify the values of
+individual tags with the B<-p> option.
 
 =item B<-php>
 
@@ -5246,16 +5239,18 @@ group name.  (eg. C<Doc2-3> is the 3rd sub-document of the 2nd embedded
 document.) Note that this option may increase processing time substantially,
 especially for PDF files with many embedded images.
 
-=item B<-ext> I<EXT>, B<--ext> I<EXT> (B<-extension>)
+=item B<-ext>[+] I<EXT>, B<--ext> I<EXT> (B<-extension>)
 
 Process only files with (B<-ext>) or without (B<--ext>) a specified
-extension.  There may be multiple B<-ext> and B<--ext> options.  EXT may
-begin with a leading '.', and case is not significant.  C<"*"> may be used
-to process files with any extension (or none at all), as in the last three
-examples:
+extension.  There may be multiple B<-ext> and B<--ext> options.  A plus sign
+may be added (ie. B<-ext+>) to add the specified extension to the normally
+processed files.  EXT may begin with a leading '.', and case is not
+significant.  C<"*"> may be used to process files with any extension (or
+none at all), as in the last three examples:
 
-    exiftool -ext .JPG DIR            # process only JPG files
+    exiftool -ext JPG DIR             # process only JPG files
     exiftool --ext cr2 --ext dng DIR  # supported files but CR2/DNG
+    exiftool -ext+ txt DIR            # supported files plus TXT
     exiftool -ext "*" DIR             # process all files
     exiftool -ext "*" --ext xml DIR   # process all but XML files
     exiftool -ext "*" --ext . DIR     # all but those with no ext
@@ -5457,7 +5452,7 @@ required.
 
 =item B<-progress>[:[I<TITLE>]]
 
-Show file progress count in messages.  The progress count appears in
+Show the progress when processing files.  The progress count appears in
 brackets after the name of each processed file, and gives the current file
 number and the total number of files to be processed.  Implies the B<-v0>
 option if I<TITLE> is not used, printing the name of each processed file
@@ -5471,8 +5466,8 @@ default I<TITLE> string of "ExifTool %p%%" is assumed.  In the string, %f
 represents the file name, %p is the progress as a percent, %r is the
 progress as a ratio, and %% is a % character.  May be combined with the
 normal B<-progress> option to also show the progress count in console
-messages.  (Note:  This feature works on Mac/Linux only if stderr goes to
-the console.)
+messages.  (Note:  For this feature to function correctly on Mac/Linux,
+stderr must go to the console.)
 
 =item B<-q> (B<-quiet>)
 
@@ -5561,6 +5556,11 @@ For example, the following I<ARGFILE> will set the value of Copyright to
     %Y
     -copyright<Copyright $createdate, Phil Harvey
 
+Arguments in I<ARGFILE> behave exactly the same as if they were entered at
+the location of the B<-@> option on the command line, with the exception
+that the B<-config> and B<-common_args> options may not be used in an
+I<ARGFILE>.
+
 =item B<-k> (B<-pause>)
 
 Pause with the message C<-- press any key --> or C<-- press RETURN -->
@@ -5613,7 +5613,8 @@ Note that none of the B<-list> options require an input I<FILE>.
 
 Print exiftool version number.  The B<-v> option may be added to print
 addition system information (see the README file of the full distribution
-for more details about optional libraries).
+for more details about optional libraries), or B<-v2> to also list the Perl
+include directories.
 
 =back
 
@@ -5874,6 +5875,55 @@ or undef if just I<VAL> is omitted.
 
 =back
 
+=head3 Advanced formatting feature
+
+An advanced formatting feature allows modification of the value of any tag
+interpolated within a B<-if> or B<-p> option argument, or a B<-tagsFromFile>
+redirection string.  Tag names within these strings are prefixed by a C<$>
+symbol, and an arbitrary Perl expression may be applied to the tag value by
+placing braces around the tag name and inserting the expression after the
+name, separated by a semicolon (ie. C<${TAG;EXPR}>).  The expression acts on
+the value of the tag through the default input variable (C<$_>), and has
+access to the full ExifTool API through the current ExifTool object
+(C<$self>).  It may contain any valid Perl code, including translation
+(C<tr///>) and substitution (C<s///>) operations, but note that braces
+within the expression must be balanced.  The example below prints the camera
+Make with spaces translated to underlines, and multiple consecutive
+underlines replaced by a single underline:
+
+    exiftool -p '${make;tr/ /_/;s/__+/_/g}' image.jpg
+
+A default expression of C<tr(/\\?*:|"E<lt>E<gt>\0)()d> is assumed if the
+expression is empty (ie. C<${TAG;}>).  This removes the characters / \ ? * :
+| E<lt> E<gt> and null from the printed value.  (These characters are
+illegal in Windows file names, so this feature is useful if tag values are
+used in file names.)
+
+ExifTool provides a C<DateFmt> utility to simplify reformatting of
+individual date/time values.  The function acts on a standard EXIF-formatted
+date/time value in C<$_> and formats it according to the specified format
+string (see the B<-d> option).  For example:
+
+    exiftool -p '${createdate#;DateFmt("%Y-%m-%d_%H%M%S")}' a.jpg
+
+A C<NoDups> utility is also provided to remove duplicate items from a list
+with a separator specified by the B<-sep> option.  This function is most
+useful when copying list-type tags.  For example, the following command may
+be used to remove duplicate Keywords:
+
+    exiftool -sep '##' '-keywords<${keywords;NoDups}' a.jpg
+
+The B<-sep> option is necessary to split the string back into individual
+list items when writing to a list-type tag.
+
+An optional flag argument may be set to 1 to cause C<NoDups> to return undef
+if no duplicates existed, thus preventing the file from being rewritten
+unnecessarily:
+
+    exiftool -sep '##' '-keywords<${keywords;NoDups(1)}' a.jpg
+
+Note that function names are case sensitive.
+
 =head1 WINDOWS UNICODE FILE NAMES
 
 In Windows, by default, file and directory names are specified on the
@@ -6258,9 +6308,9 @@ C<dst.jpg>.
 =item exiftool '-Description<${FileName;s/\.[^.]*$//}' dir
 
 Set the image Description from the file name after removing the extension. 
-This example uses an advanced formatting expression to perform a
-substitution operation to remove the last dot and subsequent characters
-from the file name.
+This example uses the L</Advanced formatting feature> to perform a
+substitution operation to remove the last dot and subsequent characters from
+the file name.
 
 =item exiftool -@ iptc2xmp.args -iptc:all= a.jpg
 
@@ -6364,7 +6414,7 @@ Same effect as above except files are copied instead of moved.
 Rename all files in C<dir> by adding the camera model name to the file name.
 The semicolon after the tag name inside the braces causes characters which
 are invalid in Windows file names to be deleted from the tag value (see the
-B<-p> option documentation for an explanation).
+L</Advanced formatting feature> for an explanation).
 
 =item exiftool '-FileName<CreateDate' -d %Y%m%d_%H%M%S%%-c.%%e dir
 
@@ -6408,16 +6458,12 @@ unless DateTimeOriginal contains a timezone.
 
 =item exiftool -geotag t.log -geotime='2009:04:02 13:41:12-05:00' a.jpg
 
-Geotag an image with the GPS position for a specific time.  (Note that the
-C<Geotag> tag must be assigned before C<Geotime> for the GPS data to be
-available when C<Geotime> is set.)
+Geotag an image with the GPS position for a specific time.
 
 =item exiftool -geotag log.gpx '-xmp:geotimeE<lt>createdate' dir
 
 Geotag all images in directory C<dir> with XMP tags instead of EXIF tags,
-based on the image CreateDate.  (In this case, the order of the arguments
-doesn't matter because tags with values copied from other tags are always
-set after constant values.)
+based on the image CreateDate.
 
 =item exiftool -geotag a.log -geosync=-20 dir