diff --git a/website/Makefile b/website/Makefile index 27ce4ae7..5b5f9fed 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 4e8dda44..94c2f6c8 100644 --- a/website/master/tags-canon.html.in +++ b/website/master/tags-canon.html.in @@ -1,59 +1,52 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Canon MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Canon MakerNote Tags

Tags found in the MakerNote of images taken with Canon cameras. These tags are defined by Exiv2 in accordance with [2].

-

Click on a column header to sort the table.

__Canon__

Canon Camera Settings Tags

-

Click on a column header to sort the table.

__CanonCs__

Canon Shot Info Tags

-

Click on a column header to sort the table.

__CanonSi__

Canon Panorama Tags

-

Click on a column header to sort the table.

__CanonPa__

Canon Custom Function Tags

-

Click on a column header to sort the table.

__CanonCf__

Canon Picture Info Tags

-

Click on a column header to sort the table.

__CanonPi__

Canon File Info Tags

-

Click on a column header to sort the table.

__CanonFi__
__footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-fujifilm.html.in b/website/master/tags-fujifilm.html.in index 2d63ce2d..e452b4db 100644 --- a/website/master/tags-fujifilm.html.in +++ b/website/master/tags-fujifilm.html.in @@ -1,22 +1,21 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Fujifilm MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Fujifilm MakerNote Tags

Tags found in the MakerNote of images taken with Fujifilm cameras. These tags are defined by Exiv2 in accordance with [1].

-

Click on a column header to sort the table.

__Fujifilm__ __footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-minolta.html.in b/website/master/tags-minolta.html.in index cc0955b2..e9f4a553 100644 --- a/website/master/tags-minolta.html.in +++ b/website/master/tags-minolta.html.in @@ -1,41 +1,37 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Minolta MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Minolta MakerNote Tags

Tags found in the MakerNote of images taken with Minolta cameras. These Exiv2 tags are based on [5], [9] and [10].

-

Click on a column header to sort the table.

__Minolta__

Minolta Camera Settings (tags from older and newer cameras)

-

Click on a column header to sort the table.

__MinoltaCsNew__

Minolta 5D Camera Settings

-

Click on a column header to sort the table.

__MinoltaCs5D__

Minolta 7D Camera Settings

-

Click on a column header to sort the table.

__MinoltaCs7D__
__footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-nikon.html.in b/website/master/tags-nikon.html.in index ae062aba..2529bc6b 100644 --- a/website/master/tags-nikon.html.in +++ b/website/master/tags-nikon.html.in @@ -1,198 +1,169 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ +
+
+

Metadata reference tables

+

There are three different Nikon MakerNote formats. Exiv2 will automatically detect the correct format for the Exif data from a particular Nikon camera model.

-

Nikon (format 1) MakerNote Tags defined in Exiv2

+

Nikon (format 1) MakerNote Tags

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 [3].

-

Click on a column header to sort the table.

__Nikon1__
-

Nikon (format 2) MakerNote Tags defined in Exiv2

+

Nikon (format 2) MakerNote Tags

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 [1].

-

Click on a column header to sort the table.

__Nikon2__
-

Nikon (format 3) MakerNote Tags defined in Exiv2

+

Nikon (format 3) MakerNote Tags

Tags found in the MakerNote of images taken with newer Nikon cameras, e.g., the E5400, SQ, D2H, D70.

-

Click on a column header to sort the table.

__Nikon3__

Nikon Vibration Reduction Tags

-

Click on a column header to sort the table.

__NikonVr__

Nikon Picture Control Tags

-

Click on a column header to sort the table.

__NikonPc__

Nikon World Time Tags

-

Click on a column header to sort the table.

__NikonWt__

Nikon ISO Info Tags

-

Click on a column header to sort the table.

__NikonIi__

Nikon Auto Focus Tags

-

Click on a column header to sort the table.

__NikonAf__

Nikon Auto Focus 2 Tags

-

Click on a column header to sort the table.

__NikonAf2__

Nikon AF Fine Tune Tags

