exiftool_vendored 9.69.0 → 9.71.0

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/TagNames.pod

@@ -133,6 +133,7 @@ This table lists information extracted by ExifTool from JPEG images.
                FotoStation                      FotoStation
                PhotoMechanic                    PhotoMechanic
                MIE                              MIE
+               Samsung                          Samsung Trailer
                PreviewImage                     Y
 
 =head3 JPEG AVI1 Tags
@@ -526,6 +527,7 @@ EXIF 2.3 specification.
   0x9000   ExifVersion               ExifIFD    undef:
   0x9003   DateTimeOriginal          ExifIFD    string
   0x9004   CreateDate                ExifIFD    string
+  0x9009   GooglePlusUploadCode      ExifIFD    undef[n]
   0x9101   ComponentsConfiguration   ExifIFD    undef[4]!:
   0x9102   CompressedBitsPerPixel    ExifIFD    rational64u!
   0x9201   ShutterSpeedValue         ExifIFD    rational64s
@@ -1819,7 +1821,7 @@ DigiKam namespace tags.
 =head3 XMP exif Tags
 
 EXIF namespace for EXIF tags.  See
-L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf> for the
+L<http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf> for the
 specification.
 
   Tag Name                                      Writable
@@ -1963,7 +1965,7 @@ specification.
 =head3 XMP exifEX Tags
 
 EXIF tags added by the EXIF 2.3 for XMP specification (see
-L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf>).
+L<http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf>).
 
   Tag Name                                      Writable
   --------                                      --------
@@ -2614,7 +2616,7 @@ Adobe SWF namespace tags.
 =head3 XMP tiff Tags
 
 EXIF namespace for TIFF tags.  See
-L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-010-2012_E.pdf> for the
+L<http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf> for the
 specification.
 
   Tag Name                                      Writable
@@ -5275,6 +5277,7 @@ These tags are used by the PowerShot G10.
     246    CameraColorCalibration13?            int16s[5]
     251    CameraColorCalibration14?            int16s[5]
     256    CameraColorCalibration15?            int16s[5]
+    264    PerChannelBlackLevel                 int16s[4]
 
 =head3 Canon ColorData6 Tags
 
@@ -5343,7 +5346,7 @@ These tags are used by the EOS 600D and 1200D.
 
 =head3 Canon ColorData7 Tags
 
-These tags are used by the EOS 1DX, 5DmkIII, 6D, 100D, 650D, 700D and M.
+These tags are used by the EOS 1DX, 5DmkIII, 6D, 100D, 650D, 700D, M and 7DmkII.
 
   Index2   Tag Name                             Writable
   ------   --------                             --------
@@ -5415,6 +5418,11 @@ These tags are used by the EOS 1DX, 5DmkIII, 6D, 100D, 650D, 700D and M.
     508    NormalWhiteLevel                     int16u
     509    SpecularWhiteLevel                   int16u
     510    LinearityUpperMargin                 int16u
+    619    RawMeasuredRGGB                      int32u[4]
+    728    PerChannelBlackLevel                 int16u[4]
+    732    NormalWhiteLevel                     int16u
+    733    SpecularWhiteLevel                   int16u
+    734    LinearityUpperMargin                 int16u
 
 =head3 Canon ColorDataUnknown Tags
 
@@ -5810,8 +5818,8 @@ well as newer tags and values added by later models.
   0x010d   ApertureRange                        int32s[3]
   0x010e   ApplyShootingMeteringMode            int32s[8]
   0x010f   FlashSyncSpeedAv                     int32s
-  0x0110   FEMicroadjustment                    int32s[3]
-  0x0111   AEMicroadjustment                    int32s[3]
+  0x0110   AEMicroadjustment                    int32s[3]
+  0x0111   FEMicroadjustment                    int32s[3]
   0x0201   LongExposureNoiseReduction           int32s
   0x0202   HighISONoiseReduction                int32s
   0x0203   HighlightTonePriority                int32s
