From f08b09fcafc730b5747060b6f3e708b0be618028 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 10 Jun 2012 17:06:34 +0800 Subject: [PATCH] admin.el (make-manuals): Generate misc html manuals too. --- admin/admin.el | 52 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/admin/admin.el b/admin/admin.el index 27b2b3ab648..9fcc5795d21 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -240,7 +240,7 @@ Root must be the root of an Emacs source tree." (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))) + (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)) @@ -248,7 +248,20 @@ Root must be the root of an Emacs source tree." (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))) + (expand-file-name "elisp.ps" ps-dir))) + ;; Misc manuals + (let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode" + "cl" "dbus" "dired-x" "ebrowse" "ede" "ediff" + "edt" "eieio" "emacs-mime" "epa" "erc" "ert" + "eshell" "eudc" "faq" "flymake" "forms" + "gnus" "emacs-gnutls" "idlwave" "info" + "mairix-el" "message" "mh-e" "newsticker" + "nxml-mode" "org" "pcl-cvs" "pgg" "rcirc" + "remember" "reftex" "sasl" "sc" "semantic" + "ses" "sieve" "smtpmail" "speedbar" "tramp" + "url" "vip" "viper" "widget" "woman"))) + (dolist (manual manuals) + (manual-misc-html manual root html-node-dir html-mono-dir))) (message "Manuals created in %s" dest))) (defconst manual-doctype-string @@ -265,6 +278,12 @@ Root must be the root of an Emacs source tree." (defconst manual-style-string "\n") +(defun manual-misc-html (name root html-node-dir html-mono-dir) + (let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root))) + (manual-html-node texi (expand-file-name name html-node-dir)) + (manual-html-mono texi (expand-file-name (concat name ".html") + html-mono-dir)))) + (defun manual-html-mono (texi-file dest) "Run Makeinfo on TEXI-FILE, emitting mono HTML output to DEST. This function also edits the HTML files so that they validate as @@ -307,13 +326,15 @@ the @import directive." (let (copyright-text) (manual-html-fix-index-1) ;; Move copyright notice to the end. - (re-search-forward "[ \t]*

Copyright ©") - (setq opoint (match-beginning 0)) - (re-search-forward "") - (setq copyright-text (buffer-substring opoint (point))) - (delete-region opoint (point)) + (when (re-search-forward "[ \t]*

Copyright ©" nil t) + (setq opoint (match-beginning 0)) + (re-search-forward "") + (setq copyright-text (buffer-substring opoint (point))) + (delete-region opoint (point))) (manual-html-fix-index-2) - (insert copyright-text "\n\n")) + (if copyright-text + (insert copyright-text)) + (insert "\n\n")) ;; For normal nodes, give the header div a blue bg. (manual-html-fix-node-div)) (save-buffer)))))) @@ -369,9 +390,9 @@ Also generate PostScript output in PS-DEST." (defun manual-html-fix-index-1 () (let (opoint) - (re-search-forward "\n\\(

\n") + (setq opoint (match-end 0)) + (search-forward "

\n\n"))) @@ -380,7 +401,8 @@ Also generate PostScript output in PS-DEST." "Replace the index list in the current buffer with a HTML table." (let (done open-td tag desc) ;; Convert the list that Makeinfo made into a table. - (search-forward "