From a376fe3ac33770d7bf7195f6848132097ed1151c Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 29 Sep 2017 11:04:00 +0900 Subject: [PATCH] Imported Upstream version 1.21 Change-Id: I6c641dd0c8e1e9e0d8e1c4c146635c5b8b07d48f Signed-off-by: DongHun Kwak --- Makefile.am | 9 +- Makefile.in | 26 +- NEWS | 39 + TODO | 77 +- configure | 30 +- configure.ac | 11 +- gtk-doc.spec | 2 +- gtk-doc.xsl | 26 +- gtkdoc-fixxref.in | 28 +- gtkdoc-mkdb.in | 308 ++-- gtkdoc-scan.in | 15 +- gtkdoc-scanobj.in | 580 ------- help/manual/C/index.docbook | 300 ++-- help/manual/Makefile.am | 6 +- help/manual/Makefile.in | 6 +- help/manual/bn_IN/index.docbook | 299 ++-- help/manual/de/index.docbook | 375 ++--- help/manual/el/el.po | 1700 +++++++++++--------- help/manual/el/fdl-appendix.xml | 2 +- help/manual/el/index.docbook | 497 ++---- help/manual/en_GB/index.docbook | 280 ++-- help/manual/es/es.po | 1642 +++++++++++-------- help/manual/es/index.docbook | 214 +-- help/manual/fr/fr.po | 2 +- help/manual/fr/index.docbook | 383 ++--- help/manual/gu/index.docbook | 292 ++-- help/manual/pt_BR/index.docbook | 337 +--- help/manual/pt_BR/pt_BR.po | 1422 ++++++++-------- help/manual/sl/index.docbook | 308 ++-- help/manual/sv/index.docbook | 308 ++-- help/manual/ta/index.docbook | 284 ++-- help/manual/te/index.docbook | 282 ++-- help/manual/zh_CN/index.docbook | 412 ++--- style/style.css | 291 ++-- tests/annotations/docs/tester-sections.txt | 5 + tests/annotations/src/tester.c | 78 +- tests/annotations/src/tester.h | 26 +- tests/bugs/docs/tester-sections.txt | 3 + tests/bugs/src/tester.c | 2 +- tests/bugs/src/tester.h | 39 +- tests/gobject/docs/tester-sections.txt | 2 + tests/gobject/src/gobject.h | 13 + 42 files changed, 4854 insertions(+), 6107 deletions(-) delete mode 100755 gtkdoc-scanobj.in diff --git a/Makefile.am b/Makefile.am index ae030df..a236d18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,6 @@ bin_SCRIPTS = \ gtkdoc-rebase \ gtkdoc-scan \ gtkdoc-scangobj \ - gtkdoc-scanobj \ gtkdocize if HAVE_PYTHON @@ -83,7 +82,12 @@ EXTRA_DIST = \ tools/gtk-doc.el \ COPYING-DOCS +CLEANFILES = \ + gtk-doc.flat.make \ + gtk-doc.notmpl-flat.make + MAINTAINERCLEANFILES = \ + build-aux \ $(srcdir)/INSTALL \ $(srcdir)/COPYING \ $(srcdir)/aclocal.m4 \ @@ -104,7 +108,8 @@ MAINTAINERCLEANFILES = \ GITIGNOREFILES = \ RELNOTES.txt \ - ChangeLog-?.?? + ChangeLog-?.?? \ + gtk-doc-*.tar.xz -include $(top_srcdir)/git.mk diff --git a/Makefile.in b/Makefile.in index 92e6d50..a4ed9fa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,11 +48,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/gtkdoc-mkhtml.in $(srcdir)/gtkdoc-mkman.in \ $(srcdir)/gtkdoc-mkpdf.in $(srcdir)/gtkdoc-mktmpl.in \ $(srcdir)/gtkdoc-rebase.in $(srcdir)/gtkdoc-scan.in \ - $(srcdir)/gtkdoc-scangobj.in $(srcdir)/gtkdoc-scanobj.in \ - $(srcdir)/gtkdocize.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO build-aux/config.guess \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/ltmain.sh build-aux/missing + $(srcdir)/gtkdoc-scangobj.in $(srcdir)/gtkdocize.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + TODO build-aux/config.guess build-aux/config.sub \ + build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ + build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \ $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \ @@ -68,7 +68,7 @@ CONFIG_CLEAN_FILES = gtk-doc.pc gtk-doc.dsl gtk-doc.spec gtk-doc.cat \ gtkdoc-common.pl gtkdoc-check gtkdoc-depscan gtkdoc-fixxref \ gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkman gtkdoc-mkpdf \ gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj \ - gtkdoc-scanobj gtkdocize + gtkdocize CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -318,8 +318,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = help tests bin_SCRIPTS = gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml \ gtkdoc-mkman gtkdoc-mkpdf gtkdoc-mktmpl gtkdoc-rebase \ - gtkdoc-scan gtkdoc-scangobj gtkdoc-scanobj gtkdocize \ - $(am__append_1) + gtkdoc-scan gtkdoc-scangobj gtkdocize $(am__append_1) gtkdocdatadir = $(datadir)/gtk-doc/data gtkdocdata_DATA = \ gtkdoc-common.pl \ @@ -372,7 +371,12 @@ EXTRA_DIST = \ tools/gtk-doc.el \ COPYING-DOCS +CLEANFILES = \ + gtk-doc.flat.make \ + gtk-doc.notmpl-flat.make + MAINTAINERCLEANFILES = \ + build-aux \ $(srcdir)/INSTALL \ $(srcdir)/COPYING \ $(srcdir)/aclocal.m4 \ @@ -393,7 +397,8 @@ MAINTAINERCLEANFILES = \ GITIGNOREFILES = \ RELNOTES.txt \ - ChangeLog-?.?? + ChangeLog-?.?? \ + gtk-doc-*.tar.xz all: all-recursive @@ -464,8 +469,6 @@ gtkdoc-scan: $(top_builddir)/config.status $(srcdir)/gtkdoc-scan.in cd $(top_builddir) && $(SHELL) ./config.status $@ gtkdoc-scangobj: $(top_builddir)/config.status $(srcdir)/gtkdoc-scangobj.in cd $(top_builddir) && $(SHELL) ./config.status $@ -gtkdoc-scanobj: $(top_builddir)/config.status $(srcdir)/gtkdoc-scanobj.in - cd $(top_builddir) && $(SHELL) ./config.status $@ gtkdocize: $(top_builddir)/config.status $(srcdir)/gtkdocize.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-binSCRIPTS: $(bin_SCRIPTS) @@ -960,6 +963,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) diff --git a/NEWS b/NEWS index e9cb2e2..05b4e74 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,42 @@ +GTK-Doc 1.21 (Jul 17 2014) +============ + + Important notice - starting with the next release these long deprecated + features will be removed, please write to gtk-doc-list@gnome.org and tell us + your concerns: + o gtkdoc-mktmpl - please move all the comments into the sources. + o generating html via sgml tools (jade/openjade), using xsltproc and + docbook-xslt is pretty common and preferred since version 1.6 + + Changes + + o 170860 : gtk-doc should have definitions for stability + o 644111 : one cannot specify against which libs gtkdoc-fixxref should resolve links (problematic with multiple versions) + o 657444 : " enum foo { ... } " ; not recognized + o 671519 : Self-test relies on nonportable (GNU enhanced) 'date' command + o 678094 : the word " returns " in a function description can be parsed as the " Returns: " section + o 722621 : gtk-doc tarball was created with 32bit uid/gid, unusable with mingw/msys tar + o 724739 : Self-test fail: gtkdoc-mkdb misusing perl datatype + o 725505 : new syntax highlighting for code is weird + o 725663 : configure: non POSIX test usage + o 730658 : Deprecation warning for non-deprecated type GParamFlags + o 730777 : Add support for nullable and optional annotations + + Contributors + + Christophe Fergeau + Damon Chaplin + Daniel Macks + Daniel Mustieles + Emmanuele Bassi + maria thukididu + Naohiro Aota + Philip Withnall + Rafael Ferreira + Stefan Sauer + Thomas Wood + William Jon McCann + GTK-Doc 1.20 (Feb 16 2014) ============ diff --git a/TODO b/TODO index 66e5474..1b3c576 100644 --- a/TODO +++ b/TODO @@ -133,13 +133,6 @@ libs can benefit from the extensions too. * need to check if we can pass the style-sheet class as a parameter (--stringparam gtkdoc.stylesheet=(chunk|docbook)) * we might also need to reflow some things, as gtk-doc.xsl also runs the devhelp/devhelp2 generation - but then the urls in the devhelp file, refer to the chunked html anyway -* rtf - ~/download/fop-0.94/fop -fo tester-docs.fo -rtf tester-docs.rtf - * unrtf - unrtf -t ps tester-docs.rtf >tester-docs.ps - unrtf -t latex tester-docs.rtf >tester-docs.tex - - bad output - = Warnings = Bugzilla has some requests for extra warnings. We should support a common @@ -167,14 +160,6 @@ more warnings: from the symbol. - possible xrefs (e.g. adding a # or () would make it a successful xref) - -= Markup = -* protected scope - * we can have /* < protected > */ in classes - * we can have in -section.txt - * ideally we have Scope: {Public, Protected, Private} supported in doc comments - * there is a bg for gir, https://bugzilla.gnome.org/show_bug.cgi?id=594125 - = GIR = == scanning == * ideas @@ -207,16 +192,13 @@ more warnings: * need to get existing python/~mm docs to use it, gtk-doc could output language=C for own docs -== installation == +=== installation === * need to install each book with a prefix * would be good to have a language attribute in book tag to allow filter by language * look at /usr/share/gtk-doc/html/pygobject/index.html -= docbook xml = -Its tedious to write large amounts of docbook. - -== more macros == += external processors = We need parametric, user definable macros. |[ ... ]| - programlistings |macro(arg1,arg2,...)[ ... ]| - call macro @@ -227,7 +209,7 @@ We need parametric, user definable macros. - get output on stdout or file - and replace the macro with it The changes could be made in gtkdoc-mkdb::ExpandAbbreviations() -=== example macros === +== example macros == |highlight(c)[...]| - highlight source code for a specific language (c) - what will this output? preformatted html to be xincluded? - we could have macros for each format, the docbook xml macro would leave @@ -236,48 +218,14 @@ The changes could be made in gtkdoc-mkdb::ExpandAbbreviations() |ditta(svg)[...]| - parse ascii art and include result as mediaobject (in svg format) - we need to generate a filename for the image or use anoter parameter -=== where to define macros === +== where to define macros == * system wide and with the package, /share/gtk-doc/macros, $(srcdir) * prefix for custom macros? * we could require stdin for input and stdout for output, the wrapper for the actual tool can ensure the convention -== asciidoc as a frontend == -Can we offer integration with asciidoc (http://www.methods.co.nz/asciidoc/)? -This way the master document could be written much easier. It would be cool if -we could use the asciidoc markup in source-comments also. - -== extract other bits and pieces == -=== library api == -gtkdoc-scan could be obsoleted and gtkdoc-mkdb would build docbook fragemnts for -api docs and their indexes -=== DBUs Interfaces === -http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html -http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus -=== GConf schemas === - -=== Wiki imports === - - = styling = -== source code examples== -http://bugzilla.gnome.org/show_bug.cgi?id=536928 -We could also run a postprocessing script in gtkdoc-mkhtml/gtkdoc-fixxref - -tools: - source-highlight (/usr/bin/source-highlight) - source-highlight -itests/gobject/examples/gobject.c -o$HOME/temp/gobject.html -n -t4 -sc - source-highlight -itests/gobject/examples/gobject.c -o$HOME/temp/gobject.html -n -t4 -sc -cstyle.css --no-doc - source-highlight -itests/gobject/examples/gobject.c -o$HOME/temp/gobject.xml -n -t4 -sc -f docbook - - highlight -itests/gobject/examples/gobject.c -o$HOME/temp/gobject.xml -l -X -f -j2 - -some tips about styling code listings in html -http://www.tjkdesign.com/articles/how_to_style_a_code_listing.asp - -=== process docbook === -if we highlight to docbook, we just get emphasis (bold) === process html === if we highlight to html we get colors, we need to check what tags we should process though: 
 is used for all code boxes.
@@ -302,9 +250,20 @@ could we write small html files for each object for methods, signals and propert
 could we do that using javascript and some other magic?
 
 
-= syntax =
+= Markup =
+== tags ==
+* to document the api-life cycle we have: since, deprecated and stability:
+* other things we might want to specify:
+  * multi-threading safety: mt-safe, use-with-lock 
+
+== protected scope ==
+* we can have /* < protected > */ in classes
+* we can have  in -section.txt
+* ideally we have Scope: {Public, Protected, Private} supported in doc comments
+* there is a bug for gir, https://bugzilla.gnome.org/show_bug.cgi?id=594125
+
 == wildcards in symbol names ==
-Somtimes one defines a set of function and macros with very simillar purpose, e.g.
+Sometimes one defines a set of function and macros with very similar purpose, e.g.
 READ_INT8, READ_INT16, READ_INT32. It would be great to allow documenting a symbol
 READ_INT* instead of 3 docs which are copy'n'pasted anyway. In the output we will have
 all matching declarations in one source listing. Multiple wildcards are okay.
@@ -315,7 +274,7 @@ all matching declarations in one source listing. Multiple wildcards are okay.
   * structure
   * docbook markup (part/chapter structure)
 * structure
-  Sugested structure for api-docs.
+  Suggested structure for api-docs.
   Idea is to have more content that api reference. It would be good to have a
   gnome-platform document in devhelp, so that we could xref that instead of
   explaining 100 times how to use pkg-config.
diff --git a/configure b/configure
index a86d4c4..8f15e1b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gtk-doc 1.20.
+# Generated by GNU Autoconf 2.68 for gtk-doc 1.21.
 #
 # Report bugs to .
 #
@@ -571,8 +571,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gtk-doc'
 PACKAGE_TARNAME='gtk-doc'
-PACKAGE_VERSION='1.20'
-PACKAGE_STRING='gtk-doc 1.20'
+PACKAGE_VERSION='1.21'
+PACKAGE_STRING='gtk-doc 1.21'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc'
 PACKAGE_URL=''
 
@@ -1351,7 +1351,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gtk-doc 1.20 to adapt to many kinds of systems.
+\`configure' configures gtk-doc 1.21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1421,7 +1421,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gtk-doc 1.20:";;
+     short | recursive ) echo "Configuration of gtk-doc 1.21:";;
    esac
   cat <<\_ACEOF
 
@@ -1544,7 +1544,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gtk-doc configure 1.20
+gtk-doc configure 1.21
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1822,7 +1822,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gtk-doc $as_me 1.20, which was
+It was created by gtk-doc $as_me 1.21, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2641,7 +2641,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gtk-doc'
- VERSION='1.20'
+ VERSION='1.21'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12542,8 +12542,8 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether date can output nanoseconds" >&5
 $as_echo_n "checking whether date can output nanoseconds... " >&6; }
-date +%s.%N | grep -q '%N'
-if test "$?" == "1"; then
+date +%s.%N | grep -q 'N'
+if test "$?" = "1"; then
   TS_FMT="+%s.%N"
   ELAPSED_FMT="+%H:%M:%S.%N"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -12560,7 +12560,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether date can format dates" >&5
 $as_echo_n "checking whether date can format dates... " >&6; }
 date >/dev/null 2>&1 --utc --date @1.1 $ELAPSED_FMT
-if test "$?" == "0"; then
+if test "$?" = "0"; then
   DATE_FMT_CMD="date --utc $ELAPSED_FMT --date @0"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -12886,8 +12886,6 @@ ac_config_files="$ac_config_files gtkdoc-scan"
 
 ac_config_files="$ac_config_files gtkdoc-scangobj"
 
-ac_config_files="$ac_config_files gtkdoc-scanobj"
-
 ac_config_files="$ac_config_files gtkdocize"
 
 ac_config_files="$ac_config_files tests/tools.sh"
@@ -13482,7 +13480,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gtk-doc $as_me 1.20, which was
+This file was extended by gtk-doc $as_me 1.21, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13539,7 +13537,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gtk-doc config.status 1.20
+gtk-doc config.status 1.21
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -13972,7 +13970,6 @@ do
     "gtkdoc-rebase") CONFIG_FILES="$CONFIG_FILES gtkdoc-rebase" ;;
     "gtkdoc-scan") CONFIG_FILES="$CONFIG_FILES gtkdoc-scan" ;;
     "gtkdoc-scangobj") CONFIG_FILES="$CONFIG_FILES gtkdoc-scangobj" ;;
-    "gtkdoc-scanobj") CONFIG_FILES="$CONFIG_FILES gtkdoc-scanobj" ;;
     "gtkdocize") CONFIG_FILES="$CONFIG_FILES gtkdocize" ;;
     "tests/tools.sh") CONFIG_FILES="$CONFIG_FILES tests/tools.sh" ;;
 
@@ -15140,7 +15137,6 @@ fi
     "gtkdoc-rebase":F) chmod +x gtkdoc-rebase ;;
     "gtkdoc-scan":F) chmod +x gtkdoc-scan ;;
     "gtkdoc-scangobj":F) chmod +x gtkdoc-scangobj ;;
-    "gtkdoc-scanobj":F) chmod +x gtkdoc-scanobj ;;
     "gtkdocize":F) chmod +x gtkdocize ;;
     "tests/tools.sh":F) chmod +x tests/tools.sh ;;
 
diff --git a/configure.ac b/configure.ac
index 600763a..e7da82c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl Use a simple 2-digit version number for a while, since our old example
 dnl Makefile can only cope with that, i.e. use 1.1, 1.2, 1.3 ... 9.9.
 dnl FIXME: I can't see anything failing (1.14.1), lets try to use a three digit
 dnl number for the development version
-m4_define(gtk_doc_version, 1.20)
+m4_define(gtk_doc_version, 1.21)
 
 AC_INIT([gtk-doc],[gtk_doc_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc],[gtk-doc])
 
@@ -210,9 +210,11 @@ fi
 AC_SUBST(TRACE)
 
 dnl check what date format we can use for the makefile tracing in tests
+dnl this is mostly to detect the date command on macosx that is quite cripled
+dnl  and broken too
 AC_MSG_CHECKING(whether date can output nanoseconds)
-date +%s.%N | grep -q '%N'
-if test "$?" == "1"; then
+date +%s.%N | grep -q 'N'
+if test "$?" = "1"; then
   TS_FMT="+%s.%N"
   ELAPSED_FMT="+%H:%M:%S.%N"
   AC_MSG_RESULT(yes)
@@ -226,7 +228,7 @@ AC_SUBST(ELAPSED_FMT)
 
 AC_MSG_CHECKING(whether date can format dates)
 date >/dev/null 2>&1 --utc --date @1.1 $ELAPSED_FMT
-if test "$?" == "0"; then
+if test "$?" = "0"; then
   DATE_FMT_CMD="date --utc $ELAPSED_FMT --date @0"
   AC_MSG_RESULT(yes)
 else
@@ -291,7 +293,6 @@ AC_CONFIG_FILES([gtkdoc-mktmpl],   [chmod +x gtkdoc-mktmpl])
 AC_CONFIG_FILES([gtkdoc-rebase],   [chmod +x gtkdoc-rebase])
 AC_CONFIG_FILES([gtkdoc-scan],     [chmod +x gtkdoc-scan])
 AC_CONFIG_FILES([gtkdoc-scangobj], [chmod +x gtkdoc-scangobj])
-AC_CONFIG_FILES([gtkdoc-scanobj],  [chmod +x gtkdoc-scanobj])
 AC_CONFIG_FILES([gtkdocize],       [chmod +x gtkdocize])
 AC_CONFIG_FILES([tests/tools.sh],  [chmod +x tests/tools.sh])
 AC_OUTPUT
diff --git a/gtk-doc.spec b/gtk-doc.spec
index 3b3895d..ee9bc11 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -2,7 +2,7 @@
 
 Summary: 	GTK+ DocBook Documentation Generator
 Name: 		gtk-doc
-Version: 	1.20
+Version: 	1.21
 Release: 	1
 License: 	GPL
 Group: 		Utilities/Text
diff --git a/gtk-doc.xsl b/gtk-doc.xsl
index b3a9b49..3427e0f 100644
--- a/gtk-doc.xsl
+++ b/gtk-doc.xsl
@@ -467,7 +467,7 @@ Get a newer version at http://docbook.sourceforge.net/projects/xsl/
 
     
       
+             summary = "Navigation header" cellpadding="2" cellspacing="5">