exiftool-vendored.pl 12.28.0 → 12.34.0

package/bin/Changes

@@ -4,9 +4,112 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.26. (Other versions are
+Note: The most recent production release is Version 12.30. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Oct. 27, 2021 - Version 12.34
+
+  - Added support for ICC.2:2019 (Profile version 5.0.0 - iccMAX) color profiles
+  - Added ability to detect/delete a Windows Zone.Identifier alternate data
+    stream (ADS) via the new ZoneIdentifier tag
+  - Added support for the Sony ILCE-7M4 (thanks Jos Roost)
+  - Added a new Sony lens (thanks LibRaw and Jos Roost)
+  - Added a new SonyModelID (thanks LibRaw)
+  - Added a new Canon RF lens (thanks Norbert Wasser)
+  - Improved handling of some SVG files
+  - Patched -overwrite_original_in_place option to open the output file in
+    update mode rather than write mode (to allow some write optimizations on
+    certain filesystems)
+  - Fixed case of tag ID for new XMP-iptcExt:EventID (thanks Michael Steidl)
+  - Fixed problem extracting ICC_Profile information from some PDF files
+  - API Changes:
+      - Added QuickTimePad option
+
+Oct. 16, 2021 - Version 12.33
+
+  - Added support for DNG version 1.6.0.0
+  - Added two new Sony LensType values (thanks Jos Roost and LibRaw)
+  - Added some new elements to the XMP-crs:Look structure (thanks Herb)
+  - Added a few new IPTC XMP tags (thanks Michael Steidl)
+  - Added a new Canon RF lens (thanks Norbert Wasser)
+  - Decode Canon ShutterMode (thanks John Moyer)
+  - Extract LensModel from some Olympus MOV videos
+  - Generate MediaDataOffset/Size for MOV videos with zero-sized MDAT chunk
+  - Improvements to CBOR reader, including hex dump with -v3 option
+  - Recognize Final Cut Pro XML files
+  - Allow binary data of Protected tags to be extracted with the -X -j and -php
+    options with -b by setting the API RequestAll option to 3
+  - Changed name of "Canon EF 80-200mm f/4.5-5.6" lens with LensType 38 to add
+    "II" to the name (Exiv2 issue 1906)
+  - Fixed runtime warning when processing files with a .DIR extension
+
+Sept. 30, 2021 - Version 12.32
+
+  - Added support for CBOR-format metadata in JUMBF (note that JUMBF support is
+    still experimental)
+  - Added a new Nikon LensID
+  - Added a new Pentax LensType
+  - Decode timed GPS for two more dashcam formats
+  - Support reference direction columns in -geotag CSV input
+  - Removed generation of GPSSpeedRef and GPSTrackRef tags in timed metadata for
+    most dashcam formats when speed is km/h and track is relative to true north
+  - Patched to allow writing of console output to named pipes
+  - Fixed formatting of InternalSerialNumber for some Panasonic cameras
+  - Fixed bug in arg_files/xmp2exif.args support file
+
+Sept. 22, 2021 - Version 12.31
+
+  - Added a new SonyModelID and a couple of new Sony lenses (thanks Jos Roost)
+  - Added a new Canon LensType (thanks Chris Skopec)
+  - Added Composite GPSLatitude/Longitude tags for Sony videos to combine the
+    reference hemispheres as with the Composite tags for EXIF GPS
+  - Decode DPX AspectRatio
+  - Decode more GoPro MP4 tags
+  - Extract ICC_Profile from CS0 object in PDF files
+  - Extract encrypted GPS from Akaso V1 dashcam videos (can't yet decrypt)
+  - Improved handling of QuickTime iTunesInfo tags, and created new "iTunes"
+    family 1 group for these
+  - Patched so NoPDFList option also applies when writing
+  - Patched to allow user-defined PNG TextualData tags to be written only as iTXt
+  - Patched PDF reader to avoid concatenating values of multiple List-type tags
+    into a single tag
+
+Aug. 12, 2021 - Version 12.30 (production release)
+
+  - Added read support for Portable FloatMap (PFM) images (this was a bit of a
+    pain because they have the same file extension as Printer Font Metrix files)
+  - Added a few new Nikon LensID values (thanks LibRaw)
+  - Added a new Canon LensType
+  - Added a new Olympus CameraType (thanks LibRaw)
+  - Added minor warning about unknown data between JPEG segments
+  - Added a couple of new NikonSettings tags (thanks Warren Hatch)
+  - Added a new Sony LensType (thanks Jos Roost)
+  - Decode 'id3 ' chunk in WAV audio files
+  - Decode timed GPS from concatenated Garmin dashcam videos
+  - Decode SamsungTrailer information from sefd atom in HEIC images
+  - Decode more Sony MakerNote tags for the ZV-E10 (thanks Jos Roost)
+  - Decode DepthMapTiff from JPEG images of more Samsung models
+  - Decode timed GPS from M2TS videos of yet another type of dashcam
+  - Extract PreviewImage from Xaiomi MP4 videos
+  - Changed name of second EmbeddedImage in Samsung trailer to EmbeddedImage2
+  - Improved Dutch translations for GPS tags (thanks Peter Dubbelman)
+  - Allow ICC_Profile to be "deleted" from AVIF files (actually, the profile
+    isn't really deleted. Instead, a zero-length profile is written to allow a
+    profile to be added back later since QuickTime item property containers
+    currently can't be created)
+  - Patched to remove 2 GB size limit when reading Photoshop ImageSourceData
+
+July 9, 2021 - Version 12.29
+
+  - Added a few new Nikon and Olympus lenses (thanks LibRaw)
+  - Improved a QuickTime "File format error" message to be more meaningful, and
+    made it a minor error
+  - Changed PNG writer to add EXIF before IDAT
+  - Some changes the way JUMBF metadata is handled
+  - Patched to read timed GPS from a different type of INSV videos
+  - Patched a security issue
+  - Fixed problem where ExifTool could hang when processing mebx timed metadata
+
 June 22, 2021 - Version 12.28
 
   - Added read support for Leica Image File (LIF) images
@@ -27,7 +130,7 @@ June 9, 2021 - Version 12.27
   - Added warning if IPTCDigest is not current
   - Decode a couple more Pentax tags (thanks LibRaw)
   - Decode streaming GPS from Novatek INNOVV MP4 and TS videos
-  - Improved tag names in confi_files/covert_regions.config (thanks StarGeek)
+  - Improved tag names in config_files/covert_regions.config (thanks StarGeek)
   - Changed MIME types for MS Office macro-enabled formats to add the .12
   - Patched Canon LensID logic to properly identify the Canon RF 24-105mm F4 L
     IS USM lens
@@ -1417,8 +1520,8 @@ Oct. 9, 2018 - Version 11.13
   - Added a new Canon LensType (thanks LibRaw)
   - Minor improvements to verbose dump of streaming GPS metadata
   - Reverted change of version 10.71 which resulted in Windows not recognizing
-    PNG CreationTime as written by ExifTool (added this feature to the
-    StrictDate API option instead)
+    PNG CreationTime as written by ExifTool (added this feature to the API
+    StrictDate option instead)
   - Improved decoding of Nikon CropHiSpeed (thanks LibRaw)
   - Improved -fast option to reduce memory usage when reading JPG, PNG,
     QuickTime-based and RIFF-based files via a sequential stream
@@ -1532,7 +1635,7 @@ June 21, 2018 - Version 11.03
 June 13, 2018 - Version 11.02
 
   - Added support for a different format of Apple iWorks files
-  - Added undocumented FixCorruptedMOV API option to allow fixing MOV videos
+  - Added undocumented API FixCorruptedMOV option to allow fixing MOV videos
     with multiple 'mdat' atoms which were corrupted by ExifTool
   - Decode more QuickTime tags
   - Decode more PanasonicRaw tags (thanks Klaus Homeister)

package/bin/MANIFEST

@@ -48,6 +48,7 @@ html/TagNames/Apple.html
 html/TagNames/Audible.html
 html/TagNames/BMP.html
 html/TagNames/BPG.html
+html/TagNames/CBOR.html
 html/TagNames/Canon.html
 html/TagNames/CanonCustom.html
 html/TagNames/CanonRaw.html
@@ -125,6 +126,7 @@ html/TagNames/Ogg.html
 html/TagNames/Olympus.html
 html/TagNames/OpenEXR.html
 html/TagNames/Opus.html
+html/TagNames/Other.html
 html/TagNames/PCX.html
 html/TagNames/PDF.html
 html/TagNames/PGF.html
@@ -216,6 +218,7 @@ lib/Image/ExifTool/BPG.pm
 lib/Image/ExifTool/BZZ.pm
 lib/Image/ExifTool/BigTIFF.pm
 lib/Image/ExifTool/BuildTagLookup.pm
+lib/Image/ExifTool/CBOR.pm
 lib/Image/ExifTool/Canon.pm
 lib/Image/ExifTool/CanonCustom.pm
 lib/Image/ExifTool/CanonRaw.pm
@@ -350,6 +353,7 @@ lib/Image/ExifTool/Ogg.pm
 lib/Image/ExifTool/Olympus.pm
 lib/Image/ExifTool/OpenEXR.pm
 lib/Image/ExifTool/Opus.pm
+lib/Image/ExifTool/Other.pm
 lib/Image/ExifTool/PCX.pm
 lib/Image/ExifTool/PDF.pm
 lib/Image/ExifTool/PGF.pm
@@ -717,6 +721,8 @@ t/PDF_6.out
 t/PDF_7.out
 t/PDF_8.out
 t/PDF_9.out
+t/PFM.t
+t/PFM_2.out
 t/PGF.t
 t/PGF_2.out
 t/PICT.t
@@ -1050,6 +1056,7 @@ t/images/Opus.opus
 t/images/PCX.pcx
 t/images/PDF.pdf
 t/images/PDF2.pdf
+t/images/PFM.pfm
 t/images/PGF.pgf
 t/images/PICT.pict
 t/images/PLIST-bin.plist

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.28",
+   "version" : "12.34",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.28
+version: 12.34
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

@@ -107,8 +107,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.28.tar.gz | tar -xf -
-  cd Image-ExifTool-12.28
+  gzip -dc Image-ExifTool-12.34.tar.gz | tar -xf -
+  cd Image-ExifTool-12.34
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/arg_files/xmp2exif.args

@@ -13,6 +13,7 @@
 #               2015/01/12 - PH Avoid copying from non-standard namespaces
 #               2016/09/26 - PH Write Composite SubSec tags
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
+#               2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #
@@ -34,7 +35,7 @@
 -Composite:SubSecDateTimeOriginal < XMP-photoshop:DateCreated
 -Composite:SubSecCreateDate < XMP-xmp:CreateDate
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate
--EXIF:Software < -XMP-xmp:CreatorTool
+-EXIF:Software < XMP-xmp:CreatorTool
 -EXIF:Copyright < XMP-dc:Rights
 -EXIF:Artist < XMP-dc:Creator
 # XMP flash information is translated by the Composite Flash tag

package/bin/config_files/example.config

@@ -133,7 +133,7 @@
         # Example 12.  PNG:NewPngTag1
         NewPngTag1 => { },
         # Example 13.  PNG:NewPngTag2
-        NewPngTag2 => { },
+        NewPngTag2 => { iTXt => 1 }, # (force this tag to be written as iTXt)
         # Example 14.  PNG:NewPngTag3
         NewPngTag3 => { },
     },

package/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '12.28';
+my $version = '12.34';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -1619,7 +1619,7 @@ if (@newValues) {
             next;
         }
         my %opts = ( Shift => 0 );  # shift values if possible instead of adding/deleting
-        # allow writing of 'unsafe' tags unless specified by wildcard
+        # allow writing of 'Unsafe' tags unless specified by wildcard
         $opts{Protected} = 1 unless $tag =~ /[?*]/;
 
         if ($tag =~ s/<// and defined $newVal) {
@@ -1954,10 +1954,19 @@ sub GetImageInfo($$)
     my $pipe = $file;
     if ($doUnzip) {
         # pipe through gzip or bzip2 if necessary
-        if ($file =~ /\.gz$/i) {
-            $pipe = qq{gzip -dc "$file" |};
-        } elsif ($file =~ /\.bz2$/i) {
-            $pipe = qq{bzip2 -dc "$file" |};
+        if ($file =~ /\.(gz|bz2)$/i) {
+            my $type = lc $1;
+            if ($file =~ /[^-_.'A-Za-z0-9\/\\]/) {
+                Warn "Error: Insecure zip file name. Skipped\n";
+                EFile($file);
+                ++$countBad;
+                return;
+            }
+            if ($type eq 'gz') {
+                $pipe = qq{gzip -dc "$file" |};
+            } else {
+                $pipe = qq{bzip2 -dc "$file" |};
+            }
         }
     }
     # evaluate -if expression for conditional processing
@@ -2276,7 +2285,7 @@ TAG:    foreach $tag (@foundTags) {
                     # avoid extracting Protected binary tags (eg. data blocks) [insider information]
                     my $lcTag = lc $tag;
                     $lcTag =~ s/ .*//;
-                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag};
+                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag} or ($$et{OPTIONS}{RequestAll} || 0) > 2;
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
                 next unless defined $val;
@@ -3052,12 +3061,14 @@ sub SetImageInfo($$$)
                         # temporarily disable CTRL-C during this critical operation
                         $critical = 1;
                         undef $tmpFile;     # handle deletion of temporary file ourself
-                        if ($et->Open(\*ORIG_FILE, $file, '>')) {
+                        if ($et->Open(\*ORIG_FILE, $file, '+<')) {
                             binmode(ORIG_FILE);
                             while (read(NEW_FILE, $buff, 65536)) {
                                 print ORIG_FILE $buff or $err = 1;
                             }
                             close(NEW_FILE);
+                            # Handle files being shorter than the original
+                            eval { truncate(ORIG_FILE, tell(ORIG_FILE)) } or $err = 1;
                             close(ORIG_FILE) or $err = 1;
                             if ($err) {
                                 Warn "Couldn't overwrite in place - $file\n";
@@ -3241,7 +3252,8 @@ sub FormatXML($$$)
     } elsif (ref $val eq 'HASH') {
         $gt = " rdf:parseType='Resource'>";
         my $val2 = '';
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             # (some variable-namespace XML structure fields may have a different group)
             my $tok = /:/ ? $_ : ($grp . ':' . $_);
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
@@ -3318,7 +3330,8 @@ sub FormatJSON($$$)
     } elsif (ref $val eq 'HASH') {
         my ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
         print $fp $bra;
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             print $fp ',' if $comma;
             my $key = EscapeJSON($_, 1);
             print $fp qq(\n$ind  $key$sep );
@@ -4721,11 +4734,11 @@ I<TAG> may contain one or more leading family 0, 1, 2 or 7 group names,
 prefixed by optional family numbers, and separated colons.  If no group name
 is specified, the tag is created in the preferred group, and updated in any
 other location where a same-named tag already exists.  The preferred group
-is the first group in the following list where I<TAG> is valid: 1) EXIF, 2)
-IPTC, 3) XMP.
+in JPEG and TIFF-format images is the first group in the following list
+where I<TAG> is valid: 1) EXIF, 2) IPTC, 3) XMP.
 
 The wildcards C<*> and C<?> may be used in tag names to assign the same
-value to multiple tags.  When specified with wildcards, "unsafe" tags are
+value to multiple tags.  When specified with wildcards, "Unsafe" tags are
 not written.  A tag name of C<All> is equivalent 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=>)
