File yelp-suse-20060319.patch of Package yelp

Overview Repositories Revisions Requests Users Attributes Meta

File yelp-suse-20060319.patch of Package yelp (Revision 9b9ad415c47480b2ec83545edf57e72a)

Currently displaying revision 9b9ad415c47480b2ec83545edf57e72a , Show latest

diff -upr yelp-2.18.1-pre/configure.in yelp-2.18.1-post/configure.in
--- yelp-2.18.1-pre/configure.in	2007-04-09 11:46:52.000000000 -0500
+++ yelp-2.18.1-post/configure.in	2007-09-14 10:39:24.000000000 -0500
@@ -73,10 +73,11 @@ PKG_CHECK_MODULES(YELP,
 	libglade-2.0 >= 2.0.0
 	libgnome-2.0 >= 2.14.0
 	libgnomeui-2.0 >= 2.14.0
-	libxml-2.0 >= 2.6.5
-	libxslt >= 1.1.4
+	libxml-2.0 >= 2.6.0
+	libxslt >= 1.1.1
 	libexslt >= 0.8.1
 	libstartup-notification-1.0 >= 0.8
+	libgnome-menu >= 2.11.1
 	dbus-glib-1
 ])
 AC_SUBST([YELP_CFLAGS])
diff -upr yelp-2.18.1-pre/data/icons/Makefile.am yelp-2.18.1-post/data/icons/Makefile.am
--- yelp-2.18.1-pre/data/icons/Makefile.am	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/data/icons/Makefile.am	2007-09-14 10:39:24.000000000 -0500
@@ -14,6 +14,7 @@ icon_DATA = 						\
 	yelp-watermark-blockquote-00BB.png		\
 	yelp-watermark-blockquote-201C.png		\
 	yelp-watermark-blockquote-201D.png		\
-	yelp-watermark-blockquote-201E.png
+	yelp-watermark-blockquote-201E.png		\
+	help-title.png
 
 EXTRA_DIST = $(icon_DATA) $(icon192_DATA)
diff -upr yelp-2.18.1-pre/data/yelp.js yelp-2.18.1-post/data/yelp.js
--- yelp-2.18.1-pre/data/yelp.js	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/data/yelp.js	2007-09-14 10:39:24.000000000 -0500
@@ -81,6 +81,50 @@ var slt = {
   }
 }
 
+function createCookie(name,value,days)
+{
+        if (days)
+        {
+                var date = new Date();
+                date.setTime(date.getTime()+(days*24*60*60*1000));
+                var expires = "; expires="+date.toGMTString();
+        }
+        else var expires = "";
+        document.cookie = name+"="+value+expires+"; path=/";
+}
+
+function load_hidden ()
+{
+    var ca = document.cookie.split(';');
+    for (var i=0; i < ca.length; i++) {
+        var c = ca[i];
+        while (c.charAt(0)==' ') c = c.substring(1,c.length);
+        if (c.indexOf('display:') == 0) {
+            var colon = c.indexOf(':');
+            var equal = c.indexOf('=');
+
+            var id = c.substring (colon + 1, equal);
+            var value = c.substring (equal + 1);
+
+            document.getElementById (id).style.display = value;
+        }
+    }
+}
+
+function show_hide (id)
+{
+    var element = document.getElementById (id + '-children');
+    if (element.style.display == "none") {
+        element.style.display = "block";
+        createCookie ('display:' + id + '-children', "block", 1000);
+    } else {
+        element.style.display = "none";
+        createCookie ('display:' + id + '-children', "none", 1000);
+    }
+}
+
+window.addEventListener("DOMContentLoaded",load_hidden,false);
+
 /* addEventListener() is Gecko-only, but so is yelp */
 window.addEventListener("load",slt.init,false);
 /* load doesn't seem to get fired in Yelp.  I might need to tell Gecko
diff -upr yelp-2.18.1-pre/src/yelp-db-pager.c yelp-2.18.1-post/src/yelp-db-pager.c
--- yelp-2.18.1-pre/src/yelp-db-pager.c	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-db-pager.c	2007-09-14 10:39:24.000000000 -0500
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <libxml/parser.h>
@@ -76,6 +77,7 @@ struct _DBWalker {
     gint depth;
     gint max_depth;
 
+    gchar *path;
 };
 
 static void           db_pager_class_init   (YelpDBPagerClass *klass);
@@ -251,6 +253,7 @@ db_pager_parse (YelpPager *pager)
     walker->pager     = YELP_DB_PAGER (pager);
     walker->doc       = doc;
     walker->cur       = xmlDocGetRootElement (walker->doc);
+    walker->path      = g_path_get_dirname (filename);
 
     if (!xmlStrcmp (xmlDocGetRootElement (doc)->name, BAD_CAST "book"))
 	priv->max_depth = walker->max_depth = BOOK_CHUNK_DEPTH;
@@ -273,6 +276,8 @@ db_pager_parse (YelpPager *pager)
     walker_walk_xml (walker);
 
  done:
+    if (walker)
+	g_free (walker->path);
     g_free (walker);
 
     g_free (filename);
@@ -386,6 +391,7 @@ walker_walk_xml (DBWalker *walker)
     GtkTreeIter  iter;
     GtkTreeIter *old_iter = NULL;
     YelpDBPagerPriv *priv = walker->pager->priv;
+    xmlChar     *fileref;
 
     /* check for the yelp:chunk-depth processing instruction and set 
      * the max chunk depth accordingly */
@@ -407,6 +413,55 @@ walker_walk_xml (DBWalker *walker)
 	id = xmlStrdup (BAD_CAST "__yelp_toc");
     }
 