@@ -5851,9 +5859,11 @@ well as newer tags and values added by later models.
   0x0518   AccelerationTracking                 int32s
   0x0519   AIServoFirstImagePriority            int32s
   0x051a   AIServoSecondImagePriority           int32s
+  0x051b   AFAreaSelectMethod                   int32s
   0x060f   MirrorLockup                         int32s
   0x0610   ContinuousShootingSpeed              int32s[3]
   0x0611   ContinuousShotLimit                  int32s[2]
+  0x0612   RestrictDriveModes                   int32s[2]
   0x0701   Shutter-AELock                       int32s
            AFAndMeteringButtons                 int32s
            ShutterButtonAFOnButton              int32s
@@ -5871,6 +5881,8 @@ well as newer tags and values added by later models.
   0x070d   StartMovieShooting                   int32s
   0x070e   FlashButtonFunction                  int32s
   0x070f   MultiFunctionLock                    int32s
+  0x0710   TrashButtonFunction                  int32s
+  0x0711   ShutterReleaseWithoutLens            int32s
   0x080b   FocusingScreen                       int32s
   0x080c   TimerLength                          int32s[4]
   0x080d   ShortReleaseTimeLag                  int32s
@@ -5878,6 +5890,7 @@ well as newer tags and values added by later models.
   0x080f   AddOriginalDecisionData              int32s
   0x0810   LiveViewExposureSimulation           int32s
   0x0811   LCDDisplayAtPowerOn                  int32s
+  0x0812   MemoAudioQuality                     int32s
   0x0813   DefaultEraseOption                   int32s
 
 =head2 CanonVRD Tags
@@ -7244,6 +7257,12 @@ from some older Kodak models such as the DC50, DC120, DCS760C, DCS Pro 14N,
   0x0401   Time                                 string
   0x0414   NCDFileInfo                          string
   0x0846   ColorTemperature                     int16u
+  0x0848   WB_RGBLevelsDaylight                 N
+  0x0849   WB_RGBLevelsTungsten                 N
+  0x084a   WB_RGBLevelsFluorescent              N
+  0x084b   WB_RGBLevelsFlash                    N
+  0x084c   WB_RGBLevelsCustom                   N
+  0x084d   WB_RGBLevelsAuto                     N
   0x0852   WB_RGBMul0                           N
   0x0853   WB_RGBMul1                           N
   0x0854   WB_RGBMul2                           N
@@ -8934,8 +8953,8 @@ This information is written by the Nikon Scan software.
 
 =head3 Nikon NCDT Tags
 
-Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some
-Nikon cameras such as the Coolpix S8000.
+Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from
+various Nikon models.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -10474,6 +10493,7 @@ These tags are used in Panasonic/Leica cameras.
   0x0077   BurstSpeed                           int16u
   0x0079   IntelligentD-Range                   int16u
   0x007c   ClearRetouch                         int16u
+  0x0080   City2                                undef
   0x0086   ManometerPressure                    int16u
   0x0089   PhotoStyle                           int16u
   0x008a   ShadingCompensation                  int16u
@@ -11724,6 +11744,19 @@ Tags found in the EXIF-format maker notes of newer Samsung models.
       3    PictureWizardSharpness               int16u
       4    PictureWizardContrast                int16u
 
+=head3 Samsung Trailer Tags
+
+Tags extracted from the trailer of JPEG images written when using certain
+features (such as "Sound & Shot" or "Shot & More") from Samsung models such
+as the Galaxy S4 and Tab S.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  EmbeddedImage                                 N
+  EmbeddedImageName                             N
+  EmbeddedAudioFile                             N
+  EmbeddedAudioFileName                         N
+
 =head3 Samsung sec Tags
 
 This information is found in the @sec atom of Samsung MP4 videos from models
@@ -12093,7 +12126,7 @@ MakerNotes.
            Tag2010g                             Sony Tag2010g
   0x2011   VignettingCorrection                 int32u
   0x2012   LateralChromaticAberration           int32u
