X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=texi%2Finfohack.el;h=3c173ba37022097ab3c67033e6beaac2ee476d33;hb=bb58610dc0061148843df9cebd2a912a813238e2;hp=4fe99499197cc5058c4a9aeb0ceee6f820d72b41;hpb=3738187cad20787b5b99c4061256e30e19ee721a;p=elisp%2Fgnus.git-

diff --git a/texi/infohack.el b/texi/infohack.el
index 4fe9949..3c173ba 100644
--- a/texi/infohack.el
+++ b/texi/infohack.el
@@ -25,11 +25,15 @@
 
 ;;; Code:
 
-(require 'texinfmt)
+(let ((default-directory (expand-file-name "../lisp/"))
+      (features (cons 'w3-forms (copy-sequence features))))
+  ;; Adjust `load-path' for APEL.
+  (load-file "dgnushack.el"))
+(load-file (expand-file-name "ptexinfmt.el" "./"))
 
 (defun infohack-remove-unsupported ()
   (goto-char (point-min))
-  (while (re-search-forward "@\\(end \\)?ifnottex" nil t) 
+  (while (re-search-forward "@\\(end \\)?ifnottex" nil t)
     (replace-match ""))
   (goto-char (point-min))
   (while (search-forward "\n@iflatex\n" nil t)
@@ -42,22 +46,132 @@
 	coding-system)
     (find-file file)
     (setq buffer-read-only nil)
-    (setq coding-system buffer-file-coding-system)
+    (setq coding-system (if (boundp 'buffer-file-coding-system)
+			    buffer-file-coding-system
+			  file-coding-system))
     (infohack-remove-unsupported)
-    (texinfo-every-node-update) 
+    (texinfo-every-node-update)
     (texinfo-format-buffer t) ;; Don't save any file.
     (setq default-directory dest-directory)
-    (setq buffer-file-name 
+    (setq buffer-file-name
 	  (expand-file-name (file-name-nondirectory buffer-file-name)
 			    default-directory))
-    (setq buffer-file-coding-system coding-system)
+    (setq buffer-file-coding-system coding-system
+	  file-coding-system coding-system)
     (if (> (buffer-size) 100000)
 	(Info-split))
     (save-buffer)))
 
+(eval-and-compile
+  (when (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+                      (symbol-name system-type))
+    (defun subst-char-in-region (START END FROMCHAR TOCHAR &optional NOUNDO)
+      "From START to END, replace FROMCHAR with TOCHAR each time it occurs.
+If optional arg NOUNDO is non-nil, don't record this change for undo
+and don't mark the buffer as really changed.
+Both characters must have the same length of multi-byte form."
+      (let ((original-buffer-undo-list buffer-undo-list)
+            (modified (buffer-modified-p)))
+        (if NOUNDO
+            (setq buffer-undo-list t))
+        (goto-char START)
+        (let ((from (char-to-string FROMCHAR))
+              (to (char-to-string TOCHAR)))
+          (while (search-forward from END t)
+            (replace-match to t t)))
+        (if NOUNDO
+            (progn (setq buffer-undo-list original-buffer-undo-list)
+                   (set-buffer-modidifed-p modified)))))))
+
 (defun batch-makeinfo ()
   "Emacs makeinfo in batch mode."
-  (infohack (car command-line-args-left))
+  (infohack-texi-format (car command-line-args-left)
+			(car (cdr command-line-args-left)))
   (setq command-line-args-left nil))
 
+
+(defun infohack-texi-format (file &optional addsuffix)
+  (let ((auto-save-default nil)
+	(find-file-run-dired nil)
+	coding-system-for-write
+	output-coding-system
+	(error 0))
+    (condition-case err
+	(progn
+	  (find-file file)
+	  (setq buffer-read-only nil)
+	  (buffer-disable-undo (current-buffer))
+	  (if (boundp 'MULE)
+	      (setq output-coding-system file-coding-system)
+	    (setq coding-system-for-write buffer-file-coding-system))
+	  ;; Remove ignored areas first.
+	  (while (re-search-forward "^@ignore[\t\r ]*$" nil t)
+	    (delete-region (match-beginning 0)
+			   (if (re-search-forward
+				"^@end[\t ]+ignore[\t\r ]*$" nil t)
+			       (1+ (match-end 0))
+			     (point-max))))
+	  (infohack-remove-unsupported)
+	  (goto-char (point-min))
+	  ;; Add suffix if it is needed.
+	  (when (and addsuffix
+		     (re-search-forward "^@setfilename[\t ]+\\([^\t\n ]+\\)"
+					nil t)
+		     (not (string-match "\\.info$" (match-string 1))))
+	    (insert ".info")
+	    (goto-char (point-min)))
+	  ;; process @include before updating node
+	  ;; This might produce some problem if we use @lowersection or
+	  ;; such.
+	  (let ((input-directory default-directory)
+		(texinfo-command-end))
+	    (while (re-search-forward "^@include" nil t)
+	      (setq texinfo-command-end (point))
+	      (let ((filename (concat input-directory
+				      (texinfo-parse-line-arg))))
+		(re-search-backward "^@include")
+		(delete-region (point) (save-excursion
+					 (forward-line 1)
+					 (point)))
+		(message "Reading included file: %s" filename)
+		(save-excursion
+		  (save-restriction
+		    (narrow-to-region
+		     (point) (+ (point)
+				(car (cdr (insert-file-contents filename)))))
+		    (goto-char (point-min))
+		    ;; Remove `@setfilename' line from included file,
+		    ;; if any, so @setfilename command not duplicated.
+		    (if (re-search-forward "^@setfilename"
+					   (save-excursion
+					     (forward-line 100)
+					     (point))
+					   t)
+			(progn
+			  (beginning-of-line)
+			  (delete-region (point) (save-excursion
+						   (forward-line 1)
+						   (point))))))))))
+	  (texinfo-mode)
+	  (texinfo-every-node-update)
+	  (set-buffer-modified-p nil)
+	  (message "texinfo formatting %s..." file)
+	  (texinfo-format-buffer nil)
+	  (if (buffer-modified-p)
+	      (progn (message "Saving modified %s" (buffer-file-name))
+		     (save-buffer))))
+      (error
+       (message ">> Error: %s" (prin1-to-string err))
+       (message ">>  point at")
+       (let ((s (buffer-substring (point) (min (+ (point) 100) (point-max))))
+	     (tem 0))
+	 (while (setq tem (string-match "\n+" s tem))
+	   (setq s (concat (substring s 0 (match-beginning 0))
+			   "\n>>  "
+			   (substring s (match-end 0)))
+		 tem (1+ tem)))
+	 (message ">>  %s" s))
+       (setq error 1)))
+    (kill-emacs error)))
+
 ;;; infohack.el ends here