Merge pull request #2053 from postscript-dev/update_XMP_tags_for_IPTC_2021.1

Update XMP tags for IPTC 2021.1

Author: postscript-dev

doc/templates/tags-xmp-iptc.html.in

@@ -10,13 +10,11 @@ __index2__
 <h2>IPTC Core schema</h2>
 <p>This schema specifies the IPTC Core XMP properties.
  <ul>
-  <li>Exiv2 keys are <b><code>Xmp.iptc.&lt;Property&gt;</code></b></li>
-  <li>Creator Contact Info sub-keys are nested: <b><code>Xmp.Iptc4xmpCore.CreatorContactInfo/Iptc4xmpCore:&lt;Property&gt;</code></b></li>
+  <li>The Exiv2 keys are either <b><code>Xmp.iptc.&lt;Property&gt;</code></b> or <b><code>Xmp.Iptc4xmpCore.&lt;Property&gt;</code></b></li>
   <li>The schema namespace URI is <b><code>http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/</code></b></li>
   <li>The preferred schema namespace prefix is <b><code>Iptc4xmpCore</code></b></li>
  </ul>
-Reference: <a href="http://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata" title="IPTC Core Specification Version 1.2">"IPTC Core" Specification Version 1.2</a></p>
-<p>Note: Exiv2 uses <b><code>iptc</code></b> (rather than <code>Iptc4xmpCore</code>) as the group name for keys of IPTC Core schema properties.</p>
+Reference: <a href="http://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata" title="IPTC Core Metadata Schema 1.3 specification">IPTC Core Metadata Schema 1.3 specification</a></p>
 
 <p>Click on a column header to sort the table.</p>
 

doc/templates/tags-xmp-iptcExt.html.in

@@ -13,12 +13,11 @@ __index2__
    of more granular properties and further specialized rights related
    properties from the PLUS metadata schema.
  <ul>
-  <li>Exiv2 keys are <b><code>Xmp.iptcExt.&lt;Property&gt;</code></b></li>
+  <li>The Exiv2 keys are either <b><code>Xmp.iptcExt.&lt;Property&gt;</code></b> or <b><code>Xmp.Iptc4xmpExt.&lt;Property&gt;</code></b></li>
   <li>The schema namespace URI is <b><code>http://iptc.org/std/Iptc4xmpExt/2008-02-29/</code></b></li>
   <li>The preferred schema namespace prefix is <b><code>Iptc4xmpExt</code></b></li>
  </ul>
-Reference: <a href="http://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata" title="IPTC Extension Specification Version 1.2">IPTC Extension Specification Version 1.2</a> standard</p>
-<p>Note: Exiv2 uses <b><code>iptcExt</code></b> (rather than <code>Iptc4xmpExt</code>) as the group name for keys of IPTC Extension schema properties.</p>
+Reference: <a href="http://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata" title="IPTC Extension Metadata Schema 1.6 specification">IPTC Extension Metadata Schema 1.6 specification</a></p>
 
 <p>Click on a column header to sort the table.</p>
 

src/properties.cpp

@@ -345,6 +345,32 @@ namespace Exiv2 {
 //! Shortcut for the printTagVocabulary template which requires typing the array name only once.
 #define EXV_PRINT_VOCABULARY(array) printTagVocabulary<EXV_COUNTOF(array), array>
 
+    template <int N, const TagVocabulary (&array)[N]>
+    std::ostream& printTagVocabularyMulti(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() == 0) {
+            os << "(" << value << ")";
+            return os;
+        }
+
+        for (int i=0; i< value.count(); i++) {
+            if (i != 0)
+                os << ", ";
+            const TagVocabulary* td = find(array, value.toString(i));
+            if (td) {
+                os << exvGettext(td->label_);
+            }
+            else {
+                os << "(" << value.toString(i) << ")";
+            }
+        }
+
+        return os;
+    }
+
+//! Shortcut for the printTagVocabularyMulti template which requires typing the array name only once.
+#define EXV_PRINT_VOCABULARY_MULTI(array) printTagVocabularyMulti<EXV_COUNTOF(array), array>
+
 // *****************************************************************************
 // free functions