From: morioka Date: Mon, 19 Oct 1998 16:27:59 +0000 (+0000) Subject: Sync up with main trunk. X-Git-Tag: flim-1_11_1~14 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=09efb883ad9987614c411516d87d50d572bceb03;p=elisp%2Fflim.git Sync up with main trunk. --- diff --git a/ChangeLog b/ChangeLog index b0696e7..2d49957 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,39 @@ 1998-10-18 MORIOKA Tomohiko + * mime-en.sgml, mime-ja.sgml (Header encoder/decoder): Add + description about `eword-field-encoding-method-alist'. + + * mime-en.sgml (Header encoder/decoder): Modify description about + `eword-encode-header'. + + * mime-ja.sgml (Header encoder/decoder): Translate. + +1998-10-18 MORIOKA Tomohiko + + * mime-en.sgml (entity formatting): Fix typo in description of + `default-mime-charset'. + + * mime-en.sgml (Header encoder/decoder): Modify description of + `eword-decode-header'. + + * mime-ja.sgml, mime-en.sgml (Header encoder/decoder): fix typo. + + * mime-en.sgml (encoder/decoder): Translate description of + `mime-decode-string'. + +1998-10-18 MORIOKA Tomohiko + + * mime-en.sgml (Content-Disposition parser): Modify description. + + * mime-en.sgml (Content-Type parser): Modify description. + +1998-10-18 MORIOKA Tomohiko + + * mime-en.sgml (Content-Transfer-Encoding parser): Translate. + + +1998-10-18 MORIOKA Tomohiko + * FLIM: Version 1.11.0 (Yamadagawa) was released. 1998-10-17 MORIOKA Tomohiko diff --git a/mime-en.sgml b/mime-en.sgml index 2523585..de14cb9 100644 --- a/mime-en.sgml +++ b/mime-en.sgml @@ -299,9 +299,9 @@ used as default value.

-Symbol to indicate default value of MIME-charset. +Symbol to indicate default value of MIME charset.

-It is used when MIME-charset is not specified. +It is used when MIME charset is not specified.

It is originally variable of APEL. @@ -563,15 +563,16 @@ Return value of parameter of content-type. Content-Type parser

- string + string

-Parse string as field-body of Content-Type field. +Parse string as a field-body of Content-Type field, and +return the result as mime-content-type structure.

-Read field-body of Content-Type field from current-buffer, -and return parsed it. +Parse Content-Type field of the current buffer, and return the result +as mime-content-type structure.

Return nil if Content-Type field is not found. @@ -581,7 +582,7 @@ Return nil if Content-Type field is not found. Content-Type utility

- type subtype + type subtype

Return type/subtype string from type and subtype. @@ -596,10 +597,10 @@ specify presentation of an entity or attributes of an entity, such as file name. + author="S. Dorner, K. Moore and R. Troost" + title="Communicating Presentation Information in Internet + Messages: The Content-Disposition Header" date="August + 1997">

FLIM provides parser for Content-Disposition field and structure mime-content-disposition to store information of @@ -649,14 +650,16 @@ Return filename of content-disposition. string

Parse string as field-body of Content-Disposition field, -and return the result. +and return the result as mime-content-disposition +structure.

-Read field-body of Content-Disposition field from current-buffer, +Parse Content-Disposition field of the current buffer, and return the +result as mime-content-disposition structure.

-Return nil if Content-Disposition field is not found. +Return nil if Content-Disposition field is not found. @@ -678,19 +681,21 @@ Content-Transfer-Encoding. Content-Transfer-Encoding parser

- string + string

-string を content-transfer-encoding として解析した結果を返す。 +Parse string as a field-body of Content-Transfer-Encoding +field, and return the result. - default-encoding + default-encoding

-現在の buffer の Content-Transfer-Encoding 欄を読み取り、解析した結果を -返す。 +Parse Content-Transfer-Encoding field of the current buffer, and +return the result.

-Content-Transfer-Encoding 欄が存在しない場合は -default-encoding を返す。 +Return default-encoding if Content-Transfer-Encoding field +is not found. If it is not specified, nil is used as the +default value. @@ -713,9 +718,10 @@ using encoding. - string encoding + string encoding

-string を encoding として復号した結果を返します。 +Decode string which is encoded in encoding, and +return the result. @@ -852,28 +858,49 @@ FLIM はこれらを符号化・復号化する機能を提供します。

Header encoding/decoding Header encoder/decoder

- - code-conversion separator + + code-conversion separator

Decode MIME encoded-words in header fields.

-If code-conversion is nil, it decodes only -encoded-words. If it is mime-charset, it decodes non-ASCII bit -patterns as the mime-charset. Otherwise it decodes non-ASCII bit -patterns as the default-mime-charset. +If code-conversion is nil, only encoded-words +are decoded. If code-conversion is a MIME +charset, non-ASCII bit patterns are decoded as the MIME +charset. Otherwise non-ASCII bit patterns are decoded as the +default-mime-charset.

-If separator is not nil, it is used as header separator. +If separator is not nil, it is used as header +separator. - code-conversion + code-conversion

Encode header fields to network representation, such as MIME encoded-word.