-  0x2013   DistortionCorrection                 int32u
+  0x2013   DistortionCorrectionSetting          int32u
   0x2014   WBShiftAB_GM                         int32s[2]
   0x2016   AutoPortraitFramed                   int16u
   0x201b   FocusMode                            int8u
@@ -12109,6 +12142,8 @@ MakerNotes.
            Tag9400c                             Sony Tag9400c
   0x9402   Tag9402                              Sony Tag9402
   0x9403   Tag9403                              Sony Tag9403
+  0x9404   Tag9404a                             Sony Tag9404a
+           Tag9404b                             Sony Tag9404b
   0x9405   Tag9405a                             Sony Tag9405a
            Tag9405b                             Sony Tag9405b
   0x9406   Tag9406                              Sony Tag9406
@@ -12290,6 +12325,10 @@ A200, A230, A290, A300, A330, A350, A380, A390, A700, A850 and A900.
      47    ExposureBracketShotNumber            int8u
      63    ExposureProgram                      int8u
      65    CreativeStyle                        int8u
+    109    ISOSetting                           int8u
+    111    ISO                                  int8u
+    119    DynamicRangeOptimizerMode            int8u
+    121    DynamicRangeOptimizerLevel           int8u
    2118    ShutterCount                         int32u
    2491    FocusPosition                        int8u
 
@@ -12336,13 +12375,19 @@ A580, A33, A35, A55, NEX-3/5/C3 and VG10E.
      26    CustomWB_RBLevels                    int16uRev[2]
      30    ExposureCompensationSet              int8u
      31    FlashExposureCompSet                 int8u
+           ISO                                  int8u
      32    LiveViewAFMethod                     int8u
+     33    ISO                                  int8u
+     37    ISO                                  int8u
      38    FNumber                              int8u
      39    ExposureTime                         int8u
      41    FocalLength2                         int8u
+           FocusPosition2                       int8u
      42    ExposureCompensation2                int16s
+     43    FocusPosition2                       int8u
      44    FlashExposureCompSet2                int16s
      46    Orientation2                         int8u
+     47    FocusPosition2                       int8u
      48    FlashAction2                         int8u
      50    FocusMode2                           int8u
 
@@ -12432,6 +12477,7 @@ Camera settings for the A200, A300, A350, A700, A850 and A900.
      61    ImageStabilizationSetting            int16u
      63    Rotation                             int16u
      77    FocusMode                            int16u
+     80    BatteryState                         int16u
      81    BatteryLevel                         int16u
      83    FocusStatus                          int16u
      84    SonyImageSize                        int16u
@@ -12689,6 +12735,7 @@ Valid for SLT-A65/A77, NEX-7/VG20E.
   0x1179   ExposureProgram                      int8u
   0x1180   WB_RGBLevels                         int16u[3]
   0x1218   SonyISO                              N
+  0x1a23   LensParameters                       int16s[16]~
 
 =head3 Sony Tag2010c Tags
 
@@ -12744,7 +12791,7 @@ not valid for panorama images.
 
 =head3 Sony Tag2010e Tags
 
-Valid for SLT-A58/A99, ILCE-3000, NEX-3N/5R/5T/6/VG30E/VG900, DSC-RX100,
+Valid for SLT-A58/A99, ILCE-3000/3500, NEX-3N/5R/5T/6/VG30E/VG900, DSC-RX100,
 DSC-RX1/RX1R. Also valid for DSC-HX300/HX50V/TX30/WX60/WX200/WX300, but not
 for panorama images.
 
@@ -12775,6 +12822,7 @@ for panorama images.
   0x127a   MinFocalLength                       int16u
   0x127c   MaxFocalLength                       int16u
   0x1280   SonyISO                              N
+  0x1870   LensParameters?                      int16s[16]~
   0x1891   LensFormat                           int8u
   0x1892   LensMount                            int8u
   0x1893   LensType2                            int16u
