doc: refactored to be more mainstream
authorNicola Fontana <ntd@entidi.it>
Sun, 23 Jun 2013 14:08:28 +0000 (23 16:08 +0200)
committerNicola Fontana <ntd@entidi.it>
Sun, 23 Jun 2013 14:08:28 +0000 (23 16:08 +0200)
Dropped custom XSL and merged latest gtk-doc.make into
Makefile.am.gtk-doc: there is no more need to have XML 1.0 compiant
pages because the new online website is based on silverstripe-gtkdoc
(http://dev.entidi.com/p/silverstripe-gtkdoc/) that accepts HTML code.

Corrected minor bugs during the process:
* removed wikilinks in @short_description because they are not properly
  handled by gtk-doc;
* removed trailing dots from @short_description for consistency;
* added index of new APIs introduced by 1.0 version;
* added index of deprecated APIs (actually empty);
* merged docs/gnu into docs/adg;
* removed docs/common.

35 files changed:
Makefile.am
build/Makefile.am.gtk-doc
configure.ac
docs/Makefile.am
docs/adg/CONTRIBUTING.xml [moved from docs/gnu/CONTRIBUTING.xml with 100% similarity]
docs/adg/HACKING.xml [moved from docs/gnu/HACKING.xml with 100% similarity]
docs/adg/Makefile.am
docs/adg/NEWS.xml [moved from docs/gnu/NEWS.xml with 100% similarity]
docs/adg/README.xml [moved from docs/gnu/README.xml with 100% similarity]
docs/adg/TODO.xml [moved from docs/gnu/TODO.xml with 100% similarity]
docs/adg/adg-docs.xml
docs/common/devhelp2.xsl [deleted file]
docs/common/gtk-doc.xsl [deleted file]
docs/common/home.png [deleted file]
docs/common/left.png [deleted file]
docs/common/right.png [deleted file]
docs/common/style.css [deleted file]
docs/common/up.png [deleted file]
docs/common/version-greater-or-equal.xsl [deleted file]
docs/cpml/Makefile.am
docs/cpml/cpml-docs.xml
docs/docbook2txt.xsl [moved from docs/common/docbook2txt.xsl with 100% similarity]
po-properties/it.po
src/adg/adg-cairo-fallback.c
src/adg/adg-dash.c
src/adg/adg-gtk-area-gtk2.c
src/adg/adg-gtk-area.c
src/adg/adg-gtk-layout-gtk2.c
src/adg/adg-gtk-layout.c
src/adg/adg-matrix.c
src/adg/adg-param-dress.c
src/adg/adg-ruled-fill.c
src/adg/adg-table-cell.c
src/adg/adg-trail.c
src/cpml/cpml-gobject.c

index 3d26165..1b780d1 100644 (file)
@@ -1,6 +1,6 @@
 include $(top_srcdir)/build/Makefile.am.common
 
-xml2txt_stylesheet=            $(abs_srcdir)/docs/common/docbook2txt.xsl
+xml2txt_stylesheet=            $(abs_srcdir)/docs/docbook2txt.xsl
 xml2txt_command=               $(AM_V_GEN)if test -x $(XSLTPROC) ; then : ; else \
                                  echo ' *WARN  libxslt-1.0.19 or later is required to generate $@' ; \
                                  touch $@ ; \
@@ -33,11 +33,6 @@ EXTRA_DIST=                  COPYING \
                                build/adg-welcome.bmp \
                                build/adg.ico \
                                build/gschemas.compiled \
-                               docs/gnu/CONTRIBUTING.xml \
-                               docs/gnu/HACKING.xml \
-                               docs/gnu/NEWS.xml \
-                               docs/gnu/README.xml \
-                               docs/gnu/TODO.xml \
                                $(BUILT_SOURCES)
 CLEANFILES=                    test-report.xml \
                                test-report.html \
@@ -78,17 +73,17 @@ ChangeLog:
        fi
 
 # Autogenerated text docs
-README: $(xml2txt_stylesheet) $(abs_srcdir)/docs/gnu/README.xml
-       $(xml2txt_command) $(abs_srcdir)/docs/gnu/README.xml
+README: $(xml2txt_stylesheet) $(abs_srcdir)/docs/adg/README.xml
+       $(xml2txt_command) $(abs_srcdir)/docs/adg/README.xml
 
-NEWS: $(xml2txt_stylesheet) $(abs_srcdir)/docs/gnu/NEWS.xml
-       $(xml2txt_command) $(abs_srcdir)/docs/gnu/NEWS.xml
+NEWS: $(xml2txt_stylesheet) $(abs_srcdir)/docs/adg/NEWS.xml
+       $(xml2txt_command) $(abs_srcdir)/docs/adg/NEWS.xml
 
-TODO: $(xml2txt_stylesheet) $(abs_srcdir)/docs/gnu/TODO.xml
-       $(xml2txt_command) $(abs_srcdir)/docs/gnu/TODO.xml
+TODO: $(xml2txt_stylesheet) $(abs_srcdir)/docs/adg/TODO.xml
+       $(xml2txt_command) $(abs_srcdir)/docs/adg/TODO.xml
 
-CONTRIBUTING: $(xml2txt_stylesheet) $(abs_srcdir)/docs/gnu/CONTRIBUTING.xml
-       $(xml2txt_command) $(abs_srcdir)/docs/gnu/CONTRIBUTING.xml
+CONTRIBUTING: $(xml2txt_stylesheet) $(abs_srcdir)/docs/adg/CONTRIBUTING.xml
+       $(xml2txt_command) $(abs_srcdir)/docs/adg/CONTRIBUTING.xml
 
-HACKING: $(xml2txt_stylesheet) $(abs_srcdir)/docs/gnu/HACKING.xml
-       $(xml2txt_command) $(abs_srcdir)/docs/gnu/HACKING.xml
+HACKING: $(xml2txt_stylesheet) $(abs_srcdir)/docs/adg/HACKING.xml
+       $(xml2txt_command) $(abs_srcdir)/docs/adg/HACKING.xml
index 2adcaf1..104c399 100644 (file)
@@ -1,19 +1,5 @@
 # -*- mode: makefile -*-
 
-
-adg_docdir=    $(abs_top_srcdir)/docs/common
-GTKDOC_MKHTML= $(XSLTPROC) \
-                       --nonet --xinclude \
-                       --path $(abs_top_srcdir)/docs/gnu \
-                       --stringparam gtkdoc.bookname $(DOC_MODULE) \
-                       --stringparam gtkdoc.version "1.18" \
-                       --stringparam chunk.quietly 1 \
-                       --stringparam chunker.output.quiet 1 \
-                       $(MKHTML_OPTIONS) \
-                       $(adg_docdir)/gtk-doc.xsl \
-                       ../$(DOC_MAIN_SGML_FILE)
-
-
 ####################################
 # Everything below here is generic #
 ####################################
@@ -43,7 +29,7 @@ SETUP_FILES = \
        $(DOC_MODULE)-sections.txt      \
        $(DOC_MODULE)-overrides.txt
 
-EXTRA_DIST =                           \
+EXTRA_DIST =                           \
        $(HTML_IMAGES)                  \
        $(SETUP_FILES)
 
@@ -88,31 +74,40 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
+
 setup-build.stamp:
-       -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-           echo '  DOC   Preparing build'; \
+       -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
            files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
            if test "x$$files" != "x" ; then \
                for file in $$files ; do \
                    test -f $(abs_srcdir)/$$file && \
-                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
                done; \
            fi; \
        fi
-       @touch setup-build.stamp
+       $(AM_V_at)touch setup-build.stamp
 
 
 #### scan ####
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) scan-hook
-       @echo '  DOC   Scanning header files'
-       @_source_dir='' ; \
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0=@echo "  DOC   Scanning header files";
+
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+       $(GTK_DOC_V_SCAN)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-       @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-           echo "  DOC   Introspecting gobjects"; \
+       $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
            scanobj_options=""; \
            gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
            if test "$(?)" = "0"; then \
@@ -127,34 +122,52 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) scan-hook
                test -f $$i || touch $$i ; \
            done \
        fi
