exiftool_vendored 9.60.0 → 9.64.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmIzMWMxMzQyMjQxMjMyMTY4NTlmY2M0ZjQ2MDY2OWM5ZWIwOTc2Mw==
+    NjI0YjZjMDQxNGIyNzMwODg2ZGE1YTNhOTc1ZjBmYjM0ZGI3OWU0MQ==
   data.tar.gz: !binary |-
-    NWYzZmIyNmYwNDY1NDA1Njk1ODU3MTgxNGFjOGU0NjA5NDU0YmM1NQ==
+    ZjhiZjkxNWZmMWIwOTQ3ZjEyZmJhMDFlMzhmYzllMDFiYWU4YjIzMg==
 SHA512:
   metadata.gz: !binary |-
-    NDliNzhlNzMzOGI4ZGE0YzNlNTk3NzRiMDIwZmQyMTkyYzAyMDdiYTAwNWI3
-    NzY1MzdmYjY5YTc1YzFkNzg0YzIwY2MzZTlkYTcwMWMxODE1Mjk4YmVjMTM4
-    ZDg0NzgxYTM2MGUyZjBmMjcyODMzNTFkNTM5OTg1MjFmZDdiZmM=
+    MTlkNTQyOWQzNjk4NGJjNDBjZDdmYjUyYjRhN2FkODVmMGJkMzc4NTIxMjg3
+    YjJiYzNjNGVhYTU0ZmFkMTdlMmVhZGJhYmMxNDQ1YjA3Mjc4NjIzZGQ5ZjNj
+    ODBlMmU2YzkxZWQ3ODBkNGM5ZjhlOTFmN2EyMGNiNjIwZWMwZmU=
   data.tar.gz: !binary |-
-    NTRhNTQxZTliMTIxYzBjNTMyNzNhZGY4Y2QwNzJhNWRlNjIxZWU0MjNiNjY1
-    NDU4ZWE5ZmE2NzU1ZDgyMWE2NGEwMWNmNTUyNjlmZjZmMzc5OWMyMzFkY2Nj
-    MjdmYzA5ODM1NjYxMWM3ZmY0MDgwYTNjZDZhN2MwMmQwYzA2OGM=
+    YmU5MTY4MGM2M2E2OWMwMDQ0MWUwOWRhNzY5M2Q2ODRmYjZkY2E2NGY2ZDAz
+    YTNlMDM1N2YwNmU1MzdjNGY1NWZhNTgzNzExZWJiOTAxNTlhZmFjMDljN2Fm
+    MjQyZTM0NzI4MDQ2NTcxZjFhOWY5N2JjMjk4MTQ1OTY0MTM3NjQ=

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/Changes

@@ -7,6 +7,52 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 9.60. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+June 14, 2014 - Version 9.64
+
+  - Added write-only TestName tag for dry-run tests of file renaming feature
+  - Added a few new Olympus CameraType values
+  - Added a new new Nikon LensID's
+  - Added a new Canon LensType
+  - Patched to avoid structure warnings when copying tags from ZIP-based files
+  - Patched to deal with incorrect byte ordering in FlashPix date/time values
+    written by some cameras
+  - Fixed problem using advanced formatting feature in a -if condition
+  - Fixed problem parsing Canon VignettingCorr for some newer PowerShot models
+  - API Changes:
+      - Added 'Test' option to SetFileName()
+
+May 31, 2014 - Version 9.63
+
+  - Added basic read support for EPUB and MOBI electronic books
+  - Added ability to combine -lang option with -listx to extract only one language
+  - Remove leading XML comment from XMP if it exists when writing as a block
+  - Another attempt to patch problem obtaining a consistent "full path" for
+    source files when importing a CSV database in Windows
+
+May 24, 2014 - Version 9.62
+
+  - Added message about SourceFile names to -v2 output when importing a database
+    with -csv= or -json=
+  - Added patch to allow extraction of some incorrectly written FlashPix tags
+  - Extract a couple of new FlashPix tags for some FujiFilm models
+  - Decode a number of new Sony tags (thanks Jos Roost)
+  - Changed -n option for GPSTimeStamp to return nanosecond precision
+
+May 18, 2014 - Version 9.61
+
+  - Added ability to combine -l with -listf, -listr or -listwf to add
+    descriptions of the file type
+  - Added a few new Canon LensType values (thanks Norbert Wasser and Mark)
+  - Extract AE metering segments again for the Pentax K-3
+  - Decode a number of new FujiFilm RAF tags (thanks LibRaw)
+  - Decode a number of new Sony tags (thanks Jos Roost)
+  - Changed the case of some AF point values for consistency
+  - Fixed an incorrect Olympus FocusMode value
+  - Fixed problem introduced in 9.60 where a "LensID argument isn't numeric"
+    warning could occur under some conditions
+  - Fixed quirk where ExifTool could incorrectly report that a file was changed
+    when conditionally deleting a non-existent tag as a block
+
 May 11, 2014 - Version 9.60 (production release)
 
   - Added a few new values for some Pentax tags
@@ -258,7 +304,7 @@ Dec. 1, 2013 - Version 9.42
 Nov. 16, 2013 - Version 9.41
 
   - Added the ability to use multiple group qualifiers on tag names when writing
-    and copying (ie. "-QuickTime:Time:All=now")
+    and copying (eg. "-QuickTime:Time:All=now")
   - Added ability to geotag from Google Location Services KML files
   - Added a new Pentax LensType (thanks Louis Granboulan)
   - Added a new Canon LensType (thanks David Monro)
@@ -270,7 +316,7 @@ Nov. 16, 2013 - Version 9.41
 Nov. 8, 2013 - Version 9.40 - "Write QuickTime"
 
   - Added ability to write XMP and edit date/time tags in QuickTime-format files
-    (ie. MOV, MP4)
+    (eg. MOV, MP4)
   - Added -api option to allow API options to be set via the command line
   - Added ability to specify family 2 group name when writing
   - Added write support for a number of new XMP tags
@@ -830,7 +876,7 @@ Sept. 6, 2012 - Version 9.02
   - Changed names of some PanasonicRaw DistortionInfo tags
   - Changed decoding for a Sony ExposureMode value
   - Fixed hang/crash that could occur when writing to an image with corrupted
-    Sony MoreInfo data (ie. SLT-A55V JPEG corrupted by GIMP)
+    Sony MoreInfo data (eg. SLT-A55V JPEG corrupted by GIMP)
 
 Aug. 25, 2012 - Version 9.01 (production release)
 
@@ -882,7 +928,7 @@ July 28, 2012 - Version 8.98
   - Decode a number of new Sony tags (thanks Jos Roost)
   - Changed name of Minolta BatteryLevel tag to BatteryState
   - Patched problem with conditional deletion of IPTC string-type tags which are
-    incorrectly null terminated (ie. written by Picasa 2.0)
+    incorrectly null terminated (eg. written by Picasa 2.0)
   - Fixed problem copying Canon 5DmkIII MakerNotes from CR2 to JPEG images
   - Fixed runtime error when writing some images with corrupted EXIF
 
@@ -1732,7 +1778,7 @@ Oct. 31, 2010 - Version 8.37
 Oct. 30, 2010 - Version 8.36
 
   - Added ability to read/write metadata in Sigma X3F images containing a