@@ -12808,7 +12856,7 @@ Valid for DSC-RX100M2, DSC-QX10/QX100.
 
 =head3 Sony Tag2010g Tags
 
-Valid for DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/6000,
+Valid for DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/5100/6000,
 ILCA-77M2.
 
   Tag ID   Tag Name                             Writable
@@ -12832,6 +12880,7 @@ ILCA-77M2.
   0x0330   MaxFocalLength                       int16u
   0x0344   SonyISO                              N
   0x0388   MeterInfo?                           Sony MeterInfo
+  0x189c   LensParameters?                      int16s[16]~
   0x18bd   LensFormat                           int8u
   0x18be   LensMount                            int8u
   0x18bf   LensType2                            int16u
@@ -12931,7 +12980,7 @@ Valid for many DSC, NEX and SLT models
 
 =head3 Sony Tag9400b Tags
 
-Valid for NEX-3N, ILCE-3000, SLT-A58, DSC-WX60, DSC-WX300, DSC-RX100M2,
+Valid for NEX-3N, ILCE-3000/3500, SLT-A58, DSC-WX60, DSC-WX300, DSC-RX100M2,
 DSC-HX50V, DSC-QX10/QX100.
 
   Tag ID   Tag Name                             Writable
@@ -12949,7 +12998,7 @@ DSC-HX50V, DSC-QX10/QX100.
 
 =head3 Sony Tag9400c Tags
 
-Valid for DSC-RX10/RX100M3/HX60V/HX400V, ILCE-7/7R/7S/5000/6000, ILCA-77M2.
+Valid for DSC-RX10/RX100M3/HX60V/HX400V, ILCE-7/7R/7S/5000/5100/6000, ILCA-77M2.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
@@ -12970,6 +13019,7 @@ Valid for DSC-RX10/RX100M3/HX60V/HX400V, ILCE-7/7R/7S/5000/6000, ILCA-77M2.
   0x0004   AmbientTemperature                   int8s
   0x0016   FocusMode                            int8u & 0x7f
   0x0017   AFAreaMode                           int8u
+  0x002d   FocusPosition2                       int8u
 
 =head3 Sony Tag9403 Tags
 
@@ -12977,37 +13027,60 @@ Valid for DSC-RX10/RX100M3/HX60V/HX400V, ILCE-7/7R/7S/5000/6000, ILCA-77M2.
   ------   --------                             --------
   0x0005   CameraTemperature                    int8s
 
+=head3 Sony Tag9404a Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0019   LensZoomPosition                     int16u
+
+=head3 Sony Tag9404b Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x001e   LensZoomPosition                     int16u
+  0x0020   FocusPosition2                       int8u
+
 =head3 Sony Tag9405a Tags
 
-Valid for SLT, NEX, ILCE-3000 and several DSC models.
+Valid for SLT, NEX, ILCE-3000/3500 and several DSC models.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
+  0x0601   DistortionCorrection                 int8u
   0x0603   LensFormat                           int8u
   0x0604   LensMount                            int8u
   0x0605   LensType2                            int16u
   0x0608   LensType                             int16u
+  0x06ca   LensParameters?                      int16s[16]~
 
 =head3 Sony Tag9405b Tags
 
-Valid for the DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/6000, ILCA-77M2.
+Valid for the DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/5100/6000, ILCA-77M2.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
+  0x0004   SonyISO                              N
+  0x0006   BaseISO                              N
+  0x000a   StopsAboveBaseISO                    int16u
   0x000e   SonyExposureTime2                    int16u
   0x0010   ExposureTime                         rational32u
   0x0014   SonyFNumber                          int16u
   0x0016   SonyMaxApertureValue                 int16u
   0x0024   SequenceImageNumber                  int32u
   0x0034   ReleaseMode2                         int8u
+  0x0042   HighISONoiseReduction                int8u
   0x0044   LongExposureNoiseReduction           int8u
   0x0046   PictureEffect2                       int8u
   0x0048   ExposureProgram                      int8u
   0x004a   CreativeStyle                        int8u
