GNU bug report logs - #13622
24.3.50; doc-view: Use (and prefer) soffice as default ODF->PDF converter

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Tassilo Horn <tsdh <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#13622: closed (24.3.50; doc-view: Use (and prefer) soffice as
 default ODF->PDF converter)
Date: Sat, 09 Feb 2013 10:04:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sat, 09 Feb 2013 11:03:20 +0100
with message-id <87y5exerdj.fsf <at> thinkpad.tsdh.de>
and subject line Re: 24.3.50; doc-view: Use (and prefer) soffice as default ODF->PDF converter
has caused the debbugs.gnu.org bug report #13622,
regarding 24.3.50; doc-view: Use (and prefer) soffice as default ODF->PDF converter
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
13622: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13622
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Jambunathan K <kjambunathan <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: 24.3.50;
	doc-view: Use (and prefer) soffice as default ODF->PDF converter
Date: Mon, 04 Feb 2013 00:31:47 +0530

[Message part 3 (text/plain, inline)]

I am attaching a patch.  Please apply to trunk.

[Message part 4 (text/plain, inline)]

=== modified file 'lisp/doc-view.el'
--- lisp/doc-view.el	2013-01-24 03:34:20 +0000
+++ lisp/doc-view.el	2013-02-03 18:47:45 +0000
@@ -231,14 +231,36 @@ If this and `doc-view-dvipdfm-program' a
   :type 'file
   :group 'doc-view)
 
-(defcustom doc-view-unoconv-program "unoconv"
+(define-obsolete-variable-alias 'doc-view-unoconv-program
+                                'doc-view-odf->pdf-converter-program
+                                "24.4")
+
+(defcustom doc-view-odf->pdf-converter-program
+  (cond
+   ((executable-find "soffice") "soffice")
+   ((executable-find "unoconv") "unoconv"))
   "Program to convert any file type readable by OpenOffice.org to PDF.
 
 Needed for viewing OpenOffice.org (and MS Office) files."
-  :version "24.1"
+  :version "24.4"
   :type 'file
   :group 'doc-view)
 
+(defcustom doc-view-odf->pdf-converter-function
+  (cond
+   ((string-match "unoconv\\'" doc-view-odf->pdf-converter-program)
+    #'doc-view-odf->pdf-converter-unoconv)
+   ((string-match "soffice\\'" doc-view-odf->pdf-converter-program)
+    #'doc-view-odf->pdf-converter-soffice))
+  "Function to call to convert a ODF file into a PDF file."
+  :type '(radio
+          (function-item doc-view-odf->pdf-converter-unoconv
+                         :doc "Use unoconv")
+          (function-item doc-view-odf->pdf-converter-soffice
+                         :doc "Use LibreOffice")
+          function)
+  :version "24.4")
+
 (defcustom doc-view-ps2pdf-program "ps2pdf"
   "Program to convert PS files to PDF.
 
@@ -700,8 +722,8 @@ OpenDocument format)."
 	 (and doc-view-ghostscript-program
 	      (executable-find doc-view-ghostscript-program)))
 	((eq type 'odf)
-	 (and doc-view-unoconv-program
-	      (executable-find doc-view-unoconv-program)
+	 (and doc-view-odf->pdf-converter-program
+	      (executable-find doc-view-odf->pdf-converter-program)
 	      (doc-view-mode-p 'pdf)))
 	((eq type 'djvu)
 	 (executable-find "ddjvu"))
@@ -903,14 +925,23 @@ If PAGE is nil, convert the whole docume
      ,@(if page `(,(format "%d" page))))
    callback))
 
-(defun doc-view-odf->pdf (odf callback)
+(defun doc-view-odf->pdf-converter-unoconv (odf callback)
   "Convert ODF to PDF asynchronously and call CALLBACK when finished.
 The converted PDF is put into the current cache directory, and it
 is named like ODF with the extension turned to pdf."
-  (doc-view-start-process "odf->pdf" doc-view-unoconv-program
+  (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program
 			  (list "-f" "pdf" "-o" (doc-view-current-cache-dir) odf)
 			  callback))
 
+(defun doc-view-odf->pdf-converter-soffice (odf callback)
+  "Convert ODF to PDF asynchronously and call CALLBACK when finished.
+The converted PDF is put into the current cache directory, and it
+is named like ODF with the extension turned to pdf."
+  (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program
+			  (list "--headless" "--convert-to" "pdf"
+				"--outdir" (doc-view-current-cache-dir) odf)
+			  callback))
+
 (defun doc-view-pdf/ps->png (pdf-ps png)
   ;; FIXME: Fix name and docstring to account for djvu&tiff.
   "Convert PDF-PS to PNG asynchronously."
@@ -1058,7 +1089,7 @@ Those files are saved in the directory g
 	 ;; The unoconv tool only supports an output directory, but no
 	 ;; file name.  It's named like the input file with the
 	 ;; extension replaced by pdf.
-         (doc-view-odf->pdf doc-view-buffer-file-name
+         (funcall doc-view-odf->pdf-converter-function doc-view-buffer-file-name
                             (lambda ()
 			      ;; Rename to doc.pdf
 			      (rename-file opdf pdf)

[Message part 5 (text/plain, inline)]

In GNU Emacs 24.3.50.8 (i686-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2013-02-02 on debian-6.05
Bzr revision: 111663 eliz <at> gnu.org-20130202171424-zeijhu9wq1tstzt0
Windowing system distributor `The X.Org Foundation', version 11.0.10707000
System Description:	Debian GNU/Linux 6.0.5 (squeeze)

[Message part 6 (message/rfc822, inline)]

From: Tassilo Horn <tsdh <at> gnu.org>
To: Chong Yidong <cyd <at> gnu.org>
Cc: Jambunathan K <kjambunathan <at> gmail.com>, 13622-done <at> debbugs.gnu.org
Subject: Re: 24.3.50;
	doc-view: Use (and prefer) soffice as default ODF->PDF converter
Date: Sat, 09 Feb 2013 11:03:20 +0100

Chong Yidong <cyd <at> gnu.org> writes:

Hi Chong,

> Could you please review the changes suggested by Jambunathan K (and go
> ahead and apply them if you agree)?  Thanks.
>
> http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13622

Thanks for notifying.

Oh, I didn't know soffice up to now.  That's a great change as it
removes the (optional) dependency to unoconv which probably nobody has
installed anyway.

I've committed the patch with some minor modification.  Thanks,
Jambunathan!

Bye,
Tassilo

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.