-

Click on a column header to sort the table.

__NikonAFT__

Nikon File Info Tags

-

Click on a column header to sort the table.

__NikonFi__

Nikon Multi Exposure Tags

-

Click on a column header to sort the table.

__NikonMe__

Nikon Flash Info 1 Tags

-

Click on a column header to sort the table.

__NikonFl1__

Nikon Flash Info 2 Tags

-

Click on a column header to sort the table.

__NikonFl2__

Nikon Flash Info 3 Tags

-

Click on a column header to sort the table.

__NikonFl3__

Nikon Shot Info D80 Tags

-

Click on a column header to sort the table.

__NikonSiD80__

Nikon Shot Info D40 Tags

-

Click on a column header to sort the table.

__NikonSiD40__

Nikon Shot Info D300a Tags

-

Click on a column header to sort the table.

__NikonSiD300a__

Nikon Shot Info D300b Tags

-

Click on a column header to sort the table.

__NikonSiD300b__

Nikon Shot Info Tags

-

Click on a column header to sort the table.

__NikonSi01xx__

Nikon Color Balance 1 Tags

-

Click on a column header to sort the table.

__NikonCb1__

Nikon Color Balance 2 Tags

-

Click on a column header to sort the table.

__NikonCb2__

Nikon Color Balance 2a Tags

-

Click on a column header to sort the table.

__NikonCb2a__

Nikon Color Balance 2b Tags

-

Click on a column header to sort the table.

__NikonCb2b__

Nikon Color Balance 3 Tags

-

Click on a column header to sort the table.

__NikonCb3__

Nikon Color Balance 4 Tags

-

Click on a column header to sort the table.

__NikonCb4__

Nikon Lens Data 1 Tags

-

Click on a column header to sort the table.

__NikonLd1__

Nikon Lens Data 2 Tags

-

Click on a column header to sort the table.

__NikonLd2__

Nikon Lens Data 3 Tags

-

Click on a column header to sort the table.

__NikonLd3__
__footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-olympus.html.in b/website/master/tags-olympus.html.in index ad9b93e6..8ea7a6b3 100644 --- a/website/master/tags-olympus.html.in +++ b/website/master/tags-olympus.html.in @@ -1,72 +1,63 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Olympus MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Olympus MakerNote Tags

Tags found in the MakerNote of images taken with Olympus cameras. References: [1], [9], and [10].

-

Click on a column header to sort the table.

__Olympus__

Olympus Camera Settings Tags

-

Click on a column header to sort the table.

__OlympusCs__

Olympus Equipment Tags

-

Click on a column header to sort the table.

__OlympusEq__

Olympus Raw Development Tags

-

Click on a column header to sort the table.

__OlympusRd__

Olympus Raw Development 2 Tags

-

Click on a column header to sort the table.

__OlympusRd2__

Olympus Image Processing Tags

-

Click on a column header to sort the table.

__OlympusIp__

Olympus Focus Info Tags

-

Click on a column header to sort the table.

__OlympusFi__

Olympus FE Tags

-

Click on a column header to sort the table.

__OlympusFe1__

Olympus Raw Info Tags

-

Click on a column header to sort the table.

__OlympusRi__
__footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-panasonic.html.in b/website/master/tags-panasonic.html.in index 539506db..6f301a06 100644 --- a/website/master/tags-panasonic.html.in +++ b/website/master/tags-panasonic.html.in @@ -1,24 +1,23 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Panasonic MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Panasonic MakerNote Tags

Tags found in the MakerNote of images taken with Panasonic cameras. References: [8], [9], and [10].

-

Click on a column header to sort the table.

__Panasonic__ __footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-pentax.html.in b/website/master/tags-pentax.html.in index caa16ca3..eec6da4c 100644 --- a/website/master/tags-pentax.html.in +++ b/website/master/tags-pentax.html.in @@ -1,25 +1,24 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Pentax MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Pentax MakerNote Tags

