Update to latest gtk-doc

Update autotools to run gtkdocize and various other updates for the
latest gtk-doc

Author: ianw

autogen.sh

@@ -82,6 +82,7 @@ $ACLOCAL $ACLOCAL_FLAGS || exit $?
 autoconf || exit $?
 autoheader || exit $?
 $AUTOMAKE --add-missing || exit $?
+gtkdocize || exit $?
 
 cd $ORIGDIR || exit $?
 

configure.in

@@ -75,8 +75,8 @@ dnl Check for headers (Mac OSX often doesn't have them)
 AC_CHECK_HEADERS([getopt.h wchar.h iconv.h])
 
 
-GTK_DOC_CHECK([1.0])
-
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+AC_CONFIG_MACRO_DIR(m4)
 
 dnl ---------------------------------------------------------------------------
 dnl Warnings

docs/reference/Makefile.am

@@ -1,48 +1,120 @@
-## Process this file with automake to produce Makefile.in
+# -*- mode: makefile -*-
+#
+# Makefile.am - template makefile for gtk-doc module
+# Copyright (C) 2007-2017  Stefan Sauer
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the above copyright owner gives unlimited
+# permission to copy, distribute and modify this Makefile.am template.
+# You need not follow the terms of the GNU General Public License when
+# using or distributing such Makefile.am files, even though portions of
+# the text of the Makefile.am appear in them. The GNU General Public
+# License (GPL) does govern all other use of the material that constitutes
+# the Makefile.am template.
+
+# This is a blank Makefile.am for using gtk-doc.
+# Copy this to your project's API docs directory and modify the variables to
+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
+# of using the various options.
 
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=libiptcdata
 
-# The top-level SGML file. Change it if you want.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+#DOC_MODULE_VERSION=2
+
+# The top-level XML file.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting functions and macros.
+# Directories containing the source code.
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
 DOC_SOURCE_DIR=../../libiptcdata
 
-# Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj.
-SCANOBJ_OPTIONS=
+# Extra options to pass to gtkdoc-scangobj. Normally not needed.
+SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
 SCAN_OPTIONS=
 
-# Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS= --sgml-mode --output-format=xml
+# Extra options to supply to gtkdoc-mkdb
+# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
+MKDB_OPTIONS=--xml-mode --output-format=xml
 
-# Extra options to supply to gtkdoc-fixref.
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=
+
+# Extra options to supply to gtkdoc-fixref. Normally not needed.
+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=
 
-# Used for dependencies.
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB=
 CFILE_GLOB=
 
-# Header files to ignore when scanning.
-IGNORE_HFILES= i18n.h
+# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
+# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
+EXTRA_HFILES=
+
+# Header files or dirs to ignore when scanning. Use base file/dir names
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
+IGNORE_HFILES=
 
 # Images to copy into HTML directory.
-HTML_IMAGES =
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES=
 
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files = \
+# Extra files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.xml building.xml changes-2.0.xml
+content_files= \
 	version.xml \
-	about.sgml \
-	commandline.sgml \
-	i18n.sgml \
-	libjpeg.sgml \
-	overview.sgml
+	about.xml \
+	commandline.xml \
+	i18n.xml \
+	libjpeg.xml \
+	overview.xml
 
+# Files where gtk-doc abbrevations (#GtkWidget) are expanded
+# e.g. expand_content_files=running.xml
+expand_content_files=
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+GTKDOC_CFLAGS=
+GTKDOC_LIBS=
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
+# Comment this out if you don't want 'make check' to test you doc status
+# and run some sanity checks
+if ENABLE_GTK_DOC
+TESTS_ENVIRONMENT = \
+  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+TESTS = $(GTKDOC_CHECK)
+endif
+
 EXTRA_DIST += \
 	version.xml.in
+
+-include $(top_srcdir)/git.mk

docs/reference/about.sgml docs/reference/about.xmldocs/reference/about.sgml renamed to docs/reference/about.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY iptc-overview SYSTEM "overview.sgml">
-<!ENTITY iptc-about SYSTEM "about.sgml">
-<!ENTITY iptc-commandline SYSTEM "commandline.sgml">
-<!ENTITY iptc-i18n SYSTEM "i18n.sgml">
-<!ENTITY iptc-libjpeg SYSTEM "libjpeg.sgml">
+<!ENTITY iptc-overview SYSTEM "overview.xml">
+<!ENTITY iptc-about SYSTEM "about.xml">
+<!ENTITY iptc-commandline SYSTEM "commandline.xml">
+<!ENTITY iptc-i18n SYSTEM "i18n.xml">
+<!ENTITY iptc-libjpeg SYSTEM "libjpeg.xml">
 <!ENTITY version SYSTEM "version.xml">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">

docs/reference/commandline.sgml docs/reference/commandline.xmldocs/reference/commandline.sgml renamed to docs/reference/commandline.xml

@@ -10,7 +10,7 @@
 	<refpurpose>an example of using libiptcdata together with libjpeg</refpurpose>
 </refnamediv>
 
-<refsect1 id="i18n">
+<refsect1 id="jpeg-reading">
 	<title>Reading IPTC data from a file parsed with libjpeg</title>
 
 	<para>

docs/reference/i18n.sgml docs/reference/i18n.xmldocs/reference/i18n.sgml renamed to docs/reference/i18n.xml

@@ -1,6 +1,6 @@
 /* i18n.h
  *
- * Copyright © 2001 David Moore <dcm@acm.org>
+ * Copyright (c) 2001 David Moore <dcm@acm.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public