From 875d1e5feef1c23dbd0d170d6171c3ee927a37ba Mon Sep 17 00:00:00 2001 From: Julien Louis Date: Fri, 1 Dec 2006 22:38:20 +0000 Subject: [PATCH] Documentation can now be built in pdf format --- configure.in | 2 ++ doc/de/Makefile.am | 18 ++++++++++++++++-- doc/de/weechat.de.xml | 2 +- doc/en/Makefile.am | 18 ++++++++++++++++-- doc/en/weechat.en.xml | 2 +- doc/fr/Makefile.am | 18 ++++++++++++++++-- doc/fr/weechat.fr.xml | 2 +- doc/fr/weechat_commands.xml | 2 +- weechat/configure.in | 2 ++ weechat/doc/de/Makefile.am | 18 ++++++++++++++++-- weechat/doc/de/weechat.de.xml | 2 +- weechat/doc/en/Makefile.am | 18 ++++++++++++++++-- weechat/doc/en/weechat.en.xml | 2 +- weechat/doc/fr/Makefile.am | 18 ++++++++++++++++-- weechat/doc/fr/weechat.fr.xml | 2 +- weechat/doc/fr/weechat_commands.xml | 2 +- 16 files changed, 108 insertions(+), 20 deletions(-) diff --git a/configure.in b/configure.in index 810c9bbe0..2a8f8e045 100644 --- a/configure.in +++ b/configure.in @@ -29,6 +29,7 @@ AC_PROG_CC AC_PROG_MAKE_SET AC_GNU_SOURCE AM_PROG_LIBTOOL +AC_CHECK_PROG(DBLATEX_FOUND, "dblatex", "yes") # Add some flags for some OS case "$host_os" in @@ -779,6 +780,7 @@ AM_CONDITIONAL(PLUGIN_ASPELL, test "$enable_aspell" = "yes") AM_CONDITIONAL(PLUGIN_CHARSET, test "$enable_charset" = "yes") AM_CONDITIONAL(HAVE_GNUTLS, test "$enable_gnutls" = "yes") AM_CONDITIONAL(HAVE_FLOCK, test "$enable_flock" = "yes") +AM_CONDITIONAL(DBLATEX_FOUND, test "$DBLATEX_FOUND" = "yes") AC_OUTPUT([Makefile doc/Makefile diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am index 8e5720c49..f3a12304d 100644 --- a/doc/de/Makefile.am +++ b/doc/de/Makefile.am @@ -22,9 +22,13 @@ QUICKSTART = weechat_quickstart.$(LANGCODE).txt EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART) +if DBLATEX_FOUND +PDF = pdf-stamp +endif + docdir = $(datadir)/doc/$(PACKAGE) -all-local: html-stamp +all-local: html-stamp $(PDF) # HTML output with chunks (many pages) @@ -48,16 +52,26 @@ html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc. cp ../weechat-doc.css html1/ touch html1-stamp +# PDF output + +pdf: pdf-stamp + +pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) + echo "`date '+%F %T'`" >date.xml + dblatex -c ../dblatex.conf $(BOOK).xml || true + touch pdf-stamp + # install docs install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ # clean clean-local: -rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml -rm -rf html/ html1/ - -rm -f html-stamp html1-stamp + -rm -f html-stamp html1-stamp pdf-stamp diff --git a/doc/de/weechat.de.xml b/doc/de/weechat.de.xml index 09972a9b0..9ee8998c5 100644 --- a/doc/de/weechat.de.xml +++ b/doc/de/weechat.de.xml @@ -1013,7 +1013,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Liste der Optionen für die Konfigurationsdatei: - + Option diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index 8ac87052a..aba7aa0d9 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -22,9 +22,13 @@ QUICKSTART = weechat_quickstart.$(LANGCODE).txt EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART) +if DBLATEX_FOUND +PDF = pdf-stamp +endif + docdir = $(datadir)/doc/$(PACKAGE) -all-local: html-stamp +all-local: html-stamp $(PDF) # HTML output with chunks (many pages) @@ -48,16 +52,26 @@ html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc. cp ../weechat-doc.css html1/ touch html1-stamp +# PDF output + +pdf: pdf-stamp + +pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) + echo "`date '+%F %T'`" >date.xml + dblatex -c ../dblatex.conf $(BOOK).xml || true + touch pdf-stamp + # install docs install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ # clean clean-local: -rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml -rm -rf html/ html1/ - -rm -f html-stamp html1-stamp + -rm -f html-stamp html1-stamp pdf-stamp diff --git a/doc/en/weechat.en.xml b/doc/en/weechat.en.xml index aa62d8df6..fd3f55483 100644 --- a/doc/en/weechat.en.xml +++ b/doc/en/weechat.en.xml @@ -1005,7 +1005,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA List of options for config file: - + Option diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am index 568a2fca7..7e30b92f8 100644 --- a/doc/fr/Makefile.am +++ b/doc/fr/Makefile.am @@ -22,9 +22,13 @@ QUICKSTART = weechat_quickstart.$(LANGCODE).txt EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART) +if DBLATEX_FOUND +PDF = pdf-stamp +endif + docdir = $(datadir)/doc/$(PACKAGE) -all-local: html-stamp +all-local: html-stamp $(PDF) # HTML output with chunks (many pages) @@ -48,16 +52,26 @@ html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc. cp ../weechat-doc.css html1/ touch html1-stamp +# PDF output + +pdf: pdf-stamp + +pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) + echo "`date '+%F %T'`" >date.xml + dblatex -c ../dblatex.conf $(BOOK).xml || true + touch pdf-stamp + # install docs install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ # clean clean-local: -rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml -rm -rf html/ html1/ - -rm -f html-stamp html1-stamp + -rm -f html-stamp html1-stamp pdf-stamp diff --git a/doc/fr/weechat.fr.xml b/doc/fr/weechat.fr.xml index 50f55f7e5..c25b990e3 100644 --- a/doc/fr/weechat.fr.xml +++ b/doc/fr/weechat.fr.xml @@ -1019,7 +1019,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Liste des options du fichier de configuration : - + Option diff --git a/doc/fr/weechat_commands.xml b/doc/fr/weechat_commands.xml index c6d9b5b91..a2b126fa2 100644 --- a/doc/fr/weechat_commands.xml +++ b/doc/fr/weechat_commands.xml @@ -218,7 +218,7 @@ gestion des fen list: liste les fenêtres ouvertes (pas de paramètre affiche cette liste) -1: saute à la fenêtre précédente +1: saute à la fenêtre suivante - b#: saute à la fenêtre affichant le tampon n°# + b#: saute à la fenêtre affichant le tampon # up: saute à la fenêtre au dessus down: saute à la fenêtre au dessous left: saute à la fenêtre à gauche diff --git a/weechat/configure.in b/weechat/configure.in index 810c9bbe0..2a8f8e045 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -29,6 +29,7 @@ AC_PROG_CC AC_PROG_MAKE_SET AC_GNU_SOURCE AM_PROG_LIBTOOL +AC_CHECK_PROG(DBLATEX_FOUND, "dblatex", "yes") # Add some flags for some OS case "$host_os" in @@ -779,6 +780,7 @@ AM_CONDITIONAL(PLUGIN_ASPELL, test "$enable_aspell" = "yes") AM_CONDITIONAL(PLUGIN_CHARSET, test "$enable_charset" = "yes") AM_CONDITIONAL(HAVE_GNUTLS, test "$enable_gnutls" = "yes") AM_CONDITIONAL(HAVE_FLOCK, test "$enable_flock" = "yes") +AM_CONDITIONAL(DBLATEX_FOUND, test "$DBLATEX_FOUND" = "yes") AC_OUTPUT([Makefile doc/Makefile diff --git a/weechat/doc/de/Makefile.am b/weechat/doc/de/Makefile.am index 8e5720c49..f3a12304d 100644 --- a/weechat/doc/de/Makefile.am +++ b/weechat/doc/de/Makefile.am @@ -22,9 +22,13 @@ QUICKSTART = weechat_quickstart.$(LANGCODE).txt EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART) +if DBLATEX_FOUND +PDF = pdf-stamp +endif + docdir = $(datadir)/doc/$(PACKAGE) -all-local: html-stamp +all-local: html-stamp $(PDF) # HTML output with chunks (many pages) @@ -48,16 +52,26 @@ html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc. cp ../weechat-doc.css html1/ touch html1-stamp +# PDF output + +pdf: pdf-stamp + +pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) + echo "`date '+%F %T'`" >date.xml + dblatex -c ../dblatex.conf $(BOOK).xml || true + touch pdf-stamp + # install docs install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ # clean clean-local: -rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml -rm -rf html/ html1/ - -rm -f html-stamp html1-stamp + -rm -f html-stamp html1-stamp pdf-stamp diff --git a/weechat/doc/de/weechat.de.xml b/weechat/doc/de/weechat.de.xml index 09972a9b0..9ee8998c5 100644 --- a/weechat/doc/de/weechat.de.xml +++ b/weechat/doc/de/weechat.de.xml @@ -1013,7 +1013,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Liste der Optionen für die Konfigurationsdatei: - + Option diff --git a/weechat/doc/en/Makefile.am b/weechat/doc/en/Makefile.am index 8ac87052a..aba7aa0d9 100644 --- a/weechat/doc/en/Makefile.am +++ b/weechat/doc/en/Makefile.am @@ -22,9 +22,13 @@ QUICKSTART = weechat_quickstart.$(LANGCODE).txt EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART) +if DBLATEX_FOUND +PDF = pdf-stamp +endif + docdir = $(datadir)/doc/$(PACKAGE) -all-local: html-stamp +all-local: html-stamp $(PDF) # HTML output with chunks (many pages) @@ -48,16 +52,26 @@ html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc. cp ../weechat-doc.css html1/ touch html1-stamp +# PDF output + +pdf: pdf-stamp + +pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) + echo "`date '+%F %T'`" >date.xml + dblatex -c ../dblatex.conf $(BOOK).xml || true + touch pdf-stamp + # install docs install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ # clean clean-local: -rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml -rm -rf html/ html1/ - -rm -f html-stamp html1-stamp + -rm -f html-stamp html1-stamp pdf-stamp diff --git a/weechat/doc/en/weechat.en.xml b/weechat/doc/en/weechat.en.xml index aa62d8df6..fd3f55483 100644 --- a/weechat/doc/en/weechat.en.xml +++ b/weechat/doc/en/weechat.en.xml @@ -1005,7 +1005,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA List of options for config file: - + Option diff --git a/weechat/doc/fr/Makefile.am b/weechat/doc/fr/Makefile.am index 568a2fca7..7e30b92f8 100644 --- a/weechat/doc/fr/Makefile.am +++ b/weechat/doc/fr/Makefile.am @@ -22,9 +22,13 @@ QUICKSTART = weechat_quickstart.$(LANGCODE).txt EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART) +if DBLATEX_FOUND +PDF = pdf-stamp +endif + docdir = $(datadir)/doc/$(PACKAGE) -all-local: html-stamp +all-local: html-stamp $(PDF) # HTML output with chunks (many pages) @@ -48,16 +52,26 @@ html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc. cp ../weechat-doc.css html1/ touch html1-stamp +# PDF output + +pdf: pdf-stamp + +pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) + echo "`date '+%F %T'`" >date.xml + dblatex -c ../dblatex.conf $(BOOK).xml || true + touch pdf-stamp + # install docs install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ + $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ # clean clean-local: -rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml -rm -rf html/ html1/ - -rm -f html-stamp html1-stamp + -rm -f html-stamp html1-stamp pdf-stamp diff --git a/weechat/doc/fr/weechat.fr.xml b/weechat/doc/fr/weechat.fr.xml index 50f55f7e5..c25b990e3 100644 --- a/weechat/doc/fr/weechat.fr.xml +++ b/weechat/doc/fr/weechat.fr.xml @@ -1019,7 +1019,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Liste des options du fichier de configuration : - + Option diff --git a/weechat/doc/fr/weechat_commands.xml b/weechat/doc/fr/weechat_commands.xml index c6d9b5b91..a2b126fa2 100644 --- a/weechat/doc/fr/weechat_commands.xml +++ b/weechat/doc/fr/weechat_commands.xml @@ -218,7 +218,7 @@ gestion des fen list: liste les fenêtres ouvertes (pas de paramètre affiche cette liste) -1: saute à la fenêtre précédente +1: saute à la fenêtre suivante - b#: saute à la fenêtre affichant le tampon n°# + b#: saute à la fenêtre affichant le tampon # up: saute à la fenêtre au dessus down: saute à la fenêtre au dessous left: saute à la fenêtre à gauche