+    /* If an external file is not available in the current language, try to fall back
+     * to English. This heuristic works well for pictures in KDE documentation. */
+
+    fileref = xmlGetProp (walker->cur, BAD_CAST "fileref");
+    if (fileref && *fileref && *fileref != '/') {
+	gchar *file_path;
+
+	file_path = g_build_filename (walker->path, fileref, NULL);
+	if (!g_file_test (file_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+	    gchar *p0;
+
+	    if ((p0 = strrchr (file_path, '/')) && p0 != file_path) {
+		/* Document file name - gone */
+
+		*p0 = '\0';
+
+		if ((p0 = strrchr (file_path, '/')) && p0 != file_path) {
+		    gchar *app_name;
+
+		    /* App name - gone (likely) */
+
+		    *p0 = '\0';
+		    app_name = g_strdup (p0 + 1);
+
+		    if ((p0 = strrchr (file_path, '/')) && p0 != file_path) {
+			gchar *new_path;
+
+			/* Language - gone */
+
+			*p0 = '\0';
+			new_path = g_build_filename (file_path, "en", app_name, fileref, NULL);
+
+			if (g_file_test (new_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
+			    xmlSetProp (walker->cur, BAD_CAST "fileref", BAD_CAST new_path);
+
+			g_free (new_path);
+		    }
+
+		    g_free (app_name);
+		}
+	    }
+	}
+
+	g_free (file_path);
+    }
+
+    if (fileref)
+	xmlFree (fileref);
+
     if (node_is_chunk (walker)) {
 	title = BAD_CAST node_get_title (walker, "titleabbrev");
 	if (!title)
diff -upr yelp-2.18.1-pre/src/yelp-main.c yelp-2.18.1-post/src/yelp-main.c
--- yelp-2.18.1-pre/src/yelp-main.c	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-main.c	2007-09-14 10:39:24.000000000 -0500
@@ -24,6 +24,8 @@
 #include <config.h>
 #endif
 
+#include <libxml/xmlreader.h>
+#include <libxml/parserInternals.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -333,6 +335,48 @@ main_is_running (void)
 }
 
 
+/* This is a workaround for documents that specify entities, e.g. DTDs,
+ * using paths relative to a system directory. There is no provision for
+ * specifying a search path for these in libxml, so we have to do it
+ * ourselves. */
+static xmlParserInputPtr
+entity_loader (const gchar *uri, const gchar *id, xmlParserCtxtPtr ctxt)
+{
+	xmlParserInputPtr ret;
+	static const gchar *search_path [] = {
+		"/opt/kde3/share/apps/ksgmltools2/docbook/xml-dtd-4.2",
+		"/opt/kde3/share/apps/ksgmltools2/customization/dtd",
+		"/usr/share/xml/docbook/schema/dtd/4.4",
+		NULL
+	};
+	gchar *filename;
+	gint   i;
+
+	if (!uri)
+		return NULL;
+
+	if ((filename = strrchr (uri, '/')))
+		filename = g_strdup (filename + 1);
+	else
+		filename = g_strdup (uri);
+
+	for (i = 0; search_path [i]; i++) {
+		gchar *full_path = g_strjoin ("/", search_path [i], filename, NULL);
+
+		ret = xmlNewInputFromFile (ctxt, full_path);
+		g_free (full_path);
+		if (ret)
+			break;
+	}
+
+	g_free (filename);
+
+	if (!ret)
+		ret = xmlNewInputFromFile (ctxt, uri);
+
+	return ret;
+}
+
 int
 main (int argc, char **argv) 
 {
@@ -354,6 +398,8 @@ main (int argc, char **argv) 
 		putenv ("DESKTOP_STARTUP_ID=");
 	}
 
+	xmlSetExternalEntityLoader (entity_loader);
+
 	/* Commandline parsing is done here */
 	context = g_option_context_new (_(" GNOME Help Browser"));
 
Only in yelp-2.18.1-post/src: yelp-main.c.orig
diff -upr yelp-2.18.1-pre/src/yelp-search-pager.c yelp-2.18.1-post/src/yelp-search-pager.c
--- yelp-2.18.1-pre/src/yelp-search-pager.c	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-search-pager.c	2007-09-14 10:39:24.000000000 -0500
@@ -149,6 +149,7 @@ static gboolean      search_pager_proces
 
 static YelpPagerClass *parent_class;
 
+#ifdef ENABLE_SCROLLKEEPER
 static void          s_startElement            (void       *data,
 						const xmlChar         *name,
 						const xmlChar        **attrs);
@@ -181,6 +182,7 @@ static void          process_man_result 
 void                 process_info_result       (YelpSearchPager       *pager, 
 						gchar                 *result,
 						gchar                **terms);
+#endif
 gchar *              string_append             (gchar                 *current,
 						gchar                 *new, 
 						gchar                 *suffix);
@@ -224,14 +226,6 @@ search_pager_class_init (YelpSearchPager
 
     parent_class = g_type_class_peek_parent (klass);
 
-#ifdef ENABLE_BEAGLE
-    if (beagle_util_daemon_is_running()) {
-	beagle_client = beagle_client_new (NULL);
-	debug_print (DB_DEBUG, "client: %p\n", beagle_client);
-    } else {
-	beagle_client = NULL;
-    }
-#endif /* ENABLE_BEAGLE */
 
     langs = g_get_language_names ();
 
@@ -298,6 +292,28 @@ search_pager_dispose (GObject *object)
     G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
+gboolean
+yelp_search_pager_search_available (void)
+{
+#ifdef ENABLE_BEAGLE
+    if (beagle_client != NULL)
+	return TRUE;
+    else {
+	beagle_client = beagle_client_new (NULL);
+	d(g_print ("client: %p\n", beagle_client));
+    }
+
+    if (beagle_client != NULL)
+	return TRUE;
+#endif /* ENABLE_BEAGLE */
+
+#ifdef ENABLE_SCROLLKEEPER
+    return TRUE;
+#else
+    return FALSE;
+#endif
+}
+
 /******************************************************************************/
 
 static gboolean
@@ -715,9 +731,11 @@ search_pager_process_idle (YelpSearchPag
 #endif
 	g_return_val_if_fail (priv->slow_search_setup_process_id == 0, FALSE);
 
+#ifdef ENABLE_SCROLLKEEPER
 	priv->slow_search_setup_process_id = 
 	    g_idle_add ((GSourceFunc) slow_search_setup,
 		        pager);
+#endif
 #ifdef ENABLE_BEAGLE
     }
 #endif
@@ -992,6 +1010,7 @@ xslt_yelp_document (xsltTransformContext
 	xsltFreeStylesheet (style);
 }
 
+#ifdef ENABLE_SCROLLKEEPER
 static gboolean sk_docomf = FALSE;
 static GSList *omf_pending = NULL;
 
@@ -2043,3 +2062,4 @@ search_process_info (YelpSearchPager *pa
 
     return;
 }
+#endif /* ENABLE_SCROLLKEEPER */
Only in yelp-2.18.1-post/src: yelp-search-pager.c.orig
diff -upr yelp-2.18.1-pre/src/yelp-search-pager.h yelp-2.18.1-post/src/yelp-search-pager.h
--- yelp-2.18.1-pre/src/yelp-search-pager.h	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-search-pager.h	2007-09-14 10:39:24.000000000 -0500
@@ -53,4 +53,5 @@ GType            yelp_search_pager_get_t
 void             yelp_search_pager_init         (void);
 YelpSearchPager *yelp_search_pager_get          (YelpDocInfo *doc_info);
 
+gboolean         yelp_search_pager_search_available (void);
 #endif /* __YELP_SEARCH_PAGER_H__ */
diff -upr yelp-2.18.1-pre/src/yelp-settings.c yelp-2.18.1-post/src/yelp-settings.c
--- yelp-2.18.1-pre/src/yelp-settings.c	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-settings.c	2007-09-14 10:39:24.000000000 -0500
@@ -35,7 +35,8 @@
 #include "yelp-debug.h"
 
 #define KEY_GNOME_DIR           "/desktop/gnome/interface"
-#define KEY_GNOME_VARIABLE_FONT KEY_GNOME_DIR "/document_font_name"
+/* Revert this to font_name, document_font_name is a GNOME 2.14 thing */
+#define KEY_GNOME_VARIABLE_FONT KEY_GNOME_DIR "/font_name"
 #define KEY_GNOME_FIXED_FONT    KEY_GNOME_DIR "/monospace_font_name"
 #define KEY_GNOME_GTK_THEME     KEY_GNOME_DIR "/gtk_theme"
 
diff -upr yelp-2.18.1-pre/src/yelp-toc-pager.c yelp-2.18.1-post/src/yelp-toc-pager.c
--- yelp-2.18.1-pre/src/yelp-toc-pager.c	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-toc-pager.c	2007-09-14 10:39:24.000000000 -0500
@@ -39,6 +39,8 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/HTMLtree.h>
+#include <libxml/tree.h>
+#include <libxml/xmlsave.h>
 #include <libxslt/xslt.h>
 #include <libxslt/templates.h>
 #include <libxslt/transform.h>
@@ -53,6 +55,12 @@
 #include "yelp-utils.h"
 #include "yelp-io-channel.h"
 
+#define GMENU_I_KNOW_THIS_IS_UNSTABLE
+#include <gmenu-tree.h>
+
+#define DESKTOP_ENTRY_GROUP     "Desktop Entry"
+#define KDE_DESKTOP_ENTRY_GROUP "KDE Desktop Entry"
+
 #define YELP_NAMESPACE "http://www.gnome.org/yelp/ns"
 
 #define STYLESHEET_PATH DATADIR"/yelp/xslt/"
@@ -102,6 +110,8 @@ struct _YelpTocPagerPriv {
     xsltStylesheetPtr       stylesheet;
     xsltTransformContextPtr transformContext;
     
+    GMenuTree *libmenu_tree;
+    GSList *libmenu_stack;
     guint process_id;
 };
 
@@ -121,11 +131,15 @@ static GtkTreeModel * toc_pager_get_sect
 static gboolean      toc_process_pending       (YelpTocPager      *pager);
 
 
-static gboolean      process_read_menu         (YelpTocPager      *pager);
+static gboolean      process_libmenu           (YelpTocPager      *pager);
+static gboolean      process_libmenu_node      (YelpTocPager      *pager);
 static gboolean      process_xslt              (YelpTocPager      *pager);
+#ifdef ENABLE_SCROLLKEEPER
+static gboolean      process_read_menu         (YelpTocPager      *pager);
 static gboolean      process_read_scrollkeeper (YelpTocPager      *pager,
                                                 gchar             *content_list);
 static gboolean      process_omf_pending       (YelpTocPager      *pager);
+#endif
 #ifdef ENABLE_MAN
 static gboolean      process_mandir_pending    (YelpTocPager      *pager);
 #endif
@@ -134,10 +148,12 @@ static gboolean      process_info_pendin
 #endif
 static gboolean      process_cleanup           (YelpTocPager      *pager);
 
+#ifdef ENABLE_SCROLLKEEPER
 static void          toc_add_doc_info          (YelpTocPager      *pager,
 						YelpDocInfo       *doc_info);
 static void          toc_remove_doc_info       (YelpTocPager      *pager,
 						YelpDocInfo       *doc_info);
+#endif
 static void          xml_trim_titles           (xmlNodePtr         node,
 						xmlChar           *nodetype);
 static void          xslt_yelp_document        (xsltTransformContextPtr ctxt,
@@ -212,6 +228,9 @@ toc_pager_init (YelpTocPager *pager)
     priv->pause_count  = 0;
     priv->pending_func = NULL;
     priv->process_id   = 0;
+
+    priv->libmenu_tree  = NULL;
+    priv->libmenu_stack = NULL;
 }
 
 static void
@@ -321,7 +340,7 @@ toc_pager_process (YelpPager *pager)
     yelp_pager_set_state (pager, YELP_PAGER_STATE_RUNNING);
     g_signal_emit_by_name (pager, "start");
 
-    priv->pending_func = (ProcessFunction) process_read_menu;
+    priv->pending_func = (ProcessFunction) process_libmenu;
 
     if (priv->process_id == 0) {
 	priv->process_id = 
@@ -350,8 +369,9 @@ toc_pager_resolve_frag (YelpPager *pager
     GtkIconInfo *info;
     GtkIconTheme *theme = (GtkIconTheme *) yelp_settings_get_icon_theme ();
 
-    if (priv->toc_doc == NULL)
-	return NULL;
+    if (priv->toc_doc == NULL) {
+	return "index";
+    }
 
     debug_print (DB_FUNCTION, "entering\n");
     debug_print (DB_ARG, "frag_id = %s\n", frag_id);
@@ -411,6 +431,11 @@ toc_pager_resolve_frag (YelpPager *pager
 	gtk_icon_info_free (info);
     }
 
+    params[params_i++] = "yelp.javascript";
+    params[params_i++] = g_strdup_printf ("\"%s\"", DATADIR "/yelp/yelp.js");
+    params[params_i++] = "yelp.topimage";
+    params[params_i++] = g_strdup_printf ("\"%s\"", DATADIR "/yelp/icons/help-title.png");
+
     /* we specify the id attribute of the toc element that we want to process to
      * the stylesheet */
     params[params_i++] = "yelp.toc.id";
@@ -422,6 +447,7 @@ toc_pager_resolve_frag (YelpPager *pager
 				      priv->toc_doc,
 				      (const gchar **)params, NULL, NULL,
 				      priv->transformContext);
+
     /* Don't do this */
     g_signal_emit_by_name (pager, "finish");
 
@@ -460,8 +486,13 @@ toc_process_pending (YelpTocPager *pager
     gboolean readd;
     YelpTocPagerPriv *priv = pager->priv;
     static ProcessFunction process_funcs[] = {
+	process_libmenu,
+        process_libmenu_node,
+        process_xslt,
+#ifdef ENABLE_SCROLLKEEPER
 	process_read_menu,
 	process_omf_pending,
+#endif
 #ifdef ENABLE_MAN
 	process_mandir_pending,
 #endif
@@ -498,6 +529,324 @@ toc_process_pending (YelpTocPager *pager
     }
 }
 
+static void
+set_icon (xmlNode *node, const char *icon)
+{
+    if (icon) {
+       GtkIconInfo *info;
+       GtkIconTheme *theme =
+           (GtkIconTheme *) yelp_settings_get_icon_theme ();
+       info = gtk_icon_theme_lookup_icon (theme, icon, 48, 0);
+       if (info) {
+           xmlNodePtr new = xmlNewChild (node, NULL, "icon", NULL);
+           xmlNewNsProp (new, NULL, "file", gtk_icon_info_get_filename (info));
+           gtk_icon_info_free (info);
+       }
+    }
+}
+
+typedef struct {
+    xmlNode *tree;
+    GSList *children;
+    GSList *iterator;
+    gboolean non_empty;
+} LibmenuStackFrame;
+
+static void
+push_stack_frame (YelpTocPager *pager, GMenuTreeDirectory *dir)
+{
+    LibmenuStackFrame *frame;
+    YelpTocPagerPriv *priv  = YELP_TOC_PAGER (pager)->priv;
+
+    frame = g_new (LibmenuStackFrame, 1);
+    frame->iterator = frame->children = gmenu_tree_directory_get_contents (dir);
+    frame->non_empty = FALSE;
+
+    frame->tree = xmlNewNode (NULL, "toc");
+    xmlSetProp (frame->tree, "id", gmenu_tree_directory_get_menu_id (dir));
+    xmlNewTextChild (frame->tree, NULL, "title", gmenu_tree_directory_get_name (dir));
+    set_icon (frame->tree, gmenu_tree_directory_get_icon (dir));
+
+    priv->libmenu_stack = g_slist_prepend (priv->libmenu_stack, frame);
+}
+
+static void
+pop_stack_frame (YelpTocPager *pager)
+{
+    LibmenuStackFrame *frame;
+    YelpTocPagerPriv *priv  = YELP_TOC_PAGER (pager)->priv;
+
+    frame = priv->libmenu_stack->data;
+
+    g_slist_free (frame->children);
+    g_free (frame);
+
+    priv->libmenu_stack = g_slist_delete_link (priv->libmenu_stack, priv->libmenu_stack);
+}
+
+static GTimer *timer;
+/* iterator points to next node to process and is incremented at the
+   end of the function.  NULL means finished with this level.  Parent
+   iterators are incremented before processing the child tree. */
+static gboolean
+process_libmenu_node (YelpTocPager *pager)
+{
+    LibmenuStackFrame *frame;
+    GMenuTreeItem *item;
+    YelpTocPagerPriv *priv  = YELP_TOC_PAGER (pager)->priv;
+    gulong ms_start;
+
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("%ld elapsed (enter process_libmenu_node) ", ms);
+           ms_start = ms;
+})
+
+    frame = priv->libmenu_stack->data;
+
+    if (frame->iterator == NULL) {
+       d(g_print ("pop");)
+       if (priv->libmenu_stack->next) {
+           if (frame->non_empty) {
+               xmlNode *tree = frame->tree;
+               pop_stack_frame (pager);
+
+               frame = priv->libmenu_stack->data;
+               xmlAddChild (frame->tree, tree);
+               frame->non_empty = TRUE;
+           } else {
+               xmlFreeNode (frame->tree);
+               pop_stack_frame(pager);
+           }
+
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("\n%ld elapsed (exit process_libmenu_node (%ld))\n", ms, ((glong)ms - ms_start) % 1000000);
+})
+           return TRUE;
+       } else {
+           YelpTocPagerPriv *priv  = YELP_TOC_PAGER (pager)->priv;
+           xmlNode *title;
+
+           priv->toc_doc = xmlNewDoc ("1.0");
+           xmlSetProp (frame->tree, "id", "index");
+           xmlDocSetRootElement (priv->toc_doc, frame->tree);
+
+           for (title = frame->tree->children; title; title = title->next) {
+               if (g_str_equal (title->name, "title")) {
+                   xmlNodeSetContent (title, _("Help Topics"));
+                   break;
+               }
+           }
+           if (title == NULL) {
+               xmlNewTextChild (frame->tree, NULL, "title", _("Help Topics"));
+           }
+
+           pop_stack_frame (pager);
+
+           gmenu_tree_unref (priv->libmenu_tree);
+           priv->libmenu_tree = NULL;
+
+
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("\n%ld elapsed (exit process_libmenu_node (%ld))\n", ms, ((glong)ms - ms_start) % 1000000);
+})
+
+           return FALSE;
+       }
+    }
+
+    item = frame->iterator->data;
+
+    switch (gmenu_tree_item_get_type (item)) {
+    case GMENU_TREE_ITEM_DIRECTORY:
+       {
+           d(g_print ("directory"));
+           push_stack_frame (pager, GMENU_TREE_DIRECTORY (item));
+       }
+       break;
+    case GMENU_TREE_ITEM_ENTRY:
+       {
+           GMenuTreeEntry *entry = GMENU_TREE_ENTRY (item);
+           const char     *path = gmenu_tree_entry_get_desktop_file_path (entry);
+           const char     *desktop_entry_group;
+           char           *docpath = NULL;
+           GKeyFile       *key_file;
+
+           key_file = g_key_file_new ();
+
+           d(g_print ("entry (%s)", path));
+
+           if (!g_key_file_load_from_file (key_file, path, 0, NULL)) {
+               g_key_file_free (key_file);
+               break;
+           }
+
+           if (g_key_file_has_group (key_file, DESKTOP_ENTRY_GROUP)) {
+               desktop_entry_group = DESKTOP_ENTRY_GROUP;
+           } else {
+               if (g_key_file_has_group (key_file, KDE_DESKTOP_ENTRY_GROUP)) {
+                   desktop_entry_group = KDE_DESKTOP_ENTRY_GROUP;
+               } else {
+                   g_key_file_free (key_file);
+                   break;
+               }
+           }
+
+           docpath = g_key_file_get_string (key_file, desktop_entry_group, "DocPath", NULL);
+
+           if (docpath)
+               g_strstrip (docpath);
+
+           if (docpath && *docpath) {
+               xmlNode *new = xmlNewChild (frame->tree, NULL, "doc", NULL);
+               if (strchr(docpath, ':')) {
+                   xmlNewNsProp (new, NULL, "href", docpath);
+               } else {
+                   char *href = g_strdup_printf ("help:%s", docpath);
+                   xmlNewNsProp (new, NULL, "href", href);
+                   g_free (href);
+               }
+
+               xmlNewTextChild (new, NULL, "title", gmenu_tree_entry_get_name (entry));
+               xmlNewTextChild (new, NULL, "description", gmenu_tree_entry_get_comment (entry));
+               set_icon (new, gmenu_tree_entry_get_icon (entry));
+
+               frame->non_empty = TRUE;
+
+               g_free (docpath);
+           }
+       }
+       break;
+    default:
+       /* Ignore */
+       break;
+    }
+
+
+    frame->iterator = frame->iterator->next;
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("\n%ld elapsed (exit process_libmenu_node (%ld))\n", ms, ((glong)ms - ms_start) % 1000000);
+})
+    return TRUE;
+}
+
+#if 0
+static xmlNode *
+build_menu_dir_xml (GMenuTreeDirectory *dir)
+{
+    gboolean non_empty = FALSE;
+    GSList *items;
+    xmlNode *tree;
+
+    tree = xmlNewNode (NULL, "toc");
+    xmlSetProp (tree, "id", gmenu_tree_directory_get_menu_id (dir));
+    xmlNewTextChild (tree, NULL, "title", gmenu_tree_directory_get_name (dir));
+
+    set_icon (tree, gmenu_tree_directory_get_icon (dir));
+
+    for (items = gmenu_tree_directory_get_contents (dir); items; items = items->next) {
+       GMenuTreeItem *item = items->data;
+       switch (gmenu_tree_item_get_type (item)) {
+       case GMENU_TREE_ITEM_DIRECTORY:
+           {
+               xmlNode *child;
+
+               child = build_menu_dir_xml (GMENU_TREE_DIRECTORY (item));
+
+               if (child) {
+                   xmlAddChild (tree, child);
+                   non_empty = TRUE;
+               }
+           }
+           break;
+       case GMENU_TREE_ITEM_ENTRY:
+           {
+               GMenuTreeEntry *entry = GMENU_TREE_ENTRY (item);
+               const char     *path = gmenu_tree_entry_get_desktop_file_path (entry);
+               const char     *desktop_entry_group;
+               char           *docpath = NULL;
+               GKeyFile       *key_file;
+
+               key_file = g_key_file_new ();
+
+               if (!g_key_file_load_from_file (key_file, path, 0, NULL)) {
+                   g_key_file_free (key_file);
+                   break;
+               }
+
+               if (g_key_file_has_group (key_file, DESKTOP_ENTRY_GROUP)) {
+                   desktop_entry_group = DESKTOP_ENTRY_GROUP;
+               } else {
+                   if (g_key_file_has_group (key_file, KDE_DESKTOP_ENTRY_GROUP)) {
+                       desktop_entry_group = KDE_DESKTOP_ENTRY_GROUP;
+                   } else {
+                       g_key_file_free (key_file);
+                       break;
+                   }
+               }
+
+               docpath = g_key_file_get_string (key_file, desktop_entry_group, "DocPath", NULL);
+
+               if (docpath) {
+                   xmlNode *new = xmlNewChild (tree, NULL, "doc", NULL);
+                   xmlNewNsProp (new, NULL, "href", docpath);
+                   xmlNewTextChild (new, NULL, "title", gmenu_tree_entry_get_name (entry));
+                   xmlNewTextChild (new, NULL, "description", gmenu_tree_entry_get_comment (entry));
+                   set_icon (new, gmenu_tree_entry_get_icon (entry));
+
+                   non_empty = TRUE;
+
+                   g_free (docpath);
+               }
+           }
+           break;
+       default:
+           /* Ignore */
+           break;
+       }
+    }
+    if (!non_empty) {
+       xmlFreeNode (tree);
+       tree = NULL;
+    }
+    return tree;
+}
+#endif
+
+static gboolean
+process_libmenu (YelpTocPager *pager)
+{
+    YelpTocPagerPriv *priv  = YELP_TOC_PAGER (pager)->priv;
+
+d(    timer = g_timer_new ();
+      g_timer_start(timer);)
+
+    priv->libmenu_tree = gmenu_tree_lookup ("applications.menu",
+                                            GMENU_TREE_FLAGS_NONE);
+
+    push_stack_frame (pager, gmenu_tree_get_root_directory (priv->libmenu_tree));
+
+#if 0
+    priv->toc_doc = xmlNewDoc ("1.0");
+
+    root = build_menu_dir_xml (gmenu_tree_get_root_directory (tree));
+
+    xmlSetProp (root, "id", "index");
+
+    xmlDocSetRootElement (priv->toc_doc, root);
+
+
+    gmenu_tree_unref (tree);
+#endif
+
+    return FALSE;
+}
+
+#ifdef ENABLE_SCROLLKEEPER
+
 /** process_read_scrollkeeper *************************************************/
 
 static void
