rmultimarkdown 6.4.0.4 → 6.7.0.0

data/ext/mmd/opml-reader.c

@@ -14,7 +14,7 @@
 
 /*
 
-	Copyright © 2016 - 2018 Fletcher T. Penney.
+	Copyright © 2016 - 2019 Fletcher T. Penney.
 
 
 	The `MultiMarkdown 6` project is released under the MIT License..
@@ -104,18 +104,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "d_string.h"
 #include "mmd.h"
 #include "opml-reader.h"
 #include "opml-lexer.h"
 #include "opml-parser.h"
 #include "token.h"
-
+#include "xml.h"
 
 // Basic parser function declarations
-void * OPMLAlloc();
-void OPML();
-void OPMLFree();
-void OPMLTrace();
+void * OPMLAlloc(void *);
+void OPML(void *, int, void *, void *);
+void OPMLFree(void *, void *);
+void OPMLTrace(FILE * stream, char * zPrefix);
 
 
 #define print(x) d_string_append(out, x)
@@ -188,107 +189,15 @@ token * tokenize_opml_string(mmd_engine * e, size_t start, size_t len) {
 }
 
 
-void print_opml_text(DString * out, const char * source, size_t start, size_t len) {
-	const char * s_start = &source[start];
-	const char * s_stop = &source[start + len];
-
-	char * c = (char *) s_start;
-
-	while (c < s_stop) {
-		switch (*c) {
-			case '&':
-				switch (*++c) {
-					case '#':
-						if (strncmp(c, "#10;", 4) == 0) {
-							print_char('\n');
-							c += 4;
-							continue;
-						}
-
-						if (strncmp(c, "#9;", 3) == 0) {
-							print_char('\t');
-							c += 3;
-							continue;
-						}
-
-						if (strncmp(c, "#13;", 4) == 0) {
-							print_char('\r');
-							c += 4;
-							continue;
-						}
-
-						break;
-
-					case 'a':
-						if (strncmp(c, "amp;", 4) == 0) {
-							print_char('&');
-							c += 4;
-							continue;
-						}
-
-						if (strncmp(c, "apos;", 5) == 0) {
-							print_char('\'');
-							c += 5;
-							continue;
-						}
-
-						break;
-
-					case 'l':
-						if (strncmp(c, "lt;", 3) == 0) {
-							print_char('<');
-							c += 3;
-							continue;
-						}
-
-						break;
-
-					case 'g':
-						if (strncmp(c, "gt;", 3) == 0) {
-							print_char('>');
-							c += 3;
-							continue;
-						}
-
-						break;
-
-					case 'q':
-						if (strncmp(c, "quot;", 5) == 0) {
-							print_char('"');
-							c += 5;
-							continue;
-						}
-
-						break;
-
-					default:
-						break;
-				}
-
-				print_char('&');
-				continue;
-				break;
-
-			default:
-				print_char(*c);
-				break;
-		}
-
-		c++;
-	}
-}
-
-
-
 void parse_opml_token_chain(mmd_engine * e, token * chain) {
 
-	void* pParser = OPMLAlloc (malloc);		// Create a parser (for lemon)
+	void * pParser = OPMLAlloc (malloc);		// Create a parser (for lemon)
 	token * walker = chain->next;				// Walk the existing tree
 	token * remainder;							// Hold unparsed tail of chain
 
-	#ifndef NDEBUG
+#ifndef NDEBUG
 	OPMLTrace(stderr, "parser >>");
-	#endif
+#endif
 
 	// Remove existing token tree
 	e->root = NULL;
@@ -302,9 +211,9 @@ void parse_opml_token_chain(mmd_engine * e, token * chain) {
 	}
 
 	// Signal finish to parser
-	#ifndef NDEBUG
+#ifndef NDEBUG
 	fprintf(stderr, "\nFinish parse\n");
-	#endif
+#endif
 	OPML(pParser, 0, NULL, e);
 
 	if (e->root) {
@@ -328,59 +237,80 @@ void parse_opml_token_chain(mmd_engine * e, token * chain) {
 					// Advance over `<outline`
 					start = walker->start + 8;
 
-					start += scan_text(&(e->dstr->str[start]));
-					len = scan_double_quoted(&(e->dstr->str[start]));
-
-					if (strncmp(&(e->dstr->str[start + 1]), "(Untitled Preamble)", 19) != 0) {
-						if (out == metadata) {
-							print_opml_text(out, e->dstr->str, start + 1, len - 2);
-							print_const(":\t");
-						} else {
-							// Print header
-							if (scan_encoded_newline(&(e->dstr->str[start + 1]), len - 2) == -1) {
-								// ATX header
-								for (int i = 0; i < header_level; ++i) {
-									print_char('#');
-								}
+					char * text = xml_extract_named_attribute(e->dstr->str, start, "text");
 
-								print_char(' ');
-							}
+					if (text) {
+						len = strlen(text);
 
-							print_opml_text(out, e->dstr->str, start + 1, len - 2);
+						if (strcmp("&gt;&gt;Preamble&lt;&lt;", text) != 0) {
+							if (out == metadata) {
+								print_xml_as_text(out, text, 0, len);
+								print_const(":\t");
+							} else {
+								// Print header
 
-							if (scan_encoded_newline(&(e->dstr->str[start + 1]), len - 2) == -1) {
-								// ATX header
-								print_char(' ');
+								if (xml_scan_encoded_newline(text, len) == -1) {
+									// ATX header
+									for (int i = 0; i < header_level; ++i) {
+										print_char('#');
+									}
 
-								for (int i = 0; i < header_level; ++i) {
-									print_char('#');
+									print_char(' ');
 								}
-							} else {
-								// Print Setext Header
-								switch (header_level) {
-									case 1:
-										print_const("\n======");
-										break;
-
-									default:
-										print_const("\n------");
-										break;
+
+								print_xml_as_text(out, text, 0, len);
+
+								if (xml_scan_encoded_newline(text, len) == -1) {
+									// ATX header
+									print_char(' ');
+
+									for (int i = 0; i < header_level; ++i) {
+										print_char('#');
+									}
+								} else {
+									// Print Setext Header
+									switch (header_level) {
+										case 1:
+											print_const("\n======");
+											break;
+
+										default:
+											print_const("\n------");
+											break;
+									}
 								}
-							}
 
-							print_const("\n");
+								print_const("\n");
+							}
 						}
+
+						free(text);
 					}
 
 					// Print contents
-					start += len;
-					start += scan_note(&(e->dstr->str[start]));
-					len = scan_double_quoted(&(e->dstr->str[start]));
+					text = xml_extract_named_attribute(e->dstr->str, start, "_note");
+
+					if (text) {
+						print_xml_as_text(out, text, 0, strlen(text));
 
-					print_opml_text(out, e->dstr->str, start + 1, len - 2);
+						free(text);
+					}
 
 					if (out == metadata) {
-						print_char('\n');
+						print_const("  \n");
+					} else {
+						// Ensure that contents end in newline
+						if (out->currentStringLength) {
+							switch (out->str[out->currentStringLength - 1]) {
+								case '\n':
+								case '\r':
+									break;
+
+								default:
+									d_string_append_c(out, '\n');
+									break;
+							}
+						}
 					}
 
 					if (walker->type == OPML_OUTLINE_SELF_CLOSE) {

data/ext/mmd/opml-reader.h

@@ -14,7 +14,7 @@
 
 /*
 
-	Copyright © 2016 - 2018 Fletcher T. Penney.
+	Copyright © 2016 - 2019 Fletcher T. Penney.
 
 
 	The `MultiMarkdown 6` project is released under the MIT License..

data/ext/mmd/opml.c

@@ -14,7 +14,7 @@
 
 /*
 
-	Copyright © 2016 - 2018 Fletcher T. Penney.
+	Copyright © 2016 - 2019 Fletcher T. Penney.
 
 
 	The `MultiMarkdown 6` project is released under the MIT License..
@@ -108,6 +108,8 @@
 
 #include "opml.h"
 #include "parser.h"
+#include "stack.h"
+
 
 #define print(x) d_string_append(out, x)
 #define print_const(x) d_string_append_c_array(out, x, sizeof(x) - 1)
@@ -118,7 +120,7 @@
 
 
 
-void mmd_print_source(DString * out, const char * source, size_t start, size_t len) {
+void mmd_print_source_opml(DString * out, const char * source, size_t start, size_t len) {
 	const char * s_start = &source[start];
 	const char * s_stop = &source[start + len];
 
@@ -190,7 +192,7 @@ void mmd_check_preamble_opml(DString * out, token * t, scratch_pad * scratch) {
 					break;
 
 				default:
-					print_const("<outline text=\"(Untitled Preamble)\" _note=\"");
+					print_const("<outline text=\"&gt;&gt;Preamble&lt;&lt;\" _note=\"");
 					scratch->opml_item_closed = 0;
 					stack_push(scratch->outline_stack, walker);
 					walker = NULL;
@@ -211,7 +213,7 @@ void mmd_export_title_opml(DString * out, const char * source, scratch_pad * scr
 		print_const("<head><title>");
 
 		size_t len = strlen(m->value);
-		mmd_print_source(out, m->value, 0, len);
+		mmd_print_source_opml(out, m->value, 0, len);
 
 		print_const("</title></head>\n");
 	}
@@ -224,16 +226,16 @@ void mmd_export_metadata_opml(DString * out, const char * source, scratch_pad *
 	size_t len;
 
 	if (scratch->meta_hash) {
-		print_const("<outline text=\"Metadata\">\n");
+		print_const("<outline text=\"&gt;&gt;Metadata&lt;&lt;\">\n");
 
 		for (m = scratch->meta_hash; m != NULL; m = m->hh.next) {
 			print_const("<outline text=\"");
 			len = strlen(m->key);
-			mmd_print_source(out, m->key, 0, len);
+			mmd_print_source_opml(out, m->key, 0, len);
 
 			print_const("\" _note=\"");
 			len = strlen(m->value);
-			mmd_print_source(out, m->value, 0, len);
+			mmd_print_source_opml(out, m->value, 0, len);
 
 			print_const("\"/>\n");
 		}
@@ -321,7 +323,7 @@ void mmd_outline_add_opml(DString * out, const char * source, token * current, s
 			}
 
 			// Output as XML string
-			mmd_print_source(out, source, start, len);
+			mmd_print_source_opml(out, source, start, len);
 
 			print_const("\">");
 			scratch->opml_item_closed = 1;
@@ -417,6 +419,8 @@ void mmd_export_header_opml(DString * out, const char * source, token * t, scrat
 				case MARKER_H4:
 				case MARKER_H5:
 				case MARKER_H6:
+				case MARKER_SETEXT_1:
+				case MARKER_SETEXT_2:
 					walker = walker->prev;
 					break;
 
@@ -427,7 +431,7 @@ void mmd_export_header_opml(DString * out, const char * source, token * t, scrat
 			}
 		}
 
-		mmd_print_source(out, source, start, stop - start);
+		mmd_print_source_opml(out, source, start, stop - start);
 	}
 }
 
@@ -437,10 +441,6 @@ void mmd_export_token_opml(DString * out, const char * source, token * t, scratc
 		return;
 	}
 
-	short	temp_short;
-	char *	temp_char	= NULL;
-	token *	temp_token	= NULL;
-
 	switch (t->type) {
 		case DOC_START_TOKEN:
 			print_const("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<opml version=\"1.0\">\n");

data/ext/mmd/opml.h

@@ -14,7 +14,7 @@
 
 /*
 
-	Copyright © 2016 - 2018 Fletcher T. Penney.
+	Copyright © 2016 - 2019 Fletcher T. Penney.
 
 
 	The `MultiMarkdown 6` project is released under the MIT License..