diff --git a/doc/Makefile b/doc/Makefile index 918f49e0..b5a7879e 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -13,7 +13,7 @@ # # Default make target -all: doc tags +all: doc # Include system configuration top_srcdir = .. @@ -30,22 +30,24 @@ SHELL = /bin/sh # ********************************************************************** # Targets -.PHONY: all doc tags mostlyclean clean distclean maintainer-clean +.PHONY: all doc doxygen tags mostlyclean clean distclean maintainer-clean -doc: +doc: doxygen tags + +doxygen: doxygen $(top_srcdir)/config/Doxyfile tags: - cd tags && $(MAKE) all - cp -f tags/tags-*.html . + cd $(top_srcdir)/doc/tags && $(MAKE) all + cp -f $(top_srcdir)/doc/tags/*.html $(top_srcdir)/doc/html/ + +mostlyclean clean: + $(RM) *~ *.bak *# -mostlyclean clean distclean: - $(RM) *~ *.bak *# - $(RM) tags-*.html - cd tags && $(MAKE) $(MAKECMDGOALS) +distclean: clean # This command is intended for maintainers to use; it deletes files # that may need special tools to rebuild. maintainer-clean: distclean + cd $(top_srcdir)/doc/tags && $(MAKE) $(MAKECMDGOALS) rm -rf $(top_srcdir)/doc/html/* - cd tags && $(MAKE) distclean diff --git a/doc/exiv2.gif b/doc/include/exiv2-components.gif similarity index 100% rename from doc/exiv2.gif rename to doc/include/exiv2-components.gif diff --git a/doc/include/sortabletable.css b/doc/include/sortabletable.css index d5b88fc7..bd634ba9 100644 --- a/doc/include/sortabletable.css +++ b/doc/include/sortabletable.css @@ -1,10 +1,3 @@ -/* -------------------------------------------------------------------------- */ -h2 { - font-size: 140%; - font-weight: bold; - text-align: center; -} - /* -------------------------------------------------------------------------- */ .BoxTable { width: 90%; diff --git a/doc/include/sortabletable.js b/doc/include/sortabletable.js index fce2fb27..4b877aa8 100644 --- a/doc/include/sortabletable.js +++ b/doc/include/sortabletable.js @@ -106,7 +106,7 @@ SortableTable.prototype.initHeader = function (oSortTypes) { for (var i = 0; i < l; i++) { c = cells[i]; img = this.document.createElement("IMG"); - img.src = "include/blank.png"; // relative to the file that uses this + img.src = "../include/blank.png"; // relative to the file that uses this c.appendChild(img); if (oSortTypes[i] != null) { c._sortType = oSortTypes[i]; diff --git a/doc/tags/Makefile b/doc/tags/Makefile index d35eaba8..2729f527 100644 --- a/doc/tags/Makefile +++ b/doc/tags/Makefile @@ -6,7 +6,10 @@ # History: 28-May-05, ahu: created # # Description: -# Simple Makefile to create the tag tables +# Simple Makefile to create html documentation from templates. Requires a +# number of special tools (java, xalan, awk, python) but really only needs +# to be used to update the documentation after changing Exiv2 tags in the +# source code. # # Restrictions: # Only tested with GNU make. @@ -17,26 +20,37 @@ TABLES = Exif Canon CanonCs1 CanonCs2 CanonCf Fujifilm Nikon1 Nikon2 Nikon3 \ TAGLIST = ../../src/taglist +# ********************************************************************** +# ====================================================================== +# ********************************************************************** + +# Initialisations +SHELL = /bin/sh + +.SUFFIXES: + # Default make target all: tags -.PHONY: clean $(TABLES) Iptc +.PHONY: tags mostlyclean clean distclean maintainer-clean tags: $(TABLES) Iptc - @./gen.py tags-*.html.in + @./gen.py *.html.in $(TABLES): @echo Generating $@ table... @$(TAGLIST) $@ | awk -f tags.awk > $@.xml @java org.apache.xalan.xslt.Process -IN $@.xml -XSL tags.xsl -OUT $@.tmp - @sed "s/report-1/$@/" $@.tmp > __$@__ + @sed "s/report1/$@/" $@.tmp > __$@__ + @touch $@ @rm -f $@.tmp Iptc: @echo Generating $@ table... @$(TAGLIST) $@ | awk -f iptc.awk > $@.xml @java org.apache.xalan.xslt.Process -IN $@.xml -XSL iptc.xsl -OUT $@.tmp - @sed "s/report-1/$@/" $@.tmp > __$@__ + @sed "s/report1/$@/g" $@.tmp > __$@__ + @touch $@ @rm -f $@.tmp mostlyclean: @@ -45,7 +59,10 @@ mostlyclean: clean: mostlyclean rm -f $(TABLES:%=__%__) __Iptc__ - rm -f tags-*.html + rm -f $(TABLES) Iptc + rm -f *.html distclean: clean rm -f *~ + +maintainer-clean: distclean diff --git a/doc/tags/__header2__ b/doc/tags/__header2__ index c2bb3634..797c5256 100644 --- a/doc/tags/__header2__ +++ b/doc/tags/__header2__ @@ -4,14 +4,15 @@ - - - + + + + - - +__header2__ -