Tags found in the MakerNote of images taken with Pentax cameras. -The same tags are found in Pentax native DNG makernotes with group PentaxDng. +The same tags are found in Pentax native DNG makernotes with group PentaxDng. Reference: [10].

-

Click on a column header to sort the table.

__Pentax__ __footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-samsung.html.in b/website/master/tags-samsung.html.in index 8751df91..567f79ce 100644 --- a/website/master/tags-samsung.html.in +++ b/website/master/tags-samsung.html.in @@ -1,22 +1,21 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Samsung MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Samsung MakerNote Tags

Tags found in the MakerNote of images taken with Samsung cameras.

-

Click on a column header to sort the table.

__Samsung2__ __footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-sigma.html.in b/website/master/tags-sigma.html.in index f71c1d79..5fe8655d 100644 --- a/website/master/tags-sigma.html.in +++ b/website/master/tags-sigma.html.in @@ -1,22 +1,21 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Sigma/Foveon MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Sigma/Foveon MakerNote Tags

Tags found in the MakerNote of images taken with Sigma/Foveon cameras. These tags are defined by Exiv2 in accordance with [7].

-

Click on a column header to sort the table.

__Sigma__ __footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags-sony.html.in b/website/master/tags-sony.html.in index 39d9c075..d448b9ea 100644 --- a/website/master/tags-sony.html.in +++ b/website/master/tags-sony.html.in @@ -1,65 +1,58 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Sony MakerNote Tags defined in Exiv2

+
+
+

Metadata reference tables

+
+

Sony MakerNote Tags

Tags found in the MakerNote of images taken with Sony cameras.

-

Click on a column header to sort the table.

__Sony1__

Sony Minolta Tags

These are the same tags as found in the Minolta MakerNote. -In Sony images the group name is SonyMinolta.

-

Click on a column header to sort the table.

+In Sony images the group name is SonyMinolta.

__SonyMinolta__

Sony Camera Settings Tags

-

Click on a column header to sort the table.

__Sony1Cs__

Sony Camera Settings 2 Tags

-

Click on a column header to sort the table.

__Sony1Cs2__

Sony Minolta Camera Settings Tags

These are the same tags as the Minolta Camera Settings in the Minolta MakerNote. -In Sony images the group name is Sony1MltCsOld or Sony1MltCsNew.

-

Click on a column header to sort the table.

+In Sony images the group name is Sony1MltCsOld or Sony1MltCsNew.

__Sony1MltCsOld__

Sony Minolta Camera Settings 7D Tags

These are the same tags as the Minolta 7D Camera Settings in the Minolta MakerNote. -In Sony images the group name is Sony1MltCs7D.

-

Click on a column header to sort the table.

+In Sony images the group name is Sony1MltCs7D.

__Sony1MltCs7D__

Sony Minolta Camera Settings A100 Tags

-

Click on a column header to sort the table.

__Sony1MltCsA100__
__footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/master/tags.html.in b/website/master/tags.html.in index 74ec6ef8..3d76e61d 100644 --- a/website/master/tags.html.in +++ b/website/master/tags.html.in @@ -1,23 +1,22 @@ __doctype__ - -__header2__ + +__header4__ -__sidebar2__ +__navbar__ -
-__maintitle__ -

Exif Tags supported by Exiv2

+
+
+

Metadata reference tables

+
+

Standard Exif Tags

These are the Exif tags as defined in the Exif 2.3 standard.

-

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 Thumbnail (instead of Image), the other two parts of the key are the same as for IFD0 tags.

-

Click on a column header to sort the table.

+

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 Thumbnail (instead of Image), the other two parts of the key are the same as for IFD0 tags.

__Exif__ __footer__ -
- - -__tracker__ +
+__bootstrap__ diff --git a/website/var/exif.xsl b/website/var/exif.xsl new file mode 100644 index 00000000..253e4793 --- /dev/null +++ b/website/var/exif.xsl @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + +
+ + + + + + Tag (hex) + Tag (dec) + IFD + Key + Type + Tag description + + + + + + + + + + + + + + + + + + + + + +