[evince] Use new documentation infrastructure

[Javier JardÃn <jjardon src gnome org>]

commit 1e15a73af761fa898fb2de22e909b8cc0104d7e9
Author: Javier JardÃn <jjardon gnome org>
Date:   Sat Aug 11 00:54:56 2012 +0900

    Use new documentation infrastructure

 Makefile.am         |    4 ---
 configure.ac        |   24 +----------------------
 help/C/noprint.page |    2 +-
 help/Makefile.am    |   19 ++++++-----------
 help/evince.omf.in  |   11 ----------
 help/omf.make       |   53 ---------------------------------------------------
 shell/ev-window.c   |    4 +-
 7 files changed, 11 insertions(+), 106 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4217901..a971ede 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,6 @@ EXTRA_DIST = \
 	$(intltool_extra) \
 	$(header_DATA) \
 	autogen.sh \
-	gnome-doc-utils.make \
 	MAINTAINERS
 
 DISTCLEANFILES = 		\
@@ -81,10 +80,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/m4 \
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make \
 	$(srcdir)/gtk-doc.make \
-	$(srcdir)/gnome-doc-utils.make	\
 	$(srcdir)/po/Makefile.in.in \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
diff --git a/configure.ac b/configure.ac
index 41fb715..ead1254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -695,29 +695,7 @@ AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_
 # Help files
 # *****************
 
-GNOME_DOC_INIT([], gnome_doc_utils=yes, gnome_doc_utils=no)
-
-AC_ARG_ENABLE(help,
-    [AS_HELP_STRING([--disable-help], [Disable offline help files])],
-    [enable_help=$enableval],
-    [enable_help=yes])
-
-if test "x$enable_help" = "xyes" && test "x$os_win32" = "xyes" ; then
-    AC_MSG_WARN([Offline help is disabled (not implemented on Windows).])
-    enable_help=no
-fi
-
-if test "x$enable_help" = "xyes" && test "x$gnome_doc_utils" == "xno"; then
-    AC_MSG_ERROR(
-       [gnome-doc-utils not found; use --disable-help to disable help files]
-    )
-fi
-
-if test "x$enable_help" = "xyes"; then
-    AC_DEFINE([OFFLINE_HELP_ENABLED], [1], [Enable offline help])
-fi
-
-AM_CONDITIONAL(ENABLE_HELP, test "x$enable_help" = "xyes")
+YELP_HELP_INIT
 
 # *****************
 # API documentation
diff --git a/help/C/noprint.page b/help/C/noprint.page
index 079a120..5701705 100644
--- a/help/C/noprint.page
+++ b/help/C/noprint.page
@@ -41,7 +41,7 @@
    <item><p>Click on <gui>Print Test Page</gui>.  A page should be sent to your printer.</p>
 <note>
  <p>
-If this fails, see <link href="ghelp:gnome-help?printing">Printing help</link>.  You may also need to see your printer's manual to see what else you can do.
+If this fails, see <link href="help:gnome-help/printing">Printing help</link>.  You may also need to see your printer's manual to see what else you can do.
 </p>
 </note>
 
diff --git a/help/Makefile.am b/help/Makefile.am
index 208211f..2f9b559 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,14 +1,10 @@
-SUBDIRS = reference
-
-if ENABLE_HELP
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 
-DOC_ID = evince
-DOC_INCLUDES = legal.xml
+SUBDIRS = reference
 
-dist-hook: doc-dist-hook
+HELP_ID = evince
 
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/add-text-annotation.png		\
 	figures/annotations-navigate.png	\
 	figures/annotations-nav-to-page.png	\
@@ -24,7 +20,7 @@ DOC_FIGURES = \
 	figures/synctex_screencast.ogv		\
 	figures/zoom.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	annotation-properties.page	\
 	annotations-delete.page		\
 	annotations-disabled.page	\
@@ -63,6 +59,7 @@ DOC_PAGES = \
 	introduction.page		\
 	invert-colors.page		\
 	license.page			\
+	legal.xml			\
 	movingaround.page		\
 	noprint.page			\
 	openerror.page			\
@@ -93,8 +90,6 @@ DOC_PAGES = \
 	toolbar.page			\
 	translate.page
 
-DOC_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl hu id it ja lv nl oc pt_BR ru sl sr sv te uk vi zh_CN zh_HK zh_TW
-
-endif
+HELP_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl hu id it ja lv nl oc pt_BR ru sl sr sv te uk vi zh_CN zh_HK zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 7c636e1..4e38ff7 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -272,8 +272,8 @@ struct _EvWindowPrivate {
 #define MAX_RECENT_ITEM_LEN (40)
 
 #if OFFLINE_HELP_ENABLED
-#define EV_HELP         "ghelp:evince"
-#define EV_HELP_TOOLBAR "ghelp:evince?toolbar"
+#define EV_HELP         "help:evince"
+#define EV_HELP_TOOLBAR "help:evince/toolbar"
 #else
 #define EV_HELP         "http://library.gnome.org/users/evince/stable/";
 #define EV_HELP_TOOLBAR "http://library.gnome.org/users/evince/stable/toolbar.html";