Exif and Iptc metadata manipulation library and tools

+
-

MakerNote Formats and Specifications

+__index1__ + +

MakerNote Formats and Specifications

The MakerNote is tag 0x927c in the Exif IFD. According to the @@ -200,5 +185,8 @@ t1.onsort = function () { Various Makernote specifications from the PHP JPEG Metadata Toolkit by Evan Hunter

+
+ + diff --git a/doc/tags/tags-canon.html.in b/doc/tags/tags-canon.html.in index 20ef4f50..8bc1aebb 100644 --- a/doc/tags/tags-canon.html.in +++ b/doc/tags/tags-canon.html.in @@ -4,7 +4,8 @@ __header2__
-__maintitle__ +__index1__ +__index2__

Canon MakerNote Tags defined in Exiv2

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

diff --git a/doc/tags/tags-exif.html.in b/doc/tags/tags-exif.html.in index def35cb6..c5ff8f2a 100644 --- a/doc/tags/tags-exif.html.in +++ b/doc/tags/tags-exif.html.in @@ -4,7 +4,8 @@ __header2__
-__maintitle__ +__index1__ +__index2__

Exif Tags supported by Exiv2

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

diff --git a/doc/tags/tags-fujifilm.html.in b/doc/tags/tags-fujifilm.html.in index ad1c1f17..355c92c9 100644 --- a/doc/tags/tags-fujifilm.html.in +++ b/doc/tags/tags-fujifilm.html.in @@ -4,7 +4,8 @@ __header2__
-__maintitle__ +__index1__ +__index2__

Fujifilm MakerNote Tags defined in Exiv2

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

diff --git a/doc/tags/tags-iptc.html.in b/doc/tags/tags-iptc.html.in index c759d314..52d3b55c 100644 --- a/doc/tags/tags-iptc.html.in +++ b/doc/tags/tags-iptc.html.in @@ -4,7 +4,8 @@ __header2__
-__maintitle__ +__index1__ +__index2__

Iptc datasets defined in Exiv2

Datasets are defined according to the specification of the Iptc diff --git a/doc/tags/tags-nikon.html.in b/doc/tags/tags-nikon.html.in index 3fe17a13..b4bb8bde 100644 --- a/doc/tags/tags-nikon.html.in +++ b/doc/tags/tags-nikon.html.in @@ -4,7 +4,8 @@ __header2__

-__maintitle__ +__index1__ +__index2__

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

diff --git a/doc/tags/tags-olympus.html.in b/doc/tags/tags-olympus.html.in index fa61b891..feb4e343 100644 --- a/doc/tags/tags-olympus.html.in +++ b/doc/tags/tags-olympus.html.in @@ -4,7 +4,8 @@ __header2__
-__maintitle__ +__index1__ +__index2__

Olympus MakerNote Tags defined in Exiv2

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

diff --git a/doc/tags/tags-sigma.html.in b/doc/tags/tags-sigma.html.in index dc2a7a86..c2522160 100644 --- a/doc/tags/tags-sigma.html.in +++ b/doc/tags/tags-sigma.html.in @@ -4,7 +4,8 @@ __header2__
-__maintitle__ +__index1__ +__index2__

Sigma/Foveon MakerNote Tags defined in Exiv2

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

diff --git a/doc/tags/tags-sony.html.in b/doc/tags/tags-sony.html.in index 547ab3a2..931af97f 100644 --- a/doc/tags/tags-sony.html.in +++ b/doc/tags/tags-sony.html.in @@ -4,7 +4,8 @@ __header2__
-__maintitle__ +__index1__ +__index2__

Sony MakerNote Tags defined in Exiv2

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

diff --git a/doc/tags/tags.xsl b/doc/tags/tags.xsl index d6a06475..e93f1c22 100644 --- a/doc/tags/tags.xsl +++ b/doc/tags/tags.xsl @@ -23,7 +23,7 @@ - +
@@ -90,12 +90,12 @@