@@ -4871,10 +4884,10 @@ See L</COPYING EXAMPLES> for examples using B<-tagsFromFile>.
 Notes:
 
 1) Some tags (generally tags which may affect the appearance of the image)
-are considered "unsafe" to write, and are only copied if specified
+are considered "Unsafe" to write, and are only copied if specified
 explicitly (ie. no wildcards).  See the
 L<tag name documentation|Image::ExifTool::TagNames> for more details about
-"unsafe" tags.
+"Unsafe" tags.
 
 2) Be aware of the difference between excluding a tag from being copied
 (--I<TAG>), and deleting a tag (-I<TAG>=).  Excluding a tag prevents it from
@@ -4972,7 +4985,7 @@ intermediate file (C<out.args> in this example):
     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,
+easy to write tags which are normally considered "Unsafe".  For instance,
 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.
@@ -4992,8 +5005,8 @@ are in the default output.  By default, list items are separated by a
 newline when extracted with the B<-b> option, but this may be changed (see
 the B<-sep> option for details).  May be combined with B<-j>, B<-php> or
 B<-X> to extract binary data in JSON, PHP or XML format, but note that
-"unsafe" tags must be specified explicitly to be extracted as binary in
-these formats.
+"Unsafe" tags are not extracted as binary unless they are specified explicitly or
+the API RequestAll option is set to 3 or higher.
 
 With a leading double dash (B<--b> or B<--binary>), tags which contain
 binary data are suppressed in the output when reading.