-It refer variable eword-field-encoding-method-alist. +Each field is encoded as corresponding method specified by variable +eword-field-encoding-method-alist. + +

+Association list to specify field encoding method. Each element looks +like (FIELD . METHOD). +

+If METHOD is mime, the FIELD will be encoded into MIME +format (encoded-word). +

+If METHOD is nil, the FIELD will not be encoded. +

+If METHOD is a MIME charset, the FIELD will be encoded as the charset +when it must be convert into network-code. +

+Otherwise the FIELD will be encoded as variable +default-mime-charset when it must be convert into +network-code. + +

Various Customization custom diff --git a/mime-en.texi b/mime-en.texi index e53af52..6da91cd 100644 --- a/mime-en.texi +++ b/mime-en.texi @@ -103,7 +103,8 @@ mime-entity.@refill If @var{buffer} is omitted, current buffer is used.@refill @var{type} is representation-type of created -mime-entity. (cf. @ref{mm-backend}) Default value is @var{buffer}. +mime-entity. (cf. @ref{mm-backend}) + Default value is @var{buffer}. @end defun @@ -329,10 +330,9 @@ value. @defvar default-mime-charset -Symbol to indicate default value of MIME-charset -(@ref{MIME-charset}).@refill +Symbol to indicate default value of MIME charset (@ref{MIME charset}).@refill -It is used when MIME-charset is not specified.@refill +It is used when MIME charset is not specified.@refill It is originally variable of APEL. @end defvar @@ -626,14 +626,15 @@ Return value of @var{parameter} of @var{content-type}. @defun mime-parse-Content-Type string -Parse @var{string} as field-body of Content-Type field. +Parse @var{string} as a field-body of Content-Type field, and return the +result as mime-content-type (@ref{mime-content-type}) structure. @end defun @defun mime-read-Content-Type -Read field-body of Content-Type field from current-buffer, and return -parsed it.@refill +Parse Content-Type field of the current buffer, and return the result as +mime-content-type (@ref{mime-content-type}) structure.@refill Return @code{nil} if Content-Type field is not found. @end defun @@ -724,15 +725,18 @@ Return filename of @var{content-disposition}. @defun mime-parse-Content-Disposition string Parse @var{string} as field-body of Content-Disposition field, and -return the result. +return the result as mime-content-disposition +(@ref{mime-content-disposition}) structure. @end defun @defun mime-read-Content-Disposition -Read field-body of Content-Disposition field from current-buffer,@refill +Parse Content-Disposition field of the current buffer, and return the +result as mime-content-disposition (@ref{mime-content-disposition}) +structure.@refill -Return nil if Content-Disposition field is not found. +Return @code{nil} if Content-Disposition field is not found. @end defun @@ -765,17 +769,18 @@ Content-Transfer-Encoding. @defun mime-parse-Content-Transfer-Encoding string -@var{string} を content-transfer-encoding として解析した結果を返す。 +Parse @var{string} as a field-body of Content-Transfer-Encoding field, +and return the result. @end defun @defun mime-read-Content-Transfer-Encoding &optional default-encoding -現在の buffer の Content-Transfer-Encoding 欄を読み取り、解析した結果を -返す。@refill +Parse Content-Transfer-Encoding field of the current buffer, and return +the result.@refill -Content-Transfer-Encoding 欄が存在しない場合は@var{default-encoding} を -返す。 +Return @var{default-encoding} if Content-Transfer-Encoding field is not +found. If it is not specified, @code{nil} is used as the default value. @end defun @@ -800,7 +805,8 @@ Decode region @var{start} to @var{end} of current buffer using @defun mime-decode-string string encoding -@var{string} を @var{encoding} として復号した結果を返します。 +Decode @var{string} which is encoded in @var{encoding}, and return the +result. @end defun @@ -948,16 +954,17 @@ FLIM はこれらを符号化・復号化する機能を提供します。 @node Header encoder/decoder, , encoded-word, encoded-word @section Header encoding/decoding -@defun eword-encode-header &optional code-conversion separator +@defun eword-decode-header &optional code-conversion separator Decode MIME encoded-words in header fields.@refill -If @var{code-conversion} is @code{nil}, it decodes only encoded-words. -If it is mime-charset, it decodes non-ASCII bit patterns as the -mime-charset. Otherwise it decodes non-ASCII bit patterns as the -default-mime-charset.@refill +If @var{code-conversion} is @code{nil}, only encoded-words are decoded. +If @var{code-conversion} is a MIME charset (@ref{MIME charset}), +non-ASCII bit patterns are decoded as the MIME charset. Otherwise +non-ASCII bit patterns are decoded as the +@code{default-mime-charset}. (cf. @ref{entity formatting}) @refill -If @var{separator} is not nil, it is used as header separator. +If @var{separator} is not @code{nil}, it is used as header separator. @end defun @@ -966,10 +973,29 @@ If @var{separator} is not nil, it is used as header separator. Encode header fields to network representation, such as MIME encoded-word.@refill -It refer variable @code{eword-field-encoding-method-alist}. +Each field is encoded as corresponding method specified by variable +@code{eword-field-encoding-method-alist}. @end defun +@defvar eword-field-encoding-method-alist + +Association list to specify field encoding method. Each element looks +like (FIELD . METHOD).@refill + +If METHOD is @code{mime}, the FIELD will be encoded into MIME format +(encoded-word).@refill + +If METHOD is @code{nil}, the FIELD will not be encoded.@refill + +If METHOD is a MIME charset, the FIELD will be encoded as the charset +when it must be convert into network-code.@refill + +Otherwise the FIELD will be encoded as variable +@code{default-mime-charset} when it must be convert into network-code. +@end defvar + + @node custom, Appendix, encoded-word, Top @chapter Various Customization diff --git a/mime-ja.sgml b/mime-ja.sgml index 7afcd96..fe6794b 100644 --- a/mime-ja.sgml +++ b/mime-ja.sgml @@ -708,9 +708,9 @@ using encoding. - string encoding + string encoding