@@ -629,6 +978,15 @@ get_omf_attributes (YelpTocPager *pager,
 
     if (!omf_doc) {
 	g_warning (_("Could not load the OMF file '%s'."), omffile);
+        /* FIXME:
+        * There is a bug in libxml2 (#131745) that prevents files from being
+        * parsed with a parser context after that context has failed on any
+        * single file.  To work around this, we'll free the parser and make
+        * a new one.  Remove the next two lines once configure.in requires
+        * a version of libxml2 that has the bug fixed.
+        */
+       xmlFreeParserCtxt (priv->parser);
+       priv->parser = xmlNewParserCtxt ();
 	return NULL;
     }
 
@@ -1029,6 +1387,7 @@ done:
     /* continue processing */
     return TRUE;
 }
+#endif
 
 #ifdef ENABLE_MAN
 static void
@@ -1480,6 +1839,12 @@ process_mandir_pending (YelpTocPager *pa
 	}
 	priv->mandir_list = g_slist_reverse (priv->mandir_list);
 
+#define GMENU_I_KNOW_THIS_IS_UNSTABLE
+#include <gmenu-tree.h>
+
+#define DESKTOP_ENTRY_GROUP     "Desktop Entry"
+#define KDE_DESKTOP_ENTRY_GROUP "KDE Desktop Entry"
+
 #ifdef YELP_DEBUG
 	/* debugging: print out lists in order */
 	GSList *list1 = priv->mandir_list;
