From 33533b338d3a4b1c3c96e2d84f07be91e693981f Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 22 Jul 2008 08:13:29 -0700
Subject: [PATCH] Make it easier to browse published PDF files.

* lisp/muse-latex.el (muse-latex-pdf-program): New option that determines
  the program to use when browsing a PDF file.
  (muse-latex-pdf-browse-file): Use it.

* lisp/muse-mode.el (muse-browse-result): Support styles that use an
  output suffix, such as PDF.

* texi/muse.texi (LaTeX): Document muse-latex-pdf-browser.
---
 ChangeLog          | 11 +++++++++++
 lisp/muse-latex.el |  8 +++++++-
 lisp/muse-mode.el  | 15 ++++++++++-----
 texi/muse.texi     |  5 +++++
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fad0a4e..a752a3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-22  Michael Olson  <mwolson@gnu.org>
+
+	* lisp/muse-latex.el (muse-latex-pdf-program): New option that
+	determines the program to use when browsing a PDF file.
+	(muse-latex-pdf-browse-file): Use it.
+
+	* lisp/muse-mode.el (muse-browse-result): Support styles that use
+	an output suffix, such as PDF.
+
+	* texi/muse.texi (LaTeX): Document muse-latex-pdf-browser.
+
 2008-07-21  Michael Olson  <mwolson@gnu.org>
 
 	* lisp/muse-html.el (muse-html-src-allowed-modes): Docfix.
diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el
index fff2196..0fff683 100644
--- a/lisp/muse-latex.el
+++ b/lisp/muse-latex.el
@@ -64,6 +64,12 @@
   :type 'string
   :group 'muse-latex)
 
+(defcustom muse-latex-pdf-browser "open %s"
+  "The program to use when browsing a published PDF file.
+This should be a format string."
+  :type 'string
+  :group 'muse-latex)
+
 (defcustom muse-latex-pdf-program "pdflatex"
   "The program that is called to generate PDF content from LaTeX content."
   :type 'string
@@ -562,7 +568,7 @@ default Muse will add a footnote for each link."
       "")))
 
 (defun muse-latex-pdf-browse-file (file)
-  (shell-command (concat "open " file)))
+  (shell-command (format muse-latex-pdf-browser file)))
 
 (defun muse-latex-pdf-generate (file output-path final-target)
   (apply
diff --git a/lisp/muse-mode.el b/lisp/muse-mode.el
index 29a7325..aee2700 100644
--- a/lisp/muse-mode.el
+++ b/lisp/muse-mode.el
@@ -620,17 +620,22 @@ in `muse-project-alist'."
   (setq style (muse-style style))
   (muse-project-publish-this-file nil style)
   (let* ((output-dir (muse-style-element :path style))
-         (result-path (muse-publish-output-file buffer-file-name output-dir
+         (output-suffix (muse-style-element :osuffix style))
+         (output-path (muse-publish-output-file buffer-file-name output-dir
                                                 style))
+         (target (if output-suffix
+                     (concat (muse-path-sans-extension output-path)
+                             output-suffix)
+                   output-path))
          (muse-current-output-style (list :base (car style)
                                           :path output-dir)))
-    (if (not (file-readable-p result-path))
-        (error "Cannot open output file '%s'" result-path)
+    (if (not (file-readable-p target))
+        (error "Cannot open output file '%s'" target)
       (if other-window
-          (find-file-other-window result-path)
+          (find-file-other-window target)
         (let ((func (muse-style-element :browser style t)))
           (if func
-              (funcall func result-path)
+              (funcall func target)
             (message "The %s publishing style does not support browsing."
                      style)))))))
 
diff --git a/texi/muse.texi b/texi/muse.texi
index 25bdbfc..6a8b204 100644
--- a/texi/muse.texi
+++ b/texi/muse.texi
@@ -2935,6 +2935,11 @@ Default file extension for publishing LaTeX files.
 @item muse-latex-pdf-extension
 Default file extension for publishing LaTeX files to PDF.
 
+@item muse-latex-pdf-browser
+The program to use when browsing a published PDF file.
+
+This should be a format string.
+
 @item muse-latex-pdf-program
 The program that is called to generate PDF content from LaTeX content.
 
-- 
2.11.4.GIT