Added a new parameter to html_to_ascii() to let it know when it's rendering to a...

[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 45beb2cbb079b97eeaa2041df905e8676ce3145a..2d604ac4fa3ab250519e022fca2d988f8bf3aaaf 100644 (file)
--- a/libcitadel/lib/html_to_ascii.c
+++ b/libcitadel/lib/html_to_ascii.c
@@ -1,21 +1,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
- */
+// Functions which handle translation between HTML and plain text
+// Copyright (c) 2000-2022 by the citadel.org team
+//
+// 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>
 #include <unistd.h>
@@ -42,13 +29,14 @@
 #include "libcitadel.h"
  
 
-/*
- * Convert HTML to plain text.
- *
- * inputmsg      = pointer to raw HTML message
- * screenwidth   = desired output screenwidth
- */
-char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
+// Convert HTML to plain text.
+//
+// inputmsg    = pointer to raw HTML message
+// msglen      = stop reading after this many bytes
+// screenwidth = desired output screenwidth
+// ansi                = if nonzero, assume output is to a terminal that supports ANSI escape codes
+//
+char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth, int ansi) {
        char inbuf[SIZ];
        int inbuf_len = 0;
        char outbuf[SIZ];
@@ -59,9 +47,9 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
        size_t outptr_buffer_size;
        size_t output_len = 0;
        int i, j, ch, did_out, rb, scanch;
-       int nest = 0;           /* Bracket nesting level */
-       int blockquote = 0;     /* BLOCKQUOTE nesting level */
-       int styletag = 0;       /* STYLE tag nesting level */
+       int nest = 0;                           // Bracket nesting level
+       int blockquote = 0;                     // BLOCKQUOTE nesting level
+       int styletag = 0;                       // STYLE tag nesting level
        int styletag_start = 0;
        int bytes_processed = 0;
        char nl[128];
@@ -241,6 +229,9 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
                                else if (!strcasecmp(tag, "BLOCKQUOTE")) {
                                        ++blockquote;
                                        strcpy(nl, "\n");
+                                       if ( (blockquote == 1) && (ansi) ) {
+                                               strcat(nl, "\033[2m\033[3m");
+                                       }
                                        for (j=0; j<blockquote; ++j) strcat(nl, ">");
                                        strcat(outbuf, nl);
                                }
@@ -248,6 +239,9 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth) {
                                else if (!strcasecmp(tag, "/BLOCKQUOTE")) {
                                        strcat(outbuf, "\n");
                                        --blockquote;
+                                       if ( (blockquote == 0) && (ansi) ) {
+                                               strcat(outbuf, "\033[22m\033[23m");
+                                       }
                                        strcpy(nl, "\n");
                                        for (j=0; j<blockquote; ++j) strcat(nl, ">");
                                        strcat(outbuf, nl);