From d01e2527ce59b5daac2b63a6ac0074cbec8bebe5 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Thu, 7 Jan 2010 10:22:14 +0200
Subject: [PATCH] docs: use xi:include to use the generated indexes if
 available.

This works transparantly for people with new enough gtk-doc (>=1.11) and
significantly improves the build time.
---
 docs/reference/gio/gio-docs.xml          | 19 +++++---
 docs/reference/glib/glib-docs.sgml       | 62 +++++++++++++++---------
 docs/reference/gobject/gobject-docs.sgml | 54 +++++++++++++--------
 3 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index 69bfb9a61..6848abcfe 100644
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -1,6 +1,7 @@
 <?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 % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
 ]>
 <book lang="en" id="gio" xmlns:xi="http://www.w3.org/2003/XInclude">
@@ -142,22 +143,28 @@
       <xi:include href="xml/tree_index.sgml"/>
   </chapter>
   
-  <index>
+  <index id="api-index-full">
     <title id="index-all">Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="deprecated">
+  <index id="api-index-deprecated" role="deprecated">
     <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.18">
+  <index id="api-index-2-18" role="2.18">
     <title>Index of new symbols in 2.18</title>
+    <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.20">
+  <index id="api-index-2-20" role="2.20">
     <title>Index of new symbols in 2.20</title>
+    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.22">
+  <index id="api-index-2-22" role="2.22">
     <title>Index of new symbols in 2.22</title>
+    <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.24">
+  <index id="api-index-2-24" role="2.24">
     <title>Index of new symbols in 2.24</title>
+    <xi:include href="xml/api-index-2.24.xml"><xi:fallback /></xi:include>
   </index>
 </book>
diff --git a/docs/reference/glib/glib-docs.sgml b/docs/reference/glib/glib-docs.sgml
index b2741fd29..dc5f01686 100644
--- a/docs/reference/glib/glib-docs.sgml
+++ b/docs/reference/glib/glib-docs.sgml
@@ -80,9 +80,10 @@
 <!ENTITY gtester SYSTEM "gtester.xml">
 <!ENTITY gtester-report SYSTEM "gtester-report.xml">
 
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
 ]>
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GLib Reference Manual</title>
     <releaseinfo>
@@ -208,44 +209,57 @@ synchronize their operation.
     &gtester-report;
   </chapter>
 
-  <index>
+  <index id="api-index-full">
     <title>Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="deprecated">
+  <index id="api-index-deprecated" role="deprecated">
     <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.2">
+  <index id="api-index-2-2" role="2.2">
     <title>Index of new symbols in 2.2</title>
+    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.4">
+  <index id="api-index-2-4" role="2.4">
     <title>Index of new symbols in 2.4</title>
-  </index>  
-  <index role="2.6">
+    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-6" role="2.6">
     <title>Index of new symbols in 2.6</title>
-  </index>  
-  <index role="2.8">
+    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-8" role="2.8">
     <title>Index of new symbols in 2.8</title>
-  </index>  
-  <index role="2.10">
+    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-10" role="2.10">
     <title>Index of new symbols in 2.10</title>
-  </index>  
-  <index role="2.12">
+    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-12" role="2.12">
     <title>Index of new symbols in 2.12</title>
-  </index>  
-  <index role="2.14">
+    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-14" role="2.14">
     <title>Index of new symbols in 2.14</title>
-  </index>  
-  <index role="2.16">
+    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-16" role="2.16">
     <title>Index of new symbols in 2.16</title>
-  </index>  
-  <index role="2.18">
+    <xi:include href="xml/api-index-2.16.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-18" role="2.18">
     <title>Index of new symbols in 2.18</title>
-  </index>  
-  <index role="2.20">
+    <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-20" role="2.20">
     <title>Index of new symbols in 2.20</title>
-  </index>  
-  <index role="2.22">
+    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-22" role="2.22">
     <title>Index of new symbols in 2.22</title>
-  </index>  
+    <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
+  </index>
 
 </book>
diff --git a/docs/reference/gobject/gobject-docs.sgml b/docs/reference/gobject/gobject-docs.sgml
index 32fe93be5..c44856abf 100644
--- a/docs/reference/gobject/gobject-docs.sgml
+++ b/docs/reference/gobject/gobject-docs.sgml
@@ -17,7 +17,6 @@
 <!ENTITY glib-mkenums SYSTEM "glib-mkenums.xml">
 <!ENTITY glib-genmarshal SYSTEM "glib-genmarshal.xml">
 <!ENTITY gobject-query SYSTEM "gobject-query.xml">
-<!ENTITY version SYSTEM "version.xml">
 
 <!ENTITY tutorial-Intro SYSTEM "tut_intro.xml">
 <!ENTITY tutorial-GType SYSTEM "tut_gtype.xml">
@@ -26,8 +25,10 @@
 <!ENTITY tutorial-HowTo SYSTEM "tut_howto.xml">
 <!ENTITY tutorial-Tools SYSTEM "tut_tools.xml">
 
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+<!ENTITY version SYSTEM "version.xml">
 ]>
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GObject Reference Manual</title>
     <releaseinfo>
@@ -125,38 +126,49 @@
     &tutorial-Tools;
   </part>
 
-  <index>
+  <index id="api-index-full">
     <title>Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="deprecated">
+  <index id="api-index-deprecated" role="deprecated">
     <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.2">
+  <index id="api-index-2-2" role="2.2">
     <title>Index of new symbols in 2.2</title>
+    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.4">
+  <index id="api-index-2-4" role="2.4">
     <title>Index of new symbols in 2.4</title>
-  </index>  
-  <index role="2.6">
+    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-6" role="2.6">
     <title>Index of new symbols in 2.6</title>
-  </index>  
-  <index role="2.8">
+    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-8" role="2.8">
     <title>Index of new symbols in 2.8</title>
-  </index>  
-  <index role="2.10">
+    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-10" role="2.10">
     <title>Index of new symbols in 2.10</title>
-  </index>  
-  <index role="2.12">
+    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-12" role="2.12">
     <title>Index of new symbols in 2.12</title>
-  </index>  
-  <index role="2.14">
+    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-14" role="2.14">
     <title>Index of new symbols in 2.14</title>
-  </index>  
-  <index role="2.18">
+    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-18" role="2.18">
     <title>Index of new symbols in 2.18</title>
-  </index>  
-  <index role="2.22">
+    <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-22" role="2.22">
     <title>Index of new symbols in 2.22</title>
-  </index>  
+    <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
+  </index>
   
 </book>