rpeg-markdown 0.1.0 → 0.2.0

data/ext/markdown_output.c

@@ -20,26 +20,20 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <glib.h>
 #include "markdown_peg.h"
 
-/***********************************************************************/
-#include "markdown_buffer.h"
-#define printf  rb_markdown_buffer_printf
-#define putchar rb_markdown_buffer_putchar
-/***********************************************************************/
-
-/* TODO remove */
-static extensions = 0;
-
-static void print_html_string(char *str, bool obfuscate);
-static void print_html_element_list(element *list, bool obfuscate);
-static void print_html_element(element elt, bool obfuscate);
-static void print_latex_string(char *str);
-static void print_latex_element_list(element *list);
-static void print_latex_element(element elt);
-static void print_groff_string(char *str);
-static void print_groff_mm_element_list(element *list);
-static void print_groff_mm_element(element elt, int count);
+static int extensions;
+
+static void print_html_string(GString *out, char *str, bool obfuscate);
+static void print_html_element_list(GString *out, element *list, bool obfuscate);
+static void print_html_element(GString *out, element *elt, bool obfuscate);
+static void print_latex_string(GString *out, char *str);
+static void print_latex_element_list(GString *out, element *list);
+static void print_latex_element(GString *out, element *elt);
+static void print_groff_string(GString *out, char *str);
+static void print_groff_mm_element_list(GString *out, element *list);
+static void print_groff_mm_element(GString *out, element *elt, int count);
 
 /**********************************************************************
 
@@ -51,13 +45,13 @@ static int padded = 2;      /* Number of newlines after last output.
                                Starts at 2 so no newlines are needed at start.
                                */
 
-static element *endnotes;   /* List of endnotes to print after main content. */
+static GSList *endnotes = NULL; /* List of endnotes to print after main content. */
 static int notenumber = 0;  /* Number of footnote. */
 
 /* pad - add newlines if needed */
