utf8ify_rfc822_string() is in libcitadel now

[citadel.git] / libcitadel / lib / html_to_ascii.c

diff --git a/libcitadel/lib/html_to_ascii.c b/libcitadel/lib/html_to_ascii.c
index 9298dd6c7706bc5c071f277924c4a4df53175a37..d325e4a896c0523a3d3ba61293445cd9705e4fd7 100644 (file)
--- a/libcitadel/lib/html_to_ascii.c
+++ b/libcitadel/lib/html_to_ascii.c
@@ -2,19 +2,8 @@
  * Functions which handle translation between HTML and plain text
  * Copyright (c) 2000-2018 by the citadel.org team
  *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
  */
 
 #include <stdlib.h>
@@ -197,6 +186,9 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
                                        strcat(outbuf, nl);
                                }
 
+#if 0
+       These seemed like a good idea at the time, but it just makes a mess.
+
                                else if (
                                        (!strcasecmp(tag, "B"))
                                        || (!strcasecmp(tag, "/B"))
@@ -204,7 +196,6 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
                                        || (!strcasecmp(tag, "/STRONG"))
                                ) {
                                        strcat(outbuf, "*");
-                                       
                                }
 
                                else if (
@@ -214,7 +205,6 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
                                        || (!strcasecmp(tag, "/EM"))
                                ) {
                                        strcat(outbuf, "/");
-                                       
                                }
 
                                else if (
@@ -222,8 +212,8 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
                                        || (!strcasecmp(tag, "/U"))
                                ) {
                                        strcat(outbuf, "_");
-                                       
                                }
+#endif
 
                                else if (!strcasecmp(tag, "BR")) {
                                        strcat(outbuf, nl);
@@ -273,7 +263,7 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
                                tag[strlen(tag)] = ch;
                        }
                                
-                       else if (!nest) {
+                       else if ((!nest) && (styletag == 0)) {
                                outbuf[strlen(outbuf)+1] = 0;
                                outbuf[strlen(outbuf)] = ch;
                        }