+  0x0052   Sharpness                            int8s
+  0x005b   DistortionCorrection                 int8u
   0x005d   LensFormat                           int8u
   0x005e   LensMount                            int8u
   0x0060   LensType2                            int16u
   0x0062   LensType                             int16u
+  0x0064   LensParameters?                      int16s[16]~
+  0x0342   LensZoomPosition                     int16u
 
 =head3 Sony Tag9406 Tags
 
@@ -13042,6 +13115,7 @@ These tags are currently extracted for SLT models only.
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x0002   AFType                               int8u
+  0x0004   AFStatusActiveSensor                 int16s
   0x0005   FocusMode                            int8u
   0x0007   AFPoint                              int8u
   0x0008   AFPointInFocus                       int8u
@@ -13864,7 +13938,8 @@ that of an old DOS disk with fixed-sized "sectors" (usually 512 bytes) and a
 "file allocation table" (FAT).  No wonder this image format never became
 popular.  However, some of the structures used in FlashPix streams are part
 of the EXIF specification, and are still being used in the APP2 FPXR segment
-of JPEG images by some digital cameras from various manufacturers.
+of JPEG images by some digital cameras from manufacturers such as FujiFilm,
+Hewlett-Packard, Kodak and Sanyo.
 
 ExifTool extracts FlashPix information from both FPX images and the APP2
 FPXR segment of JPEG images.  As well, FlashPix information is extracted
@@ -14216,7 +14291,7 @@ embedded images.
 
 These tags are part of the CIPA Stereo Still Image specification, and are
 found in the APP3 "Stim" segment of JPEG images.  See
-L<http://www.cipa.jp/english/hyoujunka/kikaku/pdf/DC-006_E.pdf> for the
+L<http://www.cipa.jp/std/documents/e/DC-006_E.pdf> for the
 official specification.
 
   Tag ID   Tag Name                             Writable
@@ -19511,6 +19586,7 @@ MP4 hint sample description.
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x0004   OtherFormat                          N
+  'ftab'   FontTable                            N
 
 =head3 QuickTime VideoHeader Tags
 
@@ -19580,6 +19656,8 @@ multi-language user data tags found, even if they don't exist in this table.
   'PANA'       PanasonicPANA                    Panasonic PANA
   'PENT'       PentaxPENT                       Pentax PENT
   'PXMN'       MakerNotePentax5b                Pentax
+               MakerNotePentax5c                Pentax
+               MakerNotePentaxUnknown           N
   'PXTH'       PentaxPreview                    Pentax PXTH
   'QVMI'       CasioQVMI                        EXIF
   'RMKN'       RicohRMKN                        EXIF
@@ -26935,6 +27013,8 @@ values, may created via the ExifTool configuration file.
                        ScaleFactor35efl
   FocusDistance        Sony:FocusPosition       N
                        FocalLength
+  FocusDistance2       Sony:FocusPosition2      N
+                       FocalLength
   GPSAltitude          QuickTime:GPSCoordinates N
   GPSAltitude          QuickTime:LocationInformation N
   GPSAltitude          GPS:GPSAltitude          N

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/WriteExif.pl

@@ -440,6 +440,7 @@ my %writeTable = (
         Shift => 'Time',
         PrintConvInv => '$self->InverseDateTime($val,0)',
     },
+    0x9009 => 'undef',      # GooglePlusUploadCode
     0x9101 => {             # ComponentsConfiguration
         Protected => 1,
         Writable => 'undef',

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/WritePDF.pl

@@ -713,6 +713,9 @@ sub WritePDF($$)
             Write($outfile, $buff) or $rtn = -1;
         }
     }
+    if ($rtn > 0 and $$et{CHANGED} and ($$et{DEL_GROUP}{PDF} or $$et{DEL_GROUP}{XMP})) {
+        $et->Warn('ExifTool PDF edits are reversible. Deleted tags may be recovered!', 1);
+    }
     undef $newTool;
     undef %capture;
     return $rtn;

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/WriteXMP.pl