@@ -1796,6 +2161,7 @@ process_info_pending (YelpTocPager *page
 }
 #endif /* ENABLE_INFO */
 
+#ifdef ENABLE_SCROLLKEEPER
 static gboolean
 process_read_menu (YelpTocPager *pager)
 {
@@ -1856,19 +2222,8 @@ process_read_menu (YelpTocPager *pager)
 	xml_trim_titles (node, BAD_CAST "description");
 
 	icon = xmlGetProp (node, BAD_CAST "icon");
-	if (icon) {
-	    GtkIconInfo *info;
-	    GtkIconTheme *theme = 
-		(GtkIconTheme *) yelp_settings_get_icon_theme ();
-	    info = gtk_icon_theme_lookup_icon (theme, (gchar *) icon, 48, 0);
-	    if (info) {
-		xmlNodePtr new = xmlNewChild (node, NULL, BAD_CAST "icon", 
-					      NULL);
-		xmlNewNsProp (new, NULL, BAD_CAST "file", 
-			      BAD_CAST gtk_icon_info_get_filename (info));
-		gtk_icon_info_free (info);
-	    }
-	}
+
+	set_icon (node, icon);
 	xmlFree (icon);
 
     }
@@ -1931,6 +2286,7 @@ process_read_menu (YelpTocPager *pager)
 
     return FALSE;
 }