-       @touch scan-build.stamp
+       $(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
        @true
 
 #### xml ####
 
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
+
 sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
-       @echo '  DOC   Building XML'
-       @_source_dir='' ; \
+       $(GTK_DOC_V_XML)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-       @touch sgml-build.stamp
+       $(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
        @true
 
 #### html ####
 
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0=@echo "  DOC   Building HTML";
+
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building HTML'
-       @rm -rf html
-       @mkdir html
-       @cd html && $(GTKDOC_MKHTML) && \
-         cp -f $(adg_docdir)/*.png ./ && cp -f $(adg_docdir)/*.css ./ && \
-         echo "timestamp" > ../html.stamp || exit $?
+       $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+       mkhtml_options=""; \
+       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+       if test "$(?)" = "0"; then \
+         if test "x$(V)" = "x1"; then \
+           mkhtml_options="$$mkhtml_options --verbose"; \
+         fi; \
+       fi; \
+       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+       if test "$(?)" = "0"; then \
+         mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
+       fi; \
+       cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
        -@test "x$(HTML_IMAGES)" = "x" || \
        for file in $(HTML_IMAGES) ; do \
          if test -f $(abs_srcdir)/$$file ; then \
@@ -164,16 +177,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
            cp $(abs_builddir)/$$file $(abs_builddir)/html; \
          fi; \
        done;
-       @echo '  DOC   Fixing cross-references'
-       @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       @touch html-build.stamp
+       $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       $(AM_V_at)touch html-build.stamp
 
 #### pdf ####
 
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building PDF'
-       @rm -f $(DOC_MODULE).pdf
-       @mkpdf_options=""; \
+       $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+       mkpdf_options=""; \
        gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
        if test "$(?)" = "0"; then \
          if test "x$(V)" = "x1"; then \
@@ -190,7 +205,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
          done; \
        fi; \
        gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-       @touch pdf-build.stamp
+       $(AM_V_at)touch pdf-build.stamp
 
 ##############
 
@@ -205,7 +220,7 @@ distclean-local:
            rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
        fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
        @rm -rf xml html
 
 install-data-local:
@@ -242,7 +257,7 @@ uninstall-local:
 # Require gtk-doc when making dist
 #
 if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
        @echo "*** gtk-doc must be installed and enabled in order to make dist"
@@ -258,4 +273,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        @cd $(distdir) && rm -f $(DISTCLEANFILES)
        @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
-.PHONY : dist-hook-local docs scan-hook
+.PHONY : dist-hook-local docs
index ebc045e..8f0b964 100644 (file)
@@ -37,6 +37,8 @@ m4_ifdef([AM_COND_IF],[],
          [AC_DEFUN([AM_COND_IF],
                    [AS_IF([test -z "$$1_TRUE"],[$2],[$3])])])
 
+AC_DEFUN([ADG_DEPENDENCY],
+         [EXTRADIR="$EXTRADIR --extra-dir=$($PKG_CONFIG --variable=prefix $1)/share/gtk-doc/html/$2"])
 
 # Check for host information
 
@@ -129,8 +131,11 @@ AC_CONFIG_COMMANDS([default],
 # Check for required packages
 
 PKG_CHECK_MODULES([GLIB],[glib-2.0])
+ADG_DEPENDENCY([glib-2.0],[glib])
 PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= ]gobject_prereq)
+ADG_DEPENDENCY([gobject-2.0],[gobject])
 PKG_CHECK_MODULES([CAIRO],[cairo >= ]cairo_prereq)
+ADG_DEPENDENCY([cairo],[cairo])
 
 
 # Check for optional packages
@@ -144,7 +149,8 @@ AS_IF([test "x${enable_pango}" != "xno"],
       [PKG_CHECK_MODULES([PANGO],[pangocairo >= ]pangocairo_prereq,
                          [enable_pango=yes
                           AC_DEFINE_UNQUOTED([PANGO_ENABLED],[1],
-                                             [Defined if the pango support is enabled.])],
+                                             [Defined if the pango support is enabled.])
+                          ADG_DEPENDENCY([pangocairo],[pango])],
                          [AS_IF([test "x${enable_pango}" = "xyes"],
                                 [AC_MSG_ERROR([${PANGO_PKG_ERRORS} and pango support requested])],
                                 [enable_pango=no])])])
@@ -164,12 +170,17 @@ AS_CASE(["${with_gtk}"],
 
 # GTK+ autodetection, giving precedence to GTK+3
 AS_IF([test "x${gtk3_pkg}" = "xyes"],
-      [PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= ]gtk3_prereq,[gtk_pkg=gtk3],[:])])
+      [PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= ]gtk3_prereq,
+                         [gtk_pkg=gtk3
+                          ADG_DEPENDENCY([gtk+-3.0],[gtk3])],
+                         [:])])
 AS_IF([test "x${gtk2_pkg}" = "xyes" -a "x${gtk_pkg}" = "x"],
-      [PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= ]gtk2_prereq,[gtk_pkg=gtk2],[:])])
+      [PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= ]gtk2_prereq,
+                         [gtk_pkg=gtk2
+                          ADG_DEPENDENCY([gtk+-2.0],[gtk2])],
+                         [:])])
 AS_IF([test "x${gtk_pkg}" != "x"],[with_gtk=${gtk_pkg}])
 
-
 # Handle "check" graceful degradation
 AS_IF([test "x${with_gtk}" = "xcheck"],[with_gtk=no])
 
@@ -369,6 +380,8 @@ AM_COND_IF([HAVE_GTK3],
 AC_SUBST([ADG_CFLAGS])
 AC_SUBST([ADG_LIBS])
 
+AC_SUBST([EXTRADIR])
+
 
 # Generation
 
index 7c4f951..e446159 100644 (file)
@@ -3,12 +3,4 @@ include $(top_srcdir)/build/Makefile.am.common
 SUBDIRS=               cpml \
                        adg
 
-EXTRA_DIST=            common/devhelp2.xsl \
-                       common/docbook2txt.xsl \
-                       common/gtk-doc.xsl \
-                       common/home.png \
-                       common/left.png \
-                       common/right.png \
-                       common/style.css \
-                       common/up.png \
-                       common/version-greater-or-equal.xsl
+EXTRA_DIST=            docbook2txt.xsl
similarity index 100%
rename from docs/gnu/HACKING.xml
rename to docs/adg/HACKING.xml
index 18da3bb..92614cb 100644 (file)
@@ -6,13 +6,13 @@ DOC_SOURCE_DIR=               $(abs_top_srcdir)/src/adg
 SCANGOBJ_OPTIONS=
 SCAN_OPTIONS=          --rebuild-types \
                        --rebuild-sections
-MKDB_OPTIONS=          --sgml-mode \
+MKDB_OPTIONS=          --name-space=adg \
+                       --sgml-mode \
                        --output-format=xml \
                        --default-includes="$(DOC_MODULE)-1/$(DOC_MODULE).h"
 MKHTML_OPTIONS=
-HTML_OPTIONS=          --stringparam chunker.output.doctype-public '-//W3C//DTD XHTML 1.0 Strict//EN' \
-                       --stringparam chunker.output.doctype-system 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
-FIXXREF_OPTIONS=       --extra-dir=$(top_srcdir)/docs/cpml
+FIXXREF_OPTIONS=       --extra-dir=$(top_srcdir)/docs/cpml/html \
+                       $(EXTRA_DIR)
 HFILE_GLOB=            $(top_srcdir)/src/adg/*.h
 CFILE_GLOB=            $(top_srcdir)/src/adg/*.c
 IGNORE_HFILES=         adg.h \
@@ -59,7 +59,11 @@ IGNORE_HFILES=               adg.h \
                        adg-type-builtins.h \
                        test-internal.h
 HTML_IMAGES=
-content_files=
+content_files=         CONTRIBUTING.xml \
+                       HACKING.xml \
+                       NEWS.xml \
+                       README.xml \
+                       TODO.xml
 expand_content_files=
 
 GTKDOC_CFLAGS=         -I$(top_srcdir)/src \
@@ -85,3 +89,5 @@ include $(top_srcdir)/build/Makefile.am.gtk-doc
 
 DISTCLEANFILES=                $(DOC_MODULE)-sections.txt \
                        $(DOC_MODULE).types
+
+EXTRA_DIST+=           $(content_files)
similarity index 100%
rename from docs/gnu/NEWS.xml
rename to docs/adg/NEWS.xml
similarity index 100%
rename from docs/gnu/README.xml
rename to docs/adg/README.xml
similarity index 100%
rename from docs/gnu/TODO.xml
rename to docs/adg/TODO.xml
index 53b6a77..53efee9 100644 (file)
   </chapter>
 
   <index id="Index">
-    <title>Index</title>
+    <title>Index of all symbols</title>
     <xi:include href="xml/api-index-full.xml"/>
   </index>
 
+  <index id="Index-deprecated">
+    <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"/>
+  </index>
+
+  <index id="Index-1.0">
+    <title>Index of new symbols in 1.0</title>
+    <xi:include href="xml/api-index-1.0.xml"/>
+  </index>
+
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
 </book>
diff --git a/docs/common/devhelp2.xsl b/docs/common/devhelp2.xsl
deleted file mode 100644 (file)
index 76a20b7..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version='1.0'?> <!--*- mode: xml -*-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version='1.0'
-                xmlns="http://www.devhelp.net/book"
-                xmlns:str="http://exslt.org/strings"
-                exclude-result-prefixes="str">
-
-  <xsl:template name="generate.devhelp2">
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename">
-        <xsl:choose>
-          <xsl:when test="$gtkdoc.bookname">
-            <xsl:value-of select="$gtkdoc.bookname"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>book</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:text>.devhelp2</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="method" select="'xml'"/>
-      <xsl:with-param name="indent" select="'yes'"/>
-      <xsl:with-param name="encoding" select="'utf-8'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="devhelp2"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:variable name="gtkdoc.refsect2" select="//refsect2"/>
-
-  <xsl:template name="devhelp2">
-    <xsl:variable name="title">
-      <xsl:apply-templates select="." mode="generate.devhelp2.toc.title.mode"/>
-    </xsl:variable>
-    <xsl:variable name="link">
-      <xsl:call-template name="href.target"/>
-    </xsl:variable>
-    <xsl:variable name="author">
-      <xsl:if test="articleinfo|bookinfo">
-        <xsl:apply-templates mode="generate.devhelp2.authors"
-                             select="articleinfo|bookinfo"/>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="toc.nodes" select="part|reference|preface|chapter|
-                                           appendix|article|bibliography|
-                                           glossary|index|refentry|
-                                           bridgehead|sect1"/>
-
-    <book title="{$title}" link="{$link}" author="{$author}" name="{$gtkdoc.bookname}" version="2" language="c">
-      <xsl:if test="$toc.nodes">
-        <chapters>
-          <xsl:apply-templates select="$toc.nodes"
-                               mode="generate.devhelp2.toc.mode"/>
-        </chapters>
-      </xsl:if>
-      <functions>
-        <xsl:apply-templates select="$gtkdoc.refsect2"
-                             mode="generate.devhelp2.index.mode"/>
-        <xsl:apply-templates select="$gtkdoc.refsect2/variablelist[@role='enum']/varlistentry"
-                             mode="generate.devhelp2.index.mode"/>
-      </functions>
-    </book>
-  </xsl:template>
-
-  <xsl:template match="*" mode="generate.devhelp2.toc.mode">
-    <xsl:variable name="title">
-      <xsl:apply-templates select="." mode="generate.devhelp2.toc.title.mode"/>
-    </xsl:variable>
-    <xsl:variable name="target">
-      <xsl:variable name="anchor" select="title/anchor"/>
-      <xsl:choose>
-        <xsl:when test="$anchor">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$anchor"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="href.target"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <sub name="{$title}" link="{$target}">
-      <xsl:apply-templates select="section|sect1|
-                                   refentry|refsect|
-                                   bridgehead|part|chapter|glossary|index"
-                           mode="generate.devhelp2.toc.mode"/>
-    </sub>
-  </xsl:template>
-
-  <xsl:template match="*" mode="generate.devhelp2.index.mode">
-    <xsl:variable name="title" select="title|term/literal"/>
-    <xsl:variable name="anchor" select="title/anchor"/>
-    <xsl:variable name="type" select="@role"/>
-    <xsl:variable name="condition" select="@condition"/>
-    <xsl:variable name="target">
-      <xsl:choose>
-        <xsl:when test="$anchor">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$anchor"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="href.target"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <keyword type="{$type}" name="{$title}" link="{$target}">
-      <xsl:if test="$condition">
-        <xsl:for-each select="str:split($condition,'|')">
-          <xsl:variable name="attrname">
-            <xsl:value-of select="substring-before(.,':')"/>
-          </xsl:variable>
-          <xsl:choose>
-            <xsl:when test="string-length($attrname)=0">
-              <xsl:variable name="attrname2">
-                <xsl:value-of select="."/>
-              </xsl:variable>
-              <xsl:attribute name="{$attrname2}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="{$attrname}">
-                <xsl:value-of select="substring-after(.,':')"/>
-              </xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:for-each>
-     </xsl:if>
-    </keyword>
-  </xsl:template>
-
-  <!-- get title -->
-  <xsl:template match="article" mode="generate.devhelp2.toc.title.mode">
-    <xsl:value-of select="articleinfo/title"/>
-  </xsl:template>
-  <xsl:template match="book" mode="generate.devhelp2.toc.title.mode">
-    <xsl:value-of select="bookinfo/title"/>
-  </xsl:template>
-  <xsl:template match="refentry" mode="generate.devhelp2.toc.title.mode">
-    <xsl:value-of select="refmeta/refentrytitle"/>
-  </xsl:template>
-  <xsl:template match="*" mode="generate.devhelp2.toc.title.mode">
-    <xsl:value-of select="title"/>
-  </xsl:template>
-
-  <!-- generate list of authors ... -->
-  <xsl:template match="articleinfo|bookinfo" mode="generate.devhelp2.authors">
-    <xsl:for-each select="authorgroup/author">
-      <xsl:value-of select="firstname"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="surname"/>
-      <xsl:if test="not(last())">
-        <xsl:text>, </xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/common/gtk-doc.xsl b/docs/common/gtk-doc.xsl
deleted file mode 100644 (file)
index 38d0a1a..0000000
+++ /dev/null
@@ -1,899 +0,0 @@
-<?xml version='1.0'?> <!--*- mode: xml -*-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                exclude-result-prefixes="l"
-                version="1.0">
-
-  <!-- import the chunked XSL stylesheet -->
-  <!-- http://www.sagehill.net/docbookxsl/Chunking.html says we should use
-       "chunkfast.xsl", but I can see a difference -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
-  <xsl:include href="devhelp2.xsl"/>
-  <xsl:include href="version-greater-or-equal.xsl"/>
-
-  <xsl:key name="acronym.key"
-          match="glossentry/glossterm"
-          use="."/>
-  <xsl:key name="gallery.key"
-          match="para[@role='gallery']/link"
-          use="@linkend"/>
-
-  <!-- change some parameters -->
-  <!-- http://docbook.sourceforge.net/release/xsl/current/doc/html/index.html -->
-  <xsl:param name="toc.section.depth">2</xsl:param>
-  <xsl:param name="generate.toc">
-    book       toc
-    chapter toc
-    glossary toc
-    index toc
-    part       toc
-    reference toc
-  </xsl:param>
-
-  <xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
-  <xsl:param name="chunker.output.indent" select="'yes'"/>
-  <xsl:param name="chunk.fast" select="1"/>
-
-  <xsl:param name="default.encoding" select="'UTF-8'"/>
-  <xsl:param name="chapter.autolabel" select="0"/>
-  <xsl:param name="use.id.as.filename" select="1"/>
-  <xsl:param name="html.ext" select="'.html'"/>
-  <xsl:param name="refentry.generate.name" select="0"/>
-  <xsl:param name="refentry.generate.title" select="1"/>
-  <!-- don't generate all those link tags (very slow and hardly used)
-       it does not show much effect as we have a user.head.content template
-  <xsl:param name="html.extra.head.links" select="0" />
-   -->
-
-  <!-- use index filtering (if available) -->
-  <xsl:param name="index.on.role" select="1"/>
-
-  <!-- display variablelists as tables -->
-  <xsl:param name="variablelist.as.table" select="1"/>
-
-  <!-- new things to consider
-  <xsl:param name="glossterm.auto.link" select="0"></xsl:param>
-  -->
-
-  <!-- this gets set on the command line ... -->
-  <xsl:param name="gtkdoc.version" select="''"/>
-  <xsl:param name="gtkdoc.bookname" select="''"/>
-
-  <!-- ========================================================= -->
-
-  <!-- l10n is slow, we don't ue it, so we'd like to turn it off
-       this atleast avoid the re-evaluation -->
-  <xsl:template name="l10n.language">en</xsl:template>
-
-  <xsl:param name="gtkdoc.l10n.xml" select="document('http://docbook.sourceforge.net/release/xsl/current/common/en.xml')"/>
-
-  <xsl:key name="gtkdoc.gentext.key"
-          match="l:gentext[@key]"
-          use="@key"/>
-  <xsl:key name="gtkdoc.context.key"
-          match="l:context[@name]"
-          use="@name"/>
-
-  <xsl:template name="gentext">
-    <xsl:param name="key" select="local-name(.)"/>
-
-    <xsl:for-each select="$gtkdoc.l10n.xml">
-    <xsl:variable name="l10n.gentext" select="key('gtkdoc.gentext.key', $key)"/>
-
-    <xsl:choose>
-      <xsl:when test="$l10n.gentext">
-        <xsl:value-of select="$l10n.gentext/@text"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>No "en" localization of "</xsl:text>
-          <xsl:value-of select="$key"/>
-          <xsl:text>" exists.</xsl:text>
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="gentext.dingbat">
-    <xsl:param name="dingbat">bullet</xsl:param>
-
-    <xsl:variable name="l10n.dingbat"
-                  select="($gtkdoc.l10n.xml/l:l10n/l:dingbat[@key=$dingbat])[1]"/>
-
-    <xsl:choose>
-      <xsl:when test="$l10n.dingbat">
-        <xsl:value-of select="$l10n.dingbat/@text"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>No "en" localization of dingbat </xsl:text>
-          <xsl:value-of select="$dingbat"/>
-          <xsl:text> exists; using "en".</xsl:text>
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="gentext.template">
-    <xsl:param name="context" select="'default'"/>
-    <xsl:param name="name" select="'default'"/>
-    <xsl:param name="origname" select="$name"/>
-
-    <!-- cut leading / if any to avoid one recursion -->
-    <xsl:variable name="rname">
-      <xsl:choose>
-        <xsl:when test="starts-with($name, '/')">
-          <xsl:value-of select="substring-after($name, '/')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- this is called with context="title|title-numbered|title-unnumbered>
-    <xsl:message>
-      <xsl:text>context:</xsl:text><xsl:value-of select="$context"/>
-      <xsl:text>;name:</xsl:text><xsl:value-of select="$rname"/>
-      <xsl:text>;origname:</xsl:text><xsl:value-of select="$origname"/>
-    </xsl:message>
-
-    see html/html.xsl:<xsl:template match="*" mode="html.title.attribute">
-    -->
-
-    <xsl:for-each select="$gtkdoc.l10n.xml">
-    <xsl:variable name="context.node" select="key('gtkdoc.context.key', $context)"/>
-    <xsl:variable name="template.node"
-                  select="($context.node/l:template[@name=$rname])[1]"/>
-
-    <xsl:choose>
-      <xsl:when test="$template.node/@text">
-        <xsl:value-of select="$template.node/@text"/>
-        <!-- debug
-        <xsl:message>
-          <xsl:text>=</xsl:text><xsl:value-of select="$template.node/@text"/>
-        </xsl:message>
-        -->
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="contains($rname, '/')">
-            <xsl:call-template name="gentext.template">
-              <xsl:with-param name="context" select="$context"/>
-              <xsl:with-param name="name" select="substring-after($rname, '/')"/>
-              <xsl:with-param name="origname" select="$origname"/>
-            </xsl:call-template>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- silently test whether a gentext template exists -->
-  <xsl:template name="gentext.template.exists">
-    <xsl:param name="context" select="'default'"/>
-    <xsl:param name="name" select="'default'"/>
-    <xsl:param name="origname" select="$name"/>
-
-    <xsl:variable name="template">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="$context"/>
-        <xsl:with-param name="name" select="$name"/>
-        <xsl:with-param name="origname" select="$origname"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="string-length($template) != 0">1</xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- shortcut version -->
-  <!-- @bug: https://bugzilla.gnome.org/show_bug.cgi?id=617478 -->
-  <xsl:template name="generate.html.title"/>
-  <!--xsl:template name="generate.html.title">
-    <xsl:variable name="has.title.markup">
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="verbose" select="0"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-    <xsl:if test="$has.title.markup != '???TITLE???'">
-      <xsl:variable name="gentext.title">
-        <xsl:apply-templates select="."  mode="object.title.markup.textonly"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="string-length($gentext.title) != 0">
-          <xsl:attribute name="title">
-            <xsl:value-of select="$gentext.title"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="alt">
-          <xsl:attribute name="title">
-            <xsl:value-of select="normalize-space(alt)"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template-->
-
-  <!-- Generate a title attribute for the context node (e.g. links) -->
-  <xsl:template match="*" mode="html.title.attribute">
-    <xsl:variable name="has.title.markup">
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="verbose" select="0"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-    <xsl:if test="$has.title.markup != '???TITLE???'">
-      <xsl:variable name="is.title">
-        <xsl:call-template name="gentext.template.exists">
-          <xsl:with-param name="context" select="'title'"/>
-          <xsl:with-param name="name" select="local-name(.)"/>
-          <xsl:with-param name="lang">
-            <xsl:call-template name="l10n.language"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="is.title-numbered">
-        <xsl:if test="$is.title = 0">
-          <xsl:call-template name="gentext.template.exists">
-            <xsl:with-param name="context" select="'title-numbered'"/>
-            <xsl:with-param name="name" select="local-name(.)"/>
-            <xsl:with-param name="lang">
-              <xsl:call-template name="l10n.language"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:variable>
-
-
-      <xsl:variable name="is.title-unnumbered">
-        <xsl:if test="$is.title = 0 and $is.title-numbered = 0">
-          <xsl:call-template name="gentext.template.exists">
-            <xsl:with-param name="context" select="'title-unnumbered'"/>
-            <xsl:with-param name="name" select="local-name(.)"/>
-            <xsl:with-param name="lang">
-              <xsl:call-template name="l10n.language"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:variable name="gentext.title">
-        <xsl:if test="$is.title != 0 or
-                      $is.title-numbered != 0 or
-                      $is.title-unnumbered != 0">
-          <xsl:apply-templates select="."
-                               mode="object.title.markup.textonly"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="string-length($gentext.title) != 0">
-          <xsl:attribute name="title">
-            <xsl:value-of select="$gentext.title"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="alt">
-          <xsl:attribute name="title">
-            <xsl:value-of select="normalize-space(alt)"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-
-
-
-  <!-- ========================================================= -->
-  <!-- template to create the index.sgml anchor index -->
-
-  <xsl:template match="book|article">
-    <xsl:variable name="tooldver">
-      <xsl:call-template name="version-greater-or-equal">
-        <xsl:with-param name="ver1" select="$VERSION" />
-        <xsl:with-param name="ver2">1.36</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="$tooldver = 0">
-      <xsl:message terminate="yes">
-FATAL-ERROR: You need the DocBook XSL Stylesheets version 1.36 or higher
-to build the documentation.
-Get a newer version at http://docbook.sourceforge.net/projects/xsl/
-      </xsl:message>
-    </xsl:if>
-    <xsl:apply-imports/>
-
-    <!-- generate the index.sgml href index -->
-    <xsl:call-template name="generate.index"/>
-    <!-- generate $book.devhelp2 -->
-    <xsl:call-template name="generate.devhelp2"/>
-  </xsl:template>
-
-  <xsl:template name="generate.index">
-    <xsl:call-template name="write.text.chunk">
-      <xsl:with-param name="filename" select="'index.sgml'"/>
-      <xsl:with-param name="content">
-        <xsl:apply-templates select="/book/bookinfo/releaseinfo/ulink"
-                             mode="generate.index.mode"/>
-        <!-- check all anchor and refentry elements -->
-       <!--
-           The obvious way to write this is //anchor|//refentry|etc...
-           The obvious way is slow because it causes multiple traversals
-           in libxslt. This take about half the time.
-       -->
-       <xsl:apply-templates select="//*[name()='anchor' or name()='refentry' or name()='refsect1' or
-                                        name() = 'refsect2' or name()='refsynopsisdiv' or
-                                        name()='varlistentry']"
-                             mode="generate.index.mode"/>
-      </xsl:with-param>
-      <xsl:with-param name="default.encoding" select="'UTF-8'"/>
-      <xsl:with-param name="chunker.output.indent" select="'no'"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="*" mode="generate.index.mode">
-    <xsl:if test="not(@href) and count(@id) > 0">
-      <xsl:text>&lt;ANCHOR id=&quot;</xsl:text>
-      <xsl:value-of select="@id"/>
-      <xsl:text>&quot; href=&quot;</xsl:text>
-        <xsl:if test="$gtkdoc.bookname">
-          <xsl:value-of select="$gtkdoc.bookname"/>
-          <xsl:text>/</xsl:text>
-        </xsl:if>
-        <xsl:call-template name="href.target"/>
-        <xsl:text>&quot;&gt;&#10;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="/book/bookinfo/releaseinfo/ulink" mode="generate.index.mode">
-    <xsl:if test="@role='online-location'">
-      <xsl:text>&lt;ONLINE href=&quot;</xsl:text>
-      <xsl:value-of select="@url"/>
-      <xsl:text>&quot;&gt;&#10;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- ========================================================= -->
-  <!-- template to output gtkdoclink elements for the unknown targets -->
-
-  <xsl:template match="link">
-    <xsl:choose>
-      <xsl:when test="id(@linkend)">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <GTKDOCLINK HREF="{@linkend}">
-          <xsl:apply-templates/>
-        </GTKDOCLINK>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- ========================================================= -->
-  <!-- Below are the visual portions of the stylesheet.  They provide
-       the normal gtk-doc output style. -->
-
-  <xsl:param name="shade.verbatim" select="0"/>
-  <xsl:param name="refentry.separator" select="0"/>
-
-  <xsl:template match="refsect2">
-    <xsl:if test="preceding-sibling::refsect2">
-      <hr/>
-    </xsl:if>
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template name="user.head.content">
-    <xsl:if test="$gtkdoc.version">
-      <meta name="generator" content="GTK-Doc V{$gtkdoc.version} (XML mode)"/>
-    </xsl:if>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
-  </xsl:template>
-
-  <xsl:template name="user.footer.content">
-    <div class="footer">
-      <hr />
-      <xsl:choose>
-        <xsl:when test="$gtkdoc.version">
-          Generated by GTK-Doc V<xsl:copy-of select="$gtkdoc.version" />
-        </xsl:when>
-        <xsl:otherwise>
-          Generated by GTK-Doc
-        </xsl:otherwise>
-      </xsl:choose>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="title" mode="book.titlepage.recto.mode">
-    <table class="navigation" id="top" width="100%"
-           cellpadding="2" cellspacing="0">
-      <tr>
-        <th valign="middle">
-          <p class="{name(.)}">
-            <xsl:value-of select="."/>
-          </p>
-        </th>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="header.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:variable name="home" select="/*[1]"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="refsections" select="./refsect1[@role]"/>
-    <xsl:variable name="glssections" select="./glossdiv/title"/>
-    <xsl:variable name="idxsections" select="./indexdiv/indexdiv/title"/>
-    <xsl:variable name="section_id" select="./@id"/>
-    <xsl:variable name="sect_object_hierarchy" select="./refsect1[@role='object_hierarchy']"/>
-    <xsl:variable name="sect_impl_interfaces" select="./refsect1[@role='impl_interfaces']"/>
-    <xsl:variable name="sect_prerequisites" select="./refsect1[@role='prerequisites']"/>
-    <xsl:variable name="sect_derived_interfaces" select="./refsect1[@role='derived_interfaces']"/>
-    <xsl:variable name="sect_implementations" select="./refsect1[@role='implementations']"/>
-    <xsl:variable name="sect_properties" select="./refsect1[@role='properties']"/>
-    <xsl:variable name="sect_child_properties" select="./refsect1[@role='child_properties']"/>
-    <xsl:variable name="sect_style_properties" select="./refsect1[@role='style_properties']"/>
-    <xsl:variable name="sect_signal_proto" select="./refsect1[@role='signal_proto']"/>
-    <xsl:variable name="sect_desc" select="./refsect1[@role='desc']"/>
-    <xsl:variable name="sect_synopsis" select="./refsynopsisdiv[@role='synopsis']"/>
-    <!--
-    <xsl:variable name="sect_details" select="./refsect1[@id='details']"/>
-    <xsl:variable name="sect_property_details" select="./refsect1[@id='property_details']"/>
-    <xsl:variable name="sect_child_property_details" select="./refsect1[@id='child_property_details']"/>
-    <xsl:variable name="sect_style_property_details" select="./refsect1[@id='style_property_details']"/>
-    <xsl:variable name="sect_signals" select="./refsect1[@id='signals']"/>
-    -->
-
-    <xsl:if test="$suppress.navigation = '0' and $home != .">
-      <table class="navigation" id="top" width="100%"
-             summary = "Navigation header" cellpadding="2" cellspacing="2">
-        <tr valign="middle">
-          <xsl:choose>
-            <xsl:when test="count($prev) > 0">
-              <td>
-                <a accesskey="p">
-                  <xsl:attribute name="href">
-                    <xsl:call-template name="href.target">
-                      <xsl:with-param name="object" select="$prev"/>
-                    </xsl:call-template>
-                  </xsl:attribute>
-                  <img src="left.png" width="24" height="24" border="0">
-                    <xsl:attribute name="alt">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">nav-prev</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                  </img>
-                </a>
-              </td>
-            </xsl:when>
-            <xsl:otherwise>
-              <td>&#160;</td>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:choose>
-            <xsl:when test="count($up) > 0 and $up != $home">
-              <td>
-                <a accesskey="u">
-                  <xsl:attribute name="href">
-                    <xsl:call-template name="href.target">
-                      <xsl:with-param name="object" select="$up"/>
-                    </xsl:call-template>
-                  </xsl:attribute>
-                  <img src="up.png" width="24" height="24" border="0">
-                    <xsl:attribute name="alt">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">nav-up</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                  </img>
-                </a>
-              </td>
-            </xsl:when>
-            <xsl:otherwise>
-              <td>&#160;</td>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:choose>
-            <xsl:when test="$home != .">
-              <td>
-                <a accesskey="h">
-                  <xsl:attribute name="href">
-                    <xsl:call-template name="href.target">
-                      <xsl:with-param name="object" select="$home"/>
-                    </xsl:call-template>
-                  </xsl:attribute>
-                  <img src="home.png" width="24" height="24" border="0">
-                    <xsl:attribute name="alt">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">nav-home</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                  </img>
-                </a>
-              </td>
-            </xsl:when>
-            <xsl:otherwise>
-              <td>&#160;</td>
-            </xsl:otherwise>
-          </xsl:choose>
-          <th width="100%" align="center">
-            <xsl:apply-templates select="$home" mode="object.title.markup"/>
-          </th>
-          <xsl:choose>
-            <xsl:when test="count($next) > 0">
-              <td>
-                <a accesskey="n">
-                  <xsl:attribute name="href">
-                    <xsl:call-template name="href.target">
-                      <xsl:with-param name="object" select="$next"/>
-                    </xsl:call-template>
-                  </xsl:attribute>
-                  <img src="right.png" width="24" height="24" border="0">
-                    <xsl:attribute name="alt">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">nav-next</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                  </img>
-                </a>
-              </td>
-            </xsl:when>
-            <xsl:otherwise>
-              <td>&#160;</td>
-            </xsl:otherwise>
-          </xsl:choose>
-        </tr>
-        <!--<xsl:if test="name()='refentry'"-->
-        <xsl:choose>
-          <xsl:when test="count($refsections) > 0">
-            <tr>
-              <td colspan="5" class="shortcuts">
-                <xsl:if test="count($sect_synopsis) > 0">
-                  <a href="#{$section_id}.synopsis" class="shortcut">Top</a>
-                </xsl:if>
-                <xsl:if test="count($sect_desc) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.description" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='desc']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_object_hierarchy) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.object-hierarchy" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='object_hierarchy']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_impl_interfaces) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.implemented-interfaces" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='impl_interfaces']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_prerequisites) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.prerequisites" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='prerequisites']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_derived_interfaces) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.derived-interfaces" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='derived_interfaces']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_implementations) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.implementations" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='implementations']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_properties) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.properties" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='properties']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_child_properties) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.child-properties" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='child_properties']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_style_properties) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.style-properties" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='style_properties']/title"/>
-                  </a>
-                </xsl:if>
-                <xsl:if test="count($sect_signal_proto) > 0">
-                  &#160;|&#160;
-                  <a href="#{$section_id}.signals" class="shortcut">
-                    <xsl:value-of select="./refsect1[@role='signal_proto']/title"/>
-                  </a>
-                </xsl:if>
-                <!--
-                <xsl:if test="count($sect_details) > 0">
-                  <a href="#details" class="shortcut">
-                    <xsl:value-of select="./refsect1[@id='details']/title"/>
-                  </a>
-                  &#160;|&#160;
-                </xsl:if>
-                <xsl:if test="count($sect_property_details) > 0">
-                  <a href="#property_details" class="shortcut">
-                    <xsl:value-of select="./refsect1[@id='property_details']/title"/>
-                  </a>
-                  &#160;|&#160;
-                </xsl:if>
-                <xsl:if test="count($sect_child_property_details) > 0">
-                  <a href="#child_property_details" class="shortcut">
-                    <xsl:value-of select="./refsect1[@id='property_child_details']/title"/>
-                  </a>
-                  &#160;|&#160;
-                </xsl:if>
-                <xsl:if test="count($sect_style_property_details) > 0">
-                  <a href="#style_property_details" class="shortcut">
-                    <xsl:value-of select="./refsect1[@id='style_property_details']/title"/>
-                  </a>
-                  &#160;|&#160;
-                </xsl:if>
-                <xsl:if test="count($sect_signals) > 0">
-                  <a href="#signals" class="shortcut">
-                    <xsl:value-of select="./refsect1[@id='signals']/title"/>
-                  </a>
-                  &#160;|&#160;
-                </xsl:if>
-                -->
-              </td>
-            </tr>
-          </xsl:when>
-          <!-- this is not yet very nice, as it requires all glossdic/indexdiv
-          elements having a anchor element. maybe we can customize the xsl
-          to automaticaly create local anchors
-          -->
-          <xsl:when test="count($glssections) > 0">
-            <tr>
-              <td colspan="5" class="shortcuts">
-                 <xsl:for-each select="./glossdiv">
-                   <xsl:if test="position() > 1">
-                     &#160;|&#160;
-                   </xsl:if>
-                   <a class="shortcut">
-                     <xsl:attribute name="href">#gls<xsl:value-of select="./title"/></xsl:attribute>
-                     <xsl:value-of select="./title"/>
-                   </a>
-                 </xsl:for-each>
-              </td>
-            </tr>
-          </xsl:when>
-          <xsl:when test="count($idxsections) > 0">
-            <tr>
-              <td colspan="5" class="shortcuts">
-                 <xsl:for-each select="./indexdiv/indexdiv">
-                   <xsl:if test="position() > 1">
-                     &#160;|&#160;
-                   </xsl:if>
-                   <a class="shortcut">
-                     <xsl:attribute name="href">#idx<xsl:value-of select="./title"/></xsl:attribute>
-                     <xsl:value-of select="./title"/>
-                   </a>
-                 </xsl:for-each>
-              </td>
-            </tr>
-          </xsl:when>
-        </xsl:choose>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="footer.navigation">
-  </xsl:template>
-
-  <!-- avoid creating multiple identical indices
-       if the stylesheets don't support filtered indices
-    -->
-  <xsl:template match="index">
-    <xsl:variable name="has-filtered-index">
-      <xsl:call-template name="version-greater-or-equal">
-        <xsl:with-param name="ver1" select="$VERSION" />
-        <xsl:with-param name="ver2">1.66</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="($has-filtered-index = 1) or (count(@role) = 0)">
-      <xsl:apply-imports/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="index" mode="toc">
-    <xsl:variable name="has-filtered-index">
-      <xsl:call-template name="version-greater-or-equal">
-        <xsl:with-param name="ver1" select="$VERSION" />
-        <xsl:with-param name="ver2">1.66</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="($has-filtered-index = 1) or (count(@role) = 0)">
-      <xsl:apply-imports/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="para">
-    <xsl:choose>
-      <xsl:when test="@role = 'gallery'">
-         <div class="container">
-           <div class="gallery-spacer"> </div>
-           <xsl:apply-templates mode="gallery.mode"/>
-           <div class="gallery-spacer"> </div>
-         </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!-- FIXME: try if that works too -->
-  <!--xsl:template match="para[@role='gallery']">
-    <div class="container">
-      <div class="gallery-spacer"> </div>
-      <xsl:apply-templates mode="gallery.mode"/>
-      <div class="gallery-spacer"> </div>
-    </div>
-  </xsl:template-->
-
-
-
-  <xsl:template match="link" mode="gallery.mode">
-    <div class="gallery-float">
-       <xsl:apply-templates select="."/>
-    </div>
-  </xsl:template>
-
-  <!-- add gallery handling to refnamediv template -->
-  <xsl:template match="refnamediv">
-    <div class="{name(.)}">
-      <table width="100%">
-        <tr><td valign="top">
-          <xsl:call-template name="anchor"/>
-            <xsl:choose>
-              <xsl:when test="$refentry.generate.name != 0">
-                <h2>
-                <xsl:call-template name="gentext">
-                    <xsl:with-param name="key" select="'RefName'"/>
-                  </xsl:call-template>
-                </h2>
-              </xsl:when>
-              <xsl:when test="$refentry.generate.title != 0">
-                <h2>
-                  <xsl:choose>
-                    <xsl:when test="../refmeta/refentrytitle">
-                      <xsl:apply-templates select="../refmeta/refentrytitle"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:apply-templates select="refname[1]"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </h2>
-              </xsl:when>
-            </xsl:choose>
-            <p>
-            <xsl:apply-templates/>
-          </p>
-        </td>
-        <td valign="top" align="right">
-          <xsl:choose>
-            <xsl:when test="../refmeta/refmiscinfo/inlinegraphic">
-              <xsl:apply-templates select="../refmeta/refmiscinfo/inlinegraphic"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- find the gallery image to use here
-                   - determine the id of the enclosing refentry
-                   - look for an inlinegraphic inside a link with linkend == refentryid inside a para with role == gallery
-                   - use it here
-                -->
-              <xsl:variable name="refentryid" select="../@id"/>
-             <xsl:apply-templates select="key('gallery.key', $refentryid)/inlinegraphic"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td></tr>
-       </table>
-     </div>
-  </xsl:template>
-
-  <!-- add anchors for index sections -->
-  <xsl:template match="indexdiv">
-    <a><xsl:attribute name="name">idx<xsl:value-of select="./title"/></xsl:attribute></a>
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <!-- add anchors for glossary sections -->
-  <xsl:template match="glossdiv">
-    <a><xsl:attribute name="name">gls<xsl:value-of select="./title"/></xsl:attribute></a>
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <!-- Exterminate any trace of indexterms in the main flow -->
-  <xsl:template match="indexterm">
-  </xsl:template>
-
-  <!-- Extra link on the right side of doc-blobs -->
-  <xsl:template name="user.format.extralinks">
-    <xsl:if test="../ulink[@role='extralinks']">
-      <span class="extralinks">
-        <xsl:for-each select="../ulink[@role='extralinks']">
-          <xsl:if test="position() = 1">[&#160;</xsl:if>
-          <xsl:if test="position() > 1">&#160;|&#160;</xsl:if>
-          <a>
-            <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
-            <xsl:copy-of select="text()" />
-          </a>
-          <xsl:if test="position() = last()">&#160;]</xsl:if>
-        </xsl:for-each>
-      </span>
-    </xsl:if>
-    <!--xsl:copy-of select="text()" /-->
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <!-- this is not in use yet (see gtkdoc-mkdb
-  <xsl:template match="//refsect2/ulink[@role='extralinks']"/>
-  <xsl:template match="//refsect1/ulink[@role='extralinks']"/>
-
-  <xsl:template match="//refsect2/title">
-    <h3><xsl:call-template name="user.format.extralinks"/></h3>
-  </xsl:template>
-
-  <xsl:template match="//refsect1/title">
-    <h2><xsl:call-template name="user.format.extralinks"/></h2>
-  </xsl:template>
-  -->
-
-  <!-- ==================================================================== -->
-
-  <xsl:template match="acronym">
-    <xsl:call-template name="generate.acronym.link"/>
-  </xsl:template>
-
-  <xsl:template name="generate.acronym.link">
-    <xsl:param name="acronym">
-      <xsl:apply-templates/>
-    </xsl:param>
-    <!--
-      We use for-each to change context to the database document because key()
-      only locates elements in the same document as the context node!
-    -->
-
-    <xsl:param name="value" >
-      <xsl:value-of select="key('acronym.key', $acronym)/../glossdef/para[1]" />
-    </xsl:param>
-    <xsl:choose>
-      <xsl:when test="$value=''">
-        <!-- debug -->
-        <xsl:message>
-          In gtk-doc.xsl: For acronym (<xsl:value-of select="$acronym"/>) no value found!
-        </xsl:message>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:text>http://foldoc.org/</xsl:text>
-               <xsl:value-of select="$acronym"/>
-          </xsl:attribute>
-          <xsl:call-template name="inline.charseq"/>
-        </a>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- found -->
-        <acronym>
-          <xsl:attribute name="title">
-            <xsl:value-of select="$value"/>
-          </xsl:attribute>
-          <xsl:call-template name="inline.charseq"/>
-        </acronym>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/common/home.png b/docs/common/home.png
deleted file mode 100644 (file)
index 1700361..0000000
Binary files a/docs/common/home.png and /dev/null differ
diff --git a/docs/common/left.png b/docs/common/left.png
deleted file mode 100644 (file)
index 2d05b3d..0000000
Binary files a/docs/common/left.png and /dev/null differ
diff --git a/docs/common/right.png b/docs/common/right.png
deleted file mode 100644 (file)
index 92832e3..0000000
Binary files a/docs/common/right.png and /dev/null differ
diff --git a/docs/common/style.css b/docs/common/style.css
deleted file mode 100644 (file)
index e4e45ec..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-.synopsis, .classsynopsis
-{
-  /* tango:aluminium 1/2 */
-  background: #eeeeec;
-  border: solid 1px #d3d7cf;
-  padding: 0.5em;
-}
-.programlisting
-{
-  /* tango:sky blue 0/1 */
-  background: #e6f3ff;
-  border: solid 1px #729fcf;
-  padding: 0.5em;
-}
-.variablelist
-{
-  padding: 4px;
-  margin-left: 3em;
-}
-.variablelist td:first-child
-{
-  vertical-align: top;
-}
-
-@media screen {
-  sup a.footnote
-  {
-    position: relative;
-    top: 0em ! important;
-  }
-  /* this is needed so that the local anchors are displayed below the naviagtion */
-  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
-  {
-    display: inline-block;
-    position: relative;
-    top:-5em;
-  }
-  /* this seems to be a bug in the xsl style sheets when generating indexes */
-  div.index div.index
-  {
-    top: 0em;
-  }
-  /* make space for the fixed navigation bar and add space at the bottom so that
-   * link targets appear somewhat close to top
-   */
-  body
-  {
-    padding-top: 3.2em;
-    padding-bottom: 20em;
-  }
-  /* style and size the navigation bar */
-  table.navigation#top
-  {
-    position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
-    margin-top: 0;
-    margin-bottom: 0;
-    top: 0;
-    left: 0;
-    height: 3em;
-    z-index: 10;
-  }
-  .navigation a, .navigation a:visited
-  {
-    /* tango:scarlet red 3 */
-    color: #a40000;
-  }
-  .navigation a:hover
-  {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
-  }
-  td.shortcuts
-  {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
-    font-size: 80%;
-    white-space: nowrap;
-  }
-}
-@media print {
-  table.navigation {
-    visibility: collapse;
-    display: none;
-  }
-  div.titlepage table.navigation {
-    visibility: visible;
-    display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
-    margin-top: 0;
-    margin-bottom: 0;
-    top: 0;
-    left: 0;
-    height: 3em;
-  }
-}
-
-.navigation .title
-{
-  font-size: 200%;
-}
-
-div.gallery-float
-{
-  float: left;
-  padding: 10px;
-}
-div.gallery-float img
-{
-  border-style: none;
-}
-div.gallery-spacer
-{
-  clear: both;
-}
-
-a, a:visited
-{
-  text-decoration: none;
-  /* tango:sky blue 2 */
-  color: #3465a4;
-}
-a:hover
-{
-  text-decoration: underline;
-  /* tango:sky blue 1 */
-  color: #729fcf;
-}
-
-table p {
-  margin: 0
-}
-div.table table
-{
-  border-collapse: collapse;
-  border-spacing: 0px;
-  /* tango:aluminium 3 */
-  border: solid 1px #babdb6;
-}
-
-div.table table td, div.table table th
-{
-  /* tango:aluminium 3 */
-  border: solid 1px #babdb6;
-  padding: 3px;
-  vertical-align: top;
-}
-
-div.table table th
-{
-  /* tango:aluminium 2 */
-  background-color: #d3d7cf;
-}
-
-hr
-{
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
-  border: none 0px;
-  height: 1px;
-  clear: both;
-}
-
-.footer
-{
-  padding-top: 3.5em;
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  text-align: center;
-  font-size: 80%;
-}
-
-.warning
-{
-  /* tango:orange 0/1 */
-  background: #ffeed9;
-  border-color: #ffb04f;
-}
-.note
-{
-  /* tango:chameleon 0/0.5 */
-  background: #d8ffb2;
-  border-color: #abf562;
-}
-.note, .warning
-{
-  padding: 0.5em;
-  border-width: 1px;
-  border-style: solid;
-}
-.note h3, .warning h3
-{
-  margin-top: 0.0em
-}
-.note p, .warning p
-{
-  margin-bottom: 0.0em
-}
-
-/* blob links */
-h2 .extralinks, h3 .extralinks
-{
-  float: right;
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  font-size: 80%;
-  font-weight: normal;
-}
-
-.annotation
-{
-  /* tango:aluminium 5 */
-  color: #555753;
-  font-size: 80%;
-  font-weight: normal;
-}
-
-/* code listings */
-
-.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
-.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
-.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
-.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
-.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
-.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
-.listing_code .programlisting .normal     { color: #000000; }
-.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
-.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
-.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
-.listing_code .programlisting .type       { color: #000000; }
-.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
-.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
-
-.listing_frame {
-  /* tango:sky blue 1 */
-  border: solid 1px #729fcf;
-  padding: 0px;
-}
-
-.listing_lines, .listing_code {
-  margin-top: 0px;
-  margin-bottom: 0px;
-  padding: 0.5em;
-}
-.listing_lines {
-  /* tango:sky blue 0.5 */
-  background: #a6c5e3;
-  /* tango:aluminium 6 */
-  color: #2e3436;
-}
-.listing_code {
-  /* tango:sky blue 0 */
-  background: #e6f3ff;
-}
-.listing_code .programlisting {
-  /* override from previous */
-  border: none 0px;
-  padding: 0px;
-}
-.listing_lines pre, .listing_code pre {
-  margin: 0px;
-}
-
diff --git a/docs/common/up.png b/docs/common/up.png
deleted file mode 100644 (file)
index 85b3e2a..0000000
Binary files a/docs/common/up.png and /dev/null differ
diff --git a/docs/common/version-greater-or-equal.xsl b/docs/common/version-greater-or-equal.xsl
deleted file mode 100644 (file)
index 8edcd81..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0'?> <!--*- mode: xml -*-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
-                exclude-result-prefixes="#default">
- <xsl:template name="version-greater-or-equal">
-  <xsl:param name="ver1"></xsl:param>
-  <xsl:param name="ver2"></xsl:param>
-  <xsl:variable name="vp1">
-    <xsl:choose>
-      <xsl:when test="contains($ver1, '.')">
-        <xsl:value-of select="substring-before($ver1, '.')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$ver1"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="vp2">
-    <xsl:choose>
-      <xsl:when test="contains($ver2, '.')">
-        <xsl:value-of select="substring-before($ver2, '.')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$ver2"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$vp1 &gt; $vp2">
-      1
-    </xsl:when>
-    <xsl:when test="$vp1 &lt; $vp2">
-      0
-    </xsl:when>
-    <xsl:when test="$vp1 = $vp2">
-      <xsl:choose>
-        <xsl:when test="contains($ver1, '.') and contains($ver2, '.')">
-          <xsl:call-template name="version-greater-or-equal">
-            <xsl:with-param name="ver1" select="substring-after($ver1, '.')"/>
-            <xsl:with-param name="ver2" select="substring-after($ver2, '.')"/>
-          </xsl:call-template>
-       </xsl:when>
-        <xsl:when test="contains($ver2, '.')">
-          0
-       </xsl:when>
-       <xsl:otherwise>
-          1
-       </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-</xsl:stylesheet>
index a96bf86..1c26f32 100644 (file)
@@ -6,13 +6,12 @@ DOC_SOURCE_DIR=               $(abs_top_srcdir)/src/cpml
 SCANGOBJ_OPTIONS=
 SCAN_OPTIONS=          --ignore-decorators="CPML_GNUC_CONST" \
                        --rebuild-sections
-MKDB_OPTIONS=          --sgml-mode \
+MKDB_OPTIONS=          --name-space=cpml \
+                       --sgml-mode \
                        --output-format=xml \
                        --default-includes="$(DOC_MODULE)-1/$(DOC_MODULE).h"
 MKHTML_OPTIONS=
-HTML_OPTIONS=          --stringparam chunker.output.doctype-public '-//W3C//DTD XHTML 1.0 Strict//EN' \
-                       --stringparam chunker.output.doctype-system 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS=       $(EXTRA_DIR)
 HFILE_GLOB=            $(top_srcdir)/src/cpml/*.h
 CFILE_GLOB=            $(top_srcdir)/src/cpml/*.c
 IGNORE_HFILES=         cpml.h \
index 7ccaf30..15940f4 100644 (file)
     <xi:include href="xml/api-index-full.xml"/>
   </index>
 
+  <index id="Index-deprecated">
+    <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"/>
+  </index>
+
+  <index id="Index-1.0">
+    <title>Index of new symbols in 1.0</title>
+    <xi:include href="xml/api-index-1.0.xml"/>
+  </index>
+
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
 </book>
index b956aa7..6b8b2dd 100644 (file)
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adg 1.0.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-25 20:44+0100\n"
+"POT-Creation-Date: 2013-06-23 14:49+0200\n"
 "PO-Revision-Date: 2013-02-15 15:37+0100\n"
 "Last-Translator: Nicola Fontana <ntd@entidi.it>\n"
 "Language-Team: \n"
@@ -607,11 +607,11 @@ msgstr ""
 "Specifica come le trasformazioni locali dell'entità corrente e dei suoi "
 "progenitori devono essere combinate per ottenere la matrice locale"
 
-#: src/adg/adg-fill-style.c:106
+#: src/adg/adg-fill-style.c:107
 msgid "Pattern"
 msgstr "Pattern"
 
-#: src/adg/adg-fill-style.c:107
+#: src/adg/adg-fill-style.c:108
 msgid "The cairo pattern set for this entity"
 msgstr "Il pattern cairo impostato per questa entità"
 
index eb20a6f..9f8a5fe 100644 (file)
@@ -21,7 +21,7 @@
 /**
  * SECTION:adg-cairo-fallback
  * @title: Cairo wrappers
- * @short_description: GObject wrappers for cairo structs.
+ * @short_description: GObject wrappers for cairo structs
  *
  * If GObject support has not been compiled in cairo, either by
  * explicitely disabling it or because the installed cairo version
index 006668b..afea810 100644 (file)
@@ -22,7 +22,7 @@
  * SECTION:adg-dash
  * @Section_Id:AdgDash
  * @title: AdgDash
- * @short_description: Dash pattern for line stroking.
+ * @short_description: Dash pattern for line stroking
  *
  * The #AdgDash boxed type wraps the values needed by cairo to
  * univoquely identify a dash pattern, an array of positive values. Each
index 57eced5..5a10fdf 100644 (file)
@@ -20,8 +20,8 @@
 
 /**
  * SECTION:adg-gtk-area
- * @short_description: A #GtkWidget specifically designed to contain
- *                     an #AdgCanvas entity
+ * @short_description: A widget specifically designed to contain
+ *                     an ADG canvas
  *
  * This is a #GtkDrawingArea derived object that provides an easy way
  * to show an ADG based canvas. The associated canvas can be set
index 6921dc4..551cf9d 100644 (file)
@@ -20,8 +20,8 @@
 
 /**
  * SECTION:adg-gtk-area
- * @short_description: A #GtkWidget specifically designed to contain
- *                     an #AdgCanvas entity
+ * @short_description: A widget specifically designed to contain an
+ *                     ADG canvas
  *
  * This is a #GtkDrawingArea derived object that provides an easy way
  * to show an ADG based canvas. The associated canvas can be set
index 53f6076..042b455 100644 (file)
@@ -20,7 +20,7 @@
 
 /**
  * SECTION:adg-gtk-layout
- * @short_description: A scrollable #AdgGtkArea based widget
+ * @short_description: A scrollable AdgGtkArea based widget
  *
  * This is an #AdgGtkArea derived object with scrolling capabilities.
  * It means an #AdgGtkLayout object can be added directly to a
index 4af29b0..386977b 100644 (file)
@@ -20,7 +20,7 @@
 
 /**
  * SECTION:adg-gtk-layout
- * @short_description: A scrollable #AdgGtkArea based widget
+ * @short_description: A scrollable AdgGtkArea based widget
  *
  * This is an #AdgGtkArea derived object with scrolling capabilities.
  * It means an #AdgGtkLayout object can be added directly to a
index 059f086..bde6deb 100644 (file)
@@ -22,7 +22,7 @@
  * SECTION:adg-matrix
  * @Section_Id:Matrix
  * @title: Matrix
- * @short_description: #cairo_matrix_t enhancements and utilities.
+ * @short_description: cairo matrix enhancements and utilities
  *
  * The following functions augment the cairo_matrix_t available methods
  * providing some useful addition.
index 72f3203..6ee55e4 100644 (file)
@@ -22,7 +22,7 @@
  * SECTION:adg-param-dress
  * @Section_Id:AdgParamDress
  * @title: AdgParamDress
- * @short_description: Metadata for dress specification.
+ * @short_description: Metadata for dress specification
  *
  * The %ADG_TYPE_PARAM_DRESS type is a parameter specification
  * compatible with %G_TYPE_PARAM_ENUM that provides additional
index a235228..6cd94da 100644 (file)
@@ -20,7 +20,7 @@
 
 /**
  * SECTION:adg-ruled-fill
- * @short_description: A style composed of evenly spaced lines.
+ * @short_description: A style composed of evenly spaced lines
  *
  * The spacing between the lines could be changed using the
  * adg_ruled_fill_set_spacing() method. The angle of the lines should
index 9d446ea..df12100 100644 (file)
@@ -22,7 +22,7 @@
  * SECTION:adg-table-cell
  * @Section_Id:AdgTableCell
  * @title: AdgTableCell
- * @short_description: A single cell of an #AdgTable
+ * @short_description: A single cell of a table
  *
  * The #AdgTableCell is a boxed type, the basic component of an
  * #AdgTable entity. It must be added to an #AdgTableRow that,
index 1c4d235..cca3f9f 100644 (file)
@@ -20,7 +20,7 @@
 
 /**
  * SECTION:adg-trail
- * @short_description: A bare model built around #cairo_path_t
+ * @short_description: A bare model built around cairo path
  *
  * The #AdgTrail model is a really basic model built around the #cairo_path_t
  * struct: for a full fledged path model consider using #AdgPath.
index 233c2eb..d764c6d 100644 (file)
@@ -22,7 +22,7 @@
  * SECTION:cpml-gobject
  * @Section_Id:GObject
  * @title: GObject wrappers
- * @short_description: Collection of #GBoxed wrappers for CPML structs.
+ * @short_description: Collection of boxed wrappers for CPML structs
  *
  * These wrappers are supposed to make bindings development easier.
  * This file defines the wrappers and the functions needed for