[goffice] Replace SGML docs source by an XML file.

[Jean BrÃfort <jbrefort src gnome org>]

commit e9f86a6d607e61269e47ce08669ceff013f525e2
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Aug 1 14:56:11 2012 +0200

    Replace SGML docs source by an XML file.

 ChangeLog                                          |    7 +++++++
 configure.in                                       |    2 +-
 docs/reference/Makefile.am                         |    4 ++--
 .../{goffice-docs.sgml => goffice-docs.xml}        |   11 ++++++-----
 4 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 65aab91..2dc6f33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-08-01  Jean Brefort  <jean brefort normalesup org>
 
+	* configure.in: requires gtk-doc >= 1.12.
+	* docs/reference/goffice-docs.sgml: replaced by xml.
+	* docs/reference/goffice-docs.xml: replaces sgml.
+	* docs/reference/Makefile.am: ditto.
+
+2012-08-01  Jean Brefort  <jean brefort normalesup org>
+
 	* goffice/gtk/go-action-combo-color.c
 	(go_action_combo_color_create_tool_item),
 	(go_action_combo_color_set_allow_alpha): add alpha support.
diff --git a/configure.in b/configure.in
index 8282493..96b452b 100644
--- a/configure.in
+++ b/configure.in
@@ -759,7 +759,7 @@ AC_DEFINE(GO_VERSION_MINOR, goffice_version_minor,
 AC_DEFINE(GO_VERSION_EXTRA, "goffice_version_extra",
 	[Extra, possibly empty tag for this release])
 
-GTK_DOC_CHECK([1.11])
+GTK_DOC_CHECK([1.12])
 if test "x$with_gtk" = "xno" -a "x$enable_gtk_doc" = "xyes"; then
 	AC_ERROR([Building documentation is not allowed for a without Gtk+ build])
 fi
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 9e5ee77..e0aa11e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -2,7 +2,7 @@
 
 DOC_MODULE=goffice- GOFFICE_API_VER@
 
-DOC_MAIN_SGML_FILE=goffice-docs.sgml
+DOC_MAIN_SGML_FILE=goffice-docs.xml
 
 DOC_SOURCE_DIR=../../goffice
 
@@ -10,7 +10,7 @@ SCANGOBJ_OPTIONS= --nogtkinit --type-init-func="g_type_init ()"
 
 SCAN_OPTIONS=--rebuild-types
 
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--xml-mode --output-format=xml
 
 MKTMPL_OPTIONS=
 
diff --git a/docs/reference/goffice-docs.sgml b/docs/reference/goffice-docs.xml
similarity index 95%
rename from docs/reference/goffice-docs.sgml
rename to docs/reference/goffice-docs.xml
index 632ee0d..78a8e6f 100644
--- a/docs/reference/goffice-docs.sgml
+++ b/docs/reference/goffice-docs.xml
@@ -1,10 +1,10 @@
 <?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"; [
+<!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
+ 'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd' [
+<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
-]
->
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
+]>
+<book lang="en" id="goffice" xmlns:xi="http://www.w3.org/2003/XInclude";>
 	<bookinfo>
 		<title>Goffice Reference Manual</title>
 		<releaseinfo>For goffice &version;</releaseinfo>
@@ -188,6 +188,7 @@
 			<xi:include href="xml/go-utils.xml"/>
 		</chapter>
 	</part>
+	<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
 <!--
 <chapter>