From a6f31bbb30b7cfdef51bb46c55350ffed13c546b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 29 Nov 1998 23:28:41 +0000 Subject: [PATCH] Update. --- ChangeLog | 11 ++- README.ichikawa | 2 +- texi/ChangeLog | 8 ++ texi/Makefile.in | 2 +- texi/emacs-mime.texi | 252 +++++++++++++++++++++++++++++++++++++++++++++++++- texi/gnus-ja.texi | 6 +- texi/gnus.texi | 6 +- texi/message-ja.texi | 6 +- texi/message.texi | 6 +- 9 files changed, 283 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 650025d..080fc45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1998-11-30 Katsumi Yamaoka + + * lisp/base64.el (base64-decode-region): Use `defun-maybe'. + (base64-encode-region): Ditto. + + * lisp/gnus.el (gnus-version-number): Update to 6.10.042. + + * Sync up with Pterodactyl Gnus 0.56. + 1998-11-29 Tatsuya Ichikawa * lisp/gnus-offline.el: Fix typo of DOC string. @@ -21,7 +30,7 @@ (message-supersede-setup-function): New user option. Use `message-supersede-setup-for-mime-edit' in default. (message-supersede): Call `message-supersede-setup-function' if it - is non-nil. + is non-nil. (message-supersede-setup-hook): New user option. * lisp/message.el (message-bounce-setup-for-mime-edit): Don't diff --git a/README.ichikawa b/README.ichikawa index d727fe3..8ed64bd 100644 --- a/README.ichikawa +++ b/README.ichikawa @@ -31,4 +31,4 @@ NEWS: * T-gnus 6.8.20 is the last version Gnus 5.6 base. After this , T-gnus 6.10 - this is based on Pterodactyl Gnus. - The latest T-gnus is T-gnus 6.10.040 (Based on pgnus-0.54). + The latest T-gnus is T-gnus 6.10.042 (Based on pgnus-0.56). diff --git a/texi/ChangeLog b/texi/ChangeLog index 856010a..5753af6 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,11 @@ +1998-11-29 00:03:43 Lars Magne Ingebrigtsen + + * emacs-mime.texi (Composing): New chapter. + +1998-11-25 Karl Eichwalder + + * Makefile.in (install): Remove emacs-info, add emacs-mime. + 1998-11-25 10:56:08 Lars Magne Ingebrigtsen * gnus.texi (To From Newsgroups): Addition. diff --git a/texi/Makefile.in b/texi/Makefile.in index 23a146e..efb7b4c 100644 --- a/texi/Makefile.in +++ b/texi/Makefile.in @@ -118,7 +118,7 @@ distclean: install: $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir) - @for file in gnus message emacs-info gnus-ja message-ja; do \ + @for file in gnus message emacs-mime gnus-ja message-ja; do \ for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $$ifile; then \ echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \ diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index 122f513..a00948d 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -89,6 +89,7 @@ read at least RFC2045 and RFC2047. * Interface Functions:: An abstraction over the basic functions. * Basic Functions:: Utility and basic parsing functions. * Decoding and Viewing:: A framework for decoding and viewing. +* Composing:: MML; a language for describing MIME parts. * Standards:: A summary of RFCs and working documents used. * Index:: Function and variable index. @end menu @@ -810,7 +811,249 @@ Offer to pipe the part to some process. Prompt for a mailcap method to use to view the part. @end table - + + +@node Composing +@chapter Composing +@cindex Composing +@cindex MIME Composing +@cindex MML +@cindex MIME Meta Language + +Creating a @sc{mime} message is boring and non-trivial. Therefore, a +library called @code{mml} has been defined that parses a language called +MML (@sc{mime} Meta Language) and generates @sc{mime} messages. + +@findex mml-generate-mime +The main interface function is @code{mml-generate-mime}. It will +examine the contents of the current (narrowed-to) buffer and return a +string containing the @sc{mime} message. + +@menu +* Simple MML Example:: An example MML document. +* MML Definition:: All valid MML elements. +* Advanced MML Example:: Another example MML document. +@end menu + + +@node Simple MML Example +@section Simple MML Example + +Here's a simple @samp{multipart/alternative}: + +@example +<#multipart type=alternative> +This is a plain text part. +<#part type=text/enriched> +
This is a centered enriched part
+<#/multipart> +@end example + +After running this through @code{mml-generate-mime}, we get this: + +@example +Content-Type: multipart/alternative; boundary="=-=-=" + + +--=-=-= + + +This is a plain text part. + +--=-=-= +Content-Type: text/enriched + + +
This is a centered enriched part
+ +--=-=-=-- +@end example + + +@node MML Definition +@section MML Definition + +The MML language is very simple. It looks a bit like an SGML +application, but it's not. + +The main concept of MML is the @dfn{part}. Each part can be of a +different type or use a different charset. The way to delineate a part +is with a @samp{<#part ...>} tag. Multipart parts can be introduced +with the @samp{<#multipart ...>} tag. Parts are ended by the +@samp{<#/part>} or @samp{<#/multipart>} tags. Parts started with the +@samp{<#part ...>} tags are also closed by the next open tag. + +There's also the @samp{<#external ...>} tag. These introduce +@samp{external/message-body} parts. + +Each tag can contain zero or more parameters on the form +@samp{parameter=value}. The values may be enclosed in quotation marks, +but that's not necessary unless the value contains white space. So +@samp{filename=/home/user/#hello$^yes} is perfectly valid. + +The following parameters have meaning in MML; parameters that have no +meaning are ignored. The MML parameter names are the same as the +@sc{mime} parameter names; the things in the parentheses say which +header it will be used in. + +@table @samp +@item type +The @sc{mime} type of the part (@code{Content-Type}). + +@item filename +Use the contents of the file in the body of the part +(@code{Content-Disposition}). + +@item charset +The contents of the body of the part are to be encoded in the character +set speficied (@code{Content-Type}). + +@item name +Might be used to suggest a file name if the part is to be saved +to a file (@code{Content-Type}). + +@item disposition +Valid values are @samp{inline} and @samp{attachment} +(@code{Content-Disposition}). + +@item encoding +Valid values are @samp{7bit}, @samp{8bit}, @samp{quoted-printable} and +@samp{base64} (@code{Content-Transfer-Encoding}). + +@item description +A description of the part (@code{Content-Description}). + +@item creation-date +RFC822 date when the part was created (@code{Content-Disposition}). + +@item modification-date +RFC822 date when the part was modified (@code{Content-Disposition}). + +@item read-date +RFC822 date when the part was read (@code{Content-Disposition}). + +@item size +The size (in octets) of the part (@code{Content-Disposition}). + +@end table + +Parameters for @samp{application/octet-stream}: + +@table @samp +@item type +Type of the part; informal---meant for human readers +(@code{Content-Type}). +@end table + +Parameters for @samp{message/external-body}: + +@table @samp +@item access-type +A word indicating the supported access mechanism by which the file may +be obtained. Values include @samp{ftp}, @samp{anon-ftp}, @samp{tftp}, +@samp{localfile}, and @samp{mailserver}. (@code{Content-Type}.) + +@item expiration +The RFC822 date after which the file may no longer be fetched. +(@code{Content-Type}.) + +@item size +The size (in octets) of the file. (@code{Content-Type}.) + +@item permission +Valid values are @samp{read} and @samp{read-write} +(@code{Content-Type}). + +@end table + + +@node Advanced MML Example +@section Advanced MML Example + +Here's a complex multipart message. It's a @samp{multipart/mixed} that +contains many parts, one of which is a @samp{multipart/alternative}. + +@example +<#multipart type=mixed> +<#part type=image/jpeg filename=~/rms.jpg disposition=inline> +<#multipart type=alternative> +This is a plain text part. +<#part type=text/enriched name=enriched.txt> +
This is a centered enriched part
+<#/multipart> +This is a new plain text part. +<#part disposition=attachment> +This plain text part is an attachment. +<#/multipart> +@end example + +And this is the resulting @sc{mime} message: + +@example +Content-Type: multipart/mixed; boundary="=-=-=" + + +--=-=-= + + + +--=-=-= +Content-Type: image/jpeg; + filename="~/rms.jpg" +Content-Disposition: inline; + filename="~/rms.jpg" +Content-Transfer-Encoding: base64 + +/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof +Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wAALCAAwADABAREA/8QAHwAA +AQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQR +BRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RF +RkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ip +qrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9oACAEB +AAA/AO/rifFHjldNuGsrDa0qcSSHkA+gHrXKw+LtWLrMb+RgTyhbr+HSug07xNqV9fQtZrNI +AyiaE/NuBPOOOP0rvRNE880KOC8TbXXGCv1FPqjrF4LDR7u5L7SkTFT/ALWOP1xXgTuXfc7E +sx6nua6rwp4IvvEM8chCxWxOdzn7wz6V9AaB4S07w9p5itow0rDLSY5Pt9K43xO66P4xs71m +2QXiGCbA4yOVJ9+1aYORkdK434lyNH4ahCnG66VT9Nj15JFbPdX0MS43M4VQf5/yr2vSpLnw +5ZW8dlCZ8KFXjOPX0/mK6rSPEGt3Angu44fNEReHYNvIH3TzXDeKNO8RX+kSX2ouZkicTIOc +L+g7E810ulFjpVtv3bwgB3HJyK5L4quY/C9sVxk3ij/xx6850u7t1mtp/wDlpEw3An3Jr3Dw +34gsbWza4nBlhC5LDsaW6+IFgupQyCF3iHH7gA7c9R9ay7zx6t7aX9jHC4smhfBkGCvHGfrm +tLQ7hbnRrV1GPkAP1x1/Hr+Ncr8Vzjwrbf8AX6v/AKA9eQRyYlQk8Yx9K6XTNbkgia2ciSIn +7p5Ga9Atte0LTLKO6it4i7dVRFJDcZ4PvXN+JvEMF9bILVGXJLSZ4zkjivRPDaeX4b08HOTC +pOffmua+KkbS+GLVUGT9tT/0B68eeIpIFYjB70+OOVXyoOM9+M1eaWeCLzHPyHGO/NVWvJJm +jQ8KGH1NfQWhXSXmh2c8eArRLwO3HSv/2Q== + +--=-=-= +Content-Type: multipart/alternative; boundary="==-=-=" + + +--==-=-= + + +This is a plain text part. + +--==-=-= +Content-Type: text/enriched; + name="enriched.txt" + + +
This is a centered enriched part
+ +--==-=-=-- + +--=-=-= + +This is a new plain text part. + +--=-=-= +Content-Disposition: attachment + + +This plain text part is an attachment. + +--=-=-=-- +@end example + + @node Standards @chapter Standards @@ -854,10 +1097,17 @@ ASCII characters @item draft-ietf-drums-msg-fmt-05.txt Draft for the successor of RFC822 +@item RFC2112 +The MIME Multipart/Related Content-type + @item RFC1892 The Multipart/Report Content Type for the Reporting of Mail System Administrative Messages +@item RFC2183 +Communicating Presentation Information in Internet Messages: The +Content-Disposition Header Field + @end table diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 24b2f0a..3b11383 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus-ja -@settitle Semi-gnus 6.10.041 Manual +@settitle Semi-gnus 6.10.042 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -345,7 +345,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Semi-gnus 6.10.041 Manual +@title Semi-gnus 6.10.042 Manual @author by Lars Magne Ingebrigtsen @author by members of Semi-gnus mailing-list @@ -399,7 +399,7 @@ Semi-gnus $B$O!"Bg$-$J3($,F~$C$F$$$?$j$5$^$6$^$J7A<0$rMQ$$$?$j$7$F$$$k$A$g$C(B $B$J8@8l7w$r:9JL$7$^$;$s!#$"$"!"%/%j%s%4%s$NJ}$O(B Unicode Next Generation$B$r(B $B$*BT$A$/$@$5$$!#(B -$B$3$N@bL@=q$O(B Semi-gnus 6.10.041 $B$KBP1~$7$^$9!#(B +$B$3$N@bL@=q$O(B Semi-gnus 6.10.042 $B$KBP1~$7$^$9!#(B @end ifinfo diff --git a/texi/gnus.texi b/texi/gnus.texi index 4336903..ad6cc75 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Semi-gnus 6.10.041 Manual +@settitle Semi-gnus 6.10.042 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -318,7 +318,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Semi-gnus 6.10.041 Manual +@title Semi-gnus 6.10.042 Manual @author by Lars Magne Ingebrigtsen @page @@ -361,7 +361,7 @@ internationalization/localization and multiscript features based on MULE API. So Semi-gnus does not discriminate various language communities. Oh, if you are a Klingon, please wait Unicode Next Generation. -This manual corresponds to Semi-gnus 6.10.041. +This manual corresponds to Semi-gnus 6.10.042. @end ifinfo diff --git a/texi/message-ja.texi b/texi/message-ja.texi index 764763e..3d93807 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message-ja -@settitle Message 6.10.041 Manual +@settitle Message 6.10.042 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -60,7 +60,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Message 6.10.041 Manual +@title Message 6.10.042 Manual @author by Lars Magne Ingebrigtsen @translated by members of Semi-gnus mailing-list @@ -112,7 +112,7 @@ Gnus $B$NA4$F$N%a%C%;!<%8$N:n@.(B ($B%a!<%k$H%K%e!<%9$NN>J}(B) $B$O%a%C%;!< * Key Index:: $B%a%C%;!<%8%b!<%I%-!<$N0lMw!#(B @end menu -$B$3$N%^%K%e%"%k$O(B Message 6.10.041 $B$KBP1~$7$^$9!#(BMessage $B$O$3$N%^%K%e%"%k$H(B +$B$3$N%^%K%e%"%k$O(B Message 6.10.042 $B$KBP1~$7$^$9!#(BMessage $B$O$3$N%^%K%e%"%k$H(B $BF1$8HGHV9f$N(B Gnus $B$NG[I[$H6&$KG[I[$5$l$^$9!#(B diff --git a/texi/message.texi b/texi/message.texi index ff6fe14..2d23a31 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Message 6.10.041 Manual +@settitle Message 6.10.042 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -42,7 +42,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Message 6.10.041 Manual +@title Message 6.10.042 Manual @author by Lars Magne Ingebrigtsen @page @@ -83,7 +83,7 @@ Message mode buffers. * Key Index:: List of Message mode keys. @end menu -This manual corresponds to Message 6.10.041. Message is +This manual corresponds to Message 6.10.042. Message is distributed with the Gnus distribution bearing the same version number as this manual. -- 1.7.10.4