X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ptexinfmt.el;h=bfe1413fa7d127cda7bc99f58d63d372b2157ff2;hb=a7c8afcefdaa5bd61967537e84ee39324489fbfc;hp=267f545a4465d2455118b91cb46c37b9e641937f;hpb=bc2ca8c1a65acaf43333fc7f069762d8ce8cd6bb;p=elisp%2Fgnus-doc-ja.git diff --git a/ptexinfmt.el b/ptexinfmt.el index 267f545..bfe1413 100644 --- a/ptexinfmt.el +++ b/ptexinfmt.el @@ -1,4 +1,4 @@ -;;; ptexinfmt.el -- portable Texinfo formatter. +;;; ptexinfmt.el --- portable Texinfo formatter -*- lexical-binding: t -*- ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, ;; 1994, 1995, 1996, 1997 Free Software Foundation, Inc. @@ -37,24 +37,29 @@ ;; Modified by Yamaoka not to use APEL functions. ;; Unimplemented command: -;; @abbr -;; @float, @caption, @shortcaption, @listoffloats +;; @abbr{ABBREVIATION} +;; @float ... @end float, @caption{TEXT}, @shortcaption{TEXT}, @listoffloats ;; @deftypecv[x] ;; @headitem ;; @comma{} ;; @quotation (optional arguments) -;; @acronym (optional argument) +;; @acronym{ACRONYM[, MEANING]} (optional argument) ;; @dofirstparagraphindent ;; @indent -;; @verbatiminclude +;; @verbatiminclude FILENAME ;; @\ -;; @definfoenclose -;; @deftypeivar -;; @deftypeop +;; @definfoenclose phoo,//,\\ +;; @deftypeivar CLASS DATA-TYPE VARIABLE-NAME +;; @deftypeop CATEGORY CLASS DATA-TYPE NAME ARGUMENTS... +;; @allowcodebreaks false +;; @thischapternum +;; @quotedblleft @quotedblright +;; @quoteleft @quoteright @quotedblbase @quotesinglbase +;; @guillemetleft @guillemetright @guilsinglleft @guilsinglright. +;; @clicksequence, @click, @clickstyle, @arrow ;;; Code: -(require 'backquote) (require 'texinfmt) ;;; Broken @@ -64,61 +69,63 @@ This is last argument in `ptexinfmt-broken-facility'.") (put 'ptexinfmt-broken-facility 'lisp-indent-function 'defun) (defmacro ptexinfmt-broken-facility (facility docstring assertion - &optional dummy) + &optional _dummy) "Declare a symbol FACILITY is broken if ASSERTION is nil. DOCSTRING will be printed if ASSERTION is nil and `ptexinfmt-disable-broken-notice-flag' is nil." - (` (let ((facility '(, facility)) - (docstring (, docstring)) - (assertion (eval '(, assertion)))) - (put facility 'broken (not assertion)) - (if assertion + `(let ((facility ',facility) + (docstring ,docstring) + (assertion (eval ',assertion))) + (put facility 'broken (not assertion)) + (if assertion + nil + (put facility 'broken-docstring docstring) + (if ptexinfmt-disable-broken-notice-flag nil - (put facility 'broken-docstring docstring) - (if ptexinfmt-disable-broken-notice-flag - nil - (message "BROKEN FACILITY DETECTED: %s" docstring)))))) + (message "BROKEN FACILITY DETECTED: %s" docstring))))) (put 'ptexinfmt-defun-if-broken 'lisp-indent-function 'defun) (defmacro ptexinfmt-defun-if-broken (&rest args) "Redefine a function just like `defun' if it is considered broken." (let ((name (list 'quote (car args)))) (setq args (cdr args)) - (` (prog1 - (, name) - (if (get (, name) 'broken) - (defalias (, name) - (function (lambda (,@ args))))))))) + `(prog1 + ,name + (if (get ,name 'broken) + (defalias ,name + (function (lambda ,@args))))))) (put 'ptexinfmt-defun-if-void 'lisp-indent-function 'defun) (defmacro ptexinfmt-defun-if-void (&rest args) "Define a function just like `defun' unless it is already defined." (let ((name (list 'quote (car args)))) (setq args (cdr args)) - (` (prog1 - (, name) - (if (fboundp (, name)) - nil - (defalias (, name) - (function (lambda (,@ args))))))))) + `(prog1 + ,name + (if (fboundp ,name) + nil + (defalias ,name + (function (lambda ,@args))))))) (put 'ptexinfmt-defvar-if-void 'lisp-indent-function 'defun) (defmacro ptexinfmt-defvar-if-void (&rest args) "Define a variable just like `defvar' unless it is already defined." (let ((name (car args))) (setq args (cdr args)) - (` (prog1 - (defvar (, name)) - (if (boundp '(, name)) - nil - (defvar (, name) (,@ args))))))) + `(prog1 + (defvar ,name) + (if (boundp ',name) + nil + (defvar ,name ,@args))))) ;; sort -fd (ptexinfmt-broken-facility texinfo-format-printindex "Can't sort on Mule for Windows." t) -;; @var +;; @var{METASYNTACTIC-VARIABLE} +(defvar texinfo-enclosure-list) +(defvar texinfo-alias-list) (ptexinfmt-broken-facility texinfo-format-var "Don't perse @var argument." (condition-case nil @@ -130,7 +137,8 @@ DOCSTRING will be printed if ASSERTION is nil and t)) (error nil))) -;; @xref +;; @xref{NODE-NAME[, CROSS-REFERENCE-NAME, TITLE-OR-TOPIC, +;; INFO-FILE-NAME, PRINTED-MANUAL-TITLE]}. (ptexinfmt-broken-facility texinfo-format-xref "Can't format @xref, 1st argument is empty." (condition-case nil @@ -142,7 +150,7 @@ DOCSTRING will be printed if ASSERTION is nil and t)) (error nil))) -;; @uref +;; @uref{URL[, TEXT][, REPLACEMENT]} (ptexinfmt-broken-facility texinfo-format-uref "Parse twice @uref argument." (condition-case nil @@ -159,7 +167,10 @@ DOCSTRING will be printed if ASSERTION is nil and "`texinfo-multitable-widths' unsupport wide-char." (if (fboundp 'texinfo-multitable-widths) (with-temp-buffer - (let ((str "幅広文字")) + (let ((str (string (make-char 'japanese-jisx0208 73 125) + (make-char 'japanese-jisx0208 57 45) + (make-char 'japanese-jisx0208 74 56) + (make-char 'japanese-jisx0208 59 122)))) (texinfo-mode) (insert (format " {%s}\n" str)) (goto-char (point-min)) @@ -188,6 +199,7 @@ DOCSTRING will be printed if ASSERTION is nil and (put 'afourwide 'texinfo-format 'texinfo-discard-line) (put 'afivepaper 'texinfo-format 'texinfo-discard-line) (put 'pagesizes 'texinfo-format 'texinfo-discard-line-with-args) +(put 'fonttextsize 'texinfo-format 'texinfo-discard-line-with-args) ;; style (put 'setchapternewpage 'texinfo-format 'texinfo-discard-line-with-args) @@ -197,6 +209,7 @@ DOCSTRING will be printed if ASSERTION is nil and (put 'setcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line) (put 'setshortcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line) (put 'novalidate 'texinfo-format 'texinfo-discard-line-with-args) +(put 'frenchspacing 'texinfo-format 'texinfo-discard-line-with-args) ;; head & foot (put 'headings 'texinfo-format 'texinfo-discard-line-with-args) @@ -211,9 +224,12 @@ DOCSTRING will be printed if ASSERTION is nil and (put 'page 'texinfo-format 'texinfo-discard-line) (put 'hyphenation 'texinfo-format 'texinfo-discard-command-and-arg) -;; @slanted{} (makeinfo 4.8 or later) +;; @slanted{TEXT} (makeinfo 4.8 or later) (put 'slanted 'texinfo-format 'texinfo-format-noop) +;; @sansserif{TEXT} (makeinfo 4.8 or later) +(put 'sansserif 'texinfo-format 'texinfo-format-noop) + ;; @tie{} (makeinfo 4.3 or later) (put 'tie 'texinfo-format 'texinfo-format-tie) (ptexinfmt-defun-if-void texinfo-format-tie () @@ -222,7 +238,7 @@ DOCSTRING will be printed if ASSERTION is nil and ;;; Directory File -;; @direcategory +;; @direcategory DIRPART (put 'dircategory 'texinfo-format 'texinfo-format-dircategory) (ptexinfmt-defun-if-void texinfo-format-dircategory () (let ((str (texinfo-parse-arg-discard))) @@ -232,7 +248,7 @@ DOCSTRING will be printed if ASSERTION is nil and (point))) (insert "INFO-DIR-SECTION " str "\n"))) -;; @direntry +;; @direntry ... @end direntry (put 'direntry 'texinfo-format 'texinfo-format-direntry) (ptexinfmt-defun-if-void texinfo-format-direntry () (texinfo-push-stack 'direntry nil) @@ -325,22 +341,28 @@ DOCSTRING will be printed if ASSERTION is nil and ;;; Marking -;; @indicateurl, @url, @env, @command, +;; @env{ENVIRONMENT-VARIABLE} (put 'env 'texinfo-format 'texinfo-format-code) + +;; @command{COMMAND-NAME} (put 'command 'texinfo-format 'texinfo-format-code) +;; @indicateurl{INDICATEURL} (put 'indicateurl 'texinfo-format 'texinfo-format-code) + +;; @url{URL[, DISPLAYED-TEXT][, REPLACEMENT} (put 'url 'texinfo-format 'texinfo-format-uref) ; Texinfo 4.7 -;; @acronym +;; @acronym{ACRONYM} (put 'acronym 'texinfo-format 'texinfo-format-var) +;; @var{METASYNTACTIC-VARIABLE} (ptexinfmt-defun-if-broken texinfo-format-var () (let ((arg (texinfo-parse-expanded-arg))) (texinfo-discard-command) (insert (upcase arg)))) -;; @key +;; @key{KEY-NAME} (put 'key 'texinfo-format 'texinfo-format-key) (ptexinfmt-defun-if-void texinfo-format-key () (insert (texinfo-parse-arg-discard)) @@ -358,7 +380,7 @@ Insert < ... > around EMAIL-ADDRESS." (insert (nth 1 args) " <" (nth 0 args) ">") (insert "<" (nth 0 args) ">")))) -;; @option +;; @option{OPTION-NAME} (put 'option 'texinfo-format 'texinfo-format-option) (ptexinfmt-defun-if-void texinfo-format-option () "Insert ` ... ' around arg unless inside a table; in that case, no quotes." @@ -387,24 +409,31 @@ For example, @verb\{|@|\} results in @ and (error "Not found: @verb start brace")) (delete-region texinfo-command-start (+ 2 texinfo-command-end)) (search-forward delimiter)) - (delete-backward-char 1) + (delete-char -1) (unless (looking-at "}") (error "Not found: @verb end brace")) (delete-char 1)) -;;; @LaTeX, @registeredsymbol{} +;; @LaTeX{} (put 'LaTeX 'texinfo-format 'texinfo-format-LaTeX) (ptexinfmt-defun-if-void texinfo-format-LaTeX () (texinfo-parse-arg-discard) (insert "LaTeX")) +;; @registeredsymbol{} (put 'registeredsymbol 'texinfo-format 'texinfo-format-registeredsymbol) (ptexinfmt-defun-if-void texinfo-format-registeredsymbol () (texinfo-parse-arg-discard) (insert "(R)")) ;;; Accents and Special characters +;; @euro{} ==> Euro +(put 'euro 'texinfo-format 'texinfo-format-euro) +(ptexinfmt-defun-if-void texinfo-format-euro () + (texinfo-parse-arg-discard) + (insert "Euro ")) + ;; @pounds{} ==> # Pounds Sterling (put 'pounds 'texinfo-format 'texinfo-format-pounds) (ptexinfmt-defun-if-void texinfo-format-pounds () @@ -415,7 +444,7 @@ For example, @verb\{|@|\} results in @ and (put 'ordf 'texinfo-format 'texinfo-format-ordf) (ptexinfmt-defun-if-void texinfo-format-ordf () (texinfo-parse-arg-discard) - (insert "o")) + (insert "a")) ;; @ordm{} ==> o Spanish masculine (put 'ordm 'texinfo-format 'texinfo-format-ordm) @@ -502,7 +531,7 @@ For example, @verb\{|@|\} results in @ and (goto-char texinfo-command-start)) ;; @,{c} ==> c, cedilla accent -(put ', 'texinfo-format 'texinfo-format-cedilla-accent) +(put '\, 'texinfo-format 'texinfo-format-cedilla-accent) (ptexinfmt-defun-if-void texinfo-format-cedilla-accent () (insert (texinfo-parse-arg-discard) ",") (goto-char texinfo-command-start)) @@ -583,9 +612,28 @@ For example, @verb\{|@|\} results in @ and (ptexinfmt-defun-if-void texinfo-format-\/ () (texinfo-discard-command)) +;; @textdegree{} +(put 'textdegree 'texinfo-format 'texinfo-format-textdegree) +(ptexinfmt-defun-if-void texinfo-format-textdegree () + (insert "o" (texinfo-parse-arg-discard)) + (goto-char texinfo-command-start)) + +;; @geq{} +(put 'geq 'texinfo-format 'texinfo-format-geq) +(ptexinfmt-defun-if-void texinfo-format-geq () + (insert ">=" (texinfo-parse-arg-discard)) + (goto-char texinfo-command-start)) + +;; @leq{} +(put 'leq 'texinfo-format 'texinfo-format-leq) +(ptexinfmt-defun-if-void texinfo-format-leq () + (insert "<=" (texinfo-parse-arg-discard)) + (goto-char texinfo-command-start)) + ;;; Cross References -;; @ref, @xref +;; @ref{NODE-NAME, ...} +;; @xref{NODE-NAME, ...} (put 'ref 'texinfo-format 'texinfo-format-xref) (ptexinfmt-defun-if-broken texinfo-format-xref () @@ -614,7 +662,7 @@ otherwise, insert URL-TITLE followed by URL in parentheses." (insert (nth 1 args) " (" (nth 0 args) ")") (insert "`" (nth 0 args) "'")))) -;; @inforef +;; @inforef{NODE-NAME, CROSS-REFERENCE-NAME, INFO-FILE-NAME} (put 'inforef 'texinfo-format 'texinfo-format-inforef) (ptexinfmt-defun-if-void texinfo-format-inforef () (let ((args (texinfo-format-parse-args))) @@ -624,7 +672,7 @@ otherwise, insert URL-TITLE followed by URL in parentheses." (insert "*Note " "(" (nth 2 args) ")" (car args) "::")))) -;; @anchor +;; @anchor{NAME} ;; don't emulation ;; If support @anchor for Mule 2.3, We must fix informat.el and info.el: ;; - Info-tagify suport @anthor-*-refill. @@ -942,6 +990,40 @@ This command is executed when texinfmt sees @item inside @multitable." (texinfo-sort-region opoint (point)) (shell-command-on-region opoint (point) "sort -fd" 1)))) + +;; @copying ... @end copying +;; that Emacs 21.4 and lesser and XEmacs don't support. +(if (fboundp 'texinfo-copying) + nil + (defvar texinfo-copying-text "" + "Text of the copyright notice and copying permissions.") + + (defun texinfo-copying () + "Copy the copyright notice and copying permissions from the Texinfo file, +as indicated by the @copying ... @end copying command; +insert the text with the @insertcopying command." + (let ((beg (progn (beginning-of-line) (point))) + (end (progn (re-search-forward "^@end copying[ \t]*\n") (point)))) + (setq texinfo-copying-text + (buffer-substring-no-properties + (save-excursion (goto-char beg) (forward-line 1) (point)) + (save-excursion (goto-char end) (forward-line -1) (point)))) + (delete-region beg end))) + + (defun texinfo-insertcopying () + "Insert the copyright notice and copying permissions from the Texinfo file, +which are indicated by the @copying ... @end copying command." + (insert (concat "\n" texinfo-copying-text))) + + (defadvice texinfo-format-scan (before expand-@copying-section activate) + "Extract @copying and replace @insertcopying with it." + (goto-char (point-min)) + (when (search-forward "@copying" nil t) + (texinfo-copying)) + (while (search-forward "@insertcopying" nil t) + (delete-region (match-beginning 0) (match-end 0)) + (texinfo-insertcopying)))) + (provide 'ptexinfmt) ;;; ptexinfmt.el ends here