+#endif
 
 static gboolean
 process_xslt (YelpTocPager *pager)
@@ -1940,7 +2296,7 @@ process_xslt (YelpTocPager *pager)
     YelpTocPagerPriv *priv = pager->priv;
     gchar **params = NULL;
     gint  params_i = 0;
-    gint  params_max = 10;
+    gint  params_max = 12;
     GtkIconInfo *info;
     GtkIconTheme *theme = (GtkIconTheme *) yelp_settings_get_icon_theme ();
 
@@ -1962,6 +2318,10 @@ process_xslt (YelpTocPager *pager)
 	goto done;
     }
 
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("%ld elapsed\n", ms);
+})
     priv->transformContext = xsltNewTransformContext (priv->stylesheet,
 						      priv->toc_doc);
     priv->transformContext->_private = pager;
@@ -1973,11 +2333,15 @@ process_xslt (YelpTocPager *pager)
     params = g_new0 (gchar *, params_max);
     yelp_settings_params (&params, &params_i, &params_max);
 
-    if ((params_i + 10) >= params_max - 1) {
-	params_max += 10;
+    if ((params_i + 14) >= params_max - 1) {
+	params_max += 14;
 	params = g_renew (gchar *, params, params_max);
     }
 
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("%ld elapsed\n", ms);
+})
     info = gtk_icon_theme_lookup_icon (theme, "yelp-icon-big", 192, 0);
     if (info) {
 	params[params_i++] = "help_icon";
@@ -1989,12 +2353,23 @@ process_xslt (YelpTocPager *pager)
 	gtk_icon_info_free (info);
     }
 
+    params[params_i++] = "yelp.javascript";
+    params[params_i++] = g_strdup_printf ("\"%s\"", DATADIR "/yelp/yelp.js");
+    params[params_i++] = "yelp.topimage";
+    params[params_i++] = g_strdup_printf ("\"%s\"", DATADIR "/yelp/icons/help-title.png");
+
     params[params_i++] = NULL;
 
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("%ld elapsed\n", ms);
+})
+
     outdoc = xsltApplyStylesheetUser (priv->stylesheet,
 				      priv->toc_doc,
 				      (const gchar **)params, NULL, NULL,
 				      priv->transformContext);
+
     /* Don't do this */
     g_signal_emit_by_name (pager, "finish");
 
@@ -2017,6 +2392,7 @@ process_xslt (YelpTocPager *pager)
 
     return FALSE;
 }
+#endif
 
 static gboolean
 process_cleanup (YelpTocPager *pager)
@@ -2052,10 +2428,16 @@ process_cleanup (YelpTocPager *pager)
 	priv->parser = NULL;
     }
 
+d({    gulong ms;
+           g_timer_elapsed (timer, &ms);
+           g_print ("%ld elapsed\n", ms);
+})
+
     /* we only ever want to run this function once, so always return false */
     return FALSE;
 }
 
