[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113217: * admin/admin.el (make-manuals): Don't both
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r113217: * admin/admin.el (make-manuals): Don't bother with txt or dvi any more. |
Date: |
Sat, 29 Jun 2013 01:51:37 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113217
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-28 18:51:32 -0700
message:
* admin/admin.el (make-manuals): Don't bother with txt or dvi any more.
(manual-txt): Remove.
(manual-pdf): Doc fix.
(manual-ps): Rename from manual-dvi.
modified:
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
admin/admin.el admin.el-20091113204419-o5vbwnq5f7feedwu-2254
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2013-06-19 20:10:57 +0000
+++ b/admin/ChangeLog 2013-06-29 01:51:32 +0000
@@ -1,3 +1,10 @@
+2013-06-29 Glenn Morris <address@hidden>
+
+ * admin.el (make-manuals): Don't bother with txt or dvi any more.
+ (manual-txt): Remove.
+ (manual-pdf): Doc fix.
+ (manual-ps): Rename from manual-dvi.
+
2013-06-15 Xue Fuqiao <address@hidden>
* notes/changelogs: Mention trivial changes in Change Log.
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2013-06-13 06:18:57 +0000
+++ b/admin/admin.el 2013-06-29 01:51:32 +0000
@@ -199,8 +199,6 @@
(let* ((dest (expand-file-name "manual" root))
(html-node-dir (expand-file-name "html_node" dest))
(html-mono-dir (expand-file-name "html_mono" dest))
- (txt-dir (expand-file-name "text" dest))
- (dvi-dir (expand-file-name "dvi" dest))
(ps-dir (expand-file-name "ps" dest)))
(when (file-directory-p dest)
(if (y-or-n-p (format "Directory %s exists, delete it first?" dest))
@@ -209,41 +207,31 @@
(make-directory dest)
(make-directory html-node-dir)
(make-directory html-mono-dir)
- (make-directory txt-dir)
- (make-directory dvi-dir)
(make-directory ps-dir)
;; Emacs manual
(let ((texi (expand-file-name "doc/emacs/emacs.texi" root)))
(manual-html-node texi (expand-file-name "emacs" html-node-dir))
(manual-html-mono texi (expand-file-name "emacs.html" html-mono-dir))
- (manual-txt texi (expand-file-name "emacs.txt" txt-dir))
(manual-pdf texi (expand-file-name "emacs.pdf" dest))
- (manual-dvi texi (expand-file-name "emacs.dvi" dvi-dir)
- (expand-file-name "emacs.ps" ps-dir)))
+ (manual-ps texi (expand-file-name "emacs.ps" ps-dir)))
;; Lisp manual
(let ((texi (expand-file-name "doc/lispref/elisp.texi" root)))
(manual-html-node texi (expand-file-name "elisp" html-node-dir))
(manual-html-mono texi (expand-file-name "elisp.html" html-mono-dir))
- (manual-txt texi (expand-file-name "elisp.txt" txt-dir))
(manual-pdf texi (expand-file-name "elisp.pdf" dest))
- (manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir)
- (expand-file-name "elisp.ps" ps-dir)))
+ (manual-ps texi (expand-file-name "elisp.ps" ps-dir)))
(let ((texi (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
(dest (expand-file-name "emacs-lisp-intro" dest))
- dest2 dest3)
+ dest2)
;; Mimic the atypical directory layout used for emacs-lisp-intro.
(make-directory dest)
(make-directory (setq dest2 (expand-file-name "html_node" dest)))
(manual-html-node texi dest2)
(make-directory (setq dest2 (expand-file-name "html_mono" dest)))
(manual-html-mono texi (expand-file-name "emacs-lisp-intro.html" dest2))
- (make-directory (setq dest2 (expand-file-name "txt" dest)))
- (manual-txt texi (expand-file-name "emacs-lisp-intro.txt" dest2))
(manual-pdf texi (expand-file-name "emacs-lisp-intro.pdf" dest))
- (make-directory (setq dest2 (expand-file-name "dvi" dest)))
- (make-directory (setq dest3 (expand-file-name "ps" dest)))
- (manual-dvi texi (expand-file-name "emacs-lisp-intro.dvi" dest2)
- (expand-file-name "emacs-lisp-intro.ps" dest3)))
+ (make-directory (setq dest2 (expand-file-name "ps" dest)))
+ (manual-ps texi (expand-file-name "emacs-lisp-intro.ps" dest2)))
;; Misc manuals
(let ((manuals '("ada-mode" "auth" "autotype" "bovine" "calc" "cc-mode"
"cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
@@ -344,18 +332,8 @@
(manual-html-fix-node-div))
(save-buffer))))))
-(defun manual-txt (texi-file dest)
- "Run Makeinfo on TEXI-FILE, emitting plaintext output to DEST."
- (call-process "makeinfo" nil nil nil
- "-I" (expand-file-name "../emacs"
- (file-name-directory texi-file))
- "-I" (expand-file-name "../misc"
- (file-name-directory texi-file))
- "--plaintext" "--no-split" texi-file "-o" dest)
- (shell-command (concat "gzip -c " dest " > " (concat dest ".gz"))))
-
(defun manual-pdf (texi-file dest)
- "Run texi2pdf on TEXI-FILE, emitting plaintext output to DEST."
+ "Run texi2pdf on TEXI-FILE, emitting pdf output to DEST."
(call-process "texi2pdf" nil nil nil
"-I" (expand-file-name "../emacs"
(file-name-directory texi-file))
@@ -363,18 +341,18 @@
(file-name-directory texi-file))
texi-file "-o" dest))
-(defun manual-dvi (texi-file dest ps-dest)
- "Run texi2dvi on TEXI-FILE, emitting dvi output to DEST.
-Also generate PostScript output in PS-DEST."
- (call-process "texi2dvi" nil nil nil
- "-I" (expand-file-name "../emacs"
- (file-name-directory texi-file))
- "-I" (expand-file-name "../misc"
- (file-name-directory texi-file))
- texi-file "-o" dest)
- (call-process "dvips" nil nil nil dest "-o" ps-dest)
- (call-process "gzip" nil nil nil dest)
- (call-process "gzip" nil nil nil ps-dest))
+(defun manual-ps (texi-file dest)
+ "Generate a PostScript version of TEXI-FILE as DEST."
+ (let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi")))
+ (call-process "texi2dvi" nil nil nil
+ "-I" (expand-file-name "../emacs"
+ (file-name-directory texi-file))
+ "-I" (expand-file-name "../misc"
+ (file-name-directory texi-file))
+ texi-file "-o" dvi-dest)
+ (call-process "dvips" nil nil nil dvi-dest "-o" dest)
+ (delete-file dvi-dest)
+ (call-process "gzip" nil nil nil dest)))
(defun manual-html-fix-headers ()
"Fix up HTML headers for the Emacs manual in the current buffer."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113217: * admin/admin.el (make-manuals): Don't bother with txt or dvi any more.,
Glenn Morris <=