get_djvu_link_dest (const DjvuDocument *djvu_document, const gchar *link_name, int base_page)
{
guint64 page_num = 0;
- gchar *end_ptr;
/* #pagenum, #+pageoffset, #-pageoffset */
if (g_str_has_prefix (link_name, "#")) {
/* The (bookmarks) cons */
iter = miniexp_cdr (iter);
} else if ( miniexp_length (iter) >= 2 ) {
+ gchar *utf8_title = NULL;
+
/* An entry */
if (!string_from_miniexp (miniexp_car (iter), &title)) goto unknown_entry;
if (!string_from_miniexp (miniexp_cadr (iter), &link_dest)) goto unknown_entry;
+
if (!g_utf8_validate (title, -1, NULL)) {
- gchar *utf8_title;
-
utf8_title = str_to_utf8 (title);
title_markup = g_markup_escape_text (utf8_title, -1);
- g_free (utf8_title);
} else {
title_markup = g_markup_escape_text (title, -1);
}
if (g_str_has_suffix (link_dest, ".djvu")) {
/* FIXME: component file identifiers */
} else if (ev_action) {
- ev_link = ev_link_new (title, ev_action);
+ ev_link = ev_link_new (utf8_title ? utf8_title : title, ev_action);
gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent);
gtk_tree_store_set (GTK_TREE_STORE (model), &tree_iter,
EV_DOCUMENT_LINKS_COLUMN_MARKUP, title_markup,
}
g_free (title_markup);
-
+ g_free (utf8_title);
iter = miniexp_cddr (iter);
parent = &tree_iter;
} else {
EvLinkMapping *ev_link_mapping)
{
miniexp_t iter;
- ddjvu_pageinfo_t info;
iter = sexp;
miniexp_t outline;
while ((outline = ddjvu_document_get_outline (djvu_document->d_document)) == miniexp_dummy)
- djvu_handle_events (djvu_document, TRUE);
+ djvu_handle_events (djvu_document, TRUE, NULL);
if (outline) {
ddjvu_miniexp_release (djvu_document->d_document, outline);
ddjvu_pageinfo_t page_info;
while ((page_annotations = ddjvu_document_get_pageanno (djvu_document->d_document, page)) == miniexp_dummy)
- djvu_handle_events (djvu_document, TRUE);
+ djvu_handle_events (djvu_document, TRUE, NULL);
while (ddjvu_document_get_pageinfo (djvu_document->d_document, page, &page_info) < DDJVU_JOB_OK)
- djvu_handle_events(djvu_document, TRUE);
+ djvu_handle_events(djvu_document, TRUE, NULL);
if (page_annotations) {
hyperlinks = ddjvu_anno_get_hyperlinks (page_annotations);
DjvuDocument *djvu_document = DJVU_DOCUMENT (document_links);
EvLinkDest *ev_dest = NULL;
- ev_dest = get_djvu_link_dest (DJVU_DOCUMENT (document_links), link_name, -1);
+ ev_dest = get_djvu_link_dest (djvu_document, link_name, -1);
if (!ev_dest) {
g_warning ("DjvuLibre error: unknown link destination %s", link_name);
miniexp_t outline = miniexp_nil;
while ((outline = ddjvu_document_get_outline (djvu_document->d_document)) == miniexp_dummy)
- djvu_handle_events (djvu_document, TRUE);
+ djvu_handle_events (djvu_document, TRUE, NULL);
if (outline) {
model = (GtkTreeModel *) gtk_tree_store_new (EV_DOCUMENT_LINKS_COLUMN_NUM_COLUMNS,