+#ifdef ENABLE_SCROLLKEEPER
 static void
 toc_add_doc_info (YelpTocPager *pager, YelpDocInfo *doc_info)
 {
@@ -2123,6 +2505,8 @@ toc_remove_doc_info (YelpTocPager *pager
 #endif
 }
 
+#endif
+
 static void
 xslt_yelp_document (xsltTransformContextPtr ctxt,
 		    xmlNodePtr              node,
@@ -2253,6 +2637,7 @@ xslt_yelp_document (xsltTransformContext
     if (style)
 	xsltFreeStylesheet (style);
 }
+#endif
 
 static void
 xml_trim_titles (xmlNodePtr node, xmlChar * nodetype)
diff -upr yelp-2.18.1-pre/src/yelp-utils.c yelp-2.18.1-post/src/yelp-utils.c
--- yelp-2.18.1-pre/src/yelp-utils.c	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-utils.c	2007-09-14 10:40:34.000000000 -0500
@@ -82,6 +82,7 @@ static gchar *mandirs[] = {
 
 static YelpDocType  get_doc_type       (gchar   *uri);
 static gchar *      convert_ghelp_uri  (gchar   *uri);
+static gchar *      convert_help_uri   (gchar   *uri);
 
 static gchar *      convert_man_uri    (gchar   *uri, gboolean trust_uri);
 static gchar *      convert_info_uri   (gchar   *uri);
@@ -108,6 +109,43 @@ yelp_dot_dir (void)
     return dot_dir;
 }
 
+static gchar *
+try_absolute_path (const gchar *full_uri)
+{
+    YelpDocType  doc_type = YELP_DOC_TYPE_ERROR;
+    gchar       *doc_uri  = NULL;
+
+    if (!full_uri || !*full_uri) {
+	doc_uri = NULL;
+    } else if (g_str_has_prefix (full_uri, "file:")) {
+	const gchar *cur;
+
+	if ((cur = strchr (full_uri, '#')) || (cur = strchr (full_uri, '?')))
+	    doc_uri = g_strndup (full_uri, cur - full_uri);
+	else
+	    doc_uri = g_strdup (full_uri);
+    } else if (g_str_has_prefix (full_uri, "ghelp:") ||
+	       g_str_has_prefix (full_uri, "help:")) {
+	const gchar *cur;
+
+	cur = strchr (full_uri, ':') + 1;
+	if (cur && *cur)
+	    doc_uri = g_strconcat ("file:", cur, NULL);
+    } else {
+	doc_uri = g_strdup (full_uri);
+    }
+
+    if (doc_uri)
+	doc_type = get_doc_type (doc_uri);
+
+    if (doc_type == YELP_DOC_TYPE_ERROR) {
+	g_free (doc_uri);
+	return NULL;
+    }
+
+    return doc_uri;
+}
+
 /* @uri:       the uri to interpret for the new YelpDocInfo struct 
  * @trust_uri: if the uri is absolute and is known to exist,
  *             then this should be set.  Only makes sense for local
@@ -136,9 +174,11 @@ yelp_doc_info_new (const gchar *uri, gbo
 	full_uri =
 	gnome_vfs_make_uri_from_input_with_dirs	(uri,
 						 GNOME_VFS_MAKE_URI_DIR_CURRENT);
-    
+
+    g_strstrip (full_uri);
+
     if (g_str_has_prefix (full_uri, "file:")) {
-	if ((cur = strchr (full_uri, '#')))
+	if ((cur = strchr (full_uri, '#')) || (cur = strchr (full_uri, '?')))
 	    doc_uri = g_strndup (full_uri, cur - full_uri);
 	else
 	    doc_uri = g_strdup (full_uri);
@@ -148,10 +188,35 @@ yelp_doc_info_new (const gchar *uri, gbo
     else if (g_str_has_prefix (full_uri, "ghelp:") ||
 	g_str_has_prefix (full_uri, "gnome-help:")) {
 	doc_uri  = convert_ghelp_uri (full_uri);
+	if (!doc_uri)
+	    doc_uri = try_absolute_path (full_uri);
 	if (doc_uri)
 	    doc_type = get_doc_type (doc_uri);
 	uri_type = YELP_URI_TYPE_GHELP;
     }
+    else if (g_str_has_prefix (full_uri, "help:")) {
+	doc_uri  = convert_help_uri (full_uri);
+	if (!doc_uri)
+	    doc_uri = try_absolute_path (full_uri);
+	if (doc_uri)
+	    doc_type = get_doc_type (doc_uri);
+#if 0
+	if ((cur = strchr (doc_uri, '#'))) {
+	    char *temp;
+
+	    if (!strchr (full_uri, '#')) {
+		temp = full_uri;
+		full_uri = g_strconcat (full_uri, "#", cur + 1, NULL);
+		g_free (temp);
+	    }
+
+	    temp = doc_uri;
+	    doc_uri = g_strndup (doc_uri, cur - doc_uri);
+	    g_free (temp);
+	}
+#endif
+	uri_type = YELP_URI_TYPE_HELP;
+    }
     else if (g_str_has_prefix (full_uri, "man:")) {
 	doc_uri  = convert_man_uri (full_uri, trust_uri);
 	doc_type = YELP_DOC_TYPE_MAN;
@@ -173,7 +238,7 @@ yelp_doc_info_new (const gchar *uri, gbo
 	}
     }
     else if (g_str_has_prefix (full_uri, "x-yelp-toc:")) {
-	doc_uri = g_strdup ("file://" DATADIR "/yelp/toc.xml");
+	doc_uri = g_strdup ("file://" DATADIR "/yelp/xslt/toc2html.xsl");
 	doc_type = YELP_DOC_TYPE_TOC;
 	uri_type = YELP_URI_TYPE_TOC;
     }
@@ -439,12 +504,35 @@ yelp_doc_info_get_type (YelpDocInfo *doc
     return doc->type;
 }
 
+static void
+strip_fragment (gchar *uri)
+{
+    gchar *cur;
+
+    if (g_str_has_prefix (uri, "ghelp:"))
+	if ((cur = strchr (uri, '?')))
+	    *cur = '\0';
+
+    if (g_str_has_prefix (uri, "x-yelp-toc:"))
+	if ((cur = strchr (uri, ':')))
+	    *cur = '\0';
+
+    if (g_str_has_prefix (uri, "info:"))
+	if ((cur = strchr (uri, ')')))
+	    *cur = '\0';
+    
+    if ((cur = strchr (uri, '#')) || (cur = strchr (uri, '?')))
+	*cur = '\0';
+}
+
 gchar *
 yelp_doc_info_get_uri (YelpDocInfo *doc,
 		       gchar       *frag_id,
 		       YelpURIType  uri_type)
 {
     gchar *base = NULL;
+    gchar *base_copy;
+    gchar *ret;
     gint i;
 
     g_return_val_if_fail (doc != NULL, NULL);
@@ -458,10 +546,17 @@ yelp_doc_info_get_uri (YelpDocInfo *doc,
     if (!base)
 	return NULL;
 
+    /* Strip old fragment, if any */
+    base_copy = g_strdup (base);
+    strip_fragment (base_copy);
+
     if (!frag_id || *frag_id == '\0')
-	return g_strdup (base);
+	return base_copy;
+
+    ret = g_strconcat (base_copy, "#", frag_id, NULL);
 
-    return g_strconcat (base, "#", frag_id, NULL);
+    g_free (base_copy);
+    return ret;
 }
 
 gchar *
@@ -537,7 +632,8 @@ yelp_uri_get_fragment (const gchar *uri)
 	if ((cur = strchr (uri, ')')))
 	    if (*(++cur) != '\0')
 		frag_id = g_strdup (cur);
-    if ((cur = strchr (uri, '#')))
+    
+    if ((cur = strchr (uri, '#')) || (cur = strchr (uri, '?')))
 	if (*(++cur) != '\0') {
 	    if (frag_id)
 		g_free (frag_id);
@@ -628,6 +724,198 @@ yelp_doc_info_add_uri (YelpDocInfo *doc_
 /** Convert fancy URIs to file URIs *******************************************/
 
 static gchar *
+help_uri_check_file (gchar *filename, gchar *reference) {
+    d(g_print ("Checking %s\n", filename));
+    if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
+	gchar *full_uri;
+	if (reference) {
+	    full_uri = g_strconcat ("file://", filename, NULL, "#", reference, NULL);
+	} else {
+	    full_uri = g_strconcat ("file://", filename, NULL);
+	}
+
+	return full_uri;
+    }
+
+    return NULL;
+}
+
+static gchar *
+help_uri_check_dir (gchar *path, gchar *identifier, gchar *reference)
+{
+    gchar *result;
+
+    gchar *full_path;
+    gchar *full_identifier;
+
+    result = help_uri_check_file (path, reference);
+    if (result)
+	return result;
+
+    full_path = g_build_filename (path, "index.docbook", NULL);
+    result = help_uri_check_file (full_path, reference);
+    g_free (full_path);
+    if (result)
+	return result;
+
+    full_identifier = g_strconcat (identifier, ".xml", NULL);
+    full_path = g_build_filename (path, full_identifier, NULL);
+    result = help_uri_check_file (full_path, reference);
+    g_free (full_path);
+    g_free (full_identifier);
+    if (result)
+	return result;
+
+    full_path = g_build_filename (path, "index.html", NULL);
+    result = help_uri_check_file (full_path, reference);
+    g_free (full_path);
+    if (result)
+	return result;
+
+    full_identifier = g_strconcat (identifier, ".html", NULL);
+    full_path = g_build_filename (path, full_identifier, NULL);
+    result = help_uri_check_file (full_path, reference);
+    g_free (full_path);
+    g_free (full_identifier);
+    if (result)
+	return result;
+
+    return NULL;
+}
+
+static gchar *
+help_uri_search (gchar *path, gchar *identifier, char *reference)
+{
+    gchar *result;
+
+    result = help_uri_check_dir (path, identifier, reference);
+    if (result)
+	return result;
+
+    if (strlen (path) > 5 && ! strcmp (path + strlen (path) - 5, ".html")) {
+	gchar *slash = strrchr (path, '/');
+	if (slash != NULL) {
+	    gchar *shortened = g_strndup (path, slash - path);
+	    gchar *shortened_reference = g_strndup (slash + 1, strlen (slash + 1) - 5);
+	    result = help_uri_check_dir (shortened, identifier, reference ? reference : shortened_reference);
+	    g_free (reference);
+	    g_free (shortened);
+	    if (result)
+		return result;
+	}
+    }
+    return NULL;
+}
+
+static gchar *
+help_uri_expand_datadirs (gchar *path, gchar *identifier, char *reference)
+{
+    char const* const* data_dirs = g_get_system_data_dirs ();
+    int i;
+    char *result;
+    for (i = 0; data_dirs[i]; i++) {
+	char *full_path = g_build_filename (data_dirs[i], path, NULL);
+	result = help_uri_search (full_path, identifier, reference);
+	g_free (full_path);
+	if (result)
+	    return result;
+    }
+    return NULL;
+}
+
+static gchar *
+convert_help_uri (gchar *uri)
+{
+    gchar  *path;
+    gchar  *file_name = NULL;
+    const gchar * const * langs;
+    gchar *result = NULL;
+    gchar *full_path;
+    int i;
+    gchar *reference;
+
+    if ((path = strchr(uri, ':')))
+	path++;
+    else
+	return NULL;
+
+    while (*path == '/')
+	path++;
+
+    path = g_strdup (path);
+    g_strstrip (path);
+
+    if (!*path) {
+	g_free (path);
+	return NULL;
+    }
+
+    if ((reference = strchr (path, '#')) || (reference = strchr (path, '?'))) {
+	*reference = 0;
+	reference ++;
+    }
+
+    full_path = g_strconcat ("/", path, NULL);
+    result = help_uri_check_file (full_path, reference);
+    g_free (full_path);
+    if (result)
+	goto end;
+
+    /* This isn't the filename so much as the rest of the path after the first bit of the path. */
+    file_name = strchr (path, '/');
+    if (file_name) {
+	*file_name = 0;
+	file_name ++;
+    } else {
+	file_name = "";
+    }
+
+    langs = g_get_language_names ();
+
+    for (i = 0; langs[i] != NULL; i++) {
+	full_path = g_strdup_printf ("/gnome/help/%s/%s/%s", path, langs[i], file_name);
+	result = help_uri_expand_datadirs (full_path, path, reference);
+	g_free (full_path);
+	if (result)
+	    goto end;
+
+	full_path = g_strdup_printf ("/gnome/help-bundle/%s/%s/%s", path, langs[i], file_name);
+	result = help_uri_expand_datadirs (full_path, path, reference);
+	g_free (full_path);
+	if (result)
+	    goto end;
+
+	full_path = g_strdup_printf ("/doc/HTML/%s/%s/%s", langs[i], path, file_name);
+	result = help_uri_expand_datadirs (full_path, path, reference);
+	g_free (full_path);
+	if (result)
+	    goto end;
+    }
+
+    full_path = g_strdup_printf ("/gnome/help/%s/C/%s", path, file_name);
+    result = help_uri_expand_datadirs (full_path, path, reference);
+    g_free (full_path);
+    if (result)
+	goto end;
+
+    full_path = g_strdup_printf ("/gnome/help-bundle/%s/C/%s", path, file_name);
+    result = help_uri_expand_datadirs (full_path, path, reference);
+    g_free (full_path);
+    if (result)
+	goto end;
+
+    full_path = g_strdup_printf ("/doc/HTML/en/%s/%s", path, file_name);
+    result = help_uri_expand_datadirs (full_path, path, reference);
+    g_free (full_path);
+    if (result)
+	goto end;
+
+ end:
+    g_free (path);
+    return result;
+}
+
+static gchar *
 locate_file_lang (gchar *path, gchar *file, const gchar *lang)
 {
     gchar *exts[] = {".xml", ".docbook", ".sgml", ".html", "", NULL};
@@ -662,6 +950,9 @@ convert_ghelp_uri (gchar *uri)
     else
 	goto done;
 
+    if (!*path)
+	goto done;
+
     if (path && path[0] == '/') {
 	if ((cur = strchr (path, '?')) || (cur = strchr (path, '#')))
 	    *cur = '\0';
@@ -946,7 +1237,7 @@ convert_info_uri (gchar   *uri)
 	    goto done;
 	info_name = g_strndup (path, cur - path);
     }
-    else if ((cur = strchr (path, '#')))
+    else if ((cur = strchr (path, '#')) || (cur = strchr (path, '?')))
 	info_name = g_strndup (path, cur - path);
     else
 	info_name = g_strdup (path);
Only in yelp-2.18.1-post/src: yelp-utils.c.orig
diff -upr yelp-2.18.1-pre/src/yelp-utils.h yelp-2.18.1-post/src/yelp-utils.h
--- yelp-2.18.1-pre/src/yelp-utils.h	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-utils.h	2007-09-14 10:39:24.000000000 -0500
@@ -50,6 +50,7 @@ typedef enum {
     YELP_URI_TYPE_TOC      = 1 << 4,
     YELP_URI_TYPE_EXTERNAL = 1 << 5,
     YELP_URI_TYPE_SEARCH   = 1 << 6,
+    YELP_URI_TYPE_HELP     = 1 << 7,
 
     YELP_URI_TYPE_NO_FILE =
       YELP_URI_TYPE_GHELP    |
@@ -57,7 +58,8 @@ typedef enum {
       YELP_URI_TYPE_INFO     |
       YELP_URI_TYPE_TOC      |
       YELP_URI_TYPE_EXTERNAL |
-      YELP_URI_TYPE_SEARCH,
+      YELP_URI_TYPE_SEARCH   |
+      YELP_URI_TYPE_HELP,
     YELP_URI_TYPE_ANY =
       YELP_URI_TYPE_FILE    |
       YELP_URI_TYPE_NO_FILE
diff -upr yelp-2.18.1-pre/src/yelp-window.c yelp-2.18.1-post/src/yelp-window.c
--- yelp-2.18.1-pre/src/yelp-window.c	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-window.c	2007-09-14 10:39:24.000000000 -0500
@@ -690,6 +690,7 @@ history_step_back (YelpWindow *window)
 {
     YelpWindowPriv   *priv;
     YelpHistoryEntry *entry;
+    static gboolean   reentering = FALSE;
 
     /** FIXME: would be nice to re-select the correct entry on the left **/
 
@@ -711,8 +712,10 @@ history_step_back (YelpWindow *window)
 	priv->current_doc  = yelp_doc_info_ref (entry->doc_info);
 	priv->current_frag = g_strdup (entry->frag_id);
 	history_entry_free (entry);
-    } else {
+    } else if (!reentering) {
+	reentering = TRUE;
 	yelp_window_load (window, "x-yelp-toc:");
+	reentering = FALSE;
     }
 }
 
@@ -724,8 +727,9 @@ history_pop_back (YelpWindow *window)
     GtkAction        *action;
 
     g_return_val_if_fail (YELP_IS_WINDOW (window), NULL);
-    if (!window->priv->history_back)
+    if (!window->priv->history_back) {
 	return NULL;
+    }
 
     priv = window->priv;
 
@@ -1222,9 +1226,11 @@ window_populate (YelpWindow *window)
 				    _("_Search:"),
 				    _("Search for other documentation"),
 				    NULL);
+    gtk_action_set_sensitive (action, yelp_search_pager_search_available ());
     g_signal_connect (G_OBJECT (action), "activate",
 		      G_CALLBACK (search_activated), window);
     gtk_action_group_add_action (priv->action_group, action);
+
 #endif
 
     priv->ui_manager = gtk_ui_manager_new ();
diff -upr yelp-2.18.1-pre/stylesheets/toc2html.xsl yelp-2.18.1-post/stylesheets/toc2html.xsl
--- yelp-2.18.1-pre/stylesheets/toc2html.xsl	2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/stylesheets/toc2html.xsl	2007-09-14 10:39:24.000000000 -0500
@@ -8,6 +8,9 @@
 <xsl:param name="help_icon"/>
 <xsl:param name="help_icon_size"/>
 
+<xsl:param name="yelp.javascript"/>
+<xsl:param name="yelp.topimage"/>
+
 <xsl:param name="yelp.color.fg"/>
 <xsl:param name="yelp.color.bg"/>
 <xsl:param name="yelp.color.anchor"/>
@@ -37,52 +40,54 @@
         <title>
           <xsl:value-of select="title[1]"/>
         </title>
+        <script type="text/javascript">
+          <xsl:attribute name="src">
+            <xsl:value-of select="concat('file://', $yelp.javascript)"/>
+          </xsl:attribute>
+        </script>
         <style type="text/css"><xsl:text>
+
         body {
           margin: 0px;
           padding: 0px;
+          background: white;
+          background-image: url("</xsl:text>
+          <xsl:value-of select="$yelp.topimage"/><xsl:text>");
+          background-position: 0px 0px;
+          background-repeat: no-repeat;
+          font-family: Segoe, Sans;
+          font-size: 11px;
+          position: absolute;
+          width: 100%;
         }
-        h1 {
-          font-size: 1.6em;
-          margin-bottom: 0.4em;
+        div.content {
+          margin-top: 30px;
+          padding: 12px;
+          padding-top: 2px;
+          padding-left: 38px;
+        }
+        #index-header {
           margin-top: 12px;
-          margin-left: 12px;
-          margin-right: 12px;
-          padding-left: 204px;
-          padding-top: 0.2em;
-          padding-bottom: 0.2em;
-          -moz-border-radius: 6px;
-          border: solid 1px </xsl:text>
-          <xsl:value-of select="$yelp.color.selected.bg.dark1"/><xsl:text>;
-          background-color: </xsl:text>
-          <xsl:value-of select="$yelp.color.selected.bg"/><xsl:text>;
-          color: </xsl:text>
-          <xsl:value-of select="$yelp.color.selected.fg"/><xsl:text>;
+	  color: #333366;
+          font-size: 32px;
         }
         h1 img {
-          position: absolute;
-          top: 6px;
+          position: relative;
+          top: -6px;
           right: 18px;
+	  display: none;
         }
 	h2 h3 {
           color: </xsl:text><xsl:value-of select="$yelp.color.fg"/><xsl:text>;
 	}
-        div[class~="body"] { }
-        div[class~="leftbar"] {
-          position: absolute;
-          top: 4em;
-          left: 12px;
-          width: 192px;
-          min-height: 192px;
-          text-align: left;
-          /* padding-top: </xsl:text>
-          <xsl:value-of select="$help_icon_size"/><xsl:text>px;
-          background-image: url("</xsl:text>
-          <xsl:value-of select="$help_icon"/><xsl:text>");
-          background-position: </xsl:text>
-          <xsl:value-of select="(192 - $help_icon_size) div 2"/><xsl:text>px 0px;
-          background-repeat: no-repeat;
-          opacity: .3; */
+	h1 {
+          margin: 0px;
+          padding: 3px;
+          font-size: 16pt;
+        }
+        li.toc li.toc h1 {
+          font-size: 12pt;
+          padding-left: 14px;
         }
         div[class~="leftbackground"] {
           position: absolute;
@@ -100,23 +105,40 @@
           background-repeat: no-repeat;
           opacity: .1;          
         }
-        div[class~="rightbar"] {
-          margin-left: 216px;
-          padding-bottom: 1em;
-          padding-top: 1em;
-          padding-left: 1em;
-          padding-right: 1em;
-          margin-right: 12px;
-          background-color: </xsl:text><xsl:value-of select="$yelp.color.bg"/><xsl:text>;
-          color: </xsl:text><xsl:value-of select="$yelp.color.fg"/><xsl:text>;
-          -moz-border-radius: 8px;
+        h1.child {
+          color: #003399;
         }
-        ul { margin-left: 0em; padding-left: 0em; }
+        h1.child:hover {
+          text-decoration: underline;
+          background: #e9ece0;
+          -moz-border-radius: 5px;
+          color: #003399;
+          cursor: pointer;
+        }
+        div.docs dl dt {
+          font-size: 10pt;
+          margin-left: 24px;
+          margin-top: 6px;
+        }
+        div.docs dl dd {
+          font-size: 9pt;
+          color: #999999;
+          margin-left: 36px;
+        }
+        div.docs a {
+          color: #003399;
+          text-decoration: none;
+        }
+        div.docs a:hover {
+          cursor: pointer;
+          text-decoration: underline;
+        }
+        ul { font-size: 1em; margin-left: 0em; padding-left: 0em; }
+
         li[class~="toclist"] {
-          margin-top: 0.3em;
-          margin-left: 0em;
+          margin-top: 2px;
+          margin-left: 32px;
           padding-left: 0em;
-          font-size: 1.2em;
           list-style-type: none;
         }
 	li li[class~="toclist"] {
@@ -133,20 +155,79 @@
           padding-top: 0.5em;
           list-style-type: none;
         }
-        dl { margin-left: 0em; padding-left: 0em; }
-        dt { font-size: 1.2em; margin-top: 1em; }
-        dd { margin-left: 1em; margin-top: 0.5em; }
-        a { text-decoration: none; color: </xsl:text><xsl:value-of select="$yelp.color.anchor"/><xsl:text>; }
-        a:hover { text-decoration: underline; }
+        div.collapse-action {
+          font-size: 11px;
+          color: red;
+          position: absolute;
+          top: 34px;
+          right: 12px;
+        }
         </xsl:text></style>
       </head>
       <body>
+        
         <xsl:apply-templates mode="body.mode" select="."/>
       </body>
     </html>
   </yelp:document>
 </xsl:template>
 
+<xsl:template name="header">
+  <xsl:param name="class"/>
+  <h1 id="{@id}-header" onclick="show_hide ('{@id}');" class="{$class}">
+    <xsl:if test="icon">
+      <img src="{icon/@file}"/>
+    </xsl:if>
+    <xsl:apply-templates select="title[1]/node()"/>
+  </h1>
+</xsl:template>
+
+<xsl:template name="children">
+  <xsl:param name="class"/>
+  <div id="{@id}-children">
+    <xsl:if test="@id != 'index'">
+      <xsl:attribute name="style">
+        <xsl:value-of select="'display: none'"/>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@id = 'index' or toc[.//doc]">
+      <div class="tocs">
+        <ul>
+          <xsl:for-each select="toc[../@id = 'index' or .//doc]">
+
+            <li class="toc">
+              <xsl:apply-templates mode="children.mode" select="."/>
+            </li>
+          </xsl:for-each>
+        </ul>
+      </div>
+    </xsl:if>
+    <xsl:if test="doc">
+      <div class="docs">
+        <dl>
+          <xsl:for-each select="doc">
+            <xsl:sort select="normalize-space(title)"/>
+            <dt class="doc">
+              <a href="{@href}" title="{@href}">
+                <xsl:if test="tooltip">
+                  <xsl:attribute name="title">
+                    <xsl:value-of select="tooltip"/>
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:value-of select="title"/>
+              </a>
+            </dt>
+            <dd>
+              <xsl:value-of select="description"/>
+            </dd>
+          </xsl:for-each>
+        </dl>
+      </div>
+    </xsl:if>
+  </div>
+ </xsl:template>
 <xsl:template name="print.documents">
   <div class="docs">
     <dl>
@@ -187,52 +268,27 @@
 </xsl:template>
 
 <xsl:template mode="body.mode" match="toc">
-  <div class="leftbackground">
-  </div>
-  <div class="body">
-    <h1>
-      <xsl:if test="icon">
-        <img src="{icon/@file}"/>
-      </xsl:if>
-      <xsl:apply-templates select="title"/>
-    </h1>
-    <div class="leftbar">
-      <xsl:choose>
-      <xsl:when test="@id= 'index'">
-        <h2><xsl:value-of select="/toc/title"/></h2>
-      </xsl:when>
-      <xsl:otherwise>
-        <a href="x-yelp-toc:index"><h2><xsl:value-of select="/toc/title"/>
-      </h2></a>
-      </xsl:otherwise>        
-      </xsl:choose>
-      <xsl:apply-templates mode="leftbar.mode" select="/toc">
-        <xsl:with-param name="curid" select="@id"/>
-      </xsl:apply-templates>
-    </div>
+  <div class="content">
+    <xsl:call-template name="header">
+      <xsl:with-param name="class" select="'index'"/>
+    </xsl:call-template>
     <div class="rightbar">
-      <h3><xsl:apply-templates select="description/node()"/></h3>
-      <xsl:choose>
-        
-        <xsl:when test="doc[1] and toc[.//doc[1]]">
-          <xsl:call-template name="print.documents"/>
-        </xsl:when>
-        
-        <xsl:when test="doc[1]">
-          <xsl:call-template name="print.documents"/>
-        </xsl:when>
-        
-        <xsl:when test="toc[.//doc[1]]">
-          <xsl:call-template name="print.subsections"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <h3>No documents or subcategories found.</h3>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="children">
+        <xsl:with-param name="class" select="'index'"/>
+      </xsl:call-template>
     </div>
   </div>
 </xsl:template>
 
+<xsl:template mode="children.mode" match="toc">
+  <xsl:call-template name="header">
+    <xsl:with-param name="class" select="'child'"/>
+  </xsl:call-template>
+  <xsl:call-template name="children">
+    <xsl:with-param name="class" select="'child'"/>
+  </xsl:call-template>
+</xsl:template>
+
 
 <xsl:template mode="leftbar.mode" match="toc">
   <xsl:param name="curid" select="0"/>

Places

File yelp-suse-20060319.patch of Package yelp (Revision 9b9ad415c47480b2ec83545edf57e72a)

Places