; Merge from origin/emacs-25

[gnu-emacs] / lisp / org / org-docview.el

diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index 0ef5df0fda6ce859664c907ff14c855362963fc3..feed9d850a22265a7730b2710ddf10fbe90cf7e8 100644 (file)
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -1,11 +1,10 @@
 ;;; org-docview.el --- support for links to doc-view-mode buffers
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.01
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -45,13 +44,27 @@
 
 
 (require 'org)
-(eval-when-compile (require 'doc-view))        ; doc-view-current-page macro
+(require 'doc-view)
 
-(autoload 'doc-view-goto-page "doc-view")
+(declare-function doc-view-goto-page "doc-view" (page))
+(declare-function image-mode-window-get "image-mode" (prop &optional winprops))
 
-(org-add-link-type "docview" 'org-docview-open)
+(org-add-link-type "docview" 'org-docview-open 'org-docview-export)
 (add-hook 'org-store-link-functions 'org-docview-store-link)
 
+(defun org-docview-export (link description format)
+  "Export a docview link from Org files."
+  (let* ((path (when (string-match "\\(.+\\)::.+" link)
+                (match-string 1 link)))
+         (desc (or description link)))
+    (when (stringp path)
+      (setq path (org-link-escape (expand-file-name path)))
+      (cond
+       ((eq format 'html) (format "<a href=\"%s\">%s</a>" path desc))
+       ((eq format 'latex) (format "\\href{%s}{%s}" path desc))
+       ((eq format 'ascii) (format "%s (%s)" desc path))
+       (t path)))))
+
 (defun org-docview-open (link)
   (when (string-match "\\(.*\\)::\\([0-9]+\\)$"  link)
     (let* ((path (match-string 1 link))
@@ -66,7 +79,7 @@
   (when (eq major-mode 'doc-view-mode)
     ;; This buffer is in doc-view-mode
     (let* ((path buffer-file-name)
-          (page (doc-view-current-page))
+          (page (image-mode-window-get 'page))
           (link (concat "docview:" path "::" (number-to-string page)))
           (description ""))
       (org-store-link-props
@@ -85,6 +98,4 @@ and append it."
 
 (provide 'org-docview)
 
-;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
-
 ;;; org-docview.el ends here