@@ -5194,7 +5207,7 @@ 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 (eg. B<-g:3:1>).
 Use the B<-listg> option to list group names for a specified family.  The
-SavePath and SaveFormat API options are automatically enabled if the
+API SavePath and SaveFormat options are automatically enabled if the
 respective family 5 or 6 group names are requested.  See the
 L<API GetGroup documentation|Image::ExifTool/GetGroup> for more information.
 
@@ -5397,7 +5410,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.28 --
+    -- Generated by ExifTool 12.34 --
     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
@@ -5414,7 +5427,7 @@ are effectively processed as separate input files.
 If a specified tag does not exist, a minor warning is issued and the line
 with the missing tag is not printed.  However, the B<-f> option may be used
 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
+API MissingTagValue option), or the B<-m> option may be used to ignore minor
 warnings and leave the missing values empty.  Alternatively, B<-q -q> may be
 used to simply suppress the warning messages.
 
@@ -5713,9 +5726,10 @@ The B<-t> option adds tag table information to the output (see B<-t> for
 details).
 
 Note:  This output is NOT the same as XMP because it uses
-dynamically-generated property names corresponding to the ExifTool tag
-names, and not the standard XMP properties.  To write XMP instead, use the
-B<-o> option with an XMP extension for the output file.
+dynamically-generated property names corresponding to the ExifTool tag names
+with ExifTool family 1 group names as namespaces, and not the standard XMP
+properties and namespaces.  To write XMP instead, use the B<-o> option with
+an XMP extension for the output file.
 
 =back
 