-static void pad(int num) {
+static void pad(GString *out, int num) {
     while (num-- > padded)
-        printf("\n");;
+        g_string_append_printf(out, "\n");;
     padded = num;
 }
 
@@ -69,207 +63,206 @@ static void pad(int num) {
 
 /* print_html_string - print string, escaping for HTML  
  * If obfuscate selected, convert characters to hex or decimal entities at random */
-static void print_html_string(char *str, bool obfuscate) {
+static void print_html_string(GString *out, char *str, bool obfuscate) {
     while (*str != '\0') {
         switch (*str) {
         case '&':
-            printf("&amp;");;;
+            g_string_append_printf(out, "&amp;");
             break;
         case '<':
-            printf("&lt;");;;
+            g_string_append_printf(out, "&lt;");
             break;
         case '>':
-            printf("&gt;");;;
+            g_string_append_printf(out, "&gt;");
             break;
         case '"':
-            printf("&quot;");;;
+            g_string_append_printf(out, "&quot;");
             break;
         default:
             if (obfuscate) {
                 if (rand() % 2 == 0)
-                    printf("&#%d;", (int) *str);
+                    g_string_append_printf(out, "&#%d;", (int) *str);
                 else
-                    printf("&#x%x;", (unsigned int) *str);
+                    g_string_append_printf(out, "&#x%x;", (unsigned int) *str);
             }
             else
-                putchar(*str);
+                g_string_append_c(out, *str);
         }
     str++;
     }
 }
 
 /* print_html_element_list - print a list of elements as HTML */
-static void print_html_element_list(element *list, bool obfuscate) {
+static void print_html_element_list(GString *out, element *list, bool obfuscate) {
     while (list != NULL) {
-        print_html_element(*list, obfuscate);
+        print_html_element(out, list, obfuscate);
         list = list->next;
     }
 }
 
+/* add_endnote - add an endnote to global endnotes list. */
+static void add_endnote(element *elt) {
+    endnotes = g_slist_prepend(endnotes, elt);
+}
+
 /* print_html_element - print an element as HTML */
-static void print_html_element(element elt, bool obfuscate) {
+static void print_html_element(GString *out, element *elt, bool obfuscate) {
     int lev;
-    char *contents;
-    switch (elt.key) {
+    switch (elt->key) {
     case SPACE:
-        printf("%s", elt.contents.str);
+        g_string_append_printf(out, "%s", elt->contents.str);
         break;
     case LINEBREAK:
-        printf("<br/>");;;
+        g_string_append_printf(out, "<br/>");
         break;
     case STR:
-        print_html_string(elt.contents.str, obfuscate);
+        print_html_string(out, elt->contents.str, obfuscate);
         break;
     case ELLIPSIS:
-        printf("&hellip;");;;
+        g_string_append_printf(out, "&hellip;");
         break;
     case EMDASH:
-        printf("&mdash;");;;
+        g_string_append_printf(out, "&mdash;");
         break;
     case ENDASH:
-        printf("&ndash;");;;
+        g_string_append_printf(out, "&ndash;");
         break;
     case APOSTROPHE:
-        printf("&rsquo;");;;
+        g_string_append_printf(out, "&rsquo;");
         break;
     case SINGLEQUOTED:
-        printf("&lsquo;");;;
-        print_html_element_list(elt.children, obfuscate);
-        printf("&rsquo;");;;
+        g_string_append_printf(out, "&lsquo;");
+        print_html_element_list(out, elt->children, obfuscate);
+        g_string_append_printf(out, "&rsquo;");
         break;
     case DOUBLEQUOTED:
-        printf("&ldquo;");;;
-        print_html_element_list(elt.children, obfuscate);
-        printf("&rdquo;");;;
+        g_string_append_printf(out, "&ldquo;");
+        print_html_element_list(out, elt->children, obfuscate);
+        g_string_append_printf(out, "&rdquo;");
         break;
     case CODE:
-        printf("<code>");;;
-        print_html_string(elt.contents.str, obfuscate);
-        printf("</code>");;;
+        g_string_append_printf(out, "<code>");
+        print_html_string(out, elt->contents.str, obfuscate);
+        g_string_append_printf(out, "</code>");
         break;
     case HTML:
-        printf("%s", elt.contents.str);
+        g_string_append_printf(out, "%s", elt->contents.str);
         break;
     case LINK:
-        if (strstr(elt.contents.link.url, "mailto:") == elt.contents.link.url)
+        if (strstr(elt->contents.link->url, "mailto:") == elt->contents.link->url)
             obfuscate = true;  /* obfuscate mailto: links */
-        printf("<a href=\"");
-        print_html_string(elt.contents.link.url, obfuscate);
-        printf("\"");
-        if (strlen(elt.contents.link.title) > 0) {
-            printf(" title=\"");
-            print_html_string(elt.contents.link.title, obfuscate);
-            printf("\"");
+        g_string_append_printf(out, "<a href=\"");
+        print_html_string(out, elt->contents.link->url, obfuscate);
+        g_string_append_printf(out, "\"");
+        if (strlen(elt->contents.link->title) > 0) {
+            g_string_append_printf(out, " title=\"");
+            print_html_string(out, elt->contents.link->title, obfuscate);
+            g_string_append_printf(out, "\"");
         }
-        printf(">");;;     
-        print_html_element_list(elt.contents.link.label, obfuscate);
-        printf("</a>");;;
+        g_string_append_printf(out, ">");
+        print_html_element_list(out, elt->contents.link->label, obfuscate);
+        g_string_append_printf(out, "</a>");
         break;
     case IMAGE:
-        printf("<img src=\"");
-        print_html_string(elt.contents.link.url, obfuscate);
-        printf("\" alt=\"");
-        print_html_element_list(elt.contents.link.label, obfuscate);
-        printf("\"");
-        if (strlen(elt.contents.link.title) > 0) {
-            printf(" title=\"");
-            print_html_string(elt.contents.link.title, obfuscate);
-            printf("\"");
+        g_string_append_printf(out, "<img src=\"");
+        print_html_string(out, elt->contents.link->url, obfuscate);
+        g_string_append_printf(out, "\" alt=\"");
+        print_html_element_list(out, elt->contents.link->label, obfuscate);
+        g_string_append_printf(out, "\"");
+        if (strlen(elt->contents.link->title) > 0) {
+            g_string_append_printf(out, " title=\"");
+            print_html_string(out, elt->contents.link->title, obfuscate);
+            g_string_append_printf(out, "\"");
         }
-        printf(" />");;;
+        g_string_append_printf(out, " />");
         break;
     case EMPH:
-        printf("<em>");;;
-        print_html_element_list(elt.children, obfuscate);
-        printf("</em>");;;
+        g_string_append_printf(out, "<em>");
+        print_html_element_list(out, elt->children, obfuscate);
+        g_string_append_printf(out, "</em>");
         break;
     case STRONG:
-        printf("<strong>");;;
-        print_html_element_list(elt.children, obfuscate);
-        printf("</strong>");;;
+        g_string_append_printf(out, "<strong>");
+        print_html_element_list(out, elt->children, obfuscate);
+        g_string_append_printf(out, "</strong>");
         break;
     case LIST:
-        print_html_element_list(elt.children, obfuscate);
+        print_html_element_list(out, elt->children, obfuscate);
         break;
     case RAW:
-        /* \001 is used to indicate boundaries between nested lists when there
-         * is no blank line.  We split the string by \001 and parse
-         * each chunk separately. */
-        contents = strtok(elt.contents.str, "\001");
-        print_html_element(markdown(contents, extensions), obfuscate);
-        while ((contents = strtok(NULL, "\001")))
-            print_html_element(markdown(contents, extensions), obfuscate);
+        /* Shouldn't occur - these are handled by process_raw_blocks() */
+        assert(elt->key != RAW);
         break;
     case H1: case H2: case H3: case H4: case H5: case H6:
-        lev = elt.key - H1 + 1;  /* assumes H1 ... H6 are in order */
-        pad(2);
-        printf("<h%1d>", lev);
-        print_html_element_list(elt.children, obfuscate);
-        printf("</h%1d>", lev);
+        lev = elt->key - H1 + 1;  /* assumes H1 ... H6 are in order */
+        pad(out, 2);
+        g_string_append_printf(out, "<h%1d>", lev);
+        print_html_element_list(out, elt->children, obfuscate);
+        g_string_append_printf(out, "</h%1d>", lev);
         padded = 0;
         break;
     case PLAIN:
-        pad(1);
-        print_html_element_list(elt.children, obfuscate);
+        pad(out, 1);
+        print_html_element_list(out, elt->children, obfuscate);
         padded = 0;
         break;
     case PARA:
-        pad(2);
-        printf("<p>");;;
-        print_html_element_list(elt.children, obfuscate);
-        printf("</p>");;;
+        pad(out, 2);
+        g_string_append_printf(out, "<p>");
+        print_html_element_list(out, elt->children, obfuscate);
+        g_string_append_printf(out, "</p>");
         padded = 0;
         break;
     case HRULE:
-        pad(2);
-        printf("<hr />");;;
+        pad(out, 2);
+        g_string_append_printf(out, "<hr />");
         padded = 0;
         break;
     case HTMLBLOCK:
-        pad(2);
-        printf("%s", elt.contents.str);
+        pad(out, 2);
+        g_string_append_printf(out, "%s", elt->contents.str);
         padded = 0;
         break;
     case VERBATIM:
-        pad(2);
-        printf("%s", "<pre><code>");
-        print_html_string(elt.contents.str, obfuscate);
-        printf("%s", "</code></pre>");
+        pad(out, 2);
+        g_string_append_printf(out, "%s", "<pre><code>");
+        print_html_string(out, elt->contents.str, obfuscate);
+        g_string_append_printf(out, "%s", "</code></pre>");
         padded = 0;
         break;
     case BULLETLIST:
-        pad(2);
-        printf("%s", "<ul>");
+        pad(out, 2);
+        g_string_append_printf(out, "%s", "<ul>");
         padded = 0;
-        print_html_element_list(elt.children, obfuscate);
-        pad(1);
-        printf("%s", "</ul>");
+        print_html_element_list(out, elt->children, obfuscate);
+        pad(out, 1);
+        g_string_append_printf(out, "%s", "</ul>");
         padded = 0;
         break;
     case ORDEREDLIST:
-        pad(2);
-        printf("%s", "<ol>");
+        pad(out, 2);
+        g_string_append_printf(out, "%s", "<ol>");
         padded = 0;
-        print_html_element_list(elt.children, obfuscate);
-        pad(1);
-        printf("</ol>");;;
+        print_html_element_list(out, elt->children, obfuscate);
+        pad(out, 1);
+        g_string_append_printf(out, "</ol>");
         padded = 0;
         break;
     case LISTITEM:
-        pad(1);
-        printf("<li>");;;
+        pad(out, 1);
+        g_string_append_printf(out, "<li>");
         padded = 2;
-        print_html_element_list(elt.children, obfuscate);
-        printf("</li>");;;
+        print_html_element_list(out, elt->children, obfuscate);
+        g_string_append_printf(out, "</li>");
         padded = 0;
         break;
     case BLOCKQUOTE:
-        pad(2);
-        printf("<blockquote>\n");;;
+        pad(out, 2);
+        g_string_append_printf(out, "<blockquote>\n");
         padded = 2;
-        print_html_element_list(elt.children, obfuscate);
-        pad(1);
-        printf("</blockquote>");;;
+        print_html_element_list(out, elt->children, obfuscate);
+        pad(out, 1);
+        g_string_append_printf(out, "</blockquote>");
         padded = 0;
         break;
     case REFERENCE:
@@ -278,39 +271,42 @@ static void print_html_element(element elt, bool obfuscate) {
     case NOTE:
         /* if contents.str == 0, then print note; else ignore, since this
          * is a note block that has been incorporated into the notes list */
-        if (elt.contents.str == 0) {
-            endnotes = cons(elt, endnotes);
+        if (elt->contents.str == 0) {
+            add_endnote(elt);
             ++notenumber;
-            printf("<a class=\"noteref\" id=\"fnref%d\" href=\"#fn%d\" title=\"Jump to note %d\">[%d]</a>", 
+            g_string_append_printf(out, "<a class=\"noteref\" id=\"fnref%d\" href=\"#fn%d\" title=\"Jump to note %d\">[%d]</a>",
                 notenumber, notenumber, notenumber, notenumber);
         }
         break;
     default: 
-        fprintf(stderr, "print_html_element encountered unknown element key = %d\n", elt.key); 
+        fprintf(stderr, "print_html_element encountered unknown element key = %d\n", elt->key); 
         exit(EXIT_FAILURE);
     }
 }
 
-static void print_html_endnotes(void) {
+static void print_html_endnotes(GString *out) {
     int counter = 0;
-    if (endnotes == NULL) {
+    GSList *note;
+    element *note_elt;
+    if (endnotes == NULL) 
         return;
-    }
-    printf("<hr/>\n<ol id=\"notes\">");
-    endnotes = reverse(endnotes);
-    while (endnotes != NULL) {
+    note = g_slist_reverse(endnotes);
+    g_string_append_printf(out, "<hr/>\n<ol id=\"notes\">");
+    while (note != NULL) {
+        note_elt = note->data;
         counter++;
-        pad(1);
-        printf("<li id=\"fn%d\">\n", counter);
+        pad(out, 1);
+        g_string_append_printf(out, "<li id=\"fn%d\">\n", counter);
         padded = 2;
-        print_html_element_list(endnotes->children, false);
-        printf(" <a href=\"#fnref%d\" title=\"Jump back to reference\">[back]</a>", counter);
-        pad(1);
-        printf("</li>");;
-        endnotes = endnotes->next;
+        print_html_element_list(out, note_elt->children, false);
+        g_string_append_printf(out, " <a href=\"#fnref%d\" title=\"Jump back to reference\">[back]</a>", counter);
+        pad(out, 1);
+        g_string_append_printf(out, "</li>");
+        note = note->next;
     }
-    pad(1);
-    printf("</ol>");;;
+    pad(out, 1);
+    g_string_append_printf(out, "</ol>");
+    g_slist_free(endnotes);
 }
 
 /**********************************************************************
@@ -320,205 +316,200 @@ static void print_html_endnotes(void) {
  ***********************************************************************/
 
 /* print_latex_string - print string, escaping for LaTeX */
-static void print_latex_string(char *str) {
+static void print_latex_string(GString *out, char *str) {
     while (*str != '\0') {
         switch (*str) {
           case '{': case '}': case '$': case '%':
           case '&': case '_': case '#':
-            printf("\\%c", *str);
+            g_string_append_printf(out, "\\%c", *str);
             break;
         case '^':
-            printf("\\^{}");;;
+            g_string_append_printf(out, "\\^{}");
             break;
         case '\\':
-            printf("\\textbackslash{}");;;
+            g_string_append_printf(out, "\\textbackslash{}");
             break;
         case '~':
-            printf("\\ensuremath{\\sim}");;;
+            g_string_append_printf(out, "\\ensuremath{\\sim}");
             break;
         case '|':
-            printf("\\textbar{}");;;
+            g_string_append_printf(out, "\\textbar{}");
             break;
         case '<':
-            printf("\\textless{}");;;
+            g_string_append_printf(out, "\\textless{}");
             break;
         case '>':
-            printf("\\textgreater{}");;;
+            g_string_append_printf(out, "\\textgreater{}");
             break;
         default:
-            putchar(*str);
+            g_string_append_c(out, *str);
         }
     str++;
     }
 }
 
 /* print_latex_element_list - print a list of elements as LaTeX */
-static void print_latex_element_list(element *list) {
+static void print_latex_element_list(GString *out, element *list) {
     while (list != NULL) {
-        print_latex_element(*list);
+        print_latex_element(out, list);
         list = list->next;
     }
 }
 
 /* print_latex_element - print an element as LaTeX */
-static void print_latex_element(element elt) {
+static void print_latex_element(GString *out, element *elt) {
     int lev;
     int i;
-    char *contents;
-    switch (elt.key) {
+    switch (elt->key) {
     case SPACE:
-        printf("%s", elt.contents.str);
+        g_string_append_printf(out, "%s", elt->contents.str);
         break;
     case LINEBREAK:
-        printf("\\\\\n");;;
+        g_string_append_printf(out, "\\\\\n");
         break;
     case STR:
-        print_latex_string(elt.contents.str);
+        print_latex_string(out, elt->contents.str);
         break;
     case ELLIPSIS:
-        printf("\\ldots{}");;;
+        g_string_append_printf(out, "\\ldots{}");
         break;
     case EMDASH: 
-        printf("---");;;
+        g_string_append_printf(out, "---");
         break;
     case ENDASH: 
-        printf("--");;;
+        g_string_append_printf(out, "--");
         break;
     case APOSTROPHE:
-        printf("'");;;
+        g_string_append_printf(out, "'");
         break;
     case SINGLEQUOTED:
-        printf("`");;;
-        print_latex_element_list(elt.children);
-        printf("'");;;
+        g_string_append_printf(out, "`");
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "'");
         break;
     case DOUBLEQUOTED:
-        printf("``");;;
-        print_latex_element_list(elt.children);
-        printf("''");;;
+        g_string_append_printf(out, "``");
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "''");
         break;
     case CODE:
-        printf("\\texttt{");;;
-        print_latex_string(elt.contents.str);
-        printf("}");;;
+        g_string_append_printf(out, "\\texttt{");
+        print_latex_string(out, elt->contents.str);
+        g_string_append_printf(out, "}");
         break;
     case HTML:
         /* don't print HTML */
         break;
     case LINK:
-        printf("\\href{%s}{", elt.contents.link.url);
-        print_latex_element_list(elt.contents.link.label);
-        printf("}");;;
+        g_string_append_printf(out, "\\href{%s}{", elt->contents.link->url);
+        print_latex_element_list(out, elt->contents.link->label);
+        g_string_append_printf(out, "}");
         break;
     case IMAGE:
-        printf("\\includegraphics{%s}", elt.contents.link.url);
+        g_string_append_printf(out, "\\includegraphics{%s}", elt->contents.link->url);
         break;
     case EMPH:
-        printf("\\emph{");;;
-        print_latex_element_list(elt.children);
-        printf("}");;;
+        g_string_append_printf(out, "\\emph{");
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "}");
         break;
     case STRONG:
-        printf("\\textbf{");;;
-        print_latex_element_list(elt.children);
-        printf("}");;;
+        g_string_append_printf(out, "\\textbf{");
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "}");
         break;
     case LIST:
-        print_latex_element_list(elt.children);
+        print_latex_element_list(out, elt->children);
         break;
     case RAW:
-        /* \001 is used to indicate boundaries between nested lists when there
-         * is no blank line.  We split the string by \001 and parse
-         * each chunk separately. */
-        contents = strtok(elt.contents.str, "\001");
-        print_latex_element(markdown(contents, extensions));
-        while ((contents = strtok(NULL, "\001")))
-            print_latex_element(markdown(contents, extensions));
+        /* Shouldn't occur - these are handled by process_raw_blocks() */
+        assert(elt->key != RAW);
         break;
     case H1: case H2: case H3:
-        pad(2);
-        lev = elt.key - H1 + 1;  /* assumes H1 ... H6 are in order */
-        printf("\\");;;
-        for (i = elt.key; i > H1; i--)
-            printf("sub");;;
-        printf("section{");;;
-        print_latex_element_list(elt.children);
-        printf("}");;;
+        pad(out, 2);
+        lev = elt->key - H1 + 1;  /* assumes H1 ... H6 are in order */
+        g_string_append_printf(out, "\\");
+        for (i = elt->key; i > H1; i--)
+            g_string_append_printf(out, "sub");
+        g_string_append_printf(out, "section{");
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "}");
         padded = 0;
         break;
     case H4: case H5: case H6:
-        pad(2);
-        printf("\\noindent\\textbf{");;;
-        print_latex_element_list(elt.children);
-        printf("}");;;
+        pad(out, 2);
+        g_string_append_printf(out, "\\noindent\\textbf{");
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "}");
         padded = 0;
         break;
     case PLAIN:
-        pad(1);
-        print_latex_element_list(elt.children);
+        pad(out, 1);
+        print_latex_element_list(out, elt->children);
         padded = 0;
         break;
     case PARA:
-        pad(2);
-        print_latex_element_list(elt.children);
+        pad(out, 2);
+        print_latex_element_list(out, elt->children);
         padded = 0;
         break;
     case HRULE:
-        pad(2);
-        printf("\\begin{center}\\rule{3in}{0.4pt}\\end{center}\n");;;
+        pad(out, 2);
+        g_string_append_printf(out, "\\begin{center}\\rule{3in}{0.4pt}\\end{center}\n");
         padded = 0;
         break;
     case HTMLBLOCK:
         /* don't print HTML block */
         break;
     case VERBATIM:
-        pad(1);
-        printf("\\begin{verbatim}\n");;;
-        print_latex_string(elt.contents.str);
-        printf("\n\\end{verbatim}");;;
+        pad(out, 1);
+        g_string_append_printf(out, "\\begin{verbatim}\n");
+        print_latex_string(out, elt->contents.str);
+        g_string_append_printf(out, "\n\\end{verbatim}");
         padded = 0;
         break;
     case BULLETLIST:
-        pad(1);
-        printf("\\begin{itemize}");;;
+        pad(out, 1);
+        g_string_append_printf(out, "\\begin{itemize}");
         padded = 0;
-        print_latex_element_list(elt.children);
-        pad(1);
-        printf("\\end{itemize}");;;
+        print_latex_element_list(out, elt->children);
+        pad(out, 1);
+        g_string_append_printf(out, "\\end{itemize}");
         padded = 0;
         break;
     case ORDEREDLIST:
-        pad(1);
-        printf("\\begin{enumerate}");;;
+        pad(out, 1);
+        g_string_append_printf(out, "\\begin{enumerate}");
         padded = 0;
-        print_latex_element_list(elt.children);
-        pad(1);
-        printf("\\end{enumerate}");;;
+        print_latex_element_list(out, elt->children);
+        pad(out, 1);
+        g_string_append_printf(out, "\\end{enumerate}");
         padded = 0;
         break;
     case LISTITEM:
-        pad(1);
-        printf("\\item ");;;
+        pad(out, 1);
+        g_string_append_printf(out, "\\item ");
         padded = 2;
-        print_latex_element_list(elt.children);
-        printf("\n");;;
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "\n");
         break;
     case BLOCKQUOTE:
-        pad(1);
-        printf("\\begin{quote}");;;
+        pad(out, 1);
+        g_string_append_printf(out, "\\begin{quote}");
         padded = 0;
-        print_latex_element(markdown(elt.contents.str, extensions));
-        printf("\\end{quote}");;;
+        print_latex_element_list(out, elt->children);
+        pad(out, 1);
+        g_string_append_printf(out, "\\end{quote}");
         padded = 0;
         break;
     case NOTE:
         /* if contents.str == 0, then print note; else ignore, since this
          * is a note block that has been incorporated into the notes list */
-        if (elt.contents.str == 0) {
-            printf("\\footnote{");;;
+        if (elt->contents.str == 0) {
+            g_string_append_printf(out, "\\footnote{");
             padded = 2;
-            print_latex_element_list(elt.children);
-            printf("}");;;
+            print_latex_element_list(out, elt->children);
+            g_string_append_printf(out, "}");
             padded = 0; 
         }
         break;
@@ -526,7 +517,7 @@ static void print_latex_element(element elt) {
         /* Nonprinting */
         break;
     default: 
-        fprintf(stderr, "print_latex_element encountered unknown element key = %d\n", elt.key); 
+        fprintf(stderr, "print_latex_element encountered unknown element key = %d\n", elt->key); 
         exit(EXIT_FAILURE);
     }
 }
@@ -540,195 +531,189 @@ static void print_latex_element(element elt) {
 static bool in_list_item = false; /* True if we're parsing contents of a list item. */
 
 /* print_groff_string - print string, escaping for groff */
-static void print_groff_string(char *str) {
+static void print_groff_string(GString *out, char *str) {
     while (*str != '\0') {
         switch (*str) {
         case '\\':
-            printf("\\e");;;
+            g_string_append_printf(out, "\\e");
             break;
         default:
-            putchar(*str);
+            g_string_append_c(out, *str);
         }
     str++;
     }
 }
 
 /* print_groff_mm_element_list - print a list of elements as groff ms */
-static void print_groff_mm_element_list(element *list) {
+static void print_groff_mm_element_list(GString *out, element *list) {
     int count = 1;
     while (list != NULL) {
-        print_groff_mm_element(*list, count);
+        print_groff_mm_element(out, list, count);
         list = list->next;
         count++;
     }
 }
 
 /* print_groff_mm_element - print an element as groff ms */
-static void print_groff_mm_element(element elt, int count) {
+static void print_groff_mm_element(GString *out, element *elt, int count) {
     int lev;
-    char *contents;
-    switch (elt.key) {
+    switch (elt->key) {
     case SPACE:
-        printf("%s", elt.contents.str);
+        g_string_append_printf(out, "%s", elt->contents.str);
         padded = 0;
         break;
     case LINEBREAK:
-        pad(1);
-        printf(".br");;;
+        pad(out, 1);
+        g_string_append_printf(out, ".br");
         padded = 0;
         break;
     case STR:
-        print_groff_string(elt.contents.str);
+        print_groff_string(out, elt->contents.str);
         padded = 0;
         break;
     case ELLIPSIS:
-        printf("...");;;
+        g_string_append_printf(out, "...");
         break;
     case EMDASH:
-        printf("\\[em]");;;
+        g_string_append_printf(out, "\\[em]");
         break;
     case ENDASH:
-        printf("\\[en]");;;
+        g_string_append_printf(out, "\\[en]");
         break;
     case APOSTROPHE:
-        printf("'");;;
+        g_string_append_printf(out, "'");
         break;
     case SINGLEQUOTED:
-        printf("`");;;
-        print_groff_mm_element_list(elt.children);
-        printf("'");;;
+        g_string_append_printf(out, "`");
+        print_groff_mm_element_list(out, elt->children);
+        g_string_append_printf(out, "'");
         break;
     case DOUBLEQUOTED:
-        printf("\\[lq]");;;
-        print_groff_mm_element_list(elt.children);
-        printf("\\[rq]");;;
+        g_string_append_printf(out, "\\[lq]");
+        print_groff_mm_element_list(out, elt->children);
+        g_string_append_printf(out, "\\[rq]");
         break;
     case CODE:
-        printf("\\fC");;;
-        print_groff_string(elt.contents.str);
-        printf("\\fR");;;
+        g_string_append_printf(out, "\\fC");
+        print_groff_string(out, elt->contents.str);
+        g_string_append_printf(out, "\\fR");
         padded = 0;
         break;
     case HTML:
         /* don't print HTML */
         break;
     case LINK:
-        print_groff_mm_element_list(elt.contents.link.label);
-        printf(" (%s)", elt.contents.link.url);
+        print_groff_mm_element_list(out, elt->contents.link->label);
+        g_string_append_printf(out, " (%s)", elt->contents.link->url);
         padded = 0;
         break;
     case IMAGE:
-        printf("[IMAGE: ");;;
-        print_groff_mm_element_list(elt.contents.link.label);
-        printf("]");;;
+        g_string_append_printf(out, "[IMAGE: ");
+        print_groff_mm_element_list(out, elt->contents.link->label);
+        g_string_append_printf(out, "]");
         padded = 0;
         /* not supported */
         break;
     case EMPH:
-        printf("\\fI");;;
-        print_groff_mm_element_list(elt.children);
-        printf("\\fR");;;
+        g_string_append_printf(out, "\\fI");
+        print_groff_mm_element_list(out, elt->children);
+        g_string_append_printf(out, "\\fR");
         padded = 0;
         break;
     case STRONG:
-        printf("\\fB");;;
-        print_groff_mm_element_list(elt.children);
-        printf("\\fR");;;
+        g_string_append_printf(out, "\\fB");
+        print_groff_mm_element_list(out, elt->children);
+        g_string_append_printf(out, "\\fR");
         padded = 0;
         break;
     case LIST:
-        print_groff_mm_element_list(elt.children);
+        print_groff_mm_element_list(out, elt->children);
         padded = 0;
         break;
     case RAW:
-        /* \001 is used to indicate boundaries between nested lists when there
-         * is no blank line.  We split the string by \001 and parse
-         * each chunk separately. */
-        contents = strtok(elt.contents.str, "\001");
-        print_groff_mm_element(markdown(contents, extensions), count);
-        while ((contents = strtok(NULL, "\001")))
-            print_groff_mm_element(markdown(contents, extensions), count);
+        /* Shouldn't occur - these are handled by process_raw_blocks() */
+        assert(elt->key != RAW);
         break;
     case H1: case H2: case H3: case H4: case H5: case H6:
-        lev = elt.key - H1 + 1;
-        pad(1);
-        printf(".H %d \"", lev);
-        print_groff_mm_element_list(elt.children);
-        printf("\"");
+        lev = elt->key - H1 + 1;
+        pad(out, 1);
+        g_string_append_printf(out, ".H %d \"", lev);
+        print_groff_mm_element_list(out, elt->children);
+        g_string_append_printf(out, "\"");
         padded = 0;
         break;
     case PLAIN:
-        pad(1);
-        print_groff_mm_element_list(elt.children);
+        pad(out, 1);
+        print_groff_mm_element_list(out, elt->children);
         padded = 0;
         break;
     case PARA:
-        pad(1);
+        pad(out, 1);
         if (!in_list_item || count != 1)
-            printf(".P\n");;;
-        print_groff_mm_element_list(elt.children);
+            g_string_append_printf(out, ".P\n");
+        print_groff_mm_element_list(out, elt->children);
         padded = 0;
         break;
     case HRULE:
-        pad(1);
-        printf("\\l'\\n(.lu*8u/10u'");;;
+        pad(out, 1);
+        g_string_append_printf(out, "\\l'\\n(.lu*8u/10u'");
         padded = 0;
         break;
     case HTMLBLOCK:
         /* don't print HTML block */
         break;
     case VERBATIM:
-        pad(1);
-        printf(".VERBON 2\n");;;
-        print_groff_string(elt.contents.str);
-        printf(".VERBOFF");;;
+        pad(out, 1);
+        g_string_append_printf(out, ".VERBON 2\n");
+        print_groff_string(out, elt->contents.str);
+        g_string_append_printf(out, ".VERBOFF");
         padded = 0;
         break;
     case BULLETLIST:
-        pad(1);
-        printf(".BL");;;
+        pad(out, 1);
+        g_string_append_printf(out, ".BL");
         padded = 0;
-        print_groff_mm_element_list(elt.children);
-        pad(1);
-        printf(".LE 1");;;
+        print_groff_mm_element_list(out, elt->children);
+        pad(out, 1);
+        g_string_append_printf(out, ".LE 1");
         padded = 0;
         break;
     case ORDEREDLIST:
-        pad(1);
-        printf(".AL");;;
+        pad(out, 1);
+        g_string_append_printf(out, ".AL");
         padded = 0;
-        print_groff_mm_element_list(elt.children);
-        pad(1);
-        printf(".LE 1");;;
+        print_groff_mm_element_list(out, elt->children);
+        pad(out, 1);
+        g_string_append_printf(out, ".LE 1");
         padded = 0;
         break;
     case LISTITEM:
-        pad(1);
-        printf(".LI\n");;;
+        pad(out, 1);
+        g_string_append_printf(out, ".LI\n");
         in_list_item = true;
         padded = 2;
-        print_groff_mm_element_list(elt.children);
+        print_groff_mm_element_list(out, elt->children);
         in_list_item = false;
         break;
     case BLOCKQUOTE:
-        pad(1);
-        printf(".DS I\n");;;
+        pad(out, 1);
+        g_string_append_printf(out, ".DS I\n");
         padded = 2;
-        print_groff_mm_element(markdown(elt.contents.str, extensions), 1);
-        pad(1);
-        printf(".DE");;;
+        print_groff_mm_element_list(out, elt->children);
+        pad(out, 1);
+        g_string_append_printf(out, ".DE");
         padded = 0;
         break;
     case NOTE:
         /* if contents.str == 0, then print note; else ignore, since this
          * is a note block that has been incorporated into the notes list */
-        if (elt.contents.str == 0) {
-            printf("\\*F\n");;;
-            printf(".FS\n");;;
+        if (elt->contents.str == 0) {
+            g_string_append_printf(out, "\\*F\n");
+            g_string_append_printf(out, ".FS\n");
             padded = 2;
-            print_groff_mm_element_list(elt.children);
-            pad(1);
-            printf(".FE\n");;;
+            print_groff_mm_element_list(out, elt->children);
+            pad(out, 1);
+            g_string_append_printf(out, ".FE\n");
             padded = 1; 
         }
         break;
@@ -736,7 +721,7 @@ static void print_groff_mm_element(element elt, int count) {
         /* Nonprinting */
         break;
     default: 
-        fprintf(stderr, "print_groff_mm_element encountered unknown element key = %d\n", elt.key); 
+        fprintf(stderr, "print_groff_mm_element encountered unknown element key = %d\n", elt->key); 
         exit(EXIT_FAILURE);
     }
 }
@@ -747,20 +732,21 @@ static void print_groff_mm_element(element elt, int count) {
 
  ***********************************************************************/
 
-void print_element(element elt, int format) {
+void print_element_list(GString *out, element *elt, int format, int exts) {
+    extensions = exts;
     switch (format) {
     case HTML_FORMAT:
-        print_html_element(elt, false);
+        print_html_element_list(out, elt, false);
         if (endnotes != NULL) {
-            pad(2);
-            print_html_endnotes();
+            pad(out, 2);
+            print_html_endnotes(out);
         }
         break;
     case LATEX_FORMAT:
-        print_latex_element(elt);
+        print_latex_element_list(out, elt);
         break;
     case GROFF_MM_FORMAT:
-        print_groff_mm_element(elt, 1);
+        print_groff_mm_element_list(out, elt);
         break;
     default:
         fprintf(stderr, "print_element - unknown format = %d\n", format);