Reworked output handling.

[nmh] / etc / mhn.defaults.sh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index ec0c085271339808e82debae56ba46213f959550..5e7c66a6b14322cb31af89bc021c52220f498d82 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -42,6 +42,7 @@ fi
 
 cat >>"$TMP" <<'EOF'
 mhstore-store-text: %m%P.txt
 
 cat >>"$TMP" <<'EOF'
 mhstore-store-text: %m%P.txt

+mhstore-store-text/calendar: %m%P.ics

 mhstore-store-text/html: %m%P.html
 mhstore-store-text/richtext: %m%P.rt
 mhstore-store-video/mpeg: %m%P.mpg
 mhstore-store-text/html: %m%P.html
 mhstore-store-text/richtext: %m%P.rt
 mhstore-store-video/mpeg: %m%P.mpg


@@ -129,6 +130,7 @@ fi
 #### supported.  mhbuild-convert-text/html is defined below.
 ####
 cat <<EOF >>${TMP}
 #### supported.  mhbuild-convert-text/html is defined below.
 ####
 cat <<EOF >>${TMP}

+mhbuild-convert-text/calendar: mhical -infile %F -contenttype

 mhbuild-convert-text: charset=%{charset}; iconv -f \${charset:-us-ascii} -t utf-8 %F${replfmt}
 mhbuild-disposition-text/calendar: inline
 mhbuild-disposition-message/rfc822: inline
 mhbuild-convert-text: charset=%{charset}; iconv -f \${charset:-us-ascii} -t utf-8 %F${replfmt}
 mhbuild-disposition-text/calendar: inline
 mhbuild-disposition-message/rfc822: inline


@@ -179,6 +181,9 @@ else
     fi
 fi
 
     fi
 fi
 

+echo "mhshow-show-text/calendar: mhical -infile %F" >> $TMP
+echo "mhfixmsg-format-text/calendar: mhical -infile %F" >> $TMP
+

 PGM=`$SEARCHPROG "$SEARCHPATH" ivs_replay`
 if [ ! -z "$PGM" ]; then
        echo "mhshow-show-application/x-ivs: %l$PGM -o %F" >> $TMP
 PGM=`$SEARCHPROG "$SEARCHPATH" ivs_replay`
 if [ ! -z "$PGM" ]; then
        echo "mhshow-show-application/x-ivs: %l$PGM -o %F" >> $TMP


@@ -280,28 +285,29 @@ EOF
 PGM=`$SEARCHPROG "$SEARCHPATH" w3m`
 if [ ! -z "$PGM" ]; then
     echo 'mhshow-show-text/html: charset=%{charset}; '"\
 PGM=`$SEARCHPROG "$SEARCHPATH" w3m`
 if [ ! -z "$PGM" ]; then
     echo 'mhshow-show-text/html: charset=%{charset}; '"\

-%l$PGM"' -dump ${charset:+-I "$charset"} -T text/html %F' >> $TMP
+%l$PGM"' -dump ${charset:+-I} ${charset:+"$charset"} -T text/html %F' >> $TMP

     echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
     echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\

-$PGM "'-dump ${charset:+-I "$charset"} -O utf-8 -T text/html %F' >> $TMP
+$PGM "'-dump ${charset:+-I} ${charset:+"$charset"} -O utf-8 -T text/html %F' \
+         >> $TMP

     echo 'mhbuild-convert-text/html: charset=%{charset}; '"\
     echo 'mhbuild-convert-text/html: charset=%{charset}; '"\

-$PGM "'-dump ${charset:+-I "$charset"} -O utf-8 -T text/html %F '"\
+$PGM "'-dump ${charset:+-I} ${charset:+"$charset"} -O utf-8 -T text/html %F '"\

 ${replfmt}" >> $TMP
 else
     PGM=`$SEARCHPROG "$SEARCHPATH" lynx`
     if [ ! -z "$PGM" ]; then
        echo 'mhshow-show-text/html: charset=%{charset}; '"\
 ${replfmt}" >> $TMP
 else
     PGM=`$SEARCHPROG "$SEARCHPATH" lynx`
     if [ ! -z "$PGM" ]; then
        echo 'mhshow-show-text/html: charset=%{charset}; '"\

-%l$PGM"' -child -dump -force-html ${charset:+--assume_charset "$charset"} %F' >> $TMP
+%l$PGM"' -child -dump -force-html ${charset:+--assume_charset} ${charset:+"$charset"} %F' >> $TMP

         #### lynx indents with 3 spaces, remove them and any trailing spaces.
         echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
         #### lynx indents with 3 spaces, remove them and any trailing spaces.
         echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\

-$PGM "'-child -dump -force_html ${charset:+--assume_charset "$charset"} %F | '"\
+$PGM "'-child -dump -force_html ${charset:+--assume_charset} ${charset:+"$charset"} %F | '"\

 expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
         echo 'mhbuild-convert-text/html: charset=%{charset}; '"\
 expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
         echo 'mhbuild-convert-text/html: charset=%{charset}; '"\

-$PGM "'-child -dump -force_html ${charset:+--assume_charset "$charset"} '"\
+$PGM "'-child -dump -force_html ${charset:+--assume_charset} ${charset:+"$charset"} '"\

 %F${replfmt}" >> $TMP
     else
         PGM=`$SEARCHPROG "$SEARCHPATH" elinks`
         if [ ! -z "$PGM" ]; then
 %F${replfmt}" >> $TMP
     else
         PGM=`$SEARCHPROG "$SEARCHPATH" elinks`
         if [ ! -z "$PGM" ]; then

-            echo "mhshow-show-text/html: $PGM -dump -force-html \
+            echo "mhshow-show-text/html: %l$PGM -dump -force-html \

 -eval 'set document.browse.margin_width = 0' %F" >> $TMP
             echo "mhfixmsg-format-text/html: $PGM -dump -force-html \
 -no-numbering -eval 'set document.browse.margin_width = 0' %F" >> $TMP
 -eval 'set document.browse.margin_width = 0' %F" >> $TMP
             echo "mhfixmsg-format-text/html: $PGM -dump -force-html \
 -no-numbering -eval 'set document.browse.margin_width = 0' %F" >> $TMP