@@ -6362,7 +6376,7 @@ exit status of the command (see L</EXIT STATUS>).
 
 Save the names of files giving errors (I<NUM> missing or 1), files that were
 unchanged (I<NUM> is 2), files that fail the B<-if> condition (I<NUM> is 4),
-or any combination thereof (by summing I<NUM>, eg. B<-efile3> is the same
+or any combination thereof by summing I<NUM> (eg. B<-efile3> is the same
 has having both B<-efile> and B<-efile2> options with the same I<ERRFILE>).
 By default, file names are appended to any existing I<ERRFILE>, but
 I<ERRFILE> is overwritten if an exclamation point is added to the option

package/bin/fmt_files/gpx.fmt

@@ -13,7 +13,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

package/bin/fmt_files/gpx_wpt.fmt

@@ -14,7 +14,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
 #------------------------------------------------------------------------------

package/bin/lib/Image/ExifTool/BuildTagLookup.pm

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.44';
+$VERSION = '3.46';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -68,6 +68,7 @@ my %tweakOrder = (
     IPTC    => 'Exif',  # put IPTC after EXIF,
     GPS     => 'XMP',   # etc...
     Composite => 'Extra',
+    CBOR    => 'JSON',
     GeoTiff => 'GPS',
     CanonVRD=> 'CanonCustom',
     DJI     => 'Casio',
@@ -459,7 +460,7 @@ According to the specification, integer-format QuickTime date/time tags
 should be stored as UTC.  Unfortunately, digital cameras often store local
 time values instead (presumably because they don't know the time zone).  For
 this reason, by default ExifTool does not assume a time zone for these
-values.  However, if the L<QuickTimeUTC|../ExifTool.html#QuickTimeUTC> API option is set, then ExifTool will
+values.  However, if the API L<QuickTimeUTC|../ExifTool.html#QuickTimeUTC> option is set, then ExifTool will
 assume these values are properly stored as UTC, and will convert them to
 local time when extracting.
 
@@ -468,6 +469,11 @@ the PrintConv option is enabled and no time zone is specified.  This is
 because Apple software may display crazy values if the time zone is missing
 for some tags.
 
+By default ExifTool will remove null padding from some QuickTime containers
+in Canon CR3 files when writing, but the
+L<QuickTimePad|../ExifTool.html#QuickTimePad> option may be used to preserve
+the original size by padding with nulls if necessary.
+
 See
 L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
 for the official specification.
@@ -2117,7 +2123,7 @@ sub WriteTagNames($$)
         $short = $$shortName{$tableName};
         my @names = split ' ', $short;
         my $class = shift @names;
-        if (@names) {
+        if (@names and $class ne 'Other') {
             # add heading for tables without a Main
             unless ($heading eq $class) {
                 $heading = $class;
@@ -2145,6 +2151,13 @@ sub WriteTagNames($$)
         $short = $$shortName{$tableName};
         $short = $tableName unless $short;
         $url = "$short.html";
+        # handle various tables in "Other.pm"
+        if ($short =~ /^Other (.*)/) {
+            $short = $1;
+            $url = 'Other.html#' . $1;
+        } else {
+            $url = "$short.html";
+        }
         print HTMLFILE "<a href='${url}'>$short</a>";
         ++$count;
     }