@@ -768,63 +768,93 @@ sub WriteXMP($$;$)
         # MicrosoftPhoto screws up the case of some tags, and some other software,
         # including Adobe software, has been known to write the wrong list type or
         # not properly enclose properties in a list, so we check for this
-        # (NOTE: we don't currently do these tests when writing structures!
-        #  --> add this to DeleteStruct() below if it turns out to be a problem)
-        unless ($cap or $isStruct) {
-            my $regex = quotemeta $path;
-            # also allow for missing structure fields in lists of structures
-            $regex =~  s/ \d+/ \\d\+/g;
-            my $ok = $regex; # regular expression to match standard property names
-            my $ok2;
-            # also check for incorrect list types which can cause problems
-            if ($regex =~ s{\\/rdf\\:(Bag|Seq|Alt)\\/}{/rdf:(Bag|Seq|Alt)/}g) {
-                # also look for missing bottom-level list
-                $regex =~ s{/rdf:\(Bag\|Seq\|Alt\)\/rdf\\:li\\ \\d\+$}{(/.*)?};
-            } else {
-                $ok2 = $regex;
-                # check for properties in lists that shouldn't be
-                # (ref http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4325.0.html)
-                $regex .= '(/rdf:(Bag|Seq|Alt)/rdf:li \d+)?';
+        until ($cap) {
+            # find and fix all incorrect property names if this is a structure or a flattened tag
+            my @fixInfo;
+            if ($isStruct or defined $$tagInfo{Flat}) {
+                # get tagInfo for all containing (possibly nested) structures
+                my @props = split '/', $path;
+                my $tbl = $$tagInfo{Table};
+                while (@props) {
+                    my $info = $$tbl{GetXMPTagID(\@props)};
+                    unshift @fixInfo, $info if ref $info eq 'HASH' and $$info{Struct} and
+                        (not @fixInfo or $fixInfo[0] ne $info);
+                    pop @props;
+                }
+                $et->WarnOnce("Error finding parent structure for $$tagInfo{Name}") unless @fixInfo;
             }
-            my @matches = sort grep m{^$regex$}i, keys %capture;
-            if (@matches) {
-                if ($matches[0] =~ /^$ok$/) {
-                    $path = $matches[0];    # use existing property path
-                    $cap = $capture{$path};
-                } else {
-                    # property list was wrong, so issue a warning and fix it
-                    my ($match, @fixed, %fixed, $err);
-                    foreach $match (@matches) {
-                        my $fixed = $path;
-                        # set list indices
-                        while ($match =~ / (\d+)/g) {
-                            my $idx = $1;
-                            # insert leading "X" so we don't replace this one again
-                            $fixed =~ s/ \d+/ X$idx/;
-                        }
-                        $fixed =~ s/ X/ /g if $fixed ne $path;  # remove "X"s
-                        $err = 1 if $capture{$fixed} or $fixed{$fixed};
-                        push @fixed, $fixed;
-                        $fixed{$fixed} = 1;
+            # fix property path for this tag (last in the @fixInfo list)
+            push @fixInfo, $tagInfo unless @fixInfo and $isStruct;
+            # start from outermost containing structure, fixing incorrect list types, etc,
+            # finally fixing the actual tag properties after all containing structures
+            my $err;
+            while (@fixInfo) {
+                my $fixInfo = shift @fixInfo;
+                my $fixPath = ConformPathToNamespace($et, GetPropertyPath($fixInfo));
+                my $regex = quotemeta($fixPath);
+                $regex =~ s/ \d+/ \\d\+/g;  # match any list index
+                my $ok = $regex;
+                my ($ok2, $match, $i, @fixed, %fixed, $fixed, $changed);
+                # check for incorrect list types
+                if ($regex =~ s{\\/rdf\\:(Bag|Seq|Alt)\\/}{/rdf:(Bag|Seq|Alt)/}g) {
+                    # also look for missing bottom-level list
+                    if ($regex =~ s{/rdf:\(Bag\|Seq\|Alt\)\/rdf\\:li\\ \\d\+$}{}) {
+                        $regex .= '(/.*)?' unless @fixInfo;
                     }
-                    my $tg = $et->GetGroup($tagInfo, 1) . ':' . $$tagInfo{Name};
-                    my $wrn = lc($path) eq lc($matches[0]) ? 'tag ID case' : 'list type';
-                    if ($err) {
-                        $et->Warn("Incorrect $wrn for existing $tg (not changed)");
-                    } else {
-                        # fix the incorrect property paths for all values of this tag
-                        foreach $match (@matches) {
-                            my $fixed = shift @fixed;
-                            $capture{$fixed} = $capture{$match};
-                            delete $capture{$match};
-                            # remove xml:lang attribute from incorrect lang-alt list if necessary
-                            delete $capture{$fixed}[1]{'xml:lang'} if $ok2 and $match !~ /^$ok2$/;
-                        }
-                        $cap = $capture{$path} || $capture{$fixed[0]};
-                        $et->Warn("Fixed incorrect $wrn for $tg", 1);
+                } elsif (not @fixInfo) {
+                    $ok2 = $regex;
+                    # check for properties in lists that shouldn't be (ref forum4325)
+                    $regex .= '(/rdf:(Bag|Seq|Alt)/rdf:li \d+)?';
+                }
+                if (@fixInfo) {
+                    $regex .= '(/.*)?';
+                    $ok .= '(/.*)?';
+                }
+                my @matches = sort grep m{^$regex$}i, keys %capture;
+                last unless @matches;
+                if ($matches[0] =~ m{^$ok$}) {
+                    unless (@fixInfo) {
+                        $path = $matches[0];
+                        $cap = $capture{$path};
                     }
+                    next;
+                }
+                # needs fixing...
+                my @fixProps = split '/', $fixPath;
+                foreach $match (@matches) {
+                    my @matchProps = split '/', $match;
+                    # remove superfluous list properties if necessary
+                    $#matchProps = $#fixProps if $ok2 and $#matchProps > $#fixProps;
+                    for ($i=0; $i<@fixProps; ++$i) {
+                        defined $matchProps[$i] or $matchProps[$i] = $fixProps[$i], next;
+                        next if $matchProps[$i] =~ / \d+$/ or $matchProps[$i] eq $fixProps[$i];
+                        $matchProps[$i] = $fixProps[$i];
+                    }
+                    $fixed = join '/', @matchProps;
+                    $err = 1 if $fixed{$fixed} or ($capture{$fixed} and $match ne $fixed);
+                    push @fixed, $fixed;
+                    $fixed{$fixed} = 1;
+                }
+                my $tg = $et->GetGroup($fixInfo, 1) . ':' . $$fixInfo{Name};
+                my $wrn = lc($fixed[0]) eq lc($matches[0]) ? 'tag ID case' : 'list type';
+                if ($err) {
+                    $et->Warn("Incorrect $wrn for existing $tg (not changed)");
+                } else {
+                    # fix the incorrect property paths for all values of this tag
+                    foreach $fixed (@fixed) {
+                        my $match = shift @matches;
+                        next if $fixed eq $match;
+                        $capture{$fixed} = $capture{$match};
+                        delete $capture{$match};
+                        # remove xml:lang attribute from incorrect lang-alt list if necessary
+                        delete $capture{$fixed}[1]{'xml:lang'} if $ok2 and $match !~ /^$ok2$/;
+                        $changed = 1;
+                    }
+                    $cap = $capture{$path} || $capture{$fixed[0]} unless @fixInfo;
+                    $et->Warn("Fixed incorrect $wrn for $tg", 1) if $changed;
                 }
             }
+            last;
         }
         my $nvHash = $et->GetNewValueHash($tagInfo);
         my $overwrite = $et->IsOverwriting($nvHash);