rmultimarkdown 6.2.2.1 → 6.4.0.1

data/ext/mmd/lexer.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.14.3 on Sun Jul 23 17:28:33 2017 */
+/* Generated by re2c 0.14.3 on Wed May 23 14:18:41 2018 */
 /**
 
 	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
@@ -643,6 +643,7 @@ yy53:
 	yyaccept = 8;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
+	case 0x00:
 	case '\t':
 	case '\n':
 	case '\r':
@@ -1088,6 +1089,7 @@ yy86:
 	YYCTXMARKER = YYCURSOR + 1;
 	yych = *++YYCURSOR;
 	switch (yych) {
+	case 0x00:
 	case '\t':
 	case '\n':
 	case '\r':
@@ -1102,9 +1104,10 @@ yy87:
 	yych = *YYCURSOR;
 yy88:
 	switch (yych) {
+	case 0x00:
+	case '\n':	goto yy91;
 	case '\t':
 	case ' ':	goto yy87;
-	case '\n':	goto yy91;
 	case '\r':	goto yy93;
 	case 0xC2:	goto yy90;
 	default:	goto yy89;
@@ -1135,9 +1138,10 @@ yy94:
 	yych = *YYCURSOR;
 yy95:
 	switch (yych) {
+	case 0x00:
+	case '\n':	goto yy98;
 	case '\t':
 	case ' ':	goto yy94;
-	case '\n':	goto yy98;
 	case '\r':	goto yy100;
 	case 0xC2:	goto yy97;
 	default:	goto yy96;
@@ -1166,6 +1170,7 @@ yy101:
 	YYCTXMARKER = YYCURSOR + 1;
 	yych = *++YYCURSOR;
 	switch (yych) {
+	case 0x00:
 	case '\t':
 	case '\n':
 	case '\r':
@@ -1178,6 +1183,7 @@ yy102:
 	YYCTXMARKER = YYCURSOR + 1;
 	yych = *++YYCURSOR;
 	switch (yych) {
+	case 0x00:
 	case '\t':
 	case '\n':
 	case '\r':
@@ -1192,9 +1198,10 @@ yy103:
 	yych = *YYCURSOR;
 yy104:
 	switch (yych) {
+	case 0x00:
+	case '\n':	goto yy107;
 	case '\t':
 	case ' ':	goto yy103;
-	case '\n':	goto yy107;
 	case '\r':	goto yy109;
 	case 0xC2:	goto yy106;
 	default:	goto yy105;
@@ -1225,9 +1232,10 @@ yy110:
 	yych = *YYCURSOR;
 yy111:
 	switch (yych) {
+	case 0x00:
+	case '\n':	goto yy114;
 	case '\t':
 	case ' ':	goto yy110;
-	case '\n':	goto yy114;
 	case '\r':	goto yy116;
 	case 0xC2:	goto yy113;
 	default:	goto yy112;
@@ -1256,6 +1264,7 @@ yy117:
 	YYCTXMARKER = YYCURSOR + 1;
 	yych = *++YYCURSOR;
 	switch (yych) {
+	case 0x00:
 	case '\t':
 	case '\n':
 	case '\r':
@@ -1268,6 +1277,7 @@ yy118:
 	YYCTXMARKER = YYCURSOR + 1;
 	yych = *++YYCURSOR;
 	switch (yych) {
+	case 0x00:
 	case '\t':
 	case '\n':
 	case '\r':
@@ -1281,9 +1291,10 @@ yy119:
 	yych = *YYCURSOR;
 yy120:
 	switch (yych) {
+	case 0x00:
+	case '\n':	goto yy123;
 	case '\t':
 	case ' ':	goto yy119;
-	case '\n':	goto yy123;
 	case '\r':	goto yy125;
 	case 0xC2:	goto yy122;
 	default:	goto yy121;
@@ -1314,9 +1325,10 @@ yy126:
 	yych = *YYCURSOR;
 yy127:
 	switch (yych) {
+	case 0x00:
+	case '\n':	goto yy130;
 	case '\t':
 	case ' ':	goto yy126;
-	case '\n':	goto yy130;
 	case '\r':	goto yy132;
 	case 0xC2:	goto yy129;
 	default:	goto yy128;

data/ext/mmd/lexer.h

@@ -69,7 +69,7 @@ typedef struct Scanner Scanner;
 
 /// Scan for the next token
 int scan(
-    Scanner * s,			//!< Pointer to Scanner state structure
-    const char * stop		//!< Pointer to position in string at which to stop parsing
+	Scanner * s,			//!< Pointer to Scanner state structure
+	const char * stop		//!< Pointer to position in string at which to stop parsing
 );
 

data/ext/mmd/memoir.c

@@ -55,6 +55,7 @@
 
 #include "latex.h"
 #include "memoir.h"
+#include "parser.h"
 
 #define print(x) d_string_append(out, x)
 #define print_const(x) d_string_append_c_array(out, x, sizeof(x) - 1)
@@ -70,6 +71,7 @@ void mmd_export_token_memoir(DString * out, const char * source, token * t, scra
 	}
 
 	char *	temp_char	= NULL;
+	token *	temp_token	= NULL;
 
 	switch (t->type) {
 		case DOC_START_TOKEN:
@@ -82,6 +84,33 @@ void mmd_export_token_memoir(DString * out, const char * source, token * t, scra
 			temp_char = get_fence_language_specifier(t->child->child, source);
 
 			if (temp_char) {
+				if (strncmp("{=", temp_char, 2) == 0) {
+					// Raw source
+					if (raw_filter_text_matches(temp_char, FORMAT_MEMOIR)) {
+						switch (t->child->tail->type) {
+							case LINE_FENCE_BACKTICK_3:
+							case LINE_FENCE_BACKTICK_4:
+							case LINE_FENCE_BACKTICK_5:
+								temp_token = t->child->tail;
+								break;
+
+							default:
+								temp_token = NULL;
+						}
+
+						if (temp_token) {
+							d_string_append_c_array(out, &source[t->child->next->start], temp_token->start - t->child->next->start);
+							scratch->padded = 1;
+						} else {
+							d_string_append_c_array(out, &source[t->child->start + t->child->len], t->start + t->len - t->child->next->start);
+							scratch->padded = 0;
+						}
+					}
+
+					free(temp_char);
+					break;
+				}
+
 				printf("\\begin{adjustwidth}{2.5em}{2.5em}\n\\begin{lstlisting}[language=%s]\n", temp_char);
 			} else {
 				print_const("\\begin{adjustwidth}{2.5em}{2.5em}\n\\begin{verbatim}\n");

data/ext/mmd/mmd.c

@@ -65,6 +65,7 @@
 #include "mmd.h"
 #include "object_pool.h"
 #include "opendocument.h"
+#include "opml-reader.h"
 #include "parser.h"
 #include "scanners.h"
 #include "stack.h"
@@ -115,6 +116,10 @@ mmd_engine * mmd_engine_create(DString * d, unsigned long extensions) {
 
 		e->allow_meta = (extensions & EXT_COMPATIBILITY) ? false : true;
 
+		if (e->allow_meta) {
+			e->allow_meta = (extensions & EXT_NO_METADATA) ? false : true;
+		}
+
 		e->language = LC_EN;
 		e->quotes_lang = ENGLISH;
 
@@ -237,7 +242,7 @@ void mmd_engine_set_language(mmd_engine * e, short language) {
 			break;
 
 		case LC_ES:
-			e->quotes_lang = ENGLISH;
+			e->quotes_lang = SPANISH;
 			break;
 
 		case LC_FR:
@@ -506,20 +511,17 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
 				line->type = (first_child->type - HASH1) + LINE_ATX_1;
 				first_child->type = (line->type - LINE_ATX_1) + MARKER_H1;
 
-				// Strip trailing whitespace from '#' sequence
-				first_child->len = first_child->type - MARKER_H1 + 1;
-
 				// Strip trailing '#' sequence if present
 				if (line->child->tail->type == TEXT_NL) {
 					if ((line->child->tail->prev->type >= HASH1) &&
-					        (line->child->tail->prev->type <= HASH6)) {
+							(line->child->tail->prev->type <= HASH6)) {
 						line->child->tail->prev->type -= HASH1;
 						line->child->tail->prev->type += MARKER_H1;
 					}
 				} else {
 					if ((line->child->tail->type >= HASH1) &&
-					        (line->child->tail->type <= HASH6)) {
-						line->child->tail->type -= TEXT_EMPTY;
+							(line->child->tail->type <= HASH6)) {
+						line->child->tail->type -= HASH1;
 						line->child->tail->type += MARKER_H1;
 					}
 				}
@@ -572,8 +574,8 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
 								t = first_child;
 
 								while (t->next && ((t->next->type == INDENT_SPACE) ||
-								                   (t->next->type == INDENT_TAB) ||
-								                   (t->next->type == NON_INDENT_SPACE))) {
+												   (t->next->type == INDENT_TAB) ||
+												   (t->next->type == NON_INDENT_SPACE))) {
 									tokens_prune(t->next, t->next);
 								}
 
@@ -722,8 +724,8 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
 								t = first_child;
 
 								while (t->next && ((t->next->type == INDENT_SPACE) ||
-								                   (t->next->type == INDENT_TAB) ||
-								                   (t->next->type == NON_INDENT_SPACE))) {
+												   (t->next->type == INDENT_TAB) ||
+												   (t->next->type == NON_INDENT_SPACE))) {
 									tokens_prune(t->next, t->next);
 								}
 
@@ -832,7 +834,7 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
 	}
 
 	if ((line->type == LINE_PLAIN) &&
-	        !(e->extensions & EXT_COMPATIBILITY)) {
+			!(e->extensions & EXT_COMPATIBILITY)) {
 		// Check if this is a potential table line
 		token * walker = first_child;
 
@@ -966,6 +968,9 @@ token * mmd_tokenize_string(mmd_engine * e, size_t start, size_t len, bool stop_
 	// Reset metadata flag
 	e->allow_meta = (e->extensions & EXT_COMPATIBILITY) ? false : true;
 
+	if (e->allow_meta) {
+		e->allow_meta = (e->extensions & EXT_NO_METADATA) ? false : true;
+	}
 
 	// Create a scanner (for re2c)
 	Scanner s;
@@ -1253,7 +1258,7 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
 
 				// Do we treat this like metadata?
 				if (!(e->extensions & EXT_COMPATIBILITY) &&
-				        !(e->extensions & EXT_NO_METADATA)) {
+						!(e->extensions & EXT_NO_METADATA)) {
 					break;
 				}
 
@@ -1281,6 +1286,9 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
 			case BLOCK_SETEXT_1:
 			case BLOCK_SETEXT_2:
 			case BLOCK_TABLE:
+			case BLOCK_TABLE_SECTION:
+			case TABLE_ROW:
+			case TABLE_CELL:
 			case BLOCK_TERM:
 			case LINE_LIST_BULLETED:
 			case LINE_LIST_ENUMERATED:
@@ -1478,14 +1486,14 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
 				offset = t->start;
 
 				if (!((offset == 0) ||
-				        (char_is_whitespace_or_line_ending_or_punctuation(str[offset - 1])) ||
-				        (char_is_whitespace_or_line_ending_or_punctuation(str[offset + 1])))) {
+						(char_is_whitespace_or_line_ending_or_punctuation(str[offset - 1])) ||
+						(char_is_whitespace_or_line_ending_or_punctuation(str[offset + 1])))) {
 					t->type = APOSTROPHE;
 					break;
 				}
 
 				if (offset && (char_is_punctuation(str[offset - 1])) &&
-				        (char_is_alphanumeric(str[offset + 1]))) {
+						(char_is_alphanumeric(str[offset + 1]))) {
 					// If possessive apostrophe, e.g. `x`'s
 					if (str[offset + 1] == 's' || str[offset + 1] == 'S') {
 						if (char_is_whitespace_or_line_ending_or_punctuation(str[offset + 2])) {
@@ -1520,7 +1528,7 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
 				if (t->len == 1) {
 					// Check whether we have '1-2'
 					if ((offset == 0) || (!char_is_digit(str[offset - 1])) ||
-					        (!char_is_digit(str[offset + 1]))) {
+							(!char_is_digit(str[offset + 1]))) {
 						t->type = TEXT_PLAIN;
 					}
 				}
@@ -1566,18 +1574,14 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
 
 				offset = t->start;
 
-				// Look left -- no whitespace to left
-				if ((offset == 0) || (char_is_whitespace_or_line_ending_or_punctuation(str[offset - 1]))) {
-					t->can_open = 0;
-				}
-
+				// Can't close if whitespace to left
 				if ((offset != 0) && (char_is_whitespace_or_line_ending(str[offset - 1]))) {
 					t->can_close = 0;
 				}
 
 				offset = t->start + t->len;
 
-				if (char_is_whitespace_or_line_ending_or_punctuation(str[offset])) {
+				if (char_is_whitespace_or_line_ending(str[offset])) {
 					t->can_open = 0;
 				}
 
@@ -1661,11 +1665,11 @@ void pair_emphasis_tokens(token * t) {
 					closer = t->mate;
 
 					if (t->next &&
-					        (t->next->mate == closer->prev) &&
-					        (t->type == t->next->type) &&
-					        (t->next->mate != t) &&
-					        (t->start + t->len == t->next->start) &&
-					        (closer->start == closer->prev->start + closer->prev->len)) {
+							(t->next->mate == closer->prev) &&
+							(t->type == t->next->type) &&
+							(t->next->mate != t) &&
+							(t->start + t->len == t->next->start) &&
+							(closer->start == closer->prev->start + closer->prev->len)) {
 
 						// We have a strong pair
 						t->type = STRONG_START;
@@ -1788,8 +1792,8 @@ void is_list_loose(token * list) {
 /// Is this actually an HTML block?
 void is_para_html(mmd_engine * e, token * block) {
 	if ((block == NULL) ||
-	        (block->child == NULL) ||
-	        (block->child->type != LINE_PLAIN)) {
+			(block->child == NULL) ||
+			(block->child->type != LINE_PLAIN)) {
 		return;
 	}
 
@@ -2043,7 +2047,7 @@ void strip_line_tokens_from_block(mmd_engine * e, token * block) {
 			case LINE_SETEXT_1:
 			case LINE_SETEXT_2:
 				if ((block->type == BLOCK_SETEXT_1) ||
-				        (block->type == BLOCK_SETEXT_2)) {
+						(block->type == BLOCK_SETEXT_2)) {
 					temp = l->next;
 					tokens_prune(l, l);
 					l = temp;
@@ -2088,7 +2092,7 @@ handle_line:
 
 				// If we're not a code block, strip additional indents
 				if ((block->type != BLOCK_CODE_INDENTED) &&
-				        (block->type != BLOCK_CODE_FENCED)) {
+						(block->type != BLOCK_CODE_FENCED)) {
 					while (l->child && ((l->child->type == INDENT_SPACE) || (l->child->type == INDENT_TAB))) {
 						token_remove_first_child(l);
 					}
@@ -2123,7 +2127,7 @@ handle_line:
 
 				// Move children to parent
 				// Add ':' back
-				if (e->dstr->str[l->child->start - 1] == ':') {
+				if (l->child->start > 0 && e->dstr->str[l->child->start - 1] == ':') {
 					temp = token_new(COLON, l->child->start - 1, 1);
 					token_append_child(block, temp);
 				}
@@ -2184,6 +2188,10 @@ token * mmd_engine_parse_substring(mmd_engine * e, size_t byte_start, size_t byt
 		e->extensions |= EXT_NO_METADATA;
 	}
 
+	if (e->extensions & EXT_PARSE_OPML) {
+		// Convert from OPML first (if not done earlier)
+		mmd_convert_opml_string(e, byte_start, byte_len);
+	}
 
 	// Tokenize the string
 	token * doc = mmd_tokenize_string(e, byte_start, byte_len, false);
@@ -2259,6 +2267,7 @@ bool mmd_d_string_has_metadata(DString * source, size_t * end) {
 /// Does the text have metadata?
 bool mmd_engine_has_metadata(mmd_engine * e, size_t * end) {
 	bool result = false;
+	token * old_root;
 
 	if (!e) {
 		return false;
@@ -2275,10 +2284,8 @@ bool mmd_engine_has_metadata(mmd_engine * e, size_t * end) {
 		return false;
 	}
 
-	// Free existing parse tree
-	if (e->root) {
-		token_tree_free(e->root);
-	}
+	// Preserve existing parse tree (if any)
+	old_root = e->root;
 
 	// Tokenize the string (up until first empty line)
 	token * doc = mmd_tokenize_string(e, 0, e->dstr->currentStringLength, true);
@@ -2298,6 +2305,9 @@ bool mmd_engine_has_metadata(mmd_engine * e, size_t * end) {
 		token_tree_free(doc);
 	}
 
+	// Restore previous parse tree
+	e->root = old_root;
+
 	return result;
 }
 
@@ -2399,6 +2409,10 @@ char * mmd_d_string_metavalue_for_key(DString * source, const char * key) {
 /// Grab metadata without processing entire document
 /// Returned char * does not need to be freed
 char * mmd_engine_metavalue_for_key(mmd_engine * e, const char * key) {
+	if (e == NULL || key == NULL) {
+		return NULL;
+	}
+
 	if (e->metadata_stack->size == 0) {
 		// Ensure we have checked for metadata
 		if (!mmd_engine_has_metadata(e, NULL)) {
@@ -2538,7 +2552,11 @@ void mmd_engine_update_metavalue_for_key(mmd_engine * e, const char * key, const
 
 	DString * temp = d_string_new(key);
 	d_string_append(temp, ":\t");
-	d_string_append(temp, value);
+
+	if (value) {
+		d_string_append(temp, value);
+	}
+
 	d_string_append_c(temp, '\n');
 
 	if (start != -1) {
@@ -2568,7 +2586,10 @@ void mmd_engine_update_metavalue_for_key(mmd_engine * e, const char * key, const
 
 		d_string_erase(e->dstr, start, len);
 		d_string_insert(e->dstr, start, "\n");
-		d_string_insert(e->dstr, start, value);
+
+		if (value) {
+			d_string_insert(e->dstr, start, value);
+		}
 	} else if (meta_end != 0) {
 		// We're appending metadata at the end
 		d_string_insert(e->dstr, meta_end, temp->str);
@@ -2743,6 +2764,11 @@ DString * mmd_engine_convert_to_data(mmd_engine * e, short format, const char *
 	DString * result = NULL;
 
 	if (format == FORMAT_MMD) {
+		if (e->extensions & EXT_PARSE_OPML) {
+			// Convert from OPML first (if not done earlier)
+			mmd_convert_opml_string(e, 0, e->dstr->currentStringLength);
+		}
+
 		// Simply return text (transclusion is handled externally)
 		d_string_append_c_array(output, e->dstr->str, e->dstr->currentStringLength);