-    JpgFromRaw (ie. all Sigma models except the SD9 and SD10)
+    JpgFromRaw (eg. all Sigma models except the SD9 and SD10)
   - Added -stay_open option to avoid startup delay when called from other
     applications
   - Added a new Pentax LensType (thanks Hubert Meier)
@@ -1759,7 +1805,7 @@ Oct. 23, 2010 - Version 8.35 - "PDF Encryption"
   - Extract Olympus ZoomedPreviewImage
   - Updated decoding of Olympus AFPoint for recent E-models
   - Avoid writing mandatory IPTC tags unless another IPTC tag actually changes
-    (ie. trying to delete a non-existent IPTC tag will no longer have the side
+    (eg. trying to delete a non-existent IPTC tag will no longer have the side
     effect of generating mandatory IPTC tags)
   - Improved language translations
   - Improved error message when trying to write a file with the wrong extension
@@ -2436,7 +2482,7 @@ Sept. 5, 2009 - Version 7.93
   - Added a few new Pentax LensType's
   - Decode a number of new tags for the Canon EOS 7D
   - Calculate Duration for WAV audio files
-  - Allow exponents when writing GPS coordinates (ie. "-gpslatitude=7.657e+01")
+  - Allow exponents when writing GPS coordinates (eg. "-gpslatitude=7.657e+01")
   - Print available character sets if no CHARSET is given for -charset option
   - Improved -v3 and -htmldump output to show MPF image data
   - Fixed -E option to work with tag descriptions when -lang option used
@@ -2721,7 +2767,7 @@ Mar. 20, 2009 - Version 7.72
   - Changed Composite:LensID to also return a value for Olympus lenses
   - Changed copying behaviour to preserve the specific location (family 1 group)
     when source group is specified and destination group is "all" or "*"
-    (ie. "-exif:all>all:all" now preserves the IFD of each tag)
+    (eg. "-exif:all>all:all" now preserves the IFD of each tag)
   - Fixed a number of incorrect Minolta/Sony lens names (thanks Olaf Ulrich)
   - Fixed bug rewriting MIE trailers on TIFF images
 
@@ -3055,7 +3101,7 @@ Oct. 11, 2008 - Version 7.47 - "Jumbo"
   - Implemented character set translation for MIE information (-L option)
   - Improved speed when scanning unknown file to determine FileType
   - Fixed bug where some writable EXIF tags gave a "not writable" message when
-    reading tag value from a dynamic file (ie. "-TAG<=%f.txt")
+    reading tag value from a dynamic file (eg. "-TAG<=%f.txt")
   - Fixed problem double-escaping characters when -h and -S were used together
   - Fixed decoding of Nikon FlashModel for SU-800 Remote Commander
   - Fixed swapped Nikon FlashGroupBControlMode/FlashGroupCControlMode tags
@@ -3086,7 +3132,7 @@ Oct. 1, 2008 - Version 7.45
   - Updated iptc2xmp.args and xmp2iptc.args to write IPTCDigest as per MWG
     recommendation
   - Allow zone-less date/time values in XMP (as per MWG and upcoming XMP spec)
-  - Allow brackets in $$ and $/ expressions (ie. ${$} and ${/} now work)
+  - Allow brackets in $$ and $/ expressions (eg. ${$} and ${/} now work)
   - Changed decoding of EXIF:Copyright to allow two separate strings as per spec
   - Changed a number of XMP Iptc4xmpCore tag names and added a corresponding set
     of aliases (shortcuts) for backward compatibility
@@ -3326,7 +3372,7 @@ May 21, 2008 - Version 7.26
   - Decode Panasonic Title tag (thanks Jens Duttke)
   - Recognize a few more uncommon top-level QuickTime atoms
   - Changed decoding of some Olympus tags for new E-520
-  - Changed warning when empty PrintIM data is encountered (ie. as written in
+  - Changed warning when empty PrintIM data is encountered (eg. as written in
     Sony A700 ARW files when Adobe RGB color mode is used)
   - Dropped Canon PreviewFocalPlaneX/YResolution tags since they never really
     existed (thanks Ger Vermeulen for pointing out the Canon bug which lead to
@@ -3465,7 +3511,7 @@ Feb. 16, 2008 - Version 7.17
 
   - Extract duplicate tags when -p option is used
   - Fixed bug introduced in 7.00 which broke the use of group family numbers and
-    groups ending with a digit in tag format strings (ie. "$IFD0:Model")
+    groups ending with a digit in tag format strings (eg. "$IFD0:Model")
 
 Feb. 14, 2008 - Version 7.16
 
@@ -3602,7 +3648,7 @@ Dec. 18, 2007 - Version 7.07
     LightSource, MeteringMode and SubjectDistanceRange) instead of handling as a
     truly unknown value (if this makes sense)
   - Extract PreviewImage from newer Panasonic RAW images (thanks Jens Duttke)
-  - Recognize Pentax-type Kodak maker notes (ie. Easyshare 883)
+  - Recognize Pentax-type Kodak maker notes (eg. Easyshare 883)
   - Made "Entries out of sequence" a minor warning since this problem is fixed
   - Allow decimal seconds to be written in time values without needing to use -n
   - Improved parsing of PDF files
@@ -3652,7 +3698,7 @@ Nov. 17, 2007 - Version 7.03
 
 Nov. 16, 2007 - Version 7.02
 
-  - Added ability to delete XMP family 1 groups (ie. "-XMP-crss:all=")
+  - Added ability to delete XMP family 1 groups (eg. "-XMP-crss:all=")
   - Fixed problem writing XMP as a block to XMP file
 
 Nov. 15, 2007 - Version 7.01
@@ -3720,7 +3766,7 @@ Oct. 6, 2007 - Version 6.99
   - Increased precision of 64-bit rational conversion from 7 to 10 digits
   - Fixed problem which caused failed tests with Perl 5.005_05
   - Fixed problem where some groups could not easily be excluded when deleting
-    all other information (ie. "-all= --exif:all" now behaves as expected)
+    all other information (eg. "-all= --exif:all" now behaves as expected)
   - Fixed problem decoding ICC Profile "dtim" format values
   - Fixed typo in a Minolta FlashMetering value (thanks Jens Duttke)
   - Fixed problem in API which could result in a UTF-8 encoded file not being
@@ -3976,7 +4022,7 @@ Mar. 20, 2007 - Version 6.82
 
 Mar. 17, 2007 - Version 6.81
 
-  - Added l/u modifiers for lower/uppercase in filename format codes (ie. "%le")
+  - Added l/u modifiers for lower/uppercase in filename format codes (eg. "%le")
   - Added equivalent IXY names to CanonModelID for PowerShot SD750 and SD1000
   - Added a few new Pentax ModelID's (Optio E30, T30, W30, A30)
   - Allow non-encrypted Nikon ColorBalance values to be written
@@ -3999,7 +4045,7 @@ Mar. 7, 2007 - Version 6.79
 
   - Translate special characters in ID3 information when reading
   - Improved conversions for GPSTimeStamp and GPSDateStamp when writing so they
-    can be set from a normal date/time tag (ie. "-gpstimestamp<createdate")
+    can be set from a normal date/time tag (eg. "-gpstimestamp<createdate")
   - Added support for Nikon D40X plus a new LensID (thanks Robert Rottmerhusen)
   - Added a new Canon LensType (thanks Warren Stockton)
   - Removed D70Boring shortcut tag
@@ -4056,7 +4102,7 @@ Feb. 2, 2007 - Version 6.74
 Jan. 31, 2007 - Version 6.73
 
   - Added read support for meta information in HTML and XHTML documents
-  - Added ability to write certain EXIF tags (ie. UserComment) as Unicode
+  - Added ability to write certain EXIF tags (eg. UserComment) as Unicode
   - Added character set translation for XMP information; the -L option now works
     for all common meta information formats! (see updated FAQ #10 for details)
   - Added a few more XMP-microsoft tags (thanks Kees Moerman)
@@ -4078,7 +4124,7 @@ Jan. 24, 2007 - Version 6.71
   - Patched Microsoft Photo bug in EXIF Unicode text byte ordering
   - Added support for XMP-microsoft tags and 2 new Microsoft EXIF tags
   - Added a few new XMP tags (NativeDigest, ColorMode and ICCProfileName)
-  - Added ability to add or delete copied tags from list (ie. "-SRCTAG+>DSTTAG")
+  - Added ability to add or delete copied tags from list (eg. "-SRCTAG+>DSTTAG")
   - Added a few more Canon EasyMode values (thanks Samson Tai)
   - Added CanonModelID values for new A450, A460 and A550
   - Changed the -if option so the condition automatically fails if the
@@ -4748,7 +4794,7 @@ Mar. 2, 2006 - Version 6.03
 Feb. 26, 2006 - Version 6.02
 
   - Fixed problem rewriting Photoshop IRB resources as written by some
-    applications (ie. PixVue)
+    applications (eg. PixVue)
   - Improved decoding of AVI files to increase speed and extract more tags
   - Added -overwrite_original_in_place option
   - Added a number of new XMP tags and bring XMP support up to new
@@ -5165,7 +5211,7 @@ July 28, 2005 - Version 5.52
 
 July 27, 2005 - Version 5.51
 
-  - Assume '-TagsFromFile @' for any redirected tags (ie. '-SRCTAG>DSTTAG' or
+  - Assume '-TagsFromFile @' for any redirected tags (eg. '-SRCTAG>DSTTAG' or
     '-DSTTAG<SRCTAG') which are specified without a prior '-TagsFromFile'
 
 July 27, 2005 - Version 5.50
@@ -5413,7 +5459,7 @@ May 16, 2005 - Version 5.18 (production release)
 May 14, 2005 - Version 5.17
 
   - Allow 'All' to be used as a group name with '-TagsFromFile' option to
-    preserve original tag groups (ie. '-all:all')
+    preserve original tag groups (eg. '-all:all')
   - PrintIM information is now copied with -TagsFromFile
   - Decode EXIF:Gamma tag
   - Decode Canon 350D FileNumber
@@ -5555,7 +5601,7 @@ Mar. 31, 2005 - Version 4.92
   - Added 'Directory' tag
   - Decode a few more Pentax tags (thanks to John Francis)
   - Allow newlines in tag values on command line when writing
-  - Fixed problem rewriting makernotes with sub directories (ie. Olympus)
+  - Fixed problem rewriting makernotes with sub directories (eg. Olympus)
 
 Mar. 28, 2005 - Version 4.91
 
@@ -5608,7 +5654,7 @@ Mar. 10, 2005 - Version 4.85
   - Fixed problem which caused an error when adding XMP information to a TIFF
     file which didn't previously contain XMP
   - Made '=' optional with -AllTagsFromFile option
-  - Fixed problem with verbose dump of zero-length directory (ie. Sony F717
+  - Fixed problem with verbose dump of zero-length directory (eg. Sony F717
     maker notes)
 
 Mar. 9, 2005 - Version 4.84
@@ -5749,7 +5795,7 @@ Feb. 4, 2005 - Version 4.51
 Feb. 2, 2005 - Version 4.50
 
   - Allow writing to specific IFD
-  - Allow permanent tags (ie. MakerNotes tags) 'deleted' by setting them to an
+  - Allow permanent tags (eg. MakerNotes tags) 'deleted' by setting them to an
     empty string if '' is a valid value for the tag
   - Added test for rewriting Nikon D70 information
   - Added missing inverse conversion routines for GPS tags (now they are all
@@ -5989,7 +6035,7 @@ Dec. 11, 2004 - Version 4.04
 Dec. 6, 2004 - Version 4.03
 
   - Major overhaul of verbose message output
-  - Change -v option to allow verbose level to be specified (ie. -v3 = very very
+  - Change -v option to allow verbose level to be specified (eg. -v3 = very very
     verbose)
   - Added a new Nikon tag (SceneMode)
   - Count images which were unchanged when writing tags

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/MANIFEST

@@ -99,6 +99,7 @@ html/TagNames/PICT.html
 html/TagNames/PLIST.html
 html/TagNames/PNG.html
 html/TagNames/PSP.html
+html/TagNames/Palm.html
 html/TagNames/Panasonic.html
 html/TagNames/PanasonicRaw.html
 html/TagNames/Pentax.html
@@ -297,6 +298,7 @@ lib/Image/ExifTool/PLIST.pm
 lib/Image/ExifTool/PNG.pm
 lib/Image/ExifTool/PPM.pm
 lib/Image/ExifTool/PSP.pm
+lib/Image/ExifTool/Palm.pm
 lib/Image/ExifTool/Panasonic.pm
 lib/Image/ExifTool/PanasonicRaw.pm
 lib/Image/ExifTool/Pentax.pm
@@ -598,6 +600,8 @@ t/PPM_2.out
 t/PPM_3.out
 t/PSP.t
 t/PSP_2.out
+t/Palm.t
+t/Palm_2.out
 t/Panasonic.t
 t/Panasonic_2.out
 t/Panasonic_3.out
@@ -844,6 +848,7 @@ t/images/PLIST-xml.plist
 t/images/PNG.png
 t/images/PPM.ppm
 t/images/PSP.psp
+t/images/Palm.mobi
 t/images/Panasonic.jpg
 t/images/Panasonic.rw2
 t/images/Pentax.avi

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

@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Image-ExifTool
-version:            9.60
+version:            9.64
 abstract:           Read and write meta information
 author:
     - Phil Harvey (phil@owl.phy.queensu.ca)

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/README

@@ -16,15 +16,16 @@ supported by ExifTool (r = read, w = write, c = create):
   ------------+-------------+-------------+-------------+------------
   3FR   r     | EIP   r     | LA    r     | OTF   r     | RW2   r/w
   3G2   r/w   | EPS   r/w   | LNK   r     | PAC   r     | RWL   r/w
-  3GP   r/w   | ERF   r/w   | M2TS  r     | PAGES r     | RWZ   r
-  ACR   r     | EXE   r     | M4A/V r/w   | PBM   r/w   | RM    r
-  AFM   r     | EXIF  r/w/c | MEF   r/w   | PCD   r     | SO    r
-  AI    r/w   | EXR   r     | MIE   r/w/c | PDF   r/w   | SR2   r/w
-  AIFF  r     | EXV   r/w/c | MIFF  r     | PEF   r/w   | SRF   r
-  APE   r     | F4A/V r/w   | MKA   r     | PFA   r     | SRW   r/w
-  ARW   r/w   | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
-  ASF   r     | FLA   r     | MKV   r     | PFM   r     | SWF   r
-  AVI   r     | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
+  3GP   r/w   | EPUB  r     | M2TS  r     | PAGES r     | RWZ   r
+  ACR   r     | ERF   r/w   | M4A/V r/w   | PBM   r/w   | RM    r
+  AFM   r     | EXE   r     | MEF   r/w   | PCD   r     | SEQ   r
+  AI    r/w   | EXIF  r/w/c | MIE   r/w/c | PDB   r     | SO    r
+  AIFF  r     | EXR   r     | MIFF  r     | PDF   r/w   | SR2   r/w
+  APE   r     | EXV   r/w/c | MKA   r     | PEF   r/w   | SRF   r
+  ARW   r/w   | F4A/V r/w   | MKS   r     | PFA   r     | SRW   r/w
+  ASF   r     | FFF   r/w   | MKV   r     | PFB   r     | SVG   r
+  AVI   r     | FLA   r     | MNG   r/w   | PFM   r     | SWF   r
+  AZW   r     | FLAC  r     | MOBI  r     | PGF   r     | THM   r/w
   BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
   BTF   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
   CHM   r     | FPX   r     | MOV   r/w   | PICT  r     | TTC   r

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/config_files/ExifTool_config

@@ -94,7 +94,7 @@
             Writable => 'rational64s',
         },
     },
-    # IPTC tags are added to a specific record type (ie. application record):
+    # IPTC tags are added to a specific record type (eg. application record):
     # (Note: IPTC tag ID's are limited to the range 0-255)
     'Image::ExifTool::IPTC::ApplicationRecord' => {
         # Example 4.  IPTC:NewIPTCTag
@@ -117,7 +117,7 @@
         # Example 7.  XMP-exif:GPSRoll
         GPSRoll  => { Writable => 'rational', Groups => { 2 => 'Location' } },
     },
-    # new XMP namespaces (ie. xxx) must be added to the Main XMP table:
+    # new XMP namespaces (eg. xxx) must be added to the Main XMP table:
     'Image::ExifTool::XMP::Main' => {
         # namespace definition for examples 8 to 11
         xxx => { # <-- must be the same as the NAMESPACE prefix
@@ -244,7 +244,7 @@
     GROUPS        => { 0 => 'XMP', 1 => 'XMP-xxx', 2 => 'Image' },
     NAMESPACE     => { 'xxx' => 'http://ns.myname.com/xxx/1.0/' },
     WRITABLE      => 'string',
-    # replace "NewXMPxxxTag1" with your own tag name (ie. "MyTag")
+    # replace "NewXMPxxxTag1" with your own tag name (eg. "MyTag")
     # Example 8.  XMP-xxx:NewXMPxxxTag1
     NewXMPxxxTag1 => { Writable => 'lang-alt' },
     # Example 9.  XMP-xxx:NewXMPxxxTag2

data/bin/{Image-ExifTool-9.60 → Image-ExifTool-9.64}/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '9.60';
+my $version = '9.64';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -35,6 +35,7 @@ sub SigCont();
 sub Cleanup();
 sub GetImageInfo($$);
 sub SetImageInfo($$$);
+sub DoHardLink($$$$);
 sub CleanXML($);
 sub EncodeXML($);
 sub FormatXML($$$);
@@ -55,7 +56,7 @@ sub AbsPath($);
 sub SuggestedExtension($$$);
 sub LoadPrintFormat($);
 sub FilenameSPrintf($;$@);
-sub NextUnusedFilename($;$);
+sub NextUnusedFilename($;$$);
 sub CreateDirectory($);
 sub OpenOutputFile($;@);
 sub AcceptFile($);
@@ -94,6 +95,7 @@ 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
 my %setTagsList;    # list of other tag lists for multiple -tagsFromFile from the same file
+my %usedFileName;   # lookup for file names we already used in TestName feature
 my %warnedOnce;     # lookup for once-only warnings
 my %wext;           # -W extensions to write
 my $allGroup;       # show group name for all tags
@@ -138,6 +140,7 @@ my $interrupted;    # flag set if CTRL-C is pressed during a critical process
 my $isWriting;      # flag set if we are writing tags
 my $joinLists;      # flag set to join list values into a single string
 my $json;           # flag for JSON/PHP output format (1=JSON, 2=PHP)
+my $langOpt;        # language option
 my $listItem;       # item number for extracting single item from a list
 my $listSep;        # list item separator (', ' by default)
 my $mt;             # main ExifTool object
@@ -353,6 +356,7 @@ undef %printFmt;
 undef %preserveTime;
 undef %setTags;
 undef %setTagsList;
+undef %usedFileName;
 undef %warnedOnce;
 undef %wext;
 undef $allGroup;
@@ -375,6 +379,7 @@ undef $filtered;
 undef $fixLen;
 undef $forcePrint;
 undef $joinLists;
+undef $langOpt;
 undef $listItem;
 undef $multiFile;
 undef $outOpt;
@@ -537,6 +542,7 @@ for (;;) {
                 my %opts;
                 $opts{Flags} = 1 if defined $forcePrint;
                 $opts{NoDesc} = 1 if $outFormat > 0;
+                $opts{Lang} = $langOpt;
                 Image::ExifTool::TagInfoXML::Write(undef, $group, %opts);
                 next;
             }
@@ -841,12 +847,12 @@ for (;;) {
     (/^l$/ or $a eq 'long') and --$outFormat, next;
     (/^L$/ or $a eq 'latin') and $utf8 = 0, $mt->Options(Charset => 'Latin'), next;
     if ($a eq 'lang') {
-        my $lang = (@ARGV and $ARGV[0] !~ /^-/) ? shift : undef;
-        if ($lang) {
-            # make lower case and use underline as a separator (ie. 'en_ca')
-            $lang =~ tr/-A-Z/_a-z/;
-            $mt->Options(Lang => $lang);
-            next if $lang eq $mt->Options('Lang');
+        $langOpt = (@ARGV and $ARGV[0] !~ /^-/) ? shift : undef;
+        if ($langOpt) {
+            # make lower case and use underline as a separator (eg. 'en_ca')
+            $langOpt =~ tr/-A-Z/_a-z/;
+            $mt->Options(Lang => $langOpt);
+            next if $langOpt eq $mt->Options('Lang');
         } else {
             $pass or push(@nextPass, '-lang'), next;
         }
@@ -855,7 +861,7 @@ for (;;) {
         $langs =~ tr/_/-/;  # display dashes instead of underlines in language codes
         $langs = $mt->Decode($langs, 'UTF8');
         $langs = Image::ExifTool::HTML::EscapeHTML($langs) if $escapeHTML;
-        $lang and Error("Invalid or unsupported language '$lang'.\n$langs"), $badCmd=1, next;
+        $langOpt and Error("Invalid or unsupported language '$langOpt'.\n$langs"), $badCmd=1, next;
         print $langs;
         $helped = 1;
         next;
@@ -1502,7 +1508,12 @@ if (@dbKeys and require Cwd) {
     local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
     foreach (@dbKeys) {
         my $absPath = AbsPath($_);
-        $database{$absPath} = $database{$_} if defined $absPath and not $database{$absPath};
+        if (defined $absPath) {
+            $database{$absPath} = $database{$_} unless $database{$absPath};
+            if ($verbose and $verbose > 1) {
+                print $vout "Imported entry for '$_' (full path: '$absPath')\n";
+            }
+        }
     }
 }
 
@@ -1754,7 +1765,7 @@ sub GetImageInfo($$)
         $info = $et->ImageInfo(Infile($pipe), \@foundTags);
         $et->Options(Duplicates => $oldDups);
     }
-    # all done now if we already wrote output text file (ie. verbose option)
+    # all done now if we already wrote output text file (eg. verbose option)
     if ($fp) {
         if ($outfile) {
             $et->Options(TextOut => \*STDOUT);
@@ -1886,7 +1897,7 @@ TAG:    foreach $tag (@foundTags) {
             my $val = $$info{$tag};
             if (ref $val) {
                 if (defined $binaryOutput and not $binaryOutput) { # happens with -X -b or -php -b
-                    # avoid extracting Protected binary tags (ie. data blocks) [insider information]
+                    # avoid extracting Protected binary tags (eg. data blocks) [insider information]
                     next if $$et{TAG_INFO}{$tag}{Protected};
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
@@ -2253,7 +2264,7 @@ TAG:    foreach $tag (@foundTags) {
 sub SetImageInfo($$$)
 {
     my ($et, $file, $orig) = @_;
-    my ($outfile, $restored, $isTemporary, $isStdout, $outType, $tagsFromSrc, $hardLink);
+    my ($outfile, $restored, $isTemporary, $isStdout, $outType, $tagsFromSrc, $hardLink, $testName);
     my $infile = $file;    # save infile in case we change it again
 
     undef $tmpFile; # make sure this isn't defined
@@ -2400,7 +2411,7 @@ sub SetImageInfo($$$)
                 unless ($found) {
                     Warn("No SourceFile '$file' in imported $csv database\n");
                     my $absPath = AbsPath($file);
-                    Warn("(absolute path: '$absPath')\n") if defined $absPath;
+                    Warn("(full path: '$absPath')\n") if defined $absPath;
                     return 0;
                 }
             }
@@ -2416,8 +2427,12 @@ sub SetImageInfo($$$)
     } else {
         # get name of hard link if we are creating one
         $hardLink = $et->GetNewValues('HardLink');
+        $testName = $et->GetNewValues('TestName');
         $hardLink = FilenameSPrintf($hardLink, $orig) if defined $hardLink;
-    
+        if (defined $testName) {
+            $testName = FilenameSPrintf($testName, $orig);
+            $testName = Image::ExifTool::GetNewFileName($file, $testName) if $file ne '';
+        }
         # determine what our output file name should be
         my $newFileName = $et->GetNewValues('FileName');
         my $newDir = $et->GetNewValues('Directory');
@@ -2494,14 +2509,9 @@ sub SetImageInfo($$$)
                 } else {
                     ++$countSameWr;
                 }
-                if (defined $hardLink) {
+                if (defined $hardLink or defined $testName) {
                     my $src = (defined $outfile and $r3 > 0) ? $outfile : $file;
-                    $hardLink = NextUnusedFilename($hardLink);
-                    if ($et->SetFileName($src, $hardLink, 'Link') > 0) {
-                        ++$countLink;
-                    } else {
-                        ++$countBadLink;
-                    }
+                    DoHardLink($et, $src, $hardLink, $testName);
                 }
                 return 1;
             }
@@ -2523,14 +2533,9 @@ sub SetImageInfo($$$)
     my $success = $et->WriteInfo(Infile($file), $outfile, $outType);
 
     # create hard link if specified
-    if (defined $hardLink and $success) {
+    if ($success and (defined $hardLink or defined $testName)) {
         my $src = defined $outfile ? $outfile : $file;
-        $hardLink = NextUnusedFilename($hardLink);
-        if ($et->SetFileName($src, $hardLink, 'Link') > 0) {
-            ++$countLink;
-        } else {
-            ++$countBadLink;
-        }
+        DoHardLink($et, $src, $hardLink, $testName);
     }
 
     # get file time if preserving it
@@ -2658,6 +2663,31 @@ sub SetImageInfo($$$)
     return $success;
 }
 
+#------------------------------------------------------------------------------
+# Make hard link and handle TestName if specified
+# Inputs: 0) ExifTool ref, 1) source file name, 2) HardLink name, 3) TestFile name
+sub DoHardLink($$$$)
+{
+    my ($et, $src, $hardLink, $testName) = @_;
+    if (defined $hardLink) {
+        $hardLink = NextUnusedFilename($hardLink);
+        if ($et->SetFileName($src, $hardLink, 'Link') > 0) {
+            ++$countLink;
+        } else {
+            ++$countBadLink;
+        }
+    }
+    if (defined $testName) {
+        $testName = NextUnusedFilename($testName, undef, 1);
+        if ($usedFileName{$testName}) {
+            $et->Warn("File '$testName' would exist");
+        } else {
+            $usedFileName{$testName} = 1;
+            $et->SetFileName($src, $testName, 'Test');
+        }
+    }
+}
+
 #------------------------------------------------------------------------------
 # Clean string for XML (also removes invalid control chars and malformed UTF-8)
 # Inputs: 0) string ref
@@ -2808,6 +2838,10 @@ sub FormatJSON($$$)
 sub FormatCSV($)
 {
     my $val = shift;
+    # currently, the value may contain NULL characters.  It is unclear
+    # whether or not this is valid CSV, but some readers may not like it.
+    # (if this becomes a problem, in the future values may need to be truncated at
+    # the first NULL character, but this would disable the use of CSV for binary data)
     $val = qq{"$val"} if $val =~ s/"/""/g or $val =~ /(^\s+|\s+$)/ or $val =~ /[,\n\r]/;
     return $val;
 }
@@ -3093,9 +3127,12 @@ sub AbsPath($)
     my $path;
     if (defined $file and require Cwd) {
         $path = eval { Cwd::abs_path($file) };
-        # convert to forward slashes if necessary
-        # (abs_path doesn't consistently return one or the other)
-        $path =~ tr/\\/\// if defined $path and $hasBackslash{$^O};
+        # make the delimiters and case consistent
+        # (abs_path is very inconsistent about what it returns in Windows)
+        if (defined $path and $hasBackslash{$^O}) {
+            $path =~ tr/\\/\// ;
+            $path = lc $path;
+        }
     }
     return $path;
 }
@@ -3259,10 +3296,11 @@ sub Num2Alpha($)
 #------------------------------------------------------------------------------
 # Expand '%c' and '%C' codes if filename to get next unused file name
 # Inputs: 0) file name format string, 1) filename ok to use even if it exists
+#         2) dry run (won't really be renaming file)
 # Returns: new file name
-sub NextUnusedFilename($;$)
+sub NextUnusedFilename($;$$)
 {
-    my ($fmt, $okfile) = @_;
+    my ($fmt, $okfile, $dryRun) = @_;
     return $fmt unless $fmt =~ /%[-+]?\d*\.?\d*[lun]?[cC]/;
     my %sep = ( '-' => '-', '+' => '_' );
     my ($copy, $alpha) = (0, 'a');
@@ -3295,7 +3333,7 @@ sub NextUnusedFilename($;$)
         }
         $filename .= substr($fmt, $pos); # add rest of file name
         # return now with filename unless file exists
-        return $filename unless -e $filename;
+        return $filename unless -e $filename or $usedFileName{$filename};
         return $filename if defined $okfile and $filename eq $okfile;
         ++$copy;
         ++$alpha;
@@ -3497,7 +3535,7 @@ sub ReadStayOpen($)
                 last;
             }
         } elsif ($result == 0) {
-            # sysread() didn't block (ie. when reading from a file),
+            # sysread() didn't block (eg. when reading from a file),
             # so wait for a short time (1/100 sec) then try again
             # Note: may break out of this early if SIGCONT is received
             select(undef,undef,undef,0.01);
@@ -3517,9 +3555,15 @@ sub PrintTagList($@)
 {
     my $msg = shift;
     print $msg, ":\n" unless $quiet;
+    my $tag;
+    if ($outFormat < 0 and $msg =~ /file extensions$/ and @_) {
+        foreach $tag (@_) {
+            printf("  %-11s %s\n", $tag, GetFileType($tag, 1));
+        }
+        return;
+    }
     print ' ';
     my $len = 1;
-    my $tag;
     foreach $tag (@_) {
         my $taglen = length($tag);
         if ($len + $taglen > 78) {
@@ -3606,35 +3650,36 @@ supported by ExifTool (r = read, w = write, c = create):
   ------------+-------------+-------------+-------------+------------
   3FR   r     | EIP   r     | LA    r     | OTF   r     | RW2   r/w
   3G2   r/w   | EPS   r/w   | LNK   r     | PAC   r     | RWL   r/w
-  3GP   r/w   | ERF   r/w   | M2TS  r     | PAGES r     | RWZ   r
-  ACR   r     | EXE   r     | M4A/V r/w   | PBM   r/w   | RM    r
-  AFM   r     | EXIF  r/w/c | MEF   r/w   | PCD   r     | SEQ   r
-  AI    r/w   | EXR   r     | MIE   r/w/c | PDF   r/w   | SO    r
-  AIFF  r     | EXV   r/w/c | MIFF  r     | PEF   r/w   | SR2   r/w
-  APE   r     | F4A/V r/w   | MKA   r     | PFA   r     | SRF   r
-  ARW   r/w   | FFF   r/w   | MKS   r     | PFB   r     | SRW   r/w
-  ASF   r     | FLA   r     | MKV   r     | PFM   r     | SVG   r
-  AVI   r     | FLAC  r     | MNG   r/w   | PGF   r     | SWF   r
-  BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | THM   r/w
-  BTF   r     | FPF   r     | MOS   r/w   | PLIST r     | TIFF  r/w
-  CHM   r     | FPX   r     | MOV   r/w   | PICT  r     | TORRENT r
-  COS   r     | GIF   r/w   | MP3   r     | PMP   r     | TTC   r
-  CR2   r/w   | GZ    r     | MP4   r/w   | PNG   r/w   | TTF   r
-  CRW   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VRD   r/w/c
-  CS1   r/w   | HDR   r     | MPG   r     | PPT   r     | VSD   r
-  DCM   r     | HTML  r     | MPO   r/w   | PPTX  r     | WAV   r
-  DCP   r/w   | ICC   r/w/c | MQV   r/w   | PS    r/w   | WDP   r/w
-  DCR   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBP  r
-  DFONT r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WEBM  r
-  DIVX  r     | IND   r/w   | NEF   r/w   | PSP   r     | WMA   r
-  DJVU  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WMV   r
-  DLL   r     | ITC   r     | NUMBERS r   | RA    r     | WV    r
-  DNG   r/w   | J2C   r     | ODP   r     | RAF   r/w   | X3F   r/w
-  DOC   r     | JNG   r/w   | ODS   r     | RAM   r     | XCF   r
-  DOCX  r     | JP2   r/w   | ODT   r     | RAR   r     | XLS   r
-  DPX   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XLSX  r
-  DV    r     | K25   r     | OGG   r     | RIFF  r     | XMP   r/w/c
-  DVB   r/w   | KDC   r     | OGV   r     | RSRC  r     | ZIP   r
+  3GP   r/w   | EPUB  r     | M2TS  r     | PAGES r     | RWZ   r
+  ACR   r     | ERF   r/w   | M4A/V r/w   | PBM   r/w   | RM    r
+  AFM   r     | EXE   r     | MEF   r/w   | PCD   r     | SEQ   r
+  AI    r/w   | EXIF  r/w/c | MIE   r/w/c | PDB   r     | SO    r
+  AIFF  r     | EXR   r     | MIFF  r     | PDF   r/w   | SR2   r/w
+  APE   r     | EXV   r/w/c | MKA   r     | PEF   r/w   | SRF   r
+  ARW   r/w   | F4A/V r/w   | MKS   r     | PFA   r     | SRW   r/w
+  ASF   r     | FFF   r/w   | MKV   r     | PFB   r     | SVG   r
+  AVI   r     | FLA   r     | MNG   r/w   | PFM   r     | SWF   r
+  AZW   r     | FLAC  r     | MOBI  r     | PGF   r     | THM   r/w
+  BMP   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
+  BTF   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
+  CHM   r     | FPX   r     | MOV   r/w   | PICT  r     | TTC   r
+  COS   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
+  CR2   r/w   | GZ    r     | MP4   r/w   | PNG   r/w   | VRD   r/w/c
+  CRW   r/w   | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
+  CS1   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
+  DCM   r     | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
+  DCP   r/w   | ICC   r/w/c | MQV   r/w   | PS    r/w   | WEBP  r
+  DCR   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
+  DFONT r     | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
+  DIVX  r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
+  DJVU  r     | INX   r     | NRW   r/w   | QTIF  r/w   | WV    r
+  DLL   r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
+  DNG   r/w   | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
+  DOC   r     | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
+  DOCX  r     | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
+  DPX   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
+  DV    r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
+  DVB   r/w   | KDC   r     | OGV   r     | RSRC  r     |
   DYLIB r     | KEY   r     | ORF   r/w   | RTF   r     |
 
   Meta Information
@@ -3777,13 +3822,13 @@ L<Advanced options|/Advanced options>
 
 =item B<->I<TAG>
 
-Extract information for the specified tag (ie. C<-CreateDate>).  Multiple
+Extract information for the specified tag (eg. C<-CreateDate>).  Multiple
 tags may be specified in a single command.  A tag name is the handle by
 which a piece of information is referenced.  See
 L<Image::ExifTool::TagNames|Image::ExifTool::TagNames> for documentation on
 available tag names.  A tag name may include leading group names separated
-by colons (ie. C<-EXIF:CreateDate>, or C<-Doc1:XMP:Creator>), and each group
-name may be prefixed by a digit to specify family number (ie.
+by colons (eg. C<-EXIF:CreateDate>, or C<-Doc1:XMP:Creator>), and each group
+name may be prefixed by a digit to specify family number (eg.
 C<-1IPTC:City>).  Use the B<-listg> option to list available group names by
 family.
 
@@ -3811,21 +3856,21 @@ information.  Use the B<-s> option to see the tag names instead.
 =item B<-->I<TAG>
 
 Exclude specified tag from extracted information.  Same as the B<-x> option.
+Group names and wildcards are permitted as described above for B<-TAG>. 
 Once excluded from the output, a tag may not be re-included by a subsequent
 option.  May also be used following a B<-tagsFromFile> option to exclude
 tags from being copied (when redirecting to another tag, it is the source
 tag that should be excluded), or to exclude groups from being deleted when
-deleting all information (ie. C<-all= --exif:all> deletes all but EXIF
+deleting all information (eg. C<-all= --exif:all> deletes all but EXIF
 information).  But note that this will not exclude individual tags from a
-group delete (unless a family 2 group is specified, see note 4 below). 
+group delete (unless a family 2 group is specified, see note 4 below).
 Instead, individual tags may be recovered using the B<-tagsFromFile> option
-(ie. C<-all= -tagsfromfile @ -artist>). Wildcards are permitted as described
-above for B<-TAG>.
+(eg. C<-all= -tagsfromfile @ -artist>).
 
 =item B<->I<TAG>[+-]B<=>[I<VALUE>]
 
-Write a new value for the specified tag (ie. C<-comment=wow>), or delete the
-tag if no I<VALUE> is given (ie. C<-comment=>).  C<+=> and C<-=> are used to
+Write a new value for the specified tag (eg. C<-comment=wow>), or delete the
+tag if no I<VALUE> is given (eg. C<-comment=>).  C<+=> and C<-=> are used to
 add or remove existing entries from a list, or to shift date/time values
 (see L<Image::ExifTool::Shift.pl|Image::ExifTool::Shift.pl> for details).
 C<+=> may also be used to increment numerical values, and C<-=> may be used
@@ -3844,7 +3889,7 @@ value to multiple tags.  When specified with wildcards, "unsafe" tags are
 not written.  A tag name of C<All> is eqivalent to C<*> (except that it
 doesn't require quoting, while arguments with wildcards do on systems with
 shell globbing), and is often used when deleting all metadata (ie. C<-All=>)
-or an entire group (ie. C<-GROUP:All=>, see note 4 below).  Note that not
+or an entire group (eg. C<-GROUP:All=>, see note 4 below).  Note that not
 all groups are deletable, and that the JPEG APP14 "Adobe" group is not
 removed by default with C<-All=> because it may affect the appearance of the
 image.  However, this will remove color space information, so the colors may
@@ -3904,8 +3949,9 @@ may also be given by a I<FMT> string where %d, %f and %e represent the
 directory, file name and extension of the original I<FILE> (see the B<-w>
 option for more details).  Note that quotes are required around this
 argument to prevent shell redirection since it contains a C<E<lt>> symbol.
-C<+E<lt>=> or C<-E<lt>=> may also be used to add or delete specific list
-entries, or to shift date/time values.
+If I<DATFILE>/I<FMT> is not provided, the effect is the same as C<-TAG=>,
+and the tag is simply deleted.  C<+E<lt>=> or C<-E<lt>=> may also be used to
+add or delete specific list entries, or to shift date/time values.
 
 =item B<-tagsFromFile> I<SRCFILE> or I<FMT>
 
@@ -3926,7 +3972,7 @@ to this group (unless redirected to another group, see below).  If C<All> is
 used as a group name, then each tag is written to the same family 1 group it
 had in the source file (ie. the same specific location in the metadata), but
 a different family may be specified by adding a leading family number to the
-group name (ie. C<-0All:all>).
+group name (eg. C<-0All:all>).
 
 I<SRCFILE> may be the same as I<FILE> to move information around within a
 single file.  In this case, C<@> may be used to represent the source file
@@ -4004,7 +4050,7 @@ any previous operations on the list.  While this avoids duplicate list items
 when copying groups of tags from a file containing redundant information, it
 also prevents values of different tags from being copied into the same list
 when this is the intent.  So a B<-addTagsFromFile> option is provided which
-allows copying of multiple tags into the same list.  ie)
+allows copying of multiple tags into the same list.  eg)
 
     exiftool -addtagsfromfile @ '-subject<make' '-subject<model' ...
 
@@ -4020,8 +4066,8 @@ B<-struct> option for details.
 =item B<-x> I<TAG> (B<-exclude>)
 
 Exclude the specified tag.  There may be multiple B<-x> options.  This has
-the same effect as --I<TAG> on the command line.  May also be used following
-a B<-tagsFromFile> option to exclude tags from being copied.
+the same effect as --I<TAG> on the command line.  See the --I<TAG>
+documentation above for a complete description.
 
 =back
 
@@ -4081,7 +4127,7 @@ when copying tags using the B<-tagsFromFile> option.
 
 2) If the hemisphere is known, a reference direction (N, S, E or W) is
 appended to each printed coordinate, but adding a C<+> to the format
-specifier (ie. C<%+.6f>) prints a signed coordinate instead.
+specifier (eg. C<%+.6f>) prints a signed coordinate instead.
 
 3) This print formatting may be disabled with the B<-n> option to extract
 coordinates as signed decimal degrees.
@@ -4220,7 +4266,7 @@ may be 0 (general location), 1 (specific location), 2 (category), 3
 specified by separating them with colons.  By default the resulting group
 name is simplified by removing any leading C<Main:> and collapsing adjacent
 identical group names, but this can be avoided by placing a colon before the
-first family number (ie. B<-g:3:1>).  If I<NUM> is not specified, B<-g0> is
+first family number (eg. B<-g:3:1>).  If I<NUM> is not specified, B<-g0> is
 assumed.  Use the B<-listg> option to list group names for a specified
 family.
 
@@ -4266,8 +4312,9 @@ the B<-D> or B<-H> option changes tag values to JSON objects with "val" and
 "id" fields, and adding B<-l> adds a "desc" field, and a "num" field if the
 numerical value is different from the converted "val".  The B<-b> option may
 be added to output binary data, encoded in base64 if necessary (indicated by
-"base64:" as the first 7 bytes of the value).  The B<-L> and B<-charset>
-options have no effect on the JSON output.
+"base64:" as the first 7 bytes of the value).  The JSON output is UTF-8
+regardless of any B<-L> or B<-charset> option setting, but the UTF-8
+validation is disabled if a character set other than UTF-8 is specified.
 
 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
@@ -4282,7 +4329,9 @@ may be suffixed with a C<#> to disable print conversion.
 
 Use long 2-line Canon-style output format.  Adds a description and
 unconverted value (if it is different from the converted value) to the XML,
-JSON or PHP output when B<-X>, B<-j> or B<-php> is used.
+JSON or PHP output when B<-X>, B<-j> or B<-php> is used.  May also be
+combined with B<-listf>, B<-listr> or B<-listwf> to add descriptions of the
+file types.
 
 =item B<-L> (B<-latin>)
 
@@ -4297,7 +4346,8 @@ C<de>, C<fr>, C<ja>, etc.  Use B<-lang> with no other arguments to get a
 list of available languages.  The default language is C<en> if B<-lang> is
 not specified.  Note that tag/group names are always English, independent of
 the B<-lang> setting, and translation of warning/error messages has not yet
-been implemented.
+been implemented.  May also be combined with B<-listx> to output
+descriptions in one language only.
 
 By default, ExifTool uses UTF-8 encoding for special characters, but the
 the B<-L> or B<-charset> option may be used to invoke other encodings.
@@ -4367,7 +4417,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 9.60 --
+    -- Generated by ExifTool 9.64 --
     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
@@ -4611,7 +4661,7 @@ are as follows:
 2) B<-W> supports three additional format codes:  %t, %g and %s represent
 the tag name, group name, and suggested extension for the output file (based
 on the format of the data).  The %g code may be followed by a single digit
-to specify the group family number (ie. %g1), otherwise family 0 is assumed.
+to specify the group family number (eg. %g1), otherwise family 0 is assumed.
 The substring width/position/case specifiers may be used with these format
 codes in exactly the same way as with %f and %e.
 
@@ -4687,7 +4737,7 @@ in JPEG and MPO files, streaming metadata in AVCHD videos, and the resource
 fork of Mac OS files.  Implies the B<-a> option.  Use B<-g3> or B<-G3> to
 identify the originating document for extracted information. Embedded
 documents containing sub-documents are indicated with dashes in the family 3
-group name.  (ie. C<Doc2-3> is the 3rd sub-document of the 2nd embedded
+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.
 
@@ -4720,8 +4770,8 @@ some maker note entries when reading the edited file.  This option allows an
 integer I<OFFSET> to be specified for adjusting the maker notes base offset.
 If no I<OFFSET> is given, ExifTool takes its best guess at the correct base.
 Note that exiftool will automatically fix the offsets for images which store
-original offset information (ie. newer Canon models).  Offsets are fixed
-permanently if B<-F> is used when writing EXIF to an image. ie)
+original offset information (eg. newer Canon models).  Offsets are fixed
+permanently if B<-F> is used when writing EXIF to an image. eg)
 
     exiftool -F -exif:resolutionunit=inches image.jpg
 
@@ -4746,10 +4796,11 @@ I<TAG>.  For example, to process files in order of date:
 Additional B<-fileOrder> options may be added for secondary sort keys. 
 Floating point values are sorted numerically, and all other values are
 sorted alphabetically.  The sort order may be reversed by prefixing the tag
-name with a C<-> (ie. C<-fileOrder -createdate>).  A C<#> may be appended to
-the tag name to disable print conversion for the sorted values.  Note that
-the B<-fileOrder> option has a large performance impact since it involves an
-additional processing pass of each file.
+name with a C<-> (eg. C<-fileOrder -createdate>).  Print conversion of the
+sorted values is disabled with the B<-n> option, or a C<#> appended to the
+tag name.  Other formatting options (eg. B<-d>) have no effect on the sorted
+values.  Note that the B<-fileOrder> option has a large performance impact
+since it involves an additional processing pass of each file.
 
 =item B<-i> I<DIR> (B<-ignore>)
 
@@ -4791,7 +4842,7 @@ Notes:
 2) Some binary data blocks are not extracted unless specified explicitly.
 These tags are not available for use in the B<-if> condition unless they are
 also specified on the command line.  The alternative is to use the
-C<$GROUP:all> syntax. (ie. Use C<$exif:all> instead of C<$exif> in I<EXPR>
+C<$GROUP:all> syntax. (eg. Use C<$exif:all> instead of C<$exif> in I<EXPR>
 to test for the existence of EXIF tags.)
 
 3) Tags in the string are interpolated the same way as with B<-p> before the
@@ -4809,7 +4860,7 @@ the associated NEF:
 
 5) The B<-a> option has no effect on the evaluation of the expression, and
 the values of duplicate tags are accessible only by specifying a group name
-(such as a family 4 instance number, ie. C<$Copy1:TAG>, C<$Copy2:TAG>, etc).
+(such as a family 4 instance number, eg. C<$Copy1:TAG>, C<$Copy2:TAG>, etc).
 
 =item B<-m> (B<-ignoreMinorErrors>)
 
@@ -4899,16 +4950,16 @@ Show file progress count in messages.  The progress count appears in
 brackets after then 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, which prints the name of each processed file when writing.  When
-combined with the [tt]-if[/tt] option, the total count includes all files
-before the condition is applied, but files that fail the condition will not
-have their names printed.
+combined with the B<-if> option, the total count includes all files before
+the condition is applied, but files that fail the condition will not have
+their names printed.
 
 =item B<-q> (B<-quiet>)
 
 Quiet processing.  One B<-q> suppresses normal informational messages, and a
 second B<-q> suppresses warnings as well.  Error messages can not be
 suppressed, although minor errors may be downgraded to warnings with the
-B<-m> option.
+B<-m> option, which may then be suppressed with C<-q -q>.
 
 =item B<-r> (B<-recurse>)
 
@@ -4956,7 +5007,7 @@ for EXIF this is the individual IFD (the family 1 group).
 When reading, causes information to be extracted from .gz and .bz2
 compressed images.  (Only one image per archive.  Requires gzip and bzip2 to
 be installed on the system.)  When writing, causes compressed information to
-be written if supported by the image format.  (ie. The PNG format supports
+be written if supported by the image format.  (eg. The PNG format supports
 compressed text.)  This option also disables the recommended padding in
 embedded XMP, saving 2424 bytes when writing XMP in a file.
 
@@ -5120,7 +5171,10 @@ be followed by an additional argument of the form C<-GROUP:All> to list only
 tags in a specific group, where C<GROUP> is one or more family 0-2 group
 names (excepting EXIF IFD groups) separated by colons.  With B<-listg>,
 I<NUM> may be given to specify the group family, otherwise family 0 is
-assumed.  Here are some examples:
+assumed.  The B<-l> option may be combined with B<-listf>, B<-listr> or
+B<-listwf> to add file descriptions to the list.  The B<-lang> option may be
+combined with B<-listx> to output descriptions in a single language.  Here
+are some examples:
 
     -list               # list all tag names
     -list -EXIF:All     # list all EXIF tags
@@ -5215,7 +5269,7 @@ and the first existing source file is processed.  If none of the source
 files already exist, then exiftool uses the first B<-srcfile> specified.
 
 A I<FMT> of C<@> may be used to represent the original I<FILE>, which may be
-useful when specifying multiple B<-srcfile> options (ie. to fall back to
+useful when specifying multiple B<-srcfile> options (eg. to fall back to
 processing the original I<FILE> if no sidecar exists).
 
 =item B<-stay_open> I<FLAG>
@@ -5373,7 +5427,7 @@ Note that quotes are necessary around arguments which contain certain
 special characters such as C<E<gt>>, C<E<lt>> or any white space.  These
 quoting techniques are shell dependent, but the examples below will work for
 most Unix shells.  With the Windows cmd shell however, double quotes should
-be used (ie. -Comment=E<34>This is a new commentE<34>).
+be used (eg. -Comment=E<34>This is a new commentE<34>).
 
 =over 5
 
@@ -5669,7 +5723,7 @@ file extensions.
 =item exiftool '-Directory<DateTimeOriginal' -d %Y/%m/%d dir
 
 Move all files in C<dir> into a directory hierarchy based on year, month and
-day of C<DateTimeOriginal>.  ie) This command would move the file
+day of C<DateTimeOriginal>.  eg) This command would move the file
 C<dir/image.jpg> with a C<DateTimeOriginal> of C<2005:10:12 16:05:56> to
 C<2005/10/12/image.jpg>.