[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:40 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d258dc1
The following commit has been merged in the master branch:
commit d258dc1cf7e492aecd00ba49ff0b93071eefb277
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Aug 28 11:30:35 2015 +0000
#1111: Bootstrapped the Exif tag-lists.
---
website/Makefile | 3 +-
website/master/tags-canon.html.in | 27 +++++++-----------
website/master/tags-fujifilm.html.in | 21 +++++++-------
website/master/tags-minolta.html.in | 24 +++++++---------
website/master/tags-nikon.html.in | 53 ++++++++---------------------------
website/master/tags-olympus.html.in | 29 +++++++------------
website/master/tags-panasonic.html.in | 21 +++++++-------
website/master/tags-pentax.html.in | 23 ++++++++-------
website/master/tags-samsung.html.in | 21 +++++++-------
website/master/tags-sigma.html.in | 21 +++++++-------
website/master/tags-sony.html.in | 33 +++++++++-------------
website/master/tags.html.in | 23 ++++++++-------
website/var/{xmp.xsl => exif.xsl} | 20 ++++++-------
13 files changed, 129 insertions(+), 190 deletions(-)
diff --git a/website/Makefile b/website/Makefile
index 27ce4ae..5b5f9fe 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -179,7 +179,8 @@ update-makernotes:
@cp -f ../doc/templates/__makernotes__ var/__makernotes__
$(TABLES):
- @cp -f ../doc/templates/__$@__ var/__$@__
+ @cp -f ../doc/templates/$@.xml var/
+ @xsltproc var/exif.xsl var/$@.xml > var/__$@__
Iptc:
@cp -f ../doc/templates/$@.xml var/
diff --git a/website/master/tags-canon.html.in b/website/master/tags-canon.html.in
index 4e8dda4..94c2f6c 100644
--- a/website/master/tags-canon.html.in
+++ b/website/master/tags-canon.html.in
@@ -1,59 +1,52 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Canon MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Canon MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Canon cameras. These tags are defined by Exiv2 in accordance with <a href="makernote.html#R2">[2]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Canon__
<br>
<h3>Canon Camera Settings Tags</h3>
-<p>Click on a column header to sort the table.</p>
__CanonCs__
<br>
<h3>Canon Shot Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__CanonSi__
<br>
<h3>Canon Panorama Tags</h3>
-<p>Click on a column header to sort the table.</p>
__CanonPa__
<br>
<h3>Canon Custom Function Tags</h3>
-<p>Click on a column header to sort the table.</p>
__CanonCf__
<br>
<h3>Canon Picture Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__CanonPi__
<br>
<h3>Canon File Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__CanonFi__
<br>
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-fujifilm.html.in b/website/master/tags-fujifilm.html.in
index 2d63ce2..e452b4d 100644
--- a/website/master/tags-fujifilm.html.in
+++ b/website/master/tags-fujifilm.html.in
@@ -1,22 +1,21 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Fujifilm MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Fujifilm MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Fujifilm cameras. These tags are defined by Exiv2 in accordance with <a href="makernote.html#R1">[1]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Fujifilm__
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-minolta.html.in b/website/master/tags-minolta.html.in
index cc0955b..e9f4a55 100644
--- a/website/master/tags-minolta.html.in
+++ b/website/master/tags-minolta.html.in
@@ -1,41 +1,37 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Minolta MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Minolta MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Minolta cameras.
These Exiv2 tags are based on <a href="makernote.html#R5">[5]</a>,
<a href="makernote.html#R9">[9]</a> and <a href="makernote.html#R10">[10]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Minolta__
<br>
<h3>Minolta Camera Settings (tags from older and newer cameras)</h3>
-<p>Click on a column header to sort the table.</p>
__MinoltaCsNew__
<br>
<h3>Minolta 5D Camera Settings</h3>
-<p>Click on a column header to sort the table.</p>
__MinoltaCs5D__
<br>
<h3>Minolta 7D Camera Settings</h3>
-<p>Click on a column header to sort the table.</p>
__MinoltaCs7D__
<br>
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-nikon.html.in b/website/master/tags-nikon.html.in
index ae062ab..2529bc6 100644
--- a/website/master/tags-nikon.html.in
+++ b/website/master/tags-nikon.html.in
@@ -1,198 +1,169 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
<p>There are three different Nikon MakerNote formats. Exiv2 will automatically detect the correct format for the Exif data from a particular Nikon camera model.</p>
-<h2>Nikon (format 1) MakerNote Tags defined in Exiv2</h2>
+<div><h2>Nikon (format 1) MakerNote Tags</h2>
<p>Tags found in the MakerNote of images taken with Nikon cameras, such as the E990 and D1. These tags are defined by Exiv2 in accordance with <a href="makernote.html#R3">[3]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Nikon1__
<br>
-<h2>Nikon (format 2) MakerNote Tags defined in Exiv2</h2>
+<h2>Nikon (format 2) MakerNote Tags</h2>
<p>Tags found in the MakerNote of images taken with Nikon cameras, including the E700, E800, E900, E900S, E910, E950. These tags are defined by Exiv2 in accordance with <a href="makernote.html#R1">[1]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Nikon2__
<br>
-<h2>Nikon (format 3) MakerNote Tags defined in Exiv2</h2>
+<h2>Nikon (format 3) MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with newer Nikon cameras, e.g., the E5400, SQ, D2H, D70.</p>
-<p>Click on a column header to sort the table.</p>
__Nikon3__
<br>
<h3>Nikon Vibration Reduction Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonVr__
<br>
<h3>Nikon Picture Control Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonPc__
<br>
<h3>Nikon World Time Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonWt__
<br>
<h3>Nikon ISO Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonIi__
<br>
<h3>Nikon Auto Focus Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonAf__
<br>
<h3>Nikon Auto Focus 2 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonAf2__
<br>
<h3>Nikon AF Fine Tune Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonAFT__
<br>
<h3>Nikon File Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonFi__
<br>
<h3>Nikon Multi Exposure Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonMe__
<br>
<h3>Nikon Flash Info 1 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonFl1__
<br>
<h3>Nikon Flash Info 2 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonFl2__
<br>
<h3>Nikon Flash Info 3 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonFl3__
<br>
<h3>Nikon Shot Info D80 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonSiD80__
<br>
<h3>Nikon Shot Info D40 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonSiD40__
<br>
<h3>Nikon Shot Info D300a Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonSiD300a__
<br>
<h3>Nikon Shot Info D300b Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonSiD300b__
<br>
<h3>Nikon Shot Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonSi01xx__
<br>
<h3>Nikon Color Balance 1 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonCb1__
<br>
<h3>Nikon Color Balance 2 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonCb2__
<br>
<h3>Nikon Color Balance 2a Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonCb2a__
<br>
<h3>Nikon Color Balance 2b Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonCb2b__
<br>
<h3>Nikon Color Balance 3 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonCb3__
<br>
<h3>Nikon Color Balance 4 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonCb4__
<br>
<h3>Nikon Lens Data 1 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonLd1__
<br>
<h3>Nikon Lens Data 2 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonLd2__
<br>
<h3>Nikon Lens Data 3 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__NikonLd3__
<br>
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-olympus.html.in b/website/master/tags-olympus.html.in
index ad9b93e..8ea7a6b 100644
--- a/website/master/tags-olympus.html.in
+++ b/website/master/tags-olympus.html.in
@@ -1,72 +1,63 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Olympus MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Olympus MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Olympus cameras. References: <a href="makernote.html#R1">[1]</a>, <a href="makernote.html#R9">[9]</a>, and <a href="makernote.html#R10">[10]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Olympus__
<br>
<h3>Olympus Camera Settings Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusCs__
<br>
<h3>Olympus Equipment Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusEq__
<br>
<h3>Olympus Raw Development Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusRd__
<br>
<h3>Olympus Raw Development 2 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusRd2__
<br>
<h3>Olympus Image Processing Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusIp__
<br>
<h3>Olympus Focus Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusFi__
<br>
<h3>Olympus FE Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusFe1__
<br>
<h3>Olympus Raw Info Tags</h3>
-<p>Click on a column header to sort the table.</p>
__OlympusRi__
<br>
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-panasonic.html.in b/website/master/tags-panasonic.html.in
index 539506d..6f301a0 100644
--- a/website/master/tags-panasonic.html.in
+++ b/website/master/tags-panasonic.html.in
@@ -1,24 +1,23 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Panasonic MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Panasonic MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Panasonic cameras. References:
<a href="makernote.html#R8">[8]</a>, <a href="makernote.html#R9">[9]</a>, and <a href="makernote.html#R10">[10]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Panasonic__
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-pentax.html.in b/website/master/tags-pentax.html.in
index caa16ca..eec6da4 100644
--- a/website/master/tags-pentax.html.in
+++ b/website/master/tags-pentax.html.in
@@ -1,25 +1,24 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Pentax MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Pentax MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Pentax cameras.
-The same tags are found in Pentax native DNG makernotes with group <i>PentaxDng</i>.
+The same tags are found in Pentax native DNG makernotes with group <code>PentaxDng</code>.
Reference: <a href="makernote.html#R10">[10]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Pentax__
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-samsung.html.in b/website/master/tags-samsung.html.in
index 8751df9..567f79c 100644
--- a/website/master/tags-samsung.html.in
+++ b/website/master/tags-samsung.html.in
@@ -1,22 +1,21 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Samsung MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Samsung MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Samsung cameras.</p>
-<p>Click on a column header to sort the table.</p>
__Samsung2__
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-sigma.html.in b/website/master/tags-sigma.html.in
index f71c1d7..5fe8655 100644
--- a/website/master/tags-sigma.html.in
+++ b/website/master/tags-sigma.html.in
@@ -1,22 +1,21 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Sigma/Foveon MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Sigma/Foveon MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Sigma/Foveon cameras. These tags are defined by Exiv2 in accordance with <a href="makernote.html#R7">[7]</a>.</p>
-<p>Click on a column header to sort the table.</p>
__Sigma__
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags-sony.html.in b/website/master/tags-sony.html.in
index 39d9c07..d448b9e 100644
--- a/website/master/tags-sony.html.in
+++ b/website/master/tags-sony.html.in
@@ -1,65 +1,58 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Sony MakerNote Tags defined in Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Sony MakerNote Tags</h2></div>
<p>Tags found in the MakerNote of images taken with Sony cameras.</p>
-<p>Click on a column header to sort the table.</p>
__Sony1__
<br>
<h3>Sony Minolta Tags</h3>
<p>These are the same tags as found in the Minolta MakerNote.
-In Sony images the group name is <b><code>SonyMinolta</code></b>.</p>
-<p>Click on a column header to sort the table.</p>
+In Sony images the group name is <code>SonyMinolta</code>.</p>
__SonyMinolta__
<br>
<h3>Sony Camera Settings Tags</h3>
-<p>Click on a column header to sort the table.</p>
__Sony1Cs__
<br>
<h3>Sony Camera Settings 2 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__Sony1Cs2__
<br>
<h3>Sony Minolta Camera Settings Tags</h3>
<p>These are the same tags as the Minolta Camera Settings in the Minolta MakerNote.
-In Sony images the group name is <b><code>Sony1MltCsOld</code></b> or <b><code>Sony1MltCsNew</code></b>.</p>
-<p>Click on a column header to sort the table.</p>
+In Sony images the group name is <code>Sony1MltCsOld</code> or <code>Sony1MltCsNew</code>.</p>
__Sony1MltCsOld__
<br>
<h3>Sony Minolta Camera Settings 7D Tags</h3>
<p>These are the same tags as the Minolta 7D Camera Settings in the Minolta MakerNote.
-In Sony images the group name is <b><code>Sony1MltCs7D</code></b>.</p>
-<p>Click on a column header to sort the table.</p>
+In Sony images the group name is <code>Sony1MltCs7D</code>.</p>
__Sony1MltCs7D__
<br>
<h3>Sony Minolta Camera Settings A100 Tags</h3>
-<p>Click on a column header to sort the table.</p>
__Sony1MltCsA100__
<br>
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/master/tags.html.in b/website/master/tags.html.in
index 74ec6ef..3d76e61 100644
--- a/website/master/tags.html.in
+++ b/website/master/tags.html.in
@@ -1,23 +1,22 @@
__doctype__
-<html>
-__header2__
+<html lang="en">
+__header4__
<body>
-__sidebar2__
+__navbar__
-<div id="content">
-__maintitle__
-<h2>Exif Tags supported by Exiv2</h2>
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+<div><h2>Standard Exif Tags</h2></div>
<p>These are the Exif tags as defined in the <a title="The Exif 2.3 standard (PDF)" href="http://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf">Exif 2.3 standard</a>.</p>
-<p>IFD1 tags are not listed seperately. All IFD0 tags may also be present in IFD1, according to the standard. The second part of the Exiv2 key of an IFD1 tag is <i>Thumbnail</i> (instead of <i>Image</i>), the other two parts of the key are the same as for IFD0 tags.</p>
-<p>Click on a column header to sort the table.</p>
+<p>IFD1 tags are not listed seperately. All IFD0 tags may also be present in IFD1, according to the standard. The second part of the Exiv2 key of an IFD1 tag is <code>Thumbnail</code> (instead of <code>Image</code>), the other two parts of the key are the same as for IFD0 tags.</p>
__Exif__
__footer__
-</div>
-<!-- closes content -->
-
-__tracker__
+</div><!-- /.container -->
+__bootstrap__
</body>
</html>
diff --git a/website/var/xmp.xsl b/website/var/exif.xsl
similarity index 83%
copy from website/var/xmp.xsl
copy to website/var/exif.xsl
index 9e4f997..253e479 100644
--- a/website/var/xmp.xsl
+++ b/website/var/exif.xsl
@@ -34,12 +34,12 @@
<!-- *********************************************************************** -->
<xsl:template name="header-row">
<tr>
- <th>Property</th>
- <th>Label</th>
- <th>Value type</th>
- <th>Exiv2 type</th>
- <th>Category</th>
- <th>Description</th>
+ <th>Tag (hex)</th>
+ <th>Tag (dec)</th>
+ <th>IFD</th>
+ <th>Key</th>
+ <th>Type</th>
+ <th>Tag description</th>
</tr>
</xsl:template>
@@ -51,11 +51,11 @@
<!-- *********************************************************************** -->
<xsl:template name="data-row">
<tr>
- <td><xsl:value-of select="tagname" /></td>
- <td><xsl:value-of select="title" /></td>
- <td><xsl:value-of select="xmpvaltype" /></td>
+ <td><xsl:value-of select="taghex" /></td>
+ <td><xsl:value-of select="tagdec" /></td>
+ <td><xsl:value-of select="ifd" /></td>
+ <td><xsl:value-of select="key" /></td>
<td><xsl:value-of select="type" /></td>
- <td><xsl:value-of select="category" /></td>
<td><xsl:value-of select="tagdesc" /></td>
</tr>
</xsl:template>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list