-string を encoding として復号した結果を返します。 +string を encoding として復号した結果を返す。 @@ -847,28 +847,49 @@ FLIM はこれらを符号化・復号化する機能を提供します。

Header の符号化・復号化 Header encoder/decoder

- - code-conversion separator + + code-conversion separator

-Decode MIME encoded-words in header fields. +Header 中の encoded-word を復号する。

-If code-conversion is nil, it decodes only -encoded-words. If it is mime-charset, it decodes non-ASCII bit -patterns as the mime-charset. Otherwise it decodes non-ASCII bit -patterns as the default-mime-charset. +もし code-conversion が nil なら、encoded-word +だけが復号される。もし、code-conversion が MIME +charset なら、非 ASCII bit patterns はその MIME charset として +復号される。これ以外の場合、非 ASCII bit patterns は +default-mime-charset. として復号される。

-If separator is not nil, it is used as header separator. +もし separator が nil でなければ、その値が +header separator として用いられる。 - code-conversion + code-conversion

-Encode header fields to network representation, such as MIME -encoded-word. +Header を network 表現に符号化する。

-It refer variable eword-field-encoding-method-alist. +各 field は eword-field-encoding-method-alist で指定され +た方式で符号化される。 + +

+Association list to specify field encoding method. Each element looks +like (FIELD . METHOD). +

+If METHOD is mime, the FIELD will be encoded into MIME +format (encoded-word). +

+If METHOD is nil, the FIELD will not be encoded. +

+If METHOD is a MIME charset, the FIELD will be encoded as the charset +when it must be convert into network-code. +

+Otherwise the FIELD will be encoded as variable +default-mime-charset when it must be convert into +network-code. + +

一般設定 custom diff --git a/mime-ja.texi b/mime-ja.texi index f5cf4fc..171e5ad 100644 --- a/mime-ja.texi +++ b/mime-ja.texi @@ -796,7 +796,7 @@ Decode region @var{start} to @var{end} of current buffer using @defun mime-decode-string string encoding -@var{string} を @var{encoding} として復号した結果を返します。 +@var{string} を @var{encoding} として復号した結果を返す。 @end defun @@ -944,28 +944,48 @@ FLIM はこれらを符号化・復号化する機能を提供します。 @node Header encoder/decoder, , encoded-word, encoded-word @section Header の符号化・復号化 -@defun eword-encode-header &optional code-conversion separator +@defun eword-decode-header &optional code-conversion separator -Decode MIME encoded-words in header fields.@refill +Header 中の encoded-word を復号する。@refill -If @var{code-conversion} is @code{nil}, it decodes only encoded-words. -If it is mime-charset, it decodes non-ASCII bit patterns as the -mime-charset. Otherwise it decodes non-ASCII bit patterns as the -default-mime-charset.@refill +もし @var{code-conversion} が @code{nil} なら、encoded-word だけが復号さ +れる。もし、@var{code-conversion} が MIME charset (@ref{MIME charset}) +なら、非 ASCII bit patterns はその MIME charset として復号される。これ以 +外の場合、非 ASCII bit patterns は@code{default-mime-charset}. として復 +号される。(cf. @ref{entity formatting}) @refill -If @var{separator} is not nil, it is used as header separator. +もし @var{separator} が @code{nil} でなければ、その値がheader separator +として用いられる。 @end defun @defun eword-encode-header &optional code-conversion -Encode header fields to network representation, such as MIME -encoded-word.@refill +Header を network 表現に符号化する。@refill -It refer variable @code{eword-field-encoding-method-alist}. +各 field は @code{eword-field-encoding-method-alist} で指定された方式で +符号化される。 @end defun +@defvar eword-field-encoding-method-alist + +Association list to specify field encoding method. Each element looks +like (FIELD . METHOD).@refill + +If METHOD is @code{mime}, the FIELD will be encoded into MIME format +(encoded-word).@refill + +If METHOD is @code{nil}, the FIELD will not be encoded.@refill + +If METHOD is a MIME charset, the FIELD will be encoded as the charset +when it must be convert into network-code.@refill + +Otherwise the FIELD will be encoded as variable +@code{default-mime-charset} when it must be convert into network-code. +@end defvar + + @node custom, Appendix, encoded-word, Top @chapter 一般設定